@angular/material 20.0.0-next.5 → 20.0.0-next.6

package/slide-toggle/_slide-toggle-theme.scss

@@ -5,7 +5,7 @@
 @use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mat/switch' as tokens-mat-switch;
+@use './m2-slide-toggle';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-slide-toggle.
@@ -17,14 +17,14 @@
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
       @include token-utils.create-token-values-mixed(
-          tokens-mat-switch.$prefix,
-          tokens-mat-switch.get-unthemable-tokens()
+          m2-slide-toggle.$prefix,
+          m2-slide-toggle.get-unthemable-tokens()
       );
 
       .mat-mdc-slide-toggle {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-switch.$prefix,
-          tokens-mat-switch.get-unthemable-tokens()
+          m2-slide-toggle.$prefix,
+          m2-slide-toggle.get-unthemable-tokens()
         );
       }
     }
@@ -40,25 +40,25 @@
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
   } @else {
-    $mat-tokens: tokens-mat-switch.get-color-tokens($theme);
+    $mat-tokens: m2-slide-toggle.get-color-tokens($theme);
 
     // Add values for MDC slide toggles tokens
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-switch.$prefix,
-        tokens-mat-switch.get-color-tokens($theme)
+        m2-slide-toggle.$prefix,
+        m2-slide-toggle.get-color-tokens($theme)
       );
 
       & {
         // TODO(andrewjs): Remove this once all tokens are migrated to
         // mat internally.
-        --mdc-switch-disabled-label-text-color: #{inspection.get-theme-color(
+        --mdc-slide-toggle-disabled-label-text-color: #{inspection.get-theme-color(
             $theme,
             foreground,
             disabled-text
           )};
         // TODO(wagnermaciel): Use our token system to define this css variable.
-        --mat-switch-disabled-label-text-color: #{inspection.get-theme-color(
+        --mat-slide-toggle-disabled-label-text-color: #{inspection.get-theme-color(
             $theme,
             foreground,
             disabled-text
@@ -67,7 +67,7 @@
 
       .mat-mdc-slide-toggle {
         // TODO(wagnermaciel): Use our token system to define this css variable.
-        --mat-switch-label-text-color: #{inspection.get-theme-color(
+        --mat-slide-toggle-label-text-color: #{inspection.get-theme-color(
           $theme,
           foreground,
           text
@@ -76,15 +76,15 @@
         // Change the color palette related tokens to accent or warn if applicable
         &.mat-accent {
           @include token-utils.create-token-values-mixed(
-            tokens-mat-switch.$prefix,
-            tokens-mat-switch.private-get-color-palette-color-tokens($theme, accent)
+            m2-slide-toggle.$prefix,
+            m2-slide-toggle.private-get-color-palette-color-tokens($theme, accent)
           );
         }
 
         &.mat-warn {
           @include token-utils.create-token-values-mixed(
-            tokens-mat-switch.$prefix,
-            tokens-mat-switch.private-get-color-palette-color-tokens($theme, warn)
+            m2-slide-toggle.$prefix,
+            m2-slide-toggle.private-get-color-palette-color-tokens($theme, warn)
           );
         }
       }
@@ -101,14 +101,14 @@
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
       @include token-utils.create-token-values-mixed(
-        tokens-mat-switch.$prefix,
-        tokens-mat-switch.get-typography-tokens($theme)
+        m2-slide-toggle.$prefix,
+        m2-slide-toggle.get-typography-tokens($theme)
       );
 
       .mat-mdc-slide-toggle {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-switch.$prefix,
-          tokens-mat-switch.get-typography-tokens($theme)
+          m2-slide-toggle.$prefix,
+          m2-slide-toggle.get-typography-tokens($theme)
         );
       }
     }
@@ -124,14 +124,14 @@
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
       @include token-utils.create-token-values-mixed(
-        tokens-mat-switch.$prefix,
-        tokens-mat-switch.get-density-tokens($theme)
+        m2-slide-toggle.$prefix,
+        m2-slide-toggle.get-density-tokens($theme)
       );
 
       .mat-mdc-slide-toggle {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-switch.$prefix,
-          tokens-mat-switch.get-density-tokens($theme)
+          m2-slide-toggle.$prefix,
+          m2-slide-toggle.get-density-tokens($theme)
         );
       }
     }
@@ -142,8 +142,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-switch.$prefix,
-      tokens: tokens-mat-switch.get-token-slots(),
+      namespace: m2-slide-toggle.$prefix,
+      tokens: m2-slide-toggle.get-token-slots(),
     ),
   );
 }
