@zenstackhq/orm 3.3.0-beta.1 → 3.3.0-beta.2

package/dist/index.cjs

@@ -39,8 +39,11 @@ __export(src_exports, {
   BaseCrudDialect: () => BaseCrudDialect,
   CRUD: () => CRUD,
   CRUD_EXT: () => CRUD_EXT,
+  CoreCreateOperations: () => CoreCreateOperations,
   CoreCrudOperations: () => CoreCrudOperations,
+  CoreDeleteOperations: () => CoreDeleteOperations,
   CoreReadOperations: () => CoreReadOperations,
+  CoreUpdateOperations: () => CoreUpdateOperations,
   CoreWriteOperations: () => CoreWriteOperations,
   DbNull: () => DbNull,
   DbNullClass: () => DbNullClass,
@@ -1164,7 +1167,15 @@ var BaseCrudDialect = class {
         } else {
           return this.eb.not(this.eb(lhs, "in", rhs));
         }
-      }).with("lt", () => this.eb(lhs, "<", rhs)).with("lte", () => this.eb(lhs, "<=", rhs)).with("gt", () => this.eb(lhs, ">", rhs)).with("gte", () => this.eb(lhs, ">=", rhs)).with("not", () => this.eb.not(recurse(value))).with(import_ts_pattern2.P.union(...AGGREGATE_OPERATORS), (op2) => {
+      }).with("lt", () => this.eb(lhs, "<", rhs)).with("lte", () => this.eb(lhs, "<=", rhs)).with("gt", () => this.eb(lhs, ">", rhs)).with("gte", () => this.eb(lhs, ">=", rhs)).with("between", () => {
+        (0, import_common_helpers2.invariant)(Array.isArray(rhs), "right hand side must be an array");
+        (0, import_common_helpers2.invariant)(rhs.length === 2, "right hand side must have a length of 2");
+        const [start, end] = rhs;
+        return this.eb.and([
+          this.eb(lhs, ">=", start),
+          this.eb(lhs, "<=", end)
+        ]);
+      }).with("not", () => this.eb.not(recurse(value))).with(import_ts_pattern2.P.union(...AGGREGATE_OPERATORS), (op2) => {
         const innerResult = this.buildStandardFilter(type, value, aggregate(this.eb, lhs, op2), getRhs, recurse, throwIfInvalid);
         consumedKeys.push(...innerResult.consumedKeys);
         return this.and(...innerResult.conditions);
@@ -2150,6 +2161,22 @@ var CoreWriteOperations = [
   "delete",
   "deleteMany"
 ];
+var CoreCreateOperations = [
+  "create",
+  "createMany",
+  "createManyAndReturn",
+  "upsert"
+];
+var CoreUpdateOperations = [
+  "update",
+  "updateMany",
+  "updateManyAndReturn",
+  "upsert"
+];
+var CoreDeleteOperations = [
+  "delete",
+  "deleteMany"
+];
 var AllCrudOperations = [
   ...CoreCrudOperations,
   "findUniqueOrThrow",
@@ -4614,8 +4641,8 @@ var InputValidator = class {
   mergePluginArgsSchema(schema, operation) {
     let result = schema;
     for (const plugin of this.options.plugins ?? []) {
-      if (plugin.extQueryArgs) {
-        const pluginSchema = plugin.extQueryArgs.getValidationSchema(operation);
+      if (plugin.queryArgs) {
+        const pluginSchema = this.getPluginExtQueryArgsSchema(plugin, operation);
         if (pluginSchema) {
           result = result.extend(pluginSchema.shape);
         }
@@ -4623,6 +4650,42 @@ var InputValidator = class {
     }
     return result.strict();
   }
+  getPluginExtQueryArgsSchema(plugin, operation) {
+    if (!plugin.queryArgs) {
+      return void 0;
+    }
+    let result;
+    if (operation in plugin.queryArgs && plugin.queryArgs[operation]) {
+      result = plugin.queryArgs[operation];
+    } else if (operation === "upsert") {
+      const createSchema = "$create" in plugin.queryArgs && plugin.queryArgs["$create"] ? plugin.queryArgs["$create"] : void 0;
+      const updateSchema = "$update" in plugin.queryArgs && plugin.queryArgs["$update"] ? plugin.queryArgs["$update"] : void 0;
+      if (createSchema && updateSchema) {
+        (0, import_common_helpers7.invariant)(createSchema instanceof import_zod3.z.ZodObject, "Plugin extended query args schema must be a Zod object");
+        (0, import_common_helpers7.invariant)(updateSchema instanceof import_zod3.z.ZodObject, "Plugin extended query args schema must be a Zod object");
+        result = createSchema.extend(updateSchema.shape);
+      } else if (createSchema) {
+        result = createSchema;
+      } else if (updateSchema) {
+        result = updateSchema;
+      }
+    } else if (
+      // then comes grouped operations: $create, $read, $update, $delete
+      CoreCreateOperations.includes(operation) && "$create" in plugin.queryArgs && plugin.queryArgs["$create"]
+    ) {
+      result = plugin.queryArgs["$create"];
+    } else if (CoreReadOperations.includes(operation) && "$read" in plugin.queryArgs && plugin.queryArgs["$read"]) {
+      result = plugin.queryArgs["$read"];
+    } else if (CoreUpdateOperations.includes(operation) && "$update" in plugin.queryArgs && plugin.queryArgs["$update"]) {
+      result = plugin.queryArgs["$update"];
+    } else if (CoreDeleteOperations.includes(operation) && "$delete" in plugin.queryArgs && plugin.queryArgs["$delete"]) {
+      result = plugin.queryArgs["$delete"];
+    } else if ("$all" in plugin.queryArgs && plugin.queryArgs["$all"]) {
+      result = plugin.queryArgs["$all"];
+    }
+    (0, import_common_helpers7.invariant)(result === void 0 || result instanceof import_zod3.z.ZodObject, "Plugin extended query args schema must be a Zod object");
+    return result;
+  }
   // #region Find
   makeFindSchema(model, operation) {
     const fields = {};
@@ -5007,6 +5070,7 @@ var InputValidator = class {
       lte: baseSchema.optional(),
       gt: baseSchema.optional(),
       gte: baseSchema.optional(),
+      between: baseSchema.array().length(2).optional(),
       not: makeThis().optional(),
       ...withAggregations?.includes("_count") ? {
         _count: this.makeNumberFilterSchema(import_zod3.z.number().int(), false, false).optional()
@@ -7619,6 +7683,14 @@ function createClientProxy(client) {
   return new Proxy(client, {
     get: /* @__PURE__ */ __name((target, prop, receiver) => {
       if (typeof prop === "string" && prop.startsWith("$")) {
+        const plugins = target.$options.plugins ?? [];
+        for (let i = plugins.length - 1; i >= 0; i--) {
+          const plugin = plugins[i];
+          const clientMembers = plugin?.client;
+          if (clientMembers && prop in clientMembers) {
+            return clientMembers[prop];
+          }
+        }
         return Reflect.get(target, prop, receiver);
       }
       if (typeof prop === "string") {
@@ -8159,8 +8231,11 @@ var MatchingExpressionVisitor = class extends ExpressionVisitor {
   BaseCrudDialect,
   CRUD,
   CRUD_EXT,
+  CoreCreateOperations,
   CoreCrudOperations,
+  CoreDeleteOperations,
   CoreReadOperations,
+  CoreUpdateOperations,
   CoreWriteOperations,
   DbNull,
   DbNullClass,