Parse through named imports from global path instead of clients (#267)

aws · Dec 30, 2022 · 35d0638 · 35d0638
1 parent 4473985
commit 35d0638
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/.changeset/wet-wolves-brake.md b/.changeset/wet-wolves-brake.md
@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": patch
+---
+
+Parse through named imports from global path instead of clients
diff --git a/src/transforms/v2-to-v3/utils/get/getV2ClientNamesRecordFromImport.ts b/src/transforms/v2-to-v3/utils/get/getV2ClientNamesRecordFromImport.ts
@@ -31,12 +31,11 @@ export const getV2ClientNamesRecordFromImport = (
     (specifier) => specifier?.type === "ImportSpecifier"
   ) as ImportSpecifier[];
 
-  for (const clientName of CLIENT_NAMES) {
-    const clientImportSpecifier = specifiersFromNamedImport.find(
-      (specifier) => specifier?.imported.name === clientName
-    );
-    if (clientImportSpecifier) {
-      v2ClientNamesRecord[clientName] = (clientImportSpecifier.local as Identifier).name;
+  for (const specifier of specifiersFromNamedImport) {
+    const importedName = specifier.imported.name;
+    const localName = (specifier.local as Identifier).name;
+    if (CLIENT_NAMES.includes(importedName)) {
+      v2ClientNamesRecord[importedName] = localName ?? importedName;
     }
   }
 

diff --git a/src/transforms/v2-to-v3/utils/get/getV2ClientNamesRecordFromRequire.ts b/src/transforms/v2-to-v3/utils/get/getV2ClientNamesRecordFromRequire.ts
@@ -22,17 +22,25 @@ export const getV2ClientNamesRecordFromRequire = (
 ) => {
   const v2ClientNamesRecord: Record<string, string> = {};
 
-  const idPropertiesFromNamedImport = getRequireIds(j, source, PACKAGE_NAME)
+  const idPropertiesFromObjectPattern = getRequireIds(j, source, PACKAGE_NAME)
     .filter((id) => id.type === "ObjectPattern")
     .map((objectPattern) => (objectPattern as ObjectPattern).properties)
     .flat() as Property[];
 
-  for (const clientName of CLIENT_NAMES) {
-    const propertyWithClientName = idPropertiesFromNamedImport.find(
-      (property) => (property?.key as Identifier).name === clientName
-    );
-    if (propertyWithClientName) {
-      v2ClientNamesRecord[clientName] = (propertyWithClientName.value as Identifier).name;
+  for (const idProperty of idPropertiesFromObjectPattern) {
+    if (idProperty.type !== "Property") {
+      continue;
+    }
+    const key = idProperty.key as Identifier;
+    if (key.type !== "Identifier") {
+      continue;
+    }
+    const value = idProperty.value as Identifier;
+    if (value.type !== "Identifier") {
+      continue;
+    }
+    if (CLIENT_NAMES.includes(key.name)) {
+      v2ClientNamesRecord[key.name] = value.name;
     }
   }