prisma-guard 1.9.0 → 1.10.0

package/dist/runtime/index.d.cts

@@ -158,7 +158,7 @@ declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends s
     input: (model: Extract<keyof TModels, string>, opts: InputOpts) => InputSchema;
     model: (model: Extract<keyof TModels, string>, opts: ModelOpts) => zod.ZodObject<any, zod_v4_core.$strip>;
     query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn<TCtx> | Record<string, ShapeOrFn<TCtx>>) => QuerySchema<TCtx>;
-    extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn: () => TCtx) => {
+    extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn?: () => TCtx) => {
         name: string;
         model: TModelExt;
         query: {

package/dist/runtime/index.d.ts

@@ -158,7 +158,7 @@ declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends s
     input: (model: Extract<keyof TModels, string>, opts: InputOpts) => InputSchema;
     model: (model: Extract<keyof TModels, string>, opts: ModelOpts) => zod.ZodObject<any, zod_v4_core.$strip>;
     query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn<TCtx> | Record<string, ShapeOrFn<TCtx>>) => QuerySchema<TCtx>;
-    extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn: () => TCtx) => {
+    extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn?: () => TCtx) => {
         name: string;
         model: TModelExt;
         query: {

package/dist/runtime/index.js

@@ -131,8 +131,49 @@ import { z as z3 } from "zod";
 
 // src/runtime/zod-type-map.ts
 import { z as z2 } from "zod";
+
+// src/shared/utils.ts
+function isPlainObject(v) {
+  if (typeof v !== "object" || v === null || Array.isArray(v))
+    return false;
+  const proto = Object.getPrototypeOf(v);
+  return proto === Object.prototype || proto === null;
+}
+function schemaProducesValueForUndefined(schema) {
+  const result = schema.safeParse(void 0);
+  return result.success && result.data !== void 0;
+}
+function isZodSchema(value) {
+  if (value == null || typeof value !== "object")
+    return false;
+  const v = value;
+  return typeof v.parse === "function" && typeof v.optional === "function";
+}
+function coerceToArray(value) {
+  if (Array.isArray(value))
+    return value;
+  if (value === null || value === void 0)
+    return value;
+  if (typeof value !== "object")
+    return value;
+  const keys = Object.keys(value);
+  if (keys.length === 0)
+    return [];
+  const allNumeric = keys.every((k) => /^\d+$/.test(k));
+  if (!allNumeric)
+    return value;
+  const sorted = keys.map(Number).sort((a, b) => a - b);
+  const obj = value;
+  const result = [];
+  for (const idx of sorted) {
+    result.push(obj[String(idx)]);
+  }
+  return result;
+}
+
+// src/runtime/zod-type-map.ts
 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"]),
@@ -182,17 +223,16 @@ function createScalarListOperatorSchema(fieldMeta, operator, enumMap, scalarBase
   if (operator === "isEmpty") {
     return z2.boolean();
   }
-  if (operator === "equals") {
-    const itemMeta2 = { ...fieldMeta, isList: false };
-    const itemBase2 = createBaseType(itemMeta2, enumMap, scalarBase);
-    return fieldMeta.isRequired ? z2.array(itemBase2) : z2.union([z2.array(itemBase2), z2.null()]);
-  }
   const itemMeta = { ...fieldMeta, isList: false };
   const itemBase = createBaseType(itemMeta, enumMap, scalarBase);
   if (operator === "has") {
     return !fieldMeta.isRequired ? z2.union([itemBase, z2.null()]) : itemBase;
   }
-  return z2.array(itemBase);
+  if (operator === "equals") {
+    const arrSchema = z2.array(itemBase);
+    return fieldMeta.isRequired ? z2.preprocess(coerceToArray, arrSchema) : z2.union([z2.preprocess(coerceToArray, arrSchema), z2.null()]);
+  }
+  return z2.preprocess(coerceToArray, z2.array(itemBase));
 }
 function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
   if (fieldMeta.isList) {
@@ -210,10 +250,8 @@ function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
     if (operator === "equals" || operator === "not") {
       return !fieldMeta.isRequired ? z2.union([enumSchema, z2.null()]) : enumSchema;
     }
-    if (!fieldMeta.isRequired) {
-      return z2.array(z2.union([enumSchema, z2.null()]));
-    }
-    return z2.array(enumSchema);
+    const itemSchema = !fieldMeta.isRequired ? z2.union([enumSchema, z2.null()]) : enumSchema;
+    return z2.preprocess(coerceToArray, z2.array(itemSchema));
   }
   const supportedOps = SCALAR_OPERATORS[fieldMeta.type];
   if (!supportedOps) {
@@ -234,32 +272,12 @@ function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
     return !fieldMeta.isRequired ? z2.union([scalar, z2.null()]) : scalar;
   }
   if (operator === "in" || operator === "notIn") {
-    if (!fieldMeta.isRequired) {
-      return z2.array(z2.union([scalar, z2.null()]));
-    }
-    return z2.array(scalar);
+    const itemSchema = !fieldMeta.isRequired ? z2.union([scalar, z2.null()]) : scalar;
+    return z2.preprocess(coerceToArray, z2.array(itemSchema));
   }
   return scalar;
 }
 
-// src/shared/utils.ts
-function isPlainObject(v) {
-  if (typeof v !== "object" || v === null || Array.isArray(v))
-    return false;
-  const proto = Object.getPrototypeOf(v);
-  return proto === Object.prototype || proto === null;
-}
-function schemaProducesValueForUndefined(schema) {
-  const result = schema.safeParse(void 0);
-  return result.success && result.data !== void 0;
-}
-function isZodSchema(value) {
-  if (value == null || typeof value !== "object")
-    return false;
-  const v = value;
-  return typeof v.parse === "function" && typeof v.optional === "function";
-}
-
 // src/runtime/schema-builder.ts
 var DEFAULT_MAX_CACHE = 500;
 var DEFAULT_MAX_DEPTH = 5;
@@ -708,6 +726,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;
@@ -1146,9 +1167,12 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
         );
       }
       if (key === "NOT") {
-        fieldSchemas[key] = z4.union([elementSchema, z4.array(elementSchema).min(1)]).optional();
+        fieldSchemas[key] = z4.union([
+          elementSchema,
+          z4.preprocess(coerceToArray, z4.array(elementSchema).min(1))
+        ]).optional();
       } else {
-        fieldSchemas[key] = z4.array(elementSchema).min(1).optional();
+        fieldSchemas[key] = z4.preprocess(coerceToArray, z4.array(elementSchema).min(1)).optional();
       }
     }
     if (hasWhereForced(result.forced)) {
@@ -1330,14 +1354,26 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
     }
     if (hasClientOps) {
       const opObj = z4.object(opSchemas).strict();
-      fieldSchemas[fieldName] = opObj.refine(
+      const refined = opObj.refine(
         (v) => clientOpKeys.some(
           (k) => v[k] !== void 0
         ),
         {
           message: `At least one operator required for where field "${fieldName}"`
         }
-      ).optional();
+      );
+      if ("equals" in opSchemas) {
+        const equalsBase = createOperatorSchema(
+          fieldMeta,
+          "equals",
+          enumMap,
+          scalarBase
+        );
+        const shorthand = equalsBase.transform((v) => ({ equals: v }));
+        fieldSchemas[fieldName] = z4.union([refined, shorthand]).optional();
+      } else {
+        fieldSchemas[fieldName] = refined.optional();
+      }
     }
     if (Object.keys(fieldForced).length > 0) {
       scalarConditions[fieldName] = fieldForced;
@@ -1439,7 +1475,7 @@ function createArgsBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
       (v) => fieldKeys.some((k) => v[k] !== void 0),
       { message: "orderBy must specify at least one field" }
     );
