refactor: replace type-of() with meta.type-of()

coreui · mrholek · Jan 30, 2025 · Jan 11, 2025 · Jan 13, 2025 · Jan 13, 2025
commit 9a9f4b1ec4a41906f4db938490ee3667e4b47c1c
diff --git a/scss/functions/_math.scss b/scss/functions/_math.scss
@@ -1,4 +1,5 @@
 @use "sass:math";
+@use "sass:meta";

 // Return valid calc
 @function add($value1, $value2, $return-calc: true) {
@@ -10,7 +11,7 @@
    @return $value1;
  }

-  @if type-of($value1) == number and type-of($value2) == number and math.compatible($value1, $value2) {
+  @if meta.type-of($value1) == number and meta.type-of($value2) == number and math.compatible($value1, $value2) {
    @return $value1 + $value2;
  }

@@ -30,11 +31,11 @@
    @return $value1;
  }

-  @if type-of($value1) == number and type-of($value2) == number and math.compatible($value1, $value2) {
+  @if meta.type-of($value1) == number and meta.type-of($value2) == number and math.compatible($value1, $value2) {
    @return $value1 - $value2;
  }

-  @if type-of($value2) != number {
+  @if meta.type-of($value2) != number {
    $value2: unquote("(") + $value2 + unquote(")");
  }


diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
@@ -1,4 +1,5 @@
 // stylelint-disable property-disallowed-list
+@use "sass:meta";
 @use "../variables" as *;
 @use "ltr-rtl" as *;

@@ -8,7 +9,7 @@
 @function valid-radius($radius) {
  $return: ();
  @each $value in $radius {
-    @if type-of($value) == number {
+    @if meta.type-of($value) == number {
      $return: append($return, max($value, 0));
    } @else {
      $return: append($return, $value);

diff --git a/scss/mixins/_utilities.scss b/scss/mixins/_utilities.scss
@@ -1,3 +1,4 @@
+@use "sass:meta";
 @use "../variables" as *;
 @use "../vendor/rfs" as *;
 @use "ltr-rtl" as *;
@@ -13,15 +14,15 @@
  $values: map-get($utility, values);

  // If the values are a list or string, convert it into a map
-  @if type-of($values) == "string" or type-of(nth($values, 1)) != "list" {
+  @if meta.type-of($values) == "string" or meta.type-of(nth($values, 1)) != "list" {
    $values: zip($values, $values);
  }

  @each $key, $value in $values {
    $properties: map-get($utility, property);

    // Multiple properties are possible, for example with vertical or horizontal margins or paddings
-    @if type-of($properties) == "string" {
+    @if meta.type-of($properties) == "string" {
      $properties: append((), $properties);
    }

@@ -102,7 +103,7 @@
                }
              }
              @if $is-rtl == true {
-                @if (type-of($value) == "map") {
+                @if (meta.type-of($value) == "map") {
                  @include ltr-rtl($property, map-get($value, "ltr"), null, map-get($value, "rtl"), if($enable-important-utilities, !important, null));
                } @else {
                  @include ltr-rtl($property, $value, null, null, if($enable-important-utilities, !important, null));