Remove utility getClientTSTypeRef (#470)

Author: trivikr

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

@@ -1,6 +1,5 @@
 import { Collection, JSCodeshift } from "jscodeshift";
 
-import { getClientTSTypeRef } from "../utils";
 import { ClientModulesOptions } from "./types";
 
 export const getClientTSTypeRefCount = (
@@ -11,17 +10,18 @@ export const getClientTSTypeRefCount = (
   let clientTSTypeRefCount = 0;
 
   if (v2GlobalName) {
-    const clienTSTypeRefFromGlobalName = source.find(
-      j.TSTypeReference,
-      getClientTSTypeRef({ v2ClientName, v2GlobalName })
-    );
+    const clienTSTypeRefFromGlobalName = source.find(j.TSTypeReference, {
+      typeName: {
+        left: { type: "Identifier", name: v2GlobalName },
+        right: { type: "Identifier", name: v2ClientName },
+      },
+    });
     clientTSTypeRefCount += clienTSTypeRefFromGlobalName.length;
   }
 
-  const clienTSTypeRefFromClientLocalName = source.find(
-    j.TSTypeReference,
-    getClientTSTypeRef({ v2ClientLocalName })
-  );
+  const clienTSTypeRefFromClientLocalName = source.find(j.TSTypeReference, {
+    typeName: { type: "Identifier", name: v2ClientLocalName },
+  });
   clientTSTypeRefCount += clienTSTypeRefFromClientLocalName.length;
 
   return clientTSTypeRefCount;

src/transforms/v2-to-v3/ts-type/getClientTypeNames.ts

@@ -1,18 +1,20 @@
 import { Collection, Identifier, JSCodeshift, TSQualifiedName, TSTypeReference } from "jscodeshift";
 
 import { getImportSpecifiers } from "../modules";
-import { getClientDeepImportPath, getClientTSTypeRef } from "../utils";
+import { getClientDeepImportPath } from "../utils";
 
 export interface GetClientTypeNamesOptions {
   v2ClientName: string;
   v2GlobalName?: string;
   v2ClientLocalName: string;
 }
 
+type DeepPartial<T> = Partial<{ [P in keyof T]: DeepPartial<T[P]> }>;
+
 const getRightIdentifierName = (
   j: JSCodeshift,
   source: Collection<unknown>,
-  tsTypeRef: TSTypeReference
+  tsTypeRef: DeepPartial<TSTypeReference>
 ) =>
   source
     .find(j.TSTypeReference, tsTypeRef)
@@ -29,16 +31,25 @@ export const getClientTypeNames = (
   const clientTypeNames = [];
 
   if (v2GlobalName) {
-    const globalTSTypeRef = getClientTSTypeRef({
-      v2ClientName,
-      v2GlobalName,
-      withoutRightSection: true,
-    });
-    clientTypeNames.push(...getRightIdentifierName(j, source, globalTSTypeRef));
+    clientTypeNames.push(
+      ...getRightIdentifierName(j, source, {
+        typeName: {
+          left: {
+            left: { type: "Identifier", name: v2GlobalName },
+            right: { type: "Identifier", name: v2ClientName },
+          },
+        },
+      })
+    );
   }
 
-  const clientTSTypeRef = getClientTSTypeRef({ v2ClientLocalName, withoutRightSection: true });
-  clientTypeNames.push(...getRightIdentifierName(j, source, clientTSTypeRef));
+  clientTypeNames.push(
+    ...getRightIdentifierName(j, source, {
+      typeName: {
+        left: { type: "Identifier", name: v2ClientLocalName },
+      },
+    })
+  );
 
   clientTypeNames.push(
     ...getImportSpecifiers(j, source, getClientDeepImportPath(v2ClientName))

src/transforms/v2-to-v3/ts-type/replaceTSTypeReference.ts

@@ -1,6 +1,5 @@
 import { Collection, Identifier, JSCodeshift, TSQualifiedName, TSTypeReference } from "jscodeshift";
 
-import { getClientTSTypeRef } from "../utils";
 import { getClientTypeNames } from "./getClientTypeNames";
 import { getV3ClientTypeReference } from "./getV3ClientTypeReference";
 
@@ -28,17 +27,26 @@ export const replaceTSTypeReference = (
   // Replace type reference to client created with global name.
   if (v2GlobalName) {
     source
-      .find(j.TSTypeReference, getClientTSTypeRef({ v2ClientName, v2GlobalName }))
+      .find(j.TSTypeReference, {
+        typeName: {
+          left: { type: "Identifier", name: v2GlobalName },
+          right: { type: "Identifier", name: v2ClientName },
+        },
+      })
       .replaceWith((v2ClientType) =>
         j.tsTypeReference(j.identifier(v3ClientName), v2ClientType.node.typeParameters)
       );
 
     // Replace reference to client types created with global name.
     source
-      .find(
-        j.TSTypeReference,
-        getClientTSTypeRef({ v2ClientName, v2GlobalName, withoutRightSection: true })
-      )
+      .find(j.TSTypeReference, {
+        typeName: {
+          left: {
+            left: { type: "Identifier", name: v2GlobalName },
+            right: { type: "Identifier", name: v2ClientName },
+          },
+        },
+      })
       .filter((v2ClientType) => isRightSectionIdentifier(v2ClientType.node))
       .replaceWith((v2ClientType) => {
         const v2ClientTypeName = getRightIdentifierName(v2ClientType.node);
@@ -48,7 +56,11 @@ export const replaceTSTypeReference = (
 
   // Replace reference to client types created with client module.
   source
-    .find(j.TSTypeReference, getClientTSTypeRef({ v2ClientLocalName, withoutRightSection: true }))
+    .find(j.TSTypeReference, {
+      typeName: {
+        left: { type: "Identifier", name: v2ClientLocalName },
+      },
+    })
     .filter((v2ClientType) => isRightSectionIdentifier(v2ClientType.node))
     .replaceWith((v2ClientType) => {
       const v2ClientTypeName = getRightIdentifierName(v2ClientType.node);

src/transforms/v2-to-v3/utils/getClientTSTypeRef.ts

@@ -1,6 +1,5 @@
 export * from "./getClientDeepImportPath";
 export * from "./getClientNewExpression";
-export * from "./getClientTSTypeRef";
 export * from "./getDefaultLocalName";
 export * from "./getDocClientNewExpression";
 export * from "./isTypeScriptFile";