Fix #272

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

Author: Alan-Cha

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

@@ -186,9 +186,9 @@ function createOrReuseOt({
     if (def.ot && typeof def.ot !== 'undefined') {
       translationLog(
         `Reuse object type '${def.otName}'` +
-        (typeof operation === 'object'
-          ? ` (for operation '${operation.operationId}')`
-          : '')
+          (typeof operation === 'object'
+            ? ` (for operation '${operation.operationId}')`
+            : '')
       )
       return def.ot as (
         | GraphQLObjectType
@@ -201,9 +201,9 @@ function createOrReuseOt({
     if (def.iot && typeof def.iot !== 'undefined') {
       translationLog(
         `Reuse input object type '${def.iotName}'` +
-        (typeof operation === 'object'
-          ? ` (for operation '${operation.operationId}')`
-          : '')
+          (typeof operation === 'object'
+            ? ` (for operation '${operation.operationId}')`
+            : '')
       )
       return def.iot as GraphQLInputObjectType
     }
@@ -223,7 +223,8 @@ function createOrReuseOt({
    * Instead, store response in an arbitray JSON type.
    */
   if (
-    typeof def.schema.properties === 'undefined' &&
+    (typeof def.schema.properties === 'undefined' ||
+      Object.keys(def.schema.properties).length === 0) && // Empty object
     typeof def.schema.allOf === 'undefined' // allOf can provide all the properties
     // TODO: Add oneOf and anyOf
   ) {
@@ -232,7 +233,7 @@ function createOrReuseOt({
       message:
         `The operation ` +
         `'${operation.operationString}' contains ` +
-        `a object schema ${JSON.stringify(def)} with no properties. ` +
+        `an object schema ${JSON.stringify(schema)} with no properties. ` +
         `GraphQL objects must have well-defined properties so a one to ` +
         `one conversion cannot be achieved.`,
       data,
@@ -245,9 +246,9 @@ function createOrReuseOt({
   if (!isInputObjectType) {
     translationLog(
       `Create object type '${def.otName}'` +
-      (typeof operation === 'object'
-        ? ` (for operation '${operation.operationId}')`
-        : '')
+        (typeof operation === 'object'
+          ? ` (for operation '${operation.operationId}')`
+          : '')
     )
 
     def.ot = new GraphQLObjectType({
@@ -271,9 +272,9 @@ function createOrReuseOt({
   } else {
     translationLog(
       `Create input object type '${def.iotName}'` +
-      (typeof operation === 'object'
-        ? ` (for operation '${operation.operationId}')`
-        : '')
+        (typeof operation === 'object'
+          ? ` (for operation '${operation.operationId}')`
+          : '')
     )
 
     def.iot = new GraphQLInputObjectType({
@@ -475,7 +476,6 @@ function createFields({
           : (objectType as GraphQLOutputType),
 
         description: schema.description
-        
       }
     }
   }
@@ -563,7 +563,7 @@ function createFields({
           const resObjectType = linkedOp.responseDefinition.ot
 
           let description = link.description
- 
+
           if (data.options.equivalentToMessages && description) {
             description += `\n\nEquivalent to ${linkedOp.operationString}`
           }

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

@@ -64,6 +64,9 @@ test('Get descriptions', () => {
             {
               description: null
             },
+            {
+              description: null
+            },
             {
               description: 'The model of the car.'
             },
@@ -806,14 +809,22 @@ test('Request data is correctly de-sanitized to be sent', () => {
   })
 })
 
-// Testing additionalProperties field in schemas
 test('Fields with arbitrary JSON (e.g., maps) can be returned', () => {
+  // Testing additionalProperties field in schemas
   const query = `{
     cars {
       tags
     }
   }`
-  return graphql(createdSchema, query, null, {}).then(result => {
+
+  // Testing empty properties field
+  const query2 = `{
+    cars {
+      features
+    }
+  }`
+
+  const promise = graphql(createdSchema, query, null, {}).then(result => {
     expect(result).toEqual({
       data: {
         cars: [
@@ -840,6 +851,31 @@ test('Fields with arbitrary JSON (e.g., maps) can be returned', () => {
       }
     })
   })
+
+  const promise2 = graphql(createdSchema, query2, null, {}).then(result => {
+    expect(result).toEqual({
+      data: {
+        cars: [
+          {
+            features: {
+              color: 'banana yellow to be specific'
+            }
+          },
+          {
+            features: null
+          },
+          {
+            features: null
+          },
+          {
+            features: null
+          }
+        ]
+      }
+    })
+  })
+
+  return Promise.all([promise, promise2])
 })
 
 test('Capitalized enum values can be returned', () => {

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

@@ -98,7 +98,10 @@ function startServer(PORT) {
       model: 'Retro Rides',
       color: 'yellow',
       kind: 'SEDAN',
-      rating: 100
+      rating: 100,
+      features: {
+        color: 'banana yellow to be specific'
+      }
     },
     will: {
       model: 'Speedzone Speedster',

packages/openapi-to-graphql/test/example_api.test.ts

@@ -1134,6 +1134,9 @@
             "type": "string",
             "description": "The color of the car."
           },
+          "features": {
+            "properties": {}
+          },
           "tags": {
             "$ref": "#/components/schemas/tags"
           },