@zenstackhq/orm 3.0.0 → 3.1.1

package/dist/index.cjs

@@ -598,6 +598,7 @@ __name(extractFieldName, "extractFieldName");
 // src/client/crud/operations/base.ts
 var import_cuid2 = require("@paralleldrive/cuid2");
 var import_common_helpers5 = require("@zenstackhq/common-helpers");
+var import_cuid = __toESM(require("cuid"), 1);
 var import_kysely5 = require("kysely");
 var import_nanoid = require("nanoid");
 var import_ts_pattern6 = require("ts-pattern");
@@ -2583,7 +2584,20 @@ var BaseOperationHandler = class {
   }
   evalGenerator(defaultValue) {
     if (schema_exports.ExpressionUtils.isCall(defaultValue)) {
-      return (0, import_ts_pattern6.match)(defaultValue.function).with("cuid", () => (0, import_cuid2.createId)()).with("uuid", () => defaultValue.args?.[0] && schema_exports.ExpressionUtils.isLiteral(defaultValue.args?.[0]) && defaultValue.args[0].value === 7 ? uuid.v7() : uuid.v4()).with("nanoid", () => defaultValue.args?.[0] && schema_exports.ExpressionUtils.isLiteral(defaultValue.args[0]) && typeof defaultValue.args[0].value === "number" ? (0, import_nanoid.nanoid)(defaultValue.args[0].value) : (0, import_nanoid.nanoid)()).with("ulid", () => (0, import_ulid.ulid)()).otherwise(() => void 0);
+      const firstArgVal = defaultValue.args?.[0] && schema_exports.ExpressionUtils.isLiteral(defaultValue.args[0]) ? defaultValue.args[0].value : void 0;
+      return (0, import_ts_pattern6.match)(defaultValue.function).with("cuid", () => {
+        const version = firstArgVal;
+        const generated = version === 2 ? (0, import_cuid2.createId)() : (0, import_cuid.default)();
+        return this.formatGeneratedValue(generated, defaultValue.args?.[1]);
+      }).with("uuid", () => {
+        const version = firstArgVal;
+        const generated = version === 7 ? uuid.v7() : uuid.v4();
+        return this.formatGeneratedValue(generated, defaultValue.args?.[1]);
+      }).with("nanoid", () => {
+        const length = firstArgVal;
+        const generated = typeof length === "number" ? (0, import_nanoid.nanoid)(length) : (0, import_nanoid.nanoid)();
+        return this.formatGeneratedValue(generated, defaultValue.args?.[1]);
+      }).with("ulid", () => this.formatGeneratedValue((0, import_ulid.ulid)(), defaultValue.args?.[0])).otherwise(() => void 0);
     } else if (schema_exports.ExpressionUtils.isMember(defaultValue) && schema_exports.ExpressionUtils.isCall(defaultValue.receiver) && defaultValue.receiver.function === "auth") {
       let val = this.client.$auth;
       for (const member of defaultValue.members) {
@@ -2594,6 +2608,12 @@ var BaseOperationHandler = class {
       return void 0;
     }
   }
+  formatGeneratedValue(generated, formatExpr) {
+    if (!formatExpr || !schema_exports.ExpressionUtils.isLiteral(formatExpr) || typeof formatExpr.value !== "string") {
+      return generated;
+    }
+    return formatExpr.value.replace(/(?<!\\)%s/g, generated).replace(/\\%s/g, "%s");
+  }
   async update(kysely, model, where, data, fromRelation, allowRelationUpdate = true, throwIfNotFound = true, fieldsToReturn) {
     if (!data || typeof data !== "object") {
       throw createInvalidInputError("data must be an object");
@@ -4498,8 +4518,11 @@ var InputValidator = class {
         fieldSchema
       ];
     })));
-    const finalSchema = import_zod3.z.custom((v) => {
-      return schema.safeParse(v).success;
+    const finalSchema = import_zod3.z.any().superRefine((value, ctx) => {
+      const parseResult = schema.safeParse(value);
+      if (!parseResult.success) {
+        parseResult.error.issues.forEach((issue) => ctx.addIssue(issue));
+      }
     });
     this.setSchemaCache(key, finalSchema);
     return finalSchema;
@@ -4577,7 +4600,9 @@ var InputValidator = class {
         }
       }
     }
-    fields["$expr"] = import_zod3.z.custom((v) => typeof v === "function").optional();
+    fields["$expr"] = import_zod3.z.custom((v) => typeof v === "function", {
+      error: '"$expr" must be a function'
+    }).optional();
     fields["AND"] = this.orArray(import_zod3.z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
     fields["OR"] = import_zod3.z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)).array().optional();
     fields["NOT"] = this.orArray(import_zod3.z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
@@ -5810,6 +5835,26 @@ var QueryNameMapper = class extends import_kysely6.OperationNodeTransformer {
     const mappedName = this.mapFieldName(scope.model, node.column.name);
     return import_kysely6.ColumnNode.create(mappedName);
   }
+  transformBinaryOperation(node) {
+    if (import_kysely6.ReferenceNode.is(node.leftOperand) && import_kysely6.ColumnNode.is(node.leftOperand.column) && (import_kysely6.ValueNode.is(node.rightOperand) || import_kysely6.PrimitiveValueListNode.is(node.rightOperand))) {
+      const columnNode = node.leftOperand.column;
+      const resolvedScope = this.resolveFieldFromScopes(columnNode.column.name, node.leftOperand.table?.table.identifier.name);
+      if (resolvedScope?.model) {
+        const valueNode = node.rightOperand;
+        let resultValue = valueNode;
+        if (import_kysely6.ValueNode.is(valueNode)) {
+          resultValue = this.processEnumMappingForValue(resolvedScope.model, columnNode, valueNode);
+        } else if (import_kysely6.PrimitiveValueListNode.is(valueNode)) {
+          resultValue = import_kysely6.PrimitiveValueListNode.create(this.processEnumMappingForValues(resolvedScope.model, valueNode.values.map(() => columnNode), valueNode.values));
+        }
+        return super.transformBinaryOperation({
+          ...node,
+          rightOperand: resultValue
+        });
+      }
+    }
+    return super.transformBinaryOperation(node);
+  }
   transformUpdateQuery(node) {
     if (!node.table) {
       return super.transformUpdateQuery(node);