fix tests

mmalerba · mmalerba · commit 172357a251ad · 2023-08-24T22:27:40.000Z
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -143,5 +143,23 @@
         "resolveNestedSelectors": true
       }
     ]
-  }
+  },
+  "overrides": [
+    {
+      "files": [
+        "**/_card-theme.scss",
+        "**/_checkbox-theme.scss",
+        "**/_core-theme.scss",
+        "**/_form-field-theme.scss",
+        "**/_optgroup-theme.scss",
+        "**/_option-theme.scss",
+        "**/_progress-bar-theme.scss",
+        "**/_pseudo-checkbox-theme.scss",
+        "**/_ripple-theme.scss"
+      ],
+      "rules": {
+        "material/theme-mixin-api": false
+      }
+    }
+  ]
 }
diff --git a/src/material/card/_card-theme.scss b/src/material/card/_card-theme.scss
@@ -24,7 +24,7 @@
   }
 }
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   }
@@ -50,7 +50,7 @@
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   }
@@ -69,7 +69,7 @@
   }
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
   }
diff --git a/src/material/core/_core-theme.scss b/src/material/core/_core-theme.scss
@@ -1,4 +1,3 @@
-@use 'sass:map';
 @use './theming/theming';
 @use './theming/inspection';
 @use './style/private';
@@ -9,7 +8,7 @@
 @use './style/elevation';
 @use './typography/typography';
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   @include ripple-theme.color($theme);
   @include option-theme.color($theme);
   @include optgroup-theme.color($theme);
@@ -43,15 +42,15 @@
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   @include option-theme.typography($theme);
   @include optgroup-theme.typography($theme);
   @include pseudo-checkbox-theme.typography($theme);
   // TODO(mmalerba): add typography mixin for this.
   // @include ripple-theme.typography($config);
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
   @include option-theme.density($theme);
   @include optgroup-theme.density($theme);
   // TODO(mmalerba): add density mixins for these.
diff --git a/src/material/core/option/_optgroup-theme.scss b/src/material/core/option/_optgroup-theme.scss
@@ -6,21 +6,21 @@
 @use '../theming/inspection';
 @use '../typography/typography';
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
       tokens-mat-optgroup.get-color-tokens($theme));
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
       tokens-mat-optgroup.get-typography-tokens($theme));
   }
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
 }
 
 @mixin theme($theme-or-color-config) {
diff --git a/src/material/core/option/_option-theme.scss b/src/material/core/option/_option-theme.scss
@@ -1,14 +1,12 @@
-@use 'sass:map';
 @use '../tokens/m2/mat/option' as tokens-mat-option;
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 
 @use '../theming/theming';
 @use '../theming/inspection';
 @use '../typography/typography';
-@use '../mdc-helpers/mdc-helpers';
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-option.$prefix,
       tokens-mat-option.get-color-tokens($theme));
@@ -25,14 +23,14 @@
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-option.$prefix,
       tokens-mat-option.get-typography-tokens($theme));
   }
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
 }
 
 @mixin theme($theme-or-color-config) {
diff --git a/src/material/core/ripple/_ripple-theme.scss b/src/material/core/ripple/_ripple-theme.scss
@@ -1,10 +1,9 @@
-@use 'sass:map';
 @use 'sass:meta';
 @use '../theming/theming';
 @use '../theming/inspection';
 
 // Colors for the ripple elements.
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   $foreground-base: inspection.get-theme-color($theme, foreground, base);
   $color-opacity: 0.1;
 
diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss
@@ -1,4 +1,3 @@
-@use 'sass:map';
 @use '../../theming/theming';
 @use '../../theming/inspection';
 
@@ -20,7 +19,7 @@
   }
 }
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   $is-dark-theme: inspection.get-theme-type($theme) == dark;
   $primary: inspection.get-theme-color($theme, primary);
   $accent: inspection.get-theme-color($theme, accent);
@@ -73,7 +72,7 @@
   }
 }
 
-@mixin typography($theme) {}
+@mixin typography($config-or-theme) {}
 
 @mixin _density($theme) {}
 
diff --git a/src/material/core/theming/_m2-inspection.scss b/src/material/core/theming/_m2-inspection.scss
@@ -27,7 +27,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
   }
   $internal: map.get($theme, $_internals, m2-config);
   $theme: map.remove($theme, $_internals);
-  @return if(_is-error-theme($theme), $internal, $theme or $internal);
+  @return if(_is-error-theme($theme), $internal, $theme);
 }
 
 /// Gets the type of theme represented by a theme object (light or dark).
@@ -142,7 +142,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
     @return theming.get-typography-config($theme) != null;
   }
   @if $system == density {
-    @return theming.get-density-config($theme, $default: null) != null;
+    @return theming.get-density-config($theme) != null;
   }
   @error 'Valid systems are: base, color, typography, density. Got:' $system;
 }
diff --git a/src/material/core/theming/_theming.scss b/src/material/core/theming/_theming.scss
@@ -633,5 +633,5 @@ $_internals: _mat-theming-internals-do-not-access;
     }
     @return $value;
   }
