@angular/material 18.2.0-next.1 → 18.2.0-next.3

package/core/tokens/m3/mdc/_checkbox.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, checkbox);
@@ -11,7 +11,7 @@ $prefix: (mdc, checkbox);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC checkbox
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('checkbox', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens('checkbox', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed
     secondary: (
@@ -55,11 +55,11 @@ $prefix: (mdc, checkbox);
     )
   );
 
-  @return token-utils.namespace-tokens(
+  @return token-definition.namespace-tokens(
     $prefix,
     (
       _fix-tokens($mdc-tokens),
-      token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+      token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
     ),
     $token-slots
   );
@@ -75,7 +75,7 @@ $prefix: (mdc, checkbox);
 @function _fix-tokens($tokens) {
   // Need to get the hardcoded values, because they include opacities that are used for the disabled
   // state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('checkbox', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('checkbox', (), false);
 
   $rename-keys: (
     selected-icon-color: selected-checkmark-color,
@@ -94,10 +94,12 @@ $prefix: (mdc, checkbox);
     unselected-pressed-outline-color: unselected-pressed-icon-color
   );
 
-  $remapped-tokens: token-utils.rename-map-keys($tokens, $rename-keys);
-  $remapped-hardcoded-tokens: token-utils.rename-map-keys($hardcoded-tokens, $rename-keys);
+  $remapped-tokens: token-definition.rename-map-keys($tokens, $rename-keys);
+  $remapped-hardcoded-tokens:
+      token-definition.rename-map-keys($hardcoded-tokens, $rename-keys);
 
-  @return token-utils.combine-color-tokens($remapped-tokens, $remapped-hardcoded-tokens, (
+  @return token-definition.combine-color-tokens(
+      $remapped-tokens, $remapped-hardcoded-tokens, (
     (
       color: disabled-selected-icon-color,
       opacity: disabled-selected-icon-opacity,

package/core/tokens/m3/mdc/_chip.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/sass-utils';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, chip);
@@ -14,16 +14,16 @@ $prefix: (mdc, chip);
   // MDC has a chip component, but they seem to have made up the tokens rather than using ones
   // generated from the token database, therefore we need a custom token function for it.
   $tokens: sass-utils.merge-all(
-    token-utils.generate-typography-tokens($systems, label-text, label-large),
+    token-definition.generate-typography-tokens($systems, label-text, label-large),
     (
-      container-shape-radius: token-utils.hardcode(8px, $exclude-hardcoded),
-      with-avatar-avatar-size: token-utils.hardcode(24px, $exclude-hardcoded),
+      container-shape-radius: token-definition.hardcode(8px, $exclude-hardcoded),
+      with-avatar-avatar-size: token-definition.hardcode(24px, $exclude-hardcoded),
       label-text-color: map.get($systems, md-sys-color, on-surface-variant),
       disabled-label-text-color: sass-utils.safe-color-change(
         map.get($systems, md-sys-color, on-surface),
         $alpha: 0.38,
       ),
-      with-icon-icon-size: token-utils.hardcode(18px, $exclude-hardcoded),
+      with-icon-icon-size: token-definition.hardcode(18px, $exclude-hardcoded),
       with-icon-icon-color: map.get($systems, md-sys-color, on-surface-variant),
       with-icon-disabled-icon-color: map.get($systems, md-sys-color, on-surface),
       with-icon-selected-icon-color: map.get($systems, md-sys-color, on-secondary-container),
@@ -31,7 +31,7 @@ $prefix: (mdc, chip);
       with-trailing-icon-disabled-trailing-icon-color: map.get($systems, md-sys-color, on-surface),
       focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
       focus-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-      outline-width: token-utils.hardcode(1px, $exclude-hardcoded),
+      outline-width: token-definition.hardcode(1px, $exclude-hardcoded),
       outline-color: map.get($systems, md-sys-color, outline),
       disabled-outline-color: sass-utils.safe-color-change(
         map.get($systems, md-sys-color, on-surface),
@@ -40,9 +40,10 @@ $prefix: (mdc, chip);
       focus-outline-color: map.get($systems, md-sys-color, on-surface-variant),
       hover-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
       hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      with-avatar-disabled-avatar-opacity: token-utils.hardcode(0.38, $exclude-hardcoded),
+      with-avatar-disabled-avatar-opacity:
+          token-definition.hardcode(0.38, $exclude-hardcoded),
       elevated-selected-container-color: map.get($systems, md-sys-color, secondary-container),
-      flat-selected-outline-width: token-utils.hardcode(0, $exclude-hardcoded),
+      flat-selected-outline-width: token-definition.hardcode(0, $exclude-hardcoded),
       selected-label-text-color: map.get($systems, md-sys-color, on-secondary-container),
       flat-disabled-selected-container-color: sass-utils.safe-color-change(
         map.get($systems, md-sys-color, on-surface),
@@ -54,9 +55,9 @@ $prefix: (mdc, chip);
       selected-focus-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
       selected-focus-state-layer-opacity:
         map.get($systems, md-sys-state, focus-state-layer-opacity),
-      with-icon-disabled-icon-opacity: token-utils.hardcode(0.38, $exclude-hardcoded),
+      with-icon-disabled-icon-opacity: token-definition.hardcode(0.38, $exclude-hardcoded),
       with-trailing-icon-disabled-trailing-icon-opacity:
-        token-utils.hardcode(0.38, $exclude-hardcoded),
+        token-definition.hardcode(0.38, $exclude-hardcoded),
     ),
   ), (
     // Color variants:
@@ -84,5 +85,5 @@ $prefix: (mdc, chip);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, $tokens, $token-slots);
+  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
 }

package/core/tokens/m3/mdc/_circular-progress.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, circular-progress);
@@ -10,8 +10,8 @@ $prefix: (mdc, circular-progress);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC circular-progress
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens:
-    token-utils.get-mdc-tokens('circular-progress-indicator', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens(
+      'circular-progress-indicator', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed
     secondary: (
@@ -25,5 +25,6 @@ $prefix: (mdc, circular-progress);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, ($mdc-tokens, $variant-tokens), $token-slots);
+  @return token-definition.namespace-tokens(
+      $prefix, ($mdc-tokens, $variant-tokens), $token-slots);
 }

package/core/tokens/m3/mdc/_dialog.scss

@@ -1,4 +1,4 @@
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, dialog);
@@ -9,8 +9,8 @@ $prefix: (mdc, dialog);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC dialog
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('dialog', $systems, $exclude-hardcoded);
-  $tokens: token-utils.rename-map-keys($tokens, (
+  $tokens: token-definition.get-mdc-tokens('dialog', $systems, $exclude-hardcoded);
+  $tokens: token-definition.rename-map-keys($tokens, (
     headline-color: subhead-color,
     headline-font: subhead-font,
     headline-line-height: subhead-line-height,
@@ -19,5 +19,5 @@ $prefix: (mdc, dialog);
     headline-weight: subhead-weight,
   ));
 
-  @return token-utils.namespace-tokens($prefix, $tokens, $token-slots);
+  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
 }

package/core/tokens/m3/mdc/_elevated-card.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, elevated-card);
@@ -11,12 +11,12 @@ $prefix: (mdc, elevated-card);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC elevated-card
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('elevated-card', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('elevated-card', $systems, $exclude-hardcoded);
   $elevation: map.get($tokens, container-elevation);
 
   @if ($elevation != null) {
     $tokens: map.set($tokens, container-elevation, elevation.get-box-shadow($elevation));
   }
 
-  @return token-utils.namespace-tokens($prefix, $tokens, $token-slots);
+  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
 }

package/core/tokens/m3/mdc/_extended-fab.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, extended-fab);
@@ -11,7 +11,8 @@ $prefix: (mdc, extended-fab);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC extended-fab
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('extended-fab-primary', $systems, $exclude-hardcoded);
+  $tokens:
+      token-definition.get-mdc-tokens('extended-fab-primary', $systems, $exclude-hardcoded);
   $elevation-tokens: (
     container-elevation,
     focus-container-elevation,
@@ -30,9 +31,12 @@ $prefix: (mdc, extended-fab);
   $variant-tokens: (
     // Color variants
     primary: (), // Default, no overrides needed.
-    secondary: token-utils.get-mdc-tokens('extended-fab-secondary', $systems, $exclude-hardcoded),
-    tertiary: token-utils.get-mdc-tokens('extended-fab-tertiary', $systems, $exclude-hardcoded)
+    secondary: token-definition.get-mdc-tokens(
+        'extended-fab-secondary', $systems, $exclude-hardcoded),
+    tertiary: token-definition.get-mdc-tokens(
+        'extended-fab-tertiary', $systems, $exclude-hardcoded)
   );
 
-  @return token-utils.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return token-definition.namespace-tokens(
+      $prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/core/tokens/m3/mdc/_fab-small.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, fab-small);
@@ -11,7 +11,7 @@ $prefix: (mdc, fab-small);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC fab-small
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('fab-primary-small', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('fab-primary-small', $systems, $exclude-hardcoded);
   $elevation-tokens: (
     container-elevation,
     focus-container-elevation,
@@ -30,9 +30,12 @@ $prefix: (mdc, fab-small);
   $variant-tokens: (
     // Color variants
     primary: (), // Default, no overrides needed.
-    secondary: token-utils.get-mdc-tokens('fab-secondary-small', $systems, $exclude-hardcoded),
-    tertiary: token-utils.get-mdc-tokens('fab-tertiary-small', $systems, $exclude-hardcoded)
+    secondary: token-definition.get-mdc-tokens(
+        'fab-secondary-small', $systems, $exclude-hardcoded),
+    tertiary: token-definition.get-mdc-tokens(
+        'fab-tertiary-small', $systems, $exclude-hardcoded)
   );
 
-  @return token-utils.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return token-definition.namespace-tokens(
+      $prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/core/tokens/m3/mdc/_fab.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, fab);
@@ -11,7 +11,7 @@ $prefix: (mdc, fab);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC fab
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('fab-primary', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('fab-primary', $systems, $exclude-hardcoded);
   $elevation-tokens: (
     container-elevation,
     focus-container-elevation,
@@ -30,9 +30,10 @@ $prefix: (mdc, fab);
   $variant-tokens: (
     // Color variants
     primary: (), // Default, no overrides needed.
-    secondary: token-utils.get-mdc-tokens('fab-secondary', $systems, $exclude-hardcoded),
-    tertiary: token-utils.get-mdc-tokens('fab-tertiary', $systems, $exclude-hardcoded)
+    secondary: token-definition.get-mdc-tokens('fab-secondary', $systems, $exclude-hardcoded),
+    tertiary: token-definition.get-mdc-tokens('fab-tertiary', $systems, $exclude-hardcoded)
   );
 
-  @return token-utils.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return token-definition.namespace-tokens(
+      $prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/core/tokens/m3/mdc/_filled-button.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, filled-button);
@@ -11,7 +11,7 @@ $prefix: (mdc, filled-button);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC filled-button
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('filled-button', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens('filled-button', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed.
     secondary: (
@@ -58,9 +58,9 @@ $prefix: (mdc, filled-button);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($mdc-tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
   ), $token-slots);
 }
 
@@ -71,9 +71,9 @@ $prefix: (mdc, filled-button);
 @function _fix-tokens($initial-tokens) {
   // Need to get the hardcoded values, because they include opacities that are used for the disabled
   // state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('filled-button', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('filled-button', (), false);
 
-  @return token-utils.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
+  @return token-definition.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
     (
       color: disabled-label-text-color,
       opacity: disabled-label-text-opacity,

package/core/tokens/m3/mdc/_filled-text-field.scss

@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:meta';
 @use 'sass:list';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, filled-text-field);
@@ -12,7 +12,8 @@ $prefix: (mdc, filled-text-field);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC filled-text-field
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('filled-text-field', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens(
+      'filled-text-field', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed
     secondary: (
@@ -32,9 +33,9 @@ $prefix: (mdc, filled-text-field);
     ),
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($mdc-tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
   ), $token-slots);
 }
 
@@ -46,9 +47,9 @@ $prefix: (mdc, filled-text-field);
 @function _fix-tokens($initial-tokens) {
   // Need to get the hardcoded values, because they include opacities that are used for the disabled
   // state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('filled-text-field', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('filled-text-field', (), false);
 
-  $tokens: token-utils.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
+  $tokens: token-definition.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
     (
       color: disabled-active-indicator-color,
       opacity: disabled-active-indicator-opacity

package/core/tokens/m3/mdc/_icon-button.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, icon-button);
@@ -11,7 +11,7 @@ $prefix: (mdc, icon-button);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC icon-button
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('icon-button', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('icon-button', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (
       icon-color: map.get($systems, md-sys-color, primary)
@@ -27,9 +27,9 @@ $prefix: (mdc, icon-button);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
   ), $token-slots);
 }
 
@@ -40,16 +40,18 @@ $prefix: (mdc, icon-button);
 @function _fix-tokens($tokens) {
   // Need to get the hardcoded values, because they include opacities that are used for the disabled
   // state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('icon-button', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('icon-button', (), false);
 
   $rename-keys: (
     unselected-icon-color: icon-color,
   );
 
-  $remapped-tokens: token-utils.rename-map-keys($tokens, $rename-keys);
-  $remapped-hardcoded-tokens: token-utils.rename-map-keys($hardcoded-tokens, $rename-keys);
+  $remapped-tokens: token-definition.rename-map-keys($tokens, $rename-keys);
+  $remapped-hardcoded-tokens:
+      token-definition.rename-map-keys($hardcoded-tokens, $rename-keys);
 
-  @return token-utils.combine-color-tokens($remapped-tokens, $remapped-hardcoded-tokens, (
+  @return token-definition.combine-color-tokens(
+      $remapped-tokens, $remapped-hardcoded-tokens, (
     (
       color: disabled-icon-color,
       opacity: disabled-icon-opacity,

package/core/tokens/m3/mdc/_linear-progress.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, linear-progress);
@@ -10,8 +10,8 @@ $prefix: (mdc, linear-progress);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC linear-progress
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens:
-    token-utils.get-mdc-tokens('linear-progress-indicator', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens(
+      'linear-progress-indicator', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed
     secondary: (
@@ -28,5 +28,6 @@ $prefix: (mdc, linear-progress);
     ),
   );
 
-  @return token-utils.namespace-tokens($prefix, ($mdc-tokens, $variant-tokens), $token-slots);
+  @return token-definition.namespace-tokens(
+      $prefix, ($mdc-tokens, $variant-tokens), $token-slots);
 }

package/core/tokens/m3/mdc/_list.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, list);
@@ -10,9 +10,9 @@ $prefix: (mdc, list);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC list
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('list', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens('list', $systems, $exclude-hardcoded);
 
-  @return token-utils.namespace-tokens($prefix, _fix-tokens($mdc-tokens), $token-slots);
+  @return token-definition.namespace-tokens($prefix, _fix-tokens($mdc-tokens), $token-slots);
 }
 
 /// Fixes values in the list tokens that are inconsistent with its usage.

package/core/tokens/m3/mdc/_outlined-button.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, outlined-button);
@@ -11,7 +11,8 @@ $prefix: (mdc, outlined-button);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC outlined-button
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('outlined-button', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens(
+      'outlined-button', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed.
     secondary: (
@@ -58,9 +59,9 @@ $prefix: (mdc, outlined-button);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($mdc-tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
   ), $token-slots);
 }
 
@@ -68,9 +69,9 @@ $prefix: (mdc, outlined-button);
 /// @param {Map} $initial-tokens Map of outlined button tokens currently being generated.
 /// @return {Map} The given tokens, with the invalid values replaced with valid ones.
 @function _fix-tokens($initial-tokens) {
-  $hardcoded-tokens: token-utils.get-mdc-tokens('outlined-button', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('outlined-button', (), false);
 
-  @return token-utils.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
+  @return token-definition.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
     (
       color: disabled-label-text-color,
       opacity: disabled-label-text-opacity,

package/core/tokens/m3/mdc/_outlined-card.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, outlined-card);
@@ -11,12 +11,12 @@ $prefix: (mdc, outlined-card);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC outlined-card
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: token-utils.get-mdc-tokens('outlined-card', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('outlined-card', $systems, $exclude-hardcoded);
   $elevation: map.get($tokens, container-elevation);
 
   @if ($elevation != null) {
     $tokens: map.set($tokens, container-elevation, elevation.get-box-shadow($elevation));
   }
 
-  @return token-utils.namespace-tokens($prefix, $tokens, $token-slots);
+  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
 }

package/core/tokens/m3/mdc/_outlined-text-field.scss

@@ -1,6 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, outlined-text-field);
@@ -11,7 +11,8 @@ $prefix: (mdc, outlined-text-field);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC outlined-text-field
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('outlined-text-field', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens(
+      'outlined-text-field', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed
     secondary: (
@@ -31,9 +32,9 @@ $prefix: (mdc, outlined-text-field);
     ),
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($mdc-tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens))
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens))
   ), $token-slots);
 }
 
@@ -46,9 +47,9 @@ $prefix: (mdc, outlined-text-field);
 @function _fix-tokens($initial-tokens) {
   // Need to get the hardcoded values, because they include opacities that are used for the disabled
   // state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('outlined-text-field', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('outlined-text-field', (), false);
 
-  @return token-utils.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
+  @return token-definition.combine-color-tokens($initial-tokens, $hardcoded-tokens, (
     (
       color: disabled-outline-color,
       opacity: disabled-outline-opacity

package/core/tokens/m3/mdc/_plain-tooltip.scss

@@ -1,4 +1,4 @@
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, plain-tooltip);
@@ -9,7 +9,7 @@ $prefix: (mdc, plain-tooltip);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of tokens for the MDC plain-tooltip
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $mdc-tokens: token-utils.get-mdc-tokens('plain-tooltip', $systems, $exclude-hardcoded);
+  $mdc-tokens: token-definition.get-mdc-tokens('plain-tooltip', $systems, $exclude-hardcoded);
 
-  @return token-utils.namespace-tokens($prefix, $mdc-tokens, $token-slots);
+  @return token-definition.namespace-tokens($prefix, $mdc-tokens, $token-slots);
 }

package/core/tokens/m3/mdc/_protected-button.scss

@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:meta';
 @use '../../../style/elevation';
-@use '../../token-utils';
+@use '../../token-definition';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, protected-button);
@@ -13,7 +13,7 @@ $prefix: (mdc, protected-button);
 /// @return {Map} A set of tokens for the MDC protected-button
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   // Note: in M3 the "protected" button is called "elevated".
-  $tokens: token-utils.get-mdc-tokens('elevated-button', $systems, $exclude-hardcoded);
+  $tokens: token-definition.get-mdc-tokens('elevated-button', $systems, $exclude-hardcoded);
   $variant-tokens: (
     primary: (), // Default, no overrides needed.
     secondary: (
@@ -57,9 +57,9 @@ $prefix: (mdc, protected-button);
     )
   );
 
-  @return token-utils.namespace-tokens($prefix, (
+  @return token-definition.namespace-tokens($prefix, (
     _fix-tokens($tokens),
-    token-utils.map-values($variant-tokens, meta.get-function(_fix-tokens)),
+    token-definition.map-values($variant-tokens, meta.get-function(_fix-tokens)),
   ), $token-slots);
 }
 
@@ -70,7 +70,7 @@ $prefix: (mdc, protected-button);
 @function _fix-tokens($initial-tokens) {
   // Need to get the hardcoded values, because they include
   // opacities that are used for the disabled state.
-  $hardcoded-tokens: token-utils.get-mdc-tokens('elevated-button', (), false);
+  $hardcoded-tokens: token-definition.get-mdc-tokens('elevated-button', (), false);
   $tokens: $initial-tokens;
   $elevation-tokens: (
     container-elevation,
@@ -88,7 +88,7 @@ $prefix: (mdc, protected-button);
     }
   }
 
-  @return token-utils.combine-color-tokens($tokens, $hardcoded-tokens, (
+  @return token-definition.combine-color-tokens($tokens, $hardcoded-tokens, (
     (
       color: disabled-label-text-color,
       opacity: disabled-label-text-opacity,