@pothos/plugin-prisma 3.63.1 → 3.65.0

package/src/index.ts

@@ -95,7 +95,7 @@ export class PrismaPlugin<Types extends SchemaTypes> extends BasePlugin<Types> {
               ? (
                   args: {},
                   ctx: Types['Context'],
-                  nestedQuery: (query: unknown, path?: string[]) => never,
+                  nestedQuery: (query: unknown, path?: string[], type?: string) => never,
                 ) => ({
                   select: (select as (args: unknown, ctx: unknown, nestedQuery: unknown) => {})(
                     args,

package/src/prisma-field-builder.ts

@@ -197,8 +197,8 @@ export class PrismaObjectFieldBuilder<
     this: PrismaObjectFieldBuilder<SchemaTypes, Model, boolean>,
     name: string,
     {
-      maxSize,
-      defaultSize,
+      maxSize = this.builder.options.prisma.maxConnectionSize,
+      defaultSize = this.builder.options.prisma.defaultConnectionSize,
       cursor: cursorValue,
       query,
       resolve,

package/src/types.ts

@@ -52,6 +52,7 @@ export interface PrismaModelTypes {
     {
       Shape: unknown;
       Name: string;
+      Nullable: boolean;
       // Types: PrismaModelTypes;
     }
   >;
@@ -99,6 +100,7 @@ export type PrismaObjectFieldOptions<
           nestedSelection: <Selection extends boolean | {}>(
             selection?: Selection,
             path?: string[],
+            type?: string,
           ) => Selection,
         ) => ExtractModel<Types, ParentShape>['Select'])
     );
@@ -169,7 +171,9 @@ type RelationShapeFromInclude<
     : never]: K extends keyof Model['Relations']
     ? Model['Relations'][K]['Shape'] extends unknown[]
       ? ShapeFromSelection<Types, TypesForRelation<Types, Model, K>, Include[K]>[]
-      : ShapeFromSelection<Types, TypesForRelation<Types, Model, K>, Include[K]>
+      : Model['Relations'][K]['Nullable'] extends true
+        ? ShapeFromSelection<Types, TypesForRelation<Types, Model, K>, Include[K]> | null
+        : ShapeFromSelection<Types, TypesForRelation<Types, Model, K>, Include[K]>
     : unknown;
 }>;
 
@@ -794,6 +798,7 @@ export type FieldSelection =
       mergeNestedSelection: (
         selection: SelectionMap | boolean | ((args: object, context: object) => SelectionMap),
         path?: IndirectInclude | string[],
+        type?: string,
       ) => SelectionMap | boolean,
       resolveSelection: (path: string[]) => FieldNode | null,
     ) => SelectionMap);

package/src/util/map-query.ts

@@ -301,12 +301,16 @@ function addFieldSelection(
     fieldSelectionMap = fieldSelect(
       args,
       context,
-      (rawQuery, indirectInclude) => {
+      (rawQuery, indirectInclude, expectedType) => {
         const returnType = getNamedType(field.type);
         const query = typeof rawQuery === 'function' ? rawQuery(args, context) : rawQuery;
 
         const normalizedIndirectInclude = Array.isArray(indirectInclude)
-          ? normalizeInclude(indirectInclude, getIndirectType(returnType, info))
+          ? normalizeInclude(
+              indirectInclude,
+              getIndirectType(returnType, info),
+              expectedType ? getNamedType(info.schema.getType(expectedType)) : undefined,
+            )
           : indirectInclude;
 
         const fieldState = createStateForType(
@@ -333,7 +337,8 @@ function addFieldSelection(
             info,
             selection,
             (returnType.extensions?.pothosPrismaIndirectInclude as { path: [] })?.path ?? [],
-            normalizedIndirectInclude.paths ?? [normalizedIndirectInclude.path!],
+            normalizedIndirectInclude?.paths ??
+              (normalizedIndirectInclude?.path ? [normalizedIndirectInclude.path] : []),
             [],
             (resolvedType, resolvedField, path) => {
               addTypeSelectionsForField(
@@ -346,6 +351,11 @@ function addFieldSelection(
               );
             },
           );
+        } else if (normalizedIndirectInclude) {
+          const targetType = info.schema.getType(normalizedIndirectInclude.getType())!;
+          if (targetType !== returnType) {
+            addTypeSelectionsForField(targetType, context, info, fieldState, selection, []);
+          }
         }
 
         addTypeSelectionsForField(returnType, context, info, fieldState, selection, []);
@@ -530,8 +540,12 @@ export function getIndirectType(type: GraphQLNamedType, info: GraphQLResolveInfo
   return targetType;
 }
 
-function normalizeInclude(path: string[], type: GraphQLNamedType): IndirectInclude {
-  let currentType = type;
+function normalizeInclude(
+  path: string[],
+  type: GraphQLNamedType,
+  expectedType?: GraphQLNamedType,
+): IndirectInclude {
+  let currentType = path.length > 0 ? type : expectedType ?? type;
 
   const normalized: { name: string; type: string }[] = [];
 
@@ -556,7 +570,9 @@ function normalizeInclude(path: string[], type: GraphQLNamedType): IndirectInclu
   }
 
   return {
-    getType: () => (normalized.length > 0 ? normalized[normalized.length - 1].type : type.name),
+    getType: () =>
+      expectedType?.name ??
+      (normalized.length > 0 ? normalized[normalized.length - 1].type : type.name),
     path: normalized,
   };
 }