@atlaskit/codemod-cli 0.27.3 → 0.28.0

package/dist/esm/presets/remove-token-fallbacks/utils/remove-unused-imports.js

@@ -40,12 +40,12 @@ export function removeUnusedImports(importDeclarations, j) {
   };
   var processImportDeclaration = function processImportDeclaration(importDeclaration) {
     var _importDeclaration$va, _importDeclaration$va2;
-    if (((_importDeclaration$va = importDeclaration.value.specifiers) === null || _importDeclaration$va === void 0 ? void 0 : _importDeclaration$va.length) === 0) {
+    if (((_importDeclaration$va = importDeclaration.value) === null || _importDeclaration$va === void 0 || (_importDeclaration$va = _importDeclaration$va.specifiers) === null || _importDeclaration$va === void 0 ? void 0 : _importDeclaration$va.length) === 0) {
       return false;
     }
     var hadUnusedDefaultImport = removeUnusedDefaultImport(importDeclaration);
     var hadUnusedNonDefaultImports = removeUnusedNonDefaultImports(importDeclaration);
-    if (((_importDeclaration$va2 = importDeclaration.value.specifiers) === null || _importDeclaration$va2 === void 0 ? void 0 : _importDeclaration$va2.length) === 0) {
+    if (((_importDeclaration$va2 = importDeclaration.value) === null || _importDeclaration$va2 === void 0 || (_importDeclaration$va2 = _importDeclaration$va2.specifiers) === null || _importDeclaration$va2 === void 0 ? void 0 : _importDeclaration$va2.length) === 0) {
       j(importDeclaration).remove();
       return true;
     }

package/dist/esm/presets/remove-token-fallbacks/utils/reporter.js

@@ -74,41 +74,47 @@ function _clearFolder() {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           console.log('Clearing report folder:', reportFolder);
+          // Create the folder if it doesn't exist
           _context3.next = 3;
-          return fs.readdir(reportFolder);
+          return fs.mkdir(reportFolder, {
+            recursive: true
+          });
         case 3:
+          _context3.next = 5;
+          return fs.readdir(reportFolder);
+        case 5:
           filesToDelete = _context3.sent;
           _iterator = _createForOfIteratorHelper(filesToDelete);
-          _context3.prev = 5;
+          _context3.prev = 7;
           _iterator.s();
-        case 7:
+        case 9:
           if ((_step = _iterator.n()).done) {
-            _context3.next = 14;
+            _context3.next = 16;
             break;
           }
           file = _step.value;
           filePath = path.join(reportFolder, file);
-          _context3.next = 12;
+          _context3.next = 14;
           return fs.unlink(filePath);
-        case 12:
-          _context3.next = 7;
-          break;
         case 14:
-          _context3.next = 19;
+          _context3.next = 9;
           break;
         case 16:
-          _context3.prev = 16;
-          _context3.t0 = _context3["catch"](5);
+          _context3.next = 21;
+          break;
+        case 18:
+          _context3.prev = 18;
+          _context3.t0 = _context3["catch"](7);
           _iterator.e(_context3.t0);
-        case 19:
-          _context3.prev = 19;
+        case 21:
+          _context3.prev = 21;
           _iterator.f();
-          return _context3.finish(19);
-        case 22:
+          return _context3.finish(21);
+        case 24:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[5, 16, 19, 22]]);
+    }, _callee3, null, [[7, 18, 21, 24]]);
   }));
   return _clearFolder.apply(this, arguments);
 }
