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

Minor fix joinAllOf

Browse Source
This commit is contained in:
Roman Hotsiy 2016-03-27 13:35:06 +03:00
parent e50d59ef6b
commit 36034d4d1a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/components/base.js
View File

@ -185,13 +185,13 @@ export class BaseComponent {
throw new Error(errMessage); throw new Error(errMessage);
} }
into.type = into.type || subSchema.type;
if (into.type === 'array') { if (into.type === 'array') {
console.warn('allOf: subschemas with type array are not supported yet'); 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) // 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) { if (into.type === 'object' && subSchema.properties) {
into.properties || (into.properties = {}); into.properties || (into.properties = {});
Object.assign(into.properties, subSchema.properties); Object.assign(into.properties, subSchema.properties);