prisma-guard 1.9.0 → 1.9.1

package/dist/runtime/index.js

@@ -132,7 +132,7 @@ import { z as z3 } from "zod";
 // src/runtime/zod-type-map.ts
 import { z as z2 } from "zod";
 var SCALAR_OPERATORS = {
-  String: /* @__PURE__ */ new Set(["equals", "not", "contains", "startsWith", "endsWith", "in", "notIn"]),
+  String: /* @__PURE__ */ new Set(["equals", "not", "contains", "startsWith", "endsWith", "in", "notIn", "gt", "gte", "lt", "lte"]),
   Int: /* @__PURE__ */ new Set(["equals", "not", "gt", "gte", "lt", "lte", "in", "notIn"]),
   Float: /* @__PURE__ */ new Set(["equals", "not", "gt", "gte", "lt", "lte", "in", "notIn"]),
   Decimal: /* @__PURE__ */ new Set(["equals", "not", "gt", "gte", "lt", "lte", "in", "notIn"]),
@@ -708,6 +708,9 @@ function applyBuiltShape(built, body, isUniqueMethod) {
   const hasWhereInSchema = "where" in built.zodSchema.shape;
   if (isPlainObject(body)) {
     const bodyObj = body;
+    if ("select" in bodyObj && "include" in bodyObj) {
+      throw new ShapeError('Request cannot define both "include" and "select"');
+    }
     if ("where" in bodyObj) {
       if (!hasWhereInSchema) {
         const { where: _, ...rest } = bodyObj;
@@ -2110,11 +2113,6 @@ function createQueryBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
     if (UNIQUE_WHERE_METHODS.has(method) && !shape.where) {
       throw new ShapeError(`${method} shape must define "where"`);
     }
-    if (shape.include && shape.select) {
-      throw new ShapeError(
-        'Shape config cannot define both "include" and "select".'
-      );
-    }
     if (method === "groupBy" && !shape.by)
       throw new ShapeError('groupBy shape must define "by"');
     if (method === "groupBy" && (shape.include || shape.select)) {
@@ -3364,9 +3362,6 @@ function createModelGuardExtension(config) {
       return queryBuilder.buildWhereSchema(modelName, whereConfig);
     }
     function buildProjectionSchema(shape) {
-      if (shape.select && shape.include) {
-        throw new ShapeError('Shape cannot define both "select" and "include"');
-      }
       const schemaFields = {};
       let forcedIncludeTree = {};
       let forcedSelectTree = {};
@@ -3418,6 +3413,11 @@ function createModelGuardExtension(config) {
           `Guard shape does not define "select" or "include" for ${method} return projection`
         );
       }
+      if ("select" in parsed && "include" in parsed) {
+        throw new ShapeError(
+          'Request body cannot define both "select" and "include"'
+        );
+      }
       if (!hasShapeProjection)
         return {};
       if (!hasBodyProjection && !enforceProjection)