@pothos/plugin-prisma 3.47.3 → 3.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-prisma",
-  "version": "3.47.3",
+  "version": "3.48.0",
   "description": "A Pothos plugin for more efficient integration with prisma",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -72,7 +72,7 @@
     "@pothos/core": "3.30.0",
     "@pothos/plugin-complexity": "3.12.1",
     "@pothos/plugin-errors": "3.11.1",
-    "@pothos/plugin-relay": "3.41.1",
+    "@pothos/plugin-relay": "3.42.0",
     "@pothos/plugin-simple-objects": "3.6.8",
     "@pothos/test-utils": "1.4.8"
   },

package/src/connection-helpers.ts

@@ -51,12 +51,14 @@ export function prismaConnectionHelpers<
   const cursorSelection = ModelLoader.getCursorSelection(ref, modelName, options.cursor, builder);
   const fieldMap = getRelationMap(getDMMF(builder)).get(modelName)!;
 
-  function resolve(
+  function resolve<Parent = unknown>(
     list: (EdgeShape & {})[],
     args: PothosSchemaTypes.DefaultConnectionArguments,
     ctx: Types['Context'],
+    parent?: Parent,
   ) {
     return wrapConnectionResult(
+      parent,
       list,
       args,
       getQueryArgs(args, ctx).take,

package/src/field-builder.ts

@@ -119,6 +119,7 @@ fieldBuilderProto.prismaConnection = function prismaConnection<
       ) =>
         resolvePrismaCursorConnection(
           {
+            parent,
             query: queryFromInfo({
               context,
               info,

package/src/global-types.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-empty-interface */
+import { A } from 'vitest/dist/types-fafda418';
 import {
   FieldKind,
   FieldMap,
@@ -7,6 +8,7 @@ import {
   FieldRef,
   InputFieldMap,
   InputFieldRef,
+  InputShapeFromFields,
   InterfaceParam,
   NormalizeArgs,
   OutputType,
@@ -21,6 +23,7 @@ import { PrismaObjectFieldBuilder as InternalPrismaObjectFieldBuilder } from './
 import {
   PrismaClient,
   PrismaConnectionFieldOptions,
+  PrismaConnectionShape,
   PrismaFieldOptions,
   PrismaFieldWithInputOptions,
   prismaModelName,
@@ -260,7 +263,7 @@ declare global {
                       ObjectRef<Shape>,
                       false,
                       false,
-                      ResolveReturnShape,
+                      PrismaConnectionShape<Types, Shape, ParentShape, Args>,
                       ConnectionInterfaces
                     >
                   | ObjectRef<ShapeFromConnection<ConnectionShapeHelper<Types, Shape, false>>>,
@@ -269,7 +272,7 @@ declare global {
                       Types,
                       ObjectRef<Shape>,
                       false,
-                      ResolveReturnShape,
+                      PrismaConnectionShape<Types, Shape, ParentShape, Args>,
                       EdgeInterfaces
                     >
                   | ObjectRef<{

package/src/prisma-field-builder.ts

@@ -20,6 +20,7 @@ import {
 import { ModelLoader } from './model-loader';
 import { PrismaObjectRef } from './object-ref';
 import {
+  PrismaConnectionShape,
   PrismaModelTypes,
   RelatedConnectionOptions,
   RelatedFieldOptions,
@@ -107,7 +108,6 @@ export class PrismaObjectFieldBuilder<
         Field extends Model['ListRelations'],
         Nullable extends boolean,
         Args extends InputFieldMap,
-        ResolveReturnShape,
         ConnectionInterfaces extends InterfaceParam<Types>[] = [],
         EdgeInterfaces extends InterfaceParam<Types>[] = [],
       >(
@@ -118,10 +118,25 @@ export class PrismaObjectFieldBuilder<
             connectionOptions:
               | PothosSchemaTypes.ConnectionObjectOptions<
                   Types,
-                  ObjectRef<Shape>,
+                  ObjectRef<
+                    ShapeFromTypeParam<
+                      Types,
+                      [ObjectRef<Model['Relations'][Field & keyof Model['Relations']]['Shape']>],
+                      Nullable
+                    >
+                  >,
                   false,
                   false,
-                  ResolveReturnShape,
+                  PrismaConnectionShape<
+                    Types,
+                    ShapeFromTypeParam<
+                      Types,
+                      [ObjectRef<Model['Relations'][Field & keyof Model['Relations']]['Shape']>],
+                      Nullable
+                    >,
+                    Shape,
+                    Args
+                  >,
                   ConnectionInterfaces
                 >
               | ObjectRef<
@@ -130,9 +145,24 @@ export class PrismaObjectFieldBuilder<
             edgeOptions:
               | PothosSchemaTypes.ConnectionEdgeObjectOptions<
                   Types,
-                  ObjectRef<Shape>,
+                  ObjectRef<
+                    ShapeFromTypeParam<
+                      Types,
+                      [ObjectRef<Model['Relations'][Field & keyof Model['Relations']]['Shape']>],
+                      Nullable
+                    >
+                  >,
                   false,
-                  ResolveReturnShape,
+                  PrismaConnectionShape<
+                    Types,
+                    ShapeFromTypeParam<
+                      Types,
+                      [ObjectRef<Model['Relations'][Field & keyof Model['Relations']]['Shape']>],
+                      Nullable
+                    >,
+                    Shape,
+                    Args
+                  >,
                   EdgeInterfaces
                 >
               | ObjectRef<{
@@ -289,7 +319,7 @@ export class PrismaObjectFieldBuilder<
                   context,
                   info,
                 ),
-              ).then((result) => wrapConnectionResult(result, args, q.take, formatCursor))),
+              ).then((result) => wrapConnectionResult(parent, result, args, q.take, formatCursor))),
         },
         type: ref,
         resolve: (
@@ -300,6 +330,7 @@ export class PrismaObjectFieldBuilder<
           const connectionQuery = getQuery(args, context);
 
           return wrapConnectionResult(
+            parent,
             (parent as Record<string, never>)[name],
             args,
             connectionQuery.take,

package/src/types.ts

@@ -752,6 +752,24 @@ export interface IndirectInclude {
 
 export type ShapeFromConnection<T> = T extends { shape: unknown } ? T['shape'] : never;
 
+export type PrismaConnectionShape<
+  Types extends SchemaTypes,
+  T,
+  Parent,
+  Args extends InputFieldMap,
+> = (
+  ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, T, false>> extends infer Shape
+    ? Shape & {
+        parent: Parent;
+        args: InputShapeFromFields<Args> & PothosSchemaTypes.DefaultConnectionArguments;
+      }
+    : never
+) extends infer C
+  ? [C] extends [{ edges: MaybePromise<readonly (infer Edge)[]> }]
+    ? Omit<C, 'edges'> & { edges: MaybePromise<(Edge & { connection: C })[]> }
+    : C
+  : never;
+
 export type UniqueFieldsExtendedWhereUnique<T> = NonNullable<
   T extends infer O
     ? {

package/src/util/cursors.ts

@@ -215,6 +215,7 @@ export interface PrismaCursorConnectionQueryOptions {
 }
 
 interface ResolvePrismaCursorConnectionOptions extends PrismaCursorConnectionQueryOptions {
+  parent?: unknown;
   query: {};
   totalCount?: number | (() => MaybePromise<number>);
 }
@@ -275,6 +276,7 @@ export function prismaCursorConnectionQuery({
 }
 
 export function wrapConnectionResult<T extends {}>(
+  parent: unknown,
   results: readonly T[],
   args: PothosSchemaTypes.DefaultConnectionArguments,
   take: number,
@@ -289,31 +291,41 @@ export function wrapConnectionResult<T extends {}>(
     ? results.slice(take < 0 ? 1 : 0, take < 0 ? results.length : -1)
     : results;
 
+  const connection = {
+    parent,
+    args,
+    totalCount,
+    edges: [] as ({ cursor: string; node: unknown } | null)[],
+    pageInfo: {
+      startCursor: null as string | null,
+      endCursor: null as string | null,
+      hasPreviousPage,
+      hasNextPage,
+    },
+  };
+
   const edges = nodes.map((value, index) =>
     value == null
       ? null
       : resolveNode
       ? {
+          connection,
           ...value,
           cursor: cursor(value),
           node: resolveNode(value),
         }
       : {
+          connection,
           cursor: cursor(value),
           node: value,
         },
   );
 
-  return {
-    totalCount,
-    edges,
-    pageInfo: {
-      startCursor: edges[0]?.cursor,
-      endCursor: edges[edges.length - 1]?.cursor,
-      hasPreviousPage,
-      hasNextPage,
-    },
-  };
+  connection.edges = edges;
+  connection.pageInfo.startCursor = edges[0]?.cursor ?? null;
+  connection.pageInfo.endCursor = edges[edges.length - 1]?.cursor ?? null;
+
+  return connection;
 }
 
 export async function resolvePrismaCursorConnection<T extends {}>(
@@ -336,7 +348,14 @@ export async function resolvePrismaCursorConnection<T extends {}>(
     return results;
   }
 
-  return wrapConnectionResult(results, options.args, query.take, cursor, options.totalCount);
+  return wrapConnectionResult(
+    options.parent,
+    results,
+    options.args,
+    query.take,
+    cursor,
+    options.totalCount,
+  );
 }
 
 export function getCursorFormatter<Types extends SchemaTypes>(