From 074872b7eec06b7cdb1632b2ed0e5e16931f6329 Mon Sep 17 00:00:00 2001
From: KtorZ <matthias.benkort@gmail.com>
Date: Fri, 10 Mar 2017 13:29:26 +0100
Subject: [PATCH] Allow oneOf / anyOf to be used & displayed for root schema
 definitions

---
 lib/components/JsonSchema/json-schema.html | 11 ++++-
 lib/components/JsonSchema/json-schema.scss |  4 ++
 lib/components/JsonSchema/json-schema.ts   | 51 +++++++++++++++-------
 lib/services/schema-helper.service.ts      | 26 ++++++++---
 lib/services/schema-normalizer.service.ts  | 12 +++++
 5 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/lib/components/JsonSchema/json-schema.html b/lib/components/JsonSchema/json-schema.html
index 8ab87420..f1238537 100644
--- a/lib/components/JsonSchema/json-schema.html
+++ b/lib/components/JsonSchema/json-schema.html
@@ -46,9 +46,17 @@
     [nestOdd]="!nestOdd" [isRequestSchema]="isRequestSchema"> </json-schema>
   </ng-template>
   <ng-template ngSwitchCase="object">
+      <div class="one-of-selector" *ngIf="schema._wrapped.length > 1">
+        {{schema._choiceTitle}}
+        <drop-down (change)="selectChoice($event)" [active]="activeChoice">
+          <option *ngFor="let item of schema._wrapped; let i=index"
+          [value]="i" [attr.selected]="activeChoice === i ? '' : null" >{{item.title}}</option>
+        </drop-down>
+    </div>
+
     <table class="params-wrap" [ngClass]="{'params-array': _isArray}">
       <!-- <caption> {{_displayType}} </caption> -->
-      <ng-template ngFor [ngForOf]="properties" let-prop="$implicit" let-last="last" [ngForTrackBy]="trackByName">
+      <ng-template ngFor [ngForOf]="schema._wrapped[activeChoice].displayProperties" let-prop="$implicit" let-last="last" [ngForTrackBy]="trackByName">
         <tr class="param" [ngClass]="{'last': last,
             'discriminator': prop.isDiscriminator,
             'complex': prop._pointer,
@@ -103,5 +111,4 @@
       </ng-template>
     </table>
   </ng-template>
-
 </ng-container>
diff --git a/lib/components/JsonSchema/json-schema.scss b/lib/components/JsonSchema/json-schema.scss
index f0d98758..074142bd 100644
--- a/lib/components/JsonSchema/json-schema.scss
+++ b/lib/components/JsonSchema/json-schema.scss
@@ -179,6 +179,10 @@ table {
   }
 }
 
+.one-of-selector {
+  text-align: right;
+}
+
 ul, li {
   margin: 0;
 }
