kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(json-schema-2020-12-samples): skip anyOf and oneOf while merging schemas (#9853)

Browse Source 
Refs #9198
This commit is contained in:
Oliwia Rogala
2024-04-23 15:27:22 +02:00
committed by GitHub
parent dee2ad0c77
commit f7373a0bc1
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/plugins/json-schema-2020-12-samples/fn/main.js
View File

@@ -320,10 +320,13 @@ export const sampleFromSchemaGeneric = (
}
if (Array.isArray(contains.anyOf)) {
// eslint-disable-next-line no-unused-vars
const { anyOf, ...containsWithoutAnyOf } = items
sampleArray.push(
...contains.anyOf.map((anyOfSchema) =>
sampleFromSchemaGeneric(
merge(anyOfSchema, contains, config),
merge(anyOfSchema, containsWithoutAnyOf, config),
config,
undefined,
respectXML
@@ -331,10 +334,13 @@ export const sampleFromSchemaGeneric = (
)
)
} else if (Array.isArray(contains.oneOf)) {
// eslint-disable-next-line no-unused-vars
const { oneOf, ...containsWithoutOneOf } = items
sampleArray.push(
...contains.oneOf.map((oneOfSchema) =>
sampleFromSchemaGeneric(
merge(oneOfSchema, contains, config),
merge(oneOfSchema, containsWithoutOneOf, config),
config,
undefined,
respectXML
@@ -357,10 +363,13 @@ export const sampleFromSchemaGeneric = (
}
if (Array.isArray(items.anyOf)) {
// eslint-disable-next-line no-unused-vars
const { anyOf, ...itemsWithoutAnyOf } = items
sampleArray.push(
...items.anyOf.map((i) =>
sampleFromSchemaGeneric(
merge(i, items, config),
merge(i, itemsWithoutAnyOf, config),
config,
undefined,
respectXML
@@ -368,10 +377,13 @@ export const sampleFromSchemaGeneric = (
)
)
} else if (Array.isArray(items.oneOf)) {
// eslint-disable-next-line no-unused-vars
const { oneOf, ...itemsWithoutOneOf } = items
sampleArray.push(
...items.oneOf.map((i) =>
sampleFromSchemaGeneric(
merge(i, items, config),
merge(i, itemsWithoutOneOf, config),
config,
undefined,
respectXML