improve test cases

Author: danadajian

src/definitions/input.ts

@@ -11,7 +11,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { GraphQLSchema, InputObjectTypeDefinitionNode } from "graphql";
+import {
+  GraphQLSchema,
+  InputObjectTypeDefinitionNode,
+  Kind,
+  TypeNode,
+} from "graphql";
 import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
 import { buildTypeMetadata } from "../helpers/build-type-metadata";
 import { buildAnnotations } from "../helpers/build-annotations";
@@ -27,9 +32,21 @@ export function buildInputObjectDefinition(
     return "";
   }
 
-  const typeNameWithoutInput = node.name.value.replace("Input", "");
-  const matchingType = schema.getType(typeNameWithoutInput);
-  if (matchingType) {
+  const typeNameWithoutInput = getTypeNameWithoutInput(node.name.value);
+  const matchingType = schema.getType(typeNameWithoutInput)?.astNode;
+  const matchingTypeFields =
+    matchingType?.kind === Kind.OBJECT_TYPE_DEFINITION
+      ? matchingType.fields
+      : [];
+  const inputFields = node.fields;
+  const fieldsMatch = matchingTypeFields?.every((field) => {
+    const matchingInputField = inputFields?.find(
+      (inputField) => inputField.name.value === field.name.value,
+    );
+    if (!matchingInputField) return false;
+    return fieldsAreEquivalent(field.type, matchingInputField.type);
+  });
+  if (matchingTypeFields?.length && fieldsMatch) {
     return "";
   }
 
@@ -60,3 +77,30 @@ export function buildInputObjectDefinition(
 ${classMembers}
 )`;
 }
+
+function getTypeNameWithoutInput(name: string) {
+  return name.endsWith("Input") ? name.replace("Input", "") : name;
+}
+
+function fieldsAreEquivalent(
+  typeField: TypeNode,
+  inputField: TypeNode,
+): boolean {
+  switch (typeField.kind) {
+    case Kind.NAMED_TYPE:
+      return (
+        inputField.kind === Kind.NAMED_TYPE &&
+        typeField.name.value === getTypeNameWithoutInput(inputField.name.value)
+      );
+    case Kind.LIST_TYPE:
+      return (
+        inputField.kind === Kind.LIST_TYPE &&
+        fieldsAreEquivalent(typeField.type, inputField.type)
+      );
+    case Kind.NON_NULL_TYPE:
+      return (
+        inputField.kind === Kind.NON_NULL_TYPE &&
+        fieldsAreEquivalent(typeField.type, inputField.type)
+      );
+  }
+}

src/definitions/object.ts

@@ -34,12 +34,6 @@ export function buildObjectTypeDefinition(
     return "";
   }
 
-  const typeNameWithInput = `${node.name.value}Input`;
-  const matchingInput = schema.getType(typeNameWithInput);
-  const typeConsolidationAnnotation = matchingInput
-    ? "@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT, GraphQLValidObjectLocations.Locations.OBJECT])\n"
-    : "";
-
   const annotations = buildAnnotations({
     config,
     definitionNode: node,
@@ -63,7 +57,7 @@ ${getDataClassMembers({ node, schema, config, completableFuture: true })}
 }`;
   }
 
-  return `${annotations}${typeConsolidationAnnotation}data class ${name}(
+  return `${annotations}data class ${name}(
 ${getDataClassMembers({ node, schema, config })}
 )${interfaceInheritance}`;
 }

test/unit/should_consolidate_input_and_output_types/expected.kt

@@ -2,24 +2,25 @@ package com.kotlin.generated
 
 import com.expediagroup.graphql.generator.annotations.*
 
-@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT, GraphQLValidObjectLocations.Locations.OBJECT])
 data class MyTypeToConsolidate(
+    val field: List<String>? = null,
+    val field2: NestedTypeToConsolidate? = null
+)
+
+data class NestedTypeToConsolidate(
     val field: String? = null
 )
 
 @GraphQLDescription("A description for MyTypeToConsolidate2")
-@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT, GraphQLValidObjectLocations.Locations.OBJECT])
 data class MyTypeToConsolidate2(
     val field: String? = null
 )
 
-@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT, GraphQLValidObjectLocations.Locations.OBJECT])
 data class MyTypeToConsolidate3(
     val field: String? = null
 )
 
 @GraphQLDescription("It always uses the type description when consolidating")
-@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT, GraphQLValidObjectLocations.Locations.OBJECT])
 data class MyTypeToConsolidate4(
     val field: String? = null
 )
@@ -32,3 +33,21 @@ data class MyTypeNotToConsolidate(
 data class MyTypeToNotConsolidateInput(
     val field: String? = null
 )
+
+data class MyTypeToNotConsolidate2(
+    val field: String? = null
+)
+
+data class MyTypeInputToNotConsolidate2(
+    val field: String? = null
+)
+
+data class MyTypeWhereFieldsDoNotMatch(
+    val field: String? = null,
+    val field2: String? = null
+)
+
+data class MyTypeWhereFieldsDoNotMatchInput(
+    val field: String? = null,
+    val field2: Int? = null
+)

test/unit/should_consolidate_input_and_output_types/schema.graphql

@@ -1,10 +1,20 @@
 # typical case where input and output types are consolidated
 
 type MyTypeToConsolidate {
-  field: String
+  field: [String!]
+  field2: NestedTypeToConsolidate
 }
 
 input MyTypeToConsolidateInput {
+  field: [String!]
+  field2: NestedTypeToConsolidateInput
+}
+
+type NestedTypeToConsolidate {
+  field: String
+}
+
+input NestedTypeToConsolidateInput {
   field: String
 }
 
@@ -52,3 +62,25 @@ type MyTypeNotToConsolidate {
 input MyTypeToNotConsolidateInput {
   field: String
 }
+
+# case where type has input in the middle of the name
+
+type MyTypeToNotConsolidate2 {
+  field: String
+}
+
+input MyTypeInputToNotConsolidate2 {
+  field: String
+}
+
+# case where type and input names match but fields do not match
+
+type MyTypeWhereFieldsDoNotMatch {
+  field: String
+  field2: String
+}
+
+input MyTypeWhereFieldsDoNotMatchInput {
+  field: String
+  field2: Int
+}