@pothos/plugin-prisma 4.3.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-prisma",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "A Pothos plugin for more efficient integration with prisma",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -54,7 +54,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@prisma/generator-helper": "^5.19.1"
+    "@prisma/generator-helper": "^6.0.0"
   },
   "prisma": {
     "seed": "node prisma/seed.mjs"
@@ -66,14 +66,14 @@
     "typescript": ">=4.7.2"
   },
   "devDependencies": {
-    "@prisma/client": "^5.19.1",
-    "graphql": ">=16.6.0",
-    "graphql-scalars": "^1.23.0",
+    "@prisma/client": "^6.0.0",
+    "graphql": "^16.8.1",
+    "graphql-scalars": "^1.24.0",
     "graphql-tag": "^2.12.6",
-    "prisma": "^5.19.1",
-    "vitest": "^2.0.5",
-    "@pothos/plugin-complexity": "4.1.0",
+    "prisma": "^6.0.0",
+    "vitest": "^2.1.6",
     "@pothos/core": "4.3.0",
+    "@pothos/plugin-complexity": "4.1.0",
     "@pothos/plugin-errors": "4.2.0",
     "@pothos/plugin-relay": "4.3.0",
     "@pothos/plugin-simple-objects": "4.1.0",

package/src/connection-helpers.ts

@@ -138,7 +138,7 @@ export function prismaConnectionHelpers<
       mergeSelection(selectState, nestedSelect);
     }
 
-    const baseQuery = typeof query === 'function' ? query(args, ctx) : query ?? {};
+    const baseQuery = typeof query === 'function' ? query(args, ctx) : (query ?? {});
 
     return {
       ...baseQuery,

package/src/model-loader.ts

@@ -39,8 +39,6 @@ export class ModelLoader {
     models: Map<object, ResolvablePromise<Record<string, unknown> | null>>;
   }>();
 
-  delegate: PrismaDelegate;
-
   tick = Promise.resolve();
 
   constructor(
@@ -53,10 +51,6 @@ export class ModelLoader {
     this.builder = builder;
     this.findUnique = findUnique;
     this.modelName = modelName;
-    this.delegate = getDelegateFromModel(
-      getClient(this.builder, this.context as never),
-      this.modelName,
-    );
   }
 
   static forRef<Types extends SchemaTypes>(
@@ -75,7 +69,7 @@ export class ModelLoader {
             ? () => {
                 throw new PothosSchemaError(`Missing findUnique for ${ref.name}`);
               }
-            : findUnique ?? ModelLoader.getDefaultFindUnique(ref, modelName, builder),
+            : (findUnique ?? ModelLoader.getDefaultFindUnique(ref, modelName, builder)),
         ),
     );
   }
@@ -285,6 +279,11 @@ export class ModelLoader {
   }
 
   async initLoad(state: SelectionState, initialModel: {}) {
+    const delegate = getDelegateFromModel(
+      getClient(this.builder, this.context as never),
+      this.modelName,
+    );
+
     const models = new Map<object, ResolvablePromise<Record<string, unknown> | null>>();
 
     const promise = createResolvablePromise<Record<string, unknown> | null>();
@@ -302,15 +301,15 @@ export class ModelLoader {
       this.staged.delete(entry);
 
       for (const [model, { resolve, reject }] of entry.models) {
-        if (this.delegate.findUniqueOrThrow) {
-          this.delegate
+        if (delegate.findUniqueOrThrow) {
+          delegate
             .findUniqueOrThrow({
               ...selectionToQuery(state),
               where: { ...(this.findUnique(model as Record<string, unknown>, this.context) as {}) },
             } as never)
             .then(resolve as () => {}, reject);
         } else {
-          this.delegate
+          delegate
             .findUnique({
               rejectOnNotFound: true,
               ...selectionToQuery(state),

package/src/util/cursors.ts

@@ -178,7 +178,10 @@ export function serializeID(id: unknown, dataType: string) {
     case 'Json':
       return JSON.stringify(id);
     case 'Byte':
-      return (id as Buffer).toString('base64');
+      if (id instanceof Uint8Array) {
+        return Buffer.from(id).toString('base64');
+      }
+      return (id as Buffer | Uint8Array).toString('base64');
     default:
       return String(id);
   }
@@ -284,7 +287,7 @@ export function wrapConnectionResult<T extends {}>(
 ) {
   const gotFullResults = results.length === Math.abs(take);
   const hasNextPage = args.before ? true : args.last ? false : gotFullResults;
-  const hasPreviousPage = args.after ? true : args.before ?? args.last ? gotFullResults : false;
+  const hasPreviousPage = args.after ? true : (args.before ?? args.last) ? gotFullResults : false;
   const nodes = gotFullResults
     ? results.slice(take < 0 ? 1 : 0, take < 0 ? results.length : -1)
     : results;

package/src/util/description.ts

@@ -14,7 +14,7 @@ export function getFieldDescription<Types extends SchemaTypes>(
 
   return (
     (usePrismaDescription
-      ? description ?? getFieldData(model, builder, fieldName).documentation
+      ? (description ?? getFieldData(model, builder, fieldName).documentation)
       : description) || undefined
   );
 }
@@ -30,7 +30,8 @@ export function getModelDescription<Types extends SchemaTypes>(
     (typeof exposeDescriptions === 'object' && exposeDescriptions?.models === true);
 
   return (
-    (usePrismaDescription ? description ?? getModel(model, builder).documentation : description) ||
-    undefined
+    (usePrismaDescription
+      ? (description ?? getModel(model, builder).documentation)
+      : description) || undefined
   );
 }

package/src/util/map-query.ts

@@ -547,7 +547,7 @@ function normalizeInclude(
   type: GraphQLNamedType,
   expectedType?: GraphQLNamedType,
 ): IndirectInclude {
-  let currentType = path.length > 0 ? type : expectedType ?? type;
+  let currentType = path.length > 0 ? type : (expectedType ?? type);
 
   const normalized: { name: string; type: string }[] = [];