Skip to content

Commit 2161b67

Browse files
trivikrtrivikr
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

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

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-basic-type/service-import-equals.output.ts

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 };

‎src/transforms/v2-to-v3/__fixtures__/api-promise/global-import-equals.output.ts

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-promise/service-import-equals.output.ts

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";

‎src/transforms/v2-to-v3/__fixtures__/ddb-doc-client-input-output-type/global-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import AWS_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
22
import DynamoDBDocument = AWS_lib_dynamodb.DynamoDBDocument;
33
import ScanCommandOutput = AWS_lib_dynamodb.ScanCommandOutput;
44
import ScanCommandInput = AWS_lib_dynamodb.ScanCommandInput;
5-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
6-
import DynamoDB = AWS_DynamoDB.DynamoDB;
5+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
6+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
77

88
const docClient = DynamoDBDocument.from(new DynamoDB({ region: "us-west-2" }));
99

‎src/transforms/v2-to-v3/__fixtures__/ddb-doc-client-input-output-type/service-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import AWS_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
22
import DynamoDBDocument = AWS_lib_dynamodb.DynamoDBDocument;
33
import ScanCommandOutput = AWS_lib_dynamodb.ScanCommandOutput;
44
import ScanCommandInput = AWS_lib_dynamodb.ScanCommandInput;
5-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
6-
import DynDB = AWS_DynamoDB.DynamoDB;
5+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
6+
import DynDB = AWS_client_dynamodb.DynamoDB;
77

88
const docClient = DynamoDBDocument.from(new DynDB({ region: "us-west-2" }));
99

‎src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/global-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AWS_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
22
import DynamoDBDocument = AWS_lib_dynamodb.DynamoDBDocument;
3-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
4-
import DynamoDB = AWS_DynamoDB.DynamoDB;
3+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
4+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
55

66
const documentClient = DynamoDBDocument.from(new DynamoDB({ region: "us-west-2" }));
77
const response = await documentClient.scan({ TableName: "TABLE_NAME" });

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AWS_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
22
import DynamoDBDocument = AWS_lib_dynamodb.DynamoDBDocument;
3-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
4-
import DynamoDBClient = AWS_DynamoDB.DynamoDB;
3+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
4+
import DynamoDBClient = AWS_client_dynamodb.DynamoDB;
55

66
const documentClient = DynamoDBDocument.from(new DynamoDBClient({ region: "us-west-2" }));
77
const response = await documentClient.scan({ TableName: "TABLE_NAME" });

‎src/transforms/v2-to-v3/__fixtures__/ddb-doc-client/service-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AWS_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
22
import DynamoDBDocument = AWS_lib_dynamodb.DynamoDBDocument;
3-
import AWS_DynamoDB = require("@aws-sdk/client-dynamodb");
4-
import DynamoDB = AWS_DynamoDB.DynamoDB;
3+
import AWS_client_dynamodb = require("@aws-sdk/client-dynamodb");
4+
import DynamoDB = AWS_client_dynamodb.DynamoDB;
55

66
const documentClient = DynamoDBDocument.from(new DynamoDB({ region: "us-west-2" }));
77
const response = await documentClient.scan({ TableName: "TABLE_NAME" });

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
33

44

5-
import AWS_AccessAnalyzer = require("@aws-sdk/client-accessanalyzer");
6-
import AccessAnalyzer = AWS_AccessAnalyzer.AccessAnalyzer;
7-
import AWS_ACM = require("@aws-sdk/client-acm");
8-
import ACM = AWS_ACM.ACM;
9-
import AWS_Discovery = require("@aws-sdk/client-application-discovery-service");
10-
import ApplicationDiscoveryService = AWS_Discovery.ApplicationDiscoveryService;
5+
import AWS_client_accessanalyzer = require("@aws-sdk/client-accessanalyzer");
6+
import AccessAnalyzer = AWS_client_accessanalyzer.AccessAnalyzer;
7+
import AWS_client_acm = require("@aws-sdk/client-acm");
8+
import ACM = AWS_client_acm.ACM;
9+
import AWS_client_application_discovery_service = require("@aws-sdk/client-application-discovery-service");
10+
import ApplicationDiscoveryService = AWS_client_application_discovery_service.ApplicationDiscoveryService;
1111

