Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for discriminator on native enums properties #210

Closed
wants to merge 9 commits into from
Closed

Add support for discriminator on native enums properties #210

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5dac8b5
added format: date-time to for in Usage: openapi-generator [options…
Nov 6, 2023
92049b9
Merge pull request #1 from shaikegross/add-date-format-to-zod-date-ob…
shaikegross Nov 6, 2023
8c72c43
reverted package-lock.json back to have no diffs
Nov 6, 2023
a38371f
Merge branch 'add-date-format-to-zod-date-object'
Nov 6, 2023
a6cdf49
Merge branch 'asteasolutions:master' into master
shaikegross Feb 26, 2024
9a50476
Add support for native enums in discrinator
shaikegross Feb 26, 2024
93922c2
Update openapi-generator.ts
shaikegross Feb 26, 2024
e4cfd9c
reinstalled pckages
Feb 26, 2024
6185d18
Merge branch 'main' into Add-support-for-discriminator-on-native-enums
Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/openapi-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,13 @@
return;
}

if (isZodType(value, 'ZodNativeEnum')) {
Object.values(value._def.values).forEach((enumValue: string) => {

Check failure on line 731 in src/openapi-generator.ts

View workflow job for this annotation

GitHub Actions / build-and-test (14.x) 

Argument of type '(enumValue: string) => void' is not assignable to parameter of type '(value: unknown, index: number, array: unknown[]) => void'.

Check failure on line 731 in src/openapi-generator.ts

View workflow job for this annotation

GitHub Actions / build-and-test (16.x) 

Argument of type '(enumValue: string) => void' is not assignable to parameter of type '(value: unknown, index: number, array: unknown[]) => void'.

Check failure on line 731 in src/openapi-generator.ts

View workflow job for this annotation

GitHub Actions / build-and-test (18.x) 

Argument of type '(enumValue: string) => void' is not assignable to parameter of type '(value: unknown, index: number, array: unknown[]) => void'.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need Object.values here as opposed to the direct usage of value._def.values above?

mapping[enumValue] = this.generateSchemaRef(refId);
});
return;
}

const literalValue = value?._def.value;

// This should never happen because Zod checks the disciminator type but to keep the types happy
Expand Down
Loading