-    return z5.union([singleSchema, z5.array(singleSchema).min(1)]).optional();
+    return z5.union([singleSchema, z5.preprocess(coerceToArray, z5.array(singleSchema).min(1))]).optional();
   }
   function buildTakeSchema(config) {
     if (!Number.isFinite(config.max) || !Number.isInteger(config.max)) {
@@ -1510,7 +1546,7 @@ function createArgsBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
         throw new ShapeError(`List field "${fieldName}" cannot be used in distinct`);
     }
     const enumSchema = z5.enum(distinctConfig);
-    return z5.union([enumSchema, z5.array(enumSchema).min(1)]).optional();
+    return z5.union([enumSchema, z5.preprocess(coerceToArray, z5.array(enumSchema).min(1))]).optional();
   }
   function buildBySchema(model, byConfig) {
     if (byConfig.length === 0) {
@@ -1532,7 +1568,7 @@ function createArgsBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
         throw new ShapeError(`List field "${fieldName}" cannot be used in by`);
     }
     const enumSchema = z5.enum(byConfig);
-    return z5.union([enumSchema, z5.array(enumSchema).min(1)]);
+    return z5.union([enumSchema, z5.preprocess(coerceToArray, z5.array(enumSchema).min(1))]);
   }
   function buildHavingSchema(model, havingConfig) {
     const modelFields = typeMap[model];
@@ -2110,11 +2146,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)) {
@@ -2224,7 +2255,7 @@ function createQueryBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
             ),
             { message: "orderBy must specify at least one field" }
           );
