Add imports after the first occurrence of aws-sdk (#622)

Author: trivikr

.changeset/eight-hornets-remain.md

@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": patch
+---
+
+Add imports after the first occurrence of aws-sdk

scripts/generateNewClientTests/config.ts

@@ -1,3 +1,3 @@
-export const CLIENTS_TO_TEST = ["ACM", "AccessAnalyzer", "Discovery"];
+export const CLIENTS_TO_TEST = ["AccessAnalyzer", "Discovery", "ACM"];
 
 export const LOCAL_NAME_SUFFIX = "Client";

scripts/generateNewClientTests/getServiceImportDeepOutput.ts

@@ -1,11 +1,12 @@
 import { CLIENTS_TO_TEST } from "./config";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageImportsCode } from "./getV3PackageImportsCode";
 
 export const getServiceImportDeepOutput = () => {
   let content = ``;
 
-  content += getV3PackageImportsCode(CLIENTS_TO_TEST);
+  content += getV3PackageImportsCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST));
   content += `\n`;
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
 

scripts/generateNewClientTests/getServiceImportDeepWithNameOutput.ts

@@ -1,12 +1,15 @@
 import { CLIENTS_TO_TEST } from "./config";
 import { getClientNameWithLocalSuffix } from "./getClientNameWithLocalSuffix";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageImportsCode } from "./getV3PackageImportsCode";
 
 export const getServiceImportDeepWithNameOutput = () => {
   let content = ``;
 
-  content += getV3PackageImportsCode(CLIENTS_TO_TEST, { useLocalSuffix: true });
+  content += getV3PackageImportsCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST), {
+    useLocalSuffix: true,
+  });
   content += `\n`;
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST.map(getClientNameWithLocalSuffix));
 

scripts/generateNewClientTests/getServiceImportEqualsOutput.ts

@@ -1,11 +1,12 @@
 import { CLIENTS_TO_TEST } from "./config";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageImportEqualsCode } from "./getV3PackageImportEqualsCode";
 
 export const getServiceImportEqualsOutput = () => {
   let content = ``;
 
-  content += getV3PackageImportEqualsCode(CLIENTS_TO_TEST);
+  content += getV3PackageImportEqualsCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST));
   content += "\n";
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
 

scripts/generateNewClientTests/getServiceImportEqualsWithNameOutput.ts

@@ -1,12 +1,15 @@
 import { CLIENTS_TO_TEST } from "./config";
 import { getClientNameWithLocalSuffix } from "./getClientNameWithLocalSuffix";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageImportEqualsCode } from "./getV3PackageImportEqualsCode";
 
 export const getServiceImportEqualsWithNameOutput = () => {
   let content = ``;
 
-  content += getV3PackageImportEqualsCode(CLIENTS_TO_TEST, { useLocalSuffix: true });
+  content += getV3PackageImportEqualsCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST), {
+    useLocalSuffix: true,
+  });
   content += "\n";
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST.map(getClientNameWithLocalSuffix));
 

scripts/generateNewClientTests/getServiceRequireDeepOutput.ts

@@ -1,11 +1,12 @@
 import { CLIENTS_TO_TEST } from "./config";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getServiceRequireDeepOutput = () => {
   let content = `\n\n`;
 
-  content += getV3PackageRequiresCode(CLIENTS_TO_TEST);
+  content += getV3PackageRequiresCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST));
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
 
   return content;

scripts/generateNewClientTests/getServiceRequireDeepWithNameOutput.ts

@@ -1,12 +1,15 @@
 import { CLIENTS_TO_TEST } from "./config";
 import { getClientNameWithLocalSuffix } from "./getClientNameWithLocalSuffix";
+import { getClientNamesSortedByPackageName } from "./getClientNamesSortedByPackageName";
 import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getServiceRequireDeepWithNameOutput = () => {
   let content = `\n\n`;
 
-  content += getV3PackageRequiresCode(CLIENTS_TO_TEST, { useLocalSuffix: true });
+  content += getV3PackageRequiresCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST), {
+    useLocalSuffix: true,
+  });
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST.map(getClientNameWithLocalSuffix));
 
   return content;

src/transforms/v2-to-v3/__fixtures__/new-client/global-import-equals.input.ts

@@ -2,6 +2,6 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 import AWS = require("aws-sdk");
 
-new AWS.ACM();
 new AWS.AccessAnalyzer();
 new AWS.Discovery();
+new AWS.ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/global-import-equals.output.ts

@@ -9,6 +9,6 @@ import ACM = AWS_client_acm.ACM;
 import AWS_client_application_discovery_service = require("@aws-sdk/client-application-discovery-service");
 import ApplicationDiscoveryService = AWS_client_application_discovery_service.ApplicationDiscoveryService;
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();