@pothos/plugin-drizzle 0.11.0 → 0.11.2

package/src/schema-builder.ts

@@ -37,7 +37,8 @@ schemaBuilderProto.drizzleObject = function drizzleObject(table, { select, field
       ...options.extensions,
       pothosDrizzleModel: table,
       pothosDrizzleTable: getSchemaConfig(this).relations.tablesConfig[table],
-      pothosDrizzleSelect: select ?? true,
+      pothosDrizzleSelect:
+        typeof select === 'object' ? { columns: {}, ...select } : (select ?? true),
       pothosDrizzleLoader: ModelLoader.forModel(table, this),
     },
     name,
@@ -65,7 +66,8 @@ schemaBuilderProto.drizzleInterface = function drizzleInterface(
       ...options.extensions,
       pothosDrizzleModel: table,
       pothosDrizzleTable: getSchemaConfig(this).relations.tablesConfig[table],
-      pothosDrizzleSelect: select ?? true,
+      pothosDrizzleSelect:
+        typeof select === 'object' ? { columns: {}, ...select } : (select ?? true),
       pothosDrizzleLoader: ModelLoader.forModel(table, this),
     },
     name,

package/src/types.ts

@@ -1,5 +1,6 @@
 import {
   type ArgumentRef,
+  type DistributeOmit,
   type FieldKind,
   type FieldMap,
   type FieldNullability,
@@ -209,7 +210,7 @@ export type DrizzleFieldOptions<
     ResolveShape,
     ResolveReturnShape
   >,
-  'resolve' | 'type'
+  'type' | InferredFieldOptionKeys
 > & {
   type: Param;
   resolve: (
@@ -235,7 +236,7 @@ export type DrizzleFieldWithInputOptions<
   InputName extends string,
   Fields extends InputFieldMap,
   ArgRequired extends boolean,
-> = Omit<
+> = DistributeOmit<
   DrizzleFieldOptions<
     Types,
     ParentShape,
@@ -272,8 +273,11 @@ export type DrizzleObjectFieldOptions<
         : BuildQueryResult<
             Types['DrizzleRelationsConfig'],
             ExtractTable<Types, ParentShape>,
-            // biome-ignore lint/suspicious/noExplicitAny: this is fine
-            Record<string, unknown> & (Select extends (...args: any[]) => infer R ? R : Select)
+            Record<string, unknown> &
+              // biome-ignore lint/suspicious/noExplicitAny: this is fine
+              Select extends (...args: any[]) => infer R
+              ? R & { columns: {} }
+              : Select & { columns: {} }
           > &
             ParentShape,
       typeof drizzleTableName
@@ -357,7 +361,7 @@ export type RelatedFieldOptions<
     },
     ResolveReturnShape
   >,
-  'description' | 'resolve' | 'select' | 'type'
+  'description' | 'select' | 'type' | InferredFieldOptionKeys
 > & {
   description?: string | false;
   // biome-ignore lint/suspicious/noExplicitAny: this is fine
@@ -400,7 +404,9 @@ export type VariantFieldOptions<
                 ExtractTable<Types, Shape>,
                 Record<string, unknown> &
                   // biome-ignore lint/suspicious/noExplicitAny: this is fine
-                  (ResolveShape extends (...args: any[]) => infer R ? R : ResolveShape)
+                  ResolveShape extends (...args: any[]) => infer R
+                  ? R & { columns: {} }
+                  : ResolveShape & { columns: {} }
               > &
                 Shape,
           typeof drizzleTableName
@@ -516,7 +522,7 @@ export type DrizzleConnectionFieldOptions<
     ParentShape,
     ResolveReturnShape
   >,
-  'args' | 'resolve' | 'type'
+  'args' | 'type' | InferredFieldOptionKeys
 > &
   Omit<
     PothosSchemaTypes.ConnectionFieldOptions<
@@ -529,7 +535,7 @@ export type DrizzleConnectionFieldOptions<
       Args,
       ResolveReturnShape
     >,
-    'resolve' | 'type'
+    'type' | InferredFieldOptionKeys
   > &
   (InputShapeFromFields<Args> &
     PothosSchemaTypes.DefaultConnectionArguments extends infer ConnectionArgs
@@ -577,7 +583,7 @@ export type RelatedConnectionOptions<
       (InputFieldMap extends Args ? {} : Args),
     unknown
   >,
-  'args' | 'resolve' | 'type'
+  'args' | 'type' | InferredFieldOptionKeys
 > &
   Omit<
     PothosSchemaTypes.ConnectionFieldOptions<
@@ -590,7 +596,7 @@ export type RelatedConnectionOptions<
       Args,
       unknown
     >,
-    'resolve' | 'type'
+    'type' | InferredFieldOptionKeys
   > &
   (InputShapeFromFields<Args> &
     PothosSchemaTypes.DefaultConnectionArguments extends infer ConnectionArgs

package/src/utils/selections.ts

@@ -126,7 +126,7 @@ export function mergeSelection(
     extras,
     columns,
     ...query
-  } = typeof selection === 'boolean' ? {} : selection;
+  } = typeof selection === 'boolean' ? (selection === true ? {} : { columns: {} }) : selection;
   if (withSelection) {
     for (const [key, value] of Object.entries(withSelection)) {
       const relation = state.table.relations[key];
@@ -155,11 +155,11 @@ export function mergeSelection(
     return;
   }
 
-  if (columns) {
+  if (columns && !state.allColumns) {
     for (const key of Object.keys(columns)) {
       state.columns.add(key);
     }
-  } else if (selection === true) {
+  } else {
     state.allColumns = true;
   }