Fix #183 field creation should use prop name instead of ref name

Signed-off-by: Jennie Ji <[email protected]>

Author: Jennie Ji

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

@@ -206,9 +206,7 @@ export function preprocessOas(
           handleWarning({
             typeKey: 'DUPLICATE_OPERATIONID',
             message: `Multiple OASs share operations with the same operationId '${operationId}'`,
-            mitigationAddendum: `The operation from the OAS '${
-              operation.oas.info.title
-            }' will be ignored`,
+            mitigationAddendum: `The operation from the OAS '${operation.oas.info.title}' will be ignored`,
             data,
             log: preprocessingLog
           })
@@ -576,7 +574,7 @@ export function createDataDef(
           oas
         )
         // Add field type references
-        def.subDefinitions[propSchemaName] = subDefinition
+        def.subDefinitions[propertyKey] = subDefinition
       }
     }
 

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

@@ -658,6 +658,9 @@ test('Get single resource', () => {
       name
       address{
         street
+      },
+      address2{
+        city
       }
     }
   }`
@@ -668,6 +671,9 @@ test('Get single resource', () => {
           name: 'Arlene L McMahon',
           address: {
             street: '4656 Cherry Camp Road'
+          },
+          address2: {
+            city: 'Macomb'
           }
         }
       }

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

@@ -25,6 +25,10 @@ function startServer(PORT) {
         street: '4656 Cherry Camp Road',
         city: 'Elk Grove Village'
       },
+      address2: {
+        street: '3180 Little Acres Lane',
+        city: 'Macomb'
+      },
       employerId: 'binsol',
       hobbies: ['tap dancing', 'bowling'],
       status: 'staff',
@@ -537,9 +541,7 @@ function startServer(PORT) {
   app.post('/api/scanner/:path', (req, res) => {
     console.log(req.method, req.path)
     res.status(200).send({
-      body: `req.body: ${req.body}, req.query.query: ${
-        req.query.query
-      }, req.path.path: ${req.params.path}`
+      body: `req.body: ${req.body}, req.query.query: ${req.query.query}, req.path.path: ${req.params.path}`
     })
   })
 

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

@@ -970,6 +970,9 @@
           "address": {
             "$ref": "#/components/schemas/address"
           },
+          "address2": {
+            "$ref": "#/components/schemas/address"
+          },
           "employerId": {
             "type": "string",
             "description": "The identifier of the company a user works for"