Added support for $ref in allOf

Signed-off-by: p787567 <[email protected]>

Author: p787567

packages/openapi-to-graphql/lib/preprocessor.js

@@ -21,6 +21,7 @@ export declare type SchemaObject = {
     items?: SchemaObject | ReferenceObject;
     additionalItems?: boolean | string[];
     enum?: string[];
+    allOf?: object[];
 };
 export declare type ReferenceObject = {
     $ref: string;

packages/openapi-to-graphql/lib/preprocessor.js.map

@@ -415,6 +415,9 @@ export function createDataDef(
 
   // Resolve allOf element in schema if applicable
   if ('allOf' in schema) {
+    schema.allOf = schema.allOf.map((entry: SchemaObject) => {
+      return entry.$ref ? Oas3Tools.resolveRef(entry.$ref, oas) : entry
+    })
     schema = mergeAllOf(schema)
   } else if ('anyOf' in schema) {
     throw new Error(

packages/openapi-to-graphql/lib/types/oas3.d.ts

@@ -28,6 +28,7 @@ export type SchemaObject = {
   items?: SchemaObject | ReferenceObject // MUST be a single schema object in OAS, see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#properties
   additionalItems?: boolean | string[]
   enum?: string[]
+  allOf?: object[]
 }
 
 export type ReferenceObject = {

packages/openapi-to-graphql/src/preprocessor.ts

@@ -1108,6 +1108,14 @@
   },
   "components": {
     "schemas": {
+      "suborderObject": {
+        "type": "object",
+        "properties": {
+          "suborder": {
+            "type": "string"
+          }
+        }
+      },
       "address": {
         "type": "object",
         "description": "The legal address of a user",
@@ -1332,11 +1340,7 @@
             "type": "object",
             "allOf": [
               {
-                "properties": {
-                  "suborder": {
-                    "type": "string"
-                  }
-                }
+                "$ref": "#/components/schemas/suborderObject"
               },
               {
                 "properties": {