fix input references

Author: danadajian

src/helpers/build-type-metadata.ts

@@ -22,6 +22,10 @@ import {
 import { getBaseTypeNode } from "@graphql-codegen/visitor-plugin-common";
 import { wrapTypeWithModifiers } from "@graphql-codegen/java-common";
 import { CodegenConfigWithDefaults } from "./build-config-with-defaults";
+import {
+  getTypeNameWithoutInput,
+  inputTypeHasMatchingOutputType,
+} from "./input-type-has-matching-output-type";
 
 export interface TypeMetadata {
   typeName: string;
@@ -73,9 +77,16 @@ export function buildTypeMetadata(
       ),
     };
   } else {
+    const typeWillBeConsolidated =
+      schemaType?.name.endsWith("Input") &&
+      schemaType?.astNode?.kind === Kind.INPUT_OBJECT_TYPE_DEFINITION &&
+      inputTypeHasMatchingOutputType(schemaType.astNode, schema);
+    const typeName = typeWillBeConsolidated
+      ? getTypeNameWithoutInput(schemaType.name)
+      : schemaType.name;
     return {
       ...commonMetadata,
-      typeName: buildListType(typeNode, schemaType.name),
+      typeName: buildListType(typeNode, typeName),
     };
   }
 }

src/helpers/dependent-type-utils.ts

@@ -19,6 +19,7 @@ import {
   TypeNode,
 } from "graphql";
 import { CodegenConfigWithDefaults } from "./build-config-with-defaults";
+import { getBaseTypeNode } from "@graphql-codegen/visitor-plugin-common";
 
 export function getDependentFieldTypeNames(
   node: TypeDefinitionNode,
@@ -36,19 +37,7 @@ export function getDependentFieldTypeNames(
 }
 
 export function getFieldTypeName(fieldType: TypeNode) {
-  switch (fieldType.kind) {
-    case Kind.NAMED_TYPE:
-      return fieldType.name.value;
-    case Kind.LIST_TYPE:
-      return getFieldTypeName(fieldType.type);
-    case Kind.NON_NULL_TYPE:
-      switch (fieldType.type.kind) {
-        case Kind.NAMED_TYPE:
-          return fieldType.type.name.value;
-        case Kind.LIST_TYPE:
-          return getFieldTypeName(fieldType.type.type);
-      }
-  }
+  return getBaseTypeNode(fieldType).name.value;
 }
 
 export function getDependentInterfaceNames(node: TypeDefinitionNode) {

src/helpers/input-type-has-matching-output-type.ts

@@ -24,7 +24,7 @@ export function inputTypeHasMatchingOutputType(
   return Boolean(matchingTypeFields?.length && fieldsMatch);
 }
 
-function getTypeNameWithoutInput(name: string) {
+export function getTypeNameWithoutInput(name: string) {
   return name.endsWith("Input") ? name.replace("Input", "") : name;
 }
 

test/unit/should_consolidate_input_and_output_types/expected.kt

@@ -57,3 +57,13 @@ data class MyTypeWhereFieldsDoNotMatchInput(
     val field: String? = null,
     val field2: Int? = null
 )
+
+@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.OBJECT])
+data class MyTypeToConsolidateParent(
+    val field: MyTypeToConsolidate? = null
+)
+
+@GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.INPUT_OBJECT])
+data class MyTypeToConsolidateInputParent(
+    val field: MyTypeToConsolidate? = null
+)

test/unit/should_consolidate_input_and_output_types/schema.graphql

@@ -84,3 +84,13 @@ input MyTypeWhereFieldsDoNotMatchInput {
   field: String
   field2: Int
 }
+
+# case where parent types reference consolidated types
+
+type MyTypeToConsolidateParent {
+  field: MyTypeToConsolidate
+}
+
+input MyTypeToConsolidateInputParent {
+  field: MyTypeToConsolidateInput
+}