Improve evaluation script

Signed-off-by: Alan Cha <Alan.cha1@ibm.com>
IBM · Mar 3, 2021 · 15ed7f2 · 15ed7f2
1 parent 0daf771
commit 15ed7f2
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 94 deletions.
diff --git a/packages/openapi-to-graphql/lib/index.js b/packages/openapi-to-graphql/lib/index.js
diff --git a/packages/openapi-to-graphql/lib/index.js.map b/packages/openapi-to-graphql/lib/index.js.map
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/src/index.ts b/packages/openapi-to-graphql/src/index.ts
@@ -149,32 +149,39 @@ export function createGraphQLSchema<TSource, TContext, TArgs>(
     if (Array.isArray(spec)) {
       // Convert all non-OAS 3 into OAS 3
       Promise.all(
-        spec.map(ele => {
+        spec.map((ele) => {
           return Oas3Tools.getValidOAS3(ele)
         })
-      ).then(oass => {
-        resolve(
-          translateOpenAPIToGraphQL(
-            oass,
-            options as InternalOptions<TSource, TContext, TArgs>
+      )
+        .then((oass) => {
+          resolve(
+            translateOpenAPIToGraphQL(
+              oass,
+              options as InternalOptions<TSource, TContext, TArgs>
+            )
           )
-        )
-      })
+        })
+        .catch((error) => {
+          reject(error)
+        })
     } else {
       /**
        * Check if the spec is a valid OAS 3
        * If the spec is OAS 2.0, attempt to translate it into 3, then try to
        * translate the spec into a GraphQL schema
        */
-
-      Oas3Tools.getValidOAS3(spec).then(oas => {
-        resolve(
-          translateOpenAPIToGraphQL(
-            [oas],
-            options as InternalOptions<TSource, TContext, TArgs>
+      Oas3Tools.getValidOAS3(spec)
+        .then((oas) => {
+          resolve(
+            translateOpenAPIToGraphQL(
+              [oas],
+              options as InternalOptions<TSource, TContext, TArgs>
+            )
           )
-        )
-      })
+        })
+        .catch((error) => {
+          reject(error)
+        })
     }
   })
 }
@@ -518,15 +525,15 @@ function translateOpenAPIToGraphQL<TSource, TContext, TArgs>(
   mutationFields = sortObject(mutationFields)
   subscriptionFields = sortObject(subscriptionFields)
   authQueryFields = sortObject(authQueryFields)
-  Object.keys(authQueryFields).forEach(key => {
+  Object.keys(authQueryFields).forEach((key) => {
     authQueryFields[key] = sortObject(authQueryFields[key])
   })
   authMutationFields = sortObject(authMutationFields)
-  Object.keys(authMutationFields).forEach(key => {
+  Object.keys(authMutationFields).forEach((key) => {
     authMutationFields[key] = sortObject(authMutationFields[key])
   })
   authSubscriptionFields = sortObject(authSubscriptionFields)
-  Object.keys(authSubscriptionFields).forEach(key => {
+  Object.keys(authSubscriptionFields).forEach((key) => {
     authSubscriptionFields[key] = sortObject(authSubscriptionFields[key])
   })
 
@@ -719,13 +726,13 @@ function checkCustomResolversStructure<TSource, TContext, TArgs>(
   if (typeof customResolvers === 'object') {
     // Check that all OASs that are referenced in the customResolvers are provided
     Object.keys(customResolvers)
-      .filter(title => {
+      .filter((title) => {
         // If no OAS contains this title
-        return !data.oass.some(oas => {
+        return !data.oass.some((oas) => {
           return title === oas.info.title
         })
       })
-      .forEach(title => {
+      .forEach((title) => {
         handleWarning({
           mitigationType: MitigationTypes.CUSTOM_RESOLVER_UNKNOWN_OAS,
           message:
@@ -737,16 +744,16 @@ function checkCustomResolversStructure<TSource, TContext, TArgs>(
       })
 
     // TODO: Only run the following test on OASs that exist. See previous check.
-    Object.keys(customResolvers).forEach(title => {
+    Object.keys(customResolvers).forEach((title) => {
       // Get all operations from a particular OAS
-      const operations = Object.values(data.operations).filter(operation => {
+      const operations = Object.values(data.operations).filter((operation) => {
         return title === operation.oas.info.title
       })
 
-      Object.keys(customResolvers[title]).forEach(path => {
-        Object.keys(customResolvers[title][path]).forEach(method => {
+      Object.keys(customResolvers[title]).forEach((path) => {
+        Object.keys(customResolvers[title][path]).forEach((method) => {
           if (
-            !operations.some(operation => {
+            !operations.some((operation) => {
               return path === operation.path && method === operation.method
             })
           ) {
@@ -775,7 +782,7 @@ function preliminaryChecks<TSource, TContext, TArgs>(
   data: PreprocessingData<TSource, TContext, TArgs>
 ): void {
   // Check if OASs have unique titles
-  const titles = data.oass.map(oas => {
+  const titles = data.oass.map((oas) => {
     return oas.info.title
   })
 
@@ -784,7 +791,7 @@ function preliminaryChecks<TSource, TContext, TArgs>(
     titles.filter((title, index) => {
       return titles.indexOf(title) !== index
     })
-  ).forEach(title => {
+  ).forEach((title) => {
     handleWarning({
       mitigationType: MitigationTypes.MULTIPLE_OAS_SAME_TITLE,
       message: `Multiple OAS share the same title '${title}'`,