Remove v2 from utility names in client-names folder (#463)

Author: trivikr

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

@@ -0,0 +1,13 @@
+import { CLIENT_NAMES, PACKAGE_NAME } from "../config";
+
+const DEEP_IMPORT_PATH_REGEXP = new RegExp(`${PACKAGE_NAME}/clients/([\\w]*)`, "g");
+
+export const getClientNamesFromDeepImport = (fileSource: string) => {
+  const clientsFromDeepImportPath = new Set(
+    [...fileSource.matchAll(DEEP_IMPORT_PATH_REGEXP)].map((regExpMatch) => regExpMatch[1]).flat()
+  );
+
+  return CLIENT_NAMES.filter((clientName) =>
+    clientsFromDeepImportPath.has(clientName.toLowerCase())
+  );
+};

src/transforms/v2-to-v3/client-names/getV2ClientNamesFromGlobal.ts renamed to src/transforms/v2-to-v3/client-names/getClientNamesFromGlobal.ts

@@ -4,7 +4,7 @@ import { CLIENT_NAMES } from "../config";
 import { getNamesFromNewExpr } from "./getNamesFromNewExpr";
 import { getNamesFromTSQualifiedName } from "./getNamesFromTSQualifiedName";
 
-export const getV2ClientNamesFromGlobal = (
+export const getClientNamesFromGlobal = (
   j: JSCodeshift,
   source: Collection<unknown>,
   v2GlobalName: string

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

@@ -0,0 +1,13 @@
+import { Collection, JSCodeshift } from "jscodeshift";
+
+import { hasRequire } from "../modules";
+import { getClientNamesFromDeepImport } from "./getClientNamesFromDeepImport";
+import { getClientNamesRecordFromImport } from "./getClientNamesRecordFromImport";
+import { getClientNamesRecordFromRequire } from "./getClientNamesRecordFromRequire";
+
+export const getClientNamesRecord = (j: JSCodeshift, source: Collection<unknown>) => {
+  const clientNamesFromDeepImport = getClientNamesFromDeepImport(source.toSource());
+  return hasRequire(j, source)
+    ? getClientNamesRecordFromRequire(j, source, clientNamesFromDeepImport)
+    : getClientNamesRecordFromImport(j, source, clientNamesFromDeepImport);
+};

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

@@ -5,12 +5,12 @@ import { getImportEqualsDeclarationType } from "../modules";
 import { getImportSpecifiers } from "../modules";
 import { getClientDeepImportPath } from "../utils";
 
-export const getV2ClientNamesRecordFromImport = (
+export const getClientNamesRecordFromImport = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  v2ClientNamesWithServiceModule: string[]
+  clientNamesFromDeepImport: string[]
 ) => {
-  const v2ClientNamesRecord: Record<string, string> = {};
+  const clientNamesRecord: Record<string, string> = {};
 
   const specifiersFromNamedImport = getImportSpecifiers(j, source, PACKAGE_NAME).filter(
     (specifier) => specifier?.type === "ImportSpecifier"
@@ -20,29 +20,29 @@ export const getV2ClientNamesRecordFromImport = (
     const importedName = specifier.imported.name;
     const localName = (specifier.local as Identifier).name;
     if (CLIENT_NAMES.includes(importedName)) {
-      v2ClientNamesRecord[importedName] = localName ?? importedName;
+      clientNamesRecord[importedName] = localName ?? importedName;
     }
   }
 
-  for (const clientName of v2ClientNamesWithServiceModule) {
+  for (const clientName of clientNamesFromDeepImport) {
     const deepImportPath = getClientDeepImportPath(clientName);
 
     const specifiersFromDeepImport = getImportSpecifiers(j, source, deepImportPath).filter(
       (specifier) =>
         ["ImportDefaultSpecifier", "ImportNamespaceSpecifier"].includes(specifier?.type as string)
     );
     if (specifiersFromDeepImport.length > 0) {
-      v2ClientNamesRecord[clientName] = (specifiersFromDeepImport[0]?.local as Identifier).name;
+      clientNamesRecord[clientName] = (specifiersFromDeepImport[0]?.local as Identifier).name;
     }
 
     const identifiersFromImportEquals = source.find(
       j.TSImportEqualsDeclaration,
       getImportEqualsDeclarationType(deepImportPath)
     );
     if (identifiersFromImportEquals.length > 0) {
-      v2ClientNamesRecord[clientName] = identifiersFromImportEquals.nodes()[0]?.id.name;
+      clientNamesRecord[clientName] = identifiersFromImportEquals.nodes()[0]?.id.name;
     }
   }
 
-  return v2ClientNamesRecord;
+  return clientNamesRecord;
 };

src/transforms/v2-to-v3/client-names/getV2ClientNamesRecordFromRequire.ts renamed to src/transforms/v2-to-v3/client-names/getClientNamesRecordFromRequire.ts

@@ -12,12 +12,12 @@ import { getRequireDeclaratorsWithProperty } from "../modules";
 import { getClientDeepImportPath } from "../utils";
 import { getRequireIds } from "./getRequireIds";
 
-export const getV2ClientNamesRecordFromRequire = (
+export const getClientNamesRecordFromRequire = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  v2ClientNamesWithServiceModule: string[]
+  clientNamesFromDeepImport: string[]
 ) => {
-  const v2ClientNamesRecord: Record<string, string> = {};
+  const clientNamesRecord: Record<string, string> = {};
 
   const idPropertiesFromObjectPattern = getRequireIds(j, source, PACKAGE_NAME)
     .filter((id) => id.type === "ObjectPattern")
@@ -34,7 +34,7 @@ export const getV2ClientNamesRecordFromRequire = (
       continue;
     }
     if (CLIENT_NAMES.includes(key.name)) {
-      v2ClientNamesRecord[key.name] = value.name;
+      clientNamesRecord[key.name] = value.name;
     }
   }
 
@@ -50,22 +50,22 @@ export const getV2ClientNamesRecordFromRequire = (
       init.type === "MemberExpression" &&
       init.property.type === "Identifier"
     ) {
-      const v2ClientName = (init.property as Identifier).name;
-      if (CLIENT_NAMES.includes(v2ClientName)) {
-        v2ClientNamesRecord[v2ClientName] = (id as Identifier).name;
+      const clientName = (init.property as Identifier).name;
+      if (CLIENT_NAMES.includes(clientName)) {
+        clientNamesRecord[clientName] = (id as Identifier).name;
       }
     }
   }
 
-  for (const clientName of v2ClientNamesWithServiceModule) {
+  for (const clientName of clientNamesFromDeepImport) {
     const deepImportPath = getClientDeepImportPath(clientName);
     const idsFromDefaultImport = getRequireIds(j, source, deepImportPath).filter(
       (id) => id.type === "Identifier"
     );
     if (idsFromDefaultImport.length) {
-      v2ClientNamesRecord[clientName] = (idsFromDefaultImport[0] as Identifier).name;
+      clientNamesRecord[clientName] = (idsFromDefaultImport[0] as Identifier).name;
     }
   }
 
-  return v2ClientNamesRecord;
+  return clientNamesRecord;
 };

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

@@ -1,3 +1,3 @@
 export * from "./getClientMetadataRecord";
-export * from "./getV2ClientNamesFromGlobal";
-export * from "./getV2ClientNamesRecord";
+export * from "./getClientNamesFromGlobal";
+export * from "./getClientNamesRecord";

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

@@ -5,8 +5,8 @@ import { replaceS3UploadApi } from "./apis/replaceS3UploadApi";
 import { replaceClientCreation } from "./client-instances";
 import {
   getClientMetadataRecord,
-  getV2ClientNamesFromGlobal,
-  getV2ClientNamesRecord,
+  getClientNamesFromGlobal,
+  getClientNamesRecord,
 } from "./client-names";
 import {
   addClientModules,
@@ -22,14 +22,14 @@ const transformer = async (file: FileInfo, api: API) => {
   const source = j(file.source);
 
   const v2GlobalName = getGlobalNameFromModule(j, source);
-  const v2ClientNamesRecord = getV2ClientNamesRecord(j, source);
+  const v2ClientNamesRecord = getClientNamesRecord(j, source);
 
   if (!v2GlobalName && Object.keys(v2ClientNamesRecord).length === 0) {
     return source.toSource();
   }
 
   if (v2GlobalName) {
-    for (const v2ClientNameFromGlobal of getV2ClientNamesFromGlobal(j, source, v2GlobalName)) {
+    for (const v2ClientNameFromGlobal of getClientNamesFromGlobal(j, source, v2GlobalName)) {
       if (!(v2ClientNameFromGlobal in v2ClientNamesRecord)) {
         v2ClientNamesRecord[v2ClientNameFromGlobal] = v2ClientNameFromGlobal;
       }