@atlaskit/codemod-utils 3.4.0 → 4.0.2

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # @atlaskit/codemod-utils
 
+## 4.0.2
+
+### Patch Changes
+
+- [`9358d42eeaa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9358d42eeaa) - NO-ISSUE: fixed codemod utils tryCreateImport() and addToImport() causing multiple insert in certain scenarios
+
+## 4.0.1
+
+### Patch Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
+
+## 4.0.0
+
+### Major Changes
+
+- [`b29ce16dad8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b29ce16dad8) - [ED-14606] Move bitbucket schema, confluence schema, jira schema, and default schema from @atlaskit/adf-schema to their own entry points. These new entry points are as follows
+
+  @atlaskit/adf-schema/schema-bitbucket for:
+
+  - bitbucketSchema
+
+  @atlaskit/adf-schema/schema-confluence for:
+
+  - confluenceSchema
+  - confluenceSchemaWithMediaSingle
+
+  @atlaskit/adf-schema/schema-jira for:
+
+  - default as createJIRASchema
+  - isSchemaWithLists
+  - isSchemaWithMentions
+  - isSchemaWithEmojis
+  - isSchemaWithLinks
+  - isSchemaWithAdvancedTextFormattingMarks
+  - isSchemaWithCodeBlock
+  - isSchemaWithBlockQuotes
+  - isSchemaWithMedia
+  - isSchemaWithSubSupMark
+  - isSchemaWithTextColor
+  - isSchemaWithTables
+
+  @atlaskit/adf-schema/schema-default for:
+
+  - defaultSchema
+  - getSchemaBasedOnStage
+  - defaultSchemaConfig
+
+  This change also includes codemods in @atlaskit/adf-schema to update these entry points. It also introduces a new util function "changeImportEntryPoint" to @atlaskit/codemod-utils to handle this scenario.
+
 ## 3.4.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -3,142 +3,148 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "createRenameFuncFor", {
+Object.defineProperty(exports, "addCommentBefore", {
   enumerable: true,
   get: function get() {
-    return _utils.createRenameFuncFor;
+    return _support.addCommentBefore;
   }
 });
