Identify allOf

Fix #237

Signed-off-by: Alan Cha <[email protected]>

Author: Alan-Cha

package.json

@@ -5,7 +5,7 @@
     "test": "cd packages/openapi-to-graphql/ && npm test"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.16",
+    "@types/jest": "^24.0.18",
     "graphql": "^14.5.0",
     "jest": "^24.8.0",
     "lerna": "^3.4.3",

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

@@ -8,7 +8,7 @@ declare type ExternalDocumentationObject = {
 export declare type SchemaObject = {
     $ref?: string;
     title?: string;
-    type: 'string' | 'number' | 'object' | 'array' | 'boolean' | 'integer';
+    type?: 'string' | 'number' | 'object' | 'array' | 'boolean' | 'integer';
     format?: string;
     nullable?: boolean;
     description?: string;

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

@@ -403,13 +403,12 @@ export function getSchemaType(
   schema: SchemaObject,
   data: PreprocessingData
 ): string | null {
-  // CASE: enum
-  if (Array.isArray(schema.enum)) {
-    return 'enum'
-  }
-
   // CASE: object
-  if (schema.type === 'object' || 'properties' in schema) {
+  if (
+    schema.type === 'object' ||
+    'properties' in schema ||
+    Array.isArray(schema.allOf)
+  ) {
     // CASE: arbitrary JSON
     if (typeof schema.additionalProperties === 'object') {
       return 'json'
@@ -423,6 +422,11 @@ export function getSchemaType(
     return 'array'
   }
 
+  // CASE: enum
+  if (Array.isArray(schema.enum)) {
+    return 'enum'
+  }
+
   // CASE: a type is present
   if (typeof schema.type === 'string') {
     // Special edge cases involving the schema format

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

@@ -15,7 +15,7 @@ type ExternalDocumentationObject = {
 export type SchemaObject = {
   $ref?: string
   title?: string
-  type: 'string' | 'number' | 'object' | 'array' | 'boolean' | 'integer'
+  type?: 'string' | 'number' | 'object' | 'array' | 'boolean' | 'integer'
   format?: string
   nullable?: boolean
   description?: string

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

@@ -184,3 +184,42 @@ test('Properly treat null values during sanitization', () => {
     })
   })
 })
+
+test('Identify allOf as an object', () => {
+  const schema = {
+    allOf: [
+      {
+        $ref: '#/components/schemas/User'
+      }
+    ]
+  }
+
+  expect(
+    Oas3Tools.getSchemaType(schema, {
+      operations: {},
+      usedOTNames: [],
+      defs: [],
+      security: {},
+      saneMap: {},
+      options: {
+        strict: false,
+        report: {
+          warnings: [],
+          numOps: 0,
+          numOpsQuery: 0,
+          numOpsMutation: 0,
+          numQueriesCreated: 0,
+          numMutationsCreated: 0
+        },
+        operationIdFieldNames: false,
+        fillEmptyResponses: false,
+        addLimitArgument: false,
+        viewer: true,
+        sendOAuthTokenInQuery: false,
+        provideErrorExtensions: true,
+        equivalentToMessages: true
+      },
+      oass: []
+    })
+  ).toEqual('object')
+})