fix(zod): date format now respects useDates override #1406
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like tests are failing with... |
|
@melloware Yep already on it, didn't run the generated locally as I didn't know they existed aha |
RyoNkmr
reviewed
May 29, 2024
packages/zod/src/index.ts
Outdated
Comment on lines
135
to
152
| if (!context.output.override.useDates) { | ||
| functions.push([type as string, undefined]); | ||
| } | ||
| functions.push(['date', undefined]); | ||
| break; | ||
| } | ||
|
|
||
| functions.push([type as string, undefined]); | ||
|
|
||
| if (schema.format === 'date-time') { | ||
| functions.push(['datetime', undefined]); | ||
| if (!context.output.override.useDates) { | ||
| functions.push([type as string, undefined], ['datetime', undefined]); | ||
| } else { | ||
| functions.push(['date', undefined]); | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| functions.push([type as string, undefined]); | ||
|
|
There was a problem hiding this comment.
looks good to me.
and if i had to say, it can makes this simple to handle useDates first like:
if (
context.output.override.useDates &&
(schema.format === 'date' || schema.format === 'date-time')
) {
functions.push(['date', undefined]);
break;
}
functions.push([type as string, undefined]);
if (schema.format === 'date') {
functions.push(['date', undefined]);
break;
}
if (schema.format === 'date-time') {
functions.push(['datetime', undefined]);
break;
}
|
@melloware @RyoNkmr This should be ready for re-review, all the tests now pass and the requested changes were made. |
melloware
approved these changes
May 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
READY
Description
This PR fixes #1402 and respects the
useDatesoverride when generating the zod specification.