Remove newlines from ObjectPattern requires with multiple keys (#717)

aws · Nov 12, 2023 · 56a5979 · 56a5979
1 parent c18f8be
commit 56a5979
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 30 deletions.
diff --git a/.changeset/eight-shrimps-admire.md b/.changeset/eight-shrimps-admire.md
@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": patch
+---
+
+Remove newlines from ObjectPattern requires with multiple keys
diff --git a/src/transforms/v2-to-v3/__fixtures__/existing/package-require.output.js b/src/transforms/v2-to-v3/__fixtures__/existing/package-require.output.js
@@ -1,7 +1,4 @@
-const {
-  DynamoDB,
-  DynamoDBClient
-} = require("@aws-sdk/client-dynamodb");
+const { DynamoDB, DynamoDBClient } = require("@aws-sdk/client-dynamodb");
 
 const client1 = new DynamoDB();
 const client2 = new DynamoDBClient();
diff --git a/src/transforms/v2-to-v3/__fixtures__/existing/package-service-require.output.js b/src/transforms/v2-to-v3/__fixtures__/existing/package-service-require.output.js
@@ -1,7 +1,4 @@
-const {
-  DynamoDB,
-  DynamoDBClient
-} = require("@aws-sdk/client-dynamodb");
+const { DynamoDB, DynamoDBClient } = require("@aws-sdk/client-dynamodb");
 
 const client1 = new DynamoDB();
 const client2 = new DynamoDBClient();
diff --git a/src/transforms/v2-to-v3/__fixtures__/s3-get-signed-url/getObject.require.output.js b/src/transforms/v2-to-v3/__fixtures__/s3-get-signed-url/getObject.require.output.js
@@ -1,9 +1,6 @@
 const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
 
-const {
-  GetObjectCommand,
-  S3
-} = require("@aws-sdk/client-s3");
+const { GetObjectCommand, S3 } = require("@aws-sdk/client-s3");
 
 const s3 = new S3();
 

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.output.js
@@ -1,7 +1,4 @@
-const {
-  S3,
-  waitUntilBucketExists
-} = require("@aws-sdk/client-s3");
+const { S3, waitUntilBucketExists } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3();

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.output.js
@@ -1,7 +1,4 @@
-const {
-  S3,
-  waitUntilBucketExists
-} = require("@aws-sdk/client-s3");
+const { S3, waitUntilBucketExists } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3();

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.output.js
@@ -1,7 +1,4 @@
-const {
-  S3,
-  waitUntilBucketExists
-} = require("@aws-sdk/client-s3");
+const { S3, waitUntilBucketExists } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3();

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.output.js
@@ -1,7 +1,4 @@
-const {
-  S3,
-  waitUntilBucketExists
-} = require("@aws-sdk/client-s3");
+const { S3, waitUntilBucketExists } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3();

diff --git a/src/transforms/v2-to-v3/utils/getFormattedSourceString.ts b/src/transforms/v2-to-v3/utils/getFormattedSourceString.ts
@@ -5,6 +5,7 @@ export const getFormattedSourceString = (source: string) =>
   source
     // Remove newlines from ObjectPattern requires.
     .replace(
-      /\{\n {2}([\w]*)\n\} = require\((['"])@aws-sdk/g,
-      (_, identifier, quote) => `{ ${identifier} } = require(${quote}@aws-sdk`
+      /\{\n {2}([\w,\n ]+)\n\} = require\((['"])@aws-sdk/g,
+      (_, identifiers, quote) =>
+        `{ ${identifiers.split(",\n  ").join(", ")} } = require(${quote}@aws-sdk`
     );