Repository navigation
Conversation
This branch has not been deployed
This file contains hidden or 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
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.
The
typescriptandtypescript-redux-querygenerators now keep model imports for container branches ofoneOfschemas.For the circular schema in #23286,
typescriptgeneratedArray<Repro> | stringwithout the necessaryReproimport.Both filters use
CodegenProperty.getImportswith parsed branch metadata.The filters keep direct references, remove unused imports, and keep imports sorted.
The substring comparison from the issue can keep an unused
Fooimport for aFooBarbranch.Fixes #23286.
The regression test in
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.javafailed without the changes and passed with them.The TypeScript package tests passed.
PR checklist
cc @TiFu @taxpon @sebastianhaas @kenisteward @Vrolijkx @macjohnny @topce @akehir @petejohansonxo @amakhrov @davidgamero @mkusaka @joscha @KannaKim
Summary by cubic
Fixes missing model imports for container types in
oneOfschemas in thetypescriptandtypescript-redux-querygenerators, resolving circular schema generation issues from #23286.Previously, model imports were kept only when they matched a direct
oneOfbranch name, so a branch likeArray<Repro>lost theReproimport. The filters now resolve imports from each branch's parsed metadata so inner types of container branches retain their imports, while unused imports are still removed and ordering is preserved.Adds a regression test with a circular
oneOfschema (Array<Repro> | string) covering both generators.Written for commit ff4e1b4. Summary will update on new commits.