Use utility getImportSpecifiers in modules (#306)

Author: trivikr

src/transforms/v2-to-v3/client-names/getV2ClientNamesRecordFromImport.ts

@@ -2,8 +2,8 @@ import { Collection, Identifier, ImportSpecifier, JSCodeshift } from "jscodeshif
 
 import { CLIENT_NAMES, PACKAGE_NAME } from "../config";
 import { getImportEqualsDeclaration } from "../modules";
+import { getImportSpecifiers } from "../modules";
 import { getV2ServiceModulePath } from "../utils";
-import { getImportSpecifiers } from "./getImportSpecifiers";
 
 export const getV2ClientNamesRecordFromImport = (
   j: JSCodeshift,

src/transforms/v2-to-v3/modules/addV3ClientDefaultImport.ts

@@ -1,6 +1,7 @@
 import { Collection, ImportDefaultSpecifier, JSCodeshift } from "jscodeshift";
 
 import { getV3ClientDefaultLocalName } from "../utils";
+import { getImportSpecifiers } from "./getImportSpecifiers";
 import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
 import { V3ClientModulesOptions } from "./types";
 
@@ -11,23 +12,18 @@ export const addV3ClientDefaultImport = (
 ) => {
   const localName = getV3ClientDefaultLocalName(v2ClientLocalName);
   const defaultImportSpecifier = j.importDefaultSpecifier(j.identifier(localName));
-  const existingImports = source.find(j.ImportDeclaration, {
+
+  const importDeclarations = source.find(j.ImportDeclaration, {
     source: { value: v3ClientPackageName },
   });
 
-  const existingImportDefaultSpecifiers = existingImports
-    .nodes()
-    .map((importDeclaration) => importDeclaration.specifiers)
-    .flat()
-    .filter(
-      (importSpecifier) => importSpecifier?.type === "ImportDefaultSpecifier"
-    ) as ImportDefaultSpecifier[];
-
-  if (existingImports.length) {
-    if (
-      !existingImportDefaultSpecifiers.find((specifier) => specifier?.local?.name === localName)
-    ) {
-      existingImports.nodes()[0].specifiers?.push(defaultImportSpecifier);
+  const importDefaultSpecifiers = getImportSpecifiers(j, source, v3ClientPackageName).filter(
+    (importSpecifier) => importSpecifier?.type === "ImportDefaultSpecifier"
+  ) as ImportDefaultSpecifier[];
+
+  if (importDeclarations.length) {
+    if (!importDefaultSpecifiers.find((specifier) => specifier?.local?.name === localName)) {
+      importDeclarations.nodes()[0].specifiers?.push(defaultImportSpecifier);
       return;
     }
   }

src/transforms/v2-to-v3/modules/addV3ClientNamedImport.ts

@@ -1,5 +1,6 @@
 import { Collection, ImportSpecifier, JSCodeshift } from "jscodeshift";
 
+import { getImportSpecifiers } from "./getImportSpecifiers";
 import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
 import { getV3ClientImportSpecifier } from "./getV3ClientImportSpecifier";
 import { V3ClientModulesOptions } from "./types";
@@ -9,29 +10,25 @@ export const addV3ClientNamedImport = (
   source: Collection<unknown>,
   { v2ClientName, v2ClientLocalName, v3ClientPackageName, v3ClientName }: V3ClientModulesOptions
 ) => {
-  const existingImports = source.find(j.ImportDeclaration, {
+  const importDeclarations = source.find(j.ImportDeclaration, {
     source: { value: v3ClientPackageName },
   });
 
-  if (existingImports.size()) {
-    const existingImportSpecifiers = existingImports
-      .nodes()
-      .map((importDeclaration) => importDeclaration.specifiers)
-      .flat()
-      .filter(
-        (importSpecifier) => importSpecifier?.type === "ImportSpecifier"
-      ) as ImportSpecifier[];
+  if (importDeclarations.size()) {
+    const importSpecifiers = getImportSpecifiers(j, source, v3ClientPackageName).filter(
+      (importSpecifier) => importSpecifier?.type === "ImportSpecifier"
+    ) as ImportSpecifier[];
 
     if (
-      existingImportSpecifiers.find(
+      importSpecifiers.find(
         (specifier) =>
           specifier?.imported?.name === v3ClientName && specifier?.local?.name === v2ClientLocalName
       )
     ) {
       return;
     }
 
-    existingImports
+    importDeclarations
       .nodes()[0]
       .specifiers?.push(
         getV3ClientImportSpecifier(j, { localName: v2ClientLocalName, importedName: v3ClientName })

src/transforms/v2-to-v3/client-names/getImportSpecifiers.ts renamed to src/transforms/v2-to-v3/modules/getImportSpecifiers.ts

@@ -2,6 +2,7 @@ import { Collection, Identifier, JSCodeshift } from "jscodeshift";
 
 import { PACKAGE_NAME } from "../config";
 import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
+import { getImportSpecifiers } from "./getImportSpecifiers";
 import { hasRequire } from "./hasRequire";
 
 export const getV2GlobalNameFromModule = (
@@ -25,20 +26,12 @@ export const getV2GlobalNameFromModule = (
     }
   }
 
-  const importDefaultNamespaceSpecifiers = source
-    .find(j.ImportDeclaration, {
-      type: "ImportDeclaration",
-      source: { value: PACKAGE_NAME },
-    })
-    .nodes()
-    .map((importDeclaration) => importDeclaration.specifiers)
-    .flat()
-    .filter((specifier) =>
-      ["ImportDefaultSpecifier", "ImportNamespaceSpecifier"].includes(specifier?.type as string)
-    );
-
-  if (importDefaultNamespaceSpecifiers.length > 0) {
-    return (importDefaultNamespaceSpecifiers[0]?.local as Identifier).name;
+  const importDefaultSpecifiers = getImportSpecifiers(j, source, PACKAGE_NAME).filter((specifier) =>
+    ["ImportDefaultSpecifier", "ImportNamespaceSpecifier"].includes(specifier?.type as string)
+  );
+
+  if (importDefaultSpecifiers.length > 0) {
+    return (importDefaultSpecifiers[0]?.local as Identifier).name;
   }
 
   const importEqualsDeclarations = source.find(

src/transforms/v2-to-v3/modules/getV2GlobalNameFromModule.ts

@@ -1,5 +1,6 @@
 export * from "./addV3ClientModules";
 export * from "./getImportEqualsDeclaration";
+export * from "./getImportSpecifiers";
 export * from "./getV2GlobalNameFromModule";
 export * from "./hasRequire";
 export * from "./removeV2ClientModule";