Skip to content

Commit 15b19a4

Browse files
authored
Make valueName optional in getV3ClientRequireProperty (#396)
1 parent e319f7f commit 15b19a4

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const addV3ClientImportEquals = (
3535
addV3ClientNamedImportEquals(j, source, {
3636
...options,
3737
keyName: v3WaiterApiName,
38-
valueName: v3WaiterApiName,
3938
});
4039
}
4140
};

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ import { V3ClientModulesOptions, V3ClientRequirePropertyOptions } from "./types"
1212
export const addV3ClientNamedRequire = (
1313
j: JSCodeshift,
1414
source: Collection<unknown>,
15-
{
16-
keyName,
17-
valueName,
18-
v2ClientName,
19-
v2ClientLocalName,
20-
v2GlobalName,
21-
v3ClientPackageName,
22-
}: V3ClientModulesOptions & V3ClientRequirePropertyOptions
15+
options: V3ClientModulesOptions & V3ClientRequirePropertyOptions
2316
) => {
17+
const { keyName, v2ClientName, v2ClientLocalName, v2GlobalName, v3ClientPackageName } = options;
18+
const valueName = options.valueName ?? keyName;
19+
2420
const v3ClientDefaultLocalName = getV3ClientDefaultLocalName(v2ClientLocalName);
2521
const v3ClientObjectProperty = getV3ClientRequireProperty(j, { keyName, valueName });
2622
const existingRequires = getRequireDeclarators(j, source, v3ClientPackageName);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const addV3ClientRequires = (
3535
addV3ClientNamedRequire(j, source, {
3636
...options,
3737
keyName: v3WaiterApiName,
38-
valueName: v3WaiterApiName,
3938
});
4039
}
4140
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export const getV3ClientRequireProperty = (
88
) =>
99
j.objectProperty.from({
1010
key: j.identifier(keyName),
11-
value: j.identifier(valueName),
11+
value: j.identifier(valueName ?? keyName),
1212
shorthand: true,
1313
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export interface V3ClientModulesOptions {
88

99
export interface V3ClientRequirePropertyOptions {
1010
keyName: string;
11-
valueName: string;
11+
valueName?: string;
1212
}
1313

1414
export interface V3ClientImportSpecifierOptions {

0 commit comments

Comments
 (0)