@zenstackhq/runtime 3.0.0-alpha.23 → 3.0.0-alpha.25

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-Y3qWOegb.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-Y3qWOegb.cjs';
+import { C as ClientConstructor } from './contract-BOWN0dwS.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-BOWN0dwS.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-Y3qWOegb.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-Y3qWOegb.js';
+import { C as ClientConstructor } from './contract-BOWN0dwS.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-BOWN0dwS.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
@@ -270,11 +270,14 @@ function getIdValues(schema, model, data) {
   }), {});
 }
 __name(getIdValues, "getIdValues");
-function buildFieldRef(schema, model, field, options, eb, modelAlias) {
+function buildFieldRef(schema, model, field, options, eb, modelAlias, inlineComputedField = true) {
   const fieldDef = requireField(schema, model, field);
   if (!fieldDef.computed) {
     return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
   } else {
+    if (!inlineComputedField) {
+      return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+    }
     let computer;
     if ("computedFields" in options) {
       const computedFields = options.computedFields;
@@ -458,7 +461,6 @@ import { sql as sql2 } from "kysely";
 import { match as match3 } from "ts-pattern";
 
 // src/client/constants.ts
-var CONTEXT_COMMENT_PREFIX = "-- $$context:";
 var NUMERIC_FIELD_TYPES = [
   "Int",
   "Float",
@@ -1045,8 +1047,8 @@ var BaseCrudDialect = class {
   not(eb, ...args) {
     return eb.not(this.and(eb, ...args));
   }
-  fieldRef(model, field, eb, modelAlias) {
-    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias);
+  fieldRef(model, field, eb, modelAlias, inlineComputedField = true) {
+    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
   }
 };
 
@@ -1141,7 +1143,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     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]) => [
         sql2.lit(field),
-        this.fieldRef(relationModel, field, eb)
+        this.fieldRef(relationModel, field, eb, void 0, false)
       ]).flatMap((v) => v));
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1153,7 +1155,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb, void 0, false);
           return [
             sql2.lit(field),
             fieldValue
@@ -1304,7 +1306,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
       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]) => [
           sql3.lit(field),
-          this.fieldRef(relationModel, field, eb)
+          this.fieldRef(relationModel, field, eb, void 0, false)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1325,7 +1327,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                this.fieldRef(relationModel, field, eb)
+                this.fieldRef(relationModel, field, eb, void 0, false)
               ];
             }
           }
@@ -3425,8 +3427,8 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
   isNumericField(fieldDef) {
     return NUMERIC_FIELD_TYPES.includes(fieldDef.type) && !fieldDef.array;
   }
-  makeContextComment(context) {
-    return sql4.raw(`${CONTEXT_COMMENT_PREFIX}${JSON.stringify(context)}`);
+  makeContextComment(_context) {
+    return sql4``;
   }
   async updateMany(kysely, model, where, data, limit, returnData, filterModel) {
     if (typeof data !== "object") {
@@ -5980,7 +5982,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,10 +6012,14 @@ ${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
@@ -6045,8 +6051,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 +6069,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) {
@@ -6861,7 +6869,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 +6885,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);