Remove v2 and v3 from utility names in apis folder (#455)

Author: trivikr

src/transforms/v2-to-v3/apis/addNotSupportedComments.ts

@@ -1,10 +1,10 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
 import { FUNCTION_TYPE_LIST } from "../config";
+import { getClientIdentifiers } from "./getClientIdentifiers";
+import { getClientWaiterCallExpression } from "./getClientWaiterCallExpression";
 import { getClientWaiterStates } from "./getClientWaiterStates";
-import { getV2ClientIdentifiers } from "./getV2ClientIdentifiers";
-import { getV2ClientS3UploadCallExpression } from "./getV2ClientS3UploadCallExpression";
-import { getV2ClientWaiterCallExpression } from "./getV2ClientWaiterCallExpression";
+import { getS3UploadCallExpression } from "./getS3UploadCallExpression";
 
 export interface CommentsForUnsupportedAPIsOptions {
   v2ClientName: string;
@@ -17,14 +17,14 @@ export const addNotSupportedComments = (
   source: Collection<unknown>,
   options: CommentsForUnsupportedAPIsOptions
 ): void => {
-  const v2ClientIdentifiers = getV2ClientIdentifiers(j, source, options);
+  const clientIdentifiers = getClientIdentifiers(j, source, options);
 
-  for (const v2ClientId of v2ClientIdentifiers) {
+  for (const clientId of clientIdentifiers) {
     const waiterStates = getClientWaiterStates(j, source, options);
 
     for (const waiterState of waiterStates) {
       source
-        .find(j.CallExpression, getV2ClientWaiterCallExpression(v2ClientId, waiterState))
+        .find(j.CallExpression, getClientWaiterCallExpression(clientId, waiterState))
         .forEach((callExpression) => {
           const args = callExpression.node.arguments;
 
@@ -47,9 +47,9 @@ export const addNotSupportedComments = (
   }
 
   if (options.v2ClientName === "S3") {
-    for (const v2ClientId of v2ClientIdentifiers) {
+    for (const clientId of clientIdentifiers) {
       source
-        .find(j.CallExpression, getV2ClientS3UploadCallExpression(v2ClientId))
+        .find(j.CallExpression, getS3UploadCallExpression(clientId))
         .forEach((callExpression) => {
           const args = callExpression.node.arguments;
 

src/transforms/v2-to-v3/apis/getV2ClientIdNamesFromNewExpr.ts renamed to src/transforms/v2-to-v3/apis/getClientIdNamesFromNewExpr.ts

@@ -2,7 +2,7 @@ import { Collection, Identifier, JSCodeshift, NewExpression } from "jscodeshift"
 
 import { getClientNewExpression } from "../utils";
 
-export interface GetV2ClientIdNamesFromNewExprOptions {
+export interface GetClientIdNamesFromNewExprOptions {
   v2ClientName: string;
   v2ClientLocalName: string;
   v2GlobalName?: string;
@@ -34,10 +34,10 @@ const getNamesFromAssignmentPattern = (
     .nodes()
     .map((assignmentPattern) => (assignmentPattern.left as Identifier).name);
 
-export const getV2ClientIdNamesFromNewExpr = (
+export const getClientIdNamesFromNewExpr = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2ClientName, v2ClientLocalName, v2GlobalName }: GetV2ClientIdNamesFromNewExprOptions
+  { v2ClientName, v2ClientLocalName, v2GlobalName }: GetClientIdNamesFromNewExprOptions
 ): string[] => {
   const namesFromGlobalModule = [];
   const namesFromServiceModule = [];

src/transforms/v2-to-v3/apis/getV2ClientIdNamesFromTSTypeRef.ts renamed to src/transforms/v2-to-v3/apis/getClientIdNamesFromTSTypeRef.ts

@@ -1,14 +1,14 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
-export interface GetV2ClientIdNamesFromTSTypeRefOptions {
+export interface GetClientIdNamesFromTSTypeRefOptions {
   v2ClientName: string;
   v2GlobalName?: string;
 }
 
-export const getV2ClientIdNamesFromTSTypeRef = (
+export const getClientIdNamesFromTSTypeRef = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  { v2GlobalName, v2ClientName }: GetV2ClientIdNamesFromTSTypeRefOptions
+  { v2GlobalName, v2ClientName }: GetClientIdNamesFromTSTypeRefOptions
 ): string[] => {
   const namesFromGlobalName = v2GlobalName
     ? source

src/transforms/v2-to-v3/apis/getV2ClientIdThisExpressions.ts renamed to src/transforms/v2-to-v3/apis/getClientIdThisExpressions.ts

@@ -8,16 +8,16 @@ export interface ThisMemberExpression {
 
 const thisMemberExpression = { type: "MemberExpression", object: { type: "ThisExpression" } };
 
-export const getV2ClientIdThisExpressions = (
+export const getClientIdThisExpressions = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  v2ClientIdentifiers: Identifier[]
+  clientIdentifiers: Identifier[]
 ): ThisMemberExpression[] =>
-  v2ClientIdentifiers.flatMap((v2ClientIdentifier) =>
+  clientIdentifiers.flatMap((clientIdentifier) =>
     source
       .find(j.AssignmentExpression, {
         left: thisMemberExpression as MemberExpression,
-        right: v2ClientIdentifier,
+        right: clientIdentifier,
       })
       .nodes()
       .map(

src/transforms/v2-to-v3/apis/getClientIdentifiers.ts

@@ -0,0 +1,31 @@
+import { Collection, Identifier, JSCodeshift } from "jscodeshift";
+
+import { getClientIdNamesFromNewExpr } from "./getClientIdNamesFromNewExpr";
+import { getClientIdNamesFromTSTypeRef } from "./getClientIdNamesFromTSTypeRef";
+import { getClientIdThisExpressions, ThisMemberExpression } from "./getClientIdThisExpressions";
+
+export interface GetClientIdentifiersOptions {
+  v2ClientName: string;
+  v2ClientLocalName: string;
+  v2GlobalName?: string;
+}
+
+export type ClientIdentifier = Identifier | ThisMemberExpression;
+
+export const getClientIdentifiers = (
+  j: JSCodeshift,
+  source: Collection<unknown>,
+  options: GetClientIdentifiersOptions
+): ClientIdentifier[] => {
+  const namesFromNewExpr = getClientIdNamesFromNewExpr(j, source, options);
+  const namesFromTSTypeRef = getClientIdNamesFromTSTypeRef(j, source, options);
+  const clientIdNames = [...new Set([...namesFromNewExpr, ...namesFromTSTypeRef])];
+
+  const clientIdentifiers: Identifier[] = clientIdNames.map((clientidName) => ({
+    type: "Identifier",
+    name: clientidName,
+  }));
+  const clientIdThisExpressions = getClientIdThisExpressions(j, source, clientIdentifiers);
+
+  return [...clientIdentifiers, ...clientIdThisExpressions];
+};

src/transforms/v2-to-v3/apis/getV2ClientWaiterCallExpression.ts renamed to src/transforms/v2-to-v3/apis/getClientWaiterCallExpression.ts

@@ -1,9 +1,9 @@
 import { CallExpression } from "jscodeshift";
 
-import { V2ClientIdentifier } from "./getV2ClientIdentifiers";
+import { ClientIdentifier } from "./getClientIdentifiers";
 
-export const getV2ClientWaiterCallExpression = (
-  v2ClientId: V2ClientIdentifier,
+export const getClientWaiterCallExpression = (
+  v2ClientId: ClientIdentifier,
   waiterState: string
 ): CallExpression => ({
   type: "CallExpression",

src/transforms/v2-to-v3/apis/getClientWaiterStates.ts

@@ -1,6 +1,6 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
-import { getV2ClientIdentifiers } from "./getV2ClientIdentifiers";
+import { getClientIdentifiers } from "./getClientIdentifiers";
 
 export interface GetClientWaiterStatesOptions {
   v2ClientName: string;
@@ -15,14 +15,14 @@ export const getClientWaiterStates = (
 ): Set<string> => {
   const waiterStates: string[] = [];
 
-  const v2ClientIdentifiers = getV2ClientIdentifiers(j, source, options);
+  const clientIdentifiers = getClientIdentifiers(j, source, options);
 
-  for (const v2ClientId of v2ClientIdentifiers) {
+  for (const clientId of clientIdentifiers) {
     source
       .find(j.CallExpression, {
         callee: {
           type: "MemberExpression",
-          object: v2ClientId,
+          object: clientId,
           property: { type: "Identifier", name: "waitFor" },
         },
       })

src/transforms/v2-to-v3/apis/getS3UploadCallExpression.ts

@@ -0,0 +1,13 @@
+import { CallExpression } from "jscodeshift";
+
+import { ClientIdentifier } from "./getClientIdentifiers";
+
+// @ts-expect-error Property 'arguments' is missing in type
+export const getS3UploadCallExpression = (clientId: ClientIdentifier): CallExpression => ({
+  type: "CallExpression",
+  callee: {
+    type: "MemberExpression",
+    object: clientId,
+    property: { type: "Identifier", name: "upload" },
+  },
+});