add createSubscriptionsFromCallbacks option ; code cleaning

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

Author: getlarge

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

@@ -107,6 +107,11 @@ export async function createGraphQLSchema(
       ? options.createSubscriptionsFromCallbacks
       : false
 
+  options.createSubscriptionsFromCallbacks =
+    typeof options.createSubscriptionsFromCallbacks === 'boolean'
+      ? options.createSubscriptionsFromCallbacks
+      : false
+
   // Authentication options
   options.viewer = typeof options.viewer === 'boolean' ? options.viewer : true
   options.sendOAuthTokenInQuery =
@@ -245,8 +250,6 @@ async function translateOpenAPIToGraphQL(
 
   preliminaryChecks(options, data)
 
-  // console.log('PREPROCESS OPENAPI', data)
-
   /**
    * Create GraphQL fields for every operation and structure them based on their
    * characteristics (query vs. mutation, auth vs. non-auth).
@@ -258,6 +261,8 @@ async function translateOpenAPIToGraphQL(
   let authMutationFields = {}
   let authSubscriptionFields = {}
 
+  // todo parse data.callbacks to recompose subscription ?
+
   Object.entries(data.operations).forEach(([operationId, operation]) => {
     translationLog(`Process operation '${operation.operationString}'...`)
 
@@ -416,7 +421,7 @@ async function translateOpenAPIToGraphQL(
           mutationFields[saneFieldName] = field
         }
       }
-    } else {
+    } else if (operation.isSubscription) {
       // handle subscriptions from operation.callbacks
       // 1) cbName would be the subscription field name
       // each paths contained in operation.callbacks[cbName]
@@ -625,7 +630,7 @@ function getFieldForOperation(
 
   if (operation.isSubscription) {
     const responseSchemaName = operation.responseDefinition
-      ? operation.responseDefinition.graphQLInputObjectTypeName
+      ? operation.responseDefinition.graphQLTypeName
       : null
 
     const resolve = getPublishResolver({

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

@@ -1075,10 +1075,10 @@ export function getEndpointCallbacks(
   data: PreprocessingData
 ): { [key: string]: CallbackObject } {
   const callbacks = {}
-  const endpoint: OperationObject = oas.paths[path][method]
+  const operation: OperationObject = oas.paths[path][method]
 
-  if (typeof endpoint.callbacks === 'object') {
-    let callbacksObject: CallbacksObject = endpoint.callbacks
+  if (typeof operation.callbacks === 'object') {
+    let callbacksObject: CallbacksObject = operation.callbacks
     for (let callbackName in callbacksObject) {
       if (typeof callbacksObject[callbackName] === 'object') {
         let callbackObject: CallbackObject | ReferenceObject =
@@ -1092,12 +1092,9 @@ export function getEndpointCallbacks(
         } else {
           callbackObject = (callbackObject as any) as CallbackObject
         }
-        // console.log("CHECK CALLBACK OBJ", callbackName, callbackObject)
-
         // Make sure CallbackObject contains PathItemObject:
         for (let expression in callbackObject) {
           let pathItem: PathItemObject = callbackObject[expression]
-          // console.log("CHECK CALLBACK ITEM", expression, pathItem)
           if (typeof (pathItem as ReferenceObject).$ref === 'string') {
             pathItem = resolveRef(callbackObject[callbackName]['$ref'], oas)
           } else {