@pothos/plugin-drizzle 0.8.1 → 0.9.0

package/src/global-types.ts

@@ -13,13 +13,14 @@ import type {
   TypeParam,
 } from '@pothos/core';
 import type {
-  AnyTable,
+  AnyRelations,
   BuildQueryResult,
   Column,
   DBQueryConfig,
   ExtractTablesWithRelations,
   SQL,
   TableRelationalConfig,
+  TablesRelationalConfig,
 } from 'drizzle-orm';
 import type { DrizzleObjectFieldBuilder } from './drizzle-field-builder';
 import type { DrizzleInterfaceRef, DrizzleRef } from './interface-ref';
@@ -36,6 +37,7 @@ import type {
   DrizzleObjectOptions,
   DrizzlePluginOptions,
   ShapeFromConnection,
+  ShapeFromIdColumns,
   drizzleTableName,
 } from './types';
 
@@ -58,34 +60,29 @@ declare global {
     }
 
     export interface UserSchemaTypes {
-      DrizzleSchema: Record<string, unknown>;
-      DrizzleRelationSchema: Record<string, TableRelationalConfig>;
-      DrizzleRelationSchemaByDbName: Record<string, TableRelationalConfig>;
+      DrizzleRelations: AnyRelations;
+      DrizzleRelationsConfig: TablesRelationalConfig;
     }
 
     export interface ExtendDefaultTypes<PartialTypes extends Partial<UserSchemaTypes>> {
-      DrizzleSchema: PartialTypes['DrizzleSchema'] & {};
-      DrizzleRelationSchema: ExtractTablesWithRelations<PartialTypes['DrizzleSchema'] & {}>;
-      DrizzleRelationSchemaByDbName: MapToDbName<
-        ExtractTablesWithRelations<PartialTypes['DrizzleSchema'] & {}>
-      >;
+      DrizzleRelations: PartialTypes['DrizzleRelations'] & {};
+      DrizzleRelationsConfig: ExtractTablesWithRelations<PartialTypes['DrizzleRelations'] & {}>;
     }
 
     export interface SchemaBuilder<Types extends SchemaTypes> {
       drizzleObject: <
         const Interfaces extends InterfaceParam<Types>[],
-        Table extends keyof Types['DrizzleRelationSchema'],
+        Table extends keyof Types['DrizzleRelations']['tables'],
         Selection extends
           | DBQueryConfig<
               'one',
-              false,
-              Types['DrizzleRelationSchema'],
-              Types['DrizzleRelationSchema'][Table]
+              Types['DrizzleRelationsConfig'],
+              Types['DrizzleRelationsConfig'][Table]
             >
           | true,
         Shape = BuildQueryResult<
-          Types['DrizzleRelationSchema'],
-          Types['DrizzleRelationSchema'][Table],
+          Types['DrizzleRelationsConfig'],
+          Types['DrizzleRelationsConfig'][Table],
           Selection
         >,
       >(
@@ -95,18 +92,17 @@ declare global {
 
       drizzleInterface: <
         const Interfaces extends InterfaceParam<Types>[],
-        Table extends keyof Types['DrizzleRelationSchema'],
+        Table extends keyof Types['DrizzleRelationsConfig'],
         Selection extends
           | DBQueryConfig<
               'one',
-              false,
-              Types['DrizzleRelationSchema'],
-              Types['DrizzleRelationSchema'][Table]
+              Types['DrizzleRelationsConfig'],
+              Types['DrizzleRelationsConfig'][Table]
             >
           | true,
         Shape = BuildQueryResult<
-          Types['DrizzleRelationSchema'],
-          Types['DrizzleRelationSchema'][Table],
+          Types['DrizzleRelationsConfig'],
+          Types['DrizzleRelationsConfig'][Table],
           Selection
         >,
       >(
@@ -117,46 +113,38 @@ declare global {
       drizzleNode: 'relay' extends PluginName
         ? <
             const Interfaces extends InterfaceParam<Types>[],
-            Table extends keyof Types['DrizzleRelationSchema'],
+            Table extends keyof Types['DrizzleRelationsConfig'],
             Selection extends
               | DBQueryConfig<
                   'one',
-                  false,
-                  Types['DrizzleRelationSchema'],
-                  Types['DrizzleRelationSchema'][Table]
+                  Types['DrizzleRelationsConfig'],
+                  Types['DrizzleRelationsConfig'][Table]
                 >
               | true,
-            IDColumn extends Column,
+            IDColumns,
             Shape = BuildQueryResult<
-              Types['DrizzleRelationSchema'],
-              Types['DrizzleRelationSchema'][Table],
+              Types['DrizzleRelationsConfig'],
+              Types['DrizzleRelationsConfig'][Table],
               Selection
             >,
           >(
             table: Table,
-            options: DrizzleNodeOptions<Types, Table, Shape, Selection, Interfaces, IDColumn>,
-          ) => DrizzleNodeRef<
-            Types,
-            Table,
-            Shape,
-            {
-              [K in IDColumn['_']['name']]: Extract<IDColumn, { _: { name: K } }>['_']['data'];
-            }
-          >
+            options: DrizzleNodeOptions<Types, Table, Shape, Selection, Interfaces, IDColumns>,
+          ) => DrizzleNodeRef<Types, Table, Shape, ShapeFromIdColumns<Types, Table, IDColumns>>
         : '@pothos/plugin-relay is required to use this method';
 
       drizzleObjectField: <
-        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationSchema'],
+        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationsConfig'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationSchema'][Type & keyof Types['DrizzleRelationSchema']],
+          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
         Shape extends {} = Type extends DrizzleObjectRef<
           Types,
-          keyof Types['DrizzleRelationSchema'],
+          keyof Types['DrizzleRelationsConfig'],
           infer S
         >
           ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationSchema'], TableConfig, true> & {
+          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -166,17 +154,17 @@ declare global {
       ) => void;
 
       drizzleInterfaceField: <
-        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationSchema'],
+        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationsConfig'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationSchema'][Type & keyof Types['DrizzleRelationSchema']],
+          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
         Shape extends {} = Type extends DrizzleInterfaceRef<
           Types,
-          keyof Types['DrizzleRelationSchema'],
+          keyof Types['DrizzleRelationsConfig'],
           infer S
         >
           ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationSchema'], TableConfig, true> & {
+          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -186,17 +174,17 @@ declare global {
       ) => void;
 
       drizzleObjectFields: <
-        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationSchema'],
+        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationsConfig'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationSchema'][Type & keyof Types['DrizzleRelationSchema']],
+          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
         Shape extends {} = Type extends DrizzleObjectRef<
           Types,
-          keyof Types['DrizzleRelationSchema'],
+          keyof Types['DrizzleRelationsConfig'],
           infer S
         >
           ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationSchema'], TableConfig, true> & {
+          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -205,17 +193,17 @@ declare global {
       ) => void;
 
       drizzleInterfaceFields: <
-        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationSchema'],
+        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationsConfig'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationSchema'][Type & keyof Types['DrizzleRelationSchema']],
+          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
         Shape extends {} = Type extends DrizzleInterfaceRef<
           Types,
