@terrazzo/parser 0.10.0 → 0.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/parser",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Parser/validator for the Design Tokens Community Group (DTCG) standard.",
   "license": "MIT",
   "type": "module",
@@ -37,12 +37,12 @@
     "@humanwhocodes/momoa": "^3.3.8",
     "@types/babel__code-frame": "^7.0.6",
     "@types/culori": "^4.0.0",
-    "culori": "^4.0.1",
+    "culori": "^4.0.2",
     "merge-anything": "^5.1.7",
     "picocolors": "^1.1.1",
     "scule": "^1.3.0",
     "wildcard-match": "^5.1.4",
-    "@terrazzo/token-tools": "^0.10.0"
+    "@terrazzo/token-tools": "^0.10.2"
   },
   "devDependencies": {
     "yaml-to-momoa": "^0.0.3"

package/src/build/index.ts

@@ -18,7 +18,11 @@ function validateTransformParams({
   params,
   logger,
   pluginName,
-}: { params: TokenTransformed; logger: Logger; pluginName: string }): void {
+}: {
+  params: TokenTransformed;
+  logger: Logger;
+  pluginName: string;
+}): void {
   const baseMessage: LogEntry = { group: 'plugin', label: pluginName, message: '' };
 
   // validate value is valid for SINGLE_VALUE or MULTI_VALUE

package/src/config.ts

@@ -48,7 +48,12 @@ function normalizeTokens({
   config,
   logger,
   cwd,
-}: { rawConfig: Config; config: ConfigInit; logger: Logger; cwd: URL }) {
+}: {
+  rawConfig: Config;
+  config: ConfigInit;
+  logger: Logger;
+  cwd: URL;
+}) {
   if (rawConfig.tokens === undefined) {
     config.tokens = [
       // @ts-ignore we’ll normalize in next step
@@ -89,7 +94,7 @@ function normalizeTokens({
     }
     try {
       config.tokens[i] = new URL(filepath, cwd);
-    } catch (err) {
+    } catch {
       logger.error({ group: 'config', label: 'tokens', message: `Invalid URL ${filepath}` });
     }
   }

package/src/index.ts

@@ -1,20 +1,3 @@
-export { default as build } from './build/index.js';
-export * from './build/index.js';
-
-export { default as defineConfig } from './config.js';
-export * from './config.js';
-
-export { default as lintRunner } from './lint/index.js';
-export * from './lint/index.js';
-
-export { default as Logger } from './logger.js';
-export * from './logger.js';
-
-export { default as parse } from './parse/index.js';
-export * from './parse/index.js';
-
-export * from './types.js';
-
 export type {
   AliasToken,
   AliasValue,
@@ -91,3 +74,20 @@ export type {
   TypographyValue,
   TypographyValueNormalized,
 } from '@terrazzo/token-tools';
+
+export * from './build/index.js';
+export { default as build } from './build/index.js';
+
+export * from './config.js';
+export { default as defineConfig } from './config.js';
+
+export * from './lint/index.js';
+export { default as lintRunner } from './lint/index.js';
+
+export * from './logger.js';
+export { default as Logger } from './logger.js';
+
+export * from './parse/index.js';
+export { default as parse } from './parse/index.js';
+
+export * from './types.js';

package/src/lint/index.ts

@@ -1,4 +1,4 @@
-import { type TokenNormalized, pluralize } from '@terrazzo/token-tools';
+import { pluralize, type TokenNormalized } from '@terrazzo/token-tools';
 import { merge } from 'merge-anything';
 import type { LogEntry, default as Logger } from '../logger.js';
 import type { ConfigInit } from '../types.js';

package/src/parse/alias.ts

@@ -2,14 +2,14 @@ import type { AnyNode, ArrayNode, ObjectNode } from '@humanwhocodes/momoa';
 import {
   type BorderTokenNormalized,
   type GradientTokenNormalized,
+  isAlias,
+  parseAlias,
   type ShadowTokenNormalized,
   type StrokeStyleTokenNormalized,
   type TokenNormalized,
   type TokenNormalizedSet,
   type TransitionTokenNormalized,
   type TypographyTokenNormalized,
-  isAlias,
-  parseAlias,
 } from '@terrazzo/token-tools';
 import type Logger from '../logger.js';
 import { getObjMembers } from './json.js';

package/src/parse/index.ts

@@ -1,5 +1,5 @@
-import { type DocumentNode, type MemberNode, type ObjectNode, evaluate } from '@humanwhocodes/momoa';
-import { type Token, type TokenNormalized, pluralize, splitID } from '@terrazzo/token-tools';
+import { type DocumentNode, evaluate, type MemberNode, type ObjectNode } from '@humanwhocodes/momoa';
+import { pluralize, splitID, type Token, type TokenNormalized } from '@terrazzo/token-tools';
 import type ytm from 'yaml-to-momoa';
 import lintRunner from '../lint/index.js';
 import Logger from '../logger.js';
@@ -7,11 +7,11 @@ import type { ConfigInit, InputSource } from '../types.js';
 import applyAliases from './alias.js';
 import { getObjMembers, parseJSON, replaceObjMembers, toMomoa, traverse } from './json.js';
 import normalize from './normalize.js';
-import validateTokenNode, { type Visitors, getInheritedType } from './validate.js';
+import validateTokenNode, { getInheritedType, type Visitors } from './validate.js';
 
 export * from './alias.js';
-export * from './normalize.js';
 export * from './json.js';
+export * from './normalize.js';
 export * from './validate.js';
 export { normalize, validateTokenNode };
 

package/src/parse/json.ts

@@ -2,11 +2,11 @@ import {
   type AnyNode,
   type DocumentNode,
   type MemberNode,
+  parse as momoaParse,
   type ObjectNode,
   type ParseOptions,
-  type ValueNode,
-  parse as momoaParse,
   print,
+  type ValueNode,
 } from '@humanwhocodes/momoa';
 import type yamlToMomoa from 'yaml-to-momoa';
 import type Logger from '../logger.js';

package/src/parse/normalize.ts

@@ -5,12 +5,12 @@ import {
   type FontFamilyValue,
   type GradientStopNormalized,
   type GradientValueNormalized,
+  isAlias,
+  parseColor,
   type ShadowValueNormalized,
   type Token,
   type TransitionValue,
   type TypographyValueNormalized,
-  isAlias,
-  parseColor,
 } from '@terrazzo/token-tools';
 
 export const FONT_WEIGHT_MAP = {

package/src/parse/validate.ts

@@ -1,13 +1,13 @@
 import {
   type AnyNode,
+  evaluate,
   type MemberNode,
   type ObjectNode,
+  print,
   type StringNode,
   type ValueNode,
-  evaluate,
-  print,
 } from '@humanwhocodes/momoa';
-import { type Token, type TokenNormalized, isAlias, splitID } from '@terrazzo/token-tools';
+import { isAlias, splitID, type Token, type TokenNormalized } from '@terrazzo/token-tools';
 import wcmatch from 'wildcard-match';
 import type Logger from '../logger.js';
 import type { ConfigInit } from '../types.js';
@@ -559,10 +559,12 @@ export function validateStrokeStyle($value: ValueNode, node: AnyNode, { filename
           } else {
             validateDimension(element.value, node, { logger, src });
           }
+        } else if (element.value.type === 'Object') {
+          validateDimension(element.value, node, { logger, src });
         } else {
           logger.error({
             ...baseMessage,
-            message: 'Expected array of strings, recieved some non-strings or empty strings.',
+            message: `Expected array of dimensions, received ${element.value.type}.`,
             node: element,
           });
         }