-          schemaFields["orderBy"] = z7.union([singleSchema, z7.array(singleSchema).min(1)]).optional();
+          schemaFields["orderBy"] = z7.union([singleSchema, z7.preprocess(coerceToArray, z7.array(singleSchema).min(1))]).optional();
         } else {
           const groupByOrderFields = {};
           for (const [fieldName, config] of Object.entries(shape.orderBy)) {
@@ -2267,7 +2298,7 @@ function createQueryBuilder(typeMap, enumMap, uniqueMap, scalarBase) {
             ),
             { message: "orderBy must specify at least one field" }
           );
-          schemaFields["orderBy"] = z7.union([singleSchema, z7.array(singleSchema).min(1)]).optional();
+          schemaFields["orderBy"] = z7.union([singleSchema, z7.preprocess(coerceToArray, z7.array(singleSchema).min(1))]).optional();
         }
       } else {
         schemaFields["orderBy"] = argsBuilder.buildOrderBySchema(
@@ -3364,9 +3395,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 +3446,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)
@@ -3916,7 +3949,9 @@ function createModelGuardExtension(config) {
 
 // src/runtime/guard.ts
 function createGuard(config) {
-  const scalarBase = createScalarBase(config.guardConfig.strictDecimal ?? false);
+  const scalarBase = createScalarBase(
+    config.guardConfig.strictDecimal ?? false
+  );
   const schemaBuilder = createSchemaBuilder(
     config.typeMap,
     config.zodChains,
@@ -3930,11 +3965,15 @@ function createGuard(config) {
     config.uniqueMap ?? {},
     scalarBase
   );
-  const log = config.logger ?? { warn: (msg) => console.warn(msg) };
+  const log = config.logger ?? {
+    warn: (msg) => console.warn(msg)
+  };
   const wrapZodErrors = config.wrapZodErrors ?? false;
   function rethrowZod(err) {
     if (err instanceof ZodError) {
-      throw new ShapeError(`Validation failed: ${formatZodError(err)}`, { cause: err });
+      throw new ShapeError(`Validation failed: ${formatZodError(err)}`, {
+        cause: err
+      });
     }
     throw err;
   }
@@ -3971,6 +4010,7 @@ function createGuard(config) {
       };
     },
     extension: (contextFn) => {
+      const effectiveContextFn = contextFn ?? (() => ({}));
       const scopeRoots = /* @__PURE__ */ new Set();
       for (const entries of Object.values(config.scopeMap)) {
         for (const entry of entries) {
@@ -3978,7 +4018,7 @@ function createGuard(config) {
         }
       }
       const scopeCtxFn = () => {
-        const ctx = validateContext(contextFn());
+        const ctx = validateContext(effectiveContextFn());
         const scopeCtx = {};
         for (const key of Object.keys(ctx)) {
           if (!scopeRoots.has(key))
@@ -4008,7 +4048,7 @@ function createGuard(config) {
         uniqueMap: config.uniqueMap ?? {},
         scopeMap: config.scopeMap,
         guardConfig: config.guardConfig,
-        contextFn,
+        contextFn: effectiveContextFn,
         wrapZodErrors
       });
       return {