-          keyof Types['DrizzleRelationSchema'],
+          keyof Types['DrizzleRelationsConfig'],
           infer S
         >
           ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationSchema'], TableConfig, true> & {
+          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -223,37 +211,37 @@ declare global {
         fields: (t: DrizzleObjectFieldBuilder<Types, TableConfig, false, Shape>) => FieldMap,
       ) => void;
 
-      drizzleGraphQLOrderBy: 'addGraphQL' extends PluginName
-        ? <Table extends keyof Types['DrizzleRelationSchema']>(
-            table: Table,
-            type: GraphQLInputObjectType,
-            ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
-          ) => InputObjectRef<Types, SQL | SQL[]>
-        : '@pothos/plugin-add-graphql is required to use this method';
+      // drizzleGraphQLOrderBy: 'addGraphQL' extends PluginName
+      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //       table: Table,
+      //       type: GraphQLInputObjectType,
+      //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
+      //     ) => InputObjectRef<Types, SQL | SQL[]>
+      //   : '@pothos/plugin-add-graphql is required to use this method';
 
-      drizzleGraphQLFilters: 'addGraphQL' extends PluginName
-        ? <Table extends keyof Types['DrizzleRelationSchema']>(
-            table: Table,
-            type: GraphQLInputObjectType,
-            ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
-          ) => InputObjectRef<Types, SQL>
-        : '@pothos/plugin-add-graphql is required to use this method';
+      // drizzleGraphQLFilters: 'addGraphQL' extends PluginName
+      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //       table: Table,
+      //       type: GraphQLInputObjectType,
+      //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
+      //     ) => InputObjectRef<Types, SQL>
+      //   : '@pothos/plugin-add-graphql is required to use this method';
 
