[drizzle] Fix t.drizzleField for list types

hayes · Sep 10, 2024 · 6dbe790 · 6dbe790
1 parent c76853f
commit 6dbe790
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/.changeset/wet-moles-repeat.md b/.changeset/wet-moles-repeat.md
@@ -0,0 +1,5 @@
+---
+"@pothos/plugin-drizzle": patch
+---
+
+fix drizzleField list types
diff --git a/packages/plugin-drizzle/src/global-types.ts b/packages/plugin-drizzle/src/global-types.ts
@@ -300,14 +300,25 @@ declare global {
                 Param extends [DrizzleRef<any, infer T>]
                 ? T & keyof Types['DrizzleRelationSchema']
                 : never,
-        Type extends TypeParam<Types> = ObjectRef<
-          Types,
-          BuildQueryResult<
-            Types['DrizzleRelationSchema'],
-            Types['DrizzleRelationSchema'][Table],
-            true
-          >
-        >,
+        Type extends TypeParam<Types> = Param extends [unknown]
+          ? [
+              ObjectRef<
+                Types,
+                BuildQueryResult<
+                  Types['DrizzleRelationSchema'],
+                  Types['DrizzleRelationSchema'][Table],
+                  true
+                >
+              >,
+            ]
+          : ObjectRef<
+              Types,
+              BuildQueryResult<
+                Types['DrizzleRelationSchema'],
+                Types['DrizzleRelationSchema'][Table],
+                true
+              >
+            >,
       >(
         options: DrizzleFieldOptions<
           Types,

diff --git a/packages/plugin-drizzle/tests/__snapshots__/index.test.ts.snap b/packages/plugin-drizzle/tests/__snapshots__/index.test.ts.snap
@@ -68,6 +68,7 @@ type Query {
   posts(after: String, before: String, category: String, first: Int, last: Int): QueryPostsConnection
   user(id: ID!): User
   userWithInput(input: QueryUserWithInputInput!): User
+  users(id: ID!): [User!]
 }
 
 type QueryPostsConnection {

diff --git a/packages/plugin-drizzle/tests/example/schema.graphql b/packages/plugin-drizzle/tests/example/schema.graphql
@@ -65,6 +65,7 @@ type Query {
   posts(after: String, before: String, category: String, first: Int, last: Int): QueryPostsConnection
   user(id: ID!): User
   userWithInput(input: QueryUserWithInputInput!): User
+  users(id: ID!): [User!]
 }
 
 type QueryPostsConnection {

diff --git a/packages/plugin-drizzle/tests/example/schema/query.ts b/packages/plugin-drizzle/tests/example/schema/query.ts
@@ -26,6 +26,19 @@ builder.queryType({
         );
       },
     }),
+    users: t.drizzleField({
+      type: ['users'],
+      args: {
+        id: t.arg.globalID({ required: true, for: User }),
+      },
+      resolve: (query, _root, { id }) => {
+        return db.query.users.findMany(
+          query({
+            where: (user, { eq }) => eq(user.id, id.id.id),
+          }),
+        );
+      },
+    }),
     userWithInput: t.drizzleFieldWithInput({
       type: 'users',
       input: {