@zenstackhq/orm 3.0.0-beta.24 → 3.0.0-beta.26

package/dist/index.cjs

@@ -1128,7 +1128,7 @@ var BaseCrudDialect = class {
       if (isRelationField(this.schema, model, field)) {
         continue;
       }
-      if (omit?.[field] === true) {
+      if (this.shouldOmitField(omit, model, field)) {
         continue;
       }
       result = this.buildSelectField(result, model, modelAlias, field);
@@ -1149,6 +1149,16 @@ var BaseCrudDialect = class {
     }
     return result;
   }
+  shouldOmitField(omit, model, field) {
+    if (omit && typeof omit === "object" && typeof omit[field] === "boolean") {
+      return omit[field];
+    }
+    if (this.options.omit?.[model] && typeof this.options.omit[model] === "object" && typeof this.options.omit[model][field] === "boolean") {
+      return this.options.omit[model][field];
+    }
+    const fieldDef = requireField(this.schema, model, field);
+    return !!fieldDef.omit;
+  }
   buildModelSelect(model, subQueryAlias, payload, selectAllFields) {
     let subQuery = this.buildSelectModel(model, subQueryAlias);
     if (selectAllFields) {
@@ -1412,7 +1422,8 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
       ]).flatMap((v) => v));
     }
     if (payload === true || !payload.select) {
-      objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
+      const omit = typeof payload === "object" ? payload.omit : void 0;
+      objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !this.shouldOmitField(omit, relationModel, name)).map(([field]) => [
         import_kysely3.sql.lit(field),
         this.fieldRef(relationModel, field, relationModelAlias, false)
       ]).flatMap((v) => v));
@@ -1623,7 +1634,8 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
         ]).flatMap((v) => v));
       }
       if (payload === true || !payload.select) {
-        objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
+        const omit = typeof payload === "object" ? payload.omit : void 0;
+        objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !this.shouldOmitField(omit, relationModel, name)).map(([field]) => [
           import_kysely4.sql.lit(field),
           this.fieldRef(relationModel, field, subQueryName, false)
         ]).flatMap((v) => v));