@@ -182,10 +182,10 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-switch-tokens: token-utils.get-tokens-for($tokens, tokens-mat-switch.$prefix);
+  $mat-switch-tokens: token-utils.get-tokens-for($tokens, m2-slide-toggle.$prefix);
   $mat-switch-tokens-options:
-    token-utils.get-tokens-for($tokens, tokens-mat-switch.$prefix, $options...);
+    token-utils.get-tokens-for($tokens, m2-slide-toggle.$prefix, $options...);
 
   $tokens: map.merge($mat-switch-tokens, $mat-switch-tokens-options);
-  @include token-utils.create-token-values(tokens-mat-switch.$prefix, $tokens);
+  @include token-utils.create-token-values(m2-slide-toggle.$prefix, $tokens);
 }

package/slide-toggle/index.d.ts

@@ -2,8 +2,8 @@ import * as i0 from '@angular/core';
 import { InjectionToken, OnDestroy, AfterContentInit, OnChanges, ChangeDetectorRef, ElementRef, EventEmitter, SimpleChanges } from '@angular/core';
 import { ControlValueAccessor, Validator, AbstractControl, ValidationErrors } from '@angular/forms';
 import { FocusMonitor } from '@angular/cdk/a11y';
-import { T as ThemePalette } from '../palette.d-f5ca9a2b.js';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
+import { T as ThemePalette } from '../palette.d-1d8ebc0d.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
 
 /** Default `mat-slide-toggle` options that can be overridden. */
@@ -148,4 +148,5 @@ declare class MatSlideToggleModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatSlideToggleModule>;
 }
 
-export { MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS, MatSlideToggle, MatSlideToggleChange, type MatSlideToggleDefaultOptions, MatSlideToggleModule };
+export { MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS, MatSlideToggle, MatSlideToggleChange, MatSlideToggleModule };
+export type { MatSlideToggleDefaultOptions };

package/slide-toggle/testing/index.d.ts

@@ -62,4 +62,5 @@ declare class MatSlideToggleHarness extends ComponentHarness {
     uncheck(): Promise<void>;
 }
 
-export { MatSlideToggleHarness, type SlideToggleHarnessFilters };
+export { MatSlideToggleHarness };
+export type { SlideToggleHarnessFilters };

package/{core/tokens/m2/mat/_slider.scss → slider/_m2-slider.scss}

@@ -1,8 +1,8 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../style/sass-utils';
-@use '../../../theming/inspection';
-@use '../../../style/elevation';
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
+@use '../core/theming/inspection';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, slider);
@@ -98,8 +98,8 @@ $prefix: (mat, slider);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
     get-unthemable-tokens(),
-    get-color-tokens(token-definition.$placeholder-color-config),
-    get-typography-tokens(token-definition.$placeholder-typography-config),
-    get-density-tokens(token-definition.$placeholder-density-config)
+    get-color-tokens(m2-utils.$placeholder-color-config),
+    get-typography-tokens(m2-utils.$placeholder-typography-config),
+    get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_slider.scss → slider/_m3-slider.scss}

@@ -1,7 +1,7 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
-@use '../../../style/elevation';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, slider);
@@ -18,17 +18,17 @@ $prefix: (mat, slider);
         map.get($systems, md-sys-color, primary), $alpha: 0.05),
     focus-state-layer-color: sass-utils.safe-color-change(
         map.get($systems, md-sys-color, primary), $alpha: 0.2),
-    value-indicator-opacity: token-definition.hardcode(1, $exclude-hardcoded),
-    value-indicator-padding: token-definition.hardcode(0, $exclude-hardcoded),
-    value-indicator-width: token-definition.hardcode(28px, $exclude-hardcoded),
-    value-indicator-height: token-definition.hardcode(28px, $exclude-hardcoded),
-    value-indicator-caret-display: token-definition.hardcode(none, $exclude-hardcoded),
+    value-indicator-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
+    value-indicator-padding: m3-utils.hardcode(0, $exclude-hardcoded),
+    value-indicator-width: m3-utils.hardcode(28px, $exclude-hardcoded),
+    value-indicator-height: m3-utils.hardcode(28px, $exclude-hardcoded),
+    value-indicator-caret-display: m3-utils.hardcode(none, $exclude-hardcoded),
     value-indicator-border-radius:
-    token-definition.hardcode(50% 50% 50% 0, $exclude-hardcoded),
+    m3-utils.hardcode(50% 50% 50% 0, $exclude-hardcoded),
     value-indicator-text-transform:
-    token-definition.hardcode(rotate(45deg), $exclude-hardcoded),
+    m3-utils.hardcode(rotate(45deg), $exclude-hardcoded),
     value-indicator-container-transform:
