@pothos/plugin-drizzle 0.10.1 → 0.10.3

package/src/field-builder.ts

@@ -152,6 +152,7 @@ fieldBuilderProto.drizzleConnection = function drizzleConnection<
             return resolve(q as never, parent, args as never, context, info) as never;
             // );
           },
+          parent,
         );
       },
     },

package/src/global-types.ts

@@ -194,7 +194,7 @@ declare global {
 
       drizzleInterfaceFields: <
         Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationsConfig'],
-        TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
+        TableConfig extends TableRelationalConfig = Type extends DrizzleInterfaceRef<Types>
           ? Type[typeof drizzleTableKey]
           : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
         Shape extends {} = Type extends DrizzleInterfaceRef<

package/src/schema-builder.ts

@@ -27,10 +27,10 @@ schemaBuilderProto.drizzleObject = function drizzleObject(table, { select, field
   const name = options.variant ?? options.name ?? table;
 
   const ref = options.variant
-    ? new DrizzleObjectRef(options.variant, name)
+    ? new DrizzleObjectRef(options.variant, table)
     : (getRefFromModel(table, this, 'object') as ObjectRef<SchemaTypes, unknown>);
 
-  ref.name = name ?? table;
+  ref.name = name;
 
   this.objectType(ref, {
     ...(options as {}),
@@ -52,9 +52,13 @@ schemaBuilderProto.drizzleInterface = function drizzleInterface(
   table,
   { select, fields, ...options },
 ) {
-  const name = options.name ?? table;
+  const name = options.variant ?? options.name ?? table;
+
+  const ref = options.variant
+    ? new DrizzleInterfaceRef(options.variant, table)
+    : (getRefFromModel(table, this, 'interface') as InterfaceRef<SchemaTypes, unknown>);
 
-  const ref = new DrizzleInterfaceRef(name, table);
+  ref.name = name;
 
   this.interfaceType(ref, {
     ...(options as {}),

package/src/types.ts

@@ -113,14 +113,9 @@ export type DrizzleInterfaceOptions<
   Shape,
   Selection,
   Interfaces extends InterfaceParam<Types>[],
-> = Omit<
-  InterfaceTypeOptions<Types, InterfaceRef<Types, Shape>, Shape, Interfaces> & {
-    name: string;
-    select?: Selection;
-  },
-  'fields'
-> &
+> = Omit<InterfaceTypeOptions<Types, InterfaceRef<Types, Shape>, Shape, Interfaces>, 'fields'> &
   NameOrVariant & {
+    select?: Selection;
     fields?: (
       t: DrizzleObjectFieldBuilder<
         Types,

package/src/utils/cursors.ts

@@ -513,6 +513,7 @@ export async function resolveDrizzleCursorConnection<T extends {}>(
   resolve: (
     queryFn: (query: QueryForDrizzleConnection<SchemaTypes, TableRelationalConfig>) => SelectionMap,
   ) => MaybePromise<readonly T[]>,
+  parent: unknown,
 ) {
   const table = config.relations.tablesConfig[tableName];
   let query: DBQueryConfig<'many'>;
@@ -557,5 +558,12 @@ export async function resolveDrizzleCursorConnection<T extends {}>(
     return results;
   }
 
-  return wrapConnectionResult(results, options.args, query!.limit as number, formatter!);
+  return wrapConnectionResult(
+    results,
+    options.args,
+    query!.limit as number,
+    formatter!,
+    undefined,
+    parent,
+  );
 }

package/src/utils/refs.ts

@@ -1,4 +1,4 @@
-import type { SchemaTypes } from '@pothos/core';
+import { PothosSchemaError, type SchemaTypes } from '@pothos/core';
 import { DrizzleInterfaceRef, type DrizzleRef } from '../interface-ref';
 import { DrizzleObjectRef } from '../object-ref';
 
@@ -21,5 +21,16 @@ export function getRefFromModel<Types extends SchemaTypes>(
     );
   }
 
-  return cache.get(name)! as never;
+  const ref = cache.get(name) as unknown as DrizzleRef<Types>;
+
+  if (
+    (type === 'interface' && !(ref instanceof DrizzleInterfaceRef)) ||
+    (type === 'object' && !(ref instanceof DrizzleObjectRef))
+  ) {
+    throw new PothosSchemaError(
+      `Drizzle table ${name} was created as both an object and interface.  Use 'variant' instead of 'name' in one of the implementations`,
+    );
+  }
+
+  return ref;
 }