Skip to content

Commit 2161b67

Browse files
authored
Use package name as suffix in import equals default declaration (#620)
1 parent d68f434 commit 2161b67

30 files changed

+103
-109
lines changed

.changeset/ten-stingrays-guess.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"aws-sdk-js-codemod": patch
3+
---
4+
5+
Use package name as suffix in import equals default declaration

scripts/generateNewClientTests/getV3PackageImportEqualsCode.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
CLIENT_NAMES_MAP,
44
CLIENT_PACKAGE_NAMES_MAP,
55
} from "../../src/transforms/v2-to-v3/config";
6-
import { getDefaultLocalName } from "../../src/transforms/v2-to-v3/utils";
76
import { getClientNameWithLocalSuffix } from "./getClientNameWithLocalSuffix";
87

98
export interface V3PackageImportEqualsCodeOptions {
@@ -18,7 +17,10 @@ export const getV3PackageImportEqualsCode = (
1817
const { useLocalSuffix = false } = options || {};
1918

2019
for (const v2ClientName of clientsToTest) {
21-
const v3ClientDefaultLocalName = getDefaultLocalName(v2ClientName);
20+
const v3ClientDefaultLocalName = [
21+
"AWS",
22+
...CLIENT_PACKAGE_NAMES_MAP[v2ClientName].split("-"),
23+
].join("_");
2224
const v3ClientPackageName = `@aws-sdk/${CLIENT_PACKAGE_NAMES_MAP[v2ClientName]}`;
2325
content += `import ${v3ClientDefaultLocalName} = require("${v3ClientPackageName}");\n`;
2426

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AWS_S3 = require("@aws-sdk/client-s3");
2-
import Tag = AWS_S3.Tag;
1+
import AWS_client_s3 = require("@aws-sdk/client-s3");
2+
import Tag = AWS_client_s3.Tag;
33

44
const testTags: Tag[] = [{ Key: "key", Value: "value" }];
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AWS_S3 = require("@aws-sdk/client-s3");
2-
import Tag = AWS_S3.Tag;
1+
import AWS_client_s3 = require("@aws-sdk/client-s3");
2+
import Tag = AWS_client_s3.Tag;
33

44
const testTags: Tag[] = [{ Key: "key", Value: "value" }];

src/transforms/v2-to-v3/__fixtures__/api-input-output-type/global-import-equals.output.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
2-
import DynamoDB = AWS_DynamoDB.DynamoDB;
3-
import ListTablesCommandOutput = AWS_DynamoDB.ListTablesCommandOutput;
4-
import ListTablesCommandInput = AWS_DynamoDB.ListTablesCommandInput;
5-
import AWS_Lambda = require("@aws-sdk/client-lambda");
6-
import Lambda = AWS_Lambda.Lambda;
7-
import InvokeCommandOutput = AWS_Lambda.InvokeCommandOutput;
8-
import InvokeCommandInput = AWS_Lambda.InvokeCommandInput;
9-
import AWS_STS = require("@aws-sdk/client-sts");
10-
import STS = AWS_STS.STS;
11-
import GetCallerIdentityCommandOutput = AWS_STS.GetCallerIdentityCommandOutput;
12-
import GetCallerIdentityCommandInput = AWS_STS.GetCallerIdentityCommandInput;
1+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
2+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
3+
import ListTablesCommandOutput = AWS_client_dynamodb.ListTablesCommandOutput;
4+
import ListTablesCommandInput = AWS_client_dynamodb.ListTablesCommandInput;
5+
import AWS_client_lambda = require("@aws-sdk/client-lambda");
6+
import Lambda = AWS_client_lambda.Lambda;
7+
import InvokeCommandOutput = AWS_client_lambda.InvokeCommandOutput;
8+
import InvokeCommandInput = AWS_client_lambda.InvokeCommandInput;
9+
import AWS_client_sts = require("@aws-sdk/client-sts");
10+
import STS = AWS_client_sts.STS;
11+
import GetCallerIdentityCommandOutput = AWS_client_sts.GetCallerIdentityCommandOutput;
12+
import GetCallerIdentityCommandInput = AWS_client_sts.GetCallerIdentityCommandInput;
1313

1414
const ddbClient = new DynamoDB({ region: "us-west-2" });
1515
const listTablesInput: ListTablesCommandInput = { Limit: 10 };

src/transforms/v2-to-v3/__fixtures__/api-input-output-type/service-import-equals.output.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
2-
import DynamoDB = AWS_DynamoDB.DynamoDB;
3-
import ListTablesCommandOutput = AWS_DynamoDB.ListTablesCommandOutput;
4-
import ListTablesCommandInput = AWS_DynamoDB.ListTablesCommandInput;
5-
import AWS_Lambda = require("@aws-sdk/client-lambda");
6-
import Lambda = AWS_Lambda.Lambda;
7-
import InvokeCommandOutput = AWS_Lambda.InvokeCommandOutput;
8-
import InvokeCommandInput = AWS_Lambda.InvokeCommandInput;
9-
import AWS_STS = require("@aws-sdk/client-sts");
10-
import STS = AWS_STS.STS;
11-
import GetCallerIdentityCommandOutput = AWS_STS.GetCallerIdentityCommandOutput;
12-
import GetCallerIdentityCommandInput = AWS_STS.GetCallerIdentityCommandInput;
1+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
2+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
3+
import ListTablesCommandOutput = AWS_client_dynamodb.ListTablesCommandOutput;
4+
import ListTablesCommandInput = AWS_client_dynamodb.ListTablesCommandInput;
5+
import AWS_client_lambda = require("@aws-sdk/client-lambda");
6+
import Lambda = AWS_client_lambda.Lambda;
7+
import InvokeCommandOutput = AWS_client_lambda.InvokeCommandOutput;
8+
import InvokeCommandInput = AWS_client_lambda.InvokeCommandInput;
9+
import AWS_client_sts = require("@aws-sdk/client-sts");
10+
import STS = AWS_client_sts.STS;
11+
import GetCallerIdentityCommandOutput = AWS_client_sts.GetCallerIdentityCommandOutput;
12+
import GetCallerIdentityCommandInput = AWS_client_sts.GetCallerIdentityCommandInput;
1313

1414
const ddbClient = new DynamoDB({ region: "us-west-2" });
1515
const listTablesInput: ListTablesCommandInput = { Limit: 10 };
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
2-
import DynamoDB = AWS_DynamoDB.DynamoDB;
1+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
2+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
33

44
const client = new DynamoDB();
55
const data = await client.listTables();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
2-
import DynamoDB = AWS_DynamoDB.DynamoDB;
1+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
2+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
33

44
const client = new DynamoDB();
55
const data = await client.listTables();

src/transforms/v2-to-v3/__fixtures__/api-redundant-type/global-import-equals.output.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import AWS_APIGateway = require("@aws-sdk/client-api-gateway");
2-
import MethodSnapshot = AWS_APIGateway.MethodSnapshot;
3-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
4-
import AttributeValue = AWS_DynamoDB.AttributeValue;
5-
import AWS_S3 = require("@aws-sdk/client-s3");
6-
import Bucket = AWS_S3.Bucket;
7-
import ChecksumAlgorithm = AWS_S3.ChecksumAlgorithm;
1+
import AWS_client_api_gateway = require("@aws-sdk/client-api-gateway");
2+
import MethodSnapshot = AWS_client_api_gateway.MethodSnapshot;
3+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
4+
import AttributeValue = AWS_client_dynamodb.AttributeValue;
5+
import AWS_client_s3 = require("@aws-sdk/client-s3");
6+
import Bucket = AWS_client_s3.Bucket;
7+
import ChecksumAlgorithm = AWS_client_s3.ChecksumAlgorithm;
88

99
// Native types
1010
const stringType: string = "string";

src/transforms/v2-to-v3/__fixtures__/api-redundant-type/service-import-equals.output.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import AWS_APIGateway = require("@aws-sdk/client-api-gateway");
2-
import MethodSnapshot = AWS_APIGateway.MethodSnapshot;
3-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
4-
import AttributeValue = AWS_DynamoDB.AttributeValue;
5-
import AWS_S3 = require("@aws-sdk/client-s3");
6-
import Bucket = AWS_S3.Bucket;
7-
import ChecksumAlgorithm = AWS_S3.ChecksumAlgorithm;
1+
import AWS_client_api_gateway = require("@aws-sdk/client-api-gateway");
2+
import MethodSnapshot = AWS_client_api_gateway.MethodSnapshot;
3+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
4+
import AttributeValue = AWS_client_dynamodb.AttributeValue;
5+
import AWS_client_s3 = require("@aws-sdk/client-s3");
6+
import Bucket = AWS_client_s3.Bucket;
7+
import ChecksumAlgorithm = AWS_client_s3.ChecksumAlgorithm;
88

99
// Native types
1010
const stringType: string = "string";

0 commit comments

Comments
 (0)