-      drizzleGraphQLInsert: 'addGraphQL' extends PluginName
-        ? <Table extends keyof Types['DrizzleRelationSchema']>(
-            table: Table,
-            type: GraphQLInputObjectType,
-            ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
-          ) => InputObjectRef<Types, Record<string, unknown>>
-        : '@pothos/plugin-add-graphql is required to use this method';
+      // drizzleGraphQLInsert: 'addGraphQL' extends PluginName
+      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //       table: Table,
+      //       type: GraphQLInputObjectType,
+      //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
+      //     ) => InputObjectRef<Types, Record<string, unknown>>
+      //   : '@pothos/plugin-add-graphql is required to use this method';
 
-      drizzleGraphQLUpdate: 'addGraphQL' extends PluginName
-        ? <Table extends keyof Types['DrizzleRelationSchema']>(
-            table: Table,
-            type: GraphQLInputObjectType,
-            ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
-          ) => InputObjectRef<Types, Record<string, unknown>>
-        : '@pothos/plugin-add-graphql is required to use this method';
+      // drizzleGraphQLUpdate: 'addGraphQL' extends PluginName
+      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //       table: Table,
+      //       type: GraphQLInputObjectType,
+      //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
+      //     ) => InputObjectRef<Types, Record<string, unknown>>
+      //   : '@pothos/plugin-add-graphql is required to use this method';
     }
 
     export interface PothosKindToGraphQLType {
@@ -288,8 +276,8 @@ declare global {
       drizzleField: <
         Args extends InputFieldMap,
         Param extends
-          | keyof Types['DrizzleRelationSchema']
-          | [keyof Types['DrizzleRelationSchema']]
+          | keyof Types['DrizzleRelationsConfig']
+          | [keyof Types['DrizzleRelationsConfig']]
           // biome-ignore lint/suspicious/noExplicitAny: <explanation>
           | DrizzleRef<any>
           // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -298,36 +286,39 @@ declare global {
         ResolveShape,
         ResolveReturnShape,
         Table extends
-          keyof Types['DrizzleRelationSchema'] = Param extends keyof Types['DrizzleRelationSchema']
+          keyof Types['DrizzleRelationsConfig'] = Param extends keyof Types['DrizzleRelationsConfig']
           ? Param
-          : Param extends [keyof Types['DrizzleRelationSchema']]
+          : Param extends [keyof Types['DrizzleRelationsConfig']]
             ? Param[0]
             : // biome-ignore lint/suspicious/noExplicitAny: <explanation>
               Param extends DrizzleRef<any, infer T>
-              ? T & keyof Types['DrizzleRelationSchema']
+              ? T & keyof Types['DrizzleRelationsConfig']
               : // biome-ignore lint/suspicious/noExplicitAny: <explanation>
                 Param extends [DrizzleRef<any, infer T>]
-                ? T & keyof Types['DrizzleRelationSchema']
+                ? T & keyof Types['DrizzleRelationsConfig']
                 : never,
-        Type extends TypeParam<Types> = Param extends [unknown]
-          ? [
-              ObjectRef<
+        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+        Type extends TypeParam<Types> = Param extends DrizzleRef<any> | [DrizzleRef<any>]
+          ? Param
+          : Param extends [unknown]
+            ? [
+                ObjectRef<
+                  Types,
+                  BuildQueryResult<
+                    Types['DrizzleRelationsConfig'],
+                    Types['DrizzleRelationsConfig'][Table],
+                    true
+                  >
+                >,
+              ]
+            : ObjectRef<
                 Types,
                 BuildQueryResult<
-                  Types['DrizzleRelationSchema'],
-                  Types['DrizzleRelationSchema'][Table],
+                  Types['DrizzleRelationsConfig'],
+                  Types['DrizzleRelationsConfig'][Table],
                   true
                 >
               >,
-            ]
-          : ObjectRef<
-              Types,
-              BuildQueryResult<
-                Types['DrizzleRelationSchema'],
-                Types['DrizzleRelationSchema'][Table],
-                true
-              >
-            >,
       >(
         options: DrizzleFieldOptions<
           Types,
@@ -342,21 +333,24 @@ declare global {
           Param
         >,
       ) => FieldRef<Types, ShapeFromTypeParam<Types, Type, Nullable>>;
-
       drizzleConnection: 'relay' extends PluginName
         ? <
             Type extends // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-              | DrizzleRef<any, keyof Types['DrizzleRelationSchema']>
-              | keyof Types['DrizzleRelationSchema'],
+              | DrizzleRef<any, keyof Types['DrizzleRelationsConfig']>
+              | keyof Types['DrizzleRelationsConfig'],
             Nullable extends boolean,
             ResolveReturnShape,
             Args extends InputFieldMap = {},
-            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            Shape = Type extends DrizzleRef<any, keyof Types['DrizzleRelationSchema'], infer S>
+            Shape = Type extends DrizzleRef<
+              // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+              any,
+              keyof Types['DrizzleRelationsConfig'],
+              infer S
+            >
               ? S
               : BuildQueryResult<
-                  Types['DrizzleRelationSchema'],
-                  Types['DrizzleRelationSchema'][Type & keyof Types['DrizzleRelationSchema']],
+                  Types['DrizzleRelationsConfig'],
+                  Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
                   true
                 >,
             const ConnectionInterfaces extends InterfaceParam<Types>[] = [],
@@ -367,9 +361,9 @@ declare global {
               ParentShape,
               Type,
               // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-              Types['DrizzleRelationSchema'][Type extends DrizzleRef<any, infer K>
+              Types['DrizzleRelationsConfig'][Type extends DrizzleRef<any, infer K>
                 ? K
-                : Type & keyof Types['DrizzleRelationSchema']],
+                : Type & keyof Types['DrizzleRelationsConfig']],
               ObjectRef<Types, Shape>,
               Nullable,
               Args,
@@ -411,12 +405,11 @@ declare global {
             >
           ) => FieldRef<Types, ShapeFromConnection<ConnectionShapeHelper<Types, Shape, Nullable>>>
         : '@pothos/plugin-relay is required to use this method';
-
       drizzleFieldWithInput: 'withInput' extends PluginName
         ? <
             Param extends
-              | keyof Types['DrizzleRelationSchema']
-              | [keyof Types['DrizzleRelationSchema']]
+              | keyof Types['DrizzleRelationsConfig']
+              | [keyof Types['DrizzleRelationsConfig']]
               // biome-ignore lint/suspicious/noExplicitAny: <explanation>
               | DrizzleRef<any>
               // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -429,22 +422,22 @@ declare global {
             Args extends InputFieldMap = {},
             InputName extends string = 'input',
             Table extends
-              keyof Types['DrizzleRelationSchema'] = Param extends keyof Types['DrizzleRelationSchema']
+              keyof Types['DrizzleRelationsConfig'] = Param extends keyof Types['DrizzleRelationsConfig']
               ? Param
-              : Param extends [keyof Types['DrizzleRelationSchema']]
+              : Param extends [keyof Types['DrizzleRelationsConfig']]
                 ? Param[0]
                 : // biome-ignore lint/suspicious/noExplicitAny: <explanation>
                   Param extends DrizzleRef<any, infer T>
-                  ? T & keyof Types['DrizzleRelationSchema']
+                  ? T & keyof Types['DrizzleRelationsConfig']
                   : // biome-ignore lint/suspicious/noExplicitAny: <explanation>
                     Param extends [DrizzleRef<any, infer T>]
-                    ? T & keyof Types['DrizzleRelationSchema']
+                    ? T & keyof Types['DrizzleRelationsConfig']
                     : never,
             Type extends TypeParam<Types> = ObjectRef<
               Types,
               BuildQueryResult<
-                Types['DrizzleRelationSchema'],
-                Types['DrizzleRelationSchema'][Table],
+                Types['DrizzleRelationsConfig'],
+                Types['DrizzleRelationsConfig'][Table],
                 true
               >
             >,

package/src/index.ts

@@ -3,85 +3,118 @@ import './field-builder';
 import './schema-builder';
 import SchemaBuilder, {
   BasePlugin,
-  createInputValueMapper,
   type InputTypeFieldsMapping,
-  mapInputFields,
   type PothosOutputFieldConfig,
+  PothosSchemaError,
+  type PothosTypeConfig,
   type SchemaTypes,
 } from '@pothos/core';
 import type { GraphQLFieldResolver } from 'graphql';
 import type { ModelLoader } from './model-loader';
 import type { DrizzleGraphQLInputExtensions } from './types';
-import {
-  extractFilters,
-  extractOrderBy,
-  remapFromGraphQLSingleInput,
-} from './utils/drizzle-graphql';
 import { getLoaderMapping, setLoaderMappings } from './utils/loader-map';
 export { drizzleClientCache } from './utils/config';
+export { drizzleConnectionHelpers } from './connection-helpers';
 
 export * from './types';
 
+export { drizzleTableName } from './types';
+
 const pluginName = 'drizzle';
 
 export default pluginName;
 
 export class PothosDrizzlePlugin<Types extends SchemaTypes> extends BasePlugin<Types> {
-  private mappingCache = new Map<
-    string,
-    InputTypeFieldsMapping<Types, DrizzleGraphQLInputExtensions>
-  >();
-  override onOutputFieldConfig(
-    fieldConfig: PothosOutputFieldConfig<Types>,
-  ): PothosOutputFieldConfig<Types> | null {
-    const argMappings = mapInputFields<Types, DrizzleGraphQLInputExtensions>(
-      fieldConfig.args,
-      this.buildCache,
-      (inputField) => {
-        if (inputField.type.kind === 'InputObject') {
-          const config = this.buildCache.getTypeConfig(inputField.type.ref);
-
-          return (config.extensions?.drizzleGraphQL as DrizzleGraphQLInputExtensions) ?? null;
-        }
-
-        return null;
-      },
-      this.mappingCache,
-    );
+  // private mappingCache = new Map<
+  //   string,
+  //   InputTypeFieldsMapping<Types, DrizzleGraphQLInputExtensions>
+  // >();
+  override onTypeConfig(typeConfig: PothosTypeConfig): PothosTypeConfig {
+    if (typeConfig.kind !== 'Object' && typeConfig.kind !== 'Interface') {
+      return typeConfig;
+    }
 
-    const argMapper = argMappings
-      ? createInputValueMapper(argMappings, (input, mappings) => {
-          if (!mappings.value) {
-            return input;
-          }
+    let model = typeConfig.extensions?.pothosDrizzleModel as string | undefined;
 
-          const { table, tableConfig, inputType } = mappings.value;
+    for (const iface of typeConfig.interfaces) {
+      const interfaceModel = this.buildCache.getTypeConfig(iface, 'Interface').extensions
+        ?.pothosDrizzleModel as string | undefined;
 
-          switch (inputType) {
-            case 'orderBy':
-              return extractOrderBy(tableConfig, input as never);
-            case 'filters':
-              return extractFilters(tableConfig, table, input as never);
-            case 'insert':
-              return remapFromGraphQLSingleInput(input as never, tableConfig);
-            case 'update':
-              return remapFromGraphQLSingleInput(input as never, tableConfig);
+      if (interfaceModel) {
+        if (model && model !== interfaceModel) {
+          throw new PothosSchemaError(
+            `DrizzleObjects must be based on the same prisma model as any DrizzleInterfaces they extend. ${typeConfig.name} uses ${model} and ${iface.name} uses ${interfaceModel}`,
+          );
+        }
 
-            default:
-              throw new Error(`Unknown drizzle input type: ${inputType}`);
-          }
-        })
-      : null;
+        model = interfaceModel;
+      }
+    }
 
-    const argMappers: typeof fieldConfig.argMappers = argMapper
-      ? [...(fieldConfig.argMappers ?? []), (args) => argMapper(args, undefined)]
-      : fieldConfig.argMappers;
+    return {
+      ...typeConfig,
+      extensions: {
+        ...typeConfig.extensions,
+        pothosDrizzleModel: model,
+      },
+    };
+  }
 
-    if (fieldConfig.kind === 'DrizzleObject' && fieldConfig.pothosOptions.select) {
+  override onOutputFieldConfig(
+    fieldConfig: PothosOutputFieldConfig<Types>,
+  ): PothosOutputFieldConfig<Types> | null {
+    // const argMappings = mapInputFields<Types, DrizzleGraphQLInputExtensions>(
+    //   fieldConfig.args,
+    //   this.buildCache,
+    //   (inputField) => {
+    //     if (inputField.type.kind === 'InputObject') {
+    //       const config = this.buildCache.getTypeConfig(inputField.type.ref);
+
+    //       return (config.extensions?.drizzleGraphQL as DrizzleGraphQLInputExtensions) ?? null;
+    //     }
+
+    //     return null;
+    //   },
+    //   this.mappingCache,
+    // );
+
+    // const argMapper = argMappings
+    //   ? createInputValueMapper(argMappings, (input, mappings) => {
+    //       if (!mappings.value) {
+    //         return input;
+    //       }
+
+    //       const { table, tableConfig, inputType } = mappings.value;
+
+    //       switch (inputType) {
+    //         case 'orderBy':
+    //           return extractOrderBy(tableConfig, input as never);
+    //         case 'filters':
+    //           return extractFilters(tableConfig, table, input as never);
+    //         case 'insert':
+    //           return remapFromGraphQLSingleInput(input as never, tableConfig);
+    //         case 'update':
+    //           return remapFromGraphQLSingleInput(input as never, tableConfig);
+
+    //         default:
+    //           throw new Error(`Unknown drizzle input type: ${inputType}`);
+    //       }
+    //     })
+    //   : null;
+
+    // const argMappers: typeof fieldConfig.argMappers = argMapper
+    //   ? [...(fieldConfig.argMappers ?? []), (args) => argMapper(args, undefined)]
+    //   : fieldConfig.argMappers;
+
+    if (
+      fieldConfig.kind === 'DrizzleObject' &&
+      fieldConfig.pothosOptions.select &&
+      !fieldConfig.extensions?.pothosDrizzleSelect
+    ) {
       const { select } = fieldConfig.pothosOptions;
       return {
         ...fieldConfig,
-        argMappers,
+        // argMappers,
         extensions: {
           ...fieldConfig.extensions,
           pothosDrizzleSelect:
@@ -90,13 +123,12 @@ export class PothosDrizzlePlugin<Types extends SchemaTypes> extends BasePlugin<T
                   args: {},
                   ctx: Types['Context'],
                   nestedQuery: (query: unknown, path?: string[]) => never,
-                ) => ({
-                  select: (select as (args: unknown, ctx: unknown, nestedQuery: unknown) => {})(
+                ) =>
+                  (select as (args: unknown, ctx: unknown, nestedQuery: unknown) => {})(
                     args,
                     ctx,
                     nestedQuery,
-                  ),
-                })
+                  )
               : select,
         },
       };
@@ -104,7 +136,7 @@ export class PothosDrizzlePlugin<Types extends SchemaTypes> extends BasePlugin<T
 
     return {
       ...fieldConfig,
-      argMappers,
+      // argMappers,
     };
   }
 
@@ -155,16 +187,6 @@ export class PothosDrizzlePlugin<Types extends SchemaTypes> extends BasePlugin<T
         return resolver(parent, args, context, info);
       }
 
-      const primaryKeys = (
-        parentConfig.extensions!.pothosDrizzleTable as { primaryKey?: { name: string }[] }
-      ).primaryKey;
-
-      if (!primaryKeys || primaryKeys.length === 0) {
-        throw new Error(
-          `Field ${fieldConfig.name} not resolved in initial query and no primary key found for type ${parentConfig.name}`,
-        );
-      }
-
       return modelLoader(context)
         .loadSelection(info, parent as object)
         .then((result) => resolver(result, args, context, info));