Support content property in parameter objects

Fix #153

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

Author: Alan-Cha

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

@@ -16,6 +16,7 @@ export declare const mitigations: {
     DUPLICATE_LINK_KEY: string;
     UNRESOLVABLE_REFERENCE: string;
     UNSUPPORTED_HTTP_SECURITY_SCHEME: string;
+    NON_APPLICATION_JSON_SCHEMA: string;
     UNRESOLVABLE_LINK: string;
     AMBIGUOUS_LINK: string;
     LINK_NAME_COLLISION: string;

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

@@ -324,9 +324,10 @@ export function getResolver({
     httpLog(
       `Call ${options.method.toUpperCase()} ${
         options.url
-      }?${querystring.stringify(options.qs)}` +
+      }?${querystring.stringify(options.qs)}\n` +
         `headers:${JSON.stringify(options.headers)}`
     )
+
     return new Promise((resolve, reject) => {
       NodeRequest(options, (err, response, body) => {
         if (err) {

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

@@ -869,30 +869,28 @@ export function getArgs({
      * or the "content" field (but not both)
      */
     let type: GraphQLType
+    let schema: SchemaObject | ReferenceObject
     if (typeof parameter.schema === 'object') {
-      let schema = parameter.schema
-      if ('$ref' in parameter.schema) {
-        schema = Oas3Tools.resolveRef(parameter.schema['$ref'], operation.oas)
-      }
-
-      // TODO: remove
-      const paramDef = createDataDef(
-        { fromRef: parameter.name },
-        schema as SchemaObject,
-        true,
-        data
-      )
-
-      // @ts-ignore
-      type = getGraphQLType({
-        def: paramDef,
-        operation,
-        data,
-        iteration: 0,
-        isMutation: true
-      })
+      schema = parameter.schema
     } else if (typeof parameter.content === 'object') {
-      // TODO
+      if (
+        typeof parameter.content['application/json'] === 'object' &&
+        typeof parameter.content['application/json'].schema === 'object'
+      ) {
+        schema = parameter.content['application/json'].schema
+      } else {
+        handleWarning({
+          typeKey: 'NON_APPLICATION_JSON_SCHEMA',
+          message:
+            `The operation '${operationString}' contains a ` +
+            `parameter '${JSON.stringify(parameter)}' that has a 'content' ` +
+            `property but no schemas in application/json format. The ` +
+            `parameter will not be created`,
+          data,
+          log: translationLog
+        })
+        continue
+      }
     } else {
       // Invalid OAS according to 3.0.2
       handleWarning({
@@ -907,6 +905,27 @@ export function getArgs({
       continue
     }
 
+    if ('$ref' in schema) {
+      schema = Oas3Tools.resolveRef(schema['$ref'], operation.oas)
+    }
+
+    // TODO: remove
+    const paramDef = createDataDef(
+      { fromRef: parameter.name },
+      schema as SchemaObject,
+      true,
+      data
+    )
+
+    // @ts-ignore
+    type = getGraphQLType({
+      def: paramDef,
+      operation,
+      data,
+      iteration: 0,
+      isMutation: true
+    })
+
     /**
      * Sanitize the argument name
      *