Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-07-10 16:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong warnings for $ref not single

Browse Source 
closes #221
This commit is contained in:
Roman Hotsiy 2017-03-09 19:58:13 +02:00
parent 4899f3e08f
commit 193f4bfb44
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/services/schema-normalizer.service.ts
View File

@ -99,6 +99,7 @@ class SchemaWalker {
export class AllOfMerger { export class AllOfMerger {
static merge(into, schemas) { static merge(into, schemas) {
into['x-derived-from'] = []; into['x-derived-from'] = [];
let hadDiscriminator = !!into.discriminator;
for (let i=0; i < schemas.length; i++) { for (let i=0; i < schemas.length; i++) {
let subSchema = schemas[i]; let subSchema = schemas[i];
into['x-derived-from'].push(subSchema._pointer); into['x-derived-from'].push(subSchema._pointer);
@ -115,7 +116,7 @@ export class AllOfMerger {
defaults(into, subSchema); defaults(into, subSchema);
subSchema._pointer = tmpPtr; subSchema._pointer = tmpPtr;
} }
into.discriminator = null; if (!hadDiscriminator) into.discriminator = null;
into.allOf = null; into.allOf = null;
} }
@ -214,7 +215,8 @@ class SchemaDereferencer {
// if resolved schema doesn't have title use name from ref // if resolved schema doesn't have title use name from ref
resolved.title = resolved.title || JsonPointer.baseName($ref); resolved.title = resolved.title || JsonPointer.baseName($ref);
let keysCount = Object.keys(schema).length; let keysCount = Object.keys(schema).filter(key => !key.startsWith('x-redoc')).length;
if ( keysCount > 2 || (keysCount === 2 && !schema.description) ) { if ( keysCount > 2 || (keysCount === 2 && !schema.description) ) {
WarningsService.warn(`Other properties are defined at the same level as $ref at "#${pointer}". ` + WarningsService.warn(`Other properties are defined at the same level as $ref at "#${pointer}". ` +
'They are IGNORED according to the JsonSchema spec'); 'They are IGNORED according to the JsonSchema spec');