@terrazzo/parser 0.0.16 → 0.0.18

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @terrazzo/parser
 
+## 0.0.18
+
+### Patch Changes
+
+- [#305](https://github.com/terrazzoapp/terrazzo/pull/305) [`9ce829c`](https://github.com/terrazzoapp/terrazzo/commit/9ce829c37c8a068f7d7157b615d4a00472c33156) Thanks [@drwpow](https://github.com/drwpow)! - Don’t log AST node on error
+
+## 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/logger.js

@@ -61,9 +61,7 @@ export default class Logger {
       return;
     }
     if (entry.node) {
-      const e = new TokensJSONError(message);
-      e.node = entry.node; // set node on instance, but don’t print to console in constructor
-      throw e;
+      throw new TokensJSONError(message);
     } else {
       throw new Error(message);
     }
@@ -130,9 +128,6 @@ export default class Logger {
 }
 
 export class TokensJSONError extends Error {
-  /** Erring JSON node */
-  node;
-
   constructor(message) {
     super(message);
     this.name = 'TokensJSONError';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/parser",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Parser/validator for the Design Tokens Community Group (DTCG) standard.",
   "type": "module",
   "author": {
@@ -30,15 +30,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@humanwhocodes/momoa": "^3.2.0",
+    "@humanwhocodes/momoa": "^3.2.1",
     "@types/babel__code-frame": "^7.0.6",
     "@types/culori": "^2.1.1",
     "culori": "^4.0.1",
     "is-what": "^4.1.16",
     "merge-anything": "^5.1.7",
-    "picocolors": "^1.0.1",
+    "picocolors": "^1.1.0",
     "wildcard-match": "^5.1.3",
-    "yaml": "^2.5.0",
+    "yaml": "^2.5.1",
     "@terrazzo/token-tools": "^0.0.9"
   },
   "devDependencies": {

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;
           }
         }