@atlaskit/codemod-cli 0.8.4 → 0.8.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/codemod-cli
 
+## 0.8.5
+
+### Patch Changes
+
+- [`e4dd80187f5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e4dd80187f5) - Refactors theme-to-tokens codemod with new token names + simplifies logic
+
 ## 0.8.4
 
 ### Patch Changes

package/dist/cjs/main.js

@@ -363,7 +363,7 @@ function _main() {
           case 4:
             _yield$parseArgs = _context5.sent;
             packages = _yield$parseArgs.packages;
-            _process$env$_PACKAGE = "0.8.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+            _process$env$_PACKAGE = "0.8.5", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
             logger.log(_chalk.default.bgBlue(_chalk.default.black("\uD83D\uDCDA Atlassian-Frontend codemod library @ ".concat(_PACKAGE_VERSION_, " \uD83D\uDCDA"))));
 
             if (packages && packages.length > 0) {

package/dist/cjs/presets/theme-to-design-tokens/theme-to-design-tokens.js

@@ -9,8 +9,6 @@ exports.default = transformer;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _colorToToken = _interopRequireDefault(require("./utils/color-to-token"));
-
 var _ast = require("./utils/ast");
 
 var _astMeta = require("./utils/ast-meta");
@@ -21,11 +19,10 @@ var _fuzzySearch = _interopRequireDefault(require("./utils/fuzzy-search"));
 
 var _legacyColors = require("./utils/legacy-colors");
 
-var _tokenNames = _interopRequireDefault(require("@atlaskit/tokens/token-names"));
+var _tokens = require("./utils/tokens");
 
 /* eslint-disable no-console */
-var tokens = Object.keys(_tokenNames.default);
-var search = (0, _fuzzySearch.default)(tokens, false);
+var search = (0, _fuzzySearch.default)(_tokens.tokens, false);
 
 function hasImportDeclaration(j, source, sourcePath) {
   return !!source.find(j.ImportDeclaration).filter(function (path) {
@@ -52,58 +49,25 @@ function insertTokenImport(j, source) {
   source.get().node.program.body.unshift(newImport);
 }
 
-function buildToken(j, tokenResult, node) {
-  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenResult.suggestion[0] || 'util.UNSAFE_MISSING_TOKEN'), tokenResult.fallbackNeeded && node].filter(Boolean));
-  callExpr.comments = [j.commentBlock(" [token-confidence: ".concat(tokenResult.confidence, "] "))];
+function buildToken(j, tokenId, node) {
+  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
   return callExpr;
 }
 
-function getTokenFromNode(j, path, debug, paletteColor) {
-  var baseMeta = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+function getTokenFromNode(j, path) {
+  var baseMeta = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var foundMeta = (0, _astMeta.getMetaFromAncestors)(j, path);
-  var propertyName = foundMeta.find(function (name) {
-    if (!name) {
-      return false;
-    }
-
-    return name.toLowerCase().match(/(.*color|image|fill|stroke|shadow|border(?!-)|background(?!-)|outline(?!-)|column-rule-color)/);
-  });
-  var state = 'resting';
-  foundMeta.find(function (name) {
-    if (!name) {
-      return false;
-    }
-
-    var result = /(hover|active|disabled)/.exec(name.toLowerCase());
-
-    if (result) {
-      if (result[0] === 'active') {
-        state = 'pressed';
-      } else {
-        state = result[0];
-      }
-
-      return true;
-    }
-
-    return false;
-  });
-  var tokenResult = (0, _colorToToken.default)(paletteColor || '', {
-    state: state,
-    propertyName: propertyName
-  }, function () {
-    var searchTerm = (0, _astMeta.cleanMeta)([].concat((0, _toConsumableArray2.default)(foundMeta), (0, _toConsumableArray2.default)(baseMeta))).join(' ');
-    var results = search.get(searchTerm);
-
-    if (results) {
-      return results.map(function (result) {
-        return result[1];
-      });
-    }
+  var meta = (0, _astMeta.cleanMeta)([].concat((0, _toConsumableArray2.default)(foundMeta), (0, _toConsumableArray2.default)(baseMeta)));
+  var results = search.get(meta.join(' '));
+  var tokenId = ['utility.UNSAFE_util.MISSING_TOKEN'];
+
+  if (results) {
+    tokenId = results.map(function (result) {
+      return result[1];
+    });
+  }
 
-    return [];
-  });
-  return tokenResult;
+  return tokenId[0];
 }
 
 function transformer(file, api) {
@@ -121,7 +85,7 @@ function transformer(file, api) {
     insertTokenImport(j, source);
     var key = path.value.property.type === 'Identifier' ? path.value.property.name : undefined;
     var colorMeta = _legacyColors.legacyColorMetaMap[key] || [];
-    var tokenId = getTokenFromNode(j, path, debug, key, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
@@ -136,7 +100,7 @@ function transformer(file, api) {
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     var colorMeta = _legacyColors.legacyColorMetaMap[valuePath.name] || [];
-    var tokenId = getTokenFromNode(j, valuePath, debug, valuePath.name, colorMeta);
+    var tokenId = getTokenFromNode(j, valuePath, colorMeta);
     j(path).replaceWith(j.objectProperty(path.value.key, buildToken(j, tokenId, valuePath.value)));
     transformed = true;
   });
@@ -152,7 +116,7 @@ function transformer(file, api) {
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     var colorMeta = _legacyColors.legacyColorMetaMap[path.value.name] || [];
-    var tokenId = getTokenFromNode(j, path, debug, path.value.name, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
@@ -167,7 +131,7 @@ function transformer(file, api) {
     insertTokenImport(j, source);
     var value = path === null || path === void 0 ? void 0 : (_path$value = path.value) === null || _path$value === void 0 ? void 0 : (_path$value$value = _path$value.value) === null || _path$value$value === void 0 ? void 0 : _path$value$value.toString();
     var colorMeta = _legacyColors.legacyColorMetaMap[value] || [];
-    var tokenId = getTokenFromNode(j, path, debug, value, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     var tokenNode = buildToken(j, tokenId, path.value);
     j(path).replaceWith((0, _ast.isDecendantOfType)(j, path, j.JSXAttribute) ? j.jsxExpressionContainer(tokenNode) : tokenNode);
     transformed = true;

package/dist/cjs/presets/theme-to-design-tokens/utils/ast-meta.js

@@ -7,27 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cleanMeta = cleanMeta;
 exports.getMetaFromAncestors = getMetaFromAncestors;
-exports.getUniqueWordsFromTokens = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _tokenNames = _interopRequireDefault(require("@atlaskit/tokens/token-names"));
-
-var tokens = Object.keys(_tokenNames.default);
-var getUniqueWordsFromTokens = tokens.reduce(function (accum, val) {
-  return [].concat((0, _toConsumableArray2.default)(accum), (0, _toConsumableArray2.default)(val.split('.')));
-}, []).reduce(function (accum, val) {
-  return [].concat((0, _toConsumableArray2.default)(accum), (0, _toConsumableArray2.default)(val.split(/(?=[A-Z])/g).map(function (e) {
-    return e.toLowerCase();
-  })));
-}, []).reduce(function (accum, val) {
-  if (!accum.includes(val)) {
-    accum.push(val);
-  }
-
-  return accum;
-}, []);
-exports.getUniqueWordsFromTokens = getUniqueWordsFromTokens;
+var _tokens = require("./tokens");
 
 function getMetaFromAncestors(j, path) {
   var meta = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
@@ -53,15 +36,16 @@ function getMetaFromAncestors(j, path) {
     var quasi = grandParent.value.quasis[expressionIndex];
     var propertyName = (quasi.value.cooked || quasi.value.raw || '').replace(/\n/g, '').split(/;|{|}/).filter(function (el) {
       return !el.match(/\.|\@|\(|\)/);
-    }).pop().replace(/:/g, '').trim();
+    }).pop().split(/:/g)[0].trim();
     grandParent.value.quasis.slice(0, expressionIndex + 1).map(function (q) {
       return q.value.cooked;
     }) // We reverse so the most nested one is first which we're more likely than not interested in
-    .reverse().forEach(function (str) {
+    .reverse().some(function (str) {
       var result = /(hover|active|disabled|focus)/.exec(str.toLowerCase());
 
       if (result) {
         meta.push(result[0]);
+        return true;
       }
     });
     meta.push(propertyName);
@@ -90,10 +74,10 @@ function cleanMeta(meta) {
       return e.toLowerCase();
     }) : []));
   }, []).reduce(function (accum, val) {
-    accum.push(val.replace(/:/g, '').replace(/,/g, '').replace('grey', 'neutral').replace('texts', 'text').replace('error', 'danger').replace('invalid', 'danger').replace('removed', 'danger').replace('removal', 'danger').replace('remove', 'danger').replace('valid', 'success').replace('successful', 'success').replace('risk', 'warning').replace('primary', 'bold').replace('info', 'bold').replace('secondary', 'subtle').replace('hyperlink', 'link').replace('focused', 'focus').replace('active', 'pressed').replace('hovered', 'hover').replace('background-color', 'background').replace('color', 'text').replace('stroke', 'border').replace('border-left', 'border').replace('border-right', 'border').replace('box-shadow', 'shadow'));
+    accum.push(val.replace(/:/g, '').replace(/,/g, '').replace('grey', 'neutral').replace('skeleton', 'neutral').replace('texts', 'text').replace('red', 'danger').replace('error', 'danger').replace('invalid', 'danger').replace('removed', 'danger').replace('removal', 'danger').replace('remove', 'danger').replace('focus', 'focused').replace('valid', 'success').replace('successful', 'success').replace('risk', 'warning').replace('caution', 'warning').replace('warn', 'warning').replace('primary', 'bold').replace('info', 'bold').replace('secondary', 'subtle').replace('hyperlink', 'link').replace('anchor', 'link').replace('active', 'pressed').replace('hover', 'hovered').replace('dragged', 'overlay').replace('dragging', 'overlay').replace('drag', 'overlay').replace('background-color', 'background').replace('color', 'text').replace('icons', 'icon').replace('glyph', 'icon').replace('stroke', 'border').replace('border-left', 'border').replace('border-right', 'border').replace('border-top', 'border').replace('border-bottom', 'border').replace('box-shadow', 'shadow'));
     return accum;
   }, []).filter(function (val) {
-    return getUniqueWordsFromTokens.includes(val);
+    return _tokens.getUniqueWordsFromTokens.includes(val);
   }).reduce(function (accum, val) {
     if (!accum.includes(val)) {
       accum.push(val);

package/dist/cjs/presets/theme-to-design-tokens/utils/legacy-colors.js

@@ -51,10 +51,12 @@ var legacyColorMetaMap = {
   T300: ['accent', 'teal'],
   T400: ['accent', 'teal'],
   T500: ['accent', 'teal'],
-  N0: ['onBold'],
+  N0: ['inverse'],
+  N700: ['text'],
   N800: ['text'],
+  N900: ['text'],
   background: ['background', 'default'],
-  backgroundActive: ['background', 'selected'],
+  backgroundActive: ['background', 'pressed'],
   backgroundHover: ['background', 'hovered'],
   backgroundOnLayer: ['background', 'blanket'],
   text: ['text'],
@@ -64,9 +66,9 @@ var legacyColorMetaMap = {
   placeholderText: ['text', 'subtlest'],
   heading: ['text'],
   subtleHeading: ['text', 'subtle'],
-  link: ['text', 'link'],
-  linkHover: ['text', 'link', 'hovered'],
-  linkActive: ['text', 'link', 'pressed'],
+  link: ['link'],
+  linkHover: ['link', 'hovered'],
+  linkActive: ['link', 'pressed'],
   linkOutline: ['border', 'selected'],
   primary: ['brand'],
   blue: ['accent', 'blue'],

package/dist/cjs/presets/theme-to-design-tokens/utils/tokens.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tokens = exports.getUniqueWordsFromTokens = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _tokenNames = _interopRequireDefault(require("@atlaskit/tokens/token-names"));
+
+var _renameMapping = _interopRequireDefault(require("@atlaskit/tokens/rename-mapping"));
+
+var tokens = Object.keys(_tokenNames.default).filter(function (t) {
+  return !t.includes('UNSAFE') && !t.includes('interaction');
+}).filter(function (t) {
+  return !_renameMapping.default.find(function (_ref) {
+    var path = _ref.path;
+    return t === path.replace(/\.[default]\g/, '');
+  });
+});
+exports.tokens = tokens;
+var getUniqueWordsFromTokens = Object.keys(_tokenNames.default).reduce(function (accum, val) {
+  return [].concat((0, _toConsumableArray2.default)(accum), (0, _toConsumableArray2.default)(val.split('.')));
+}, []).reduce(function (accum, val) {
+  return [].concat((0, _toConsumableArray2.default)(accum), (0, _toConsumableArray2.default)(val.split(/(?=[A-Z])/g).map(function (e) {
+    return e.toLowerCase();
+  })));
+}, []).reduce(function (accum, val) {
+  if (!accum.includes(val)) {
+    accum.push(val);
+  }
+
+  return accum;
+}, []);
+exports.getUniqueWordsFromTokens = getUniqueWordsFromTokens;

package/dist/cjs/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/codemod-cli",
-	"version": "0.8.4"
+	"version": "0.8.5"
 }

package/dist/es2019/presets/theme-to-design-tokens/theme-to-design-tokens.js

@@ -1,12 +1,10 @@
 /* eslint-disable no-console */
-import colorToToken from './utils/color-to-token';
 import { isDecendantOfToken, isDecendantOfType } from './utils/ast';
 import { cleanMeta, getMetaFromAncestors } from './utils/ast-meta';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from './utils/color';
 import Search from './utils/fuzzy-search';
 import { legacyColorMetaMap } from './utils/legacy-colors';
-import designTokens from '@atlaskit/tokens/token-names';
-const tokens = Object.keys(designTokens);
+import { tokens } from './utils/tokens';
 const search = Search(tokens, false);
 
 function hasImportDeclaration(j, source, sourcePath) {
@@ -30,55 +28,22 @@ function insertTokenImport(j, source) {
   source.get().node.program.body.unshift(newImport);
 }
 
-function buildToken(j, tokenResult, node) {
-  const callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenResult.suggestion[0] || 'util.UNSAFE_MISSING_TOKEN'), tokenResult.fallbackNeeded && node].filter(Boolean));
-  callExpr.comments = [j.commentBlock(` [token-confidence: ${tokenResult.confidence}] `)];
+function buildToken(j, tokenId, node) {
+  const callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
   return callExpr;
 }
 
-function getTokenFromNode(j, path, debug, paletteColor, baseMeta = []) {
+function getTokenFromNode(j, path, baseMeta = []) {
   const foundMeta = getMetaFromAncestors(j, path);
-  const propertyName = foundMeta.find(name => {
-    if (!name) {
-      return false;
-    }
-
-    return name.toLowerCase().match(/(.*color|image|fill|stroke|shadow|border(?!-)|background(?!-)|outline(?!-)|column-rule-color)/);
-  });
-  let state = 'resting';
-  foundMeta.find(name => {
-    if (!name) {
-      return false;
-    }
+  const meta = cleanMeta([...foundMeta, ...baseMeta]);
+  const results = search.get(meta.join(' '));
+  let tokenId = ['utility.UNSAFE_util.MISSING_TOKEN'];
 
-    const result = /(hover|active|disabled)/.exec(name.toLowerCase());
-
-    if (result) {
-      if (result[0] === 'active') {
-        state = 'pressed';
-      } else {
-        state = result[0];
-      }
-
-      return true;
-    }
-
-    return false;
-  });
-  const tokenResult = colorToToken(paletteColor || '', {
-    state,
-    propertyName
-  }, () => {
-    const searchTerm = cleanMeta([...foundMeta, ...baseMeta]).join(' ');
-    const results = search.get(searchTerm);
-
-    if (results) {
-      return results.map(result => result[1]);
-    }
+  if (results) {
+    tokenId = results.map(result => result[1]);
+  }
 
-    return [];
-  });
-  return tokenResult;
+  return tokenId[0];
 }
 
 export default function transformer(file, api, debug = false) {
@@ -93,18 +58,16 @@ export default function transformer(file, api, debug = false) {
     insertTokenImport(j, source);
     const key = path.value.property.type === 'Identifier' ? path.value.property.name : undefined;
     const colorMeta = legacyColorMetaMap[key] || [];
-    const tokenId = getTokenFromNode(j, path, debug, key, colorMeta);
+    const tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
-  source.find(j.ObjectProperty).filter(path => {
-    return path.value.value.type === 'Identifier' && (isLegacyColor(path.value.value.name) || isLegacyNamedColor(path.value.value.name));
-  }).filter(path => hasImportSpecifier(j, source, path.value.value.type === 'Identifier' ? path.value.value.name : '', '@atlaskit/theme') || hasImportSpecifier(j, source, path.value.value.type === 'Identifier' ? path.value.value.name : '', '@atlaskit/theme/colors')).filter(path => !isDecendantOfToken(j, path.value.value)).forEach(path => {
+  source.find(j.ObjectProperty).filter(path => path.value.value.type === 'Identifier' && (isLegacyColor(path.value.value.name) || isLegacyNamedColor(path.value.value.name))).filter(path => hasImportSpecifier(j, source, path.value.value.type === 'Identifier' ? path.value.value.name : '', '@atlaskit/theme') || hasImportSpecifier(j, source, path.value.value.type === 'Identifier' ? path.value.value.name : '', '@atlaskit/theme/colors')).filter(path => !isDecendantOfToken(j, path.value.value)).forEach(path => {
     const valuePath = path.get('value');
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     const colorMeta = legacyColorMetaMap[valuePath.name] || [];
-    const tokenId = getTokenFromNode(j, valuePath, debug, valuePath.name, colorMeta);
+    const tokenId = getTokenFromNode(j, valuePath, colorMeta);
     j(path).replaceWith(j.objectProperty(path.value.key, buildToken(j, tokenId, valuePath.value)));
     transformed = true;
   });
@@ -112,7 +75,7 @@ export default function transformer(file, api, debug = false) {
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     const colorMeta = legacyColorMetaMap[path.value.name] || [];
-    const tokenId = getTokenFromNode(j, path, debug, path.value.name, colorMeta);
+    const tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
@@ -123,7 +86,7 @@ export default function transformer(file, api, debug = false) {
     insertTokenImport(j, source);
     const value = path === null || path === void 0 ? void 0 : (_path$value = path.value) === null || _path$value === void 0 ? void 0 : (_path$value$value = _path$value.value) === null || _path$value$value === void 0 ? void 0 : _path$value$value.toString();
     const colorMeta = legacyColorMetaMap[value] || [];
-    const tokenId = getTokenFromNode(j, path, debug, value, colorMeta);
+    const tokenId = getTokenFromNode(j, path, colorMeta);
     const tokenNode = buildToken(j, tokenId, path.value);
     j(path).replaceWith(isDecendantOfType(j, path, j.JSXAttribute) ? j.jsxExpressionContainer(tokenNode) : tokenNode);
     transformed = true;

package/dist/es2019/presets/theme-to-design-tokens/utils/ast-meta.js

@@ -1,12 +1,4 @@
-import designTokens from '@atlaskit/tokens/token-names';
-const tokens = Object.keys(designTokens);
-export const getUniqueWordsFromTokens = tokens.reduce((accum, val) => [...accum, ...val.split('.')], []).reduce((accum, val) => [...accum, ...val.split(/(?=[A-Z])/g).map(e => e.toLowerCase())], []).reduce((accum, val) => {
-  if (!accum.includes(val)) {
-    accum.push(val);
-  }
-
-  return accum;
-}, []);
+import { getUniqueWordsFromTokens } from './tokens';
 export function getMetaFromAncestors(j, path, meta = []) {
   const parent = path.parentPath;
   const grandParent = parent && parent.parentPath;
@@ -26,13 +18,14 @@ export function getMetaFromAncestors(j, path, meta = []) {
   if (parent && grandParent && grandParent.value.type === 'TemplateLiteral') {
     const expressionIndex = grandParent.value.expressions.findIndex(exp => exp.name === path.value.name);
     const quasi = grandParent.value.quasis[expressionIndex];
-    const propertyName = (quasi.value.cooked || quasi.value.raw || '').replace(/\n/g, '').split(/;|{|}/).filter(el => !el.match(/\.|\@|\(|\)/)).pop().replace(/:/g, '').trim();
+    const propertyName = (quasi.value.cooked || quasi.value.raw || '').replace(/\n/g, '').split(/;|{|}/).filter(el => !el.match(/\.|\@|\(|\)/)).pop().split(/:/g)[0].trim();
     grandParent.value.quasis.slice(0, expressionIndex + 1).map(q => q.value.cooked) // We reverse so the most nested one is first which we're more likely than not interested in
-    .reverse().forEach(str => {
+    .reverse().some(str => {
       const result = /(hover|active|disabled|focus)/.exec(str.toLowerCase());
 
       if (result) {
         meta.push(result[0]);
+        return true;
       }
     });
     meta.push(propertyName);
@@ -56,7 +49,7 @@ export function getMetaFromAncestors(j, path, meta = []) {
 }
 export function cleanMeta(meta) {
   return meta.reduce((accum, val) => [...accum, ...(typeof val === 'string' ? val.split(/(?=[A-Z])/g).map(e => e.toLowerCase()) : [])], []).reduce((accum, val) => {
-    accum.push(val.replace(/:/g, '').replace(/,/g, '').replace('grey', 'neutral').replace('texts', 'text').replace('error', 'danger').replace('invalid', 'danger').replace('removed', 'danger').replace('removal', 'danger').replace('remove', 'danger').replace('valid', 'success').replace('successful', 'success').replace('risk', 'warning').replace('primary', 'bold').replace('info', 'bold').replace('secondary', 'subtle').replace('hyperlink', 'link').replace('focused', 'focus').replace('active', 'pressed').replace('hovered', 'hover').replace('background-color', 'background').replace('color', 'text').replace('stroke', 'border').replace('border-left', 'border').replace('border-right', 'border').replace('box-shadow', 'shadow'));
+    accum.push(val.replace(/:/g, '').replace(/,/g, '').replace('grey', 'neutral').replace('skeleton', 'neutral').replace('texts', 'text').replace('red', 'danger').replace('error', 'danger').replace('invalid', 'danger').replace('removed', 'danger').replace('removal', 'danger').replace('remove', 'danger').replace('focus', 'focused').replace('valid', 'success').replace('successful', 'success').replace('risk', 'warning').replace('caution', 'warning').replace('warn', 'warning').replace('primary', 'bold').replace('info', 'bold').replace('secondary', 'subtle').replace('hyperlink', 'link').replace('anchor', 'link').replace('active', 'pressed').replace('hover', 'hovered').replace('dragged', 'overlay').replace('dragging', 'overlay').replace('drag', 'overlay').replace('background-color', 'background').replace('color', 'text').replace('icons', 'icon').replace('glyph', 'icon').replace('stroke', 'border').replace('border-left', 'border').replace('border-right', 'border').replace('border-top', 'border').replace('border-bottom', 'border').replace('box-shadow', 'shadow'));
     return accum;
   }, []).filter(val => {
     return getUniqueWordsFromTokens.includes(val);

package/dist/es2019/presets/theme-to-design-tokens/utils/legacy-colors.js

@@ -43,10 +43,12 @@ export const legacyColorMetaMap = {
   T300: ['accent', 'teal'],
   T400: ['accent', 'teal'],
   T500: ['accent', 'teal'],
-  N0: ['onBold'],
+  N0: ['inverse'],
+  N700: ['text'],
   N800: ['text'],
+  N900: ['text'],
   background: ['background', 'default'],
-  backgroundActive: ['background', 'selected'],
+  backgroundActive: ['background', 'pressed'],
   backgroundHover: ['background', 'hovered'],
   backgroundOnLayer: ['background', 'blanket'],
   text: ['text'],
@@ -56,9 +58,9 @@ export const legacyColorMetaMap = {
   placeholderText: ['text', 'subtlest'],
   heading: ['text'],
   subtleHeading: ['text', 'subtle'],
-  link: ['text', 'link'],
-  linkHover: ['text', 'link', 'hovered'],
-  linkActive: ['text', 'link', 'pressed'],
+  link: ['link'],
+  linkHover: ['link', 'hovered'],
+  linkActive: ['link', 'pressed'],
   linkOutline: ['border', 'selected'],
   primary: ['brand'],
   blue: ['accent', 'blue'],

package/dist/es2019/presets/theme-to-design-tokens/utils/tokens.js

@@ -0,0 +1,12 @@
+import designTokens from '@atlaskit/tokens/token-names';
+import renameMapping from '@atlaskit/tokens/rename-mapping';
+export const tokens = Object.keys(designTokens).filter(t => !t.includes('UNSAFE') && !t.includes('interaction')).filter(t => !renameMapping.find(({
+  path
+}) => t === path.replace(/\.[default]\g/, '')));
+export const getUniqueWordsFromTokens = Object.keys(designTokens).reduce((accum, val) => [...accum, ...val.split('.')], []).reduce((accum, val) => [...accum, ...val.split(/(?=[A-Z])/g).map(e => e.toLowerCase())], []).reduce((accum, val) => {
+  if (!accum.includes(val)) {
+    accum.push(val);
+  }
+
+  return accum;
+}, []);

package/dist/es2019/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/codemod-cli",
-	"version": "0.8.4"
+	"version": "0.8.5"
 }

package/dist/esm/main.js

@@ -340,7 +340,7 @@ function _main() {
           case 4:
             _yield$parseArgs = _context5.sent;
             packages = _yield$parseArgs.packages;
-            _process$env$_PACKAGE = "0.8.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+            _process$env$_PACKAGE = "0.8.5", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
             logger.log(chalk.bgBlue(chalk.black("\uD83D\uDCDA Atlassian-Frontend codemod library @ ".concat(_PACKAGE_VERSION_, " \uD83D\uDCDA"))));
 
             if (packages && packages.length > 0) {

package/dist/esm/presets/theme-to-design-tokens/theme-to-design-tokens.js

@@ -1,14 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
 /* eslint-disable no-console */
-import colorToToken from './utils/color-to-token';
 import { isDecendantOfToken, isDecendantOfType } from './utils/ast';
 import { cleanMeta, getMetaFromAncestors } from './utils/ast-meta';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from './utils/color';
 import Search from './utils/fuzzy-search';
 import { legacyColorMetaMap } from './utils/legacy-colors';
-import designTokens from '@atlaskit/tokens/token-names';
-var tokens = Object.keys(designTokens);
+import { tokens } from './utils/tokens';
 var search = Search(tokens, false);
 
 function hasImportDeclaration(j, source, sourcePath) {
@@ -36,58 +34,25 @@ function insertTokenImport(j, source) {
   source.get().node.program.body.unshift(newImport);
 }
 
-function buildToken(j, tokenResult, node) {
-  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenResult.suggestion[0] || 'util.UNSAFE_MISSING_TOKEN'), tokenResult.fallbackNeeded && node].filter(Boolean));
-  callExpr.comments = [j.commentBlock(" [token-confidence: ".concat(tokenResult.confidence, "] "))];
+function buildToken(j, tokenId, node) {
+  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
   return callExpr;
 }
 
-function getTokenFromNode(j, path, debug, paletteColor) {
-  var baseMeta = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+function getTokenFromNode(j, path) {
+  var baseMeta = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var foundMeta = getMetaFromAncestors(j, path);
-  var propertyName = foundMeta.find(function (name) {
-    if (!name) {
-      return false;
-    }
-
-    return name.toLowerCase().match(/(.*color|image|fill|stroke|shadow|border(?!-)|background(?!-)|outline(?!-)|column-rule-color)/);
-  });
-  var state = 'resting';
-  foundMeta.find(function (name) {
-    if (!name) {
-      return false;
-    }
-
-    var result = /(hover|active|disabled)/.exec(name.toLowerCase());
-
-    if (result) {
-      if (result[0] === 'active') {
-        state = 'pressed';
-      } else {
-        state = result[0];
-      }
-
-      return true;
-    }
-
-    return false;
-  });
-  var tokenResult = colorToToken(paletteColor || '', {
-    state: state,
-    propertyName: propertyName
-  }, function () {
-    var searchTerm = cleanMeta([].concat(_toConsumableArray(foundMeta), _toConsumableArray(baseMeta))).join(' ');
-    var results = search.get(searchTerm);
-
-    if (results) {
-      return results.map(function (result) {
-        return result[1];
-      });
-    }
+  var meta = cleanMeta([].concat(_toConsumableArray(foundMeta), _toConsumableArray(baseMeta)));
+  var results = search.get(meta.join(' '));
+  var tokenId = ['utility.UNSAFE_util.MISSING_TOKEN'];
+
+  if (results) {
+    tokenId = results.map(function (result) {
+      return result[1];
+    });
+  }
 
-    return [];
-  });
-  return tokenResult;
+  return tokenId[0];
 }
 
 export default function transformer(file, api) {
@@ -105,7 +70,7 @@ export default function transformer(file, api) {
     insertTokenImport(j, source);
     var key = path.value.property.type === 'Identifier' ? path.value.property.name : undefined;
     var colorMeta = legacyColorMetaMap[key] || [];
-    var tokenId = getTokenFromNode(j, path, debug, key, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
@@ -120,7 +85,7 @@ export default function transformer(file, api) {
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     var colorMeta = legacyColorMetaMap[valuePath.name] || [];
-    var tokenId = getTokenFromNode(j, valuePath, debug, valuePath.name, colorMeta);
+    var tokenId = getTokenFromNode(j, valuePath, colorMeta);
     j(path).replaceWith(j.objectProperty(path.value.key, buildToken(j, tokenId, valuePath.value)));
     transformed = true;
   });
@@ -136,7 +101,7 @@ export default function transformer(file, api) {
     debug && console.log('file:', file.path);
     insertTokenImport(j, source);
     var colorMeta = legacyColorMetaMap[path.value.name] || [];
-    var tokenId = getTokenFromNode(j, path, debug, path.value.name, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     j(path).replaceWith(buildToken(j, tokenId, path.value));
     transformed = true;
   });
@@ -151,7 +116,7 @@ export default function transformer(file, api) {
     insertTokenImport(j, source);
     var value = path === null || path === void 0 ? void 0 : (_path$value = path.value) === null || _path$value === void 0 ? void 0 : (_path$value$value = _path$value.value) === null || _path$value$value === void 0 ? void 0 : _path$value$value.toString();
     var colorMeta = legacyColorMetaMap[value] || [];
-    var tokenId = getTokenFromNode(j, path, debug, value, colorMeta);
+    var tokenId = getTokenFromNode(j, path, colorMeta);
     var tokenNode = buildToken(j, tokenId, path.value);
     j(path).replaceWith(isDecendantOfType(j, path, j.JSXAttribute) ? j.jsxExpressionContainer(tokenNode) : tokenNode);
     transformed = true;