Skip to content

Commit c564357

Browse files
mrlubosmrlubos
committed
test: update types
1 parent d22a26e commit c564357

File tree

27 files changed

+299
-295
lines changed

27 files changed

+299
-295
lines changed

‎packages/openapi-ts-tests/main/test/2.0.x.test.ts‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const version = '2.0.x';
1515
const outputDir = path.join(__dirname, 'generated', version);
1616

1717
describe(`OpenAPI ${version}`, () => {
18-
const createConfig = (userConfig: UserConfig): UserConfig => {
18+
const createConfig = (userConfig: UserConfig) => {
1919
const inputPath = path.join(
2020
getSpecsPath(),
2121
version,
@@ -42,7 +42,7 @@ describe(`OpenAPI ${version}`, () => {
4242
outputDir,
4343
typeof userConfig.output === 'string' ? userConfig.output : '',
4444
),
45-
};
45+
} as const satisfies UserConfig;
4646
};
4747

4848
const scenarios = [
@@ -393,9 +393,7 @@ describe(`OpenAPI ${version}`, () => {
393393
it.each(scenarios)('$description', async ({ config }) => {
394394
await createClient(config);
395395

396-
const outputPath =
397-
typeof config.output === 'string' ? config.output : config.output.path;
398-
const filePaths = getFilePaths(outputPath);
396+
const filePaths = getFilePaths(config.output);
399397

400398
await Promise.all(
401399
filePaths.map(async (filePath) => {
@@ -425,17 +423,8 @@ describe(`OpenAPI ${version}`, () => {
425423

426424
await createClient([configA, configB]);
427425

428-
const outputPathA =
429-
typeof configA.output === 'string'
430-
? configA.output
431-
: configA.output.path;
432-
const outputPathB =
433-
typeof configB.output === 'string'
434-
? configB.output
435-
: configB.output.path;
436-
437-
const filesA = getFilePaths(outputPathA);
438-
const filesB = getFilePaths(outputPathB);
426+
const filesA = getFilePaths(configA.output);
427+
const filesB = getFilePaths(configB.output);
439428

440429
await Promise.all(
441430
filesA.map(async (filePath) => {

‎packages/openapi-ts-tests/main/test/3.0.x.test.ts‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const version = '3.0.x';
1515
const outputDir = path.join(__dirname, 'generated', version);
1616

1717
describe(`OpenAPI ${version}`, () => {
18-
const createConfig = (userConfig: UserConfig): UserConfig => {
18+
const createConfig = (userConfig: UserConfig) => {
1919
const inputPath = path.join(
2020
getSpecsPath(),
2121
version,
@@ -42,7 +42,7 @@ describe(`OpenAPI ${version}`, () => {
4242
outputDir,
4343
typeof userConfig.output === 'string' ? userConfig.output : '',
4444
),
45-
};
45+
} as const satisfies UserConfig;
4646
};
4747

4848
const scenarios = [
@@ -670,9 +670,7 @@ describe(`OpenAPI ${version}`, () => {
670670
it.each(scenarios)('$description', async ({ config }) => {
671671
await createClient(config);
672672

673-
const outputPath =
674-
typeof config.output === 'string' ? config.output : config.output.path;
675-
const filePaths = getFilePaths(outputPath);
673+
const filePaths = getFilePaths(config.output);
676674

677675
await Promise.all(
678676
filePaths.map(async (filePath) => {
@@ -703,17 +701,8 @@ describe(`OpenAPI ${version}`, () => {
703701

704702
await createClient([configA, configB]);
705703

706-
const outputPathA =
707-
typeof configA.output === 'string'
708-
? configA.output
709-
: configA.output.path;
710-
const outputPathB =
711-
typeof configB.output === 'string'
712-
? configB.output
713-
: configB.output.path;
714-
715-
const filesA = getFilePaths(outputPathA);
716-
const filesB = getFilePaths(outputPathB);
704+
const filesA = getFilePaths(configA.output);
705+
const filesB = getFilePaths(configB.output);
717706

718707
await Promise.all(
719708
filesA.map(async (filePath) => {

‎packages/openapi-ts-tests/main/test/3.1.x.test.ts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const version = '3.1.x';
1515
const outputDir = path.join(__dirname, 'generated', version);
1616

1717
describe(`OpenAPI ${version}`, () => {
18-
const createConfig = (userConfig: UserConfig): UserConfig => {
18+
const createConfig = (userConfig: UserConfig) => {
1919
const inputPath = path.join(
2020
getSpecsPath(),
2121
version,
@@ -25,6 +25,10 @@ describe(`OpenAPI ${version}`, () => {
2525
? (userConfig.input[0] as any).path || userConfig.input[0]
2626
: (userConfig.input as any).path,
2727
);
28+
const output =
29+
userConfig.output instanceof Array
30+
? userConfig.output[0]
31+
: userConfig.output;
2832
return {
2933
plugins: ['@hey-api/typescript'],
3034
...userConfig,
@@ -40,11 +44,9 @@ describe(`OpenAPI ${version}`, () => {
4044
},
4145
output: path.join(
4246
outputDir,
43-
typeof userConfig.output === 'string'
44-
? userConfig.output
45-
: userConfig.output.path,
47+
typeof output === 'string' ? output : (output?.path ?? ''),
4648
),
47-
};
49+
} as const satisfies UserConfig;
4850
};
4951

5052
const scenarios = [
@@ -973,9 +975,7 @@ describe(`OpenAPI ${version}`, () => {
973975
it.each(scenarios)('$description', async ({ config }) => {
974976
await createClient(config);
975977

976-
const outputPath =
977-
typeof config.output === 'string' ? config.output : config.output.path;
978-
const filePaths = getFilePaths(outputPath);
978+
const filePaths = getFilePaths(config.output);
979979

980980
await Promise.all(
981981
filePaths.map(async (filePath) => {
@@ -1006,17 +1006,8 @@ describe(`OpenAPI ${version}`, () => {
10061006

10071007
await createClient([configA, configB]);
10081008

1009-
const outputPathA =
1010-
typeof configA.output === 'string'
1011-
? configA.output
1012-
: configA.output.path;
1013-
const outputPathB =
1014-
typeof configB.output === 'string'
1015-
? configB.output
1016-
: configB.output.path;
1017-
1018-
const filesA = getFilePaths(outputPathA);
1019-
const filesB = getFilePaths(outputPathB);
1009+
const filesA = getFilePaths(configA.output);
1010+
const filesB = getFilePaths(configB.output);
10201011

10211012
await Promise.all(
10221013
filesA.map(async (filePath) => {

‎packages/openapi-ts-tests/main/test/clients.test.ts‎

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,26 @@ for (const client of clients) {
3636
const createConfig = (
3737
userConfig: Omit<UserConfig, 'input'> &
3838
Pick<Partial<UserConfig>, 'input'>,
39-
): UserConfig => ({
40-
...userConfig,
41-
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
42-
logs: {
43-
level: 'silent',
44-
},
45-
output:
46-
typeof userConfig.output === 'string'
47-
? path.join(outputDir, userConfig.output)
48-
: {
49-
...userConfig.output,
50-
path: path.join(outputDir, userConfig.output.path),
51-
},
52-
});
39+
) => {
40+
const output =
41+
userConfig.output instanceof Array
42+
? userConfig.output[0]
43+
: userConfig.output;
44+
return {
45+
...userConfig,
46+
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
47+
logs: {
48+
level: 'silent',
49+
},
50+
output:
51+
typeof output === 'string'
52+
? path.join(outputDir, output)
53+
: {
54+
...output,
55+
path: path.join(outputDir, output?.path ?? ''),
56+
},
57+
} as const satisfies UserConfig;
58+
};
5359

5460
const scenarios = [
5561
{
@@ -226,17 +232,18 @@ describe('custom-client', () => {
226232

227233
const createConfig = (
228234
userConfig: Omit<UserConfig, 'input'> & Pick<Partial<UserConfig>, 'input'>,
229-
): UserConfig => ({
230-
...userConfig,
231-
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
232-
logs: {
233-
level: 'silent',
234-
},
235-
output: path.join(
236-
outputDir,
237-
typeof userConfig.output === 'string' ? userConfig.output : '',
238-
),
239-
});
235+
) =>
236+
({
237+
...userConfig,
238+
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
239+
logs: {
240+
level: 'silent',
241+
},
242+
output: path.join(
243+
outputDir,
244+
typeof userConfig.output === 'string' ? userConfig.output : '',
245+
),
246+
}) as const satisfies UserConfig;
240247

241248
const scenarios = [
242249
{
@@ -336,9 +343,7 @@ describe('custom-client', () => {
336343
it.each(scenarios)('$description', async ({ config }) => {
337344
await createClient(config);
338345

339-
const outputPath =
340-
typeof config.output === 'string' ? config.output : config.output.path;
341-
const filePaths = getFilePaths(outputPath);
346+
const filePaths = getFilePaths(config.output);
342347

343348
await Promise.all(
344349
filePaths.map(async (filePath) => {
@@ -372,17 +377,18 @@ describe('my-client', () => {
372377

373378
const createConfig = (
374379
userConfig: Omit<UserConfig, 'input'> & Pick<Partial<UserConfig>, 'input'>,
375-
): UserConfig => ({
376-
...userConfig,
377-
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
378-
logs: {
379-
level: 'silent',
380-
},
381-
output: path.join(
382-
outputDir,
383-
typeof userConfig.output === 'string' ? userConfig.output : '',
384-
),
385-
});
380+
) =>
381+
({
382+
...userConfig,
383+
input: path.join(getSpecsPath(), '3.1.x', 'full.yaml'),
384+
logs: {
385+
level: 'silent',
386+
},
387+
output: path.join(
388+
outputDir,
389+
typeof userConfig.output === 'string' ? userConfig.output : '',
390+
),
391+
}) as const satisfies UserConfig;
386392

387393
const scenarios = [
388394
{
@@ -482,9 +488,7 @@ describe('my-client', () => {
482488
it.each(scenarios)('$description', async ({ config }) => {
483489
await createClient(config);
484490

485-
const outputPath =
486-
typeof config.output === 'string' ? config.output : config.output.path;
487-
const filePaths = getFilePaths(outputPath);
491+
const filePaths = getFilePaths(config.output);
488492

489493
await Promise.all(
490494
filePaths.map(async (filePath) => {

‎packages/openapi-ts-tests/main/test/plugins.test.ts‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,26 @@ for (const version of versions) {
2626
userConfig: Omit<UserConfig, 'input'> &
2727
Pick<Required<UserConfig>, 'plugins'> &
2828
Pick<Partial<UserConfig>, 'input'>,
29-
): UserConfig => ({
30-
...userConfig,
31-
input: path.join(
32-
getSpecsPath(),
33-
version,
34-
typeof userConfig.input === 'string' ? userConfig.input : 'full.yaml',
35-
),
36-
logs: {
37-
level: 'silent',
38-
},
39-
output: path.join(
40-
outputDir,
41-
typeof userConfig.plugins[0] === 'string'
42-
? userConfig.plugins[0]
43-
: userConfig.plugins[0]!.name,
44-
typeof userConfig.output === 'string' ? userConfig.output : '',
45-
),
46-
plugins: userConfig.plugins ?? ['@hey-api/client-fetch'],
47-
});
29+
) =>
30+
({
31+
...userConfig,
32+
input: path.join(
33+
getSpecsPath(),
34+
version,
35+
typeof userConfig.input === 'string' ? userConfig.input : 'full.yaml',
36+
),
37+
logs: {
38+
level: 'silent',
39+
},
40+
output: path.join(
41+
outputDir,
42+
typeof userConfig.plugins[0] === 'string'
43+
? userConfig.plugins[0]
44+
: userConfig.plugins[0]!.name,
45+
typeof userConfig.output === 'string' ? userConfig.output : '',
46+
),
47+
plugins: userConfig.plugins ?? ['@hey-api/client-fetch'],
48+
}) as const satisfies UserConfig;
4849

4950
const scenarios = [
5051
{
@@ -566,9 +567,7 @@ for (const version of versions) {
566567
it.each(scenarios)('$description', async ({ config }) => {
567568
await createClient(config);
568569

569-
const outputPath =
570-
typeof config.output === 'string' ? config.output : config.output.path;
571-
const filePaths = getFilePaths(outputPath);
570+
const filePaths = getFilePaths(config.output);
572571

573572
await Promise.all(
574573
filePaths.map(async (filePath) => {

‎packages/openapi-ts-tests/zod/v3/test/3.0.x.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ for (const zodVersion of zodVersions) {
6868
it.each(scenarios)('$description', async ({ config }) => {
6969
await createClient(config);
7070

71-
const outputPath =
72-
typeof config.output === 'string' ? config.output : config.output.path;
73-
const filePaths = getFilePaths(outputPath);
71+
const filePaths = getFilePaths(config.output);
7472

7573
await Promise.all(
7674
filePaths.map(async (filePath) => {

‎packages/openapi-ts-tests/zod/v3/test/3.1.x.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ for (const zodVersion of zodVersions) {
150150
it.each(scenarios)('$description', async ({ config }) => {
151151
await createClient(config);
152152

153-
const outputPath =
154-
typeof config.output === 'string' ? config.output : config.output.path;
155-
const filePaths = getFilePaths(outputPath);
153+
const filePaths = getFilePaths(config.output);
156154

157155
await Promise.all(
158156
filePaths.map(async (filePath) => {

‎packages/openapi-ts-tests/zod/v3/test/openapi.test.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ for (const version of versions) {
5454
it.each(scenarios)('$description', async ({ config }) => {
5555
await createClient(config);
5656

57-
const outputPath =
58-
typeof config.output === 'string'
59-
? config.output
60-
: config.output.path;
61-
const filePaths = getFilePaths(outputPath);
57+
const filePaths = getFilePaths(config.output);
6258

6359
await Promise.all(
6460
filePaths.map(async (filePath) => {

‎packages/openapi-ts-tests/zod/v3/test/utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const createZodConfig =
1818
outputDir: string;
1919
zodVersion: (typeof zodVersions)[number];
2020
}) =>
21-
(userConfig: UserConfig): UserConfig => {
21+
(userConfig: UserConfig) => {
2222
const inputPath = path.join(
2323
getSpecsPath(),
2424
openApiVersion,
@@ -52,7 +52,7 @@ export const createZodConfig =
5252
outputDir,
5353
typeof userConfig.output === 'string' ? userConfig.output : '',
5454
),
55-
};
55+
} as const satisfies UserConfig;
5656
};
5757

5858
export const getSnapshotsPath = (): string =>

0 commit comments

Comments
 (0)