@pothos/plugin-prisma 3.59.0 → 3.59.2

package/src/model-loader.ts

@@ -25,15 +25,22 @@ interface ResolvablePromise<T> {
 }
 export class ModelLoader {
   context: object;
+
   builder: PothosSchemaTypes.SchemaBuilder<never>;
+
   findUnique: (model: Record<string, unknown>, ctx: {}) => unknown;
+
   modelName: string;
+
   queryCache = new Map<string, { selection: SelectionState; query: SelectionMap }>();
+
   staged = new Set<{
     state: SelectionState;
     models: Map<object, ResolvablePromise<Record<string, unknown> | null>>;
   }>();
+
   delegate: PrismaDelegate;
+
   tick = Promise.resolve();
 
   constructor(
@@ -53,7 +60,7 @@ export class ModelLoader {
   }
 
   static forRef<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     findUnique: ((model: Record<string, unknown>, ctx: {}) => unknown) | undefined,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
@@ -75,11 +82,11 @@ export class ModelLoader {
 
   static getFindUnique(
     findBy:
+      | string
       | {
           name: string | null;
           fields: string[];
-        }
-      | string,
+        },
   ): (model: Record<string, unknown>) => {} {
     if (typeof findBy === 'string') {
       return (parent) => ({ [findBy]: parent[findBy] });
@@ -99,7 +106,7 @@ export class ModelLoader {
   }
 
   static getDefaultFindBy<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
   ) {
@@ -111,11 +118,11 @@ export class ModelLoader {
     );
 
     let findBy:
+      | string
       | {
           name: string | null;
           fields: string[];
         }
-      | string
       | undefined;
 
     if (model.primaryKey) {
@@ -136,7 +143,7 @@ export class ModelLoader {
   }
 
   static getDefaultFindUnique<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
   ): (model: Record<string, unknown>) => {} {
@@ -146,7 +153,7 @@ export class ModelLoader {
   }
 
   static getDefaultIDSelection<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
   ): Record<string, boolean> {
@@ -166,7 +173,7 @@ export class ModelLoader {
   }
 
   static getCursorSelection<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     cursor: string,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
@@ -195,7 +202,7 @@ export class ModelLoader {
   }
 
   static getFindUniqueForField<Types extends SchemaTypes>(
-    ref: ObjectRef<unknown> | InterfaceRef<unknown>,
+    ref: InterfaceRef<unknown> | ObjectRef<unknown>,
     modelName: string,
     fieldName: string,
     builder: PothosSchemaTypes.SchemaBuilder<Types>,
@@ -207,11 +214,11 @@ export class ModelLoader {
     );
 
     let findBy:
+      | string
       | {
           name: string | null;
           fields: string[];
         }
-      | string
       | undefined;
 
     if (model.fields.some((field) => field.name === fieldName)) {

package/src/object-ref.ts

@@ -5,7 +5,9 @@ export const prismaModelKey = Symbol.for('Pothos.prismaModelKey');
 
 export class PrismaObjectRef<Model extends PrismaModelTypes, T = {}> extends ObjectRef<T> {
   [prismaModelKey]!: Model;
+
   [abstractReturnShapeKey]!: WithBrand<T>;
+
   modelName: string;
 
   constructor(name: string, modelName: string) {

package/src/prisma-field-builder.ts

@@ -80,17 +80,27 @@ export class PrismaObjectFieldBuilder<
   Shape extends object = Model['Shape'],
 > extends RootBuilder<Types, Shape, 'PrismaObject'> {
   model: string;
+
   prismaFieldMap: FieldMap;
 
   exposeBoolean = this.createExpose('Boolean');
+
   exposeFloat = this.createExpose('Float');
+
   exposeInt = this.createExpose('Int');
+
   exposeID = this.createExpose('ID');
+
   exposeString = this.createExpose('String');
+
   exposeBooleanList = this.createExpose(['Boolean']);
+
   exposeFloatList = this.createExpose(['Float']);
+
   exposeIntList = this.createExpose(['Int']);
+
   exposeIDList = this.createExpose(['ID']);
+
   exposeStringList = this.createExpose(['String']);
 
   withAuth: 'scopeAuth' extends PluginName
@@ -117,6 +127,9 @@ export class PrismaObjectFieldBuilder<
         ...args: NormalizeArgs<
           [
             connectionOptions:
+              | ObjectRef<
+                  ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, Shape, false>>
+                >
               | PothosSchemaTypes.ConnectionObjectOptions<
                   Types,
                   ObjectRef<
@@ -139,11 +152,12 @@ export class PrismaObjectFieldBuilder<
                     Args
                   >,
                   ConnectionInterfaces
-                >
-              | ObjectRef<
-                  ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, Shape, false>>
                 >,
             edgeOptions:
+              | ObjectRef<{
+                  cursor: string;
+                  node?: ShapeFromTypeParam<Types, Model['Shape'], false>;
+                }>
               | PothosSchemaTypes.ConnectionEdgeObjectOptions<
                   Types,
                   ObjectRef<
@@ -165,11 +179,7 @@ export class PrismaObjectFieldBuilder<
                     Args
                   >,
                   EdgeInterfaces
-                >
-              | ObjectRef<{
-                  cursor: string;
-                  node?: ShapeFromTypeParam<Types, Model['Shape'], false>;
-                }>,
+                >,
           ],
           0
         >
@@ -528,18 +538,18 @@ export class PrismaObjectFieldBuilder<
     name: Name,
     ...args: NormalizeArgs<
       [
-        options: Omit<
-          PothosSchemaTypes.ObjectFieldOptions<
-            Types,
-            Shape,
-            Type,
-            Nullable,
-            {},
-            ResolveReturnShape
-          >,
-          'resolve' | 'select' | 'description' | 'nullable'
-        > &
-          ExposeNullability<Types, Type, Model['Shape'], Name, Nullable> & {
+        options: ExposeNullability<Types, Type, Model['Shape'], Name, Nullable> &
+          Omit<
+            PothosSchemaTypes.ObjectFieldOptions<
+              Types,
+              Shape,
+              Type,
+              Nullable,
+              {},
+              ResolveReturnShape
+            >,
+            'description' | 'nullable' | 'resolve' | 'select'
+          > & {
             description?: string | false;
           },
       ]
@@ -577,18 +587,18 @@ export class PrismaObjectFieldBuilder<
       name: Name,
       ...args: NormalizeArgs<
         [
-          options: Omit<
-            PothosSchemaTypes.ObjectFieldOptions<
-              Types,
-              Shape,
-              Type,
-              Nullable,
-              {},
-              ResolveReturnShape
-            >,
-            'resolve' | 'type' | 'select' | 'description' | 'nullable'
-          > &
-            ExposeNullability<Types, Type, Model['Shape'], Name, Nullable> & {
+          options: ExposeNullability<Types, Type, Model['Shape'], Name, Nullable> &
+            Omit<
+              PothosSchemaTypes.ObjectFieldOptions<
+                Types,
+                Shape,
+                Type,
+                Nullable,
+                {},
+                ResolveReturnShape
+              >,
+              'description' | 'nullable' | 'resolve' | 'select' | 'type'
+            > & {
               description?: string | false;
             },
         ]

package/src/types.ts

@@ -155,7 +155,7 @@ export type TypesForRelation<
   Relation extends keyof Model['Relations'],
 > = Model['Relations'][Relation]['Name'] extends infer Name
   ? Name extends keyof Types['PrismaTypes']
-    ? Types['PrismaTypes'][Name] & PrismaModelTypes
+    ? PrismaModelTypes & Types['PrismaTypes'][Name]
     : never
   : never;
 
@@ -205,7 +205,7 @@ export type PrismaObjectImplementationOptions<
 > = Omit<
   | PothosSchemaTypes.ObjectTypeOptions<Types, Shape>
   | PothosSchemaTypes.ObjectTypeWithInterfaceOptions<Types, Shape, Interfaces>,
-  'fields' | 'description'
+  'description' | 'fields'
 > & {
   description?: string | false;
   fields?: PrismaObjectFieldsShape<
@@ -225,8 +225,8 @@ export type PrismaObjectTypeOptions<
   Include,
   Select,
   Shape extends object,
-> = PrismaObjectRefOptions<Types, Model, FindUnique, Include, Select, Shape> &
-  PrismaObjectImplementationOptions<Types, Model, Interfaces, FindUnique, Select, Shape>;
+> = PrismaObjectImplementationOptions<Types, Model, Interfaces, FindUnique, Select, Shape> &
+  PrismaObjectRefOptions<Types, Model, FindUnique, Include, Select, Shape>;
 
 export type PrismaInterfaceRefOptions<
   Types extends SchemaTypes,
@@ -259,7 +259,7 @@ export type PrismaInterfaceImplementationOptions<
   Shape extends object,
 > = Omit<
   PothosSchemaTypes.InterfaceTypeOptions<Types, Shape, Interfaces>,
-  'fields' | 'description'
+  'description' | 'fields'
 > & {
   description?: string | false;
   fields?: PrismaObjectFieldsShape<
@@ -279,8 +279,8 @@ export type PrismaInterfaceTypeOptions<
   Include,
   Select,
   Shape extends object,
-> = PrismaInterfaceRefOptions<Types, Model, FindUnique, Include, Select, Shape> &
-  PrismaInterfaceImplementationOptions<Types, Model, Interfaces, FindUnique, Select, Shape>;
+> = PrismaInterfaceImplementationOptions<Types, Model, Interfaces, FindUnique, Select, Shape> &
+  PrismaInterfaceRefOptions<Types, Model, FindUnique, Include, Select, Shape>;
 
 type NameOrVariant =
   | {
@@ -305,7 +305,14 @@ export type PrismaNodeOptions<
     | PothosSchemaTypes.ObjectTypeOptions<Types, Shape>
     | PothosSchemaTypes.ObjectTypeWithInterfaceOptions<Types, Shape, Interfaces>,
     'fields' | 'isTypeOf'
-  > & {
+  > &
+  (UniqueField extends string
+    ? {
+        findUnique?: (id: string, context: Types['Context']) => Model['WhereUnique'];
+      }
+    : {
+        findUnique: (id: string, context: Types['Context']) => Model['WhereUnique'];
+      }) & {
     id: Omit<
       FieldOptionsFromKind<
         Types,
@@ -341,14 +348,9 @@ export type PrismaNodeOptions<
       Shape & { [prismaModelName]?: Model['Name'] },
       Select
     >;
-  } & (UniqueField extends string
-    ? {
-        findUnique?: (id: string, context: Types['Context']) => Model['WhereUnique'];
-      }
-    : {
-        findUnique: (id: string, context: Types['Context']) => Model['WhereUnique'];
-      }) &
-  (
+  } & {
+    nullable?: boolean;
+  } & (
     | {
         include?: Include & Model['Include'];
         select?: never;
@@ -357,9 +359,7 @@ export type PrismaNodeOptions<
         select: Model['Select'] & Select;
         include?: never;
       }
-  ) & {
-    nullable?: boolean;
-  };
+  );
 
 type QueryForField<
   Types extends SchemaTypes,
@@ -425,7 +425,7 @@ export type RelatedFieldOptions<
     Args,
     ResolveReturnShape
   >,
-  'resolve' | 'type' | 'description'
+  'description' | 'resolve' | 'type'
 > &
   (NeedsResolve extends false
     ? {
@@ -569,11 +569,11 @@ export type PrismaFieldWithInputOptions<
     Type,
     Model,
     Param,
-    {
+    Args & {
       [K in InputName]: InputFieldRef<
         InputShapeFromFields<Fields> | (true extends ArgRequired ? never : null | undefined)
       >;
-    } & Args,
+    },
     Nullable,
     ResolveShape,
     ResolveReturnShape,
@@ -583,11 +583,11 @@ export type PrismaFieldWithInputOptions<
 > &
   PothosSchemaTypes.FieldWithInputBaseOptions<
     Types,
-    {
+    Args & {
       [K in InputName]: InputFieldRef<
         InputShapeFromFields<Fields> | (true extends ArgRequired ? never : null | undefined)
       >;
-    } & Args,
+    },
     Fields,
     InputName,
     ArgRequired
@@ -620,8 +620,8 @@ export type PrismaConnectionFieldOptions<
   Types extends SchemaTypes,
   ParentShape,
   Type extends
-    | PrismaRef<PrismaModelTypes>
     | PrismaInterfaceRef<PrismaModelTypes>
+    | PrismaRef<PrismaModelTypes>
     | keyof Types['PrismaTypes'],
   Model extends PrismaModelTypes,
   Param extends OutputType<Types>,
@@ -629,32 +629,33 @@ export type PrismaConnectionFieldOptions<
   Args extends InputFieldMap,
   ResolveReturnShape,
   Kind extends FieldKind,
+  // eslint-disable-next-line @typescript-eslint/sort-type-constituents
 > = Omit<
-  PothosSchemaTypes.ConnectionFieldOptions<
+  FieldOptionsFromKind<
     Types,
     ParentShape,
     Param,
     Nullable,
-    false,
-    false,
-    Args,
+    InputFieldsFromShape<PothosSchemaTypes.DefaultConnectionArguments> &
+      (InputFieldMap extends Args ? {} : Args),
+    Kind,
+    ParentShape,
     ResolveReturnShape
   >,
-  'resolve' | 'type'
+  'args' | 'resolve' | 'type'
 > &
   Omit<
-    FieldOptionsFromKind<
+    PothosSchemaTypes.ConnectionFieldOptions<
       Types,
       ParentShape,
       Param,
       Nullable,
-      (InputFieldMap extends Args ? {} : Args) &
-        InputFieldsFromShape<PothosSchemaTypes.DefaultConnectionArguments>,
-      Kind,
-      ParentShape,
+      false,
+      false,
+      Args,
       ResolveReturnShape
     >,
-    'args' | 'resolve' | 'type'
+    'resolve' | 'type'
   > &
   (InputShapeFromFields<Args> &
     PothosSchemaTypes.DefaultConnectionArguments extends infer ConnectionArgs
@@ -695,17 +696,18 @@ export type RelatedConnectionOptions<
   Nullable extends boolean,
   Args extends InputFieldMap,
   NeedsResolve extends boolean,
+  // eslint-disable-next-line @typescript-eslint/sort-type-constituents
 > = Omit<
   PothosSchemaTypes.ObjectFieldOptions<
     Types,
     Model['Shape'],
     ObjectRef<unknown>,
     Nullable,
-    (InputFieldMap extends Args ? {} : Args) &
-      InputFieldsFromShape<PothosSchemaTypes.DefaultConnectionArguments>,
+    InputFieldsFromShape<PothosSchemaTypes.DefaultConnectionArguments> &
+      (InputFieldMap extends Args ? {} : Args),
     unknown
   >,
-  'resolve' | 'type' | 'args' | 'description'
+  'args' | 'description' | 'resolve' | 'type'
 > &
   Omit<
     PothosSchemaTypes.ConnectionFieldOptions<
@@ -722,15 +724,7 @@ export type RelatedConnectionOptions<
   > &
   (InputShapeFromFields<Args> &
     PothosSchemaTypes.DefaultConnectionArguments extends infer ConnectionArgs
-    ? {
-        description?: string | false;
-        query?: QueryForField<Types, Args, Model['Include'][Field & keyof Model['Include']]>;
-        type?: PrismaRef<TypesForRelation<Types, Model, Field>>;
-        cursor: CursorFromRelation<Model, Field>;
-        defaultSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
-        maxSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
-        totalCount?: NeedsResolve extends false ? boolean : false;
-      } & (NeedsResolve extends false
+    ? (NeedsResolve extends false
         ? {
             resolve?: (
               query: {
@@ -770,7 +764,15 @@ export type RelatedConnectionOptions<
                 Nullable
               >
             >;
-          })
+          }) & {
+        description?: string | false;
+        query?: QueryForField<Types, Args, Model['Include'][Field & keyof Model['Include']]>;
+        type?: PrismaRef<TypesForRelation<Types, Model, Field>>;
+        cursor: CursorFromRelation<Model, Field>;
+        defaultSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
+        maxSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
+        totalCount?: NeedsResolve extends false ? boolean : false;
+      }
     : never);
 
 export type WithBrand<T> = T & { [typeBrandKey]: string };
@@ -790,7 +792,7 @@ export type FieldSelection =
       context: object,
       mergeNestedSelection: (
         selection: SelectionMap | boolean | ((args: object, context: object) => SelectionMap),
-        path?: string[] | IndirectInclude,
+        path?: IndirectInclude | string[],
       ) => SelectionMap | boolean,
       resolveSelection: (path: string[]) => FieldNode | null,
     ) => SelectionMap);

package/src/util/map-query.ts

@@ -4,12 +4,15 @@ import {
   FieldNode,
   FragmentDefinitionNode,
   getArgumentValues,
+  getDirectiveValues,
   getNamedType,
   GraphQLField,
+  GraphQLIncludeDirective,
   GraphQLInterfaceType,
   GraphQLNamedType,
   GraphQLObjectType,
   GraphQLResolveInfo,
+  GraphQLSkipDirective,
   InlineFragmentNode,
   isInterfaceType,
   isObjectType,
@@ -60,8 +63,8 @@ function addTypeSelectionsForField(
   };
 
   if (
-    (pothosPrismaIndirectInclude?.path && pothosPrismaIndirectInclude.path.length > 0) ||
-    (pothosPrismaIndirectInclude?.paths && pothosPrismaIndirectInclude.paths.length === 0)
+    (!!pothosPrismaIndirectInclude?.path && pothosPrismaIndirectInclude.path.length > 0) ||
+    (!!pothosPrismaIndirectInclude?.paths && pothosPrismaIndirectInclude.paths.length === 0)
   ) {
     resolveIndirectIncludePaths(
       type,
@@ -94,7 +97,7 @@ function addTypeSelectionsForField(
     state.mode = 'include';
   }
 
-  if (pothosPrismaInclude || pothosPrismaSelect) {
+  if (pothosPrismaInclude ?? pothosPrismaSelect) {
     mergeSelection(state, {
       select: pothosPrismaSelect ? { ...pothosPrismaSelect } : undefined,
       include: pothosPrismaInclude ? { ...pothosPrismaInclude } : undefined,
@@ -145,7 +148,11 @@ function resolveIndirectInclude(
   for (const sel of selection.selectionSet.selections) {
     switch (sel.kind) {
       case Kind.FIELD:
-        if (sel.name.value === include.name && (isObjectType(type) || isInterfaceType(type))) {
+        if (
+          !fieldSkipped(info, sel) &&
+          sel.name.value === include.name &&
+          (isObjectType(type) || isInterfaceType(type))
+        ) {
           const returnType = getNamedType(type.getFields()[sel.name.value].type);
 
           resolveIndirectInclude(
@@ -198,7 +205,7 @@ function resolveIndirectInclude(
 }
 
 function addNestedSelections(
-  type: GraphQLObjectType | GraphQLInterfaceType,
+  type: GraphQLInterfaceType | GraphQLObjectType,
   context: object,
   info: GraphQLResolveInfo,
   state: SelectionState,
@@ -260,14 +267,14 @@ function addNestedSelections(
 }
 
 function addFieldSelection(
-  type: GraphQLObjectType | GraphQLInterfaceType,
+  type: GraphQLInterfaceType | GraphQLObjectType,
   context: object,
   info: GraphQLResolveInfo,
   state: SelectionState,
   selection: FieldNode,
   indirectPath: string[],
 ) {
-  if (selection.name.value.startsWith('__')) {
+  if (selection.name.value.startsWith('__') || fieldSkipped(info, selection)) {
     return;
   }
 
@@ -316,8 +323,8 @@ function addFieldSelection(
         }
 
         if (
-          (normalizedIndirectInclude?.path && normalizedIndirectInclude.path.length > 0) ||
-          (normalizedIndirectInclude?.paths && normalizedIndirectInclude.paths.length > 0)
+          (!!normalizedIndirectInclude?.path && normalizedIndirectInclude.path.length > 0) ||
+          (!!normalizedIndirectInclude?.paths && normalizedIndirectInclude.paths.length > 0)
         ) {
           resolveIndirectIncludePaths(
             returnType,
@@ -397,7 +404,7 @@ export function queryFromInfo<T extends SelectionMap['select'] | undefined = und
   path?: string[];
   paths?: string[][];
   withUsageCheck?: boolean;
-}): { select: T } | { include?: {} } {
+}): { include?: {} } | { select: T } {
   const returnType = getNamedType(info.returnType);
   const type = typeName ? info.schema.getTypeMap()[typeName] : returnType;
 
@@ -547,3 +554,17 @@ function normalizeInclude(path: string[], type: GraphQLNamedType): IndirectInclu
     path: normalized,
   };
 }
+
+function fieldSkipped(info: GraphQLResolveInfo, selection: FieldNode) {
+  const skip = getDirectiveValues(GraphQLSkipDirective, selection, info.variableValues);
+  if (skip?.if === true) {
+    return true;
+  }
+
+  const include = getDirectiveValues(GraphQLIncludeDirective, selection, info.variableValues);
+  if (include?.if === false) {
+    return true;
+  }
+
+  return false;
+}