Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-08-07 05:40:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

add nullable lable for OAS 3.1 JSON schema

Browse Source
This commit is contained in:
Anton_Kozachuk 2021-05-18 14:06:30 +03:00 committed by Alex Varchuk
parent 21e086222e
commit f7f28bfbd0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/models/Schema.ts
View File

@ -77,6 +77,12 @@ export class SchemaModel {
this.pointer = schemaOrRef.$ref || pointer || '';
this.rawSchema = parser.deref(schemaOrRef);
if (Array.isArray(this.rawSchema.type)) {
this.rawSchema.oneOf = this.rawSchema.type.map( type => ({type}));
delete this.rawSchema.type;
}
this.schema = parser.mergeAllOf(this.rawSchema, this.pointer, isChild);
this.init(parser, isChild);
@ -149,7 +155,8 @@ export class SchemaModel {
}
if (schema.oneOf !== undefined) {
this.initOneOf(schema.oneOf, parser);
this.nullable = this.nullable || schema.oneOf.some(s => s.type === 'null');
this.initOneOf(schema.oneOf.filter(s => s.type !== 'null'), parser);
this.oneOfType = 'One of';
if (schema.anyOf !== undefined) {
console.warn(
@ -160,7 +167,8 @@ export class SchemaModel {
}
if (schema.anyOf !== undefined) {
this.initOneOf(schema.anyOf, parser);
this.nullable = this.nullable || schema.anyOf.some(s => s.type === 'null');
this.initOneOf(schema.anyOf.filter(s => s.type !== 'null'), parser);
this.oneOfType = 'Any of';
return;
}