[BUG][SWIFT6] unalias additionalProperties before building map type declaration#23668
Open
winrid wants to merge 1 commit intoOpenAPITools:masterfrom
Open
[BUG][SWIFT6] unalias additionalProperties before building map type declaration#23668winrid wants to merge 1 commit intoOpenAPITools:masterfrom
winrid wants to merge 1 commit intoOpenAPITools:masterfrom
Conversation
…eclaration
A nested map property whose additionalProperties is a $ref to an aliased
map schema (e.g. StringMap = type: object, additionalProperties: { type:
string }) resolved to `[String: Dictionary]` (no generic args, doesn't
compile in Swift 6) instead of `[String: [String: String]]`.
Wrap ModelUtils.getAdditionalProperties(p) with unaliasSchema(...) in
getTypeDeclaration so the alias resolves to the actual schema before
recursion.
Closes OpenAPITools#23666
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.
Closes #23666.
A nested map property whose
additionalPropertiesis a$refto an aliased map schema produced[String: Dictionary](no generic args, doesn't compile in Swift 6) instead of the resolved[String: [String: String]].Fix
Wrap
ModelUtils.getAdditionalProperties(p)withunaliasSchema(...)inSwift6ClientCodegen.getTypeDeclarationso the alias resolves to the actual schema before recursion.Test
New
nestedMapRefTypeTestinSwift6ClientCodegenModelTestagainstswift6_nested_map.yamlasserts the resolved type. Full swift6 suite (39 tests) passes.PR checklist
master(5.x.x) (patches will be cascaded frommasterto other branches by the maintainers)cc @4brunu @yutailang0119