Do not throw error for anyOf, oneOf, and not

Related to #197 and #248 Signed-off-by: Alan Cha <[email protected]>
IBM · Oct 3, 2019 · b30dfe2 · b30dfe2
1 parent 8a41f9c
commit b30dfe2
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 17 deletions.
diff --git a/packages/openapi-to-graphql/lib/preprocessor.js b/packages/openapi-to-graphql/lib/preprocessor.js
diff --git a/packages/openapi-to-graphql/lib/preprocessor.js.map b/packages/openapi-to-graphql/lib/preprocessor.js.map
diff --git a/packages/openapi-to-graphql/lib/utils.d.ts b/packages/openapi-to-graphql/lib/utils.d.ts
@@ -14,6 +14,7 @@ export declare const mitigations: {
     UNSUPPORTED_HTTP_SECURITY_SCHEME: string;
     NON_APPLICATION_JSON_SCHEMA: string;
     OBJECT_MISSING_PROPERTIES: string;
+    UNSUPPORTED_JSON_SCHEMA_KEYWORD: string;
     UNRESOLVABLE_LINK: string;
     AMBIGUOUS_LINK: string;
     LINK_NAME_COLLISION: string;

diff --git a/packages/openapi-to-graphql/lib/utils.js b/packages/openapi-to-graphql/lib/utils.js
diff --git a/packages/openapi-to-graphql/lib/utils.js.map b/packages/openapi-to-graphql/lib/utils.js.map
diff --git a/packages/openapi-to-graphql/src/preprocessor.ts b/packages/openapi-to-graphql/src/preprocessor.ts
@@ -537,23 +537,32 @@ export function createDataDef(
         if ('allOf' in schema) {
           addAllOfToDataDef(def, schema, isInputObjectType, data, oas)
         } else if ('anyOf' in schema) {
-          throw new Error(
-            `OpenAPI-to-GraphQL currently cannot handle 'anyOf' keyword in '${JSON.stringify(
+          handleWarning({
+            typeKey: 'UNSUPPORTED_JSON_SCHEMA_KEYWORD',
+            message: `OpenAPI-to-GraphQL currently cannot handle 'anyOf' keyword in '${JSON.stringify(
               schema
-            )}'`
-          )
+            )}'`,
+            data,
+            log: preprocessingLog
+          })
         } else if ('oneOf' in schema) {
-          throw new Error(
-            `OpenAPI-to-GraphQL currently cannot handle 'oneOf' keyword in '${JSON.stringify(
+          handleWarning({
+            typeKey: 'UNSUPPORTED_JSON_SCHEMA_KEYWORD',
+            message: `OpenAPI-to-GraphQL currently cannot handle 'oneOf' keyword in '${JSON.stringify(
               schema
-            )}'`
-          )
+            )}'`,
+            data,
+            log: preprocessingLog
+          })
         } else if ('not' in schema) {
-          throw new Error(
-            `OpenAPI-to-GraphQL currently cannot handle 'not' keyword in '${JSON.stringify(
+          handleWarning({
+            typeKey: 'UNSUPPORTED_JSON_SCHEMA_KEYWORD',
+            message: `OpenAPI-to-GraphQL currently cannot handle 'not' keyword in '${JSON.stringify(
               schema
-            )}'`
-          )
+            )}'`,
+            data,
+            log: preprocessingLog
+          })
         }
 
         // Add existing properties (regular object type)

diff --git a/packages/openapi-to-graphql/src/utils.ts b/packages/openapi-to-graphql/src/utils.ts
@@ -23,6 +23,7 @@ export const mitigations = {
   UNSUPPORTED_HTTP_SECURITY_SCHEME: `Ignore security scheme.`,
   NON_APPLICATION_JSON_SCHEMA: `Ignore schema`,
   OBJECT_MISSING_PROPERTIES: `The (sub-)object will be stored in an arbitray JSON type.`,
+  UNSUPPORTED_JSON_SCHEMA_KEYWORD: `Ignore keyword and continue.`,
 
   // Links
   UNRESOLVABLE_LINK: `Ignore link.`,