fixes

Signed-off-by: Dotan Simha <[email protected]>

Author: dotansimha

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

@@ -54,6 +54,7 @@ import { sortObject, handleWarning } from './utils'
 type Result = {
   schema: GraphQLSchema
   report: Report
+  data: PreprocessingData
 }
 
 const translationLog = debug('translation')
@@ -140,13 +141,14 @@ export async function createGraphQLSchema(
     oass = [await Oas3Tools.getValidOAS3(spec)]
   }
 
-  const { schema, report } = await translateOpenAPIToGraphQL(
+  const { schema, report, data } = await translateOpenAPIToGraphQL(
     oass,
     options as InternalOptions
   )
   return {
     schema,
-    report
+    report,
+    data
   }
 }
 
@@ -185,7 +187,7 @@ async function translateOpenAPIToGraphQL(
     provideErrorExtensions,
     equivalentToMessages
   }: InternalOptions
-): Promise<{ schema: GraphQLSchema; report: Report }> {
+): Promise<{ schema: GraphQLSchema; report: Report; data: PreprocessingData }> {
   const options = {
     strict,
     report,
@@ -476,7 +478,7 @@ async function translateOpenAPIToGraphQL(
 
   const schema = new GraphQLSchema(schemaConfig)
 
-  return { schema, report: options.report }
+  return { schema, report: options.report, data }
 }
 
 /**

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

@@ -1,3 +1,4 @@
+import { OperationObject } from './types/oas3'
 // Copyright IBM Corp. 2018. All Rights Reserved.
 // Node module: openapi-to-graphql
 // This file is licensed under the MIT License.
@@ -77,7 +78,7 @@ export function preprocessOas(
           continue
         }
 
-        const endpoint = oas.paths[path][method]
+        const endpoint: OperationObject = oas.paths[path][method]
         const operationString =
           oass.length === 1
             ? Oas3Tools.formatOperationString(method, path)
@@ -92,6 +93,9 @@ export function preprocessOas(
           description = endpoint.summary
         }
 
+        // Determine tags
+        const tags = endpoint.tags || []
+
         if (data.options.equivalentToMessages) {
           // Description may not exist
           if (typeof description !== 'string') {
@@ -206,6 +210,8 @@ export function preprocessOas(
 
         // Store determined information for operation
         const operation: Operation = {
+          object: endpoint,
+          tags,
           operationId,
           operationString,
           description,
@@ -1045,7 +1051,7 @@ function resolveAllOf(
 
 type MemberSchemaData = {
   allTargetGraphQLTypes: string[]
-  allProperties: ({ [key: string]: SchemaObject | ReferenceObject })[]
+  allProperties: { [key: string]: SchemaObject | ReferenceObject }[]
   allRequired: string[]
 }
 
@@ -1207,11 +1213,11 @@ function createDataDefFromAnyOf(
           Object.keys(properties).forEach(propertyName => {
             if (
               !incompatibleProperties.has(propertyName) && // Has not been already identified as a problematic property
-              (typeof allProperties[propertyName] === 'object' &&
+              typeof allProperties[propertyName] === 'object' &&
                 allProperties[propertyName].some(property => {
                   // Property does not match a recorded one
                   return !deepEqual(property, properties[propertyName])
-                }))
+                })
             ) {
               incompatibleProperties.add(propertyName)
             }

packages/openapi-to-graphql/src/types/operation.ts

@@ -1,3 +1,4 @@
+import { OperationObject } from './oas3'
 // Copyright IBM Corp. 2018. All Rights Reserved.
 // Node module: openapi-to-graphql
 // This file is licensed under the MIT License.
@@ -93,6 +94,11 @@ export type Operation = {
    */
   operationId: string
 
+  /**
+   * The raw operation object from the OAS spec
+   */
+  object: OperationObject
+
   /**
    * A combination of the operation method and path (and the title of the OAS
    * where the operation originates from if multiple OASs are provided) in the
@@ -114,6 +120,11 @@ export type Operation = {
    */
   path: string
 
+  /**
+   * Tags from the original OAS
+   */
+  tags: string[]
+
   /**
    * HTTP method for this operation
    */