1212
new ACM();
1313
new AccessAnalyzer();

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
33

44

5-
import AWS_ACM = require("@aws-sdk/client-acm");
6-
import ACMClient = AWS_ACM.ACM;
7-
import AWS_AccessAnalyzer = require("@aws-sdk/client-accessanalyzer");
8-
import AccessAnalyzerClient = AWS_AccessAnalyzer.AccessAnalyzer;
9-
import AWS_Discovery = require("@aws-sdk/client-application-discovery-service");
10-
import DiscoveryClient = AWS_Discovery.ApplicationDiscoveryService;
5+
import AWS_client_acm = require("@aws-sdk/client-acm");
6+
import ACMClient = AWS_client_acm.ACM;
7+
import AWS_client_accessanalyzer = require("@aws-sdk/client-accessanalyzer");
8+
import AccessAnalyzerClient = AWS_client_accessanalyzer.AccessAnalyzer;
9+
import AWS_client_application_discovery_service = require("@aws-sdk/client-application-discovery-service");
10+
import DiscoveryClient = AWS_client_application_discovery_service.ApplicationDiscoveryService;
1111

1212
new ACMClient();
1313
new AccessAnalyzerClient();

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Do not edit this file directly. Instead, edit the script and run it to regenerate this file.
33

44

5-
import AWS_ACM = require("@aws-sdk/client-acm");
6-
import ACM = AWS_ACM.ACM;
7-
import AWS_AccessAnalyzer = require("@aws-sdk/client-accessanalyzer");
8-
import AccessAnalyzer = AWS_AccessAnalyzer.AccessAnalyzer;
9-
import AWS_Discovery = require("@aws-sdk/client-application-discovery-service");
10-
import ApplicationDiscoveryService = AWS_Discovery.ApplicationDiscoveryService;
5+
import AWS_client_acm = require("@aws-sdk/client-acm");
6+
import ACM = AWS_client_acm.ACM;
7+
import AWS_client_accessanalyzer = require("@aws-sdk/client-accessanalyzer");
8+
import AccessAnalyzer = AWS_client_accessanalyzer.AccessAnalyzer;
9+
import AWS_client_application_discovery_service = require("@aws-sdk/client-application-discovery-service");
10+
import ApplicationDiscoveryService = AWS_client_application_discovery_service.ApplicationDiscoveryService;
1111

1212
new ACM();
1313
new AccessAnalyzer();

‎src/transforms/v2-to-v3/__fixtures__/s3-get-signed-url/getObject.import-equals.output.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import AWS_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
22
import getSignedUrl = AWS_s3_request_presigner.getSignedUrl;
3-
import AWS_S3 = require("@aws-sdk/client-s3");
4-
import GetObjectCommand = AWS_S3.GetObjectCommand;
5-
import S3 = AWS_S3.S3;
3+
import AWS_client_s3 = require("@aws-sdk/client-s3");
4+
import GetObjectCommand = AWS_client_s3.GetObjectCommand;
5+
import S3 = AWS_client_s3.S3;
66

77
const s3 = new S3();
88

‎src/transforms/v2-to-v3/__fixtures__/s3-upload/global-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AWS_lib_storage = require("@aws-sdk/lib-storage");
22
import Upload = AWS_lib_storage.Upload;
3-
import AWS_S3 = require("@aws-sdk/client-s3");
4-
import S3 = AWS_S3.S3;
3+
import AWS_client_s3 = require("@aws-sdk/client-s3");
4+
import S3 = AWS_client_s3.S3;
55

