@terrazzo/parser 0.0.15 → 0.0.17

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @terrazzo/parser
 
+## 0.0.17
+
+### Patch Changes
+
+- [#302](https://github.com/terrazzoapp/terrazzo/pull/302) [`d0a9df4`](https://github.com/terrazzoapp/terrazzo/commit/d0a9df43ccabd10ea338e12cbfcfbd7e00952d28) Thanks [@drwpow](https://github.com/drwpow)! - Fix parser bug with partialAliasOf that would lead to incorrect final values when aliasing
+
 ## 0.0.13
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/parser",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Parser/validator for the Design Tokens Community Group (DTCG) standard.",
   "type": "module",
   "author": {
@@ -39,7 +39,7 @@
     "picocolors": "^1.0.1",
     "wildcard-match": "^5.1.3",
     "yaml": "^2.5.0",
-    "@terrazzo/token-tools": "^0.0.8"
+    "@terrazzo/token-tools": "^0.0.9"
   },
   "devDependencies": {
     "esbuild": "^0.23.1",

package/parse/index.js

@@ -459,8 +459,8 @@ function applyAliases(token, { tokens, logger, filename, src, node }) {
           token.partialAliasOf = [];
         }
         const aliasOfID = resolveAlias(token.$value[i], { tokens, logger, filename, node, src });
-        const { mode: aliasMode } = parseAlias(token.$value[i]);
-        token.partialAliasOf[i] = aliasOfID;
+        const { id: aliasID, mode: aliasMode } = parseAlias(token.$value[i]);
+        token.partialAliasOf[i] = aliasID;
         token.$value[i] = tokens[aliasOfID].mode[aliasMode]?.$value || tokens[aliasOfID].$value;
       } else if (typeof token.$value[i] === 'object') {
         for (const property in token.$value[i]) {
@@ -472,9 +472,9 @@ function applyAliases(token, { tokens, logger, filename, src, node }) {
               token.partialAliasOf[i] = {};
             }
             const aliasOfID = resolveAlias(token.$value[i][property], { tokens, logger, filename, node, src });
-            const { mode: aliasMode } = parseAlias(token.$value[i][property]);
+            const { id: aliasID, mode: aliasMode } = parseAlias(token.$value[i][property]);
+            token.partialAliasOf[i][property] = aliasID; // also keep the shallow alias here, too!
             token.$value[i][property] = tokens[aliasOfID].mode[aliasMode]?.$value || tokens[aliasOfID].$value;
-            token.partialAliasOf[i][property] = aliasOfID;
           }
         }
       }
@@ -492,8 +492,8 @@ function applyAliases(token, { tokens, logger, filename, src, node }) {
           token.partialAliasOf = {};
         }
         const aliasOfID = resolveAlias(token.$value[property], { tokens, logger, filename, node, src });
-        const { mode: aliasMode } = parseAlias(token.$value[property]);
-        token.partialAliasOf[property] = aliasOfID;
+        const { id: aliasID, mode: aliasMode } = parseAlias(token.$value[property]);
+        token.partialAliasOf[property] = aliasID; // keep the shallow alias!
         token.$value[property] = tokens[aliasOfID].mode[aliasMode]?.$value || tokens[aliasOfID].$value;
       }
       // strokeStyle has an array within an object
@@ -507,8 +507,8 @@ function applyAliases(token, { tokens, logger, filename, src, node }) {
             if (!token.partialAliasOf[property]) {
               token.partialAliasOf[property] = [];
             }
-            const { mode: aliasMode } = parseAlias(token.$value[property][i]);
-            token.partialAliasOf[property][i] = aliasOfID;
+            const { id: aliasID, mode: aliasMode } = parseAlias(token.$value[property][i]);
+            token.partialAliasOf[property][i] = aliasID; // keep the shallow alias!
             token.$value[property][i] = tokens[aliasOfID].mode[aliasMode]?.$value || tokens[aliasOfID].$value;
           }
         }