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: move title propagation to the correct place

Browse Source
This commit is contained in:
Roman Hotsiy 2018-01-10 13:02:32 +02:00
parent 9d0f2a9273
commit 0b0bc99f73
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/services/OpenAPIParser.ts
View File

@ -191,10 +191,6 @@ export class OpenAPIParser {
}; };
}); });
if (receiver.title === undefined && isNamedDefinition($ref)) {
receiver.title = JsonPointer.baseName($ref);
}
for (let { $ref: subSchemaRef, schema: subSchema } of allOfSchemas) { for (let { $ref: subSchemaRef, schema: subSchema } of allOfSchemas) {
if ( if (
receiver.type !== subSchema.type && receiver.type !== subSchema.type &&
@ -220,17 +216,22 @@ export class OpenAPIParser {
receiver.required = (receiver.required || []).concat(subSchema.required); receiver.required = (receiver.required || []).concat(subSchema.required);
} }
// merge rest of constraints
// TODO: do more intelegent merge
receiver = { ...subSchema, ...receiver };
if (subSchemaRef) { if (subSchemaRef) {
receiver.parentRefs!.push(subSchemaRef); receiver.parentRefs!.push(subSchemaRef);
if (receiver.title === undefined && isNamedDefinition(subSchemaRef)) { if (receiver.title === undefined && isNamedDefinition(subSchemaRef)) {
receiver.title = JsonPointer.baseName(subSchemaRef); receiver.title = JsonPointer.baseName(subSchemaRef);
} }
} }
// merge rest of constraints
// TODO: do more intelegent merge
receiver = { ...subSchema, ...receiver };
} }
if (receiver.title === undefined && isNamedDefinition($ref)) {
receiver.title = JsonPointer.baseName($ref);
}
return receiver; return receiver;
} }