Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-02-07 13:30:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: optimize and support inherited discriminator

Browse Source
This commit is contained in:
Roman Hotsiy 2017-03-09 19:59:49 +02:00
parent 193f4bfb44
commit 64e5741f67
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/utils/spec-manager.ts
View File

@ -183,6 +183,21 @@ export class SpecManager {
let globalDefs = this._schema.definitions || {}; let globalDefs = this._schema.definitions || {};
let res:DescendantInfo[] = []; let res:DescendantInfo[] = [];
let extendedDiscriminatorProp = definition['x-extendedDiscriminator']; let extendedDiscriminatorProp = definition['x-extendedDiscriminator'];
let pointers;
if (definition['x-derived-from']) {
// support inherited discriminator o_O
let derivedDiscriminator = definition['x-derived-from'].filter(ptr => {
if (!ptr) return false;
let def = this.byPointer(ptr);
return def && def.discriminator;
});
pointers = [defPointer, ...derivedDiscriminator];
} else {
pointers = [defPointer];
}
for (let defName of Object.keys(globalDefs)) { for (let defName of Object.keys(globalDefs)) {
let def = globalDefs[defName]; let def = globalDefs[defName];
if (!def.allOf && if (!def.allOf &&
@ -190,12 +205,6 @@ export class SpecManager {
let subTypes = def['x-derived-from'] || let subTypes = def['x-derived-from'] ||
def.allOf.map(subType => subType._pointer || subType.$ref); def.allOf.map(subType => subType._pointer || subType.$ref);
let pointers;
if (definition['x-derived-from']) {
pointers = [defPointer, ...definition['x-derived-from']];
} else {
pointers = [defPointer];
}
let idx = -1; let idx = -1;
for (let ptr of pointers) { for (let ptr of pointers) {