prisma-guard 1.15.0 → 1.17.0

package/dist/runtime/index.js

@@ -84,10 +84,7 @@ function isJsonSafe(value) {
   return true;
 }
 var DECIMAL_REGEX = /^-?(\d+\.?\d*|\.\d+)([eE]-?\d+)?$/;
-var decimalStringSchema = z.string().refine(
-  (s) => DECIMAL_REGEX.test(s),
-  "Invalid decimal string"
-);
+var decimalStringSchema = z.string().refine((s) => DECIMAL_REGEX.test(s), "Invalid decimal string");
 var decimalObjectSchema = z.custom(
   (v) => v !== null && typeof v === "object" && typeof v.toFixed === "function" && typeof v.toNumber === "function",
   "Expected Decimal-compatible object"
@@ -113,18 +110,39 @@ function createScalarBase(strictDecimal) {
       z.string().regex(/^-?\d+$/).transform((v) => BigInt(v))
     ]),
     Boolean: () => z.boolean(),
-    DateTime: () => z.union([
-      z.date(),
-      z.string().datetime({ offset: true })
-    ]).pipe(z.coerce.date()),
-    Json: () => z.unknown().refine(isJsonSafe, "Value must be JSON-serializable (no undefined, functions, symbols, class instances, NaN, Infinity, or circular references)"),
-    Bytes: () => z.union([
-      z.string(),
-      z.custom((v) => v instanceof Uint8Array)
-    ])
+    DateTime: () => z.union([z.date(), z.string().datetime({ offset: true })]).pipe(z.coerce.date()),
+    Json: () => z.unknown().refine(
+      isJsonSafe,
+      "Value must be JSON-serializable (no undefined, functions, symbols, class instances, NaN, Infinity, or circular references)"
+    ),
+    Bytes: () => z.union([z.string(), z.custom((v) => v instanceof Uint8Array)])
   };
 }
 var SCALAR_BASE = createScalarBase(false);
+function wrapWithInputCoercion(fieldType, isList, schema) {
+  let itemCoercion = null;
+  switch (fieldType) {
+    case "String":
+      itemCoercion = z.union([z.string(), z.number().transform(String)]);
+      break;
+    case "Int":
+      itemCoercion = z.union([
+        z.number().int(),
+        z.string().regex(/^-?\d+$/).transform(Number)
+      ]);
+      break;
+    case "Float":
+      itemCoercion = z.union([
+        z.number(),
+        z.string().regex(/^-?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$/).transform(Number)
+      ]);
+      break;
+    default:
+      return schema;
+  }
+  const coercion = isList ? z.array(itemCoercion) : itemCoercion;
+  return coercion.pipe(schema);
+}
 
 // src/runtime/schema-builder.ts
 import { z as z3 } from "zod";
