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

Resolve allOf in JsonSchema component

Browse Source
This commit is contained in:
Roman Hotsiy 2015-11-25 01:51:54 +02:00
parent 743f270feb
commit f538d15ece
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/components/JsonSchema/json-schema.js
View File

@ -17,6 +17,7 @@ export default class JsonSchema extends BaseComponent {
prepareModel() {
this.dereference();
this.joinAllOf();
this.requiredMap = {};
if (this.schema.required) {
this.schema.required.forEach(prop => this.requiredMap[prop] = true);
@ -26,7 +27,7 @@ export default class JsonSchema extends BaseComponent {
this.data.properties = [];
if (schema.type !== 'object') {
// TODO
this.errorMessage = 'Non-object (array-based or all-of) schemas are not implemented yet';
this.errorMessage = 'Non-object (array-based) schemas are not implemented yet';
return;
}
if (!schema.properties) return;

30
lib/components/base.js
View File

@ -98,6 +98,36 @@ export class BaseComponent {
});
}
joinAllOf(schema = this.componentSchema) {
var self = this;
function merge(into, schemas) {
if (into.required || into.properties) {
console.warn('WARN: properties or required field set on the same level as allOf');
}
into.required = [];
into.properties = {};
for (let subSchema of schemas) {
if (typeof subSchema !== 'object' || subSchema.type !== 'object') {
console.warn('WARN: incorrect allOf element skipped\nObject: ', subSchema);
}
self.joinAllOf(subSchema);
if (subSchema.properties) {
Object.assign(into.properties, subSchema.properties);
}
if (subSchema.required) {
into.required.push(...subSchema.required);
}
}
into.type = 'object';
into.allOf = null;
}
if (schema.allOf) {
merge(schema, schema.allOf);
}
}
/**
* Used to prepare model based on component schema
* @abstract