From a3a05e4179b99f8c9bbd33fac03b665e0c17a671 Mon Sep 17 00:00:00 2001 From: Elizabeth Mitchell Date: Wed, 17 Jan 2024 09:59:17 -0800 Subject: [PATCH] chore(tokens): rename `tokens/internal/values` `tokens/internal/validate` The naming is a bit backwards. The file is about validation and the function is for the token values, not a file just for token values. PiperOrigin-RevId: 599207580 --- tokens/_md-comp-assist-chip.scss | 4 ++-- tokens/_md-comp-checkbox.scss | 4 ++-- tokens/_md-comp-circular-progress.scss | 4 ++-- tokens/_md-comp-dialog.scss | 4 ++-- tokens/_md-comp-divider.scss | 4 ++-- tokens/_md-comp-elevated-button.scss | 4 ++-- tokens/_md-comp-elevated-card.scss | 4 ++-- tokens/_md-comp-elevation.scss | 4 ++-- tokens/_md-comp-fab-branded.scss | 4 ++-- tokens/_md-comp-fab.scss | 4 ++-- tokens/_md-comp-filled-button.scss | 4 ++-- tokens/_md-comp-filled-card.scss | 4 ++-- tokens/_md-comp-filled-field.scss | 4 ++-- tokens/_md-comp-filled-icon-button.scss | 4 ++-- tokens/_md-comp-filled-select.scss | 4 ++-- tokens/_md-comp-filled-text-field.scss | 4 ++-- tokens/_md-comp-filled-tonal-button.scss | 4 ++-- tokens/_md-comp-filled-tonal-icon-button.scss | 4 ++-- tokens/_md-comp-filter-chip.scss | 4 ++-- tokens/_md-comp-focus-ring.scss | 4 ++-- tokens/_md-comp-icon-button.scss | 4 ++-- tokens/_md-comp-icon.scss | 4 ++-- tokens/_md-comp-input-chip.scss | 4 ++-- tokens/_md-comp-item.scss | 4 ++-- tokens/_md-comp-linear-progress.scss | 4 ++-- tokens/_md-comp-list-item.scss | 4 ++-- tokens/_md-comp-list.scss | 4 ++-- tokens/_md-comp-menu-item.scss | 4 ++-- tokens/_md-comp-menu-list-item.scss | 4 ++-- tokens/_md-comp-menu.scss | 4 ++-- tokens/_md-comp-outlined-button.scss | 4 ++-- tokens/_md-comp-outlined-card.scss | 4 ++-- tokens/_md-comp-outlined-field.scss | 4 ++-- tokens/_md-comp-outlined-icon-button.scss | 4 ++-- .../_md-comp-outlined-segmented-button.scss | 4 ++-- tokens/_md-comp-outlined-select.scss | 4 ++-- tokens/_md-comp-outlined-text-field.scss | 4 ++-- tokens/_md-comp-primary-tab.scss | 4 ++-- tokens/_md-comp-radio.scss | 4 ++-- tokens/_md-comp-ripple.scss | 4 ++-- tokens/_md-comp-secondary-tab.scss | 4 ++-- tokens/_md-comp-slider.scss | 4 ++-- tokens/_md-comp-suggestion-chip.scss | 4 ++-- tokens/_md-comp-switch.scss | 4 ++-- tokens/_md-comp-text-button.scss | 4 ++-- tokens/_md-ref-palette.scss | 4 ++-- tokens/_md-ref-typeface.scss | 4 ++-- tokens/_md-sys-color.scss | 6 +++--- tokens/_md-sys-typescale.scss | 4 ++-- .../internal/{_values.scss => _validate.scss} | 20 +++++++++---------- 50 files changed, 109 insertions(+), 109 deletions(-) rename tokens/internal/{_values.scss => _validate.scss} (85%) diff --git a/tokens/_md-comp-assist-chip.scss b/tokens/_md-comp-assist-chip.scss index c1eaa5d5a..2feb4c1cc 100644 --- a/tokens/_md-comp-assist-chip.scss +++ b/tokens/_md-comp-assist-chip.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -86,7 +86,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-assist-chip.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-checkbox.scss b/tokens/_md-comp-checkbox.scss index ac7429695..475b922ff 100644 --- a/tokens/_md-comp-checkbox.scss +++ b/tokens/_md-comp-checkbox.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -90,7 +90,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-checkbox.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-circular-progress.scss b/tokens/_md-comp-circular-progress.scss index 025545562..ef37a2683 100644 --- a/tokens/_md-comp-circular-progress.scss +++ b/tokens/_md-comp-circular-progress.scss @@ -8,7 +8,7 @@ @use 'sass:math'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './v0_192/md-comp-circular-progress-indicator'; @@ -39,7 +39,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-circular-progress-indicator.values( $deps, $exclude-hardcoded-values diff --git a/tokens/_md-comp-dialog.scss b/tokens/_md-comp-dialog.scss index b7657cf93..32098fa7b 100644 --- a/tokens/_md-comp-dialog.scss +++ b/tokens/_md-comp-dialog.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -73,7 +73,7 @@ $unsupported-tokens: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-dialog.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-divider.scss b/tokens/_md-comp-divider.scss index 5d2222a53..44df9d3a2 100644 --- a/tokens/_md-comp-divider.scss +++ b/tokens/_md-comp-divider.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './v0_192/md-comp-divider'; // go/keep-sorted end @@ -21,7 +21,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - @return values.validate( + @return validate.values( md-comp-divider.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens ); diff --git a/tokens/_md-comp-elevated-button.scss b/tokens/_md-comp-elevated-button.scss index cda3380f1..aafca003e 100644 --- a/tokens/_md-comp-elevated-button.scss +++ b/tokens/_md-comp-elevated-button.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -77,7 +77,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-elevated-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-elevated-card.scss b/tokens/_md-comp-elevated-card.scss index 8ac54cc61..33d69e039 100644 --- a/tokens/_md-comp-elevated-card.scss +++ b/tokens/_md-comp-elevated-card.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -53,7 +53,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-elevated-card.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-elevation.scss b/tokens/_md-comp-elevation.scss index e2529ca1f..8e1086a63 100644 --- a/tokens/_md-comp-elevation.scss +++ b/tokens/_md-comp-elevation.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; // go/keep-sorted end @@ -29,5 +29,5 @@ $_default: ( 'level': map.get($deps, 'md-sys-elevation', 'level0'), 'shadow-color': map.get($deps, 'md-sys-color', 'shadow'), ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-fab-branded.scss b/tokens/_md-comp-fab-branded.scss index 1be0b1cd0..3794fe351 100644 --- a/tokens/_md-comp-fab-branded.scss +++ b/tokens/_md-comp-fab-branded.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -100,7 +100,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-fab-branded.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-fab.scss b/tokens/_md-comp-fab.scss index d0b959ccd..82bf7013b 100644 --- a/tokens/_md-comp-fab.scss +++ b/tokens/_md-comp-fab.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -234,7 +234,7 @@ $_default: ( @function values($deps: $_default, $exclude-hardcoded-values: false) { $tokens: md-comp-fab-surface.values($deps, $exclude-hardcoded-values); - $tokens: values.validate( + $tokens: validate.values( $tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-filled-button.scss b/tokens/_md-comp-filled-button.scss index 1dca161d8..3cc7e071b 100644 --- a/tokens/_md-comp-filled-button.scss +++ b/tokens/_md-comp-filled-button.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -77,7 +77,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-filled-card.scss b/tokens/_md-comp-filled-card.scss index 8976ff244..68a78a607 100644 --- a/tokens/_md-comp-filled-card.scss +++ b/tokens/_md-comp-filled-card.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -53,7 +53,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-card.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-filled-field.scss b/tokens/_md-comp-filled-field.scss index b90f58ba2..834ed5db1 100644 --- a/tokens/_md-comp-filled-field.scss +++ b/tokens/_md-comp-filled-field.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -249,5 +249,5 @@ $_default: ( // go/keep-sorted end ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-filled-icon-button.scss b/tokens/_md-comp-filled-icon-button.scss index 5bd1c407e..b78460f0b 100644 --- a/tokens/_md-comp-filled-icon-button.scss +++ b/tokens/_md-comp-filled-icon-button.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -65,7 +65,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-icon-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-filled-select.scss b/tokens/_md-comp-filled-select.scss index 0caec1175..82f157226 100644 --- a/tokens/_md-comp-filled-select.scss +++ b/tokens/_md-comp-filled-select.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -159,7 +159,7 @@ $_default: ( $original-tokens, _get-override-tokens($exclude-hardcoded-values) ); - $tokens: values.validate( + $tokens: validate.values( $original-tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-filled-text-field.scss b/tokens/_md-comp-filled-text-field.scss index db5ec3d53..215e3e12c 100644 --- a/tokens/_md-comp-filled-text-field.scss +++ b/tokens/_md-comp-filled-text-field.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -120,7 +120,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-text-field.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-filled-tonal-button.scss b/tokens/_md-comp-filled-tonal-button.scss index 80b2857a7..3af5e6aec 100644 --- a/tokens/_md-comp-filled-tonal-button.scss +++ b/tokens/_md-comp-filled-tonal-button.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -77,7 +77,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-tonal-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-filled-tonal-icon-button.scss b/tokens/_md-comp-filled-tonal-icon-button.scss index 7afc87e76..8025f250e 100644 --- a/tokens/_md-comp-filled-tonal-icon-button.scss +++ b/tokens/_md-comp-filled-tonal-icon-button.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -65,7 +65,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filled-tonal-icon-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-filter-chip.scss b/tokens/_md-comp-filter-chip.scss index fcf109aae..5719a11fe 100644 --- a/tokens/_md-comp-filter-chip.scss +++ b/tokens/_md-comp-filter-chip.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -128,7 +128,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-filter-chip.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-focus-ring.scss b/tokens/_md-comp-focus-ring.scss index 1034bfec4..0fdb2411f 100644 --- a/tokens/_md-comp-focus-ring.scss +++ b/tokens/_md-comp-focus-ring.scss @@ -8,7 +8,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-motion'; @use './md-sys-shape'; @@ -43,5 +43,5 @@ $_default: ( 'width': if($exclude-hardcoded-values, null, 3px), ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-icon-button.scss b/tokens/_md-comp-icon-button.scss index 439132a25..d51583f9e 100644 --- a/tokens/_md-comp-icon-button.scss +++ b/tokens/_md-comp-icon-button.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -54,7 +54,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-icon-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-icon.scss b/tokens/_md-comp-icon.scss index dcd2ddcc2..7b2636941 100644 --- a/tokens/_md-comp-icon.scss +++ b/tokens/_md-comp-icon.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; // go/keep-sorted end $supported-tokens: ( @@ -24,7 +24,7 @@ $supported-tokens: ( } @function values($exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( (), $supported-tokens: $supported-tokens, $new-tokens: _get-new-tokens($exclude-hardcoded-values) diff --git a/tokens/_md-comp-input-chip.scss b/tokens/_md-comp-input-chip.scss index 87cd876e1..b21984b84 100644 --- a/tokens/_md-comp-input-chip.scss +++ b/tokens/_md-comp-input-chip.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -116,7 +116,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-input-chip.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-item.scss b/tokens/_md-comp-item.scss index 502a70a04..5418b7de6 100644 --- a/tokens/_md-comp-item.scss +++ b/tokens/_md-comp-item.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-typescale'; @use './v0_192/md-comp-list'; @@ -83,5 +83,5 @@ $_default: ( // go/keep-sorted end ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-linear-progress.scss b/tokens/_md-comp-linear-progress.scss index a0a01de5b..cee7e04b8 100644 --- a/tokens/_md-comp-linear-progress.scss +++ b/tokens/_md-comp-linear-progress.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './v0_192/md-comp-linear-progress-indicator'; @@ -42,7 +42,7 @@ $unsupported-tokens: ( // TODO(b/275045611) may need to update based on resolution of design // for buffer and background animation. @function values($deps: $_default, $exclude-hardcoded-values: false) { - @return values.validate( + @return validate.values( md-comp-linear-progress-indicator.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-list-item.scss b/tokens/_md-comp-list-item.scss index 0d1c0b480..77f7a09e4 100644 --- a/tokens/_md-comp-list-item.scss +++ b/tokens/_md-comp-list-item.scss @@ -9,7 +9,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-state'; @use './md-sys-typescale'; @@ -128,7 +128,7 @@ $_default: ( @function values($deps: $_default, $exclude-hardcoded-values: false) { $original-tokens: md-comp-list.values($deps, $exclude-hardcoded-values); - $tokens: values.validate( + $tokens: validate.values( $original-tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-list.scss b/tokens/_md-comp-list.scss index d02203722..db4af91dd 100644 --- a/tokens/_md-comp-list.scss +++ b/tokens/_md-comp-list.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './v0_192/md-comp-list'; // go/keep-sorted end @@ -28,5 +28,5 @@ $_default: ( 'container-color': map.get($list-tokens, 'list-item-container-color'), ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-menu-item.scss b/tokens/_md-comp-menu-item.scss index 71cf5d824..62fa0eff9 100644 --- a/tokens/_md-comp-menu-item.scss +++ b/tokens/_md-comp-menu-item.scss @@ -9,7 +9,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -41,7 +41,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-menu.values($deps), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-menu-list-item.scss b/tokens/_md-comp-menu-list-item.scss index d77ec1005..091973be5 100644 --- a/tokens/_md-comp-menu-list-item.scss +++ b/tokens/_md-comp-menu-list-item.scss @@ -11,7 +11,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-state'; @use './md-sys-typescale'; @@ -130,7 +130,7 @@ $_default: ( @function values($deps: $_default, $exclude-hardcoded-values: false) { $original-tokens: md-comp-list.values($deps, $exclude-hardcoded-values); - $tokens: values.validate( + $tokens: validate.values( $original-tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-menu.scss b/tokens/_md-comp-menu.scss index 7a35bbed9..8df6fff9f 100644 --- a/tokens/_md-comp-menu.scss +++ b/tokens/_md-comp-menu.scss @@ -9,7 +9,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -41,7 +41,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-menu.values($deps), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-outlined-button.scss b/tokens/_md-comp-outlined-button.scss index 0825e5ec2..9c49f8210 100644 --- a/tokens/_md-comp-outlined-button.scss +++ b/tokens/_md-comp-outlined-button.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -73,7 +73,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-outlined-card.scss b/tokens/_md-comp-outlined-card.scss index 1cf0d4ba9..2bb58a8db 100644 --- a/tokens/_md-comp-outlined-card.scss +++ b/tokens/_md-comp-outlined-card.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -59,7 +59,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-card.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-outlined-field.scss b/tokens/_md-comp-outlined-field.scss index 853357155..de3b67022 100644 --- a/tokens/_md-comp-outlined-field.scss +++ b/tokens/_md-comp-outlined-field.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -224,5 +224,5 @@ $_default: ( // go/keep-sorted end ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-outlined-icon-button.scss b/tokens/_md-comp-outlined-icon-button.scss index 09d463bcf..4f8e466d9 100644 --- a/tokens/_md-comp-outlined-icon-button.scss +++ b/tokens/_md-comp-outlined-icon-button.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -58,7 +58,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-icon-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-outlined-segmented-button.scss b/tokens/_md-comp-outlined-segmented-button.scss index a281f4cac..213cb0a9a 100644 --- a/tokens/_md-comp-outlined-segmented-button.scss +++ b/tokens/_md-comp-outlined-segmented-button.scss @@ -6,7 +6,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -75,7 +75,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-segmented-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-outlined-select.scss b/tokens/_md-comp-outlined-select.scss index 7f222f770..b07b4dc8c 100644 --- a/tokens/_md-comp-outlined-select.scss +++ b/tokens/_md-comp-outlined-select.scss @@ -8,7 +8,7 @@ @use 'sass:string'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -137,7 +137,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-select.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-outlined-text-field.scss b/tokens/_md-comp-outlined-text-field.scss index ff18d1617..0a50b3edf 100644 --- a/tokens/_md-comp-outlined-text-field.scss +++ b/tokens/_md-comp-outlined-text-field.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-typescale'; @@ -111,7 +111,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-outlined-text-field.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/_md-comp-primary-tab.scss b/tokens/_md-comp-primary-tab.scss index bdec0c802..787757186 100644 --- a/tokens/_md-comp-primary-tab.scss +++ b/tokens/_md-comp-primary-tab.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -83,7 +83,7 @@ $_default: ( $exclude-hardcoded-values: $exclude-hardcoded-values ); - @return values.validate( + @return validate.values( $tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-radio.scss b/tokens/_md-comp-radio.scss index dc0b26222..4a0af49b1 100644 --- a/tokens/_md-comp-radio.scss +++ b/tokens/_md-comp-radio.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-state'; @use './v0_192/md-comp-radio-button'; @@ -52,7 +52,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-radio-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-ripple.scss b/tokens/_md-comp-ripple.scss index 82f2a03de..281711e7a 100644 --- a/tokens/_md-comp-ripple.scss +++ b/tokens/_md-comp-ripple.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -36,5 +36,5 @@ $_default: ( map.get($deps, 'md-sys-state', 'pressed-state-layer-opacity'), ); - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-comp-secondary-tab.scss b/tokens/_md-comp-secondary-tab.scss index ae7b4e5db..e64a709b9 100644 --- a/tokens/_md-comp-secondary-tab.scss +++ b/tokens/_md-comp-secondary-tab.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -83,7 +83,7 @@ $_default: ( $tokens: _add-missing-secondary-tokens($tokens); - $tokens: values.validate( + $tokens: validate.values( $tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-slider.scss b/tokens/_md-comp-slider.scss index 73404f6c8..af280bb00 100644 --- a/tokens/_md-comp-slider.scss +++ b/tokens/_md-comp-slider.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -88,7 +88,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-slider.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-suggestion-chip.scss b/tokens/_md-comp-suggestion-chip.scss index 68d2e6d26..c39bb17e9 100644 --- a/tokens/_md-comp-suggestion-chip.scss +++ b/tokens/_md-comp-suggestion-chip.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-elevation'; @use './md-sys-shape'; @@ -86,7 +86,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-suggestion-chip.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-switch.scss b/tokens/_md-comp-switch.scss index b07097a6b..c22a07fa4 100644 --- a/tokens/_md-comp-switch.scss +++ b/tokens/_md-comp-switch.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -97,7 +97,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-switch.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-comp-text-button.scss b/tokens/_md-comp-text-button.scss index e5eb48ce9..6dc82d08c 100644 --- a/tokens/_md-comp-text-button.scss +++ b/tokens/_md-comp-text-button.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-sys-color'; @use './md-sys-shape'; @use './md-sys-state'; @@ -66,7 +66,7 @@ $_default: ( ); @function values($deps: $_default, $exclude-hardcoded-values: false) { - $tokens: values.validate( + $tokens: validate.values( md-comp-text-button.values($deps, $exclude-hardcoded-values), $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens, diff --git a/tokens/_md-ref-palette.scss b/tokens/_md-ref-palette.scss index f91c72f76..0c985fb56 100644 --- a/tokens/_md-ref-palette.scss +++ b/tokens/_md-ref-palette.scss @@ -4,7 +4,7 @@ // // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './v0_192/md-ref-palette'; // go/keep-sorted end @@ -105,7 +105,7 @@ $supported-tokens: ( ); @function values($exclude-hardcoded-values: false) { - @return values.validate( + @return validate.values( md-ref-palette.values($exclude-hardcoded-values), $supported-tokens: $supported-tokens ); diff --git a/tokens/_md-ref-typeface.scss b/tokens/_md-ref-typeface.scss index 95018e3be..8c9275088 100644 --- a/tokens/_md-ref-typeface.scss +++ b/tokens/_md-ref-typeface.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './v0_192/md-ref-typeface'; // go/keep-sorted end @@ -42,5 +42,5 @@ $supported-tokens: ( } } - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-sys-color.scss b/tokens/_md-sys-color.scss index bb96e3547..49f579650 100644 --- a/tokens/_md-sys-color.scss +++ b/tokens/_md-sys-color.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-ref-palette'; @use './v0_192/md-sys-color'; // go/keep-sorted end @@ -89,7 +89,7 @@ $_default-dark: ( } } - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } $_default-light: ( @@ -115,5 +115,5 @@ $_default-light: ( } } - @return values.validate($tokens, $supported-tokens: $supported-tokens); + @return validate.values($tokens, $supported-tokens: $supported-tokens); } diff --git a/tokens/_md-sys-typescale.scss b/tokens/_md-sys-typescale.scss index 5c11dfbfd..ff57c85d3 100644 --- a/tokens/_md-sys-typescale.scss +++ b/tokens/_md-sys-typescale.scss @@ -7,7 +7,7 @@ @use 'sass:map'; // go/keep-sorted end // go/keep-sorted start -@use './internal/values'; +@use './internal/validate'; @use './md-ref-typeface'; @use './v0_192/md-sys-typescale'; // go/keep-sorted end @@ -141,7 +141,7 @@ $_default: ( } } - @return values.validate( + @return validate.values( $tokens, $supported-tokens: $supported-tokens, $unsupported-tokens: $unsupported-tokens diff --git a/tokens/internal/_values.scss b/tokens/internal/_validate.scss similarity index 85% rename from tokens/internal/_values.scss rename to tokens/internal/_validate.scss index c5184736d..b6a3b7bea 100644 --- a/tokens/internal/_values.scss +++ b/tokens/internal/_validate.scss @@ -14,7 +14,7 @@ /// Validation requires a `$values` Map and at least the `$supported-tokens` /// keyword argument. /// @example - scss -/// $tokens: values.validate( +/// $tokens: validate.values( /// md-comp-foo.values($deps, $exclude-hardcoded-values), /// $supported-tokens: (), /// 'foo-color', @@ -39,18 +39,18 @@ /// `$supported-tokens` list. /// @return {Map} The `tokens.md-comp-*-values()` Map with any unsupported /// tokens removed, renamed tokens updated, and new tokens added. -@function validate($values, $tokens...) { +@function values($values, $tokens...) { $tokens: meta.keywords($tokens); $renamed-tokens: map.get($tokens, 'renamed-tokens'); @if $renamed-tokens { @if meta.type-of($renamed-tokens) != 'map' { - @error 'values.validate($renamed-tokens) must be a map.'; + @error 'validate.values($renamed-tokens) must be a map.'; } @each $old-token, $new-token in $renamed-tokens { @if not map.has-key($values, $old-token) { - @error 'values.validate($renamed-tokens: (\'#{$old-token}\': \'#{$new-token}\')) old-token in not the provided values.'; + @error 'validate.values($renamed-tokens: (\'#{$old-token}\': \'#{$new-token}\')) old-token in not the provided values.'; } $values: map.set($values, $new-token, map.get($values, $old-token)); @@ -61,12 +61,12 @@ $unsupported-tokens: map.get($tokens, 'unsupported-tokens'); @if $unsupported-tokens { @if meta.type-of($unsupported-tokens) != 'list' { - @error 'values.validate($unsupported-tokens) must be a list.'; + @error 'validate.values($unsupported-tokens) must be a list.'; } @each $unsupported-token in $unsupported-tokens { @if not map.has-key($values, $unsupported-token) { - @error 'values.validate($unsupported-tokens: (\'#{$unsupported-token}\')) token is not in the provided values.'; + @error 'validate.values($unsupported-tokens: (\'#{$unsupported-token}\')) token is not in the provided values.'; } $values: map.remove($values, $unsupported-token); @@ -76,12 +76,12 @@ $new-tokens: map.get($tokens, 'new-tokens'); @if $new-tokens { @if meta.type-of($new-tokens) != 'map' { - @error 'values.validate($new-tokens) must be a map.'; + @error 'validate.values($new-tokens) must be a map.'; } @each $new-token, $new-value in $new-tokens { @if map.has-key($values, $new-token) { - @warn 'values.validate($new-tokens: (\'#{$new-token}\': \'#{$new-value}\')) already exists. Has it been added to tokens? If so, remove this new token.'; + @warn 'validate.values($new-tokens: (\'#{$new-token}\': \'#{$new-value}\')) already exists. Has it been added to tokens? If so, remove this new token.'; } $values: map.set($values, $new-token, $new-value); @@ -90,12 +90,12 @@ $supported-tokens: map.get($tokens, 'supported-tokens'); @if not $supported-tokens or meta.type-of($supported-tokens) != 'list' { - @error 'values.validate() must include a $supported-tokens list.'; + @error 'validate.values() must include a $supported-tokens list.'; } @each $token in map.keys($values) { @if list.index($supported-tokens, $token) == null { - @error 'values.validate($supported-tokens)) is missing the \'#{$token}\' token. Does it need adding to $unsupported-tokens?'; + @error 'validate.values($supported-tokens)) is missing the \'#{$token}\' token. Does it need adding to $unsupported-tokens?'; } }