[typescript] Fix uncompilable output when using allOf (#8000) #9275
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.
Fixes #8000
Summary
When using
allOf
, oroneOf
with an inline schema, a Union/Intersection type is generated with the primitiveobject
. This results in an invalid import because the composed type of the schema is ignored.Approach
To fix this I used
needToImport
to removes the language primitives from being imported. This same check already happens inaddImport
, but not intoModelImportMap
.toModelImportMap
splits union types but not intersection types, so I've combined those cases intosplitComposedType
. ForsplitComposedType
I combinedreplace(" ","").split("\\|")
andsplit("( [|&] )|[<>]")
intoreplace(" ","").split("[|&<>]")
. These should be equivilant regex, and I think stripping the whitespace is good here.I added the warning in
toModelImport
strictly because there was already a warning for the union type and wanted to be consistent.Minimal Reproducible Example
PR checklist
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*
.For Windows users, please run the script in Git BASH.
master
,5.1.x
,6.0.x
@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)