-  @return ('ERROR': $message);
+  @return (ERROR: $message);
 }
diff --git a/src/material/core/theming/tests/test-css-variables-theme.scss b/src/material/core/theming/tests/test-css-variables-theme.scss
@@ -10,11 +10,13 @@
   $output: ();
 
   @each $key, $value in $palette {
-    @if (meta.type-of($value) == 'map') {
-      $output: map.merge(($key: _replace-all-values($value, $replacement)), $output);
-    }
-    @else {
-      $output: map.merge(($key: $replacement), $output);
+    @if $key != _mat-theming-internals-do-not-access {
+      @if (meta.type-of($value) == 'map') {
+        $output: map.merge(($key: _replace-all-values($value, $replacement)), $output);
+      }
+ @else {
+        $output: map.merge(($key: $replacement), $output);
+      }
     }
   }
 
diff --git a/src/material/core/tokens/m2/mat/_card.scss b/src/material/core/tokens/m2/mat/_card.scss
@@ -1,8 +1,5 @@
-@use 'sass:map';
 @use '../../token-utils';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
-@use '../../../typography/typography-utils';
 @use '../../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/core/tokens/m2/mat/_form-field.scss b/src/material/core/tokens/m2/mat/_form-field.scss
@@ -1,10 +1,8 @@
 @use 'sass:map';
 @use '../../token-utils';
 @use '../../../style/sass-utils';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../theming/palette';
-@use '../../../typography/typography-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, form-field);
diff --git a/src/material/core/tokens/m2/mat/_optgroup.scss b/src/material/core/tokens/m2/mat/_optgroup.scss
@@ -1,9 +1,6 @@
-@use 'sass:map';
 @use '../../token-utils';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
-@use '../../../typography/typography-utils';
 @use '../../../mdc-helpers/mdc-helpers';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/core/tokens/m2/mat/_option.scss b/src/material/core/tokens/m2/mat/_option.scss
@@ -1,9 +1,6 @@
-@use 'sass:map';
 @use '../../token-utils';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
-@use '../../../typography/typography-utils';
 @use '../../../mdc-helpers/mdc-helpers';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/core/tokens/m2/mdc/_elevated-card.scss b/src/material/core/tokens/m2/mdc/_elevated-card.scss
@@ -1,6 +1,4 @@
-@use 'sass:map';
 @use '../../../style/elevation';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
diff --git a/src/material/core/tokens/m2/mdc/_filled-text-field.scss b/src/material/core/tokens/m2/mdc/_filled-text-field.scss
@@ -1,10 +1,8 @@
 @use 'sass:color';
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
-@use '../../../typography/typography-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/core/tokens/m2/mdc/_linear-progress.scss b/src/material/core/tokens/m2/mdc/_linear-progress.scss
@@ -1,9 +1,7 @@
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 @use 'sass:color';
-@use 'sass:map';
 @use 'sass:meta';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/core/tokens/m2/mdc/_outlined-card.scss b/src/material/core/tokens/m2/mdc/_outlined-card.scss
@@ -1,6 +1,4 @@
-@use 'sass:map';
 @use '../../../style/elevation';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
diff --git a/src/material/core/tokens/m2/mdc/_outlined-text-field.scss b/src/material/core/tokens/m2/mdc/_outlined-text-field.scss
@@ -1,8 +1,6 @@
 @use 'sass:map';
-@use '../../../theming/theming';
 @use '../../../theming/inspection';
 @use '../../../style/sass-utils';
-@use '../../../typography/typography-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
diff --git a/src/material/form-field/_form-field-density.scss b/src/material/form-field/_form-field-density.scss
@@ -2,7 +2,6 @@
 @use 'sass:math';
 @use '@material/density' as mdc-density;
 @use '@material/textfield' as mdc-textfield;
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 
 @use './form-field-sizing';
diff --git a/src/material/form-field/_form-field-theme.scss b/src/material/form-field/_form-field-theme.scss
@@ -11,7 +11,7 @@
 @use '../core/tokens/token-utils';
 @use './form-field-density';
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
       tokens-mdc-filled-text-field.get-color-tokens($theme));
@@ -40,7 +40,7 @@
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
       tokens-mdc-filled-text-field.get-typography-tokens($theme));
@@ -51,7 +51,7 @@
   }
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
   @include form-field-density.private-form-field-density($theme);
 }
 