@@ -117,16 +123,17 @@ function saveFilePaths(_x5, _x6) {
 }
 function _saveFilePaths() {
   _saveFilePaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(reportFolder, files) {
-    var filesTxtPath;
+    var filesTxtPath, sortedFiles;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           filesTxtPath = path.join(reportFolder, 'files.txt');
-          _context4.next = 3;
-          return fs.writeFile(filesTxtPath, Array.from(files).map(function (filePath) {
+          sortedFiles = Array.from(files).sort(); // Sort the file paths alphabetically
+          _context4.next = 4;
+          return fs.writeFile(filesTxtPath, sortedFiles.map(function (filePath) {
             return "\"".concat(filePath, "\"");
-          }).join(' '), 'utf-8');
-        case 3:
+          }).join('\n'), 'utf-8');
+        case 4:
         case "end":
           return _context4.stop();
       }

package/dist/esm/presets/remove-token-fallbacks/utils/token-processor.js

@@ -87,7 +87,7 @@ export var TokenProcessor = /*#__PURE__*/function () {
     value: function () {
       var _processSingleToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callPath) {
         var _callPath$node$loc2;
-        var args, line, tokenKey, isSkipped, tokenValue, _ref, rawFallbackValue, fallbackValue, resolvedImportDeclaration, resolvedLocalVarDeclaration, _normalizeValues, difference, isAcceptableDifference, tokenLogValue, fallbackLogValue, normalizedTokenValue, normalizedFallbackValue, areEqual, logData, fallbackRemoved, importDeclaration, localVarDeclaration, message;
+        var args, line, tokenKey, isSkipped, tokenValue, _ref, rawFallbackValue, fallbackValue, resolvedImportDeclaration, resolvedLocalVarDeclaration, _normalizeValues, difference, isAcceptableDifference, tokenLogValue, fallbackLogValue, normalizedTokenValue, normalizedFallbackValue, areEqual, logData, fallbackRemoved, importDeclaration, localVarDeclaration, isBorderToken, message;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -117,7 +117,9 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 resolvedLocalVarDeclaration: undefined
               });
             case 8:
-              isSkipped = tokenKey.startsWith('elevation.shadow') || tokenKey.startsWith('font.body') || tokenKey.startsWith('font.heading');
+              isSkipped = false; // tokenKey.startsWith('elevation.shadow') ||
+              // tokenKey.startsWith('font.body') ||
+              // tokenKey.startsWith('font.heading');
               tokenValue = isSkipped ? '' : this.tokenMap[tokenKey];
               this.logVerbose("Token value from tokenMap: ".concat(chalk.magenta(tokenValue), " for key: ").concat(chalk.yellow(tokenKey)));
               if (!isSkipped) {
@@ -156,7 +158,8 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 difference: difference
               };
               fallbackRemoved = false;
-              if (areEqual || isAcceptableDifference || this.options.forceUpdate) {
+              isBorderToken = tokenKey.startsWith('border');
+              if (areEqual || (isAcceptableDifference || this.options.forceUpdate) && !isBorderToken) {
                 this.log(chalk.green(areEqual ? 'Token value and fallback value are equal, removing fallback' : 'Token value and fallback value are within acceptable difference threshold, removing fallback'));
                 args.pop();
                 this.details.replaced.push(logData);
@@ -164,7 +167,7 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 importDeclaration = resolvedImportDeclaration;
                 localVarDeclaration = resolvedLocalVarDeclaration;
               } else {
-                message = normalizedFallbackValue === undefined ? "Fallback value could not be resolved" : "Values mismatched significantly";
+                message = isBorderToken ? 'Skip modifying border token' : normalizedFallbackValue === undefined ? "Fallback value could not be resolved" : "Values mismatched significantly";
                 this.logError(message);
                 if (this.options.addEslintComments) {
                   addOrUpdateEslintIgnoreComment(this.j, tokenValue, fallbackValue, callPath);
@@ -178,7 +181,7 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 resolvedImportDeclaration: importDeclaration,
                 resolvedLocalVarDeclaration: localVarDeclaration
               });
-            case 30:
+            case 31:
             case "end":
               return _context2.stop();
           }
@@ -321,10 +324,57 @@ export var TokenProcessor = /*#__PURE__*/function () {
     key: "processFallbackAsMemberExpression",
     value: function () {
       var _processFallbackAsMemberExpression = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(fallbackValueNode) {
-        var objectName, propertyName, fallbackValue, rawFallbackValue, resolvedImportDeclaration, importDeclaration, importSource;
+        var objectName, propertyName, fallbackValue, resolvedImportDeclaration, resolvedLocalVarDeclaration, _getFullMemberPath, fullMemberPath, pathSegments, localVarDeclaration, _importDeclaration, rawFallbackValue, importDeclaration, importSource;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              // Function to get full member expression path as string
+              _getFullMemberPath = function getFullMemberPath(node) {
+                if (node.type === 'Identifier') {
+                  return node.name;
+                } else if (node.type === 'MemberExpression') {
+                  return "".concat(_getFullMemberPath(node.object), ".").concat(node.property.type === 'Identifier' ? node.property.name : '');
+                }
+                return '';
+              };
+              fullMemberPath = _getFullMemberPath(fallbackValueNode); // Detect long member expression paths
+              pathSegments = fullMemberPath.split('.');
+              if (!(pathSegments.length > 2)) {
+                _context5.next = 9;
+                break;
+              }
+              this.logVerbose("Detected long member expression: ".concat(chalk.yellow(fullMemberPath), ". Just resolving import or local variable declaration."));
+
+              // Find the import statement or local variable for the top-level object
+              objectName = pathSegments[0];
+
+              // Check if it's a local variable
+              localVarDeclaration = this.source.find(this.j.VariableDeclarator, {
+                id: {
+                  name: objectName
+                }
+              }).at(0);
+              if (localVarDeclaration.size()) {
+                resolvedLocalVarDeclaration = localVarDeclaration.paths()[0];
+                this.logVerbose("Resolved local variable declaration for: ".concat(chalk.yellow(objectName)));
+              } else {
+                // Search for import declaration
+                _importDeclaration = this.source.find(this.j.ImportDeclaration).filter(this.createImportFilter(objectName)).at(0);
+                if (_importDeclaration.size()) {
+                  resolvedImportDeclaration = _importDeclaration.paths()[0];
+                  this.logVerbose("Resolved import declaration for: ".concat(chalk.yellow(objectName)));
+                } else {
+                  this.logError("Could not resolve import or local variable for: ".concat(chalk.yellow(objectName)));
+                }
+              }
+              return _context5.abrupt("return", {
+                rawFallbackValue: fullMemberPath,
+                fallbackValue: undefined,
+                resolvedImportDeclaration: resolvedImportDeclaration,
+                resolvedLocalVarDeclaration: resolvedLocalVarDeclaration
+              });
+            case 9:
+              // Existing logic for member expressions with shorter paths
               if (fallbackValueNode.object.type === 'Identifier') {
                 objectName = fallbackValueNode.object.name;
               }
@@ -334,7 +384,7 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 propertyName = fallbackValueNode.property.value;
               }
               if (!(!objectName || !propertyName)) {
-                _context5.next = 5;
+                _context5.next = 14;
                 break;
               }
               this.logError("Could not determine object and property names from member expression: ".concat(chalk.yellow(fallbackValueNode)));
@@ -344,36 +394,37 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 resolvedImportDeclaration: undefined,
                 resolvedLocalVarDeclaration: undefined
               });
-            case 5:
+            case 14:
               rawFallbackValue = "".concat(objectName, ".").concat(propertyName);
               this.logVerbose("Fallback is a member expression: ".concat(chalk.yellow(rawFallbackValue), ", attempting to resolve..."));
+
               // Find the import statement for the object
               importDeclaration = this.source.find(this.j.ImportDeclaration).filter(this.createImportFilter(objectName)).at(0);
               if (!importDeclaration.size()) {
-                _context5.next = 16;
+                _context5.next = 25;
                 break;
               }
               importSource = importDeclaration.get().value.source.value;
-              _context5.next = 12;
+              _context5.next = 21;
               return this.resolveValueFromImport(this.rootDir, importSource, objectName, propertyName);
-            case 12:
+            case 21:
               fallbackValue = _context5.sent;
               if (fallbackValue !== undefined) {
                 resolvedImportDeclaration = importDeclaration.paths()[0];
                 this.logVerbose("Resolved fallback value from member expression: ".concat(chalk.yellow(fallbackValue)));
               }
-              _context5.next = 17;
+              _context5.next = 26;
               break;
-            case 16:
+            case 25:
               this.logError("Could not find import for member expression: ".concat(chalk.yellow(rawFallbackValue)));
-            case 17:
+            case 26:
               return _context5.abrupt("return", {
                 rawFallbackValue: rawFallbackValue,
                 fallbackValue: fallbackValue,
                 resolvedImportDeclaration: resolvedImportDeclaration,
                 resolvedLocalVarDeclaration: undefined
               });
-            case 18:
+            case 27:
             case "end":
               return _context5.stop();
           }
