From 334a0a07daa84beaf0ac0b4e78c51e87b51ddb57 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Thu, 23 Nov 2017 16:16:04 +0200
Subject: [PATCH] fix: make oneOf not skip fields defined alongside

---
 src/services/models/Schema.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/services/models/Schema.ts b/src/services/models/Schema.ts
index 6373a8a9..9232461b 100644
--- a/src/services/models/Schema.ts
+++ b/src/services/models/Schema.ts
@@ -147,8 +147,15 @@ export class SchemaModel {
   private initOneOf(oneOf: OpenAPISchema[], parser: OpenAPIParser) {
     this.oneOf = oneOf!.map(
       (variant, idx) =>
-        // TODO: merge base schema into each oneOf
-        new SchemaModel(parser, variant, this._$ref + '/oneOf/' + idx, this.options),
+        new SchemaModel(
+          parser,
+          {
+            // merge base schema into each of oneOf's subschemas
+            allOf: [variant, { ...this.schema, oneOf: undefined, anyOf: undefined }],
+          } as OpenAPISchema,
+          this._$ref + '/oneOf/' + idx,
+          this.options,
+        ),
     );
     this.displayType = this.oneOf.map(schema => schema.displayType).join(' or ');
   }