@terrazzo/parser 0.8.1 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/parser",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Parser/validator for the Design Tokens Community Group (DTCG) standard.",
   "license": "MIT",
   "type": "module",
@@ -42,7 +42,7 @@
     "picocolors": "^1.1.1",
     "scule": "^1.3.0",
     "wildcard-match": "^5.1.4",
-    "@terrazzo/token-tools": "^0.8.1"
+    "@terrazzo/token-tools": "^0.9.0"
   },
   "devDependencies": {
     "yaml-to-momoa": "^0.0.3"

package/src/build/index.ts

@@ -1,5 +1,5 @@
 import type { DocumentNode } from '@humanwhocodes/momoa';
-import { type TokenNormalized, isTokenMatch } from '@terrazzo/token-tools';
+import type { TokenNormalized } from '@terrazzo/token-tools';
 import wcmatch from 'wildcard-match';
 import Logger, { type LogEntry } from '../logger.js';
 import type { BuildRunnerResult, ConfigInit, TokenTransformed, TransformParams } from '../types.js';
@@ -55,6 +55,10 @@ export default async function build(
       logger.warn({ group: 'plugin', message: '"format" missing from getTransforms(), no tokens returned.' });
       return [];
     }
+
+    const tokenMatcher = params.id ? wcmatch(Array.isArray(params.id) ? params.id : [params.id]) : null;
+    const modeMatcher = params.mode ? wcmatch(params.mode) : null;
+
     return (formats[params.format!] ?? []).filter((token) => {
       if (params.$type) {
         if (typeof params.$type === 'string' && token.token.$type !== params.$type) {
@@ -63,14 +67,10 @@ export default async function build(
           return false;
         }
       }
-      if (
-        params.id &&
-        params.id !== '*' &&
-        !isTokenMatch(token.token.id, Array.isArray(params.id) ? params.id : [params.id])
-      ) {
+      if (params.id && params.id !== '*' && tokenMatcher && !tokenMatcher(token.token.id)) {
         return false;
       }
-      if (params.mode && !wcmatch(params.mode)(token.mode)) {
+      if (modeMatcher && !modeMatcher(token.mode)) {
         return false;
       }
       return true;

package/src/lint/plugin-core/rules/a11y-min-font-size.ts

@@ -1,4 +1,4 @@
-import { isTokenMatch } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -31,8 +31,10 @@ const rule: LintRule<typeof ERROR_TOO_SMALL, RuleA11yMinFontSizeOptions> = {
       throw new Error('Must specify at least one of minSizePx or minSizeRem');
     }
 
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
-      if (options.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
 

package/src/lint/plugin-core/rules/colorspace.ts

@@ -1,4 +1,5 @@
-import { type ColorValueNormalized, isTokenMatch } from '@terrazzo/token-tools';
+import type { ColorValueNormalized } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -37,9 +38,11 @@ const rule: LintRule<
       return;
     }
 
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
       // skip ignored tokens
-      if (options?.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
 

package/src/lint/plugin-core/rules/descriptions.ts

@@ -1,4 +1,4 @@
-import { isTokenMatch } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -23,8 +23,10 @@ const rule: LintRule<typeof ERROR_MISSING_DESCRIPTION, RuleDescriptionsOptions>
   },
   defaultOptions: {},
   create({ tokens, options, report }) {
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
-      if (options.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
       if (!t.$description) {

package/src/lint/plugin-core/rules/duplicate-values.ts

@@ -1,4 +1,5 @@
-import { isAlias, isTokenMatch } from '@terrazzo/token-tools';
+import { isAlias } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -25,9 +26,11 @@ const rule: LintRule<typeof ERROR_DUPLICATE_VALUE, RuleDuplicateValueOptions> =
   create({ report, tokens, options }) {
     const values: Record<string, Set<any>> = {};
 
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
       // skip ignored tokens
-      if (options.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
 

package/src/lint/plugin-core/rules/max-gamut.ts

@@ -1,5 +1,6 @@
-import { type ColorValueNormalized, isTokenMatch, tokenToCulori } from '@terrazzo/token-tools';
+import { type ColorValueNormalized, tokenToCulori } from '@terrazzo/token-tools';
 import { type Color, clampChroma } from 'culori';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -73,9 +74,11 @@ const rule: LintRule<
       throw new Error(`Unknown gamut "${options.gamut}". Options are "srgb", "p3", or "rec2020"`);
     }
 
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
       // skip ignored tokens
-      if (options.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
 

package/src/lint/plugin-core/rules/required-children.ts

@@ -1,4 +1,4 @@
-import { isTokenMatch } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -56,11 +56,13 @@ const rule: LintRule<
         throw new Error(`Match ${matchI}: must declare either \`requiredTokens: […]\` or \`requiredGroups: […]\``);
       }
 
+      const matcher = wcmatch(match);
+
       const matchGroups: string[] = [];
       const matchTokens: string[] = [];
       let tokensMatched = false;
       for (const t of Object.values(tokens)) {
-        if (!isTokenMatch(t.id, match)) {
+        if (!matcher(t.id)) {
           continue;
         }
         tokensMatched = true;

package/src/lint/plugin-core/rules/required-modes.ts

@@ -1,4 +1,4 @@
-import { isTokenMatch } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -41,9 +41,11 @@ const rule: LintRule<never, RuleRequiredModesOptions> = {
         throw new Error(`Match ${matchI}: must declare \`modes: […]\``);
       }
 
+      const matcher = wcmatch(match);
+
       let tokensMatched = false;
       for (const t of Object.values(tokens)) {
-        if (!isTokenMatch(t.id, match)) {
+        if (!matcher(t.id)) {
           continue;
         }
         tokensMatched = true;

package/src/lint/plugin-core/rules/required-typography-properties.ts

@@ -1,4 +1,4 @@
-import { isTokenMatch } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type { LintRule } from '../../../types.js';
 import { docsLink } from '../lib/docs.js';
 
@@ -28,8 +28,10 @@ const rule: LintRule<never, RuleRequiredTypographyPropertiesOptions> = {
       throw new Error(`"properties" can’t be empty`);
     }
 
+    const shouldIgnore = options.ignore ? wcmatch(options.ignore) : null;
+
     for (const t of Object.values(tokens)) {
-      if (options.ignore && isTokenMatch(t.id, options.ignore)) {
+      if (shouldIgnore?.(t.id)) {
         continue;
       }
 

package/src/parse/validate.ts

@@ -7,7 +7,8 @@ import {
   evaluate,
   print,
 } from '@humanwhocodes/momoa';
-import { type Token, type TokenNormalized, isAlias, isTokenMatch, splitID } from '@terrazzo/token-tools';
+import { type Token, type TokenNormalized, isAlias, splitID } from '@terrazzo/token-tools';
+import wcmatch from 'wildcard-match';
 import type Logger from '../logger.js';
 import type { ConfigInit } from '../types.js';
 import { getObjMembers, injectObjMembers } from './json.js';
@@ -858,7 +859,7 @@ export default function validateTokenNode(
   // point. However, if we are ignoring this token (or respecting
   // $deprecated, we can omit it from the output.
   const $deprecated = members.$deprecated && (evaluate(members.$deprecated) as string | boolean | undefined);
-  if ((config.ignore.deprecated && $deprecated) || (config.ignore.tokens && isTokenMatch(id, config.ignore.tokens))) {
+  if ((config.ignore.deprecated && $deprecated) || (config.ignore.tokens && wcmatch(config.ignore.tokens)(id))) {
     return;
   }