Skip to content

fix(downgrader): clear the 3.1 to 3.0 nullable-merge lists when conversion throws #99

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.

Sign up for GitHub

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

Open
dinwwwh wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −8
Open

fix(downgrader): clear the 3.1 to 3.0 nullable-merge lists when conversion throws #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/downgrader/src/v3.1-to-v3.0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,16 +794,19 @@ function convertDocument(value: unknown, ctx: Context): unknown {
}

function downgradeV30(root: unknown, convert: Convert): unknown {
twoBranchAnyOfs.length = 0
anyOfTargets.clear()
const out = downgrade(root, convert)
for (const [schema, input] of twoBranchAnyOfs.splice(0)) {
if (!anyOfTargets.has(input)) {
mergeNullable(schema, root)
try {
const out = downgrade(root, convert)
for (const [schema, input] of twoBranchAnyOfs) {
if (!anyOfTargets.has(input)) {
mergeNullable(schema, root)
}
}
return out
} finally {
// Cleared even when conversion throws, so nothing keeps the input alive.
twoBranchAnyOfs.length = 0
anyOfTargets.clear()
}
anyOfTargets.clear()
return out
}

export function downgradeSpecV31ToV30(spec: OpenAPIV3_1.OpenAPIObject): OpenAPIV3_0.OpenAPIObject {
Expand Down
Loading