@@ -173,19 +191,65 @@ function coerceToArray(value) {
 
 // src/runtime/zod-type-map.ts
 var SCALAR_OPERATORS = {
-  String: /* @__PURE__ */ new Set(["equals", "not", "contains", "startsWith", "endsWith", "in", "notIn", "gt", "gte", "lt", "lte"]),
+  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"]),
   BigInt: /* @__PURE__ */ new Set(["equals", "not", "gt", "gte", "lt", "lte", "in", "notIn"]),
   Boolean: /* @__PURE__ */ new Set(["equals", "not"]),
   DateTime: /* @__PURE__ */ new Set(["equals", "not", "gt", "gte", "lt", "lte", "in", "notIn"]),
-  Bytes: /* @__PURE__ */ new Set([])
+  Bytes: /* @__PURE__ */ new Set([]),
+  Json: /* @__PURE__ */ new Set([
+    "equals",
+    "not",
+    "path",
+    "string_contains",
+    "string_starts_with",
+    "string_ends_with",
+    "array_contains",
+    "array_starts_with",
+    "array_ends_with"
+  ])
 };
-var SCALAR_LIST_OPERATORS = /* @__PURE__ */ new Set(["has", "hasEvery", "hasSome", "isEmpty", "equals"]);
+var SCALAR_LIST_OPERATORS = /* @__PURE__ */ new Set([
+  "has",
+  "hasEvery",
+  "hasSome",
+  "isEmpty",
+  "equals"
+]);
 var ENUM_OPERATORS = /* @__PURE__ */ new Set(["equals", "not", "in", "notIn"]);
 var NUMERIC_TYPES = /* @__PURE__ */ new Set(["Int", "Float", "Decimal", "BigInt"]);
-var COMPARABLE_TYPES = /* @__PURE__ */ new Set(["Int", "Float", "Decimal", "BigInt", "String", "DateTime"]);
+var COMPARABLE_TYPES = /* @__PURE__ */ new Set([
+  "Int",
+  "Float",
+  "Decimal",
+  "BigInt",
+  "String",
+  "DateTime"
+]);
+var JSON_STRING_OPERATORS = /* @__PURE__ */ new Set([
+  "string_contains",
+  "string_starts_with",
+  "string_ends_with"
+]);
+var JSON_ARRAY_OPERATORS = /* @__PURE__ */ new Set([
+  "array_contains",
+  "array_starts_with",
+  "array_ends_with"
+]);
 function getSupportedOperators(fieldMeta) {
   if (fieldMeta.isList)
     return [...SCALAR_LIST_OPERATORS];
@@ -220,7 +284,9 @@ function createBaseType(fieldMeta, enumMap, scalarBase) {
 }
 function createScalarListOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
   if (!SCALAR_LIST_OPERATORS.has(operator)) {
-    throw new ShapeError(`Operator "${operator}" not supported for scalar list fields`);
+    throw new ShapeError(
+      `Operator "${operator}" not supported for scalar list fields`
+    );
   }
   if (operator === "isEmpty") {
     return z2.boolean();
@@ -236,9 +302,32 @@ function createScalarListOperatorSchema(fieldMeta, operator, enumMap, scalarBase
   }
   return z2.preprocess(coerceToArray, z2.array(itemBase));
 }
+function createJsonOperatorSchema(fieldMeta, operator) {
+  const jsonValue = z2.unknown();
+  if (operator === "equals" || operator === "not") {
+    return !fieldMeta.isRequired ? z2.union([jsonValue, z2.null()]) : jsonValue;
+  }
+  if (operator === "path") {
+    return z2.preprocess(coerceToArray, z2.array(z2.string()).min(1));
+  }
+  if (JSON_STRING_OPERATORS.has(operator)) {
+    return z2.string();
+  }
+  if (JSON_ARRAY_OPERATORS.has(operator)) {
+    return jsonValue;
+  }
+  throw new ShapeError(
+    `Operator "${operator}" not supported for Json fields`
+  );
+}
 function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
   if (fieldMeta.isList) {
-    return createScalarListOperatorSchema(fieldMeta, operator, enumMap, scalarBase);
+    return createScalarListOperatorSchema(
+      fieldMeta,
+      operator,
+      enumMap,
+      scalarBase
+    );
   }
   if (fieldMeta.isEnum) {
     const values = enumMap[fieldMeta.type];
@@ -246,7 +335,9 @@ function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
       throw new ShapeError(`Unknown enum: ${fieldMeta.type}`);
     }
     if (!ENUM_OPERATORS.has(operator)) {
-      throw new ShapeError(`Operator "${operator}" not supported for enum fields`);
+      throw new ShapeError(
+        `Operator "${operator}" not supported for enum fields`
+      );
     }
     const enumSchema = z2.enum(values);
     if (operator === "equals" || operator === "not") {
@@ -255,29 +346,43 @@ function createOperatorSchema(fieldMeta, operator, enumMap, scalarBase) {
     const itemSchema = !fieldMeta.isRequired ? z2.union([enumSchema, z2.null()]) : enumSchema;
     return z2.preprocess(coerceToArray, z2.array(itemSchema));
   }
+  if (fieldMeta.type === "Json") {
+    const supportedOps2 = SCALAR_OPERATORS["Json"];
+    if (!supportedOps2 || !supportedOps2.has(operator)) {
+      throw new ShapeError(
+        `Operator "${operator}" not supported for type "Json"`
+      );
+    }
+    return createJsonOperatorSchema(fieldMeta, operator);
+  }
   const supportedOps = SCALAR_OPERATORS[fieldMeta.type];
   if (!supportedOps) {
     throw new ShapeError(`Unknown scalar type for operator: ${fieldMeta.type}`);
   }
   if (supportedOps.size === 0) {
-    throw new ShapeError(`Type "${fieldMeta.type}" does not support filter operators`);
+    throw new ShapeError(
+      `Type "${fieldMeta.type}" does not support filter operators`
+    );
   }
   if (!supportedOps.has(operator)) {
-    throw new ShapeError(`Operator "${operator}" not supported for type "${fieldMeta.type}"`);
+    throw new ShapeError(
+      `Operator "${operator}" not supported for type "${fieldMeta.type}"`
+    );
   }
   const factory = scalarBase[fieldMeta.type];
   if (!factory) {
     throw new ShapeError(`Unknown scalar type: ${fieldMeta.type}`);
   }
   const scalar = factory();
+  const coerced = wrapWithInputCoercion(fieldMeta.type, false, scalar);
   if (operator === "equals" || operator === "not") {
-    return !fieldMeta.isRequired ? z2.union([scalar, z2.null()]) : scalar;
+    return !fieldMeta.isRequired ? z2.union([coerced, z2.null()]) : coerced;
   }
   if (operator === "in" || operator === "notIn") {
-    const itemSchema = !fieldMeta.isRequired ? z2.union([scalar, z2.null()]) : scalar;
+    const itemSchema = !fieldMeta.isRequired ? z2.union([coerced, z2.null()]) : coerced;
     return z2.preprocess(coerceToArray, z2.array(itemSchema));
   }
-  return scalar;
+  return coerced;
 }
 
 // src/runtime/schema-builder.ts
@@ -327,6 +432,9 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
         );
       }
     }
