From d712c5d7b800aeadfaaf7215829fb5fe78ec14e1 Mon Sep 17 00:00:00 2001 From: gracetxgao <101677420+gracetxgao@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:52:41 -0800 Subject: [PATCH] refactor: move and rename error-to-string function --- libs/design/scss/core/error/error-to-string.scss | 13 +++++++++++++ .../design/scss/core/map/map-get/map-get-error.scss | 13 ------------- libs/design/scss/core/map/map-get/map-get.scss | 4 ++-- libs/design/scss/core/map/map-get/map-get.spec.scss | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 libs/design/scss/core/error/error-to-string.scss delete mode 100644 libs/design/scss/core/map/map-get/map-get-error.scss diff --git a/libs/design/scss/core/error/error-to-string.scss b/libs/design/scss/core/error/error-to-string.scss new file mode 100644 index 0000000000..13c2231509 --- /dev/null +++ b/libs/design/scss/core/error/error-to-string.scss @@ -0,0 +1,13 @@ +$use-string: false !default; + +@function error-to-string($message, $override: $use-string) { + @if $override { + @return $message; + } @else { + @error $message; + } +} + +@mixin set-use-string($state: true) { + $use-string: $state !global; +} \ No newline at end of file diff --git a/libs/design/scss/core/map/map-get/map-get-error.scss b/libs/design/scss/core/map/map-get/map-get-error.scss deleted file mode 100644 index d9925d5fa4..0000000000 --- a/libs/design/scss/core/map/map-get/map-get-error.scss +++ /dev/null @@ -1,13 +0,0 @@ -$debug: false !default; - -@function map-get-error($message, $override: $debug) { - @if $override { - @return $message; - } @else { - @error $message; - } -} - -@mixin set-debug($state: true) { - $debug: $state !global; -} \ No newline at end of file diff --git a/libs/design/scss/core/map/map-get/map-get.scss b/libs/design/scss/core/map/map-get/map-get.scss index 2eab9c807a..943658e702 100644 --- a/libs/design/scss/core/map/map-get/map-get.scss +++ b/libs/design/scss/core/map/map-get/map-get.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use './map-get-error'; +@use '../../error/error-to-string'; // // Return a the value of a nested key in a map if it exists. @@ -14,7 +14,7 @@ @function daff-map-get($map, $keys...) { @each $key in $keys { @if not map.has-key($map, $key) { - @return map-get-error.map-get-error("The map doesn't contain the $key: `#{$key}`'"); + @return error-to-string.error-to-string("The map doesn't contain the $key: `#{$key}`'"); } $map: map.get($map, $key); } diff --git a/libs/design/scss/core/map/map-get/map-get.spec.scss b/libs/design/scss/core/map/map-get/map-get.spec.scss index 98deeaf26d..cc23e4bd54 100644 --- a/libs/design/scss/core/map/map-get/map-get.spec.scss +++ b/libs/design/scss/core/map/map-get/map-get.spec.scss @@ -1,6 +1,6 @@ @use 'true' as *; @use './map-get' as *; -@use './map-get-error'; +@use '../../error/error-to-string'; @include describe('map-get') { $nested-map: ( @@ -28,7 +28,7 @@ $empty-map: (); - @include map-get-error.set-debug(true); + @include error-to-string.set-use-string(true); @include it('returns the value of the nested key if it exists in the map') { @include assert-equal(daff-map-get($map, 'nested', 'string'), '1'); @@ -61,5 +61,5 @@ ); } - @include map-get-error.set-debug(false); + @include error-to-string.set-use-string(false); }