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

.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();

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

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

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

@@ -6,6 +6,6 @@ import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
 import { ACM } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService } from "@aws-sdk/client-application-discovery-service";
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/global-require-property-with-name.input.js

@@ -1,9 +1,9 @@
 // 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.
-const ACMClient = require("aws-sdk").ACM;
 const AccessAnalyzerClient = require("aws-sdk").AccessAnalyzer;
 const DiscoveryClient = require("aws-sdk").Discovery;
+const ACMClient = require("aws-sdk").ACM;
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

src/transforms/v2-to-v3/__fixtures__/new-client/global-require-property-with-name.output.js

@@ -2,18 +2,18 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-const {
-  ACM: ACMClient
-} = require("@aws-sdk/client-acm");
-
 const {
   AccessAnalyzer: AccessAnalyzerClient
 } = require("@aws-sdk/client-accessanalyzer");
 
+const {
+  ACM: ACMClient
+} = require("@aws-sdk/client-acm");
+
 const {
   ApplicationDiscoveryService: DiscoveryClient
 } = require("@aws-sdk/client-application-discovery-service");
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

src/transforms/v2-to-v3/__fixtures__/new-client/global-require-property.input.js

@@ -1,9 +1,9 @@
 // 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.
-const ACM = require("aws-sdk").ACM;
 const AccessAnalyzer = require("aws-sdk").AccessAnalyzer;
 const Discovery = require("aws-sdk").Discovery;
+const ACM = require("aws-sdk").ACM;
 
-new ACM();
 new AccessAnalyzer();
 new Discovery();
+new ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/global-require-property.output.js

@@ -2,18 +2,18 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-const {
-  ACM
-} = require("@aws-sdk/client-acm");
-
 const {
   AccessAnalyzer
 } = require("@aws-sdk/client-accessanalyzer");
 
+const {
+  ACM
+} = require("@aws-sdk/client-acm");
+
 const {
   ApplicationDiscoveryService
 } = require("@aws-sdk/client-application-discovery-service");
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/global-require.input.js

@@ -2,6 +2,6 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 const 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-require.output.js

@@ -14,6 +14,6 @@ const {
   ApplicationDiscoveryService
 } = require("@aws-sdk/client-application-discovery-service");
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/service-import-deep-star-with-name.input.js

@@ -1,9 +1,9 @@
 // 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.
-import * as ACMClient from "aws-sdk/clients/acm";
 import * as AccessAnalyzerClient from "aws-sdk/clients/accessanalyzer";
 import * as DiscoveryClient from "aws-sdk/clients/discovery";
+import * as ACMClient from "aws-sdk/clients/acm";
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

src/transforms/v2-to-v3/__fixtures__/new-client/service-import-deep-star-with-name.output.js

@@ -2,10 +2,10 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import { ACM as ACMClient } from "@aws-sdk/client-acm";
 import { AccessAnalyzer as AccessAnalyzerClient } from "@aws-sdk/client-accessanalyzer";
+import { ACM as ACMClient } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService as DiscoveryClient } from "@aws-sdk/client-application-discovery-service";
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

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

@@ -1,9 +1,9 @@
 // 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.
-import * as ACM from "aws-sdk/clients/acm";
 import * as AccessAnalyzer from "aws-sdk/clients/accessanalyzer";
 import * as Discovery from "aws-sdk/clients/discovery";
+import * as ACM from "aws-sdk/clients/acm";
 
-new ACM();
 new AccessAnalyzer();
 new Discovery();
+new ACM();

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

@@ -2,10 +2,10 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import { ACM } from "@aws-sdk/client-acm";
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
+import { ACM } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService } from "@aws-sdk/client-application-discovery-service";
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();

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

@@ -1,9 +1,9 @@
 // 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.
-import ACMClient from "aws-sdk/clients/acm";
 import AccessAnalyzerClient from "aws-sdk/clients/accessanalyzer";
 import DiscoveryClient from "aws-sdk/clients/discovery";
+import ACMClient from "aws-sdk/clients/acm";
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

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

@@ -2,10 +2,10 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import { ACM as ACMClient } from "@aws-sdk/client-acm";
 import { AccessAnalyzer as AccessAnalyzerClient } from "@aws-sdk/client-accessanalyzer";
+import { ACM as ACMClient } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService as DiscoveryClient } from "@aws-sdk/client-application-discovery-service";
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

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

@@ -1,9 +1,9 @@
 // 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.
-import ACM from "aws-sdk/clients/acm";
 import AccessAnalyzer from "aws-sdk/clients/accessanalyzer";
 import Discovery from "aws-sdk/clients/discovery";
+import ACM from "aws-sdk/clients/acm";
 
-new ACM();
 new AccessAnalyzer();
 new Discovery();
+new ACM();

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

@@ -2,10 +2,10 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import { ACM } from "@aws-sdk/client-acm";
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
+import { ACM } from "@aws-sdk/client-acm";
 import { ApplicationDiscoveryService } from "@aws-sdk/client-application-discovery-service";
 
-new ACM();
 new AccessAnalyzer();
 new ApplicationDiscoveryService();
+new ACM();

src/transforms/v2-to-v3/__fixtures__/new-client/service-import-equals-with-name.input.ts

@@ -1,9 +1,9 @@
 // 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.
-import ACMClient = require("aws-sdk/clients/acm");
 import AccessAnalyzerClient = require("aws-sdk/clients/accessanalyzer");
 import DiscoveryClient = require("aws-sdk/clients/discovery");
+import ACMClient = require("aws-sdk/clients/acm");
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

src/transforms/v2-to-v3/__fixtures__/new-client/service-import-equals-with-name.output.ts

@@ -2,13 +2,13 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import AWS_client_acm = require("@aws-sdk/client-acm");
-import ACMClient = AWS_client_acm.ACM;
 import AWS_client_accessanalyzer = require("@aws-sdk/client-accessanalyzer");
 import AccessAnalyzerClient = AWS_client_accessanalyzer.AccessAnalyzer;
+import AWS_client_acm = require("@aws-sdk/client-acm");
+import ACMClient = AWS_client_acm.ACM;
 import AWS_client_application_discovery_service = require("@aws-sdk/client-application-discovery-service");
 import DiscoveryClient = AWS_client_application_discovery_service.ApplicationDiscoveryService;
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();

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

@@ -1,9 +1,9 @@
 // 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.
-import ACM = require("aws-sdk/clients/acm");
 import AccessAnalyzer = require("aws-sdk/clients/accessanalyzer");
 import Discovery = require("aws-sdk/clients/discovery");
+import ACM = require("aws-sdk/clients/acm");
 
-new ACM();
 new AccessAnalyzer();
 new Discovery();
+new ACM();

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

@@ -2,13 +2,13 @@
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
 
 
-import AWS_client_acm = require("@aws-sdk/client-acm");
-import ACM = AWS_client_acm.ACM;
 import AWS_client_accessanalyzer = require("@aws-sdk/client-accessanalyzer");
 import AccessAnalyzer = AWS_client_accessanalyzer.AccessAnalyzer;
+import AWS_client_acm = require("@aws-sdk/client-acm");
+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();

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

@@ -1,11 +1,11 @@
 // 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.
 import { 
-  ACM as ACMClient,
   AccessAnalyzer as AccessAnalyzerClient,
-  Discovery as DiscoveryClient
+  Discovery as DiscoveryClient,
+  ACM as ACMClient
 } from "aws-sdk";
 
-new ACMClient();
 new AccessAnalyzerClient();
 new DiscoveryClient();
+new ACMClient();