@angular/material 20.0.0-next.0 → 20.0.0-next.10

package/chips/testing/index.d.ts

@@ -1,31 +1,13 @@
-import { AsyncFactoryFn } from '@angular/cdk/testing';
-import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ComponentHarness } from '@angular/cdk/testing';
-import { ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { HarnessPredicate } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
-import { TestKey } from '@angular/cdk/testing';
+import * as _angular_cdk_testing from '@angular/cdk/testing';
+import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate, ContentContainerComponentHarness, TestKey } from '@angular/cdk/testing';
 
-export declare interface ChipAvatarHarnessFilters extends BaseHarnessFilters {
-}
-
-export declare interface ChipEditInputHarnessFilters extends BaseHarnessFilters {
-}
-
-export declare interface ChipGridHarnessFilters extends BaseHarnessFilters {
-    /** Only find instances which match the given disabled state. */
-    disabled?: boolean;
-}
-
-export declare interface ChipHarnessFilters extends BaseHarnessFilters {
+interface ChipHarnessFilters extends BaseHarnessFilters {
     /** Only find instances whose text matches the given value. */
     text?: string | RegExp;
     /** Only find instances which match the given disabled state. */
     disabled?: boolean;
 }
-
-export declare interface ChipInputHarnessFilters extends BaseHarnessFilters {
+interface ChipInputHarnessFilters extends BaseHarnessFilters {
     /** Filters based on the value of the input. */
     value?: string | RegExp;
     /** Filters based on the placeholder text of the input. */
@@ -33,28 +15,31 @@ export declare interface ChipInputHarnessFilters extends BaseHarnessFilters {
     /** Only find instances which match the given disabled state. */
     disabled?: boolean;
 }
-
-export declare interface ChipListboxHarnessFilters extends BaseHarnessFilters {
+interface ChipListboxHarnessFilters extends BaseHarnessFilters {
     /** Only find instances which match the given disabled state. */
     disabled?: boolean;
 }
-
-export declare interface ChipOptionHarnessFilters extends ChipHarnessFilters {
+interface ChipOptionHarnessFilters extends ChipHarnessFilters {
     /** Only find chip instances whose selected state matches the given value. */
     selected?: boolean;
 }
-
-export declare interface ChipRemoveHarnessFilters extends BaseHarnessFilters {
+interface ChipGridHarnessFilters extends BaseHarnessFilters {
+    /** Only find instances which match the given disabled state. */
+    disabled?: boolean;
 }
-
-export declare interface ChipRowHarnessFilters extends ChipHarnessFilters {
+interface ChipRowHarnessFilters extends ChipHarnessFilters {
 }
-
-export declare interface ChipSetHarnessFilters extends BaseHarnessFilters {
+interface ChipSetHarnessFilters extends BaseHarnessFilters {
+}
+interface ChipRemoveHarnessFilters extends BaseHarnessFilters {
+}
+interface ChipAvatarHarnessFilters extends BaseHarnessFilters {
+}
+interface ChipEditInputHarnessFilters extends BaseHarnessFilters {
 }
 
 /** Harness for interacting with a standard Material chip avatar in tests. */
-export declare class MatChipAvatarHarness extends ComponentHarness {
+declare class MatChipAvatarHarness extends ComponentHarness {
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a chip avatar with specific
@@ -65,44 +50,23 @@ export declare class MatChipAvatarHarness extends ComponentHarness {
     static with<T extends MatChipAvatarHarness>(this: ComponentHarnessConstructor<T>, options?: ChipAvatarHarnessFilters): HarnessPredicate<T>;
 }
 
-/** Harness for interacting with an editable chip's input in tests. */
-export declare class MatChipEditInputHarness extends ComponentHarness {
+/** Harness for interacting with a standard Material chip remove button in tests. */
+declare class MatChipRemoveHarness extends ComponentHarness {
     static hostSelector: string;
     /**
-     * Gets a `HarnessPredicate` that can be used to search for a chip edit input with specific
+     * Gets a `HarnessPredicate` that can be used to search for a chip remove with specific
      * attributes.
      * @param options Options for filtering which input instances are considered a match.
      * @return a `HarnessPredicate` configured with the given options.
      */
-    static with<T extends MatChipEditInputHarness>(this: ComponentHarnessConstructor<T>, options?: ChipEditInputHarnessFilters): HarnessPredicate<T>;
-    /** Sets the value of the input. */
-    setValue(value: string): Promise<void>;
-}
-
-/** Harness for interacting with a mat-chip-grid in tests. */
-export declare class MatChipGridHarness extends ComponentHarness {
-    static hostSelector: string;
-    /**
-     * Gets a `HarnessPredicate` that can be used to search for a chip grid with specific attributes.
-     * @param options Options for filtering which chip grid instances are considered a match.
-     * @return a `HarnessPredicate` configured with the given options.
-     */
-    static with<T extends MatChipGridHarness>(this: ComponentHarnessConstructor<T>, options?: ChipGridHarnessFilters): HarnessPredicate<T>;
-    /** Gets whether the chip grid is disabled. */
-    isDisabled(): Promise<boolean>;
-    /** Gets whether the chip grid is required. */
-    isRequired(): Promise<boolean>;
-    /** Gets whether the chip grid is invalid. */
-    isInvalid(): Promise<boolean>;
-    /** Gets promise of the harnesses for the chip rows. */
-    getRows(filter?: ChipRowHarnessFilters): Promise<MatChipRowHarness[]>;
-    /** Gets promise of the chip text input harness. */
-    getInput(filter?: ChipInputHarnessFilters): Promise<MatChipInputHarness | null>;
+    static with<T extends MatChipRemoveHarness>(this: ComponentHarnessConstructor<T>, options?: ChipRemoveHarnessFilters): HarnessPredicate<T>;
+    /** Clicks the remove button. */
+    click(): Promise<void>;
 }
 
 /** Harness for interacting with a mat-chip in tests. */
-export declare class MatChipHarness extends ContentContainerComponentHarness {
-    protected _primaryAction: AsyncFactoryFn<TestElement>;
+declare class MatChipHarness extends ContentContainerComponentHarness {
+    protected _primaryAction: _angular_cdk_testing.AsyncFactoryFn<_angular_cdk_testing.TestElement>;
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a chip with specific attributes.
@@ -129,7 +93,7 @@ export declare class MatChipHarness extends ContentContainerComponentHarness {
 }
 
 /** Harness for interacting with a grid's chip input in tests. */
-export declare class MatChipInputHarness extends ComponentHarness {
+declare class MatChipInputHarness extends ComponentHarness {
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a chip input with specific
@@ -167,8 +131,28 @@ export declare class MatChipInputHarness extends ComponentHarness {
     sendSeparatorKey(key: TestKey | string): Promise<void>;
 }
 
+/** Harness for interacting with a mat-chip-option in tests. */
+declare class MatChipOptionHarness extends MatChipHarness {
+    static hostSelector: string;
+    /**
+     * Gets a `HarnessPredicate` that can be used to search for a chip option with specific
+     * attributes.
+     * @param options Options for narrowing the search.
+     * @return a `HarnessPredicate` configured with the given options.
+     */
+    static with<T extends MatChipHarness>(this: ComponentHarnessConstructor<T>, options?: ChipOptionHarnessFilters): HarnessPredicate<T>;
+    /** Whether the chip is selected. */
+    isSelected(): Promise<boolean>;
+    /** Selects the given chip. Only applies if it's selectable. */
+    select(): Promise<void>;
+    /** Deselects the given chip. Only applies if it's selectable. */
+    deselect(): Promise<void>;
+    /** Toggles the selected state of the given chip. */
+    toggle(): Promise<void>;
+}
+
 /** Harness for interacting with a mat-chip-listbox in tests. */
-export declare class MatChipListboxHarness extends ComponentHarness {
+declare class MatChipListboxHarness extends ComponentHarness {
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a chip listbox with specific
@@ -198,42 +182,22 @@ export declare class MatChipListboxHarness extends ComponentHarness {
     selectChips(filter?: ChipOptionHarnessFilters): Promise<void>;
 }
 
-/** Harness for interacting with a mat-chip-option in tests. */
-export declare class MatChipOptionHarness extends MatChipHarness {
-    static hostSelector: string;
-    /**
-     * Gets a `HarnessPredicate` that can be used to search for a chip option with specific
-     * attributes.
-     * @param options Options for narrowing the search.
-     * @return a `HarnessPredicate` configured with the given options.
-     */
-    static with<T extends MatChipHarness>(this: ComponentHarnessConstructor<T>, options?: ChipOptionHarnessFilters): HarnessPredicate<T>;
-    /** Whether the chip is selected. */
-    isSelected(): Promise<boolean>;
-    /** Selects the given chip. Only applies if it's selectable. */
-    select(): Promise<void>;
-    /** Deselects the given chip. Only applies if it's selectable. */
-    deselect(): Promise<void>;
-    /** Toggles the selected state of the given chip. */
-    toggle(): Promise<void>;
-}
-
-/** Harness for interacting with a standard Material chip remove button in tests. */
-export declare class MatChipRemoveHarness extends ComponentHarness {
+/** Harness for interacting with an editable chip's input in tests. */
+declare class MatChipEditInputHarness extends ComponentHarness {
     static hostSelector: string;
     /**
-     * Gets a `HarnessPredicate` that can be used to search for a chip remove with specific
+     * Gets a `HarnessPredicate` that can be used to search for a chip edit input with specific
      * attributes.
      * @param options Options for filtering which input instances are considered a match.
      * @return a `HarnessPredicate` configured with the given options.
      */
-    static with<T extends MatChipRemoveHarness>(this: ComponentHarnessConstructor<T>, options?: ChipRemoveHarnessFilters): HarnessPredicate<T>;
-    /** Clicks the remove button. */
-    click(): Promise<void>;
+    static with<T extends MatChipEditInputHarness>(this: ComponentHarnessConstructor<T>, options?: ChipEditInputHarnessFilters): HarnessPredicate<T>;
+    /** Sets the value of the input. */
+    setValue(value: string): Promise<void>;
 }
 
 /** Harness for interacting with a mat-chip-row in tests. */
-export declare class MatChipRowHarness extends MatChipHarness {
+declare class MatChipRowHarness extends MatChipHarness {
     static hostSelector: string;
     /** Whether the chip is editable. */
     isEditable(): Promise<boolean>;
@@ -247,8 +211,29 @@ export declare class MatChipRowHarness extends MatChipHarness {
     getEditInput(filter?: ChipEditInputHarnessFilters): Promise<MatChipEditInputHarness>;
 }
 
+/** Harness for interacting with a mat-chip-grid in tests. */
+declare class MatChipGridHarness extends ComponentHarness {
+    static hostSelector: string;
+    /**
+     * Gets a `HarnessPredicate` that can be used to search for a chip grid with specific attributes.
+     * @param options Options for filtering which chip grid instances are considered a match.
+     * @return a `HarnessPredicate` configured with the given options.
+     */
+    static with<T extends MatChipGridHarness>(this: ComponentHarnessConstructor<T>, options?: ChipGridHarnessFilters): HarnessPredicate<T>;
+    /** Gets whether the chip grid is disabled. */
+    isDisabled(): Promise<boolean>;
+    /** Gets whether the chip grid is required. */
+    isRequired(): Promise<boolean>;
+    /** Gets whether the chip grid is invalid. */
+    isInvalid(): Promise<boolean>;
+    /** Gets promise of the harnesses for the chip rows. */
+    getRows(filter?: ChipRowHarnessFilters): Promise<MatChipRowHarness[]>;
+    /** Gets promise of the chip text input harness. */
+    getInput(filter?: ChipInputHarnessFilters): Promise<MatChipInputHarness | null>;
+}
+
 /** Harness for interacting with a mat-chip-set in tests. */
-export declare class MatChipSetHarness extends ComponentHarness {
+declare class MatChipSetHarness extends ComponentHarness {
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a chip set with specific attributes.
@@ -260,4 +245,5 @@ export declare class MatChipSetHarness extends ComponentHarness {
     getChips(filter?: ChipHarnessFilters): Promise<MatChipHarness[]>;
 }
 
-export { }
+export { MatChipAvatarHarness, MatChipEditInputHarness, MatChipGridHarness, MatChipHarness, MatChipInputHarness, MatChipListboxHarness, MatChipOptionHarness, MatChipRemoveHarness, MatChipRowHarness, MatChipSetHarness };
+export type { ChipAvatarHarnessFilters, ChipEditInputHarnessFilters, ChipGridHarnessFilters, ChipHarnessFilters, ChipInputHarnessFilters, ChipListboxHarnessFilters, ChipOptionHarnessFilters, ChipRemoveHarnessFilters, ChipRowHarnessFilters, ChipSetHarnessFilters };

package/common-module.d-C8xzHJDr.d.ts

@@ -0,0 +1,44 @@
+import * as i0 from '@angular/core';
+import { InjectionToken } from '@angular/core';
+import * as i1 from '@angular/cdk/bidi';
+
+/**
+ * Injection token that configures whether the Material sanity checks are enabled.
+ * @deprecated No longer used and will be removed.
+ * @breaking-change 21.0.0
+ */
+declare const MATERIAL_SANITY_CHECKS: InjectionToken<SanityChecks>;
+/**
+ * Possible sanity checks that can be enabled. If set to
+ * true/false, all checks will be enabled/disabled.
+ * @deprecated No longer used and will be removed.
+ * @breaking-change 21.0.0
+ */
+type SanityChecks = boolean | GranularSanityChecks;
+/**
+ * Object that can be used to configure the sanity checks granularly.
+ * @deprecated No longer used and will be removed.
+ * @breaking-change 21.0.0
+ */
+interface GranularSanityChecks {
+    doctype: boolean;
+    theme: boolean;
+    version: boolean;
+}
+/**
+ * Module that captures anything that should be loaded and/or run for *all* Angular Material
+ * components. This includes Bidi, etc.
+ *
+ * This module should be imported to each top-level component module (e.g., MatTabsModule).
+ * @deprecated No longer used and will be removed.
+ * @breaking-change 21.0.0
+ */
+declare class MatCommonModule {
+    constructor(...args: any[]);
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCommonModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatCommonModule, never, [typeof i1.BidiModule], [typeof i1.BidiModule]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MatCommonModule>;
+}
+
+export { MatCommonModule as M, MATERIAL_SANITY_CHECKS as a };
+export type { GranularSanityChecks as G, SanityChecks as S };

package/core/_core-theme.scss

@@ -8,12 +8,11 @@
 @use './style/sass-utils';
 @use './typography/typography';
 @use './tokens/token-utils';
-@use './tokens/m2/mat/app' as tokens-mat-app;
-@use './tokens/m2/mat/ripple' as tokens-mat-ripple;
-@use './tokens/m2/mat/option' as tokens-mat-option;
-@use './tokens/m2/mat/optgroup' as tokens-mat-optgroup;
-@use './tokens/m2/mat/full-pseudo-checkbox' as tokens-mat-full-pseudo-checkbox;
-@use './tokens/m2/mat/minimal-pseudo-checkbox' as tokens-mat-minimal-pseudo-checkbox;
+@use './m2-app';
+@use 'ripple/m2-ripple';
+@use 'option/m2-option';
+@use 'option/m2-optgroup';
+@use 'selection/pseudo-checkbox/m2-pseudo-checkbox';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -24,10 +23,8 @@
     @include optgroup-theme.base($theme);
     @include pseudo-checkbox-theme.base($theme);
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-app.$prefix, m2-app.get-unthemable-tokens());
     }
   }
 }
@@ -41,10 +38,8 @@
     @include optgroup-theme.color($theme);
     @include pseudo-checkbox-theme.color($theme);
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-app.$prefix, m2-app.get-color-tokens($theme));
     }
   }
 }
@@ -62,7 +57,7 @@
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
     @include option-theme.density($theme);
     @include optgroup-theme.density($theme);
@@ -72,28 +67,22 @@
 }
 
 @function _define-overrides() {
-  $app-tokens: tokens-mat-app.get-token-slots();
-  $ripple-tokens: tokens-mat-ripple.get-token-slots();
-  $option-tokens: tokens-mat-option.get-token-slots();
-  $optgroup-tokens: tokens-mat-optgroup.get-token-slots();
-  $full-pseudo-checkbox-tokens: tokens-mat-full-pseudo-checkbox.get-token-slots();
-  $minimal-pseudo-checkbox-tokens: tokens-mat-minimal-pseudo-checkbox.get-token-slots();
+  $app-tokens: m2-app.get-token-slots();
+  $ripple-tokens: m2-ripple.get-token-slots();
+  $option-tokens: m2-option.get-token-slots();
+  $optgroup-tokens: m2-optgroup.get-token-slots();
+  $pseudo-checkbox-tokens: m2-pseudo-checkbox.get-token-slots();
 
   @return (
-    (namespace: tokens-mat-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
-    (namespace: tokens-mat-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
-    (namespace: tokens-mat-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
-    (namespace: tokens-mat-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
+    (namespace: m2-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
+    (namespace: m2-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
+    (namespace: m2-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
+    (namespace: m2-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
     (
-      namespace: tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens: $full-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-full-'
+      namespace: m2-pseudo-checkbox.$prefix,
+      tokens: m2-pseudo-checkbox.get-token-slots(),
+      prefix: 'pseudo-checkbox-'
     ),
-    (
-      namespace: tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens: $minimal-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-minimal-'
-    )
   );
 }
 
@@ -128,35 +117,26 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-app-tokens: token-utils.get-tokens-for($tokens, tokens-mat-app.$prefix, $options...);
-  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, tokens-mat-ripple.$prefix, $options...);
-  $mat-option-tokens: token-utils.get-tokens-for($tokens, tokens-mat-option.$prefix, $options...);
+  $mat-app-tokens: token-utils.get-tokens-for($tokens, m2-app.$prefix, $options...);
+  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, m2-ripple.$prefix, $options...);
+  $mat-option-tokens: token-utils.get-tokens-for($tokens, m2-option.$prefix, $options...);
   $mat-optgroup-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-optgroup.$prefix,
-    $options...
-  );
-  $mat-full-pseudo-checkbox-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-full-pseudo-checkbox.$prefix,
+    m2-optgroup.$prefix,
     $options...
   );
-  $mat-minimal-pseudo-checkbox-tokens: token-utils.get-tokens-for(
+  $mat-pseudo-checkbox-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
+    m2-pseudo-checkbox.$prefix,
     $options...
   );
 
-  @include token-utils.create-token-values(tokens-mat-app.$prefix, $mat-app-tokens);
-  @include token-utils.create-token-values(tokens-mat-ripple.$prefix, $mat-ripple-tokens);
-  @include token-utils.create-token-values(tokens-mat-option.$prefix, $mat-option-tokens);
-  @include token-utils.create-token-values(tokens-mat-optgroup.$prefix, $mat-optgroup-tokens);
-  @include token-utils.create-token-values(
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $mat-full-pseudo-checkbox-tokens
-  );
+  @include token-utils.create-token-values(m2-app.$prefix, $mat-app-tokens);
+  @include token-utils.create-token-values(m2-ripple.$prefix, $mat-ripple-tokens);
+  @include token-utils.create-token-values(m2-option.$prefix, $mat-option-tokens);
+  @include token-utils.create-token-values(m2-optgroup.$prefix, $mat-optgroup-tokens);
   @include token-utils.create-token-values(
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $mat-minimal-pseudo-checkbox-tokens
+    m2-pseudo-checkbox.$prefix,
+    $mat-pseudo-checkbox-tokens
   );
 }

package/core/_core.scss

@@ -1,4 +1,4 @@
-@use './tokens/m2/mat/app' as tokens-mat-app;
+@use './m2-app';
 @use './tokens/token-utils';
 @use './style/elevation';
 
@@ -20,10 +20,10 @@
   // user's content isn't inside of a `mat-sidenav-container`.
   @at-root {
     // Note: we need to emit fallback values here to avoid errors in internal builds.
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       .mat-app-background {
-        @include token-utils.create-token-slot(background-color, background-color, transparent);
-        @include token-utils.create-token-slot(color, text-color, inherit);
+        background-color: token-utils.slot(background-color, transparent);
+        color: token-utils.slot(text-color, inherit);
       }
     }
   }
@@ -35,7 +35,7 @@
 // Material Design specification.
 @mixin elevation-classes() {
   @at-root {
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       // Provides external CSS classes for each elevation value. Each CSS class is formatted as
       // `mat-elevation-z$z-value` where `$z-value` corresponds to the z-space to which the element
       // is elevated.
@@ -44,7 +44,7 @@
         // We need the `mat-mdc-elevation-specific`, because some MDC mixins
         // come with elevation baked in and we don't have a way of removing it.
         .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
-          @include token-utils.create-token-slot(box-shadow, 'elevation-shadow-level-#{$z-value}',
+          box-shadow: token-utils.slot('elevation-shadow-level-#{$z-value}',
             none);
         }
       }

package/core/{tokens/m2/mat/_app.scss → _m2-app.scss}

@@ -1,8 +1,9 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
-@use '../../../style/elevation';
+@use './tokens/m2-utils';
+@use './theming/inspection';
+@use './style/sass-utils';
+@use './style/elevation';
+
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, app);
@@ -45,8 +46,8 @@ $prefix: (mat, app);
 @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/_app.scss → _m3-app.scss}

@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../../style/elevation';
-@use '../../token-definition';
+@use './style/elevation';
+@use './tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, app);
@@ -12,7 +12,6 @@ $prefix: (mat, app);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of custom tokens for the app
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $shadow-color: map.get($systems, md-sys-color, shadow);
   $tokens: (
     background-color: map.get($systems, md-sys-color, background),
     text-color: map.get($systems, md-sys-color, on-background),
@@ -20,6 +19,7 @@ $prefix: (mat, app);
 
   // If the shadow-color is an actual color, convert it to a box-shadow value. Otherwise
   // use the token value as itself (e,g. as a CSS var name).
+  $shadow-color: map.get($systems, md-sys-color, shadow);
   @if (meta.type-of($shadow-color) == color) {
     @for $zValue from 0 through 24 {
       $shadow: elevation.get-box-shadow($zValue, $shadow-color);
@@ -27,5 +27,5 @@ $prefix: (mat, app);
     }
   }
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/core/density/private/_all-density.scss

@@ -1,33 +1,33 @@
-@use '../../theming/inspection';
+@use '../../../autocomplete/autocomplete-theme';
+@use '../../../button-toggle/button-toggle-theme';
 @use '../../../button/button-theme';
-@use '../../../button/icon-button-theme';
 @use '../../../button/fab-theme';
+@use '../../../button/icon-button-theme';
+@use '../../../card/card-theme';
+@use '../../../checkbox/checkbox-theme';
+@use '../../../chips/chips-theme';
+@use '../../../core/core-theme';
+@use '../../../dialog/dialog-theme';
 @use '../../../expansion/expansion-theme';
-@use '../../../stepper/stepper-theme';
-@use '../../../toolbar/toolbar-theme';
-@use '../../../tree/tree-theme';
-@use '../../../paginator/paginator-theme';
 @use '../../../form-field/form-field-theme';
-@use '../../../button-toggle/button-toggle-theme';
-@use '../../../card/card-theme';
+@use '../../../input/input-theme';
+@use '../../../list/list-theme';
+@use '../../../menu/menu-theme';
+@use '../../../paginator/paginator-theme';
 @use '../../../progress-bar/progress-bar-theme';
 @use '../../../progress-spinner/progress-spinner-theme';
-@use '../../../tooltip/tooltip-theme';
-@use '../../../input/input-theme';
-@use '../../../autocomplete/autocomplete-theme';
-@use '../../../checkbox/checkbox-theme';
-@use '../../../core/core-theme';
+@use '../../../radio/radio-theme';
 @use '../../../select/select-theme';
-@use '../../../dialog/dialog-theme';
-@use '../../../chips/chips-theme';
 @use '../../../slide-toggle/slide-toggle-theme';
-@use '../../../radio/radio-theme';
 @use '../../../slider/slider-theme';
-@use '../../../menu/menu-theme';
-@use '../../../list/list-theme';
-@use '../../../tabs/tabs-theme';
 @use '../../../snack-bar/snack-bar-theme';
+@use '../../../stepper/stepper-theme';
 @use '../../../table/table-theme';
+@use '../../../tabs/tabs-theme';
+@use '../../../toolbar/toolbar-theme';
+@use '../../../tooltip/tooltip-theme';
+@use '../../../tree/tree-theme';
+@use '../../theming/inspection';
 
 // Includes all of the density styles.
 @mixin all-component-densities($theme) {
@@ -40,35 +40,35 @@
   // not possible as it would introduce a circular dependency for density because the `mat-core`
   // mixin that is transitively loaded by the `all-theme` file, imports `all-density` which
   // would then load `all-theme` again. This ultimately results a circular dependency.
-  @include form-field-theme.density($theme);
+  @include autocomplete-theme.density($theme);
+  @include button-theme.density($theme);
+  @include button-toggle-theme.density($theme);
   @include card-theme.density($theme);
+  @include checkbox-theme.density($theme);
+  @include chips-theme.density($theme);
+  @include core-theme.density($theme);
+  @include dialog-theme.density($theme);
+  @include expansion-theme.density($theme);
+  @include fab-theme.density($theme);
+  @include form-field-theme.density($theme);
+  @include icon-button-theme.density($theme);
+  @include input-theme.density($theme);
+  @include list-theme.density($theme);
+  @include menu-theme.density($theme);
+  @include paginator-theme.density($theme);
   @include progress-bar-theme.density($theme);
   @include progress-spinner-theme.density($theme);
-  @include tooltip-theme.density($theme);
-  @include input-theme.density($theme);
-  @include core-theme.density($theme);
+  @include radio-theme.density($theme);
   @include select-theme.density($theme);
-  @include checkbox-theme.density($theme);
-  @include autocomplete-theme.density($theme);
-  @include dialog-theme.density($theme);
-  @include chips-theme.density($theme);
   @include slide-toggle-theme.density($theme);
-  @include radio-theme.density($theme);
   @include slider-theme.density($theme);
-  @include menu-theme.density($theme);
-  @include list-theme.density($theme);
-  @include paginator-theme.density($theme);
-  @include tabs-theme.density($theme);
   @include snack-bar-theme.density($theme);
-  @include button-theme.density($theme);
-  @include icon-button-theme.density($theme);
-  @include fab-theme.density($theme);
-  @include table-theme.density($theme);
-  @include expansion-theme.density($theme);
   @include stepper-theme.density($theme);
+  @include table-theme.density($theme);
+  @include tabs-theme.density($theme);
   @include toolbar-theme.density($theme);
+  @include tooltip-theme.density($theme);
   @include tree-theme.density($theme);
-  @include button-toggle-theme.density($theme);
 }