From 1994002685a2d1844888e85ce5ee0dae0a875997 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 23 Nov 2017 15:27:50 +0200 Subject: [PATCH] Fix nested allOfs --- src/services/OpenAPIParser.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/OpenAPIParser.ts b/src/services/OpenAPIParser.ts index 663952a7..ec242909 100644 --- a/src/services/OpenAPIParser.ts +++ b/src/services/OpenAPIParser.ts @@ -166,9 +166,11 @@ export class OpenAPIParser { }; const allOfSchemas = schema.allOf.map((subSchema, idx) => { + const resolved = this.deref(subSchema, forceCircular); + const subRef = subSchema.$ref || $ref + '/allOf/' + idx; return { - $ref: subSchema.$ref || $ref + '/allOf/' + idx, - schema: this.deref(subSchema, forceCircular), + $ref: subRef, + schema: this.mergeAllOf(resolved, subRef, forceCircular), }; });