fix(ts-client): order independent input object defs

graffle-js · Apr 14, 2024 · 310f10c · 310f10c
1 parent 54d2810
commit 310f10c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/src/generator/__snapshots__/files.test.ts.snap b/src/generator/__snapshots__/files.test.ts.snap
@@ -59,6 +59,12 @@ export namespace Root {
         input: $.Input.Nullable<InputObject.InputObjectNested>
       }>
     >
+    InputObjectNestedNonNull: $.Field<
+      $.Output.Nullable<$Scalar.ID>,
+      $.Args<{
+        input: InputObject.InputObjectNested
+      }>
+    >
     id: $.Field<$.Output.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<$Scalar.ID, null>
     string: $.Field<$.Output.Nullable<$Scalar.String>, null>
@@ -170,6 +176,10 @@ export namespace InputObject {
     InputObject: $.Input.Nullable<InputObject.InputObject>
   }>
 
+  export type InputObjectNestedNonNull = $.InputObject<'InputObjectNestedNonNull', {
+    InputObject: InputObject.InputObject
+  }>
+
   export type InputObject = $.InputObject<'InputObject', {
     id: $.Input.Nullable<$Scalar.ID>
     idRequired: $Scalar.ID
@@ -298,6 +308,10 @@ export const InputObjectNested = $.InputObject(\`InputObjectNested\`, {
   InputObject: $.Input.field(() => $.Input.Nullable(InputObject)),
 })
 
+export const InputObjectNestedNonNull = $.InputObject(\`InputObjectNestedNonNull\`, {
+  InputObject: $.Input.field(() => InputObject),
+})
+
 export const InputObject = $.InputObject(\`InputObject\`, {
   id: $.Input.field($.Input.Nullable($Scalar.ID)),
   idRequired: $.Input.field($Scalar.ID),
@@ -415,6 +429,7 @@ export const Query = $.Object$(\`Query\`, {
   dateArgNonNullListNonNull: $.field($.Output.Nullable($Scalar.Date), $.Args({ date: $.Input.List($Scalar.Date) })),
   dateArgInputObject: $.field($.Output.Nullable($Scalar.Date), $.Args({ input: $.Input.Nullable(InputObject) })),
   InputObjectNested: $.field($.Output.Nullable($Scalar.ID), $.Args({ input: $.Input.Nullable(InputObjectNested) })),
+  InputObjectNestedNonNull: $.field($.Output.Nullable($Scalar.ID), $.Args({ input: InputObjectNested })),
   id: $.field($.Output.Nullable($Scalar.ID)),
   idNonNull: $.field($Scalar.ID),
   string: $.field($.Output.Nullable($Scalar.String)),

diff --git a/src/generator/code/schemaRuntime.ts b/src/generator/code/schemaRuntime.ts
@@ -19,7 +19,7 @@ import {
   isUnionType,
 } from 'graphql'
 import type { AnyClass, AnyGraphQLOutputField } from '../../lib/graphql.js'
-import { hasMutation, hasQuery, hasSubscription, unwrapToNonNull } from '../../lib/graphql.js'
+import { hasMutation, hasQuery, hasSubscription, unwrapToNamed, unwrapToNonNull } from '../../lib/graphql.js'
 import type { Config } from './code.js'
 
 export const generateRuntimeSchema = (
@@ -116,10 +116,12 @@ const inputObject = (config: Config, type: GraphQLInputObjectType) => {
     })
 	`
 }
+unwrapToNamed
 
 const inputField = (config: Config, field: GraphQLInputField): string => {
   const type = buildType(`input`, config, field.type)
-  return `$.Input.field(${isInputObjectType(field.type) ? `() => ${type}` : type})`
+  const isNeedThunk = isInputObjectType(unwrapToNamed(field.type))
+  return `$.Input.field(${isNeedThunk ? `() => ${type}` : type})`
 }
 
 const outputField = (config: Config, field: AnyGraphQLOutputField): string => {

diff --git a/tests/ts/_/schema/generated/SchemaBuildtime.ts b/tests/ts/_/schema/generated/SchemaBuildtime.ts
@@ -56,6 +56,12 @@ export namespace Root {
         input: $.Input.Nullable<InputObject.InputObjectNested>
       }>
     >
+    InputObjectNestedNonNull: $.Field<
+      $.Output.Nullable<$Scalar.ID>,
+      $.Args<{
+        input: InputObject.InputObjectNested
+      }>
+    >
     id: $.Field<$.Output.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<$Scalar.ID, null>
     string: $.Field<$.Output.Nullable<$Scalar.String>, null>
@@ -167,6 +173,10 @@ export namespace InputObject {
     InputObject: $.Input.Nullable<InputObject.InputObject>
   }>
 
+  export type InputObjectNestedNonNull = $.InputObject<'InputObjectNestedNonNull', {
+    InputObject: InputObject.InputObject
+  }>
+
   export type InputObject = $.InputObject<'InputObject', {
     id: $.Input.Nullable<$Scalar.ID>
     idRequired: $Scalar.ID

diff --git a/tests/ts/_/schema/generated/SchemaRuntime.ts b/tests/ts/_/schema/generated/SchemaRuntime.ts
@@ -7,6 +7,10 @@ export const InputObjectNested = $.InputObject(`InputObjectNested`, {
   InputObject: $.Input.field(() => $.Input.Nullable(InputObject)),
 })
 
+export const InputObjectNestedNonNull = $.InputObject(`InputObjectNestedNonNull`, {
+  InputObject: $.Input.field(() => InputObject),
+})
+
 export const InputObject = $.InputObject(`InputObject`, {
   id: $.Input.field($.Input.Nullable($Scalar.ID)),
   idRequired: $.Input.field($Scalar.ID),
@@ -124,6 +128,7 @@ export const Query = $.Object$(`Query`, {
   dateArgNonNullListNonNull: $.field($.Output.Nullable($Scalar.Date), $.Args({ date: $.Input.List($Scalar.Date) })),
   dateArgInputObject: $.field($.Output.Nullable($Scalar.Date), $.Args({ input: $.Input.Nullable(InputObject) })),
   InputObjectNested: $.field($.Output.Nullable($Scalar.ID), $.Args({ input: $.Input.Nullable(InputObjectNested) })),
+  InputObjectNestedNonNull: $.field($.Output.Nullable($Scalar.ID), $.Args({ input: InputObjectNested })),
   id: $.field($.Output.Nullable($Scalar.ID)),
   idNonNull: $.field($Scalar.ID),
   string: $.field($.Output.Nullable($Scalar.String)),

diff --git a/tests/ts/_/schema/schema.graphql b/tests/ts/_/schema/schema.graphql
@@ -20,6 +20,7 @@ type Query {
 	# Note: It is important that the type `InputObjectNested` is defined before `InputObject` in the generated runtime schema.
 	# This is to force the case of needing a thunk, to make sure our tests for it are actually testing the case.
 	InputObjectNested(input: InputObjectNested): ID
+	InputObjectNestedNonNull(input: InputObjectNested!): ID
 	# Scalar
 	id: ID
 	idNonNull: ID!
@@ -78,6 +79,10 @@ input InputObjectNested {
 	InputObject: InputObject
 }
 
+input InputObjectNestedNonNull {
+	InputObject: InputObject!
+}
+
 input InputObject {
 	id: ID
 	idRequired: ID!