diff --git a/lib/components/JsonSchema/json-schema.ts b/lib/components/JsonSchema/json-schema.ts
index e514b79b..6aab3959 100644
--- a/lib/components/JsonSchema/json-schema.ts
+++ b/lib/components/JsonSchema/json-schema.ts
@@ -37,6 +37,7 @@ export class JsonSchema extends BaseSearchableComponent implements OnInit {
   _isArray: boolean;
   normalizer: SchemaNormalizer;
   descendants: DescendantInfo[];
+  activeChoice: number;
 
   constructor(
     specMgr: SpecManager,
@@ -96,6 +97,11 @@ export class JsonSchema extends BaseSearchableComponent implements OnInit {
     this.selectDescendantByIdx(0);
   }
 
+  selectChoice(index) {
+    if (typeof index === "object") return;
+    this.activeChoice = index
+  }
+
   init() {
     if (!this.pointer) return;
     if (!this.absolutePointer) this.absolutePointer = this.pointer;
@@ -112,38 +118,51 @@ export class JsonSchema extends BaseSearchableComponent implements OnInit {
     this._isArray = this.schema._isArray;
     this.absolutePointer += (this._isArray ? '/items' : '');
     this.initDescendants();
+    this.selectChoice(0);
     this.preprocessSchema();
   }
 
   preprocessSchema() {
     SchemaHelper.preprocess(this.schema, this.normPointer, this.pointer);
 
-    if (!this.schema.isTrivial) {
+    if (!this.schema.isTrivial && !this.schema._wrapped) {
       SchemaHelper.preprocessProperties(this.schema, this.normPointer, {
         childFor: this.childFor,
         discriminator: this.discriminator
       });
     }
 
-    this.properties = this.schema._properties || [];
-    if (this.isRequestSchema) {
-      this.properties = this.properties.filter(prop => !prop.readOnly);
-    }
+    if (this.schema._wrapped) {
+      this.schema._wrapped.forEach((schema) => {
+        SchemaHelper.preprocessProperties(schema, this.normPointer, {
+          childFor: this.childFor,
+          discriminator: this.discriminator
+        });
 
-    if (this.optionsService.options.requiredPropsFirst) {
-      SchemaHelper.moveRequiredPropsFirst(this.properties, this.schema.required);
-    }
+        let properties = schema._properties || [];
 
-    this._hasSubSchemas = this.properties && this.properties.some(
-      propSchema => {
-        if (propSchema.type === 'array') {
-          propSchema = propSchema.items;
+        if (this.isRequestSchema) {
+          properties = properties.filter(prop => !prop.readOnly);
         }
-        return (propSchema && propSchema.type === 'object' && propSchema._pointer);
-      });
 
-    if (this.properties.length === 1) {
-      this.properties[0].expanded = true;
+        if (this.optionsService.options.requiredPropsFirst) {
+          SchemaHelper.moveRequiredPropsFirst(properties, schema.required);
+        }
+
+        this._hasSubSchemas = properties && properties.some(
+          propSchema => {
+            if (propSchema.type === 'array') {
+              propSchema = propSchema.items;
+            }
+            return (propSchema && propSchema.type === 'object' && propSchema._pointer);
+          });
+
+        if (properties.length === 1) {
+          properties[0].expanded = true;
+        }
+
+        schema.displayProperties = properties
+      })
     }
   }
 
diff --git a/lib/services/schema-helper.service.ts b/lib/services/schema-helper.service.ts
index 9f07b546..82912337 100644
--- a/lib/services/schema-helper.service.ts
+++ b/lib/services/schema-helper.service.ts
@@ -85,17 +85,33 @@ const injectors = {
   },
   object: {
     check: (propertySchema) => {
-      return propertySchema.type === 'object' && (propertySchema.properties ||
+      let isObject = propertySchema.type === 'object' && (propertySchema.properties ||
         typeof propertySchema.additionalProperties === 'object');
+
+      let isChoiceObject = propertySchema.oneOf && propertySchema.oneOf.length > 0 ||
+        propertySchema.anyOf && propertySchema.anyOf.length > 0
+
+      return isObject || isChoiceObject;
     },
     inject: (injectTo, propertySchema = injectTo) => {
-      let baseName = propertySchema._pointer && JsonPointer.baseName(propertySchema._pointer);
-      injectTo._displayType = propertySchema.title || baseName || 'object';
       injectTo._widgetType = 'object';
+      if (propertySchema.type === 'object') {
+        let baseName = propertySchema._pointer && JsonPointer.baseName(propertySchema._pointer);
+        injectTo._displayType = propertySchema.title || baseName || 'object';
+        injectTo._wrapped = [propertySchema];
+      } else if (propertySchema.oneOf) {
+        injectTo._displayType = 'oneOf';
+        injectTo._choiceTitle = 'One of';
+        injectTo._wrapped = propertySchema.oneOf
+      } else if (propertySchema.anyOf) {
+        injectTo._displayType = 'anyOf';
+        injectTo._choiceTitle = 'Any of';
+        injectTo._wrapped = propertySchema.anyOf
+      }
     }
   },
   noType: {
-    check: (propertySchema) => !propertySchema.type,
+    check: (propertySchema) => !propertySchema.type && !propertySchema.oneOf && !propertySchema.anyOf,
     inject: (injectTo) => {
       injectTo._displayType = '< anything >';
       injectTo._displayTypeHint = 'This field may contain data of any type';
@@ -110,7 +126,7 @@ const injectors = {
         return (!propertySchema.properties || !Object.keys(propertySchema.properties).length)
           && (typeof propertySchema.additionalProperties !== 'object');
       }
-      return (propertySchema.type !== 'array') && propertySchema.type;
+      return (propertySchema.type !== 'array' && !propertySchema.oneOf && !propertySchema.anyOf) && propertySchema.type;
     },
     inject: (injectTo, propertySchema = injectTo) => {
       injectTo.isTrivial = true;
diff --git a/lib/services/schema-normalizer.service.ts b/lib/services/schema-normalizer.service.ts
index d3940bb2..3583b168 100644
--- a/lib/services/schema-normalizer.service.ts
+++ b/lib/services/schema-normalizer.service.ts
@@ -13,6 +13,8 @@ interface Reference {
 interface Schema {
   properties: any;
   allOf: any;
+  oneOf: any;
+  anyOf: any;
   items: any;
   additionalProperties: any;
 }
@@ -73,6 +75,16 @@ class SchemaWalker {
       SchemaWalker.walkEach(obj.allOf, ptr, visitor);
     }
 
+    if (obj.oneOf) {
+      let ptr = JsonPointer.join(pointer, ['oneOf']);
+      SchemaWalker.walkEach(obj.oneOf, ptr, visitor);
+    }
+
+    if (obj.anyOf) {
+      let ptr = JsonPointer.join(pointer, ['anyOf']);
+      SchemaWalker.walkEach(obj.anyOf, ptr, visitor);
+    }
+
     if (obj.items) {
       let ptr = JsonPointer.join(pointer, ['items']);
       if (Array.isArray(obj.items)) {