@@ -388,51 +439,108 @@ export var TokenProcessor = /*#__PURE__*/function () {
     key: "processFallbackAsTemplateLiteral",
     value: function () {
       var _processFallbackAsTemplateLiteral = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(fallbackValueNode) {
-        var expressions, rawFallbackValue, fallbackValue, quasis, exprValue, expression, resolvedImportDeclaration, resolvedLocalVarDeclaration, result, _result;
+        var expressions, quasis, resolvedImportDeclaration, resolvedLocalVarDeclaration, rawFallbackValue, fallbackValue, _iterator, _step, _expression, result, _result, exprValue, expression, _result2, _result3;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               expressions = fallbackValueNode.expressions;
-              rawFallbackValue = '';
               quasis = fallbackValueNode.quasis;
+              rawFallbackValue = '';
               if (!(expressions.length !== 1 || quasis.length !== 2)) {
-                _context6.next = 6;
+                _context6.next = 35;
                 break;
               }
               this.logError("Unsupported template literal structure");
+
+              // Attempt to resolve any imports or local variables used in expressions
+              _iterator = _createForOfIteratorHelper(expressions);
+              _context6.prev = 6;
+              _iterator.s();
+            case 8:
+              if ((_step = _iterator.n()).done) {
+                _context6.next = 26;
+                break;
+              }
+              _expression = _step.value;
+              if (!(_expression.type === 'Identifier')) {
+                _context6.next = 18;
+                break;
+              }
+              _context6.next = 13;
+              return this.processFallbackAsIdentifier(_expression);
+            case 13:
+              result = _context6.sent;
+              if (result.resolvedImportDeclaration) {
+                resolvedImportDeclaration = result.resolvedImportDeclaration;
+              }
+              if (result.resolvedLocalVarDeclaration) {
+                resolvedLocalVarDeclaration = result.resolvedLocalVarDeclaration;
+              }
+              _context6.next = 24;
+              break;
+            case 18:
+              if (!(_expression.type === 'MemberExpression')) {
+                _context6.next = 24;
+                break;
+              }
+              _context6.next = 21;
+              return this.processFallbackAsMemberExpression(_expression);
+            case 21:
+              _result = _context6.sent;
+              if (_result.resolvedImportDeclaration) {
+                resolvedImportDeclaration = _result.resolvedImportDeclaration;
+              }
+              if (_result.resolvedLocalVarDeclaration) {
+                resolvedLocalVarDeclaration = _result.resolvedLocalVarDeclaration;
+              }
+            case 24:
+              _context6.next = 8;
+              break;
+            case 26:
+              _context6.next = 31;
+              break;
+            case 28:
+              _context6.prev = 28;
+              _context6.t0 = _context6["catch"](6);
+              _iterator.e(_context6.t0);
+            case 31:
+              _context6.prev = 31;
+              _iterator.f();
+              return _context6.finish(31);
+            case 34:
               return _context6.abrupt("return", {
                 rawFallbackValue: rawFallbackValue,
                 fallbackValue: fallbackValue,
-                resolvedImportDeclaration: undefined,
-                resolvedLocalVarDeclaration: undefined
+                resolvedImportDeclaration: resolvedImportDeclaration,
+                resolvedLocalVarDeclaration: resolvedLocalVarDeclaration
               });
-            case 6:
+            case 35:
               expression = expressions[0];
               if (!(expression.type === 'Identifier')) {
-                _context6.next = 16;
+                _context6.next = 45;
                 break;
               }
-              _context6.next = 10;
+              _context6.next = 39;
               return this.processFallbackAsIdentifier(expression);
-            case 10:
-              result = _context6.sent;
-              exprValue = result.fallbackValue;
-              resolvedImportDeclaration = result.resolvedImportDeclaration;
-              resolvedLocalVarDeclaration = result.resolvedLocalVarDeclaration;
-              _context6.next = 22;
+            case 39:
+              _result2 = _context6.sent;
+              exprValue = _result2.fallbackValue;
+              resolvedImportDeclaration = _result2.resolvedImportDeclaration;
+              resolvedLocalVarDeclaration = _result2.resolvedLocalVarDeclaration;
+              _context6.next = 51;
               break;
-            case 16:
+            case 45:
               if (!(expression.type === 'MemberExpression')) {
-                _context6.next = 22;
+                _context6.next = 51;
                 break;
               }
-              _context6.next = 19;
+              _context6.next = 48;
               return this.processFallbackAsMemberExpression(expression);
-            case 19:
-              _result = _context6.sent;
-              exprValue = _result.fallbackValue;
-              resolvedImportDeclaration = _result.resolvedImportDeclaration;
-            case 22:
+            case 48:
+              _result3 = _context6.sent;
+              exprValue = _result3.fallbackValue;
+              resolvedImportDeclaration = _result3.resolvedImportDeclaration;
+            case 51:
               if (exprValue !== undefined) {
                 rawFallbackValue = "".concat(quasis[0].value.raw, "${").concat(exprValue, "}").concat(quasis[1].value.raw);
                 fallbackValue = "".concat(quasis[0].value.cooked).concat(exprValue).concat(quasis[1].value.cooked);
@@ -444,11 +552,11 @@ export var TokenProcessor = /*#__PURE__*/function () {
                 resolvedImportDeclaration: resolvedImportDeclaration,
                 resolvedLocalVarDeclaration: resolvedLocalVarDeclaration
               });
-            case 24:
+            case 53:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this);
+        }, _callee6, this, [[6, 28, 31, 34]]);
       }));
       function processFallbackAsTemplateLiteral(_x6) {
         return _processFallbackAsTemplateLiteral.apply(this, arguments);
@@ -472,19 +580,19 @@ export var TokenProcessor = /*#__PURE__*/function () {
     key: "tryResolveLocalPath",
     value: function () {
       var _tryResolveLocalPath = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(currentDir, importPath) {
-        var _iterator, _step, ext, potentialPath;
+        var _iterator2, _step2, ext, potentialPath;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _iterator = _createForOfIteratorHelper(this.possibleExtensions);
+              _iterator2 = _createForOfIteratorHelper(this.possibleExtensions);
               _context7.prev = 1;
-              _iterator.s();
+              _iterator2.s();
             case 3:
-              if ((_step = _iterator.n()).done) {
+              if ((_step2 = _iterator2.n()).done) {
                 _context7.next = 17;
                 break;
               }
-              ext = _step.value;
+              ext = _step2.value;
               potentialPath = path.resolve(currentDir, "".concat(importPath).concat(ext));
               _context7.prev = 6;
               _context7.next = 9;
@@ -504,10 +612,10 @@ export var TokenProcessor = /*#__PURE__*/function () {
             case 19:
               _context7.prev = 19;
               _context7.t1 = _context7["catch"](1);
-              _iterator.e(_context7.t1);
+              _iterator2.e(_context7.t1);
             case 22:
               _context7.prev = 22;
-              _iterator.f();
+              _iterator2.f();
               return _context7.finish(22);
             case 25:
               return _context7.abrupt("return", null);

package/dist/types/presets/remove-token-fallbacks/remove-token-fallbacks.d.ts

@@ -24,6 +24,6 @@ export declare const parser = "tsx";
 export declare function beforeAll(options: RemoveTokenFallbackOptions): Promise<void>;
 /**
  * Function executed after all transformations to combine individual file reports into a comprehensive transformation report.
- * It also applies prettier to the affected files.
+ * It also applies prettier and eslint (to remove dangling suppressions) to the affected files.
  */
 export declare function afterAll(options: RemoveTokenFallbackOptions): Promise<void>;

package/dist/types/presets/remove-token-fallbacks/utils/chunk.d.ts

@@ -0,0 +1 @@
+export declare const chunkArray: <T>(array: T[], chunkSize: number) => T[][];

package/dist/types-ts4.5/presets/remove-token-fallbacks/remove-token-fallbacks.d.ts

@@ -24,6 +24,6 @@ export declare const parser = "tsx";
 export declare function beforeAll(options: RemoveTokenFallbackOptions): Promise<void>;
 /**
  * Function executed after all transformations to combine individual file reports into a comprehensive transformation report.
- * It also applies prettier to the affected files.
+ * It also applies prettier and eslint (to remove dangling suppressions) to the affected files.
  */
 export declare function afterAll(options: RemoveTokenFallbackOptions): Promise<void>;

package/dist/types-ts4.5/presets/remove-token-fallbacks/utils/chunk.d.ts

@@ -0,0 +1 @@
+export declare const chunkArray: <T>(array: T[], chunkSize: number) => T[][];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/codemod-cli",
-	"version": "0.27.3",
+	"version": "0.28.0",
 	"description": "A cli for distributing codemods for atlassian-frontend components and services",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
 	"bin": "./bin/codemod-cli.js",
 	"dependencies": {
 		"@atlaskit/codemod-utils": "^4.2.0",
-		"@atlaskit/tokens": "^4.0.0",
+		"@atlaskit/tokens": "^4.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@codeshift/utils": "^0.2.4",
 		"@hypermod/utils": "^0.4.2",
@@ -49,7 +49,7 @@
 		"color-diff": "^1.2.0",
 		"enquirer": "^2.3.4",
 		"glob": "9.0.0",
-		"jscodeshift": "^0.13.0",
+		"jscodeshift": "^17.0.0",
 		"meow": "^8.1.1",
 		"projector-spawn": "^1.0.1",
 		"read-pkg-up": "^7.0.1",
@@ -58,7 +58,7 @@
 		"uuid": "^3.1.0"
 	},
 	"devDependencies": {
-		"@af/formatting": "*",
+		"@af/formatting": "^0.0.4",
 		"@types/color-diff": "^1.2.1",
 		"prettier": "^3.2.5",
 		"ts-node": "^10.9.1",