From ff11477ca90212c175c5a232be8f5bd4e9eb88b4 Mon Sep 17 00:00:00 2001
From: Ulf Winkelvos <ulf.winkelvos@mobimeo.com>
Date: Tue, 18 Jan 2022 00:42:17 +0100
Subject: [PATCH] enhance SchemaObject type

-  Composition types: allOf, anyOf, oneOf and not are valid SchemaObjects
---
 src/framework/types.ts                        | 27 +++++++++++--------
 .../parsers/req.parameter.mutator.ts          |  2 +-
 .../parsers/schema.preprocessor.ts            |  4 +--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/framework/types.ts b/src/framework/types.ts
index cc16a520..7f9f8634 100644
--- a/src/framework/types.ts
+++ b/src/framework/types.ts
@@ -246,19 +246,29 @@ export namespace OpenAPIV3 {
     | 'string'
     | 'integer';
   export type ArraySchemaObjectType = 'array';
-  export type SchemaObject = ArraySchemaObject | NonArraySchemaObject;
 
-  export interface ArraySchemaObject extends BaseSchemaObject {
-    type: ArraySchemaObjectType;
+  export type SchemaObject = ArraySchemaObject | NonArraySchemaObject | CompositionSchemaObject;
+
+  export interface ArraySchemaObject extends BaseSchemaObject<ArraySchemaObjectType> {
     items: ReferenceObject | SchemaObject;
   }
 
-  export interface NonArraySchemaObject extends BaseSchemaObject {
-    type: NonArraySchemaObjectType;
+  export interface NonArraySchemaObject extends BaseSchemaObject<NonArraySchemaObjectType> {
   }
 
-  interface BaseSchemaObject {
+  export interface CompositionSchemaObject extends BaseSchemaObject<undefined> {
     // JSON schema allowed properties, adjusted for OpenAPI
+    allOf?: Array<ReferenceObject | SchemaObject>;
+    oneOf?: Array<ReferenceObject | SchemaObject>;
+    anyOf?: Array<ReferenceObject | SchemaObject>;
+    not?: ReferenceObject | SchemaObject;
+    // OpenAPI-specific properties
+    discriminator?: DiscriminatorObject;
+  }
+
+  interface BaseSchemaObject<T> {
+    // JSON schema allowed properties, adjusted for OpenAPI
+    type?: T;
     title?: string;
     description?: string;
     format?: string;
@@ -282,14 +292,9 @@ export namespace OpenAPIV3 {
     properties?: {
       [name: string]: ReferenceObject | SchemaObject;
     };
-    allOf?: Array<ReferenceObject | SchemaObject>;
-    oneOf?: Array<ReferenceObject | SchemaObject>;
-    anyOf?: Array<ReferenceObject | SchemaObject>;
-    not?: ReferenceObject | SchemaObject;
 
     // OpenAPI-specific properties
     nullable?: boolean;
-    discriminator?: DiscriminatorObject;
     readOnly?: boolean;
     writeOnly?: boolean;
     xml?: XMLObject;
diff --git a/src/middlewares/parsers/req.parameter.mutator.ts b/src/middlewares/parsers/req.parameter.mutator.ts
index 202aaa03..0a80c191 100644
--- a/src/middlewares/parsers/req.parameter.mutator.ts
+++ b/src/middlewares/parsers/req.parameter.mutator.ts
@@ -183,7 +183,7 @@ export class RequestParameterMutator {
   ): void {
     // fetch the keys used for this kind of explode
     const type = schema.type;
-    const hasXOf = schema.allOf || schema.oneOf || schema.anyOf;
+    const hasXOf = schema['allOf'] || schema['oneOf'] || schema['anyOf'];
     const properties = hasXOf
       ? xOfProperties(schema)
       : type === 'object'
diff --git a/src/middlewares/parsers/schema.preprocessor.ts b/src/middlewares/parsers/schema.preprocessor.ts
index 8f84ea78..fb83cd26 100644
--- a/src/middlewares/parsers/schema.preprocessor.ts
+++ b/src/middlewares/parsers/schema.preprocessor.ts
@@ -260,10 +260,10 @@ export class SchemaPreprocessor {
 
   private processDiscriminator(parent: Schema, schema: Schema, opts: any = {}) {
     const o = opts.discriminator;
-    const schemaObj = <SchemaObject>schema;
+    const schemaObj = <OpenAPIV3.CompositionSchemaObject>schema;
     const xOf = schemaObj.oneOf ? 'oneOf' : schemaObj.anyOf ? 'anyOf' : null;
 
-    if (xOf && schemaObj?.discriminator?.propertyName && !o.discriminator) {
+    if (xOf && schemaObj.discriminator?.propertyName && !o.discriminator) {
       const options = schemaObj[xOf].flatMap((refObject) => {
         if (refObject['$ref'] === undefined) {
           return [];