mirror of
https://github.com/Redocly/redoc.git
synced 2025-07-10 16:22:27 +03:00
fix: move title propagation to the correct place
This commit is contained in:
parent
9d0f2a9273
commit
0b0bc99f73
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user