-    token-definition.hardcode(translateX(-50%) rotate(-45deg), $exclude-hardcoded),
+    m3-utils.hardcode(translateX(-50%) rotate(-45deg), $exclude-hardcoded),
     active-track-color: map.get($systems, md-sys-color, primary),
     active-track-height: if($exclude-hardcoded, null, 4px),
     active-track-shape: map.get($systems, md-sys-shape, corner-full),
@@ -117,5 +117,5 @@ $prefix: (mat, slider);
     ),
   );
 
-  @return token-definition.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/slider/_slider-theme.scss

@@ -4,7 +4,7 @@
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/slider' as tokens-mat-slider;
+@use './m2-slider';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-slider.
@@ -15,9 +15,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-unthemable-tokens()
-      );
+        m2-slider.$prefix, m2-slider.get-unthemable-tokens());
     }
   }
 }
@@ -33,22 +31,16 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-color-tokens($theme)
-      );
+        m2-slider.$prefix, m2-slider.get-color-tokens($theme));
 
       .mat-accent {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-slider.$prefix,
-          tokens-mat-slider.private-get-color-palette-color-tokens($theme, accent)
-        );
+          m2-slider.$prefix, m2-slider.private-get-color-palette-color-tokens($theme, accent));
       }
 
       .mat-warn {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-slider.$prefix,
-          tokens-mat-slider.private-get-color-palette-color-tokens($theme, warn)
-        );
+          m2-slider.$prefix, m2-slider.private-get-color-palette-color-tokens($theme, warn));
       }
     }
   }
@@ -62,9 +54,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-typography-tokens($theme)
-      );
+        m2-slider.$prefix, m2-slider.get-typography-tokens($theme));
     }
   }
 }
@@ -77,9 +67,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-density-tokens($theme)
-      );
+        m2-slider.$prefix, m2-slider.get-density-tokens($theme));
     }
   }
 }
@@ -88,8 +76,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-slider.$prefix,
-      tokens: tokens-mat-slider.get-token-slots(),
+      namespace: m2-slider.$prefix,
+      tokens: m2-slider.get-token-slots(),
     ),
   );
 }
@@ -128,6 +116,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-slider-tokens: token-utils.get-tokens-for($tokens, tokens-mat-slider.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-slider.$prefix, $mat-slider-tokens);
+  $mat-slider-tokens: token-utils.get-tokens-for($tokens, m2-slider.$prefix, $options...);
+  @include token-utils.create-token-values(m2-slider.$prefix, $mat-slider-tokens);
 }

package/slider/index.d.ts

@@ -1,12 +1,12 @@
 import { Directionality } from '@angular/cdk/bidi';
 import * as i0 from '@angular/core';
 import { ChangeDetectorRef, WritableSignal, AfterViewInit, OnDestroy, NgZone, ElementRef, QueryList, EventEmitter } from '@angular/core';
