Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-04-25 03:03:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: allOf inside oneOf overwritten and not rendered

Browse Source 
fixes #660
This commit is contained in:
Roman Hotsiy 2018-10-01 10:19:25 +03:00
parent 533733bc7f
commit fe3383d1a3
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/models/Schema.ts
View File

@ -161,9 +161,10 @@ export class SchemaModel {
(variant, idx) => (variant, idx) =>
new SchemaModel( new SchemaModel(
parser, parser,
// merge base schema into each of oneOf's subschemas
{ {
// merge base schema into each of oneOf's subschemas // variant may already have allOf so merge it to not get overwritten
...variant, ...parser.mergeAllOf(variant, this.pointer + '/oneOf/' + idx),
allOf: [{ ...this.schema, oneOf: undefined, anyOf: undefined }], allOf: [{ ...this.schema, oneOf: undefined, anyOf: undefined }],
} as OpenAPISchema, } as OpenAPISchema,
this.pointer + '/oneOf/' + idx, this.pointer + '/oneOf/' + idx,