Handle DynamoDB DocumentClient in getTSQualifiedNameFromClientName (#830)

Author: trivikr

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

@@ -3,15 +3,14 @@ import { Collection, Identifier, JSCodeshift, TSQualifiedName, TSTypeReference }
 import { ImportSpecifierType } from "../modules";
 import { getImportSpecifiers } from "../modules/importModule";
 import { getClientDeepImportPath } from "../utils";
+import { DeepPartial, getTSQualifiedNameFromClientName } from "./getTSQualifiedNameFromClientName";
 
 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>,
@@ -32,46 +31,18 @@ export const getClientTypeNames = (
   const clientTypeNames = [];
 
   if (v2GlobalName) {
-    // Support for DynamoDB.DocumentClient
-    const [clientName, subClientName] = v2ClientName.split(".");
-
     clientTypeNames.push(
       ...getRightIdentifierName(j, source, {
         typeName: {
-          left: {
-            ...(subClientName
-              ? {
-                  left: {
-                    left: { type: "Identifier", name: v2GlobalName },
-                    right: { type: "Identifier", name: clientName },
-                  },
-                  right: { type: "Identifier", name: subClientName },
-                }
-              : {
-                  left: { type: "Identifier", name: v2GlobalName },
-                  right: { type: "Identifier", name: clientName },
-                }),
-          },
+          left: getTSQualifiedNameFromClientName(v2ClientName, v2GlobalName),
         },
       })
     );
   }
 
-  // Support for DynamoDB.DocumentClient
-  const [clientName, subClientName] = v2ClientLocalName!.split(".");
-
   clientTypeNames.push(
     ...getRightIdentifierName(j, source, {
-      typeName: {
-        ...(subClientName
-          ? {
-              left: {
-                left: { type: "Identifier", name: clientName },
-                right: { type: "Identifier", name: subClientName },
-              },
-            }
-          : { left: { type: "Identifier", name: clientName } }),
-      },
+      typeName: getTSQualifiedNameFromClientName(v2ClientLocalName),
     })
   );
 

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

@@ -1,24 +1,39 @@
 import { TSQualifiedName } from "jscodeshift";
 
+export type DeepPartial<T> = Partial<{ [P in keyof T]: DeepPartial<T[P]> }>;
+
 export const getTSQualifiedNameFromClientName = (
-  v2GlobalName: string,
-  clientName: string
-): TSQualifiedName => {
+  v2ClientName: string,
+  v2GlobalName?: string
+): DeepPartial<TSQualifiedName> => {
   // Support for DynamoDB.DocumentClient
-  const [clientNamePrefix, clientNameSuffix] = clientName.split(".");
+  const [clientNamePrefix, clientNameSuffix] = v2ClientName.split(".");
+
+  if (v2GlobalName) {
+    if (clientNameSuffix) {
+      return {
+        left: {
+          left: { type: "Identifier", name: v2GlobalName },
+          right: { type: "Identifier", name: clientNamePrefix },
+        },
+        right: { type: "Identifier", name: clientNameSuffix },
+      };
+    }
+
+    return {
+      left: { type: "Identifier", name: v2GlobalName },
+      right: { type: "Identifier", name: clientNamePrefix },
+    };
+  }
 
   if (clientNameSuffix) {
     return {
       left: {
-        left: { type: "Identifier", name: v2GlobalName },
-        right: { type: "Identifier", name: clientNamePrefix },
+        left: { type: "Identifier", name: clientNamePrefix },
+        right: { type: "Identifier", name: clientNameSuffix },
       },
-      right: { type: "Identifier", name: clientNameSuffix },
-    } as TSQualifiedName;
+    };
   }
 
-  return {
-    left: { type: "Identifier", name: v2GlobalName },
-    right: { type: "Identifier", name: clientNamePrefix },
-  } as TSQualifiedName;
+  return { left: { type: "Identifier", name: clientNamePrefix } };
 };

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

@@ -31,7 +31,7 @@ export const replaceTSTypeReference = (
     // Replace type reference to client created with global name.
     source
       .find(j.TSTypeReference, {
-        typeName: getTSQualifiedNameFromClientName(v2GlobalName, v2ClientName),
+        typeName: getTSQualifiedNameFromClientName(v2ClientName, v2GlobalName),
       })
       .replaceWith((v2ClientType) =>
         j.tsTypeReference(j.identifier(v3ClientName), v2ClientType.node.typeParameters)
@@ -41,7 +41,7 @@ export const replaceTSTypeReference = (
     source
       .find(j.TSTypeReference, {
         typeName: {
-          left: getTSQualifiedNameFromClientName(v2GlobalName, v2ClientName),
+          left: getTSQualifiedNameFromClientName(v2ClientName, v2GlobalName),
         },
       })
       .filter((v2ClientType) => isRightSectionIdentifier(v2ClientType.node))
@@ -58,21 +58,8 @@ export const replaceTSTypeReference = (
       .replaceWith(() => j.tsTypeReference(j.identifier(v3ClientName)));
   }
 
-  const [clientNamePrefix, clientNameSuffix] = v2ClientLocalName.split(".");
-  // Replace reference to client types created with client module.
   source
-    .find(j.TSTypeReference, {
-      typeName: {
-        ...(clientNameSuffix
-          ? {
-              left: {
-                left: { type: "Identifier", name: clientNamePrefix },
-                right: { type: "Identifier", name: clientNameSuffix },
-              },
-            }
-          : { left: { type: "Identifier", name: clientNamePrefix } }),
-      },
-    })
+    .find(j.TSTypeReference, { typeName: getTSQualifiedNameFromClientName(v2ClientLocalName) })
     .filter((v2ClientType) => isRightSectionIdentifier(v2ClientType.node))
     .replaceWith((v2ClientType) => {
       const v2ClientTypeName = getRightIdentifierName(v2ClientType.node);