66
const client = new S3({ region: "REGION" });
77
await new Upload({

‎src/transforms/v2-to-v3/__fixtures__/s3-upload/service-import-equals.output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AWS_lib_storage = require("@aws-sdk/lib-storage");
22
import Upload = AWS_lib_storage.Upload;
3-
import AWS_S3 = require("@aws-sdk/client-s3");
4-
import S3 = AWS_S3.S3;
3+
import AWS_client_s3 = require("@aws-sdk/client-s3");
4+
import S3 = AWS_client_s3.S3;
55

66
const client = new S3({ region: "REGION" });
77
await new Upload({

‎src/transforms/v2-to-v3/__fixtures__/waiters/global-import-equals.output.ts

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

55
const Bucket = "BUCKET_NAME";
66
const client = new S3({ region: "REGION" });

‎src/transforms/v2-to-v3/__fixtures__/waiters/service-import-equals.output.ts

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

55
const Bucket = "BUCKET_NAME";
66
const client = new S3({ region: "REGION" });

‎src/transforms/v2-to-v3/modules/getImportEqualsLocalNameSuffix.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/transforms/v2-to-v3/modules/importEqualsModule/addClientDefaultModule.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Collection, JSCodeshift } from "jscodeshift";
22

3-
import { getDefaultLocalName } from "../../utils";
43
import { getImportEqualsDeclaration } from "../getImportEqualsDeclaration";
54
import { getImportEqualsDeclarationType } from "../getImportEqualsDeclarationType";
6-
import { getImportEqualsLocalNameSuffix } from "../getImportEqualsLocalNameSuffix";
75
import { ClientModulesOptions } from "../types";
6+
import { getImportEqualsDefaultName } from "./getImportEqualsDefaultName";
87

98
export type ClientDefaultModuleOptions = Omit<ClientModulesOptions, "clientIdentifiers">;
109

@@ -13,8 +12,7 @@ export const addClientDefaultModule = (
1312
source: Collection<unknown>,
1413
{ v2ClientLocalName, v2ClientName, v2GlobalName, v3ClientPackageName }: ClientDefaultModuleOptions
1514
) => {
16-
const localNameSuffix = getImportEqualsLocalNameSuffix(v2ClientName, v3ClientPackageName);
17-
const defaultLocalName = getDefaultLocalName(localNameSuffix);
15+
const defaultLocalName = getImportEqualsDefaultName(v3ClientPackageName);
1816
const existingImportEquals = source.find(
1917
j.TSImportEqualsDeclaration,
2018
getImportEqualsDeclarationType(v3ClientPackageName)

‎src/transforms/v2-to-v3/modules/importEqualsModule/addClientNamedModule.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import { Collection, JSCodeshift } from "jscodeshift";
22

3-
import { getDefaultLocalName } from "../../utils";
43
import { getImportEqualsDeclarationType } from "../getImportEqualsDeclarationType";
5-
import { getImportEqualsLocalNameSuffix } from "../getImportEqualsLocalNameSuffix";
64
import { ClientModulesOptions, ImportSpecifierOptions } from "../types";
75
import { addClientDefaultModule } from "./addClientDefaultModule";
6+
import { getImportEqualsDefaultName } from "./getImportEqualsDefaultName";
87

98
export const addClientNamedModule = (
109
j: JSCodeshift,
1110
source: Collection<unknown>,
1211
options: ClientModulesOptions & ImportSpecifierOptions
1312
) => {
1413
const { importedName, localName = importedName, ...v3ClientModulesOptions } = options;
15-
const { v2ClientName, v3ClientPackageName } = v3ClientModulesOptions;
14+
const { v3ClientPackageName } = v3ClientModulesOptions;
1615

17-
const localNameSuffix = getImportEqualsLocalNameSuffix(v2ClientName, v3ClientPackageName);
18-
const defaultLocalName = getDefaultLocalName(localNameSuffix);
16+
const defaultLocalName = getImportEqualsDefaultName(v3ClientPackageName);
1917

2018
const existingDeclaration = source.find(j.TSImportEqualsDeclaration, {
2119
type: "TSImportEqualsDeclaration",

‎src/transforms/v2-to-v3/modules/importEqualsModule/getImportEqualsDefaultName.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const getImportEqualsDefaultName = (packageName: string) =>
2+
["AWS", ...packageName.split("/").pop()!.split("-")].join("_");

‎src/transforms/v2-to-v3/modules/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export * from "./addClientModules";
22
export * from "./getGlobalNameFromModule";
33
export * from "./getImportEqualsDeclarationType";
4-
export * from "./getImportEqualsLocalNameSuffix";
54
export * from "./getImportSpecifiers";
65
export * from "./getImportType";
76
export * from "./getRequireDeclaratorsWithProperty";

‎src/transforms/v2-to-v3/utils/getDefaultLocalName.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/transforms/v2-to-v3/utils/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export * from "./getClientDeepImportPath";
22
export * from "./getClientNewExpression";
3-
export * from "./getDefaultLocalName";
43
export * from "./isTypeScriptFile";

0 commit comments

Comments
 (0)