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

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-D8U59Syb.cjs';
-export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-D8U59Syb.cjs';
+import { C as ClientConstructor } from './contract-C9SubPBD.cjs';
+export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-C9SubPBD.cjs';
 import 'decimal.js';
 import '@zenstackhq/sdk/schema';
 import 'kysely';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-D8U59Syb.js';
-export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-D8U59Syb.js';
+import { C as ClientConstructor } from './contract-C9SubPBD.js';
+export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-C9SubPBD.js';
 import 'decimal.js';
 import '@zenstackhq/sdk/schema';
 import 'kysely';

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 };
 
 // src/client/client-impl.ts
-import { invariant as invariant12, lowerCaseFirst as lowerCaseFirst2 } from "@zenstackhq/common-helpers";
+import { invariant as invariant12 } from "@zenstackhq/common-helpers";
 import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql9 } from "kysely";
 
 // src/client/crud/operations/aggregate.ts
@@ -5873,7 +5873,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
         await this.callBeforeMutationHooks(queryNode, mutationInterceptionInfo);
       }
       const oldQueryNode = queryNode;
-      if ((InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntity) {
+      if ((InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntities) {
         queryNode = {
           ...queryNode,
           returning: ReturningNode3.create([
@@ -5980,7 +5980,7 @@ ${compiled.parameters.map((p) => inspect2(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 match16(queryNode).when(InsertQueryNode2.is, (node) => node.into.table.identifier.name).when(UpdateQueryNode2.is, (node) => node.table.table.identifier.name).when(DeleteQueryNode2.is, (node) => {
@@ -6010,21 +6010,25 @@ ${compiled.parameters.map((p) => inspect2(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 && (UpdateQueryNode2.is(queryNode) || DeleteQueryNode2.is(queryNode))) {
+      if (result.loadBeforeMutationEntities && (UpdateQueryNode2.is(queryNode) || DeleteQueryNode2.is(queryNode))) {
         beforeMutationEntities = await this.loadEntities(mutationModel, where);
       }
       return {
@@ -6045,8 +6049,9 @@ ${compiled.parameters.map((p) => inspect2(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,
@@ -6062,8 +6067,9 @@ ${compiled.parameters.map((p) => inspect2(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) {
@@ -6073,7 +6079,7 @@ ${compiled.parameters.map((p) => inspect2(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 (InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode)) {
           afterMutationEntities = queryResult.rows;
         }
@@ -6861,7 +6867,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);
         }
@@ -6877,27 +6883,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 === lowerCaseFirst2(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);