Rename getV2*Declaration to get*Declaration (#462)

trivikr · web-flow · commit a61eb1b37676 · 2023-03-02T14:16:05.000-08:00
diff --git a/src/transforms/v2-to-v3/client-names/getV2ClientNamesRecordFromImport.ts b/src/transforms/v2-to-v3/client-names/getV2ClientNamesRecordFromImport.ts
@@ -1,7 +1,7 @@
 import { Collection, Identifier, ImportSpecifier, JSCodeshift } from "jscodeshift";
 
 import { CLIENT_NAMES, PACKAGE_NAME } from "../config";
-import { getImportEqualsDeclaration } from "../modules";
+import { getImportEqualsDeclarationType } from "../modules";
 import { getImportSpecifiers } from "../modules";
 import { getClientDeepImportPath } from "../utils";
 
@@ -37,7 +37,7 @@ export const getV2ClientNamesRecordFromImport = (
 
     const identifiersFromImportEquals = source.find(
       j.TSImportEqualsDeclaration,
-      getImportEqualsDeclaration(deepImportPath)
+      getImportEqualsDeclarationType(deepImportPath)
     );
     if (identifiersFromImportEquals.length > 0) {
       v2ClientNamesRecord[clientName] = identifiersFromImportEquals.nodes()[0]?.id.name;
diff --git a/src/transforms/v2-to-v3/modules/addClientDefaultImport.ts b/src/transforms/v2-to-v3/modules/addClientDefaultImport.ts
@@ -1,8 +1,8 @@
 import { Collection, ImportDefaultSpecifier, JSCodeshift } from "jscodeshift";
 
 import { getDefaultLocalName } from "../utils";
+import { getImportDeclaration } from "./getImportDeclaration";
 import { getImportSpecifiers } from "./getImportSpecifiers";
-import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
 import { ClientModulesOptions } from "./types";
 
 export const addClientDefaultImport = (
@@ -29,7 +29,7 @@ export const addClientDefaultImport = (
   }
 
   // Insert after global import, or service import.
-  const v2ImportDeclaration = getV2ImportDeclaration(j, source, {
+  const v2ImportDeclaration = getImportDeclaration(j, source, {
     v2ClientName,
     v2ClientLocalName,
   });
diff --git a/src/transforms/v2-to-v3/modules/addClientDefaultImportEquals.ts b/src/transforms/v2-to-v3/modules/addClientDefaultImportEquals.ts
@@ -2,8 +2,8 @@ import { Collection, JSCodeshift } from "jscodeshift";
 
 import { getDefaultLocalName } from "../utils";
 import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
+import { getImportEqualsDeclarationType } from "./getImportEqualsDeclarationType";
 import { getImportEqualsLocalNameSuffix } from "./getImportEqualsLocalNameSuffix";
-import { getV2ImportEqualsDeclaration } from "./getV2ImportEqualsDeclaration";
 import { ClientModulesOptions } from "./types";
 
 export const addClientDefaultImportEquals = (
@@ -15,7 +15,7 @@ export const addClientDefaultImportEquals = (
   const defaultLocalName = getDefaultLocalName(localNameSuffix);
   const existingImportEquals = source.find(
     j.TSImportEqualsDeclaration,
-    getImportEqualsDeclaration(v3ClientPackageName)
+    getImportEqualsDeclarationType(v3ClientPackageName)
   );
 
   if (existingImportEquals.size()) {
@@ -29,7 +29,7 @@ export const addClientDefaultImportEquals = (
   }
 
   // Insert after global, or service import equals.
-  const v2ImportEqualsDeclaration = getV2ImportEqualsDeclaration(j, source, {
+  const v2ImportEqualsDeclaration = getImportEqualsDeclaration(j, source, {
     v2ClientName,
     v2ClientLocalName,
     v2GlobalName,
diff --git a/src/transforms/v2-to-v3/modules/addClientDefaultRequire.ts b/src/transforms/v2-to-v3/modules/addClientDefaultRequire.ts
@@ -1,8 +1,8 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
 import { getDefaultLocalName } from "../utils";
+import { getRequireDeclarator } from "./getRequireDeclarator";
 import { getRequireDeclarators } from "./getRequireDeclarators";
-import { getV2RequireDeclarator } from "./getV2RequireDeclarator";
 import { ClientModulesOptions } from "./types";
 
 export const addClientDefaultRequire = (
@@ -29,7 +29,7 @@ export const addClientDefaultRequire = (
 
   // prettier-ignore
   const v2RequireDeclarator =
-    getV2RequireDeclarator(j, source, { v2ClientName, v2ClientLocalName, v2GlobalName });
+    getRequireDeclarator(j, source, { v2ClientName, v2ClientLocalName, v2GlobalName });
 
   const v3RequireDeclarator = j.variableDeclarator(
     j.identifier(defaultLocalName),
diff --git a/src/transforms/v2-to-v3/modules/addClientNamedImport.ts b/src/transforms/v2-to-v3/modules/addClientNamedImport.ts
@@ -1,8 +1,8 @@
 import { Collection, ImportSpecifier, JSCodeshift } from "jscodeshift";
 
+import { getImportDeclaration } from "./getImportDeclaration";
 import { getImportSpecifier } from "./getImportSpecifier";
 import { getImportSpecifiers } from "./getImportSpecifiers";
-import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
 import { importSpecifierCompareFn } from "./importSpecifierCompareFn";
 import { ClientModulesOptions, ImportSpecifierOptions } from "./types";
 
@@ -41,7 +41,7 @@ export const addClientNamedImport = (
   }
 
   // Insert after global import, or service import.
-  const v2ImportDeclaration = getV2ImportDeclaration(j, source, {
+  const v2ImportDeclaration = getImportDeclaration(j, source, {
     v2ClientName,
     v2ClientLocalName,
   });
diff --git a/src/transforms/v2-to-v3/modules/addClientNamedImportEquals.ts b/src/transforms/v2-to-v3/modules/addClientNamedImportEquals.ts
@@ -2,7 +2,7 @@ import { Collection, JSCodeshift } from "jscodeshift";
 
 import { getDefaultLocalName } from "../utils";
 import { addClientDefaultImportEquals } from "./addClientDefaultImportEquals";
-import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
+import { getImportEqualsDeclarationType } from "./getImportEqualsDeclarationType";
 import { getImportEqualsLocalNameSuffix } from "./getImportEqualsLocalNameSuffix";
 import { getRequireProperty } from "./getRequireProperty";
 import { objectPatternPropertyCompareFn } from "./objectPatternPropertyCompareFn";
@@ -32,7 +32,7 @@ export const addClientNamedImportEquals = (
     return;
   }
 
-  const importEqualsDeclaration = getImportEqualsDeclaration(v3ClientPackageName);
+  const importEqualsDeclaration = getImportEqualsDeclarationType(v3ClientPackageName);
   if (source.find(j.TSImportEqualsDeclaration, importEqualsDeclaration).size() === 0) {
     addClientDefaultImportEquals(j, source, v3ClientModulesOptions);
   }
diff --git a/src/transforms/v2-to-v3/modules/addClientNamedRequire.ts b/src/transforms/v2-to-v3/modules/addClientNamedRequire.ts
@@ -2,10 +2,10 @@ import { Collection, JSCodeshift, ObjectPattern, ObjectProperty, Property } from
 
 import { OBJECT_PROPERTY_TYPE_LIST } from "../config";
 import { getDefaultLocalName } from "../utils";
+import { getRequireDeclarator } from "./getRequireDeclarator";
 import { getRequireDeclarators } from "./getRequireDeclarators";
 import { getRequireDeclaratorsWithIdentifier } from "./getRequireDeclaratorsWithIdentifier";
 import { getRequireProperty } from "./getRequireProperty";
-import { getV2RequireDeclarator } from "./getV2RequireDeclarator";
 import { objectPatternPropertyCompareFn } from "./objectPatternPropertyCompareFn";
 import { ClientModulesOptions, RequirePropertyOptions } from "./types";
 
@@ -75,7 +75,7 @@ export const addClientNamedRequire = (
 
   // prettier-ignore
   const v2RequireDeclarator =
-    getV2RequireDeclarator(j, source, { v2ClientName, v2ClientLocalName, v2GlobalName });
+    getRequireDeclarator(j, source, { v2ClientName, v2ClientLocalName, v2GlobalName });
 
   if (v2RequireDeclarator && v2RequireDeclarator.nodes().length > 0) {
     v2RequireDeclarator.insertAfter(v3RequireDeclarator);
diff --git a/src/transforms/v2-to-v3/modules/getGlobalNameFromModule.ts b/src/transforms/v2-to-v3/modules/getGlobalNameFromModule.ts
@@ -1,7 +1,7 @@
 import { Collection, Identifier, JSCodeshift } from "jscodeshift";
 
 import { PACKAGE_NAME } from "../config";
-import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
+import { getImportEqualsDeclarationType } from "./getImportEqualsDeclarationType";
 import { getImportSpecifiers } from "./getImportSpecifiers";
 import { hasRequire } from "./hasRequire";
 
@@ -36,7 +36,7 @@ export const getGlobalNameFromModule = (
 
   const importEqualsDeclarations = source.find(
     j.TSImportEqualsDeclaration,
-    getImportEqualsDeclaration(PACKAGE_NAME)
+    getImportEqualsDeclarationType(PACKAGE_NAME)
   );
 
   if (importEqualsDeclarations.length > 0) {
diff --git a/src/transforms/v2-to-v3/modules/getImportDeclaration.ts b/src/transforms/v2-to-v3/modules/getImportDeclaration.ts
@@ -3,15 +3,15 @@ import { Collection, JSCodeshift } from "jscodeshift";
 import { PACKAGE_NAME } from "../config";
 import { getClientDeepImportPath } from "../utils";
 
-export interface GetV2ImportDeclarationOptions {
+export interface GetImportDeclarationOptions {
   v2ClientName: string;
   v2ClientLocalName: string;
 }
 
-export const getV2ImportDeclaration = (
+export const getImportDeclaration = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2ClientName, v2ClientLocalName }: GetV2ImportDeclarationOptions
+  { v2ClientName, v2ClientLocalName }: GetImportDeclarationOptions
 ) =>
   // Return global or service import declaration.
   source.find(j.ImportDeclaration).filter((importDeclaration) => {
diff --git a/src/transforms/v2-to-v3/modules/getImportEqualsDeclaration.ts b/src/transforms/v2-to-v3/modules/getImportEqualsDeclaration.ts
@@ -1,10 +1,39 @@
-import { TSImportEqualsDeclaration } from "jscodeshift";
-
-export const getImportEqualsDeclaration = (expressionValue?: string) =>
-  ({
-    type: "TSImportEqualsDeclaration",
-    moduleReference: {
-      type: "TSExternalModuleReference",
-      expression: { type: "StringLiteral", ...(expressionValue && { value: expressionValue }) },
-    },
-  } as TSImportEqualsDeclaration);
+import { Collection, JSCodeshift, TSExternalModuleReference } from "jscodeshift";
+
+import { PACKAGE_NAME } from "../config";
+import { getClientDeepImportPath } from "../utils";
+import { getImportEqualsDeclarationType } from "./getImportEqualsDeclarationType";
+
+export interface GetImportEqualsDeclarationOptions {
+  v2ClientName: string;
+  v2ClientLocalName: string;
+  v2GlobalName?: string;
+}
+
+export const getImportEqualsDeclaration = (
+  j: JSCodeshift,
+  source: Collection<unknown>,
+  { v2ClientName, v2ClientLocalName, v2GlobalName }: GetImportEqualsDeclarationOptions
+) =>
+  // Return global or service import declaration.
+  source
+    .find(j.TSImportEqualsDeclaration, getImportEqualsDeclarationType())
+    .filter((importEqualsDeclaration) => {
+      const identifierName = importEqualsDeclaration.value.id.name;
+      const importEqualsModuleRef = importEqualsDeclaration.value
+        .moduleReference as TSExternalModuleReference;
+      const expressionValue = importEqualsModuleRef.expression.value;
+
+      if (expressionValue === PACKAGE_NAME && identifierName === v2GlobalName) {
+        return true;
+      }
+
+      if (
+        expressionValue === getClientDeepImportPath(v2ClientName) &&
+        identifierName === v2ClientLocalName
+      ) {
+        return true;
+      }
+
+      return false;
+    });
diff --git a/src/transforms/v2-to-v3/modules/getImportEqualsDeclarationType.ts b/src/transforms/v2-to-v3/modules/getImportEqualsDeclarationType.ts
@@ -0,0 +1,10 @@
+import { TSImportEqualsDeclaration } from "jscodeshift";
+
+export const getImportEqualsDeclarationType = (expressionValue?: string) =>
+  ({
+    type: "TSImportEqualsDeclaration",
+    moduleReference: {
+      type: "TSExternalModuleReference",
+      expression: { type: "StringLiteral", ...(expressionValue && { value: expressionValue }) },
+    },
+  } as TSImportEqualsDeclaration);
diff --git a/src/transforms/v2-to-v3/modules/getRequireDeclarator.ts b/src/transforms/v2-to-v3/modules/getRequireDeclarator.ts
@@ -6,16 +6,16 @@ import { getRequireDeclaratorsWithIdentifier } from "./getRequireDeclaratorsWith
 import { getRequireDeclaratorsWithObjectPattern } from "./getRequireDeclaratorsWithObjectPattern";
 import { getRequireDeclaratorsWithProperty } from "./getRequireDeclaratorsWithProperty";
 
-export interface GetV2BaseDeclaratorOptions {
+export interface GetRequireDeclaratorOptions {
   v2ClientName: string;
   v2ClientLocalName: string;
   v2GlobalName?: string;
 }
 
-export const getV2RequireDeclarator = (
+export const getRequireDeclarator = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2ClientName, v2ClientLocalName, v2GlobalName }: GetV2BaseDeclaratorOptions
+  { v2ClientName, v2ClientLocalName, v2GlobalName }: GetRequireDeclaratorOptions
 ) => {
   if (v2GlobalName) {
     const requireDeclaratorsWithIdentifier = getRequireDeclaratorsWithIdentifier(j, source, {
diff --git a/src/transforms/v2-to-v3/modules/getV2ImportEqualsDeclaration.ts b/src/transforms/v2-to-v3/modules/getV2ImportEqualsDeclaration.ts
diff --git a/src/transforms/v2-to-v3/modules/hasImportEquals.ts b/src/transforms/v2-to-v3/modules/hasImportEquals.ts
@@ -1,10 +1,10 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
-import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
+import { getImportEqualsDeclarationType } from "./getImportEqualsDeclarationType";
 
 export const hasImportEquals = (j: JSCodeshift, source: Collection<unknown>) =>
   source
-    .find(j.TSImportEqualsDeclaration, getImportEqualsDeclaration())
+    .find(j.TSImportEqualsDeclaration, getImportEqualsDeclarationType())
     .filter((importEqualsDeclaration) => {
       const { moduleReference } = importEqualsDeclaration.value;
       if (moduleReference.type !== "TSExternalModuleReference") return false;
diff --git a/src/transforms/v2-to-v3/modules/index.ts b/src/transforms/v2-to-v3/modules/index.ts
@@ -1,6 +1,6 @@
 export * from "./addClientModules";
 export * from "./getGlobalNameFromModule";
-export * from "./getImportEqualsDeclaration";
+export * from "./getImportEqualsDeclarationType";
 export * from "./getImportSpecifiers";
 export * from "./getRequireDeclaratorsWithProperty";
 export * from "./hasRequire";
