Change type to targetGraphQLType

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

Author: Alan-Cha

packages/openapi-to-graphql/lib/oas_3_tools.d.ts

@@ -83,10 +83,9 @@ export declare function instantiatePathAndGetQuery(path: string, parameters: Par
     };
 };
 /**
- * Returns the "type" of the given JSON schema. Makes best guesses if the type
- * is not explicitly defined.
+ * Returns the GraphQL type that the provided schema should be made into
  */
-export declare function getSchemaType(schema: SchemaObject, data: PreprocessingData): string | null;
+export declare function getSchemaTargetGraphQLType(schema: SchemaObject, data: PreprocessingData): string | null;
 /**
  * Determines an approximate name for the resource at the given path.
  */

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

@@ -4,10 +4,11 @@
  */
 import { Oas3, LinkObject, ParameterObject, ServerObject, SchemaObject } from './oas3';
 import { GraphQLScalarType, GraphQLObjectType, GraphQLInputObjectType, GraphQLList, GraphQLEnumType, GraphQLUnionType } from 'graphql';
+import * as GraphQLJSON from 'graphql-type-json';
 export declare type DataDefinition = {
     preferredName: string;
     schema: SchemaObject;
-    type: string;
+    targetGraphQLType: string;
     links: {
         [key: string]: LinkObject;
     };
@@ -28,7 +29,7 @@ export declare type DataDefinition = {
     } | DataDefinition[];
     graphQLTypeName: string;
     graphQLInputObjectTypeName: string;
-    graphQLType?: GraphQLObjectType | GraphQLList<any> | GraphQLUnionType | GraphQLEnumType | GraphQLScalarType;
+    graphQLType?: GraphQLObjectType | GraphQLList<any> | GraphQLUnionType | GraphQLEnumType | GraphQLScalarType | GraphQLJSON;
     graphQLInputObjectType?: GraphQLInputObjectType | GraphQLList<any>;
 };
 export declare type Operation = {

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

@@ -411,10 +411,9 @@ export function instantiatePathAndGetQuery(
 }
 
 /**
- * Returns the "type" of the given JSON schema. Makes best guesses if the type
- * is not explicitly defined.
+ * Returns the GraphQL type that the provided schema should be made into
  */
-export function getSchemaType(
+export function getSchemaTargetGraphQLType(
   schema: SchemaObject,
   data: PreprocessingData
 ): string | null {

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

@@ -518,10 +518,13 @@ export function createDataDef(
     const iotName = otName + 'Input'
 
     // Determine the type of the schema
-    const type = Oas3Tools.getSchemaType(schema as SchemaObject, data)
+    const targetGraphQLType = Oas3Tools.getSchemaTargetGraphQLType(
+      schema as SchemaObject,
+      data
+    )
 
     // Only add type names if a type will be created
-    if (type === 'object' || type === 'array' || type === 'enum') {
+    if (targetGraphQLType === 'object' || targetGraphQLType === 'array' || targetGraphQLType === 'enum') {
       // Add the names to the master list
       data.usedTypeNames.push(otName)
 
@@ -541,22 +544,21 @@ export function createDataDef(
        * currently, it does not.
        */
       schema,
-
-      type,
+      targetGraphQLType,
       subDefinitions: undefined,
       links: saneLinks,
       graphQLTypeName: otName,
       graphQLInputObjectTypeName: iotName
     }
 
-    if (type) {
+    if (targetGraphQLType) {
       // Add the def to the master list
       data.defs.push(def)
 
       // Break schema down into component parts
       // I.e. if it is an list type, create a reference to the list item type
       // Or if it is an object type, create references to all of the field types
-      if (type === 'array' && typeof schema.items === 'object') {
+      if (targetGraphQLType === 'array' && typeof schema.items === 'object') {
         let itemsSchema = schema.items
         let itemsName = `${name}ListItem`
 
@@ -576,7 +578,7 @@ export function createDataDef(
 
         // Add list item reference
         def.subDefinitions = subDefinition
-      } else if (type === 'object') {
+      } else if (targetGraphQLType === 'object') {
         def.subDefinitions = {}
 
         // Resolve allOf element in schema if applicable
@@ -613,7 +615,7 @@ export function createDataDef(
 
         // Add existing properties (regular object type)
         addObjectPropertiesToDataDef(def, schema, isInputObjectType, data, oas)
-      } else if (type === 'union') {
+      } else if (targetGraphQLType === 'union') {
         def.subDefinitions = []
 
         schema.oneOf.forEach(subSchema => {