@pothos/plugin-drizzle 0.12.1 → 0.14.0

package/src/drizzle-field-builder.ts

@@ -83,41 +83,37 @@ export class DrizzleObjectFieldBuilder<
         Args extends InputFieldMap,
         const ConnectionInterfaces extends InterfaceParam<Types>[] = [],
         const EdgeInterfaces extends InterfaceParam<Types>[] = [],
+        Type = unknown,
+        Shape = // biome-ignore lint/suspicious/noExplicitAny: generic match
+        Type extends DrizzleRef<any, any>
+          ? Type['$inferType']
+          : TypesForRelation<Types, TableConfig['relations'][Field]>,
       >(
         field: Field,
         ...args: NormalizeArgs<
           [
-            options: RelatedConnectionOptions<Types, Shape, TableConfig, Field, Nullable, Args>,
+            options: RelatedConnectionOptions<
+              Types,
+              Shape,
+              TableConfig,
+              Field,
+              Nullable,
+              Args,
+              Type
+            >,
             connectionOptions:
               | ObjectRef<
                   Types,
-                  ShapeFromConnection<
-                    PothosSchemaTypes.ConnectionShapeHelper<
-                      Types,
-                      TypesForRelation<Types, TableConfig['relations'][Field]>,
-                      false
-                    >
-                  >
+                  ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, Shape, false>>
                 >
               | PothosSchemaTypes.ConnectionObjectOptions<
                   Types,
-                  ObjectRef<
-                    Types,
-                    ShapeFromTypeParam<
-                      Types,
-                      [ObjectRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>>],
-                      Nullable
-                    >
-                  >,
+                  ObjectRef<Types, ShapeFromTypeParam<Types, [ObjectRef<Types, Shape>], Nullable>>,
                   false,
                   false,
                   DrizzleConnectionShape<
                     Types,
-                    ShapeFromTypeParam<
-                      Types,
-                      [ObjectRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>>],
-                      Nullable
-                    >,
+                    ShapeFromTypeParam<Types, [ObjectRef<Types, Shape>], Nullable>,
                     Shape,
                     Args
                   >,
@@ -128,27 +124,16 @@ export class DrizzleObjectFieldBuilder<
                   Types,
                   {
                     cursor: string;
-                    node?: TypesForRelation<Types, TableConfig['relations'][Field]>;
+                    node?: Shape | null | undefined;
                   }
                 >
               | PothosSchemaTypes.ConnectionEdgeObjectOptions<
                   Types,
-                  ObjectRef<
-                    Types,
-                    ShapeFromTypeParam<
-                      Types,
-                      [ObjectRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>>],
-                      Nullable
-                    >
-                  >,
+                  ObjectRef<Types, ShapeFromTypeParam<Types, [ObjectRef<Types, Shape>], Nullable>>,
                   false,
                   DrizzleConnectionShape<
                     Types,
-                    ShapeFromTypeParam<
-                      Types,
-                      [ObjectRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>>],
-                      Nullable
-                    >,
+                    ShapeFromTypeParam<Types, [ObjectRef<Types, Shape>], Nullable>,
                     Shape,
                     Args
                   >,
@@ -168,7 +153,7 @@ export class DrizzleObjectFieldBuilder<
       maxSize = this.builder.options.drizzle?.maxConnectionSize,
       defaultSize = this.builder.options.drizzle?.defaultConnectionSize,
       query,
-      resolve,
+      resolve: _,
       extensions,
       description,
       ...options
@@ -263,6 +248,7 @@ export class DrizzleObjectFieldBuilder<
           ...extensions,
           pothosDrizzleSelect: relationSelect,
         },
+        description,
         type: ref,
         resolve: (
           parent: unknown,

package/src/field-builder.ts

@@ -37,7 +37,7 @@ fieldBuilderProto.drizzleField = function drizzleField({ type, resolve, ...optio
             select,
             info,
             // withUsageCheck: !!this.builder.options.drizzle?.onUnusedQuery,
-          }),
+          }) as never,
         parent,
         args as never,
         context,

package/src/global-types.ts

@@ -37,10 +37,6 @@ import type {
   ShapeFromIdColumns,
 } from './types';
 
