@zenstackhq/runtime 3.0.0-alpha.22 → 3.0.0-alpha.24

package/dist/index.cjs

@@ -5908,7 +5908,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely13
         await this.callBeforeMutationHooks(queryNode, mutationInterceptionInfo);
       }
       const oldQueryNode = queryNode;
-      if ((import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntity) {
+      if ((import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntities) {
         queryNode = {
           ...queryNode,
           returning: import_kysely13.ReturningNode.create([
@@ -6015,7 +6015,7 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     return newExecutor;
   }
   get hasMutationHooks() {
-    return this.client.$options.plugins?.some((plugin) => plugin.beforeEntityMutation || plugin.afterEntityMutation);
+    return this.client.$options.plugins?.some((plugin) => !!plugin.onEntityMutation);
   }
   getMutationModel(queryNode) {
     return (0, import_ts_pattern16.match)(queryNode).when(import_kysely13.InsertQueryNode.is, (node) => node.into.table.identifier.name).when(import_kysely13.UpdateQueryNode.is, (node) => node.table.table.identifier.name).when(import_kysely13.DeleteQueryNode.is, (node) => {
@@ -6045,21 +6045,25 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
         where: node.where
       })).exhaustive();
       for (const plugin of plugins) {
-        if (!plugin.mutationInterceptionFilter) {
+        const onEntityMutation = plugin.onEntityMutation;
+        if (!onEntityMutation) {
+          continue;
+        }
+        if (!onEntityMutation.mutationInterceptionFilter) {
           result.intercept = true;
         } else {
-          const filterResult = await plugin.mutationInterceptionFilter({
+          const filterResult = await onEntityMutation.mutationInterceptionFilter({
             model: mutationModel,
             action,
             queryNode
           });
           result.intercept ||= filterResult.intercept;
-          result.loadBeforeMutationEntity ||= filterResult.loadBeforeMutationEntity;
-          result.loadAfterMutationEntity ||= filterResult.loadAfterMutationEntity;
+          result.loadBeforeMutationEntities ||= filterResult.loadBeforeMutationEntities;
+          result.loadAfterMutationEntities ||= filterResult.loadAfterMutationEntities;
         }
       }
       let beforeMutationEntities;
-      if (result.loadBeforeMutationEntity && (import_kysely13.UpdateQueryNode.is(queryNode) || import_kysely13.DeleteQueryNode.is(queryNode))) {
+      if (result.loadBeforeMutationEntities && (import_kysely13.UpdateQueryNode.is(queryNode) || import_kysely13.DeleteQueryNode.is(queryNode))) {
         beforeMutationEntities = await this.loadEntities(mutationModel, where);
       }
       return {
@@ -6080,8 +6084,9 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     if (this.options.plugins) {
       const mutationModel = this.getMutationModel(queryNode);
       for (const plugin of this.options.plugins) {
-        if (plugin.beforeEntityMutation) {
-          await plugin.beforeEntityMutation({
+        const onEntityMutation = plugin.onEntityMutation;
+        if (onEntityMutation?.beforeEntityMutation) {
+          await onEntityMutation.beforeEntityMutation({
             model: mutationModel,
             action: mutationInterceptionInfo.action,
             queryNode,
@@ -6097,8 +6102,9 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     }
     const hooks = [];
     for (const plugin of this.options.plugins ?? []) {
-      if (plugin.afterEntityMutation) {
-        hooks.push(plugin.afterEntityMutation.bind(plugin));
+      const onEntityMutation = plugin.onEntityMutation;
+      if (onEntityMutation?.afterEntityMutation) {
+        hooks.push(onEntityMutation.afterEntityMutation.bind(plugin));
       }
     }
     if (hooks.length === 0) {
@@ -6108,7 +6114,7 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     const inTransaction = this.driver.isTransactionConnection(connection);
     for (const hook of hooks) {
       let afterMutationEntities = void 0;
-      if (mutationInterceptionInfo.loadAfterMutationEntity) {
+      if (mutationInterceptionInfo.loadAfterMutationEntities) {
         if (import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) {
           afterMutationEntities = queryResult.rows;
         }
@@ -6896,7 +6902,7 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
     return createZenStackPromise(async (txClient) => {
       let proceed = /* @__PURE__ */ __name(async (_args) => {
         const _handler = txClient ? handler.withClient(txClient) : handler;
-        const r = await _handler.handle(operation, _args ?? args);
+        const r = await _handler.handle(operation, _args);
         if (!r && throwIfNoResult) {
           throw new NotFoundError(model);
         }
@@ -6912,27 +6918,18 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
         ...client.$options.plugins ?? []
       ];
       for (const plugin of plugins) {
-        if (plugin.onQuery && typeof plugin.onQuery === "object") {
-          for (const [_model, modelHooks] of Object.entries(plugin.onQuery)) {
-            if (_model === (0, import_common_helpers13.lowerCaseFirst)(model) || _model === "$allModels") {
-              if (modelHooks && typeof modelHooks === "object") {
-                for (const [op, opHooks] of Object.entries(modelHooks)) {
-                  if (op === operation || op === "$allOperations") {
-                    if (typeof opHooks === "function") {
-                      const _proceed = proceed;
-                      proceed = /* @__PURE__ */ __name(() => opHooks({
-                        client,
-                        model,
-                        operation,
-                        args,
-                        query: _proceed
-                      }), "proceed");
-                    }
-                  }
-                }
-              }
-            }
-          }
+        const onQuery = plugin.onQuery;
+        if (onQuery) {
+          const _proceed = proceed;
+          proceed = /* @__PURE__ */ __name((_args) => onQuery({
+            client,
+            model,
+            operation,
+            // reflect the latest override if provided
+            args: _args,
+            // ensure inner overrides are propagated to the previous proceed
+            proceed: /* @__PURE__ */ __name((nextArgs) => _proceed(nextArgs), "proceed")
+          }), "proceed");
         }
       }
       return proceed(args);