Remove references to client while adding named import/requires (#378)

Author: trivikr

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

@@ -22,6 +22,10 @@ export const addV3ClientImportEquals = (
 
   if (newExpressionCount > 0 || clientTSTypeRefCount > 0) {
     addV3ClientDefaultImportEquals(j, source, options);
-    addV3ClientNamedImportEquals(j, source, options);
+    addV3ClientNamedImportEquals(j, source, {
+      ...options,
+      keyName: options.v3ClientName,
+      valueName: options.v2ClientLocalName,
+    });
   }
 };

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

@@ -22,6 +22,10 @@ export const addV3ClientImports = (
   }
 
   if (newExpressionCount > 0 || clientTSTypeRefCount > 0) {
-    addV3ClientNamedImport(j, source, options);
+    addV3ClientNamedImport(j, source, {
+      ...options,
+      importedName: options.v3ClientName,
+      localName: options.v2ClientLocalName,
+    });
   }
 };

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

@@ -3,12 +3,18 @@ import { Collection, ImportSpecifier, JSCodeshift } from "jscodeshift";
 import { getImportSpecifiers } from "./getImportSpecifiers";
 import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
 import { getV3ClientImportSpecifier } from "./getV3ClientImportSpecifier";
-import { V3ClientModulesOptions } from "./types";
+import { V3ClientImportSpecifierOptions, V3ClientModulesOptions } from "./types";
 
 export const addV3ClientNamedImport = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2ClientName, v2ClientLocalName, v3ClientPackageName, v3ClientName }: V3ClientModulesOptions
+  {
+    localName,
+    importedName,
+    v2ClientName,
+    v2ClientLocalName,
+    v3ClientPackageName,
+  }: V3ClientModulesOptions & V3ClientImportSpecifierOptions
 ) => {
   const importDeclarations = source.find(j.ImportDeclaration, {
     source: { value: v3ClientPackageName },
@@ -22,17 +28,15 @@ export const addV3ClientNamedImport = (
     if (
       importSpecifiers.find(
         (specifier) =>
-          specifier?.imported?.name === v3ClientName && specifier?.local?.name === v2ClientLocalName
+          specifier?.imported?.name === importedName && specifier?.local?.name === localName
       )
     ) {
       return;
     }
 
     importDeclarations
       .nodes()[0]
-      .specifiers?.push(
-        getV3ClientImportSpecifier(j, { localName: v2ClientLocalName, importedName: v3ClientName })
-      );
+      .specifiers?.push(getV3ClientImportSpecifier(j, { importedName, localName }));
     return;
   }
 
@@ -43,12 +47,7 @@ export const addV3ClientNamedImport = (
   });
 
   const importDeclaration = j.importDeclaration(
-    [
-      getV3ClientImportSpecifier(j, {
-        localName: v2ClientLocalName,
-        importedName: v3ClientName,
-      }),
-    ],
+    [getV3ClientImportSpecifier(j, { importedName, localName })],
     j.stringLiteral(v3ClientPackageName)
   );
 

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

@@ -2,12 +2,17 @@ import { Collection, JSCodeshift } from "jscodeshift";
 
 import { getV3ClientDefaultLocalName } from "../utils";
 import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
-import { V3ClientModulesOptions } from "./types";
+import { V3ClientModulesOptions, V3ClientRequirePropertyOptions } from "./types";
 
 export const addV3ClientNamedImportEquals = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2ClientLocalName, v3ClientName, v3ClientPackageName }: V3ClientModulesOptions
+  {
+    keyName,
+    valueName,
+    v2ClientLocalName,
+    v3ClientPackageName,
+  }: V3ClientModulesOptions & V3ClientRequirePropertyOptions
 ) => {
   const v3ClientDefaultLocalName = getV3ClientDefaultLocalName(v2ClientLocalName);
   const existingImportEquals = source.find(
@@ -19,8 +24,8 @@ export const addV3ClientNamedImportEquals = (
     j.variableDeclarator(
       j.objectPattern([
         j.objectProperty.from({
-          key: j.identifier(v3ClientName),
-          value: j.identifier(v2ClientLocalName),
+          key: j.identifier(keyName),
+          value: j.identifier(valueName),
           shorthand: true,
         }),
       ]),

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

@@ -5,24 +5,22 @@ import { getRequireDeclarators } from "./getRequireDeclarators";
 import { getRequireDeclaratorsWithIdentifier } from "./getRequireDeclaratorsWithIdentifier";
 import { getV2RequireDeclarator } from "./getV2RequireDeclarator";
 import { getV3ClientRequireProperty } from "./getV3ClientRequireProperty";
-import { V3ClientModulesOptions } from "./types";
+import { V3ClientModulesOptions, V3ClientRequirePropertyOptions } from "./types";
 
 export const addV3ClientNamedRequire = (
   j: JSCodeshift,
   source: Collection<unknown>,
   {
+    keyName,
+    valueName,
     v2ClientName,
     v2ClientLocalName,
     v2GlobalName,
-    v3ClientName,
     v3ClientPackageName,
-  }: V3ClientModulesOptions
+  }: V3ClientModulesOptions & V3ClientRequirePropertyOptions
 ) => {
   const v3ClientDefaultLocalName = getV3ClientDefaultLocalName(v2ClientLocalName);
-  const v3ClientObjectProperty = getV3ClientRequireProperty(j, {
-    keyName: v3ClientName,
-    valueName: v2ClientLocalName,
-  });
+  const v3ClientObjectProperty = getV3ClientRequireProperty(j, { keyName, valueName });
   const existingRequires = getRequireDeclarators(j, source, v3ClientPackageName);
 
   if (existingRequires && existingRequires.nodes().length > 0) {
@@ -40,8 +38,8 @@ export const addV3ClientNamedRequire = (
               property.type === "Property" &&
               property.key.type === "Identifier" &&
               property.value.type === "Identifier" &&
-              property.key.name === v3ClientName &&
-              property.value.name === v2ClientLocalName
+              property.key.name === keyName &&
+              property.value.name === valueName
           )
       )
     ) {

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

@@ -21,6 +21,10 @@ export const addV3ClientRequires = (
   }
 
   if (newExpressionCount > 0 || clientTSTypeRefCount > 0) {
-    addV3ClientNamedRequire(j, source, options);
+    addV3ClientNamedRequire(j, source, {
+      ...options,
+      keyName: options.v3ClientName,
+      valueName: options.v2ClientLocalName,
+    });
   }
 };