@ng-matero/extensions 17.3.5 → 18.0.1

package/core/tokens/_m3-tokens.scss

@@ -0,0 +1,350 @@
+@use 'sass:map';
+@use '@material/tokens/v0_161' as mdc-tokens;
+@use '@angular/material' as mat;
+@use './m3';
+@use '../tokens/m2' as m2-tokens;
+@use './density';
+@use './format-tokens';
+
+/// Generates tokens for the given palette with the given prefix.
+/// @param {Map} $palette The palette to generate tokens for
+/// @param {String} $prefix The key prefix used to name the tokens
+/// @return {Map} A set of tokens for the given palette
+@function _generate-palette-tokens($palette, $prefix) {
+  $palette: map.remove($palette, neutral, neutral-variant);
+  $result: ();
+  @each $hue, $value in $palette {
+    $result: map.set($result, '#{$prefix}#{$hue}', $value);
+  }
+  @return $result;
+}
+
+/// Creates a set of `md-ref-palette` tokens from the given palettes. (See
+/// https://github.com/material-components/material-components-web/blob/master/packages/mdc-tokens/v0_161/_md-ref-palette.scss)
+/// @param {Map} $primary The primary palette
+/// @param {Map} $secondary The secondary palette
+/// @param {Map} $tertiary The tertiary palette
+/// @param {Map} $error The error palette
+/// @return {Map} A set of `md-ref-palette` tokens
+@function _generate-ref-palette-tokens($primary, $tertiary, $error) {
+  @return mat.private-merge-all(
+      (black: #000, white: #fff),
+      _generate-palette-tokens($primary, primary),
+      _generate-palette-tokens(map.get($primary, secondary), secondary),
+      _generate-palette-tokens($tertiary, tertiary),
+      _generate-palette-tokens(map.get($primary, neutral), neutral),
+      _generate-palette-tokens(map.get($primary, neutral-variant), neutral-variant),
+      _generate-palette-tokens($error, error),
+  );
+}
+
+/// Creates a set of `md-ref-typeface` tokens from the given palettes. (See
+/// https://github.com/material-components/material-components-web/blob/master/packages/mdc-tokens/v0_161/_md-ref-typeface.scss)
+/// @param {List|String} $brand The font-family to use for brand text
+/// @param {List|String} $plain The font-family to use for plain text
+/// @param {String} $bold The font-weight to use for bold text
+/// @param {String} $medium The font-weight to use for medium text
+/// @param {String} $regular The font-weight to use for regular text
+/// @return {Map} A set of `md-ref-typeface` tokens
+@function _generate-ref-typeface-tokens($brand, $plain, $bold, $medium, $regular) {
+  @return (
+    brand: $brand,
+    plain: $plain,
+    weight-bold: $bold,
+    weight-medium: $medium,
+    weight-regular: $regular,
+  );
+}
+
+$_cached-token-slots: null;
+
+/// Determines the token slots for all components.
+@function _get-token-slots() {
+  // Cache the slots since they're constant and calculating
+  // them appears to be expensive (see #29009).
+  @if ($_cached-token-slots) {
+    @return $_cached-token-slots;
+  }
+
+  // TODO(mmalerba): Refactor this to not depend on the legacy theme when moving out of
+  //  material-experimental. This is a hack for now because there is no good way to get the token
+  //  slots in material-experimental without exposing them all from material.
+  $fake-theme: mat.m2-define-light-theme((
+    color: (
+      primary: mat.m2-define-palette(mat.$m2-red-palette),
+      accent: mat.m2-define-palette(mat.$m2-red-palette),
+      warn: mat.m2-define-palette(mat.$m2-red-palette),
+    ),
+    typography: mat.m2-define-typography-config(),
+    density: 0
+  ));
+  $_cached-token-slots: m2-tokens.m2-tokens-from-theme($fake-theme) !global;
+  @return $_cached-token-slots;
+}
+
+/// Generates a set of namespaced tokens for all components.
+/// @param {Map} $systems The MDC system tokens
+/// @param {Boolean} $include-non-systemized Whether to include non-systemized tokens
+/// @return {Map} A map of namespaced tokens
+@function _generate-tokens($systems, $include-non-systemized: false) {
+  $systems: map.merge((
+    md-sys-color: (),
+    md-sys-elevation: (),
+    md-sys-motion: (),
+    md-sys-shape: (),
+    md-sys-state: (),
+    md-sys-typescale: ()
+  ), $systems);
+  $exclude-hardcoded: not $include-non-systemized;
+
+  // DO NOT REMOVE
+  // This function is used internally.
+  $systems: format-tokens.private-format-tokens($systems);
+  $token-slots: _get-token-slots();
+
+  // TODO(mmalerba): Fill in remaining tokens.
+  $result: mat.private-deep-merge-all(
+    // Add the system color & typography tokens (so we can give users access via an API).
+    (
+      (mdc, theme): map.get($systems, md-sys-color),
+      (mdc, typography): map.get($systems, md-sys-typescale),
+    ),
+    m3.get-m3-tokens($systems, $exclude-hardcoded, $token-slots),
+  );
+
+  // Strip out tokens that are systemized by our made up density system.
+  @each $namespace, $tokens in $result {
+    @each $token, $value in $tokens {
+      @if density.is-systemized($namespace, $token) {
+        $tokens: map.remove($tokens, $token);
+      }
+    }
+    $result: map.set($result, $namespace, $tokens);
+  }
+  @return $result;
+}
+
+@function _get-sys-color($type, $ref) {
+  $mdc-sys-color: if($type == dark,
+    mdc-tokens.md-sys-color-values-dark($ref),
+    mdc-tokens.md-sys-color-values-light($ref));
+
+  @if (mat.$private-use-system-color-variables) {
+    @return (
+      'background': var(--sys-background),
+      'error': var(--sys-error),
+      'error-container': var(--sys-error-container),
+      'inverse-on-surface': var(--sys-inverse-on-surface),
+      'inverse-primary': var(--sys-inverse-primary),
+      'inverse-surface': var(--sys-inverse-surface),
+      'on-background': var(--sys-on-background),
+      'on-error': var(--sys-on-error),
+      'on-error-container': var(--sys-on-error-container),
+      'on-primary': var(--sys-on-primary),
+      'on-primary-container': var(--sys-on-primary-container),
+      'on-primary-fixed': var(--sys-on-primary-fixed),
+      'on-primary-fixed-variant': var(--sys-on-primary-fixed-variant),
+      'on-secondary': var(--sys-on-secondary),
+      'on-secondary-container': var(--sys-on-secondary-container),
+      'on-secondary-fixed': var(--sys-on-secondary-fixed),
+      'on-secondary-fixed-variant': var(--sys-on-secondary-fixed-variant),
+      'on-surface': var(--sys-on-surface),
+      'on-surface-variant': var(--sys-on-surface-variant),
+      'on-tertiary': var(--sys-on-tertiary),
+      'on-tertiary-container': var(--sys-on-tertiary-container),
+      'on-tertiary-fixed': var(--sys-on-tertiary-fixed),
+      'on-tertiary-fixed-variant': var(--sys-on-tertiary-fixed-variant),
+      'outline': var(--sys-outline),
+      'outline-variant': var(--sys-outline-variant),
+      'primary': var(--sys-primary),
+      'primary-container': var(--sys-primary-container),
+      'primary-fixed': var(--sys-primary-fixed),
+      'primary-fixed-dim': var(--sys-primary-fixed-dim),
+      'scrim': var(--sys-scrim),
+      'secondary': var(--sys-secondary),
+      'secondary-container': var(--sys-secondary-container),
+      'secondary-fixed': var(--sys-secondary-fixed),
+      'secondary-fixed-dim': var(--sys-secondary-fixed-dim),
+      'shadow': map.get($mdc-sys-color, shadow),
+      'surface': var(--sys-surface),
+      'surface-bright': var(--sys-surface-bright),
+      'surface-container': var(--sys-surface-container),
+      'surface-container-high': var(--sys-surface-container-high),
+      'surface-container-highest': var(--sys-surface-container-highest),
+      'surface-container-low': var(--sys-surface-container-low),
+      'surface-container-lowest': var(--sys-surface-container-lowest),
+      'surface-dim': var(--sys-surface-dim),
+      'surface-tint': var(--sys-surface-tint),
+      'surface-variant': var(--sys-surface-variant),
+      'tertiary': var(--sys-tertiary),
+      'tertiary-container': var(--sys-tertiary-container),
+      'tertiary-fixed': var(--sys-tertiary-fixed),
+      'tertiary-fixed-dim': var(--sys-tertiary-fixed-dim),
+    );
+  }
+
+  @return $mdc-sys-color;
+}
+
+@function _get-sys-typeface($ref) {
+  @if (mat.$private-use-system-typography-variables) {
+    @return (
+      'body-large': var(--sys-body-large),
+      'body-large-font': var(--sys-body-large-font),
+      'body-large-line-height': var(--sys-body-large-line-height),
+      'body-large-size': var(--sys-body-large-size),
+      'body-large-tracking': var(--sys-body-large-tracking),
+      'body-large-weight': var(--sys-body-large-weight),
+      'body-medium': var(--sys-body-medium),
+      'body-medium-font': var(--sys-body-medium-font),
+      'body-medium-line-height': var(--sys-body-medium-line-height),
+      'body-medium-size': var(--sys-body-medium-size),
+      'body-medium-tracking': var(--sys-body-medium-tracking),
+      'body-medium-weight': var(--sys-body-medium-weight),
+      'body-small': var(--sys-body-small),
+      'body-small-font': var(--sys-body-small-font),
+      'body-small-line-height': var(--sys-body-small-line-height),
+      'body-small-size': var(--sys-body-small-size),
+      'body-small-tracking': var(--sys-body-small-tracking),
+      'body-small-weight': var(--sys-body-small-weight),
+      'display-large': var(--sys-display-large),
+      'display-large-font': var(--sys-display-large-font),
+      'display-large-line-height': var(--sys-display-large-line-height),
+      'display-large-size': var(--sys-display-large-size),
+      'display-large-tracking': var(--sys-display-large-tracking),
+      'display-large-weight': var(--sys-display-large-weight),
+      'display-medium': var(--sys-display-medium),
+      'display-medium-font': var(--sys-display-medium-font),
+      'display-medium-line-height': var(--sys-display-medium-line-height),
+      'display-medium-size': var(--sys-display-medium-size),
+      'display-medium-tracking': var(--sys-display-medium-tracking),
+      'display-medium-weight': var(--sys-display-medium-weight),
+      'display-small': var(--sys-display-small),
+      'display-small-font': var(--sys-display-small-font),
+      'display-small-line-height': var(--sys-display-small-line-height),
+      'display-small-size': var(--sys-display-small-size),
+      'display-small-tracking': var(--sys-display-small-tracking),
+      'display-small-weight': var(--sys-display-small-weight),
+      'headline-large': var(--sys-headline-large),
+      'headline-large-font': var(--sys-headline-large-font),
+      'headline-large-line-height': var(--sys-headline-large-line-height),
+      'headline-large-size': var(--sys-headline-large-size),
+      'headline-large-tracking': var(--sys-headline-large-tracking),
+      'headline-large-weight': var(--sys-headline-large-weight),
+      'headline-medium': var(--sys-headline-medium),
+      'headline-medium-font': var(--sys-headline-medium-font),
+      'headline-medium-line-height': var(--sys-headline-medium-line-height),
+      'headline-medium-size': var(--sys-headline-medium-size),
+      'headline-medium-tracking': var(--sys-headline-medium-tracking),
+      'headline-medium-weight': var(--sys-headline-medium-weight),
+      'headline-small': var(--sys-headline-small),
+      'headline-small-font': var(--sys-headline-small-font),
+      'headline-small-line-height': var(--sys-headline-small-line-height),
+      'headline-small-size': var(--sys-headline-small-size),
+      'headline-small-tracking': var(--sys-headline-small-tracking),
+      'headline-small-weight': var(--sys-headline-small-weight),
+      'label-large': var(--sys-label-large),
+      'label-large-font': var(--sys-label-large-font),
+      'label-large-line-height': var(--sys-label-large-line-height),
+      'label-large-size': var(--sys-label-large-size),
+      'label-large-tracking': var(--sys-label-large-tracking),
+      'label-large-weight': var(--sys-label-large-weight),
+      'label-large-weight-prominent': var(--sys-label-large-weight-prominent),
+      'label-medium': var(--sys-label-medium),
+      'label-medium-font': var(--sys-label-medium-font),
+      'label-medium-line-height': var(--sys-label-medium-line-height),
+      'label-medium-size': var(--sys-label-medium-size),
+      'label-medium-tracking': var(--sys-label-medium-tracking),
+      'label-medium-weight': var(--sys-label-medium-weight),
+      'label-medium-weight-prominent': var(--sys-label-medium-weight-prominent),
+      'label-small': var(--sys-label-small),
+      'label-small-font': var(--sys-label-small-font),
+      'label-small-line-height': var(--sys-label-small-line-height),
+      'label-small-size': var(--sys-label-small-size),
+      'label-small-tracking': var(--sys-label-small-tracking),
+      'label-small-weight': var(--sys-label-small-weight),
+      'title-large': var(--sys-title-large),
+      'title-large-font': var(--sys-title-large-font),
+      'title-large-line-height': var(--sys-title-large-line-height),
+      'title-large-size': var(--sys-title-large-size),
+      'title-large-tracking': var(--sys-title-large-tracking),
+      'title-large-weight': var(--sys-title-large-weight),
+      'title-medium': var(--sys-title-medium),
+      'title-medium-font': var(--sys-title-medium-font),
+      'title-medium-line-height': var(--sys-title-medium-line-height),
+      'title-medium-size': var(--sys-title-medium-size),
+      'title-medium-tracking': var(--sys-title-medium-tracking),
+      'title-medium-weight': var(--sys-title-medium-weight),
+      'title-small': var(--sys-title-small),
+      'title-small-font': var(--sys-title-small-font),
+      'title-small-line-height': var(--sys-title-small-line-height),
+      'title-small-size': var(--sys-title-small-size),
+      'title-small-tracking': var(--sys-title-small-tracking),
+      'title-small-weight': var(--sys-title-small-weight),
+    );
+  }
+  @return mdc-tokens.md-sys-typescale-values($ref);
+}
+
+/// Generates a set of namespaced color tokens for all components.
+/// @param {String} $type The type of theme system (light or dark)
+/// @param {Map} $primary The primary palette
+/// @param {Map} $tertiary The tertiary palette
+/// @param {Map} $error The error palette
+/// @return {Map} A map of namespaced color tokens
+@function generate-color-tokens($type, $primary, $tertiary, $error) {
+  $ref: (
+    md-ref-palette: _generate-ref-palette-tokens($primary, $tertiary, $error)
+  );
+
+  $sys-color: _get-sys-color($type, $ref);
+
+  @return _generate-tokens(map.merge($ref, (
+    md-sys-color: $sys-color,
+    // Because the elevation values are always combined with color values to create the box shadow,
+    // elevation needs to be part of the color dimension.
+    md-sys-elevation: mdc-tokens.md-sys-elevation-values(),
+    // Because the state values are sometimes combined with color values to create rgba colors,
+    // state needs to be part of color dimension.
+    // TODO(mmalerba): If at some point we remove the need for these combined values, we can move
+    //  state to the base dimension.
+    md-sys-state: mdc-tokens.md-sys-state-values(),
+  )));
+}
+
+/// Generates a set of namespaced color tokens for all components.
+/// @param {String|List} $brand The brand font-family
+/// @param {String|List} $plain The plain fort-family
+/// @param {String|Number} $bold The bold font-weight
+/// @param {String|Number} $medium The medium font-weight
+/// @param {String|Number} $regular The regular font-weight
+/// @return {Map} A map of namespaced typography tokens
+@function generate-typography-tokens($brand, $plain, $bold, $medium, $regular) {
+  $ref: (
+    md-ref-typeface: _generate-ref-typeface-tokens($brand, $plain, $bold, $medium, $regular)
+  );
+
+  $sys-typeface: _get-sys-typeface($ref);
+
+  @return _generate-tokens((
+    md-sys-typescale: $sys-typeface
+  ));
+}
+
+/// Generates a set of namespaced density tokens for all components.
+/// @param {String|Number} $scale The regular font-weight
+/// @return {Map} A map of namespaced density tokens
+@function generate-density-tokens($scale) {
+  @return density.get-tokens-for-scale($scale);
+}
+
+/// Generates a set of namespaced tokens not related to color, typography, or density for all
+/// components.
+/// @return {Map} A map of namespaced tokens not related to color, typography, or density
+@function generate-base-tokens() {
+  // TODO(mmalerba): Exclude density tokens once implemented.
+  @return _generate-tokens((
+    md-sys-motion: mdc-tokens.md-sys-motion-values(),
+    md-sys-shape: mdc-tokens.md-sys-shape-values(),
+  ), $include-non-systemized: true);
+}

package/core/tokens/_token-utils.scss

@@ -1,17 +1,17 @@
 @use 'sass:list';
 @use 'sass:map';
+@use 'sass:meta';
 @use '@material/elevation/elevation-theme' as mdc-elevation-theme;
 @use '@material/theme/custom-properties' as mdc-custom-properties;
 @use '@material/theme/theme' as mdc-theme;
 @use '@material/theme/keys' as mdc-keys;
 @use '@angular/material' as mat;
-@use '../style/sass-utils';
 @use '../typography/typography';
 
 // Indicates whether we're building internally. Used for backwards compatibility.
 $private-is-internal-build: false;
 
-$_placeholder-color-palette: mat.define-palette(mat.$red-palette);
+$_placeholder-color-palette: mat.m2-define-palette(mat.$m2-red-palette);
 
 // Placeholder color config that can be passed to token getter functions when generating token
 // slots.
@@ -20,8 +20,8 @@ $placeholder-color-config: (
   accent: $_placeholder-color-palette,
   warn: $_placeholder-color-palette,
   is-dark: false,
-  foreground: mat.$light-theme-foreground-palette,
-  background: mat.$light-theme-background-palette,
+  foreground: mat.$m2-light-theme-foreground-palette,
+  background: mat.$m2-light-theme-background-palette,
 );
 
 $_placeholder-typography-level-config: typography.typography-config-level-from-mdc(body1);
@@ -190,7 +190,7 @@ $_component-prefix: null;
 /// @throws If given options are invalid
 /// @return {Map} The token values for the requested component.
 @function get-tokens-for($tokens, $prefix, $options...) {
-  $options: sass-utils.validate-keyword-args($options, (color-variant, emit-overrides-only));
+  $options: mat.private-validate-keyword-args($options, (color-variant, emit-overrides-only));
   @if $tokens == () {
     @return ();
   }
@@ -209,35 +209,149 @@ $_component-prefix: null;
   @return if($emit-overrides-only, $overrides, map.merge($values, $overrides));
 }
 
-/// Emits new token values for the given tokens.
-/// Verifies that the tokens passed in are valid tokens.
+/// Emits new token values for the given token overrides.
+/// Verifies that the overrides passed in are valid tokens.
 /// New token values are emitted under the current selector or root.
-@mixin batch-create-token-values(
-  $tokens: (),
-  $mat-prefix: '',
-  $mdc-prefix: '',
-  $mat-tokens: (),
-  $mdc-tokens: ()
-) {
-  $custom-mat-tokens: ();
-  $custom-mdc-tokens: ();
-
-  $mat-token-names: map.keys($mat-tokens);
-  $mdc-token-names: map.keys($mdc-tokens);
-  $valid-token-names: _get-valid-token-names($mat-tokens, $mdc-tokens);
-
-  @each $name, $value in $tokens {
-    $is-mat-token: list.index($mat-token-names, $name) != null;
-    $is-mdc-token: list.index($mdc-token-names, $name) != null;
-
-    @if ($is-mat-token) {
-      $custom-mat-tokens: map.set($custom-mat-tokens, $name, $value);
+@mixin batch-create-token-values($overrides: (), $token-maps...) {
+  @include _validate-token-overrides($overrides, $token-maps);
+
+  @each $token-map in $token-maps {
+    $prefix: map.get($token-map, prefix);
+    $tokens: map.get($token-map, tokens);
+
+    @each $name, $value in $tokens {
+      $tokens: map.set($tokens, $name, map.get($overrides, $name));
+    }
+
+    @include mat.private-current-selector-or-root() {
+      @include create-token-values($prefix, $tokens);
+    }
+  }
+}
+
+/// Gets the MDC tokens for the given prefix, M3 token values, and supported token slots.
+/// @param {List} $prefix The token prefix for the given tokens.
+/// @param {Map|(Map, Map)} $values A map of M3 token values for the given prefix.
+///  This param may also be a tuple of maps, the first one representing the default M3 token values,
+//   and the second containing overrides for different color variants.
+//   Single map example:
+//     (token1: green, token2: 2px)
+//   Tuple example:
+//     (
+//       (token1: green, token2: 2px),
+//       (
+//         secondary: (token1: blue),
+//         error: (token1: red),
+//       )
+//     )
+/// @param {Map} $slots A map of token slots, with null value indicating the token is not supported.
+/// @param {String|null} $variant The name of the variant the token values are for.
+/// @return {Map} A map of fully qualified token names to values, for only the supported tokens.
+@function namespace-tokens($prefix, $values, $slots, $variant: null) {
+  $result: ();
+  @if $variant == null and meta.type-of($values) == 'list' and list.length($values == 2) {
+    $variants: list.nth($values, 2);
+    $values: list.nth($values, 1);
+    @each $variant, $overrides in $variants {
+      $result: map.merge($result, namespace-tokens($prefix, $overrides, $slots, $variant));
+    }
+  }
+  $used-token-names: map.keys(_filter-nulls(map.get($slots, $prefix)));
+  $used-m3-tokens: _pick(_filter-nulls($values), $used-token-names);
+  $prefix: if($variant == null, $prefix, list.append($prefix, $variant));
+  @return map.merge($result, ($prefix: $used-m3-tokens));
+}
+
+/// Hardcode the given value, or null if hardcoded values are excluded.
+@function hardcode($value, $exclude-hardcoded) {
+  @return if($exclude-hardcoded, null, $value);
+}
+
+/// Sets all of the standard typography tokens for the given token base name to the given typography
+/// level.
+/// @param {Map} $systems The MDC system tokens
+/// @param {String} $base-name The token base name to get the typography tokens for
+/// @param {String} $typography-level The typography level to base the token values on
+/// @return {Map} A map containing the typography tokens for the given base token name
+@function generate-typography-tokens($systems, $base-name, $typography-level) {
+  $result: ();
+  @each $prop in (font, line-height, size, tracking, weight) {
+    $result: map.set($result, #{$base-name}-#{$prop},
+      map.get($systems, md-sys-typescale, #{$typography-level}-#{$prop}));
+  }
+  @return $result;
+}
+
+/// Maps the values in a map to new values using the given mapping function
+/// @param {Map} $map The maps whose values will be mapped to new values.
+/// @param {Function} $fn The value mapping function.
+/// @param {Map} A new map with its values updated using the mapping function.
+@function map-values($map, $fn) {
+  $result: ();
+  @each $key, $value in $map {
+    $result: map.set($result, $key, meta.call($fn, $value));
+  }
+  @return $result;
+}
+
+/// Renames the keys in a map
+/// @param {Map} $map The map whose keys should be renamed
+/// @param {Map} $rename-keys A map of original key to renamed key to apply to $map
+/// @return {Map} The result of applying the given key renames to the given map.
+@function rename-map-keys($map, $rename-keys) {
+  $result: $map;
+  @each $old-key-name, $new-key-name in $rename-keys {
+    @if map.has-key($map, $old-key-name) {
+      $result: map.set($result, $new-key-name, map.get($map, $old-key-name));
     }
+  }
+  @return $result;
+}
+
+/// At the time of writing, some color tokens (e.g. disabled state) are defined as a solid color
+/// token and a separate opacity token. This function applies the opacity to the color and drops the
+/// opacity key from the map. Can be removed once b/213331407 is resolved.
+/// @param {Map} $tokens The map of tokens currently being generated
+/// @param {Map} $all-tokens A map of all tokens, including hardcoded values
+/// @param {List} $pairs Pairs of color token names and their opacities. Should be in the shape of
+/// `((color: 'color-key', opacity: 'opacity-key'))`.
+/// @return {Map} The initial tokens with the combined color values.
+@function combine-color-tokens($tokens, $opacity-lookup, $pairs) {
+  $result: $tokens;
+
+  @each $pair in $pairs {
+    $color-key: map.get($pair, color);
+    $opacity-key: map.get($pair, opacity);
+    $color: map.get($tokens, $color-key);
+    $opacity: map.get($opacity-lookup, $opacity-key);
+
+    @if(meta.type-of($color) == 'color') {
+      $result: map.remove($result, $opacity-key);
+      $result: map.set($result, $color-key, rgba($color, $opacity));
+    }
+    @else if($color != null) {
+      $result: map.remove($result, $opacity-key);
+      $combined-color: #{color-mix(in srgb, #{$color} #{($opacity * 100) + '%'}, transparent)};
+      $result: map.set($result, $color-key, $combined-color);
+    }
+  }
+
+  @return $result;
+}
+
+/// Verifies that the token overrides exist and are used in one of the given token maps.
+@mixin _validate-token-overrides($overrides: (), $token-maps) {
+  $valid-token-names: ();
 
-    @if ($is-mdc-token) {
-      $custom-mdc-tokens: map.set($custom-mdc-tokens, $name, $value);
+  @each $token-map in $token-maps {
+    @each $name, $value in map.get($token-map, tokens) {
+      @if ($value != null and list.index($valid-token-names, $name) == null) {
+        $valid-token-names: list.append($valid-token-names, $name);
+      }
     }
+  }
 
+  @each $name in map.keys($overrides) {
     @if (list.index($valid-token-names, $name) == null) {
       @error (
         'Invalid token: "' + $name + '"'
@@ -245,22 +359,32 @@ $_component-prefix: null;
       );
     }
   }
+}
 
-  @include sass-utils.current-selector-or-root() {
-    @include create-token-values($mat-prefix, $custom-mat-tokens);
-    @include create-token-values($mdc-prefix, $custom-mdc-tokens);
+/// Picks a submap containing only the given keys out the given map.
+/// @param {Map} $map The map to pick from.
+/// @param {List} $keys The map keys to pick.
+/// @return {Map} A submap containing only the given keys.
+@function _pick($map, $keys) {
+  $result: ();
+  @each $key in $keys {
+    @if map.has-key($map, $key) {
+      $result: map.set($result, $key, map.get($map, $key));
+    }
   }
+  @return $result;
 }
 
-/// Returns the union of token names whose values are not null.
-@function _get-valid-token-names($mat-tokens, $mdc-tokens) {
-  $mat-and-mdc-tokens: map.merge($mat-tokens, $mdc-tokens);
 
-  @each $name, $value in $mat-and-mdc-tokens {
-    @if ($value == null) {
-      $mat-and-mdc-tokens: map.remove($mat-and-mdc-tokens, $name);
+/// Filters keys with a null value out of the map.
+/// @param {Map} $map The map to filter.
+/// @return {Map} The given map with all of the null keys filtered out.
+@function _filter-nulls($map) {
+  $result: ();
+  @each $key, $val in $map {
+    @if $val != null {
+      $result: map.set($result, $key, $val);
     }
   }
-
-  @return map.keys($mat-and-mdc-tokens);
+  @return $result;
 }

package/core/tokens/m2/_index.scss

@@ -1,7 +1,6 @@
 @use 'sass:map';
 @use 'sass:meta';
 @use '@angular/material' as mat;
-@use '../../style/sass-utils';
 @use './mtx/alert' as tokens-mtx-alert;
 @use './mtx/colorpicker' as tokens-mtx-colorpicker;
 @use './mtx/datetimepicker' as tokens-mtx-datetimepicker;
@@ -38,7 +37,7 @@
 /// @return {Map} The token map by calling the token getters in the given module with the given
 ///     Angular Material theme. Token names are fully-qualified.
 @function _get-tokens-for-module($theme, $module) {
-  $tokens: sass-utils.deep-merge-all(
+  $tokens: mat.private-deep-merge-all(
       _get-tokens-for-module-and-system($theme, $module, unthemable),
       _get-tokens-for-module-and-system($theme, $module, color),
       _get-tokens-for-module-and-system($theme, $module, typography),
@@ -55,7 +54,7 @@
 ///       )
 ///     )
 @function m2-tokens-from-theme($theme) {
-  @return sass-utils.deep-merge-all(
+  @return mat.private-deep-merge-all(
     _get-tokens-for-module($theme, tokens-mtx-alert),
     _get-tokens-for-module($theme, tokens-mtx-colorpicker),
     _get-tokens-for-module($theme, tokens-mtx-datetimepicker),

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

@@ -1,5 +1,4 @@
 @use '@angular/material' as mat;
-@use '../../../style/sass-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -55,7 +54,7 @@ $prefix: (mdc, plain-tooltip);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return sass-utils.deep-merge-all(
+  @return mat.private-deep-merge-all(
       get-unthemable-tokens(),
       get-color-tokens(token-utils.$placeholder-color-config),
       get-typography-tokens(token-utils.$placeholder-typography-config),