-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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.
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
[typescript-fetch] Fix code generation for oneOf cases without discriminator #19219
[typescript-fetch] Fix code generation for oneOf cases without discriminator #19219
Conversation
Dear technical committee members of TypeScript, could you check this? 🙇 |
@@ -36,6 +36,8 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole | |||
return {{{.}}}FromJSONTyped(json, true); | |||
} | |||
{{/oneOf}} | |||
|
|||
return json; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thought (non-blocking):
Here, the fallback case returns the raw json
. But a similar fallback in the xxxToJSON
(below) returns {}
.
I don't think it makes a huge practical difference (if this happens for real, one should go and fix the code to be compatible with the spec, instead of finding smart ways around it).
Just looks a bit inconsistent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed. I change it to return {} as any
.
(I needed to add type-assertion because {}
is not compatible with the return type.
Since json
is also any
, there is no big difference.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @odiak - looks good to me!
TL;DR
oneOf
without discriminator.Detail
I improved code generation for model with
oneOf
without discriminator on #18702.But later I found generated code cause type error. (But there is no problem on runtime.)
ref: comment
The cause of the problem is lack of return statement at the end of functions like
MyModelFromJSONTyped
.So I added
return json
at the end of these functions.PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*
.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
master
(upcoming 7.6.0 minor release - breaking changes with fallbacks),8.0.x
(breaking changes without fallbacks)