fix(ts-client): thunk list objects

graffle-js · Apr 14, 2024 · 1238a1c · 1238a1c
1 parent cebd26d
commit 1238a1c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/Schema/Output/types/List.ts b/src/Schema/Output/types/List.ts
@@ -1,12 +1,13 @@
-import type { Base } from '../../core/helpers.js'
+import type { Base, MaybeThunk } from '../../core/helpers.js'
 import type { Named } from '../typeGroups.js'
 import type { Nullable } from './Nullable.js'
 
 type InnerType = Named | Nullable<any> | List<any>
 
 export type List<$Type extends InnerType> = Base.List<$Type>
 
-export const List = <$Type extends InnerType>(type: $Type): List<$Type> => ({
+export const List = <$Type extends InnerType>(type: MaybeThunk<$Type>): List<$Type> => ({
   kind: `list`,
-  type,
+  // at type level "type" is not a thunk
+  type: type as any, // eslint-disable-line
 })
diff --git a/src/generator/__snapshots__/files.test.ts.snap b/src/generator/__snapshots__/files.test.ts.snap
@@ -123,6 +123,8 @@ export namespace Root {
       }>
     >
     fooBarUnion: $.Field<$.Output.Nullable<Union.FooBarUnion>, null>
+    objectList: $.Field<$.Output.Nullable<$.Output.List<$.Output.Nullable<Object.Object1>>>, null>
+    objectListNonNull: $.Field<$.Output.List<Object.Object1>, null>
     /**
      * Query enum field documentation.
      */
@@ -422,6 +424,8 @@ export const Query = $.Object$(\`Query\`, {
     }),
   ),
   fooBarUnion: $.field($.Output.Nullable(() => FooBarUnion)),
+  objectList: $.field($.Output.Nullable($.Output.List($.Output.Nullable(() => Object1)))),
+  objectListNonNull: $.field($.Output.List(() => Object1)),
   abcEnum: $.field($.Output.Nullable(ABCEnum)),
   lowerCaseUnion: $.field($.Output.Nullable(() => lowerCaseUnion)),
   interface: $.field($.Output.Nullable(() => Interface)),

diff --git a/tests/ts/_/schema/generated/SchemaBuildtime.ts b/tests/ts/_/schema/generated/SchemaBuildtime.ts
@@ -120,6 +120,8 @@ export namespace Root {
       }>
     >
     fooBarUnion: $.Field<$.Output.Nullable<Union.FooBarUnion>, null>
+    objectList: $.Field<$.Output.Nullable<$.Output.List<$.Output.Nullable<Object.Object1>>>, null>
+    objectListNonNull: $.Field<$.Output.List<Object.Object1>, null>
     /**
      * Query enum field documentation.
      */

diff --git a/tests/ts/_/schema/generated/SchemaRuntime.ts b/tests/ts/_/schema/generated/SchemaRuntime.ts
@@ -143,6 +143,8 @@ export const Query = $.Object$(`Query`, {
     }),
   ),
   fooBarUnion: $.field($.Output.Nullable(() => FooBarUnion)),
+  objectList: $.field($.Output.Nullable($.Output.List($.Output.Nullable(() => Object1)))),
+  objectListNonNull: $.field($.Output.List(() => Object1)),
   abcEnum: $.field($.Output.Nullable(ABCEnum)),
   lowerCaseUnion: $.field($.Output.Nullable(() => lowerCaseUnion)),
   interface: $.field($.Output.Nullable(() => Interface)),

diff --git a/tests/ts/_/schema/schema.graphql b/tests/ts/_/schema/schema.graphql
@@ -33,6 +33,8 @@ type Query {
 	objectNested: ObjectNested
 	objectWithArgs(string:String, int:Int, float:Float, boolean:Boolean, id:ID): Object1
 	fooBarUnion: FooBarUnion
+	objectList: [Object1]
+	objectListNonNull: [Object1!]!
 	"""
 	Query enum field documentation.
 	"""