Use filter API to shortlist import declarations to be deleted (#321)

.changeset/nervous-worms-grin.md

@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": patch
+---
+
+Use filter API to shortlist import declarations to be deleted

scripts/generateNewClientTests/getServiceImportDeepOutput.ts

@@ -1,3 +1,13 @@
-import { getServiceImportOutput } from "./getServiceImportOutput";
+import { CLIENTS_TO_TEST } from "./config";
+import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
+import { getV3PackageImportsCode } from "./getV3PackageImportsCode";
 
-export const getServiceImportDeepOutput = getServiceImportOutput;
+export const getServiceImportDeepOutput = (codegenComment: string) => {
+  let serviceImportOutputContent = `${codegenComment}\n`;
+
+  serviceImportOutputContent += getV3PackageImportsCode(CLIENTS_TO_TEST);
+  serviceImportOutputContent += `\n`;
+  serviceImportOutputContent += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
+
+  return serviceImportOutputContent;
+};

scripts/generateNewClientTests/getServiceImportInput.ts

@@ -4,9 +4,7 @@ import { getV2ClientsNewExpressionCode } from "./getV2ClientsNewExpressionCode";
 export const getServiceImportInput = (codegenComment: string) => {
   let serviceImportInputContent = `${codegenComment}\n`;
 
-  for (const clientName of CLIENTS_TO_TEST) {
-    serviceImportInputContent += `import { ${clientName} } from "aws-sdk";\n`;
-  }
+  serviceImportInputContent += `import { ${CLIENTS_TO_TEST.join(", ")} } from "aws-sdk";\n`;
   serviceImportInputContent += `\n`;
   serviceImportInputContent += getV2ClientsNewExpressionCode(CLIENTS_TO_TEST);
 

scripts/generateNewClientTests/getServiceImportOutput.ts

@@ -1,11 +1,14 @@
 import { CLIENTS_TO_TEST } from "./config";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageImportsCode } from "./getV3PackageImportsCode";
 
 export const getServiceImportOutput = (codegenComment: string) => {
   let serviceImportOutputContent = `${codegenComment}\n`;
 
-  serviceImportOutputContent += getV3PackageImportsCode(CLIENTS_TO_TEST);
+  serviceImportOutputContent += getV3PackageImportsCode(
+    getClientNamesSortedByPackageName(CLIENTS_TO_TEST)
+  );
   serviceImportOutputContent += `\n`;
   serviceImportOutputContent += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
 

src/transforms/v2-to-v3/__fixtures__/new-client/service-import.input.js

@@ -1,9 +1,7 @@
 // This file is generated by scripts/generateNewClientTests/index.ts
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 "use strict";
-import { ACM } from "aws-sdk";
-import { AccessAnalyzer } from "aws-sdk";
-import { Discovery } from "aws-sdk";
+import { ACM, AccessAnalyzer, Discovery } from "aws-sdk";
 
 new ACM();
 new AccessAnalyzer();

src/transforms/v2-to-v3/__fixtures__/new-client/service-import.output.js

@@ -1,8 +1,8 @@
 // This file is generated by scripts/generateNewClientTests/index.ts
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 "use strict";
-import { ACM } from "@aws-sdk/client-acm";
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
+import { ACM } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService as Discovery } from "@aws-sdk/client-application-discovery-service";
 
 new ACM();

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

@@ -13,9 +13,15 @@ export const removeImportNamed = (
 ) => {
   source
     .find(j.ImportDeclaration, {
-      specifiers: [{ local: { name: localName } }],
       source: { value: sourceValue },
     })
+    .filter(
+      (importDeclaration) =>
+        importDeclaration.value.specifiers !== undefined &&
+        importDeclaration.value.specifiers.some(
+          (specifier) => specifier.type === "ImportSpecifier" && specifier.local?.name === localName
+        )
+    )
     .forEach((declarationPath) => {
       // Remove named import from ImportDeclaration if there is a match.
       declarationPath.value.specifiers = declarationPath.value.specifiers?.filter((specifier) => {