[drizzle] Fix drizzleFieldWithInput

hayes · Sep 9, 2024 · fa2429f · fa2429f
1 parent 2f2de56
commit fa2429f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/.changeset/fuzzy-ties-talk.md b/.changeset/fuzzy-ties-talk.md
@@ -0,0 +1,5 @@
+---
+"@pothos/plugin-drizzle": patch
+---
+
+Fix drizzleFieldWithInput
diff --git a/packages/plugin-drizzle/src/field-builder.ts b/packages/plugin-drizzle/src/field-builder.ts
@@ -8,6 +8,7 @@ import { getSchemaConfig } from './utils/config';
 import { resolveDrizzleCursorConnection } from './utils/cursors';
 import { queryFromInfo } from './utils/map-query';
 import { getRefFromModel } from './utils/refs';
+import type { SelectionMap } from './utils/selections';
 
 const fieldBuilderProto = RootFieldBuilder.prototype as PothosSchemaTypes.RootFieldBuilder<
   SchemaTypes,
@@ -69,16 +70,22 @@ fieldBuilderProto.drizzleFieldWithInput = function drizzleFieldWithInput(
     ...(options as {}),
     type: typeParam,
     resolve: (parent: unknown, args: unknown, context: {}, info: GraphQLResolveInfo) => {
-      const query = queryFromInfo({
-        config: getSchemaConfig(this.builder),
+      return resolve(
+        (select: SelectionMap) =>
+          queryFromInfo({
+            config: getSchemaConfig(this.builder),
+            context,
+            select,
+            info,
+            // withUsageCheck: !!this.builder.options.drizzle?.onUnusedQuery,
+          }),
+        parent,
+        args as never,
         context,
         info,
-        // withUsageCheck: !!this.builder.options.drizzle?.onUnusedQuery,
-      });
-
-      return resolve(query, parent, args as never, context, info) as never;
+      ) as never;
     },
-  });
+  }) as never;
 } as never;
 
 fieldBuilderProto.drizzleConnection = function drizzleConnection<

diff --git a/packages/plugin-drizzle/src/global-types.ts b/packages/plugin-drizzle/src/global-types.ts
@@ -394,8 +394,6 @@ declare global {
 
       drizzleFieldWithInput: 'withInput' extends PluginName
         ? <
-            Fields extends InputFieldMap,
-            Args extends InputFieldMap,
             Param extends
               | keyof Types['DrizzleRelationSchema']
               | [keyof Types['DrizzleRelationSchema']]
@@ -407,6 +405,8 @@ declare global {
             ResolveShape,
             ResolveReturnShape,
             ArgRequired extends boolean,
+            Fields extends InputFieldMap = {},
+            Args extends InputFieldMap = {},
             InputName extends string = 'input',
             Table extends
               keyof Types['DrizzleRelationSchema'] = Param extends keyof Types['DrizzleRelationSchema']

diff --git a/packages/plugin-drizzle/src/types.ts b/packages/plugin-drizzle/src/types.ts
@@ -223,18 +223,7 @@ export type DrizzleFieldWithInputOptions<
   >,
   'args'
 > &
-  PothosSchemaTypes.FieldWithInputBaseOptions<
-    Types,
-    Args & {
-      [K in InputName]: ArgumentRef<
-        Types,
-        InputShapeFromFields<Fields> | (true extends ArgRequired ? never : null | undefined)
-      >;
-    },
-    Fields,
-    InputName,
-    ArgRequired
-  >;
+  PothosSchemaTypes.FieldWithInputBaseOptions<Types, Args, Fields, InputName, ArgRequired>;
 
 export type DrizzleObjectFieldOptions<
   Types extends SchemaTypes,

diff --git a/packages/plugin-drizzle/tests/example/schema.graphql b/packages/plugin-drizzle/tests/example/schema.graphql
@@ -64,6 +64,7 @@ type Query {
   post(id: ID!): Post
   posts(after: String, before: String, category: String, first: Int, last: Int): QueryPostsConnection
   user(id: ID!): User
+  userWithInput(input: QueryUserWithInputInput!): User
 }
 
 type QueryPostsConnection {
@@ -76,6 +77,10 @@ type QueryPostsConnectionEdge {
   node: Post
 }
 
+input QueryUserWithInputInput {
+  id: ID!
+}
+
 type User implements Node {
   bio: String
   email: String

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