@pothos/plugin-prisma 0.15.2 → 0.16.3

package/lib/util/map-includes.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryFromInfo = exports.includesFromSelectionSet = void 0;
+exports.queryFromInfo = exports.includesFromSelectionSet = exports.SELF_RELATION = void 0;
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-continue */
-/* eslint-disable @typescript-eslint/no-use-before-define */
 const graphql_1 = require("graphql");
 const values_1 = require("graphql/execution/values");
 const loader_map_1 = require("../loader-map");
 const _1 = require(".");
+exports.SELF_RELATION = '@self';
 function handleField(ctx, info, fields, selection, includes, counts, mappings, indirectMap) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     if (selection.name.value.startsWith('__')) {
         return;
     }
@@ -56,7 +56,7 @@ function handleField(ctx, info, fields, selection, includes, counts, mappings, i
         const args = (0, values_1.getArgumentValues)(field, selection, info.variableValues);
         query = query(args, ctx);
     }
-    const existingInclude = includes[relationName];
+    const existingInclude = relationName === exports.SELF_RELATION ? { include: includes } : includes[relationName];
     query = { ...query, include: newIncludes };
     if (typeof existingInclude === 'object') {
         query = (0, _1.mergeIncludes)(existingInclude, query);
@@ -64,20 +64,36 @@ function handleField(ctx, info, fields, selection, includes, counts, mappings, i
             return;
         }
     }
+    if (!mappings[relationName]) {
+        mappings[relationName] = [];
+    }
     const nestedIncludes = query.include;
     const nestedMappings = {};
     const nestedCounts = {
         current: {},
         parent: counts.current,
     };
