@zenstackhq/orm 3.0.0 → 3.1.1

package/dist/index.js

@@ -560,8 +560,9 @@ function extractFieldName(node) {
 __name(extractFieldName, "extractFieldName");
 
 // src/client/crud/operations/base.ts
-import { createId } from "@paralleldrive/cuid2";
+import { createId as cuid2 } from "@paralleldrive/cuid2";
 import { clone, enumerate as enumerate2, invariant as invariant5, isPlainObject as isPlainObject2 } from "@zenstackhq/common-helpers";
+import { default as cuid1 } from "cuid";
 import { createQueryId, expressionBuilder as expressionBuilder2, sql as sql4 } from "kysely";
 import { nanoid } from "nanoid";
 import { match as match6 } from "ts-pattern";
@@ -2547,7 +2548,20 @@ var BaseOperationHandler = class {
   }
   evalGenerator(defaultValue) {
     if (schema_exports.ExpressionUtils.isCall(defaultValue)) {
-      return match6(defaultValue.function).with("cuid", () => 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" ? nanoid(defaultValue.args[0].value) : nanoid()).with("ulid", () => ulid()).otherwise(() => void 0);
+      const firstArgVal = defaultValue.args?.[0] && schema_exports.ExpressionUtils.isLiteral(defaultValue.args[0]) ? defaultValue.args[0].value : void 0;
+      return match6(defaultValue.function).with("cuid", () => {
+        const version = firstArgVal;
+        const generated = version === 2 ? cuid2() : cuid1();
+        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" ? nanoid(length) : nanoid();
+        return this.formatGeneratedValue(generated, defaultValue.args?.[1]);
+      }).with("ulid", () => this.formatGeneratedValue(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) {
@@ -2558,6 +2572,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");
@@ -4462,8 +4482,11 @@ var InputValidator = class {
         fieldSchema
       ];
     })));
-    const finalSchema = z3.custom((v) => {
-      return schema.safeParse(v).success;
+    const finalSchema = z3.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;
@@ -4541,7 +4564,9 @@ var InputValidator = class {
         }
       }
     }
-    fields["$expr"] = z3.custom((v) => typeof v === "function").optional();
+    fields["$expr"] = z3.custom((v) => typeof v === "function", {
+      error: '"$expr" must be a function'
+    }).optional();
     fields["AND"] = this.orArray(z3.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
     fields["OR"] = z3.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)).array().optional();
     fields["NOT"] = this.orArray(z3.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
@@ -5774,6 +5799,26 @@ var QueryNameMapper = class extends OperationNodeTransformer {
     const mappedName = this.mapFieldName(scope.model, node.column.name);
     return ColumnNode2.create(mappedName);
   }
+  transformBinaryOperation(node) {
+    if (ReferenceNode2.is(node.leftOperand) && ColumnNode2.is(node.leftOperand.column) && (ValueNode.is(node.rightOperand) || 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 (ValueNode.is(valueNode)) {
+          resultValue = this.processEnumMappingForValue(resolvedScope.model, columnNode, valueNode);
+        } else if (PrimitiveValueListNode.is(valueNode)) {
+          resultValue = 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);