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

package/dist/index.cjs

@@ -305,11 +305,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;
@@ -493,7 +496,6 @@ var import_kysely2 = require("kysely");
 var import_ts_pattern3 = require("ts-pattern");
 
 // src/client/constants.ts
-var CONTEXT_COMMENT_PREFIX = "-- $$context:";
 var NUMERIC_FIELD_TYPES = [
   "Int",
   "Float",
@@ -1080,8 +1082,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);
   }
 };
 
@@ -1176,7 +1178,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]) => [
         import_kysely2.sql.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]) => {
@@ -1188,7 +1190,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 [
             import_kysely2.sql.lit(field),
             fieldValue
@@ -1339,7 +1341,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]) => [
           import_kysely3.sql.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]) => {
@@ -1360,7 +1362,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 import_kysely3.sql.lit(field),
-                this.fieldRef(relationModel, field, eb)
+                this.fieldRef(relationModel, field, eb, void 0, false)
               ];
             }
           }
@@ -3460,8 +3462,8 @@ ${compiled.parameters.map((p) => (0, import_node_util.inspect)(p)).join("\n")}`;
   isNumericField(fieldDef) {
     return NUMERIC_FIELD_TYPES.includes(fieldDef.type) && !fieldDef.array;
   }
-  makeContextComment(context) {
-    return import_kysely8.sql.raw(`${CONTEXT_COMMENT_PREFIX}${JSON.stringify(context)}`);
+  makeContextComment(_context) {
+    return import_kysely8.sql``;
   }
   async updateMany(kysely, model, where, data, limit, returnData, filterModel) {
     if (typeof data !== "object") {
@@ -6015,7 +6017,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,10 +6047,14 @@ ${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
@@ -6080,8 +6086,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 +6104,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) {
@@ -6896,7 +6904,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 +6920,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);