fix: diff-gen - deprecation in sets not being detected

tools/diff-generator/src/lib/deprecated-token-detection.js

@@ -26,19 +26,53 @@ export default function detectDeprecatedTokens(renamedTokens, changes) {
   const possibleMistakenRevert = { ...changes.deleted };
   Object.keys(changes.added).forEach((token) => {
     if (
-      (token !== undefined && !deprecatedTokens[token].deprecated) ||
+      (token !== undefined && !isDeprecated(deprecatedTokens[token])) ||
       renamedTokens[token] !== undefined
     ) {
       delete deprecatedTokens[token];
     }
   });
   Object.keys(changes.deleted).forEach((token) => {
     const t = possibleMistakenRevert[token]; // a token marked as deleted
-    if (t === undefined || (typeof t !== "string" && !("deprecated" in t))) {
+    if (t === undefined || !wasUndeprecated(t)) {
       delete possibleMistakenRevert[token];
+    } else {
+      delete changes.deleted[token];
     }
   });
   result.deprecated = deprecatedTokens;
   result.reverted = possibleMistakenRevert;
   return result;
 }
+
+function isDeprecated(tokenObj) {
+  if (typeof tokenObj !== "object") {
+    return false;
+  } else if (tokenObj.deprecated) {
+    return true;
+  } else {
+    let result = false;
+
+    Object.keys(tokenObj).forEach((property) => {
+      result = result || isDeprecated(tokenObj[property]);
+    });
+
+    return result;
+  }
+}
+
+function wasUndeprecated(tokenObj) {
+  if (typeof tokenObj !== "object") {
+    return false;
+  } else if ("deprecated" in tokenObj && tokenObj.deprecated === undefined) {
+    return true;
+  } else {
+    let result = false;
+
+    Object.keys(tokenObj).forEach((property) => {
+      result = result || wasUndeprecated(tokenObj[property]);
+    });
+
+    return result;
+  }
+}

tools/diff-generator/test/addedToken.test.js

@@ -167,9 +167,6 @@ const expectedSeveralAddedSetTokens = {
         $schema:
           "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json",
         value: "{gray-800}",
-        deprecated: true,
-        deprecated_comment:
-          "Express will merge with Spectrum with the release of Spectrum 2.",
         uuid: "60caae29-d389-421e-a574-b26bcaeed3bf",
       },
     },

tools/diff-generator/test/test-schemas/added-set-tokens-out-of-order.json

@@ -78,8 +78,6 @@
       "express": {
         "$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json",
         "value": "{gray-800}",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2.",
         "uuid": "60caae29-d389-421e-a574-b26bcaeed3bf"
       }
     }