@@ -3099,12 +3111,11 @@ var BaseOperationHandler = class {
     const allFields = Object.keys(modelDef.fields);
     const relationFields = Object.values(modelDef.fields).filter((f) => f.relation).map((f) => f.name);
     const computedFields = Object.values(modelDef.fields).filter((f) => f.computed).map((f) => f.name);
-    const omit = Object.entries(args.omit ?? {}).filter(([, v]) => v).map(([k]) => k);
     const allFieldsSelected = [];
     if (!args.select || typeof args.select !== "object") {
-      allFieldsSelected.push(...allFields.filter((f) => !relationFields.includes(f) && !omit.includes(f)));
+      allFieldsSelected.push(...allFields.filter((f) => !relationFields.includes(f) && !this.dialect.shouldOmitField(args.omit, model, f)));
     } else {
-      allFieldsSelected.push(...Object.entries(args.select).filter(([k, v]) => v && !omit.includes(k)).map(([k]) => k));
+      allFieldsSelected.push(...Object.entries(args.select).filter(([k, v]) => v && !this.dialect.shouldOmitField(args.omit, model, k)).map(([k]) => k));
     }
     if (allFieldsSelected.some((f) => relationFields.includes(f) || computedFields.includes(f))) {
       return {
@@ -3727,15 +3738,14 @@ function addBigIntValidation(schema, attributes) {
     if (val === void 0) {
       continue;
     }
-    const bigIntVal = BigInt(val);
     (0, import_ts_pattern12.match)(attr.name).with("@gt", () => {
-      result = result.gt(bigIntVal);
+      result = result.gt(BigInt(val));
     }).with("@gte", () => {
-      result = result.gte(bigIntVal);
+      result = result.gte(BigInt(val));
     }).with("@lt", () => {
-      result = result.lt(bigIntVal);
+      result = result.lt(BigInt(val));
     }).with("@lte", () => {
-      result = result.lte(bigIntVal);
+      result = result.lte(BigInt(val));
     });
   }
   return result;
@@ -4003,6 +4013,9 @@ var InputValidator = class {
   get schema() {
     return this.client.$schema;
   }
+  get options() {
+    return this.client.$options;
+  }
   get extraValidationsEnabled() {
     return this.client.$options.validateInput !== false;
   }
@@ -4492,7 +4505,11 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (!fieldDef.relation) {
-        fields[field] = import_zod2.z.boolean().optional();
+        if (this.options.allowQueryTimeOmitOverride !== false) {
+          fields[field] = import_zod2.z.boolean().optional();
+        } else {
+          fields[field] = import_zod2.z.literal(true).optional();
+        }
       }
     }
     return import_zod2.z.strictObject(fields);
@@ -4905,7 +4922,8 @@ var InputValidator = class {
     let schema = import_zod2.z.strictObject({
       where: this.makeWhereSchema(model, true),
       select: this.makeSelectSchema(model).optional().nullable(),
-      include: this.makeIncludeSchema(model).optional().nullable()
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -6827,6 +6845,9 @@ var ClientImpl = class _ClientImpl {
   get $auth() {
     return this.auth;
   }
+  $setOptions(options) {
+    return new _ClientImpl(this.schema, options, this);
+  }
   $setInputValidation(enable) {
     const newOptions = {
       ...this.options,
@@ -7306,7 +7327,8 @@ var DefaultOperationNodeVisitor = class extends import_kysely11.OperationNodeVis
 // src/utils/schema-utils.ts
 var schema_utils_exports = {};
 __export(schema_utils_exports, {
-  ExpressionVisitor: () => ExpressionVisitor
+  ExpressionVisitor: () => ExpressionVisitor,
+  MatchingExpressionVisitor: () => MatchingExpressionVisitor
 });
 var import_ts_pattern17 = require("ts-pattern");
 var ExpressionVisitor = class {
@@ -7314,7 +7336,7 @@ var ExpressionVisitor = class {
     __name(this, "ExpressionVisitor");
   }
   visit(expr) {
-    (0, import_ts_pattern17.match)(expr).with({
+    return (0, import_ts_pattern17.match)(expr).with({
       kind: "literal"
     }, (e) => this.visitLiteral(e)).with({
       kind: "array"
@@ -7337,28 +7359,67 @@ var ExpressionVisitor = class {
   visitLiteral(_e) {
   }
   visitArray(e) {
-    e.items.forEach((item) => this.visit(item));
+    for (const item of e.items) {
+      const result = this.visit(item);
+      if (result?.abort) {
+        return result;
+      }
+    }
   }
   visitField(_e) {
   }
   visitMember(e) {
-    this.visit(e.receiver);
+    return this.visit(e.receiver);
   }
   visitBinary(e) {
-    this.visit(e.left);
-    this.visit(e.right);
+    const l = this.visit(e.left);
+    if (l?.abort) {
+      return l;
+    } else {
+      return this.visit(e.right);
+    }
   }
   visitUnary(e) {
-    this.visit(e.operand);
+    return this.visit(e.operand);
   }
   visitCall(e) {
-    e.args?.forEach((arg) => this.visit(arg));
+    for (const arg of e.args ?? []) {
+      const r = this.visit(arg);
+      if (r?.abort) {
+        return r;
+      }
+    }
   }
   visitThis(_e) {
   }
   visitNull(_e) {
   }
 };
+var MatchingExpressionVisitor = class extends ExpressionVisitor {
+  static {
+    __name(this, "MatchingExpressionVisitor");
+  }
+  predicate;
+  found = false;
+  constructor(predicate) {
+    super(), this.predicate = predicate;
+  }
+  find(expr) {
+    this.found = false;
+    this.visit(expr);
+    return this.found;
+  }
+  visit(expr) {
+    if (this.predicate(expr)) {
+      this.found = true;
+      return {
+        abort: true
+      };
+    } else {
+      return super.visit(expr);
+    }
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseCrudDialect,