@terrazzo/parser 0.10.3 → 0.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/parser",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Parser/validator for the Design Tokens Community Group (DTCG) standard.",
   "license": "MIT",
   "type": "module",
@@ -34,9 +34,9 @@
     "directory": "./packages/parser/"
   },
   "dependencies": {
-    "@humanwhocodes/momoa": "^3.3.8",
+    "@humanwhocodes/momoa": "^3.3.9",
     "@types/babel__code-frame": "^7.0.6",
-    "@types/culori": "^4.0.0",
+    "@types/culori": "^4.0.1",
     "culori": "^4.0.2",
     "merge-anything": "^5.1.7",
     "picocolors": "^1.1.1",
@@ -45,7 +45,7 @@
     "@terrazzo/token-tools": "^0.10.3"
   },
   "devDependencies": {
-    "yaml-to-momoa": "^0.0.3"
+    "yaml-to-momoa": "^0.0.6"
   },
   "scripts": {
     "build": "rolldown -c && attw --profile esm-only --pack .",

package/src/lib/code-frame.ts

@@ -62,9 +62,9 @@ export interface Options {
  */
 function getMarkerLines(loc: NodeLocation, source: string[], opts: Options = {} as Options) {
   const startLoc = {
-    // @ts-ignore this is fine
+    // @ts-expect-error this is fine
     column: 0,
-    // @ts-ignore this is fine
+    // @ts-expect-error this is fine
     line: -1,
     ...loc.start,
   } as Location;

package/src/parse/index.ts

@@ -256,8 +256,18 @@ async function parseSingle(
         const inheritedTypeNode = computeInheritedProperty(node, '$type', { subpath, inherited: $typeInheritance });
         if (node.value.type === 'Object') {
           const $value = node.value.members.find((m) => m.name.type === 'String' && m.name.value === '$value');
-          if ($value && inheritedTypeNode?.value.type === 'String' && transform?.[inheritedTypeNode.value.value]) {
-            const result = transform[inheritedTypeNode.value.value]?.(evaluate(node.value), subpath.join('.'), node);
+
+          // Call transform using either inherited type or token-level type
+          let typeNode = inheritedTypeNode;
+          if (!typeNode) {
+            const local$type = node.value.members.find((m) => m.name.type === 'String' && m.name.value === '$type');
+            if (local$type) {
+              typeNode = local$type as MemberNode;
+            }
+          }
+
+          if ($value && typeNode?.value.type === 'String' && transform?.[typeNode.value.value]) {
+            const result = transform[typeNode.value.value]?.(evaluate(node.value), subpath.join('.'), node);
             if (result) {
               node.value = parseJSON(result).body;
             }