-Object.defineProperty(exports, "createConvertFuncFor", {
+Object.defineProperty(exports, "addCommentToStartOfFile", {
   enumerable: true,
   get: function get() {
-    return _utils.createConvertFuncFor;
+    return _support.addCommentToStartOfFile;
   }
 });
-Object.defineProperty(exports, "createRenameImportFor", {
+Object.defineProperty(exports, "addDynamicImport", {
   enumerable: true,
   get: function get() {
-    return _utils.createRenameImportFor;
+    return _support.addDynamicImport;
   }
 });
-Object.defineProperty(exports, "createRemoveFuncFor", {
+Object.defineProperty(exports, "addToImport", {
   enumerable: true,
   get: function get() {
-    return _utils.createRemoveFuncFor;
+    return _support.addToImport;
   }
 });
-Object.defineProperty(exports, "replaceImportStatementFor", {
+Object.defineProperty(exports, "callExpressionArgMatchesString", {
   enumerable: true,
   get: function get() {
-    return _utils.replaceImportStatementFor;
+    return _support.callExpressionArgMatchesString;
   }
 });
-Object.defineProperty(exports, "elevateComponentToNewEntryPoint", {
+Object.defineProperty(exports, "changeImportEntryPoint", {
   enumerable: true,
   get: function get() {
-    return _utils.elevateComponentToNewEntryPoint;
+    return _utils.changeImportEntryPoint;
   }
 });
-Object.defineProperty(exports, "createTransformer", {
+Object.defineProperty(exports, "createConvertFuncFor", {
   enumerable: true,
   get: function get() {
-    return _utils.createTransformer;
+    return _utils.createConvertFuncFor;
   }
 });
-Object.defineProperty(exports, "renameNamedImportWithAliasName", {
+Object.defineProperty(exports, "createRemoveFuncAddCommentFor", {
   enumerable: true,
   get: function get() {
-    return _utils.renameNamedImportWithAliasName;
+    return _utils.createRemoveFuncAddCommentFor;
   }
 });
-Object.defineProperty(exports, "flattenCertainChildPropsAsProp", {
+Object.defineProperty(exports, "createRemoveFuncFor", {
   enumerable: true,
   get: function get() {
-    return _utils.flattenCertainChildPropsAsProp;
+    return _utils.createRemoveFuncFor;
   }
 });
-Object.defineProperty(exports, "createRenameJSXFunc", {
+Object.defineProperty(exports, "createRenameFuncFor", {
   enumerable: true,
   get: function get() {
-    return _utils.createRenameJSXFunc;
+    return _utils.createRenameFuncFor;
   }
 });
-Object.defineProperty(exports, "createRemoveFuncAddCommentFor", {
+Object.defineProperty(exports, "createRenameImportFor", {
   enumerable: true,
   get: function get() {
-    return _utils.createRemoveFuncAddCommentFor;
+    return _utils.createRenameImportFor;
   }
 });
-Object.defineProperty(exports, "getDefaultSpecifier", {
+Object.defineProperty(exports, "createRenameJSXFunc", {
   enumerable: true,
   get: function get() {
-    return _support.getDefaultSpecifier;
+    return _utils.createRenameJSXFunc;
   }
 });
-Object.defineProperty(exports, "getNamedSpecifier", {
+Object.defineProperty(exports, "createTransformer", {
   enumerable: true,
   get: function get() {
-    return _support.getNamedSpecifier;
+    return _utils.createTransformer;
   }
 });
-Object.defineProperty(exports, "getJSXAttributesByName", {
+Object.defineProperty(exports, "doesIdentifierExist", {
   enumerable: true,
   get: function get() {
-    return _support.getJSXAttributesByName;
+    return _support.doesIdentifierExist;
   }
 });
-Object.defineProperty(exports, "hasJSXAttributesByName", {
+Object.defineProperty(exports, "elevateComponentToNewEntryPoint", {
   enumerable: true,
   get: function get() {
-    return _support.hasJSXAttributesByName;
+    return _utils.elevateComponentToNewEntryPoint;
   }
 });
-Object.defineProperty(exports, "doesIdentifierExist", {
+Object.defineProperty(exports, "flattenCertainChildPropsAsProp", {
   enumerable: true,
   get: function get() {
-    return _support.doesIdentifierExist;
+    return _utils.flattenCertainChildPropsAsProp;
   }
 });
-Object.defineProperty(exports, "hasImportDeclaration", {
+Object.defineProperty(exports, "getDefaultSpecifier", {
   enumerable: true,
   get: function get() {
-    return _support.hasImportDeclaration;
+    return _support.getDefaultSpecifier;
   }
 });
-Object.defineProperty(exports, "hasImportDeclarationFromAnyPackageEntrypoint", {
+Object.defineProperty(exports, "getDynamicImportName", {
   enumerable: true,
   get: function get() {
-    return _support.hasImportDeclarationFromAnyPackageEntrypoint;
+    return _support.getDynamicImportName;
   }
 });
-Object.defineProperty(exports, "addCommentBefore", {
+Object.defineProperty(exports, "getJSXAttributesByName", {
   enumerable: true,
   get: function get() {
-    return _support.addCommentBefore;
+    return _support.getJSXAttributesByName;
   }
 });
-Object.defineProperty(exports, "addCommentToStartOfFile", {
+Object.defineProperty(exports, "getNamedSpecifier", {
   enumerable: true,
   get: function get() {
-    return _support.addCommentToStartOfFile;
+    return _support.getNamedSpecifier;
   }
 });
-Object.defineProperty(exports, "callExpressionArgMatchesString", {
+Object.defineProperty(exports, "getSafeImportName", {
   enumerable: true,
   get: function get() {
-    return _support.callExpressionArgMatchesString;
+    return _support.getSafeImportName;
   }
 });
-Object.defineProperty(exports, "testMethodVariantEach", {
+Object.defineProperty(exports, "hasImportDeclaration", {
   enumerable: true,
   get: function get() {
-    return _support.testMethodVariantEach;
+    return _support.hasImportDeclaration;
   }
 });
-Object.defineProperty(exports, "getSafeImportName", {
+Object.defineProperty(exports, "hasImportDeclarationFromAnyPackageEntrypoint", {
   enumerable: true,
   get: function get() {
-    return _support.getSafeImportName;
+    return _support.hasImportDeclarationFromAnyPackageEntrypoint;
+  }
+});
+Object.defineProperty(exports, "hasJSXAttributesByName", {
+  enumerable: true,
+  get: function get() {
+    return _support.hasJSXAttributesByName;
   }
 });
 Object.defineProperty(exports, "removeImport", {
@@ -147,28 +153,28 @@ Object.defineProperty(exports, "removeImport", {
     return _support.removeImport;
   }
 });
-Object.defineProperty(exports, "getDynamicImportName", {
+Object.defineProperty(exports, "renameNamedImportWithAliasName", {
   enumerable: true,
   get: function get() {
-    return _support.getDynamicImportName;
+    return _utils.renameNamedImportWithAliasName;
   }
 });
-Object.defineProperty(exports, "addDynamicImport", {
+Object.defineProperty(exports, "replaceImportStatementFor", {
   enumerable: true,
   get: function get() {
-    return _support.addDynamicImport;
+    return _utils.replaceImportStatementFor;
   }
 });
-Object.defineProperty(exports, "tryCreateImport", {
+Object.defineProperty(exports, "testMethodVariantEach", {
   enumerable: true,
   get: function get() {
-    return _support.tryCreateImport;
+    return _support.testMethodVariantEach;
   }
 });
-Object.defineProperty(exports, "addToImport", {
+Object.defineProperty(exports, "tryCreateImport", {
   enumerable: true,
   get: function get() {
-    return _support.addToImport;
+    return _support.tryCreateImport;
   }
 });
 

package/dist/cjs/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createRemoveFuncAddCommentFor = exports.createRenameJSXFunc = exports.flattenCertainChildPropsAsProp = exports.renameNamedImportWithAliasName = exports.createTransformer = exports.elevateComponentToNewEntryPoint = exports.replaceImportStatementFor = exports.createRemoveFuncFor = exports.createRenameImportFor = exports.createConvertFuncFor = exports.createRenameFuncFor = void 0;
+exports.replaceImportStatementFor = exports.renameNamedImportWithAliasName = exports.flattenCertainChildPropsAsProp = exports.elevateComponentToNewEntryPoint = exports.createTransformer = exports.createRenameJSXFunc = exports.createRenameImportFor = exports.createRenameFuncFor = exports.createRemoveFuncFor = exports.createRemoveFuncAddCommentFor = exports.createConvertFuncFor = exports.changeImportEntryPoint = void 0;
 
 var _support = require("./support");
 
@@ -273,4 +273,56 @@ var renameNamedImportWithAliasName = function renameNamedImportWithAliasName(com
   };
 };
 
-exports.renameNamedImportWithAliasName = renameNamedImportWithAliasName;
+exports.renameNamedImportWithAliasName = renameNamedImportWithAliasName;
+
+var changeImportEntryPoint = function changeImportEntryPoint(oldPackageName, importToConvert, newPackageName) {
+  return function (j, root) {
+    root.find(j.ImportDeclaration, {
+      source: {
+        value: oldPackageName
+      }
+    }).forEach(function (path) {
+      var _currentImportSpecifi;
+
+      var currentImportSpecifier = (path.value.specifiers || []).find(function (specifier) {
+        if (specifier.type === 'ImportSpecifier') {
+          return specifier.imported.name === importToConvert;
+        }
+
+        return false;
+      });
+
+      if (!currentImportSpecifier) {
+        return;
+      }
+
+      var importedSpecifierName = currentImportSpecifier.imported.name;
+      var localSpecifierName = (_currentImportSpecifi = currentImportSpecifier.local) === null || _currentImportSpecifi === void 0 ? void 0 : _currentImportSpecifi.name;
+      var newIdentifier = j.importSpecifier(j.identifier(importedSpecifierName), localSpecifierName ? j.identifier(localSpecifierName) : undefined); // check if new import exists, if not create it
+
+      (0, _support.tryCreateImport)(j, root, oldPackageName, newPackageName); // remove the old import specifier, but NOT the whole package
+
+      root.find(j.ImportDeclaration, {
+        source: {
+          value: oldPackageName
+        }
+      }).find(j.ImportSpecifier).filter(function (path) {
+        return path.value.imported.name === importToConvert;
+      }).remove(); // adds import specifier to new import
+
+      (0, _support.addToImport)(j, root, newIdentifier, newPackageName); // if there are any imports with no specifiers, remove the whole import
+
+      root.find(j.ImportDeclaration, {
+        source: {
+          value: oldPackageName
+        }
+      }).filter(function (path) {
+        var _path$value$specifier;
+
+        return !((_path$value$specifier = path.value.specifiers) !== null && _path$value$specifier !== void 0 && _path$value$specifier.length);
+      }).remove();
+    });
+  };
+};
+
+exports.changeImportEntryPoint = changeImportEntryPoint;

package/dist/cjs/utils/support.js

@@ -5,14 +5,18 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getNamedSpecifier = getNamedSpecifier;
 exports.addCommentBefore = addCommentBefore;
-exports.removeImport = removeImport;
-exports.tryCreateImport = tryCreateImport;
+exports.addDynamicImport = exports.addCommentToStartOfFile = void 0;
 exports.addToImport = addToImport;
+exports.callExpressionArgMatchesString = void 0;
 exports.clean = clean;
+exports.getJSXAttributesByName = exports.getDynamicImportName = exports.getDefaultSpecifier = exports.doesIdentifierExist = exports.debug = void 0;
+exports.getNamedSpecifier = getNamedSpecifier;
 exports.getSafeImportName = getSafeImportName;
-exports.addDynamicImport = exports.getDynamicImportName = exports.testMethodVariantEach = exports.callExpressionArgMatchesString = exports.debug = exports.isEmpty = exports.shiftDefaultImport = exports.doesIdentifierExist = exports.addCommentToStartOfFile = exports.hasImportDeclarationFromAnyPackageEntrypoint = exports.hasImportDeclaration = exports.hasJSXAttributesByName = exports.getJSXAttributesByName = exports.getDefaultSpecifier = void 0;
+exports.isEmpty = exports.hasJSXAttributesByName = exports.hasImportDeclarationFromAnyPackageEntrypoint = exports.hasImportDeclaration = void 0;
+exports.removeImport = removeImport;
+exports.testMethodVariantEach = exports.shiftDefaultImport = void 0;
+exports.tryCreateImport = tryCreateImport;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -293,13 +297,13 @@ function tryCreateImport(j, base, relativeToPackage, packageName) {
 
   base.find(j.ImportDeclaration).filter(function (path) {
     return path.value.source.value === relativeToPackage;
-  }).insertBefore(j.importDeclaration([], j.literal(packageName)));
+  }).at(0).insertBefore(j.importDeclaration([], j.literal(packageName)));
 }
 
 function addToImport(j, base, importSpecifier, packageName) {
   base.find(j.ImportDeclaration).filter(function (path) {
     return path.value.source.value === packageName;
-  }).replaceWith(function (declaration) {
+  }).at(0).replaceWith(function (declaration) {
     return j.importDeclaration([].concat((0, _toConsumableArray2.default)((declaration.value.specifiers || []).filter(function (item) {
       return item.type === 'ImportSpecifier' && item.imported != null;
     })), [importSpecifier]), j.literal(packageName));

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/codemod-utils",
-	"version": "3.4.0",
+	"version": "4.0.2",
 	"sideEffects": false
 }

package/dist/es2019/index.js

@@ -1,2 +1,2 @@
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor } from './utils';
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint } from './utils';
 export { getDefaultSpecifier, getNamedSpecifier, getJSXAttributesByName, hasJSXAttributesByName, doesIdentifierExist, hasImportDeclaration, hasImportDeclarationFromAnyPackageEntrypoint, addCommentBefore, addCommentToStartOfFile, callExpressionArgMatchesString, testMethodVariantEach, getSafeImportName, removeImport, getDynamicImportName, addDynamicImport, tryCreateImport, addToImport } from './utils/support';

package/dist/es2019/utils/index.js

@@ -1,4 +1,4 @@
-import { addCommentToStartOfFile, getDefaultSpecifier, getJSXAttributesByName, getNamedSpecifier, getSafeImportName } from './support';
+import { addCommentToStartOfFile, addToImport, getDefaultSpecifier, getJSXAttributesByName, getNamedSpecifier, getSafeImportName, tryCreateImport } from './support';
 
 const createRemoveFuncFor = (component, importName, prop, predicate = () => true, comment) => (j, source) => {
   const specifier = getNamedSpecifier(j, source, component, importName);
@@ -200,4 +200,50 @@ const renameNamedImportWithAliasName = (component, from, to) => (j, source) => {
   });
 };
 
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor };
+const changeImportEntryPoint = (oldPackageName, importToConvert, newPackageName) => (j, root) => {
+  root.find(j.ImportDeclaration, {
+    source: {
+      value: oldPackageName
+    }
+  }).forEach(path => {
+    var _currentImportSpecifi;
+
+    const currentImportSpecifier = (path.value.specifiers || []).find(specifier => {
+      if (specifier.type === 'ImportSpecifier') {
+        return specifier.imported.name === importToConvert;
+      }
+
+      return false;
+    });
+
+    if (!currentImportSpecifier) {
+      return;
+    }
+
+    const importedSpecifierName = currentImportSpecifier.imported.name;
+    const localSpecifierName = (_currentImportSpecifi = currentImportSpecifier.local) === null || _currentImportSpecifi === void 0 ? void 0 : _currentImportSpecifi.name;
+    const newIdentifier = j.importSpecifier(j.identifier(importedSpecifierName), localSpecifierName ? j.identifier(localSpecifierName) : undefined); // check if new import exists, if not create it
+
+    tryCreateImport(j, root, oldPackageName, newPackageName); // remove the old import specifier, but NOT the whole package
+
+    root.find(j.ImportDeclaration, {
+      source: {
+        value: oldPackageName
+      }
+    }).find(j.ImportSpecifier).filter(path => path.value.imported.name === importToConvert).remove(); // adds import specifier to new import
+
+    addToImport(j, root, newIdentifier, newPackageName); // if there are any imports with no specifiers, remove the whole import
+
+    root.find(j.ImportDeclaration, {
+      source: {
+        value: oldPackageName
+      }
+    }).filter(path => {
+      var _path$value$specifier;
+
+      return !((_path$value$specifier = path.value.specifiers) !== null && _path$value$specifier !== void 0 && _path$value$specifier.length);
+    }).remove();
+  });
+};
+
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint };

package/dist/es2019/utils/support.js

@@ -222,11 +222,11 @@ function tryCreateImport(j, base, relativeToPackage, packageName) {
     return;
   }
 
-  base.find(j.ImportDeclaration).filter(path => path.value.source.value === relativeToPackage).insertBefore(j.importDeclaration([], j.literal(packageName)));
+  base.find(j.ImportDeclaration).filter(path => path.value.source.value === relativeToPackage).at(0).insertBefore(j.importDeclaration([], j.literal(packageName)));
 }
 
 function addToImport(j, base, importSpecifier, packageName) {
-  base.find(j.ImportDeclaration).filter(path => path.value.source.value === packageName).replaceWith(declaration => {
+  base.find(j.ImportDeclaration).filter(path => path.value.source.value === packageName).at(0).replaceWith(declaration => {
     return j.importDeclaration([// we are appending to the existing specifiers
     // We are doing a filter hear because sometimes specifiers can be removed
     // but they hand around in the declaration

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/codemod-utils",
-	"version": "3.4.0",
+	"version": "4.0.2",
 	"sideEffects": false
 }

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor } from './utils';
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint } from './utils';
 export { getDefaultSpecifier, getNamedSpecifier, getJSXAttributesByName, hasJSXAttributesByName, doesIdentifierExist, hasImportDeclaration, hasImportDeclarationFromAnyPackageEntrypoint, addCommentBefore, addCommentToStartOfFile, callExpressionArgMatchesString, testMethodVariantEach, getSafeImportName, removeImport, getDynamicImportName, addDynamicImport, tryCreateImport, addToImport } from './utils/support';

package/dist/esm/utils/index.js

@@ -1,4 +1,4 @@
-import { addCommentToStartOfFile, getDefaultSpecifier, getJSXAttributesByName, getNamedSpecifier, getSafeImportName } from './support';
+import { addCommentToStartOfFile, addToImport, getDefaultSpecifier, getJSXAttributesByName, getNamedSpecifier, getSafeImportName, tryCreateImport } from './support';
 
 var createRemoveFuncFor = function createRemoveFuncFor(component, importName, prop) {
   var predicate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function () {
@@ -246,4 +246,54 @@ var renameNamedImportWithAliasName = function renameNamedImportWithAliasName(com
   };
 };
 
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor };
+var changeImportEntryPoint = function changeImportEntryPoint(oldPackageName, importToConvert, newPackageName) {
+  return function (j, root) {
+    root.find(j.ImportDeclaration, {
+      source: {
+        value: oldPackageName
+      }
+    }).forEach(function (path) {
+      var _currentImportSpecifi;
+
+      var currentImportSpecifier = (path.value.specifiers || []).find(function (specifier) {
+        if (specifier.type === 'ImportSpecifier') {
+          return specifier.imported.name === importToConvert;
+        }
+
+        return false;
+      });
+
+      if (!currentImportSpecifier) {
+        return;
+      }
+
+      var importedSpecifierName = currentImportSpecifier.imported.name;
+      var localSpecifierName = (_currentImportSpecifi = currentImportSpecifier.local) === null || _currentImportSpecifi === void 0 ? void 0 : _currentImportSpecifi.name;
+      var newIdentifier = j.importSpecifier(j.identifier(importedSpecifierName), localSpecifierName ? j.identifier(localSpecifierName) : undefined); // check if new import exists, if not create it
+
+      tryCreateImport(j, root, oldPackageName, newPackageName); // remove the old import specifier, but NOT the whole package
+
+      root.find(j.ImportDeclaration, {
+        source: {
+          value: oldPackageName
+        }
+      }).find(j.ImportSpecifier).filter(function (path) {
+        return path.value.imported.name === importToConvert;
+      }).remove(); // adds import specifier to new import
+
+      addToImport(j, root, newIdentifier, newPackageName); // if there are any imports with no specifiers, remove the whole import
+
+      root.find(j.ImportDeclaration, {
+        source: {
+          value: oldPackageName
+        }
+      }).filter(function (path) {
+        var _path$value$specifier;
+
+        return !((_path$value$specifier = path.value.specifiers) !== null && _path$value$specifier !== void 0 && _path$value$specifier.length);
+      }).remove();
+    });
+  };
+};
+
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint };

package/dist/esm/utils/support.js

@@ -252,13 +252,13 @@ function tryCreateImport(j, base, relativeToPackage, packageName) {
 
   base.find(j.ImportDeclaration).filter(function (path) {
     return path.value.source.value === relativeToPackage;
-  }).insertBefore(j.importDeclaration([], j.literal(packageName)));
+  }).at(0).insertBefore(j.importDeclaration([], j.literal(packageName)));
 }
 
 function addToImport(j, base, importSpecifier, packageName) {
   base.find(j.ImportDeclaration).filter(function (path) {
     return path.value.source.value === packageName;
-  }).replaceWith(function (declaration) {
+  }).at(0).replaceWith(function (declaration) {
     return j.importDeclaration([].concat(_toConsumableArray((declaration.value.specifiers || []).filter(function (item) {
       return item.type === 'ImportSpecifier' && item.imported != null;
     })), [importSpecifier]), j.literal(packageName));

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/codemod-utils",
-	"version": "3.4.0",
+	"version": "4.0.2",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, } from './utils';
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint, } from './utils';
 export { getDefaultSpecifier, getNamedSpecifier, getJSXAttributesByName, hasJSXAttributesByName, doesIdentifierExist, hasImportDeclaration, hasImportDeclarationFromAnyPackageEntrypoint, addCommentBefore, addCommentToStartOfFile, callExpressionArgMatchesString, testMethodVariantEach, getSafeImportName, removeImport, getDynamicImportName, addDynamicImport, tryCreateImport, addToImport, } from './utils/support';

package/dist/types/utils/index.d.ts

@@ -11,4 +11,5 @@ declare const flattenCertainChildPropsAsProp: (component: string, propName: stri
 declare const createRenameJSXFunc: (packagePath: string, from: string, to: string, fallback?: string | undefined) => (j: core.JSCodeshift, source: any) => void;
 declare const createRemoveFuncAddCommentFor: (component: string, prop: string, comment?: string | undefined) => (j: core.JSCodeshift, source: Collection<Node>) => void;
 declare const renameNamedImportWithAliasName: (component: string, from: string, to: string) => (j: core.JSCodeshift, source: Collection<Node>) => void;
-export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, };
+declare const changeImportEntryPoint: (oldPackageName: string, importToConvert: string, newPackageName: string) => (j: core.JSCodeshift, root: Collection<Node>) => void;
+export { createRenameFuncFor, createConvertFuncFor, createRenameImportFor, createRemoveFuncFor, replaceImportStatementFor, elevateComponentToNewEntryPoint, createTransformer, renameNamedImportWithAliasName, flattenCertainChildPropsAsProp, createRenameJSXFunc, createRemoveFuncAddCommentFor, changeImportEntryPoint, };

package/dist/types/utils/support.d.ts

@@ -9,7 +9,7 @@ declare const addCommentToStartOfFile: ({ j, base, message, }: {
     base: Collection<Node>;
     message: string;
 }) => void;
-declare function addCommentBefore(j: core.JSCodeshift, target: Collection<Program> | Collection<ImportDeclaration> | Collection<JSXElement> | Collection<CallExpression> | Collection<VariableDeclarator>, message: string, commentType?: 'block' | 'line', messagePrefix?: string): void;
+declare function addCommentBefore(j: core.JSCodeshift, target: Collection<Program> | Collection<ImportDeclaration> | Collection<JSXElement> | Collection<JSXAttribute> | Collection<CallExpression> | Collection<VariableDeclarator>, message: string, commentType?: 'block' | 'line', messagePrefix?: string): void;
 declare const getDefaultSpecifier: (j: core.JSCodeshift, source: Collection<Node>, specifier: string) => string | null;
 declare const getJSXAttributesByName: (j: core.JSCodeshift, element: ASTPath<any>, attributeName: string) => Collection<JSXAttribute>;
 declare const isEmpty: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/codemod-utils",
-  "version": "3.4.0",
+  "version": "4.0.2",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
   "description": " jscodeshift-compatible codemod utilities",
@@ -8,7 +8,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "atlassian": {
-    "team": "AFP: Monorepo",
+    "team": "UIP: Monorepo",
     "inPublicMirror": false,
     "releaseModel": "continuous"
   },
@@ -30,7 +30,7 @@
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@types/jscodeshift": "^0.11.0",
     "jscodeshift": "^0.13.0",
-    "typescript": "3.9.6"
+    "typescript": "4.2.4"
   },
   "techstack": {
     "@atlassian/frontend": {
@@ -46,7 +46,7 @@
         "analytics-next"
       ],
       "theming": [
-        "new-theming-api"
+        "react-context"
       ],
       "ui-components": [
         "lite-mode"