diff --git a/src/material/progress-bar/_progress-bar-theme.scss b/src/material/progress-bar/_progress-bar-theme.scss
@@ -30,7 +30,7 @@
   @include mdc-linear-progress-theme.theme($color-tokens);
 }
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   .mat-mdc-progress-bar {
     @include _palette-styles($theme, primary);
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-@mixin color($theme) {`
	`27`	`+@mixin color($config-or-theme) {`
`28`	`28`	`@if inspection.get-theme-version($theme) == 1 {`
`29`	`29`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));`
`30`	`30`	`}`
`@@ -50,7 +50,7 @@`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-@mixin typography($theme) {`
	`53`	`+@mixin typography($config-or-theme) {`
`54`	`54`	`@if inspection.get-theme-version($theme) == 1 {`
`55`	`55`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));`
`56`	`56`	`}`
`@@ -69,7 +69,7 @@`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-@mixin density($theme) {`
	`72`	`+@mixin density($config-or-theme) {`
`73`	`73`	`@if inspection.get-theme-version($theme) == 1 {`
`74`	`74`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,21 @@`
`6`	`6`	`@use '../theming/inspection';`
`7`	`7`	`@use '../typography/typography';`
`8`	`8`
`9`		`-@mixin color($theme) {`
	`9`	`+@mixin color($config-or-theme) {`
`10`	`10`	`@include sass-utils.current-selector-or-root() {`
`11`	`11`	`@include token-utils.create-token-values(tokens-mat-optgroup.$prefix,`
`12`	`12`	`tokens-mat-optgroup.get-color-tokens($theme));`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-@mixin typography($theme) {`
	`16`	`+@mixin typography($config-or-theme) {`
`17`	`17`	`@include sass-utils.current-selector-or-root() {`
`18`	`18`	`@include token-utils.create-token-values(tokens-mat-optgroup.$prefix,`
`19`	`19`	`tokens-mat-optgroup.get-typography-tokens($theme));`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-@mixin density($theme) {`
	`23`	`+@mixin density($config-or-theme) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@mixin theme($theme-or-color-config) {`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,12 @@`
`1`		`-@use 'sass:map';`
`2`	`1`	`@use '../tokens/m2/mat/option' as tokens-mat-option;`
`3`	`2`	`@use '../tokens/token-utils';`
`4`	`3`	`@use '../style/sass-utils';`
`5`	`4`
`6`	`5`	`@use '../theming/theming';`
`7`	`6`	`@use '../theming/inspection';`
`8`	`7`	`@use '../typography/typography';`
`9`		`-@use '../mdc-helpers/mdc-helpers';`
`10`	`8`
`11`		`-@mixin color($theme) {`
	`9`	`+@mixin color($config-or-theme) {`
`12`	`10`	`@include sass-utils.current-selector-or-root() {`
`13`	`11`	`@include token-utils.create-token-values(tokens-mat-option.$prefix,`
`14`	`12`	`tokens-mat-option.get-color-tokens($theme));`
`@@ -25,14 +23,14 @@`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`
`28`		`-@mixin typography($theme) {`
	`26`	`+@mixin typography($config-or-theme) {`
`29`	`27`	`@include sass-utils.current-selector-or-root() {`
`30`	`28`	`@include token-utils.create-token-values(tokens-mat-option.$prefix,`
`31`	`29`	`tokens-mat-option.get-typography-tokens($theme));`
`32`	`30`	`}`
`33`	`31`	`}`
`34`	`32`
`35`		`-@mixin density($theme) {`
	`33`	`+@mixin density($config-or-theme) {`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`@mixin theme($theme-or-color-config) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@use 'sass:map';`
`2`	`1`	`@use '../../theming/theming';`
`3`	`2`	`@use '../../theming/inspection';`
`4`	`3`
`@@ -20,7 +19,7 @@`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
`23`		`-@mixin color($theme) {`
	`22`	`+@mixin color($config-or-theme) {`
`24`	`23`	`$is-dark-theme: inspection.get-theme-type($theme) == dark;`
`25`	`24`	`$primary: inspection.get-theme-color($theme, primary);`
`26`	`25`	`$accent: inspection.get-theme-color($theme, accent);`
`@@ -73,7 +72,7 @@`
`73`	`72`	`}`
`74`	`73`	`}`
`75`	`74`
`76`		`-@mixin typography($theme) {}`
	`75`	`+@mixin typography($config-or-theme) {}`
`77`	`76`
`78`	`77`	`@mixin _density($theme) {}`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac`
`27`	`27`	`}`
`28`	`28`	`$internal: map.get($theme, $_internals, m2-config);`
`29`	`29`	`$theme: map.remove($theme, $_internals);`
`30`		`- @return if(_is-error-theme($theme), $internal, $theme or $internal);`
	`30`	`+ @return if(_is-error-theme($theme), $internal, $theme);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/// Gets the type of theme represented by a theme object (light or dark).`
`@@ -142,7 +142,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac`
`142`	`142`	`@return theming.get-typography-config($theme) != null;`
`143`	`143`	`}`
`144`	`144`	`@if $system == density {`
`145`		`- @return theming.get-density-config($theme, $default: null) != null;`
	`145`	`+ @return theming.get-density-config($theme) != null;`
`146`	`146`	`}`
`147`	`147`	`@error 'Valid systems are: base, color, typography, density. Got:' $system;`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -633,5 +633,5 @@ $_internals: _mat-theming-internals-do-not-access;`
`633`	`633`	`}`
`634`	`634`	`@return $value;`
`635`	`635`	`}`
`636`		`- @return ('ERROR': $message);`
	`636`	`+ @return (ERROR: $message);`
`637`	`637`	`}`