-    if (!mappings[relationName]) {
-        mappings[relationName] = [];
+    if (relationName === exports.SELF_RELATION) {
+        mappings[relationName].push({
+            field: selection.name.value,
+            alias: (_j = selection.alias) === null || _j === void 0 ? void 0 : _j.value,
+            mappings: nestedMappings,
+            indirectPath: (_k = indirectMap === null || indirectMap === void 0 ? void 0 : indirectMap.path) !== null && _k !== void 0 ? _k : [],
+        });
+        const { include } = query;
+        if (selection.selectionSet) {
+            includesFromSelectionSet(ctx, type, info, includes, counts, nestedMappings, selection.selectionSet);
+        }
+        Object.keys(include).forEach((key) => {
+            includes[key] = include[key];
+        });
+        return;
     }
     mappings[relationName].push({
         field: selection.name.value,
-        alias: (_j = selection.alias) === null || _j === void 0 ? void 0 : _j.value,
+        alias: (_l = selection.alias) === null || _l === void 0 ? void 0 : _l.value,
         mappings: nestedMappings,
-        indirectPath: (_k = indirectMap === null || indirectMap === void 0 ? void 0 : indirectMap.path) !== null && _k !== void 0 ? _k : [],
+        indirectPath: (_m = indirectMap === null || indirectMap === void 0 ? void 0 : indirectMap.path) !== null && _m !== void 0 ? _m : [],
     });
     if (selection.selectionSet) {
         includesFromSelectionSet(ctx, type, info, nestedIncludes, nestedCounts, nestedMappings, selection.selectionSet);

package/lib/util/map-includes.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-includes.js","sourceRoot":"","sources":["../../src/util/map-includes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map-includes.js","sourceRoot":"","sources":["../../src/util/map-includes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-prisma",
-  "version": "0.15.2",
+  "version": "0.16.3",
   "description": "A Pothos plugin for more efficient integration with prisma",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@prisma/generator-helper": "^3.8.1"
+    "@prisma/generator-helper": "^3.9.1"
   },
   "prisma": {
     "seed": "pnpm ts-node prisma/seed.ts"
@@ -47,15 +47,15 @@
     "typescript": ">4.5.2"
   },
   "devDependencies": {
-    "@pothos/core": "^3.0.1",
-    "@pothos/plugin-errors": "^3.0.0",
-    "@pothos/plugin-relay": "^3.0.0",
-    "@pothos/plugin-scope-auth": "^3.0.0",
-    "@pothos/test-utils": "^1.0.0",
-    "@prisma/client": "^3.8.1",
-    "graphql": "16.2.0",
+    "@pothos/core": "3.1.2",
+    "@pothos/plugin-errors": "3.0.1",
+    "@pothos/plugin-relay": "3.3.1",
+    "@pothos/plugin-scope-auth": "3.0.2",
+    "@pothos/test-utils": "1.0.1",
+    "@prisma/client": "^3.9.1",
+    "graphql": "16.3.0",
     "graphql-tag": "^2.12.6",
-    "prisma": "^3.8.1"
+    "prisma": "^3.9.1"
   },
   "scripts": {
     "generate": "prisma generate",

package/src/field-builder.ts

@@ -6,7 +6,6 @@ import {
   ObjectRef,
   RootFieldBuilder,
   SchemaTypes,
-  TypeParam,
 } from '@pothos/core';
 import { resolvePrismaCursorConnection } from './cursors';
 import { getRefFromModel } from './refs';
@@ -22,9 +21,12 @@ const fieldBuilderProto = RootFieldBuilder.prototype as PothosSchemaTypes.RootFi
 >;
 
 fieldBuilderProto.prismaField = function prismaField({ type, resolve, ...options }) {
-  const model: string = Array.isArray(type) ? type[0] : type;
-  const typeRef = getRefFromModel(model, this.builder);
-  const typeParam: TypeParam<SchemaTypes> = Array.isArray(type) ? [typeRef] : typeRef;
+  const modelOrRef = Array.isArray(type) ? type[0] : type;
+  const typeRef =
+    typeof modelOrRef === 'string'
+      ? getRefFromModel(modelOrRef, this.builder)
+      : (modelOrRef as ObjectRef<unknown>);
+  const typeParam = Array.isArray(type) ? ([typeRef] as [ObjectRef<unknown>]) : typeRef;
 
   return this.field({
     ...options,
@@ -66,7 +68,7 @@ fieldBuilderProto.prismaConnection = function prismaConnection<
   connectionOptions: {},
   edgeOptions: {},
 ) {
-  const ref = getRefFromModel(type, this.builder);
+  const ref = typeof type === 'string' ? getRefFromModel(type, this.builder) : type;
   let typeName: string | undefined;
 
   const fieldRef = (

package/src/generator.ts

@@ -45,7 +45,14 @@ generatorHandler({
         [],
         model.name,
         undefined,
+
         ts.factory.createTypeLiteralNode([
+          ts.factory.createPropertySignature(
+            [],
+            'Name',
+            undefined,
+            ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(model.name)),
+          ),
           ts.factory.createPropertySignature(
             [],
             'Shape',
@@ -96,7 +103,7 @@ generatorHandler({
             undefined,
             ts.factory.createTypeLiteralNode(
               relations.map((field) => {
-                const typeName = typeof field.type === 'string' ? field.type : field.type.name;
+                const typeName = field.type;
 
                 return ts.factory.createPropertySignature(
                   [],

package/src/global-types.ts

@@ -13,6 +13,7 @@ import {
   ShapeFromTypeParam,
 } from '@pothos/core';
 import PrismaNodeRef from './node-ref';
+import { prismaModelKey, PrismaObjectRef } from './object-ref';
 import {
   PrismaConnectionFieldOptions,
   PrismaFieldOptions,
@@ -21,7 +22,7 @@ import {
   PrismaObjectTypeOptions,
   ShapeWithInclude,
 } from './types';
-import { PrismaPlugin } from '.';
+import { PrismaPlugin, ShapeFromConnection } from '.';
 
 declare global {
   export namespace PothosSchemaTypes {
@@ -58,7 +59,7 @@ declare global {
       >(
         name: Name,
         options: PrismaObjectTypeOptions<Types, Model, Interfaces, FindUnique, Include, Shape>,
-      ) => ObjectRef<Shape>;
+      ) => PrismaObjectRef<Model, Shape>;
 
       prismaNode: 'relay' extends PluginName
         ? <
@@ -70,7 +71,7 @@ declare global {
           >(
             name: Name,
             options: PrismaNodeOptions<Types, Model, Interfaces, Include, Shape>,
-          ) => PrismaNodeRef<Shape>
+          ) => PrismaNodeRef<Model, Shape>
         : '@pothos/plugin-relay is required to use this method';
     }
 
@@ -81,15 +82,23 @@ declare global {
     > {
       prismaField: <
         Args extends InputFieldMap,
-        TypeParam extends keyof Types['PrismaTypes'] | [keyof Types['PrismaTypes']],
+        TypeParam extends
+          | PrismaObjectRef<PrismaModelTypes>
+          | keyof Types['PrismaTypes']
+          | [keyof Types['PrismaTypes']]
+          | [PrismaObjectRef<PrismaModelTypes>],
         Nullable extends FieldNullability<Type>,
         ResolveReturnShape,
-        Type extends TypeParam extends [keyof Types['PrismaTypes']]
+        Type extends TypeParam extends [unknown]
           ? [ObjectRef<Model['Shape']>]
           : ObjectRef<Model['Shape']>,
         Model extends PrismaModelTypes = PrismaModelTypes &
           (TypeParam extends [keyof Types['PrismaTypes']]
             ? Types['PrismaTypes'][TypeParam[0]]
+            : TypeParam extends [PrismaObjectRef<PrismaModelTypes>]
+            ? TypeParam[0][typeof prismaModelKey]
+            : TypeParam extends PrismaObjectRef<PrismaModelTypes>
+            ? TypeParam[typeof prismaModelKey]
             : TypeParam extends keyof Types['PrismaTypes']
             ? Types['PrismaTypes'][TypeParam]
             : never),
@@ -109,11 +118,13 @@ declare global {
 
       prismaConnection: 'relay' extends PluginName
         ? <
-            Type extends keyof Types['PrismaTypes'],
+            Type extends PrismaObjectRef<PrismaModelTypes> | keyof Types['PrismaTypes'],
             Nullable extends boolean,
             ResolveReturnShape,
             Args extends InputFieldMap = {},
-            Model extends PrismaModelTypes = PrismaModelTypes & Types['PrismaTypes'][Type],
+            Model extends PrismaModelTypes = Type extends PrismaObjectRef<infer T>
+              ? T
+              : PrismaModelTypes & Types['PrismaTypes'][Type & keyof Types['PrismaTypes']],
           >(
             ...args: NormalizeArgs<
               [
@@ -131,16 +142,19 @@ declare global {
                 connectionOptions?: ConnectionObjectOptions<
                   Types,
                   ObjectRef<Model['Shape']>,
+                  false,
+                  false,
                   ResolveReturnShape
                 >,
                 edgeOptions?: ConnectionEdgeObjectOptions<
                   Types,
                   ObjectRef<Model['Shape']>,
+                  false,
                   ResolveReturnShape
                 >,
               ]
             >
-          ) => FieldRef<ConnectionShapeHelper<Types, Model['Shape'], Nullable>['shape']>
+          ) => FieldRef<ShapeFromConnection<ConnectionShapeHelper<Types, Model['Shape'], Nullable>>>
         : '@pothos/plugin-relay is required to use this method';
     }
 
@@ -149,6 +163,8 @@ declare global {
       ParentShape,
       Type extends OutputType<Types>,
       Nullable extends boolean,
+      EdgeNullability extends FieldNullability<[unknown]>,
+      NodeNullability extends boolean,
       Args extends InputFieldMap,
       ResolveReturnShape,
     > {}
@@ -156,12 +172,15 @@ declare global {
     export interface ConnectionObjectOptions<
       Types extends SchemaTypes,
       Type extends OutputType<Types>,
+      EdgeNullability extends FieldNullability<[unknown]>,
+      NodeNullability extends boolean,
       Resolved,
     > {}
 
     export interface ConnectionEdgeObjectOptions<
       Types extends SchemaTypes,
       Type extends OutputType<Types>,
+      NodeNullability extends boolean,
       Resolved,
     > {}
 
@@ -172,8 +191,6 @@ declare global {
       after?: string | null | undefined;
     }
 
-    export interface ConnectionShapeHelper<Types extends SchemaTypes, T, Nullable> {
-      shape: unknown;
-    }
+    export interface ConnectionShapeHelper<Types extends SchemaTypes, T, Nullable> {}
   }
 }

package/src/model-loader.ts

@@ -66,6 +66,20 @@ export class ModelLoader {
     return (result._count as Record<string, number>)[relation];
   }
 
+  async loadSelf(include: unknown, context: {}) {
+    for (const entry of this.staged) {
+      const merged = mergeIncludes(entry.include, include as Record<string, unknown>);
+
+      if (merged) {
+        entry.include = merged as Record<string, unknown>;
+
+        return entry.promise;
+      }
+    }
+
+    return this.initLoad(null, include, context);
+  }
+
   async loadRelation(relation: string, include: unknown, context: {}) {
     let promise;
     for (const entry of this.staged) {
@@ -96,18 +110,21 @@ export class ModelLoader {
     return result[relation];
   }
 
-  async initLoad(relation: string, includeArg: unknown, context: {}, count = false) {
-    const include: Record<string, unknown> = count
-      ? {
-          _count: {
-            select: {
-              [relation]: true,
-            },
-          },
-        }
-      : {
-          [relation]: includeArg,
-        };
+  async initLoad(relation: string | null, includeArg: unknown, context: {}, count = false) {
+    const include: Record<string, unknown> =
+      (relation &&
+        (count
+          ? {
+              _count: {
+                select: {
+                  [relation]: true,
+                },
+              },
+            }
+          : {
+              [relation]: includeArg,
+            })) ||
+      {};
 
     const promise = new Promise<Record<string, unknown>>((resolve, reject) => {
       setTimeout(() => {
@@ -117,7 +134,7 @@ export class ModelLoader {
           this.delegate.findUnique({
             rejectOnNotFound: true,
             where: { ...(this.findUnique(this.model, context) as {}) },
-            include,
+            include: Object.keys(include).length > 0 ? include : undefined,
           } as never) as Promise<Record<string, unknown>>,
         );
       }, 0);

package/src/node-ref.ts

@@ -1,7 +1,12 @@
-import { abstractReturnShapeKey, brandWithType, ObjectRef, typeBrandKey } from '@pothos/core';
+import { abstractReturnShapeKey, brandWithType, typeBrandKey } from '@pothos/core';
+import { PrismaObjectRef } from './object-ref';
 import { WithBrand } from './types';
+import { PrismaModelTypes } from '.';
 
-export default class PrismaNodeRef<T> extends ObjectRef<T, T> {
+export default class PrismaNodeRef<Model extends PrismaModelTypes, T> extends PrismaObjectRef<
+  Model,
+  T
+> {
   [abstractReturnShapeKey]: WithBrand<T>;
 
   addBrand<V extends T | T[]>(

package/src/object-ref.ts

@@ -0,0 +1,8 @@
+import { ObjectRef } from '@pothos/core';
+import { PrismaModelTypes } from '.';
+
+export const prismaModelKey = Symbol.for('Pothos.prismaModelKey');
+
+export class PrismaObjectRef<Model extends PrismaModelTypes, T = {}> extends ObjectRef<T> {
+  [prismaModelKey]: Model;
+}

package/src/prisma-field-builder.ts

@@ -13,6 +13,7 @@ import {
 import { prismaCursorConnectionQuery, wrapConnectionResult } from './cursors';
 import { getLoaderMapping, setLoaderMappings } from './loader-map';
 import { ModelLoader } from './model-loader';
+import { PrismaObjectRef } from './object-ref';
 import { getDelegateFromModel, getFindUniqueForRef, getRefFromModel, getRelation } from './refs';
 import {
   PrismaDelegate,
@@ -20,8 +21,10 @@ import {
   RelatedConnectionOptions,
   RelatedFieldOptions,
   RelationCountOptions,
+  ShapeFromConnection,
 } from './types';
-import { queryFromInfo } from './util';
+import { queryFromInfo, SELF_RELATION } from './util';
+import { VariantFieldOptions } from '.';
 
 export class PrismaObjectFieldBuilder<
   Types extends SchemaTypes,
@@ -46,16 +49,21 @@ export class PrismaObjectFieldBuilder<
             connectionOptions?: PothosSchemaTypes.ConnectionObjectOptions<
               Types,
               ObjectRef<Shape>,
+              false,
+              false,
               ResolveReturnShape
             >,
             edgeOptions?: PothosSchemaTypes.ConnectionEdgeObjectOptions<
               Types,
               ObjectRef<Shape>,
+              false,
               ResolveReturnShape
             >,
           ]
         >
-      ) => FieldRef<PothosSchemaTypes.ConnectionShapeHelper<Types, Shape, Nullable>['shape']>
+      ) => FieldRef<
+        ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, Shape, Nullable>>
+      >
     : '@pothos/plugin-relay is required to use this method' = function relatedConnection(
     this: PrismaObjectFieldBuilder<SchemaTypes, Model, boolean>,
     name: string,
@@ -69,6 +77,7 @@ export class PrismaObjectFieldBuilder<
       totalCount,
       ...options
     }: {
+      type?: ObjectRef<unknown, unknown>;
       totalCount?: boolean;
       maxSize?: number;
       defaultSize?: number;
@@ -82,9 +91,7 @@ export class PrismaObjectFieldBuilder<
   ) {
     const relationField = getRelation(this.model, this.builder, name);
     const parentRef = getRefFromModel(this.model, this.builder);
-    const relationTypeName =
-      typeof relationField.type === 'string' ? relationField.type : relationField.type.name;
-    const ref = getRefFromModel(relationTypeName, this.builder);
+    const ref = options.type ?? getRefFromModel(relationField.type, this.builder);
     const findUnique = getFindUniqueForRef(parentRef, this.builder);
     const loaderCache = ModelLoader.forModel(this.model, this.builder);
     let typeName: string | undefined;
@@ -230,9 +237,7 @@ export class PrismaObjectFieldBuilder<
     const [name, options = {} as never] = allArgs;
     const relationField = getRelation(this.model, this.builder, name);
     const parentRef = getRefFromModel(this.model, this.builder);
-    const relationTypeName =
-      typeof relationField.type === 'string' ? relationField.type : relationField.type.name;
-    const ref = getRefFromModel(relationTypeName, this.builder);
+    const ref = options.type ?? getRefFromModel(relationField.type, this.builder);
     const findUnique = getFindUniqueForRef(parentRef, this.builder);
     const loaderCache = ModelLoader.forModel(this.model, this.builder);
 
@@ -321,4 +326,50 @@ export class PrismaObjectFieldBuilder<
       },
     }) as FieldRef<number, 'Object'>;
   }
+
+  variant<Variant extends Model['Name'] | PrismaObjectRef<Model>>(
+    ...allArgs: NormalizeArgs<
+      [
+        variant: Variant,
+        options?: VariantFieldOptions<
+          Types,
+          Model,
+          Variant extends PrismaObjectRef<Model> ? Variant : PrismaObjectRef<Model>
+        >,
+      ]
+    >
+  ): FieldRef<Model['Shape'], 'Object'> {
+    const [variant, options = {} as never] = allArgs;
+    const ref: PrismaObjectRef<PrismaModelTypes> =
+      typeof variant === 'string' ? getRefFromModel(variant, this.builder) : variant;
+    const parentRef = getRefFromModel(this.model, this.builder);
+    const findUnique = getFindUniqueForRef(parentRef, this.builder);
+    const loaderCache = ModelLoader.forModel(this.model, this.builder);
+
+    return this.field({
+      ...options,
+      type: ref,
+      extensions: {
+        ...options.extensions,
+        pothosPrismaRelation: SELF_RELATION,
+      },
+      resolve: (parent, args, context, info) => {
+        const mapping = getLoaderMapping(context, info.path);
+
+        if (mapping) {
+          setLoaderMappings(context, info.path, mapping);
+
+          return parent as never;
+        }
+
+        const queryOptions = queryFromInfo(context, info);
+
+        if (!findUnique) {
+          throw new Error(`Missing findUnique for Prisma type ${this.model}`);
+        }
+
+        return loaderCache(parent).loadSelf(queryOptions, context) as never;
+      },
+    }) as FieldRef<Model['Shape'], 'Object'>;
+  }
 }

package/src/refs.ts

@@ -1,8 +1,10 @@
 import { ObjectRef, SchemaTypes } from '@pothos/core';
 import { Prisma } from '../tests/client';
+import { PrismaObjectRef } from './object-ref';
 import { PrismaDelegate } from './types';
+import { PrismaModelTypes } from '.';
 
-export const refMap = new WeakMap<object, Map<string, ObjectRef<unknown>>>();
+export const refMap = new WeakMap<object, Map<string, PrismaObjectRef<PrismaModelTypes>>>();
 export const findUniqueMap = new WeakMap<
   object,
   Map<ObjectRef<unknown>, ((args: unknown, ctx: {}) => unknown) | null>
@@ -16,14 +18,14 @@ export const includeForRefMap = new WeakMap<
 export function getRefFromModel<Types extends SchemaTypes>(
   name: string,
   builder: PothosSchemaTypes.SchemaBuilder<Types>,
-): ObjectRef<unknown> {
+): PrismaObjectRef<PrismaModelTypes> {
   if (!refMap.has(builder)) {
     refMap.set(builder, new Map());
   }
   const cache = refMap.get(builder)!;
 
   if (!cache.has(name)) {
-    cache.set(name, builder.objectRef(name));
+    cache.set(name, new PrismaObjectRef(name));
   }
 
   return cache.get(name)!;

package/src/schema-builder.ts

@@ -18,8 +18,8 @@ import { queryFromInfo } from './util';
 const schemaBuilderProto = SchemaBuilder.prototype as PothosSchemaTypes.SchemaBuilder<SchemaTypes>;
 
 schemaBuilderProto.prismaObject = function prismaObject(type, { fields, findUnique, ...options }) {
-  const ref = getRefFromModel(type, this);
-  const name = options.name ?? type;
+  const ref = options.variant ? this.objectRef(options.variant) : getRefFromModel(type, this);
+  const name = options.variant ?? options.name ?? type;
 
   ref.name = name;
 
@@ -53,6 +53,7 @@ schemaBuilderProto.prismaNode = function prismaNode(
   {
     findUnique,
     name,
+    variant,
     ...options
   }: PrismaNodeOptions<SchemaTypes, ModelTypes<PrismaDelegate>, [], never, {}>,
 ) {
@@ -62,16 +63,13 @@ schemaBuilderProto.prismaNode = function prismaNode(
     throw new TypeError('builder.prismaNode requires @pothos/plugin-relay to be installed');
   }
 
-  const typeName = name ?? type;
+  const typeName = variant ?? name ?? type;
   const delegate = getDelegateFromModel(this.options.prisma.client, type);
   const nodeRef = new PrismaNodeRef(typeName);
   const extendedOptions = {
     ...options,
+    variant,
     interfaces: [interfaceRef, ...(options.interfaces ?? [])],
-    extensions: {
-      ...options.extensions,
-      pothosPrismaInclude: options.include,
-    },
     isTypeOf: (val: unknown) => nodeRef.hasBrand(val),
     findUnique: (parent: unknown, context: {}) =>
       findUnique(options.id.resolve(parent as never, context) as string, context),