Remove v2 from remove*Module utilities (#460)

Author: trivikr

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

@@ -4,5 +4,5 @@ export * from "./getImportSpecifiers";
 export * from "./getRequireDeclaratorsWithProperty";
 export * from "./getV2GlobalNameFromModule";
 export * from "./hasRequire";
-export * from "./removeV2ClientModule";
-export * from "./removeV2GlobalModule";
+export * from "./removeClientModule";
+export * from "./removeGlobalModule";

src/transforms/v2-to-v3/modules/removeV2ClientModule.ts renamed to src/transforms/v2-to-v3/modules/removeClientModule.ts

@@ -12,16 +12,16 @@ import { removeRequireIdentifier } from "./removeRequireIdentifier";
 import { removeRequireObjectProperty } from "./removeRequireObjectProperty";
 import { removeRequireProperty } from "./removeRequireProperty";
 
-export interface RemoveV2ClientModuleOptions {
+export interface RemoveClientModuleOptions {
   v2ClientName: string;
   v2ClientLocalName: string;
   v2GlobalName?: string;
 }
 
-export const removeV2ClientModule = (
+export const removeClientModule = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  options: RemoveV2ClientModuleOptions
+  options: RemoveClientModuleOptions
 ) => {
   const { v2ClientName, v2ClientLocalName } = options;
   const deepImportPath = getClientDeepImportPath(v2ClientName);

src/transforms/v2-to-v3/modules/removeV2GlobalModule.ts renamed to src/transforms/v2-to-v3/modules/removeGlobalModule.ts

@@ -7,7 +7,7 @@ import { removeImportDefault } from "./removeImportDefault";
 import { removeImportEquals } from "./removeImportEquals";
 import { removeRequireIdentifier } from "./removeRequireIdentifier";
 
-export const removeV2GlobalModule = (
+export const removeGlobalModule = (
   j: JSCodeshift,
   source: Collection<unknown>,
   v2GlobalName: string

src/transforms/v2-to-v3/transformer.ts

@@ -11,8 +11,8 @@ import {
 import {
   addClientModules,
   getV2GlobalNameFromModule,
-  removeV2ClientModule,
-  removeV2GlobalModule,
+  removeClientModule,
+  removeGlobalModule,
 } from "./modules";
 import { replaceTSTypeReference } from "./ts-type";
 import { isTypeScriptFile } from "./utils";
@@ -55,7 +55,7 @@ const transformer = async (file: FileInfo, api: API) => {
 
     addClientModules(j, source, { ...v2Options, ...v3Options });
     replaceTSTypeReference(j, source, { ...v2Options, v3ClientName });
-    removeV2ClientModule(j, source, v2Options);
+    removeClientModule(j, source, v2Options);
     replaceS3UploadApi(j, source, v2Options);
     removePromiseCalls(j, source, v2Options);
     replaceWaiterApi(j, source, v2Options);
@@ -66,7 +66,7 @@ const transformer = async (file: FileInfo, api: API) => {
   }
 
   if (v2GlobalName) {
-    removeV2GlobalModule(j, source, v2GlobalName);
+    removeGlobalModule(j, source, v2GlobalName);
   }
 
   return source.toSource();