-import { T as ThemePalette } from '../palette.d-f5ca9a2b.js';
-import { b as RippleGlobalOptions, M as MatRipple } from '../ripple.d-838c5cd6.js';
+import { T as ThemePalette } from '../palette.d-1d8ebc0d.js';
+import { b as RippleGlobalOptions, M as MatRipple } from '../ripple.d-305c30f3.js';
 import { ControlValueAccessor } from '@angular/forms';
 import { Subject } from 'rxjs';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import { M as MatRippleModule } from '../index.d-609609fc.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatRippleModule } from '../index.d-511f9e6c.js';
 import '@angular/cdk/platform';
 
 /**
@@ -656,4 +656,5 @@ declare class MatSliderModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatSliderModule>;
 }
 
-export { MatSlider, MatSliderChange, type MatSliderDragEvent, MatSliderModule, MatSliderRangeThumb, MatSliderThumb, MatSliderVisualThumb };
+export { MatSlider, MatSliderChange, MatSliderModule, MatSliderRangeThumb, MatSliderThumb, MatSliderVisualThumb };
+export type { MatSliderDragEvent };

package/slider/testing/index.d.ts

@@ -86,4 +86,5 @@ declare class MatSliderHarness extends ComponentHarness {
     getMinValue(): Promise<number>;
 }
 
-export { MatSliderHarness, MatSliderThumbHarness, type SliderHarnessFilters, type SliderThumbHarnessFilters, ThumbPosition };
+export { MatSliderHarness, MatSliderThumbHarness, ThumbPosition };
+export type { SliderHarnessFilters, SliderThumbHarnessFilters };

package/{core/tokens/m2/mat/_snack-bar.scss → snack-bar/_m2-snack-bar.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
 @use 'sass:meta';
 @use 'sass:color';
 
@@ -55,8 +55,8 @@ $prefix: (mat, snack-bar);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_snack-bar.scss → snack-bar/_m3-snack-bar.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, snack-bar);
@@ -21,5 +21,5 @@ $prefix: (mat, snack-bar);
     supporting-text-weight: map.get($systems, md-sys-typescale, body-medium-weight),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/snack-bar/_snack-bar-theme.scss

@@ -5,7 +5,7 @@
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/snack-bar' as tokens-mat-snack-bar;
+@use './m2-snack-bar';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -14,9 +14,7 @@
     // Add default values for tokens not related to color, typography, or density.
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-snack-bar.$prefix,
-        tokens-mat-snack-bar.get-unthemable-tokens()
-      );
+        m2-snack-bar.$prefix, m2-snack-bar.get-unthemable-tokens());
     }
   }
 }
@@ -27,9 +25,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-snack-bar.$prefix,
-        tokens-mat-snack-bar.get-color-tokens($theme)
-      );
+        m2-snack-bar.$prefix, m2-snack-bar.get-color-tokens($theme));
     }
   }
 }
@@ -40,9 +36,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-snack-bar.$prefix,
-        tokens-mat-snack-bar.get-typography-tokens($theme)
-      );
+        m2-snack-bar.$prefix, m2-snack-bar.get-typography-tokens($theme));
     }
   }
 }
@@ -54,8 +48,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-snack-bar.$prefix,
-      tokens: tokens-mat-snack-bar.get-token-slots(),
+      namespace: m2-snack-bar.$prefix,
+      tokens: m2-snack-bar.get-token-slots(),
     ),
   );
 }
@@ -91,8 +85,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-snack-bar.$prefix,
-      map.get($tokens, tokens-mat-snack-bar.$prefix)
+      m2-snack-bar.$prefix,
+      map.get($tokens, m2-snack-bar.$prefix)
     );
   }
 }

package/snack-bar/index.d.ts

@@ -7,13 +7,13 @@ import { BasePortalOutlet, CdkPortalOutlet, ComponentPortal, TemplatePortal, Dom
 import * as i0 from '@angular/core';
 import { InjectionToken, ViewContainerRef, OnDestroy, ElementRef, ComponentRef, EmbeddedViewRef, TemplateRef } from '@angular/core';
 import { Direction } from '@angular/cdk/bidi';
-import { n as MatButtonModule } from '../module.d-1b393e15.js';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import '../index.d-609609fc.js';
-import '../ripple.d-838c5cd6.js';
+import { n as MatButtonModule } from '../module.d-9a1d1c76.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import '../index.d-511f9e6c.js';
+import '../ripple.d-305c30f3.js';
 import '@angular/cdk/platform';
-import '../palette.d-f5ca9a2b.js';
-import '../ripple-loader.d-ef3a5132.js';
+import '../palette.d-1d8ebc0d.js';
+import '../ripple-loader.d-f51e5eb6.js';
 
 /** Injection token that can be used to access the data that was passed in to a snack bar. */
 declare const MAT_SNACK_BAR_DATA: InjectionToken<any>;
@@ -341,4 +341,5 @@ declare const matSnackBarAnimations: {
     readonly snackBarState: any;
 };
 
-export { MAT_SNACK_BAR_DATA, MAT_SNACK_BAR_DEFAULT_OPTIONS, MAT_SNACK_BAR_DEFAULT_OPTIONS_FACTORY, MatSnackBar, MatSnackBarAction, MatSnackBarActions, MatSnackBarConfig, MatSnackBarContainer, type MatSnackBarDismiss, type MatSnackBarHorizontalPosition, MatSnackBarLabel, MatSnackBarModule, MatSnackBarRef, type MatSnackBarVerticalPosition, SimpleSnackBar, type TextOnlySnackBar, matSnackBarAnimations };
+export { MAT_SNACK_BAR_DATA, MAT_SNACK_BAR_DEFAULT_OPTIONS, MAT_SNACK_BAR_DEFAULT_OPTIONS_FACTORY, MatSnackBar, MatSnackBarAction, MatSnackBarActions, MatSnackBarConfig, MatSnackBarContainer, MatSnackBarLabel, MatSnackBarModule, MatSnackBarRef, SimpleSnackBar, matSnackBarAnimations };
+export type { MatSnackBarDismiss, MatSnackBarHorizontalPosition, MatSnackBarVerticalPosition, TextOnlySnackBar };

package/snack-bar/testing/index.d.ts

@@ -60,4 +60,5 @@ declare class MatSnackBarHarness extends ContentContainerComponentHarness<string
     private _getActionButton;
 }
 
