Skip to content

Commit 10be584

Browse files
trivikrtrivikr
authored
Rename v2DefaultModuleName to v2GlobalName (#232)
1 parent 19c35c6 commit 10be584

22 files changed

+86
-93
lines changed

‎.changeset/dirty-wombats-double.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+
Rename v2DefaultModuleName to v2GlobalName to align with v2ClientName

‎src/transforms/v2-to-v3/transformer.ts‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {
44
addV3ClientModules,
55
getClientMetadata,
66
getV2ClientNames,
7-
getV2ClientNamesFromDefault,
8-
getV2DefaultModuleName,
7+
getV2ClientNamesFromGlobal,
8+
getV2GlobalName,
99
isTypeScriptFile,
10-
removeDefaultModuleIfNotUsed,
1110
removePromiseCalls,
1211
removeV2ClientModule,
12+
removeV2GlobalModule,
1313
replaceClientCreation,
1414
replaceTSTypeReference,
1515
} from "./utils";
@@ -18,36 +18,34 @@ export default function transformer(file: FileInfo, api: API) {
1818
const j = isTypeScriptFile(file.path) ? api.jscodeshift.withParser("ts") : api.jscodeshift;
1919
const source = j(file.source);
2020

21-
// ToDo: Make v2DefaultModuleName optional downstream as it can be undefined.
22-
// ToDo: Rename v2DefaultModuleName to v2GlobalName to align with v2ClientName.
23-
const v2DefaultModuleName = getV2DefaultModuleName(j, source) as string;
21+
// ToDo: Make v2GlobalName optional downstream as it can be undefined.
22+
const v2GlobalName = getV2GlobalName(j, source) as string;
2423
const v2ClientNames = getV2ClientNames(j, source);
2524

26-
if (!v2DefaultModuleName && v2ClientNames.length === 0) {
25+
if (!v2GlobalName && v2ClientNames.length === 0) {
2726
return source.toSource();
2827
}
2928

30-
if (v2DefaultModuleName) {
31-
v2ClientNames.push(...getV2ClientNamesFromDefault(j, source, v2DefaultModuleName));
29+
if (v2GlobalName) {
30+
v2ClientNames.push(...getV2ClientNamesFromGlobal(j, source, v2GlobalName));
3231
}
3332

3433
const clientMetadata = getClientMetadata(v2ClientNames);
3534

3635
for (const [v2ClientName, v3ClientMetadata] of Object.entries(clientMetadata).reverse()) {
3736
const { v3ClientName, v3ClientPackageName } = v3ClientMetadata;
38-
addV3ClientModules(j, source, {
39-
v2ClientName,
40-
v3ClientName,
41-
v3ClientPackageName,
42-
v2DefaultModuleName,
43-
});
44-
replaceTSTypeReference(j, source, { v2ClientName, v2DefaultModuleName, v3ClientName });
45-
removeV2ClientModule(j, source, { v2ClientName, v2DefaultModuleName });
46-
removePromiseCalls(j, source, { v2ClientName, v2DefaultModuleName });
47-
replaceClientCreation(j, source, { v2ClientName, v2DefaultModuleName, v3ClientName });
37+
38+
const v2Options = { v2ClientName, v2GlobalName };
39+
const v3Options = { v3ClientName, v3ClientPackageName };
40+
41+
addV3ClientModules(j, source, { ...v2Options, ...v3Options });
42+
replaceTSTypeReference(j, source, { ...v2Options, v3ClientName });
43+
removeV2ClientModule(j, source, v2Options);
44+
removePromiseCalls(j, source, v2Options);
45+
replaceClientCreation(j, source, { ...v2Options, v3ClientName });
4846
}
4947

50-
removeDefaultModuleIfNotUsed(j, source, v2DefaultModuleName);
48+
removeV2GlobalModule(j, source, v2GlobalName);
5149

5250
return source.toSource();
5351
}

‎src/transforms/v2-to-v3/utils/add/addV3ClientImports.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ import { AddV3ClientModulesOptions } from "./addV3ClientModules";
88
export const addV3ClientImports = (
99
j: JSCodeshift,
1010
source: Collection<unknown>,
11-
{
12-
v2ClientName,
13-
v3ClientName,
14-
v3ClientPackageName,
15-
v2DefaultModuleName,
16-
}: AddV3ClientModulesOptions
11+
{ v2ClientName, v3ClientName, v3ClientPackageName, v2GlobalName }: AddV3ClientModulesOptions
1712
): void => {
1813
const existingImports = source.find(j.ImportDeclaration, {
1914
source: { value: v3ClientPackageName },
@@ -41,7 +36,7 @@ export const addV3ClientImports = (
4136
}
4237

4338
// Add require for input/output types, if needed.
44-
const v3ClientTypeNames = getV3ClientTypeNames(j, source, { v2ClientName, v2DefaultModuleName });
39+
const v3ClientTypeNames = getV3ClientTypeNames(j, source, { v2ClientName, v2GlobalName });
4540

4641
if (v3ClientTypeNames.length > 0) {
4742
const clientImports = source.find(j.ImportDeclaration, {

‎src/transforms/v2-to-v3/utils/add/addV3ClientModules.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export interface AddV3ClientModulesOptions {
88
v2ClientName: string;
99
v3ClientName: string;
1010
v3ClientPackageName: string;
11-
v2DefaultModuleName: string;
11+
v2GlobalName: string;
1212
}
1313

1414
export const addV3ClientModules = (

‎src/transforms/v2-to-v3/utils/add/addV3ClientRequires.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@ const getClientProperty = (j: JSCodeshift, name: Identifier) =>
2020
export const addV3ClientRequires = (
2121
j: JSCodeshift,
2222
source: Collection<unknown>,
23-
{
24-
v2ClientName,
25-
v3ClientName,
26-
v3ClientPackageName,
27-
v2DefaultModuleName,
28-
}: AddV3ClientModulesOptions
23+
{ v2ClientName, v3ClientName, v3ClientPackageName, v2GlobalName }: AddV3ClientModulesOptions
2924
): void => {
3025
const v3ClientNameProperty = getClientProperty(j, j.identifier(v3ClientName));
3126
const existingRequires = getRequireVariableDeclaration(j, source, v3ClientPackageName);
@@ -54,7 +49,7 @@ export const addV3ClientRequires = (
5449
}
5550

5651
// Add require for input/output types, if needed.
57-
const v3ClientTypeNames = getV3ClientTypeNames(j, source, { v2ClientName, v2DefaultModuleName });
52+
const v3ClientTypeNames = getV3ClientTypeNames(j, source, { v2ClientName, v2GlobalName });
5853

5954
if (v3ClientTypeNames.length > 0) {
6055
const clientRequires = getRequireVariableDeclaration(j, source, v3ClientPackageName);

‎src/transforms/v2-to-v3/utils/get/getV2ClientIdNamesFromNewExpr.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getV2ClientNewExpression } from "./getV2ClientNewExpression";
55

66
export interface GetV2ClientIdNamesFromNewExprOptions {
77
v2ClientName: string;
8-
v2DefaultModuleName: string;
8+
v2GlobalName: string;
99
}
1010

1111
const getNamesFromVariableDeclarator = (
@@ -37,17 +37,17 @@ const getNamesFromAssignmentPattern = (
3737
export const getV2ClientIdNamesFromNewExpr = (
3838
j: JSCodeshift,
3939
source: Collection<unknown>,
40-
{ v2DefaultModuleName, v2ClientName }: GetV2ClientIdNamesFromNewExprOptions
40+
{ v2GlobalName, v2ClientName }: GetV2ClientIdNamesFromNewExprOptions
4141
): string[] => {
42-
const namesFromDefaultModule = [];
42+
const namesFromGlobalModule = [];
4343
const namesFromServiceModule = [];
4444

4545
for (const getNames of [getNamesFromVariableDeclarator, getNamesFromAssignmentPattern]) {
46-
namesFromDefaultModule.push(
47-
...getNames(j, source, getV2ClientNewExpression({ v2DefaultModuleName, v2ClientName }))
46+
namesFromGlobalModule.push(
47+
...getNames(j, source, getV2ClientNewExpression({ v2GlobalName, v2ClientName }))
4848
);
4949
namesFromServiceModule.push(...getNames(j, source, getV2ClientNewExpression({ v2ClientName })));
5050
}
5151

52-
return getMergedArrayWithoutDuplicates(namesFromDefaultModule, namesFromServiceModule);
52+
return getMergedArrayWithoutDuplicates(namesFromGlobalModule, namesFromServiceModule);
5353
};

‎src/transforms/v2-to-v3/utils/get/getV2ClientIdNamesFromTSTypeRef.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import { getMergedArrayWithoutDuplicates } from "./getMergedArrayWithoutDuplicat
44

55
export interface GetV2ClientIdNamesFromTSTypeRefOptions {
66
v2ClientName: string;
7-
v2DefaultModuleName: string;
7+
v2GlobalName: string;
88
}
99

1010
export const getV2ClientIdNamesFromTSTypeRef = (
1111
j: JSCodeshift,
1212
source: Collection<unknown>,
13-
{ v2DefaultModuleName, v2ClientName }: GetV2ClientIdNamesFromTSTypeRefOptions
13+
{ v2GlobalName, v2ClientName }: GetV2ClientIdNamesFromTSTypeRefOptions
1414
): string[] => {
15-
const clientIdNamesFromDefaultModule = source
15+
const clientIdNamesFromGlobalModule = source
1616
.find(j.Identifier, {
1717
typeAnnotation: {
1818
typeAnnotation: {
1919
typeName: {
20-
left: { name: v2DefaultModuleName },
20+
left: { name: v2GlobalName },
2121
right: { name: v2ClientName },
2222
},
2323
},
@@ -38,7 +38,7 @@ export const getV2ClientIdNamesFromTSTypeRef = (
3838
.map((identifier) => identifier.name);
3939

4040
return getMergedArrayWithoutDuplicates(
41-
clientIdNamesFromDefaultModule,
41+
clientIdNamesFromGlobalModule,
4242
clientIdNamesFromServiceModule
4343
);
4444
};

‎src/transforms/v2-to-v3/utils/get/getV2ClientIdentifiers.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import { getV2ClientIdNamesFromTSTypeRef } from "./getV2ClientIdNamesFromTSTypeR
66

77
export interface GetV2ClientIdNamesOptions {
88
v2ClientName: string;
9-
v2DefaultModuleName: string;
9+
v2GlobalName: string;
1010
}
1111

1212
export const getV2ClientIdentifiers = (
1313
j: JSCodeshift,
1414
source: Collection<unknown>,
15-
{ v2DefaultModuleName, v2ClientName }: GetV2ClientIdNamesOptions
15+
{ v2GlobalName, v2ClientName }: GetV2ClientIdNamesOptions
1616
): Identifier[] => {
1717
const v2ClientIdNamesFromNewExpr = getV2ClientIdNamesFromNewExpr(j, source, {
18-
v2DefaultModuleName,
18+
v2GlobalName,
1919
v2ClientName,
2020
});
2121

2222
const v2ClientIdNamesFromTSTypeRef = getV2ClientIdNamesFromTSTypeRef(j, source, {
23-
v2DefaultModuleName,
23+
v2GlobalName,
2424
v2ClientName,
2525
});
2626

‎src/transforms/v2-to-v3/utils/get/getV2ClientNamesFromDefault.ts‎ renamed to ‎src/transforms/v2-to-v3/utils/get/getV2ClientNamesFromGlobal.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { getMergedArrayWithoutDuplicates } from "./getMergedArrayWithoutDuplicat
44
import { getV2ClientNamesFromNewExpr } from "./getV2ClientNamesFromNewExpr";
55
import { getV2ClientNamesFromTSTypeRef } from "./getV2ClientNamesFromTSTypeRef";
66

7-
export const getV2ClientNamesFromDefault = (
7+
export const getV2ClientNamesFromGlobal = (
88
j: JSCodeshift,
99
source: Collection<unknown>,
10-
v2DefaultModuleName: string
10+
v2GlobalName: string
1111
): string[] => {
12-
const v2ClientNamesFromNewExpr = getV2ClientNamesFromNewExpr(j, source, v2DefaultModuleName);
13-
const v2ClientNamesFromTSTypeRef = getV2ClientNamesFromTSTypeRef(j, source, v2DefaultModuleName);
12+
const v2ClientNamesFromNewExpr = getV2ClientNamesFromNewExpr(j, source, v2GlobalName);
13+
const v2ClientNamesFromTSTypeRef = getV2ClientNamesFromTSTypeRef(j, source, v2GlobalName);
1414

1515
return getMergedArrayWithoutDuplicates(v2ClientNamesFromNewExpr, v2ClientNamesFromTSTypeRef);
1616
};

‎src/transforms/v2-to-v3/utils/get/getV2ClientNamesFromNewExpr.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { getV2ClientNewExpression } from "../get";
55
export const getV2ClientNamesFromNewExpr = (
66
j: JSCodeshift,
77
source: Collection<unknown>,
8-
v2DefaultModuleName: string
8+
v2GlobalName: string
99
): string[] =>
1010
source
11-
.find(j.NewExpression, getV2ClientNewExpression({ v2DefaultModuleName }))
11+
.find(j.NewExpression, getV2ClientNewExpression({ v2GlobalName }))
1212
.nodes()
1313
.map(
1414
(newExpression) => ((newExpression.callee as MemberExpression).property as Identifier).name

0 commit comments

Comments
 (0)