-type MapToDbName<T> = {
-  [K in keyof T as T[K] extends { dbName: infer K2 extends string } ? K2 : K]: T[K];
-};
-
 declare global {
   export namespace PothosSchemaTypes {
     export interface Plugins<Types extends SchemaTypes> {
@@ -282,16 +278,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 +327,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 +418,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/model-loader.ts

@@ -2,7 +2,7 @@ import { createContextCache, type SchemaTypes } from '@pothos/core';
 import {
   type AnyTable,
   type Column,
-  getTableColumns,
+  getColumns,
   inArray,
   type SQL,
   sql,
@@ -60,7 +60,7 @@ export class ModelLoader {
     this.columns = columns ?? this.primaryKey;
     this.selectSQL = (table) => {
       const columns = this.columns.map((column) =>
-        Object.values(getTableColumns(table)).find(
+        Object.values(getColumns(table)).find(
           (tblColumn) => 'columnType' in tblColumn && tblColumn.name === column.name,
         ),
       );

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,9 +215,14 @@ export type DrizzleFieldOptions<
 > & {
   type: Param;
   resolve: (
-    query: <T extends QueryForDrizzleField<Types, Param, Table>>(
+    query: <T extends QueryForDrizzleField<Types, Param, Table> = {}>(
       selection?: T,
-    ) => Omit<T, 'columns'>,
+    ) => 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'],
@@ -460,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<
@@ -538,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' | 'columns'> & {
+          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,
@@ -566,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<
@@ -610,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);

package/src/utils/config.ts

@@ -1,5 +1,5 @@
 import { createContextCache, type SchemaTypes } from '@pothos/core';
-import { type AnyRelations, type Column, getTableColumns, isTable, type Table } from 'drizzle-orm';
+import { type AnyRelations, type Column, getColumns, isTable, type Table } from 'drizzle-orm';
 import type { DrizzleClient } from '../types';
 
 export interface PothosDrizzleSchemaConfig {
@@ -17,14 +17,12 @@ const configCache = createContextCache(
       relations = (builder.options.drizzle.client as DrizzleClient)._.relations;
     }
 
-    const columnNameMappings: Record<string, string> = {};
+    const columnNameMappings = new Map<Column, string>();
 
     Object.values(relations).forEach(({ table }) => {
       if (isTable(table)) {
-        Object.entries(getTableColumns(table)).forEach(([tsName, col]) => {
-          if (col.uniqueName) {
-            columnNameMappings[col.uniqueName] = tsName;
-          }
+        Object.entries(getColumns(table)).forEach(([tsName, col]) => {
+          columnNameMappings.set(col, tsName);
         });
       }
     });
@@ -32,15 +30,13 @@ const configCache = createContextCache(
     return {
       skipDeferredFragments: builder.options.drizzle.skipDeferredFragments ?? true,
       columnToTsName: (column) => {
-        if (!column.uniqueName) {
-          throw new Error(`Column ${String(column.name)} has no uniqueName`);
-        }
+        const tsName = columnNameMappings.get(column);
 
-        if (!(column.uniqueName in columnNameMappings)) {
-          throw new Error(`Typescript name not found for ${column.uniqueName}`);
+        if (!tsName) {
+          throw new Error(`Typescript name not found for column ${String(column.name)}`);
         }
 
-        return columnNameMappings[column.uniqueName];
+        return tsName;
       },
       getPrimaryKey: (tableName) => {
         const tableConfig = builder.options.drizzle.getTableConfig(

package/src/utils/cursors.ts

@@ -8,7 +8,7 @@ import {
 import {
   type Column,
   type DBQueryConfig,
-  getTableColumns,
+  getColumns,
   type SQL,
   type Table,
   type TableRelationalConfig,
@@ -322,7 +322,7 @@ function parseOrderBy(
       normalized.push({ direction: 'asc', column: field });
     }
   } else {
-    const tableColumns = getTableColumns(table.table as Table);
+    const tableColumns = getColumns(table.table as Table);
     Object.entries(
       orderBy as {
         [k: string]: 'asc' | 'desc' | undefined;

package/src/utils/drizzle-graphql.ts

@@ -1,3 +1,4 @@
+export {};
 // import {
 //   type Column,
 //   type SQL,

package/src/utils/map-query.ts

@@ -567,7 +567,7 @@ export function getIndirectType(type: GraphQLNamedType, info: GraphQLResolveInfo
 
   while (targetType.extensions?.pothosIndirectInclude) {
     targetType = info.schema.getType(
-      (targetType.extensions?.pothosIndirectInclude as IndirectInclude).getType(),
+      (targetType.extensions.pothosIndirectInclude as IndirectInclude).getType(),
     )!;
   }
 

package/src/utils/usage.ts

@@ -1,6 +1,6 @@
 export const usageSymbol = Symbol.for('Pothos.isUsed');
 
-export function wrapWithUsageCheck<T extends Object>(obj: T): T {
+export function wrapWithUsageCheck<T extends object>(obj: T): T {
   const result = {};
   let used = true;