Improve error handling

Mention keywords for combining schema

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

Author: Alan-Cha

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

@@ -6,9 +6,6 @@ export declare const mitigations: {
      * Should be caught by the module oas-validator
      */
     INVALID_OAS: string;
-    INVALID_SCHEMA_TYPE: string;
-    INVALID_SCHEMA_TYPE_LIST_ITEM: string;
-    INVALID_SCHEMA_TYPE_SCALAR: string;
     UNNAMED_PARAMETER: string;
     MULTIPLE_RESPONSES: string;
     MISSING_RESPONSE_SCHEMA: string;

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

@@ -415,6 +415,24 @@ export function createDataDef(
   // Resolve allOf element in schema if applicable
   if ('allOf' in schema) {
     schema = mergeAllOf(schema)
+  } else if ('anyOf' in schema) {
+    throw new Error(
+      `OpenAPI-to-GraphQL currently cannot handle 'anyOf' keyword in '${JSON.stringify(
+        schema
+      )}'`
+    )
+  } else if ('oneOf' in schema) {
+    throw new Error(
+      `OpenAPI-to-GraphQL currently cannot handle 'oneOf' keyword in '${JSON.stringify(
+        schema
+      )}'`
+    )
+  } else if ('not' in schema) {
+    throw new Error(
+      `OpenAPI-to-GraphQL currently cannot handle 'not' keyword in '${JSON.stringify(
+        schema
+      )}'`
+    )
   }
 
   const preferredName = getPreferredName(names)
@@ -486,17 +504,11 @@ export function createDataDef(
     // Determine the type of the schema
     const type = Oas3Tools.getSchemaType(schema as SchemaObject)
     if (!type) {
-      // TODO: Throw error?
-      handleWarning({
-        typeKey: 'INVALID_SCHEMA_TYPE',
-        message:
-          `Request/response schema has no (valid) type ` +
-          `'${JSON.stringify(schema)}'.`,
-        data,
-        log: preprocessingLog
-      })
-
-      return null
+      throw new Error(
+        `Cannot process schema '${JSON.stringify(
+          schema
+        )}'. Cannot identify type of schema.`
+      )
     } else {
       // Add the names to the master list
       data.usedOTNames.push(saneName)

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

@@ -348,15 +348,8 @@ function reuseOrCreateList({
     }
     return listObjectType
   } else {
-    handleWarning({
-      typeKey: 'INVALID_SCHEMA_TYPE_LIST_ITEM',
-      message:
-        `List item '${itemsName}' in list '${name}' contains an ` +
-        `invalid JSON schema '${JSON.stringify(itemsSchema)}'`,
-      data,
-      log: translationLog
-    })
-    return new GraphQLList(GraphQLString)
+    throw new Error(`Cannot create list item object type '${itemsName}' in list 
+    '${name}' with schema '${JSON.stringify(itemsSchema)}'`)
   }
 }
 

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

@@ -13,9 +13,6 @@ export const mitigations = {
    * Should be caught by the module oas-validator
    */
   INVALID_OAS: `Ignore issue and continue.`,
-  INVALID_SCHEMA_TYPE: `Fall back to GraphQL string type and stringify returned data.`,
-  INVALID_SCHEMA_TYPE_LIST_ITEM: `Fall back to GraphQL string type and stringify returned data.`,
-  INVALID_SCHEMA_TYPE_SCALAR: `Fall back to GraphQL string type and stringify returned data.`,
   UNNAMED_PARAMETER: `Ignore parameter.`,
 
   // General problems