mirror of
https://github.com/Redocly/redoc.git
synced 2025-02-26 23:10:33 +03:00
Minor fix joinAllOf
This commit is contained in:
parent
e50d59ef6b
commit
36034d4d1a
|
@ -185,13 +185,13 @@ export class BaseComponent {
|
|||
throw new Error(errMessage);
|
||||
}
|
||||
|
||||
into.type = into.type || subSchema.type;
|
||||
|
||||
if (into.type === 'array') {
|
||||
console.warn('allOf: subschemas with type array are not supported yet');
|
||||
}
|
||||
|
||||
// TODO: add check if can be merged correctly (no different properties with the same name)
|
||||
into.type = into.type || subSchema.type;
|
||||
if (into.type === 'object' && subSchema.properties) {
|
||||
into.properties || (into.properties = {});
|
||||
Object.assign(into.properties, subSchema.properties);
|
||||
|
|
Loading…
Reference in New Issue
Block a user