+    if (!fieldMeta.isEnum && !fieldMeta.isRelation && !fieldMeta.isUnsupported) {
+      result = wrapWithInputCoercion(fieldMeta.type, fieldMeta.isList, result);
+    }
     lruSet(chainCache, cacheKey, result, DEFAULT_MAX_CACHE);
     return result;
   }
@@ -359,9 +467,13 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
         if (!modelFields[name])
           throw new ShapeError(`Unknown field "${name}" on model "${model}"`);
         if (modelFields[name].isRelation)
-          throw new ShapeError(`Field "${name}" cannot be used in input schema (relation field)`);
+          throw new ShapeError(
+            `Field "${name}" cannot be used in input schema (relation field)`
+          );
         if (modelFields[name].isUpdatedAt)
-          throw new ShapeError(`Field "${name}" cannot be used in input schema (updatedAt field)`);
+          throw new ShapeError(
+            `Field "${name}" cannot be used in input schema (updatedAt field)`
+          );
       }
       fieldNames = fieldNames.filter((n) => opts.pick.includes(n));
     } else if (opts.omit) {
@@ -435,7 +547,9 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
     }
     const effectiveMaxDepth = maxDepth ?? opts.maxDepth ?? DEFAULT_MAX_DEPTH;
     if (depth > effectiveMaxDepth) {
-      throw new ShapeError(`Maximum include depth (${effectiveMaxDepth}) exceeded`);
+      throw new ShapeError(
+        `Maximum include depth (${effectiveMaxDepth}) exceeded`
+      );
     }
     const modelFields = typeMap[model];
     if (!modelFields)
@@ -446,7 +560,9 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
         if (!modelFields[name])
           throw new ShapeError(`Unknown field "${name}" on model "${model}"`);
         if (modelFields[name].isRelation && !includeKeys.has(name)) {
-          throw new ShapeError(`Field "${name}" is a relation on model "${model}". Use include: { ${name}: ... } instead of pick.`);
+          throw new ShapeError(
+            `Field "${name}" is a relation on model "${model}". Use include: { ${name}: ... } instead of pick.`
+          );
         }
       }
     }
@@ -479,10 +595,14 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
       if (!fieldMeta)
         throw new ShapeError(`Unknown field "${relName}" on model "${model}"`);
       if (!fieldMeta.isRelation)
-        throw new ShapeError(`Field "${relName}" is not a relation on model "${model}"`);
+        throw new ShapeError(
+          `Field "${relName}" is not a relation on model "${model}"`
+        );
       const relatedModel = fieldMeta.type;
       if (!typeMap[relatedModel]) {
-        throw new ShapeError(`Related model "${relatedModel}" not found in type map`);
+        throw new ShapeError(
+          `Related model "${relatedModel}" not found in type map`
+        );
       }
       let relSchema = buildModelSchema(
         relatedModel,
@@ -511,11 +631,17 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
         const countFields = {};
         for (const relName of Object.keys(opts._count)) {
           if (!modelFields[relName])
-            throw new ShapeError(`Unknown field "${relName}" on model "${model}" in _count`);
+            throw new ShapeError(
+              `Unknown field "${relName}" on model "${model}" in _count`
+            );
           if (!modelFields[relName].isRelation)
-            throw new ShapeError(`Field "${relName}" is not a relation on model "${model}" in _count`);
+            throw new ShapeError(
+              `Field "${relName}" is not a relation on model "${model}" in _count`
+            );
           if (!modelFields[relName].isList)
-            throw new ShapeError(`Field "${relName}" is a to-one relation on model "${model}" in _count. Only to-many relations support _count.`);
+            throw new ShapeError(
+              `Field "${relName}" is a to-one relation on model "${model}" in _count. Only to-many relations support _count.`
+            );
           countFields[relName] = z3.number().int().min(0);
         }
         schemaMap["_count"] = z3.object(countFields);
@@ -527,7 +653,12 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
     }
     return schema;
   }