-export { MatSnackBarHarness, type SnackBarHarnessFilters };
+export { MatSnackBarHarness };
+export type { SnackBarHarnessFilters };

package/{core/tokens/m2/mat/_sort.scss → sort/_m2-sort.scss}

@@ -1,8 +1,8 @@
 @use 'sass:color';
 @use 'sass:meta';
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, sort);
@@ -53,8 +53,8 @@ $prefix: (mat, sort);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_sort.scss → sort/_m3-sort.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, sort);
@@ -14,5 +14,5 @@ $prefix: (mat, sort);
     arrow-color: map.get($systems, md-sys-color, on-surface),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/sort/_sort-theme.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../core/tokens/m2/mat/sort' as tokens-mat-sort;
+@use './m2-sort';
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/theming/theming';
@@ -20,9 +20,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-sort.$prefix,
-        tokens-mat-sort.get-color-tokens($theme)
-      );
+        m2-sort.$prefix, m2-sort.get-color-tokens($theme));
     }
   }
 }
@@ -33,9 +31,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-sort.$prefix,
-        tokens-mat-sort.get-typography-tokens($theme)
-      );
+        m2-sort.$prefix, m2-sort.get-typography-tokens($theme));
     }
   }
 }
@@ -46,9 +42,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-sort.$prefix,
-        tokens-mat-sort.get-density-tokens($theme)
-      );
+        m2-sort.$prefix, m2-sort.get-density-tokens($theme));
     }
   }
 }
@@ -57,8 +51,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-sort.$prefix,
-      tokens: tokens-mat-sort.get-token-slots(),
+      namespace: m2-sort.$prefix,
+      tokens: m2-sort.get-token-slots(),
     ),
   );
 }
@@ -92,8 +86,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-sort.$prefix,
-      map.get($tokens, tokens-mat-sort.$prefix)
+      m2-sort.$prefix,
+      map.get($tokens, m2-sort.$prefix)
     );
   }
 }

package/sort/index.d.ts

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
 import { Optional, OnDestroy, OnInit, AfterViewInit } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import { M as MatSortable, a as MatSort, S as SortHeaderArrowPosition } from '../sort.d-75ca592a.js';
-export { d as MAT_SORT_DEFAULT_OPTIONS, a as MatSort, c as MatSortDefaultOptions, M as MatSortable, b as Sort, S as SortHeaderArrowPosition } from '../sort.d-75ca592a.js';
-import { S as SortDirection } from '../sort-direction.d-2be5f588.js';
-export { S as SortDirection } from '../sort-direction.d-2be5f588.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatSortable, a as MatSort, S as SortHeaderArrowPosition } from '../sort.d-7718b3de.js';
+export { d as MAT_SORT_DEFAULT_OPTIONS, a as MatSort, c as MatSortDefaultOptions, M as MatSortable, b as Sort, S as SortHeaderArrowPosition } from '../sort.d-7718b3de.js';
+import { S as SortDirection } from '../sort-direction.d-52bce05e.js';
+export { S as SortDirection } from '../sort-direction.d-52bce05e.js';
 import { Subject } from 'rxjs';
 import '@angular/cdk/bidi';
 
@@ -160,4 +160,5 @@ declare const matSortAnimations: {
     readonly allowChildren: any;
 };
 
-export { type ArrowViewState, type ArrowViewStateTransition, MAT_SORT_HEADER_INTL_PROVIDER, MAT_SORT_HEADER_INTL_PROVIDER_FACTORY, MatSortHeader, MatSortHeaderIntl, MatSortModule, matSortAnimations };
+export { MAT_SORT_HEADER_INTL_PROVIDER, MAT_SORT_HEADER_INTL_PROVIDER_FACTORY, MatSortHeader, MatSortHeaderIntl, MatSortModule, matSortAnimations };
+export type { ArrowViewState, ArrowViewStateTransition };

package/sort/testing/index.d.ts

@@ -1,5 +1,5 @@
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
-import { S as SortDirection } from '../../sort-direction.d-2be5f588.js';
+import { S as SortDirection } from '../../sort-direction.d-52bce05e.js';
 
 interface SortHarnessFilters extends BaseHarnessFilters {
 }
@@ -44,4 +44,5 @@ declare class MatSortHarness extends ComponentHarness {
     getActiveHeader(): Promise<MatSortHeaderHarness | null>;
 }
 
-export { MatSortHarness, MatSortHeaderHarness, type SortHarnessFilters, type SortHeaderHarnessFilters };
+export { MatSortHarness, MatSortHeaderHarness };
+export type { SortHarnessFilters, SortHeaderHarnessFilters };