Add require declaration per client (#625)

Author: trivikr

.changeset/great-laws-sit.md

@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": minor
+---
+
+Add require declaration per client

scripts/generateNewClientTests/getGlobalRequireOutput.ts

@@ -4,7 +4,7 @@ import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getGlobalRequireOutput = () => {
-  let content = ``;
+  let content = `\n\n`;
 
   content += getV3PackageRequiresCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST));
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);

scripts/generateNewClientTests/getServiceRequireDeepOutput.ts

@@ -3,10 +3,9 @@ import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getServiceRequireDeepOutput = () => {
-  let content = ``;
+  let content = `\n\n`;
 
-  content += getV3PackageRequiresCode(CLIENTS_TO_TEST, { declarationPerClient: true });
-  content += `\n`;
+  content += getV3PackageRequiresCode(CLIENTS_TO_TEST);
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST);
 
   return content;

scripts/generateNewClientTests/getServiceRequireDeepWithNameOutput.ts

@@ -4,13 +4,9 @@ import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getServiceRequireDeepWithNameOutput = () => {
-  let content = ``;
+  let content = `\n\n`;
 
-  content += getV3PackageRequiresCode(CLIENTS_TO_TEST, {
-    declarationPerClient: true,
-    useLocalSuffix: true,
-  });
-  content += `\n`;
+  content += getV3PackageRequiresCode(CLIENTS_TO_TEST, { useLocalSuffix: true });
   content += getV3ClientsNewExpressionCode(CLIENTS_TO_TEST.map(getClientNameWithLocalSuffix));
 
   return content;

scripts/generateNewClientTests/getServiceRequireWithNameOutput.ts

@@ -5,7 +5,7 @@ import { getV3ClientsNewExpressionCode } from "./getV3ClientsNewExpressionCode";
 import { getV3PackageRequiresCode } from "./getV3PackageRequiresCode";
 
 export const getServiceRequireWithNameOutput = () => {
-  let content = ``;
+  let content = `\n\n`;
 
   content += getV3PackageRequiresCode(getClientNamesSortedByPackageName(CLIENTS_TO_TEST), {
     useLocalSuffix: true,

scripts/generateNewClientTests/getV3PackageRequiresCode.ts

@@ -7,19 +7,14 @@ import { getClientNameWithLocalSuffix } from "./getClientNameWithLocalSuffix";
 
 export interface V3PackageRequiresCodeOptions {
   useLocalSuffix?: boolean;
-  declarationPerClient?: boolean;
 }
 
 export const getV3PackageRequiresCode = (
   clientsToTest: typeof CLIENT_NAMES,
   options?: V3PackageRequiresCodeOptions
 ) => {
   let content = ``;
-  const { useLocalSuffix = false, declarationPerClient = false } = options || {};
-
-  if (!declarationPerClient) {
-    content += `const `;
-  }
+  const { useLocalSuffix = false } = options || {};
 
   for (const v2ClientName of clientsToTest) {
     const v3ClientName = CLIENT_NAMES_MAP[v2ClientName];
@@ -30,13 +25,7 @@ export const getV3PackageRequiresCode = (
 
     const v3RequireKeyValuePair =
       v2ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName}: ${v2ClientLocalName}`;
-    content += declarationPerClient
-      ? `const {\n  ${v3RequireKeyValuePair}\n} = require("${v3ClientPackageName}");\n`
-      : `{\n        ${v3RequireKeyValuePair}\n      } = require("${v3ClientPackageName}"),\n      `;
-  }
-
-  if (!declarationPerClient) {
-    content = content.replace(/,\n {6}$/, ";\n\n");
+    content += `const {\n  ${v3RequireKeyValuePair}\n} = require("${v3ClientPackageName}");\n\n`;
   }
 
   return content;

src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/global-require.output.js

@@ -1,9 +1,10 @@
 const {
-        DynamoDBDocument
-      } = require("@aws-sdk/lib-dynamodb"),
-      {
-        DynamoDB
-      } = require("@aws-sdk/client-dynamodb");
+  DynamoDBDocument
+} = require("@aws-sdk/lib-dynamodb");
+
+const {
+  DynamoDB
+} = require("@aws-sdk/client-dynamodb");
 
 const documentClient = DynamoDBDocument.from(new DynamoDB({ region: "us-west-2" }));
 const response = await documentClient.scan({ TableName: "TABLE_NAME" });

src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/service-require-deep-with-name.output.js

@@ -1,9 +1,10 @@
 const {
-        DynamoDBDocument
-      } = require("@aws-sdk/lib-dynamodb"),
-      {
-        DynamoDB: DynamoDBClient
-      } = require("@aws-sdk/client-dynamodb");
+  DynamoDBDocument
+} = require("@aws-sdk/lib-dynamodb");
+
+const {
+  DynamoDB: DynamoDBClient
+} = require("@aws-sdk/client-dynamodb");
 
 const documentClient = DynamoDBDocument.from(new DynamoDBClient({ region: "us-west-2" }));
 const response = await documentClient.scan({ TableName: "TABLE_NAME" });

src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/service-require-deep.output.js

@@ -1,9 +1,10 @@
 const {
-        DynamoDBDocument
-      } = require("@aws-sdk/lib-dynamodb"),
-      {
-        DynamoDB
-      } = require("@aws-sdk/client-dynamodb");
+  DynamoDBDocument
+} = require("@aws-sdk/lib-dynamodb");
+
+const {
+  DynamoDB
+} = require("@aws-sdk/client-dynamodb");
 
 const documentClient = DynamoDBDocument.from(new DynamoDB({ region: "us-west-2" }));
 const response = await documentClient.scan({ TableName: "TABLE_NAME" });

src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/service-require-with-name.output.js

@@ -1,9 +1,10 @@
 const {
-        DynamoDBDocument
-      } = require("@aws-sdk/lib-dynamodb"),
-      {
-        DynamoDB: DynamoDBClient
-      } = require("@aws-sdk/client-dynamodb");
+  DynamoDBDocument
+} = require("@aws-sdk/lib-dynamodb");
+
+const {
+  DynamoDB: DynamoDBClient
+} = require("@aws-sdk/client-dynamodb");
 
 const documentClient = DynamoDBDocument.from(new DynamoDBClient({ region: "us-west-2" }));
 const response = await documentClient.scan({ TableName: "TABLE_NAME" });