-  return { buildFieldSchema, buildBaseFieldSchema, buildInputSchema, buildModelSchema };
+  return {
+    buildFieldSchema,
+    buildBaseFieldSchema,
+    buildInputSchema,
+    buildModelSchema
+  };
 }
 
 // src/runtime/query-builder.ts
@@ -981,13 +1112,18 @@ function validateUniqueEquality(model, where, method, uniqueMap, typeMap) {
 }
 
 // src/runtime/query-builder-where.ts
-var UNSUPPORTED_WHERE_TYPES = /* @__PURE__ */ new Set(["Json", "Bytes"]);
+var UNSUPPORTED_WHERE_TYPES = /* @__PURE__ */ new Set(["Bytes"]);
 var STRING_MODE_OPS = /* @__PURE__ */ new Set([
   "contains",
   "startsWith",
   "endsWith",
   "equals"
 ]);
+var JSON_STRING_MODE_OPS = /* @__PURE__ */ new Set([
+  "string_contains",
+  "string_starts_with",
+  "string_ends_with"
+]);
 var MAX_WHERE_DEPTH = 10;
 function safeStringify(v) {
   if (typeof v === "bigint")
@@ -1083,6 +1219,13 @@ function mergeRelationForcedMaps(target, source) {
     }
   }
 }
+function isModeCompatibleOp(fieldType, op) {
+  if (fieldType === "String")
+    return STRING_MODE_OPS.has(op);
+  if (fieldType === "Json")
+    return JSON_STRING_MODE_OPS.has(op);
+  return false;
+}
 function createWhereBuilder(typeMap, enumMap, scalarBase) {
   function buildWhereSchema(model, whereConfig, depth) {
     const currentDepth = depth ?? 0;
@@ -1285,7 +1428,7 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
     const opSchemas = {};
     const fieldForced = {};
     let hasClientOps = false;
-    let hasStringModeOp = false;
+    let hasModeCompatibleOp = false;
     const clientOpKeys = [];
     let modeConfigValue = void 0;
     let hasModeConfig = false;
@@ -1304,8 +1447,8 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
         ).optional();
         hasClientOps = true;
         clientOpKeys.push(op);
-        if (fieldMeta.type === "String" && !fieldMeta.isList && STRING_MODE_OPS.has(op)) {
-          hasStringModeOp = true;
+        if (!fieldMeta.isList && isModeCompatibleOp(fieldMeta.type, op)) {
+          hasModeCompatibleOp = true;
         }
       } else {
         const actualOpValue = isForcedValue(opValue) ? opValue.value : opValue;
@@ -1324,15 +1467,15 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
           );
         }
         fieldForced[op] = parsed;
-        if (fieldMeta.type === "String" && !fieldMeta.isList && STRING_MODE_OPS.has(op)) {
-          hasStringModeOp = true;
+        if (!fieldMeta.isList && isModeCompatibleOp(fieldMeta.type, op)) {
+          hasModeCompatibleOp = true;
         }
       }
     }
     if (!hasClientOps && Object.keys(fieldForced).length === 0) {
       if (hasModeConfig) {
         throw new ShapeError(
-          `Where field "${fieldName}" on model "${model}" has "mode" but no operators. Add at least one operator (contains, startsWith, endsWith, equals).`
+          `Where field "${fieldName}" on model "${model}" has "mode" but no operators. Add at least one compatible operator.`
         );
       }
       throw new ShapeError(
@@ -1340,9 +1483,9 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
       );
     }
     if (hasModeConfig) {
-      if (!hasStringModeOp) {
+      if (!hasModeCompatibleOp) {
         throw new ShapeError(
-          `"mode" on where field "${fieldName}" on model "${model}" requires a compatible String operator (contains, startsWith, endsWith, equals)`
+          `"mode" on where field "${fieldName}" on model "${model}" requires a compatible operator (String: contains, startsWith, endsWith, equals; Json: string_contains, string_starts_with, string_ends_with)`
         );
       }
       if (modeConfigValue === true) {
@@ -1360,7 +1503,7 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
         }
         fieldForced["mode"] = parsed;
       }
-    } else if (hasStringModeOp) {
+    } else if (hasModeCompatibleOp) {
       opSchemas["mode"] = z4.enum(["default", "insensitive"]).optional();
     }
     if (hasClientOps) {
@@ -1373,7 +1516,7 @@ function createWhereBuilder(typeMap, enumMap, scalarBase) {
           message: `At least one operator required for where field "${fieldName}"`
         }
       );
-      if ("equals" in opSchemas) {
+      if ("equals" in opSchemas && fieldMeta.type !== "Json") {
         const equalsBase = createOperatorSchema(
           fieldMeta,
           "equals",