@pothos/plugin-prisma 3.13.2 → 3.16.0

package/lib/util/selections.js

@@ -1,4 +1,4 @@
-"use strict";
+/* eslint-disable no-param-reassign */ /* eslint-disable no-underscore-dangle */ "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -9,12 +9,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    selectionCompatible: ()=>selectionCompatible,
+    stateCompatible: ()=>stateCompatible,
+    mergeState: ()=>mergeState,
     createState: ()=>createState,
     mergeSelection: ()=>mergeSelection,
-    mergeState: ()=>mergeState,
-    selectionCompatible: ()=>selectionCompatible,
-    selectionToQuery: ()=>selectionToQuery,
-    stateCompatible: ()=>stateCompatible
+    selectionToQuery: ()=>selectionToQuery
 });
 const _deepEqual = require("./deep-equal");
 function selectionCompatible(state, selectionMap, ignoreQuery = false) {

package/lib/util/selections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/selections.ts"],"names":["createState","mergeSelection","mergeState","selectionCompatible","selectionToQuery","stateCompatible","state","selectionMap","ignoreQuery","Object","keys","query","length","select","include","some","key","compare","deepEqual","value","fieldMap","relations","has","get","newState","name","relationState","mode","fields","add","parent","Set","counts","Map","mappings","forEach","merge","count","selection","childMap","relatedState","set","nestedIncludes","hasSelection","sel","relation","nested","size","_count","field"],"mappings":"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"}
+{"version":3,"sources":["../../src/util/selections.ts"],"names":["selectionCompatible","stateCompatible","mergeState","createState","mergeSelection","selectionToQuery","state","selectionMap","ignoreQuery","Object","keys","query","length","select","include","some","key","compare","deepEqual","value","fieldMap","relations","has","get","newState","name","relationState","mode","fields","add","parent","Set","counts","Map","mappings","forEach","merge","count","selection","childMap","relatedState","set","nestedIncludes","hasSelection","sel","relation","nested","size","_count","field"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-prisma",
-  "version": "3.13.2",
+  "version": "3.16.0",
   "description": "A Pothos plugin for more efficient integration with prisma",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@prisma/generator-helper": "^4.0.0"
+    "@prisma/generator-helper": "^4.1.0"
   },
   "prisma": {
     "seed": "node prisma/seed.mjs"
@@ -49,15 +49,15 @@
     "typescript": ">=4.7.2"
   },
   "devDependencies": {
-    "@pothos/core": "3.12.2",
-    "@pothos/plugin-errors": "3.4.2",
-    "@pothos/plugin-relay": "3.16.0",
-    "@pothos/plugin-complexity": "3.5.0",
-    "@pothos/test-utils": "1.2.3",
-    "@prisma/client": "^4.0.0",
+    "@pothos/core": "3.13.0",
+    "@pothos/plugin-complexity": "3.6.0",
+    "@pothos/plugin-errors": "3.5.0",
+    "@pothos/plugin-relay": "3.17.0",
+    "@pothos/test-utils": "1.3.0",
+    "@prisma/client": "^4.1.0",
     "graphql": "16.5.0",
     "graphql-tag": "^2.12.6",
-    "prisma": "^4.0.0"
+    "prisma": "^4.1.0"
   },
   "scripts": {
     "generate": "prisma generate",

package/src/global-types.ts

@@ -17,19 +17,18 @@ import PrismaNodeRef from './node-ref';
 import { prismaModelKey, PrismaObjectRef } from './object-ref';
 import { PrismaObjectFieldBuilder as InternalPrismaObjectFieldBuilder } from './prisma-field-builder';
 import {
+  PrismaClient,
   PrismaConnectionFieldOptions,
   PrismaFieldOptions,
   PrismaModelTypes,
   PrismaNodeOptions,
-  PrismaObjectTypeOptions,
-} from './types';
-import {
-  PrismaClient,
   PrismaObjectFieldOptions,
-  PrismaPlugin,
+  PrismaObjectTypeOptions,
   ShapeFromConnection,
   ShapeFromSelection,
-} from '.';
+} from './types';
+
+import type { PrismaPlugin } from '.';
 
 declare global {
   export namespace PothosSchemaTypes {

package/src/node-ref.ts

@@ -1,7 +1,6 @@
 import { abstractReturnShapeKey, brandWithType, typeBrandKey } from '@pothos/core';
 import { PrismaObjectRef } from './object-ref';
-import { WithBrand } from './types';
-import { PrismaModelTypes } from '.';
+import type { PrismaModelTypes, WithBrand } from './types';
 
 export default class PrismaNodeRef<Model extends PrismaModelTypes, T> extends PrismaObjectRef<
   Model,

package/src/object-ref.ts

@@ -1,5 +1,5 @@
 import { ObjectRef } from '@pothos/core';
-import { PrismaModelTypes } from '.';
+import type { PrismaModelTypes } from './types';
 
 export const prismaModelKey = Symbol.for('Pothos.prismaModelKey');
 

package/src/prisma-field-builder.ts

@@ -179,26 +179,15 @@ export class PrismaObjectFieldBuilder<
       context: object,
       nestedQuery: (query: unknown, path: unknown) => unknown,
     ) => {
-      const nested = nestedQuery(
-        {
-          ...((typeof query === 'function' ? query(args, context) : query) as {}),
-          ...prismaCursorConnectionQuery({
-            parseCursor,
-            maxSize,
-            defaultSize,
-            args,
-          }),
-        },
-        {
-          getType: () => {
-            if (!typeName) {
-              typeName = this.builder.configStore.getTypeConfig(ref).name;
-            }
-            return typeName;
-          },
-          path: [{ name: 'edges' }, { name: 'node' }],
+      const nested = nestedQuery(getQuery(args, context), {
+        getType: () => {
+          if (!typeName) {
+            typeName = this.builder.configStore.getTypeConfig(ref).name;
+          }
+          return typeName;
         },
-      ) as SelectionMap;
+        path: [{ name: 'edges' }, { name: 'node' }],
+      }) as SelectionMap;
 
       return {
         select: {
@@ -239,7 +228,7 @@ export class PrismaObjectFieldBuilder<
                 resolve(
                   {
                     ...q,
-                    ...(typeof query === 'function' ? query(args, context) : query),
+                    ...getQuery(args, context),
                   } as never,
                   parent,
                   args,

package/src/types.ts

@@ -20,7 +20,7 @@ import {
   typeBrandKey,
   TypeParam,
 } from '@pothos/core';
-import { PrismaObjectFieldBuilder } from './field-builder';
+import type { PrismaObjectFieldBuilder } from './field-builder';
 import { PrismaObjectRef } from './object-ref';
 
 export interface PrismaDelegate {
@@ -557,7 +557,7 @@ export type RelatedConnectionOptions<
           args: InputShapeFromFields<Args>,
           context: Types['Context'],
           info: GraphQLResolveInfo,
-        ) => MaybePromise<Model['Relations'][Field & keyof Model['Relations']]>;
+        ) => MaybePromise<Model['Relations'][Field & keyof Model['Relations']]['Shape']>;
       }
     : {
         resolve: (
@@ -571,7 +571,7 @@ export type RelatedConnectionOptions<
           args: InputShapeFromFields<Args>,
           context: Types['Context'],
           info: GraphQLResolveInfo,
-        ) => MaybePromise<Model['Relations'][Field & keyof Model['Relations']]>;
+        ) => MaybePromise<Model['Relations'][Field & keyof Model['Relations']]['Shape']>;
       });
 
 export type WithBrand<T> = T & { [typeBrandKey]: string };

package/src/util/cursors.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { MaybePromise, SchemaTypes } from '@pothos/core';
+// eslint-disable-next-line import/no-cycle
 import { getModel } from './datamodel';
 import { DMMFField } from './get-client';
 

package/src/util/datamodel.ts

@@ -1,6 +1,7 @@
 import { ObjectRef, SchemaTypes } from '@pothos/core';
 import { PrismaObjectRef } from '../object-ref';
 import { PrismaClient, PrismaDelegate, PrismaModelTypes } from '../types';
+// eslint-disable-next-line import/no-cycle
 import { formatCursor, parseCompositeCursor, parseRawCursor } from './cursors';
 import { getDMMF } from './get-client';
 
@@ -56,7 +57,7 @@ export function getModel<Types extends SchemaTypes>(
   builder: PothosSchemaTypes.SchemaBuilder<Types>,
 ) {
   const dmmf = getDMMF(builder);
-  const modelData = dmmf.modelMap[name];
+  const modelData = dmmf.datamodel.models.find((model) => model.name === name);
 
   if (!modelData) {
     throw new Error(`Model '${name}' not found in DMMF`);

package/src/util/get-client.ts

@@ -13,17 +13,14 @@ export interface DMMFField {
 }
 
 interface DMMF {
-  datamodel: unknown;
-  modelMap: Record<
-    string,
-    {
+  datamodel: {
+    models: {
       name: string;
       fields: DMMFField[];
-      fieldMap?: Record<string, DMMFField>;
       primaryKey: { name: string | null; fields: string[] } | null;
       uniqueIndexes: { name: string | null; fields: string[] }[];
-    }
-  >;
+    }[];
+  };
 }
 
 const prismaClientCache = createContextCache(