remove theme mixin explicit normalization

Author: mmalerba

.stylelintrc.json

@@ -148,7 +148,6 @@
     {
       "files": [
         "**/_card-theme.scss",
-        "**/_checkbox-theme.scss",
         "**/_core-theme.scss",
         "**/_form-field-theme.scss",
         "**/_optgroup-theme.scss",

src/material/checkbox/_checkbox-theme.scss

@@ -8,7 +8,7 @@
 @use '../core/mdc-helpers/mdc-helpers';
 @use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
 
-@mixin base($theme) {
+@mixin base($config-or-theme) {
   @if inspection.get-theme-version($config-or-theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($config-or-theme, base));
   }
@@ -19,7 +19,7 @@
   }
 }
 
-@mixin color($theme) {
+@mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
 
   @if inspection.get-theme-version($config-or-theme) == 1 {
@@ -58,7 +58,7 @@
   }
 }
 
-@mixin typography($theme) {
+@mixin typography($config-or-theme) {
   $config: typography.private-typography-to-2018-config(
           theming.get-typography-config($config-or-theme));
 
@@ -79,7 +79,7 @@
   }
 }
 
-@mixin density($theme) {
+@mixin density($config-or-theme) {
   $density-scale: theming.get-density-config($config-or-theme);
 
   @if inspection.get-theme-version($config-or-theme) == 1 {

src/material/core/_core-theme.scss

@@ -59,8 +59,7 @@
 }
 
 // Mixin that renders all of the core styles that depend on the theme.
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
   // there won't be multiple warnings. e.g. if `mat-core-theme` reports a warning, then
   // the imported themes (such as `mat-ripple-theme`) should not report again.

src/material/core/option/_optgroup-theme.scss

@@ -23,8 +23,7 @@
 @mixin density($theme) {
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-optgroup') {
     @if inspection.theme-has($theme, color) {
       @include color($theme);

src/material/core/option/_option-theme.scss

@@ -33,21 +33,16 @@
 @mixin density($theme) {
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-option') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
     @if inspection.theme-has($theme, color) {
       @include color($theme);
     }
     @if inspection.theme-has($theme, density) {
-      @include density($density);
+      @include density($theme);
     }
     @if inspection.theme-has($theme, typography) {
-      @include typography($typography);
+      @include typography($theme);
     }
   }
 }

src/material/core/ripple/_ripple-theme.scss

@@ -20,8 +20,7 @@
   }
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-ripple') {
     @if inspection.theme-has($theme, color) {
       @include color($theme);

src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

@@ -76,8 +76,7 @@
 
 @mixin _density($theme) {}
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-pseudo-checkbox') {
     @if inspection.theme-has($theme, color) {
       @include color($theme);

src/material/core/theming/_m2-inspection.scss

@@ -137,12 +137,21 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
     @return true;
   }
   @if $system == color {
+    @if not theming.private-is-theme-object($theme) {
+      @return map.has-key($theme, primary);
+    }
     @return theming.get-color-config($theme) != null;
   }
   @if $system == typography {
+    @if not theming.private-is-theme-object($theme) {
+      @return map.has-key($theme, body-1);
+    }
     @return theming.get-typography-config($theme) != null;
   }
   @if $system == density {
+    @if not theming.private-is-theme-object($theme) {
+      @return $theme == minimum or $theme == maximum or meta.type-of($theme) == 'number';
+    }
     @return theming.get-density-config($theme) != null;
   }
   @error 'Valid systems are: base, color, typography, density. Got:' $system;

src/material/form-field/_form-field-theme.scss

@@ -55,8 +55,7 @@
   @include form-field-density.private-form-field-density($theme);
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field') {
     @if inspection.theme-has($theme, color) {
       @include color($theme);

src/material/progress-bar/_progress-bar-theme.scss

@@ -48,8 +48,7 @@
 
 @mixin density($theme) {}
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-progress-bar') {
     @include base($theme);
     @if inspection.theme-has($theme, color) {