Skip to content

Commit 2c48ffd

Browse files
authored
Rename getV3DefaultLocalName to getDefaultLocalName (#458)
1 parent 8082197 commit 2c48ffd

9 files changed

+33
-36
lines changed

src/transforms/v2-to-v3/modules/addClientDefaultImport.ts

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

3-
import { getV3DefaultLocalName } from "../utils";
3+
import { getDefaultLocalName } from "../utils";
44
import { getImportSpecifiers } from "./getImportSpecifiers";
55
import { getV2ImportDeclaration } from "./getV2ImportDeclaration";
66
import { ClientModulesOptions } from "./types";
@@ -10,8 +10,8 @@ export const addClientDefaultImport = (
1010
source: Collection<unknown>,
1111
{ v2ClientLocalName, v2ClientName, v3ClientPackageName }: ClientModulesOptions
1212
) => {
13-
const localName = getV3DefaultLocalName(v2ClientLocalName);
14-
const defaultImportSpecifier = j.importDefaultSpecifier(j.identifier(localName));
13+
const defaultLocalName = getDefaultLocalName(v2ClientLocalName);
14+
const defaultImportSpecifier = j.importDefaultSpecifier(j.identifier(defaultLocalName));
1515

1616
const importDeclarations = source.find(j.ImportDeclaration, {
1717
source: { value: v3ClientPackageName },
@@ -22,7 +22,7 @@ export const addClientDefaultImport = (
2222
) as ImportDefaultSpecifier[];
2323

2424
if (importDeclarations.length) {
25-
if (!importDefaultSpecifiers.find((specifier) => specifier?.local?.name === localName)) {
25+
if (!importDefaultSpecifiers.find((specifier) => specifier?.local?.name === defaultLocalName)) {
2626
importDeclarations.nodes()[0].specifiers?.push(defaultImportSpecifier);
2727
return;
2828
}

src/transforms/v2-to-v3/modules/addClientDefaultImportEquals.ts

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

3-
import { getV3DefaultLocalName } from "../utils";
3+
import { getDefaultLocalName } from "../utils";
44
import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
55
import { getImportEqualsLocalNameSuffix } from "./getImportEqualsLocalNameSuffix";
66
import { getV2ImportEqualsDeclaration } from "./getV2ImportEqualsDeclaration";
@@ -12,7 +12,7 @@ export const addClientDefaultImportEquals = (
1212
{ v2ClientLocalName, v2ClientName, v2GlobalName, v3ClientPackageName }: ClientModulesOptions
1313
) => {
1414
const localNameSuffix = getImportEqualsLocalNameSuffix(v2ClientName, v3ClientPackageName);
15-
const v3ClientDefaultLocalName = getV3DefaultLocalName(localNameSuffix);
15+
const defaultLocalName = getDefaultLocalName(localNameSuffix);
1616
const existingImportEquals = source.find(
1717
j.TSImportEqualsDeclaration,
1818
getImportEqualsDeclaration(v3ClientPackageName)
@@ -22,9 +22,7 @@ export const addClientDefaultImportEquals = (
2222
if (
2323
existingImportEquals
2424
.nodes()
25-
.some(
26-
(importEqualsDeclaration) => importEqualsDeclaration.id.name === v3ClientDefaultLocalName
27-
)
25+
.some((importEqualsDeclaration) => importEqualsDeclaration.id.name === defaultLocalName)
2826
) {
2927
return;
3028
}
@@ -38,7 +36,7 @@ export const addClientDefaultImportEquals = (
3836
}).at(0);
3937

4038
const v3importEqualsDeclaration = j.tsImportEqualsDeclaration(
41-
j.identifier(v3ClientDefaultLocalName),
39+
j.identifier(defaultLocalName),
4240
j.tsExternalModuleReference(j.stringLiteral(v3ClientPackageName))
4341
);
4442

src/transforms/v2-to-v3/modules/addClientDefaultRequire.ts

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

3-
import { getV3DefaultLocalName } from "../utils";
3+
import { getDefaultLocalName } from "../utils";
44
import { getRequireDeclarators } from "./getRequireDeclarators";
55
import { getV2RequireDeclarator } from "./getV2RequireDeclarator";
66
import { ClientModulesOptions } from "./types";
@@ -10,7 +10,7 @@ export const addClientDefaultRequire = (
1010
source: Collection<unknown>,
1111
{ v2ClientName, v2ClientLocalName, v3ClientPackageName, v2GlobalName }: ClientModulesOptions
1212
) => {
13-
const identifierName = getV3DefaultLocalName(v2ClientLocalName);
13+
const defaultLocalName = getDefaultLocalName(v2ClientLocalName);
1414
const existingRequires = getRequireDeclarators(j, source, v3ClientPackageName);
1515

1616
if (
@@ -21,7 +21,7 @@ export const addClientDefaultRequire = (
2121
.find(
2222
(variableDeclarator) =>
2323
variableDeclarator.id.type === "Identifier" &&
24-
variableDeclarator.id.name === identifierName
24+
variableDeclarator.id.name === defaultLocalName
2525
)
2626
) {
2727
return;
@@ -32,7 +32,7 @@ export const addClientDefaultRequire = (
3232
getV2RequireDeclarator(j, source, { v2ClientName, v2ClientLocalName, v2GlobalName });
3333

3434
const v3RequireDeclarator = j.variableDeclarator(
35-
j.identifier(identifierName),
35+
j.identifier(defaultLocalName),
3636
j.callExpression(j.identifier("require"), [j.literal(v3ClientPackageName)])
3737
);
3838

src/transforms/v2-to-v3/modules/addClientNamedImportEquals.ts

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

3-
import { getV3DefaultLocalName } from "../utils";
3+
import { getDefaultLocalName } from "../utils";
44
import { addClientDefaultImportEquals } from "./addClientDefaultImportEquals";
55
import { getImportEqualsDeclaration } from "./getImportEqualsDeclaration";
66
import { getImportEqualsLocalNameSuffix } from "./getImportEqualsLocalNameSuffix";
@@ -17,12 +17,12 @@ export const addClientNamedImportEquals = (
1717
const { v2ClientName, v3ClientPackageName } = v3ClientModulesOptions;
1818

1919
const localNameSuffix = getImportEqualsLocalNameSuffix(v2ClientName, v3ClientPackageName);
20-
const v3ClientDefaultLocalName = getV3DefaultLocalName(localNameSuffix);
20+
const defaultLocalName = getDefaultLocalName(localNameSuffix);
2121
const namedImportObjectProperty = getRequireProperty(j, { keyName, valueName });
2222

2323
const existingVarDeclarator = source.find(j.VariableDeclarator, {
2424
type: "VariableDeclarator",
25-
init: { type: "Identifier", name: v3ClientDefaultLocalName },
25+
init: { type: "Identifier", name: defaultLocalName },
2626
});
2727

2828
if (existingVarDeclarator.size()) {
@@ -40,15 +40,14 @@ export const addClientNamedImportEquals = (
4040
const varDeclaration = j.variableDeclaration("const", [
4141
j.variableDeclarator(
4242
j.objectPattern([namedImportObjectProperty]),
43-
j.identifier(v3ClientDefaultLocalName)
43+
j.identifier(defaultLocalName)
4444
),
4545
]);
4646

4747
const v3ClientImportEquals = source
4848
.find(j.TSImportEqualsDeclaration, importEqualsDeclaration)
4949
.filter(
50-
(importEqualsDeclaration) =>
51-
importEqualsDeclaration.value.id.name === v3ClientDefaultLocalName
50+
(importEqualsDeclaration) => importEqualsDeclaration.value.id.name === defaultLocalName
5251
);
5352

5453
if (v3ClientImportEquals.size() > 0) {

src/transforms/v2-to-v3/modules/addClientNamedRequire.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Collection, JSCodeshift, ObjectPattern, ObjectProperty, Property } from "jscodeshift";
22

33
import { OBJECT_PROPERTY_TYPE_LIST } from "../config";
4-
import { getV3DefaultLocalName } from "../utils";
4+
import { getDefaultLocalName } from "../utils";
55
import { getRequireDeclarators } from "./getRequireDeclarators";
66
import { getRequireDeclaratorsWithIdentifier } from "./getRequireDeclaratorsWithIdentifier";
77
import { getRequireProperty } from "./getRequireProperty";
@@ -17,8 +17,8 @@ export const addClientNamedRequire = (
1717
const { keyName, v2ClientName, v2ClientLocalName, v2GlobalName, v3ClientPackageName } = options;
1818
const valueName = options.valueName ?? keyName;
1919

20-
const v3ClientDefaultLocalName = getV3DefaultLocalName(v2ClientLocalName);
21-
const v3ClientObjectProperty = getRequireProperty(j, { keyName, valueName });
20+
const defaultLocalName = getDefaultLocalName(v2ClientLocalName);
21+
const clientObjectProperty = getRequireProperty(j, { keyName, valueName });
2222
const existingRequires = getRequireDeclarators(j, source, v3ClientPackageName);
2323

2424
if (existingRequires && existingRequires.nodes().length > 0) {
@@ -46,30 +46,30 @@ export const addClientNamedRequire = (
4646
}
4747

4848
const requireDeclaratorsWithIdentifier = getRequireDeclaratorsWithIdentifier(j, source, {
49-
identifierName: v3ClientDefaultLocalName,
49+
identifierName: defaultLocalName,
5050
sourceValue: v3ClientPackageName,
5151
});
5252

5353
if (requireDeclaratorsWithIdentifier && requireDeclaratorsWithIdentifier.nodes().length > 0) {
5454
requireDeclaratorsWithIdentifier.at(0).insertAfter(
55-
j.variableDeclarator(j.objectPattern([v3ClientObjectProperty]), {
55+
j.variableDeclarator(j.objectPattern([clientObjectProperty]), {
5656
type: "Identifier",
57-
name: v3ClientDefaultLocalName,
57+
name: defaultLocalName,
5858
})
5959
);
6060
return;
6161
}
6262

6363
if (existingRequireProperties.length > 0) {
6464
const firstRequireProperties = (existingRequireProperties[0].id as ObjectPattern).properties;
65-
firstRequireProperties.push(v3ClientObjectProperty);
65+
firstRequireProperties.push(clientObjectProperty);
6666
firstRequireProperties.sort(objectPatternPropertyCompareFn);
6767
return;
6868
}
6969
}
7070

7171
const v3RequireDeclarator = j.variableDeclarator(
72-
j.objectPattern([v3ClientObjectProperty]),
72+
j.objectPattern([clientObjectProperty]),
7373
j.callExpression(j.identifier("require"), [j.literal(v3ClientPackageName)])
7474
);
7575

src/transforms/v2-to-v3/ts-type/getV3ClientTypeReference.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
V2_CLIENT_INPUT_SUFFIX_LIST,
66
V2_CLIENT_OUTPUT_SUFFIX_LIST,
77
} from "../config";
8-
import { getV3DefaultLocalName } from "../utils";
8+
import { getDefaultLocalName } from "../utils";
99
import { getTypeRefForString } from "./getTypeRefForString";
1010

1111
export interface GetV3ClientTypeReferenceOptions {
@@ -25,17 +25,17 @@ export const getV3ClientTypeReference = (
2525
{ v2ClientLocalName, v2ClientName, v2ClientTypeName }: GetV3ClientTypeReferenceOptions
2626
): TSType => {
2727
const clientTypesMap = CLIENT_TYPES_MAP[v2ClientName];
28-
const v3ClientDefaultLocalName = getV3DefaultLocalName(v2ClientLocalName);
28+
const defaultLocalName = getDefaultLocalName(v2ClientLocalName);
2929

3030
if (Object.keys(clientTypesMap).includes(v2ClientTypeName)) {
31-
return getTypeRefForString(j, v3ClientDefaultLocalName, clientTypesMap[v2ClientTypeName]);
31+
return getTypeRefForString(j, defaultLocalName, clientTypesMap[v2ClientTypeName]);
3232
}
3333

3434
for (const inputSuffix of V2_CLIENT_INPUT_SUFFIX_LIST) {
3535
if (v2ClientTypeName.endsWith(inputSuffix)) {
3636
return getTypeRefWithV3ClientDefaultLocalName(
3737
j,
38-
v3ClientDefaultLocalName,
38+
defaultLocalName,
3939
v2ClientTypeName.replace(new RegExp(`${inputSuffix}$`), "CommandInput")
4040
);
4141
}
@@ -45,11 +45,11 @@ export const getV3ClientTypeReference = (
4545
if (v2ClientTypeName.endsWith(outputSuffix)) {
4646
return getTypeRefWithV3ClientDefaultLocalName(
4747
j,
48-
v3ClientDefaultLocalName,
48+
defaultLocalName,
4949
v2ClientTypeName.replace(new RegExp(`${outputSuffix}$`), "CommandOutput")
5050
);
5151
}
5252
}
5353

54-
return getTypeRefWithV3ClientDefaultLocalName(j, v3ClientDefaultLocalName, v2ClientTypeName);
54+
return getTypeRefWithV3ClientDefaultLocalName(j, defaultLocalName, v2ClientTypeName);
5555
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const getDefaultLocalName = (localNameSuffix: string) => `AWS_${localNameSuffix}`;

src/transforms/v2-to-v3/utils/getV3DefaultLocalName.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from "./getClientDeepImportPath";
22
export * from "./getClientNewExpression";
33
export * from "./getClientTSTypeRef";
4-
export * from "./getV3DefaultLocalName";
4+
export * from "./getDefaultLocalName";
55
export * from "./isTypeScriptFile";

0 commit comments

Comments
 (0)