@pothos/plugin-drizzle 0.12.0 → 0.13.0

package/src/global-types.ts

@@ -282,16 +282,26 @@ declare global {
             ? [
                 ObjectRef<
                   Types,
-                  BuildQueryResult<
-                    Types['DrizzleRelations'],
-                    Types['DrizzleRelations'][Table],
-                    true
-                  >
+                  | BuildQueryResult<
+                      Types['DrizzleRelations'],
+                      Types['DrizzleRelations'][Table],
+                      true
+                    >
+                  | {
+                      $pothosQueryFor: Table | undefined;
+                    }
                 >,
               ]
             : ObjectRef<
                 Types,
-                BuildQueryResult<Types['DrizzleRelations'], Types['DrizzleRelations'][Table], true>
+                | BuildQueryResult<
+                    Types['DrizzleRelations'],
+                    Types['DrizzleRelations'][Table],
+                    true
+                  >
+                | {
+                    $pothosQueryFor: Table | undefined;
+                  }
               >,
       >(
         options: DrizzleFieldOptions<
@@ -321,11 +331,15 @@ declare global {
               infer S
             >
               ? S
-              : BuildQueryResult<
-                  Types['DrizzleRelations'],
-                  Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
-                  true
-                >,
+              :
+                  | BuildQueryResult<
+                      Types['DrizzleRelations'],
+                      Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
+                      true
+                    >
+                  | {
+                      $pothosQueryFor: Type | undefined;
+                    },
             const ConnectionInterfaces extends InterfaceParam<Types>[] = [],
             const EdgeInterfaces extends InterfaceParam<Types>[] = [],
           >(
@@ -408,7 +422,10 @@ declare global {
                     : never,
             Type extends TypeParam<Types> = ObjectRef<
               Types,
-              BuildQueryResult<Types['DrizzleRelations'], Types['DrizzleRelations'][Table], true>
+              | BuildQueryResult<Types['DrizzleRelations'], Types['DrizzleRelations'][Table], true>
+              | {
+                  $pothosQueryFor: Table | undefined;
+                }
             >,
           >(
             options: DrizzleFieldWithInputOptions<

package/src/interface-ref.ts

@@ -15,7 +15,14 @@ export class DrizzleInterfaceRef<
   Types extends SchemaTypes,
   Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
-> extends InterfaceRef<Types, T> {
+> extends InterfaceRef<
+  Types,
+  | T
+  | {
+      $pothosQueryFor: Table | undefined;
+    },
+  T
+> {
   [drizzleTableKey]!: Types['DrizzleRelations'][Table];
 
   tableName: string;

package/src/object-ref.ts

@@ -13,7 +13,14 @@ export class DrizzleObjectRef<
   Types extends SchemaTypes,
   Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
-> extends ObjectRef<Types, T> {
+> extends ObjectRef<
+  Types,
+  | T
+  | {
+      $pothosQueryFor: Table | undefined;
+    },
+  T
+> {
   [drizzleTableKey]!: Types['DrizzleRelations'][Table];
 
   [abstractReturnShapeKey]!: WithBrand<T>;

package/src/types.ts

@@ -33,6 +33,7 @@ import type {
   DBQueryConfig,
   Many,
   Relation,
+  SQL,
   Table,
   TableRelationalConfig,
 } from 'drizzle-orm';
@@ -214,7 +215,14 @@ export type DrizzleFieldOptions<
 > & {
   type: Param;
   resolve: (
-    query: <T extends QueryForDrizzleField<Types, Param, Table>>(selection?: T) => T,
+    query: <T extends QueryForDrizzleField<Types, Param, Table> = {}>(
+      selection?: T,
+    ) => Omit<T, 'columns' | 'extra'> & {
+      columns: T extends { columns: infer C extends {} } ? C : {};
+      extras: {
+        $pothosQueryFor: SQL<Table | undefined>;
+      } & (T extends { extra: infer E } ? E : {});
+    },
     parent: ParentShape,
     args: InputShapeFromFields<Args>,
     ctx: Types['Context'],
@@ -458,9 +466,10 @@ export type QueryForDrizzleField<
   Types extends SchemaTypes,
   Param,
   Table extends keyof Types['DrizzleRelations'],
-> = Omit<
-  DBQueryConfig<'many', Types['DrizzleRelations'], Types['DrizzleRelations'][Table]>,
-  Param extends [unknown] ? never : 'limit'
+> = DBQueryConfig<
+  Param extends [unknown] ? 'one' : 'many',
+  Types['DrizzleRelations'],
+  Types['DrizzleRelations'][Table]
 >;
 
 export type QueryForRelatedConnection<
@@ -536,14 +545,18 @@ export type DrizzleConnectionFieldOptions<
         maxSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
 
         resolve: (
-          query: <T extends QueryForRelatedConnection<Types, TableConfig, ConnectionArgs>>(
-            selection?: T,
-          ) => Omit<T, 'orderBy'> & {
+          query: <T = {}>(
+            selection?: T & QueryForDrizzleConnection<Types, TableConfig>,
+          ) => Omit<T, 'orderBy' | 'columns' | 'extra'> & {
+            columns: T extends { columns: infer C extends {} } ? C : {};
             orderBy: {
               [K in TableConfig['table']['_'] extends { columns: infer Columns }
                 ? keyof Columns
                 : never]?: 'asc' | 'desc' | undefined;
             };
+            extras: {
+              $pothosQueryFor: () => SQL<TableConfig['name'] | undefined>;
+            } & (T extends { extra: infer E } ? E : {});
           },
           parent: ParentShape,
           args: ConnectionArgs,
@@ -564,6 +577,7 @@ export type RelatedConnectionOptions<
   Field extends keyof Table['relations'],
   Nullable extends boolean,
   Args extends InputFieldMap,
+  Type = unknown,
   NodeTable extends
     TableRelationalConfig = Types['DrizzleRelations'][Table['relations'][Field]['targetTable']['_']['name']],
 > = Omit<
@@ -608,7 +622,7 @@ export type RelatedConnectionOptions<
         >;
         query?: QueryForRelatedConnection<Types, NodeTable, ConnectionArgs>;
         // biome-ignore lint/suspicious/noExplicitAny: this is fine
-        type?: DrizzleRef<any, Table['relations'][Field]['targetTable']['_']['name']>;
+        type?: Type & DrizzleRef<any, Table['relations'][Field]['targetTable']['_']['name']>;
 
         defaultSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
         maxSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);