@zenstackhq/runtime 3.0.0-alpha.31 → 3.0.0-alpha.33

package/dist/index.js

@@ -6,8 +6,8 @@ var __export = (target, all) => {
 };
 
 // src/client/client-impl.ts
-import { invariant as invariant13 } from "@zenstackhq/common-helpers";
-import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql9 } from "kysely";
+import { invariant as invariant15 } from "@zenstackhq/common-helpers";
+import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql9, Transaction } from "kysely";
 
 // src/client/crud/operations/aggregate.ts
 import { sql as sql5 } from "kysely";
@@ -92,7 +92,10 @@ var ExpressionUtils = {
   isUnary: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "unary"), "isUnary"),
   isBinary: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "binary"), "isBinary"),
   isField: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "field"), "isField"),
-  isMember: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "member"), "isMember")
+  isMember: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "member"), "isMember"),
+  getLiteralValue: /* @__PURE__ */ __name((expr2) => {
+    return ExpressionUtils.isLiteral(expr2) ? expr2.value : void 0;
+  }, "getLiteralValue")
 };
 
 // src/utils/object-utils.ts
@@ -1016,6 +1019,16 @@ var BaseCrudDialect = class {
     }
     return result;
   }
+  buildModelSelect(eb, model, subQueryAlias, payload, selectAllFields) {
+    let subQuery = this.buildSelectModel(eb, model, subQueryAlias);
+    if (selectAllFields) {
+      subQuery = this.buildSelectAllFields(model, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
+    }
+    if (payload && typeof payload === "object") {
+      subQuery = this.buildFilterSortTake(model, payload, subQuery, subQueryAlias);
+    }
+    return subQuery;
+  }
   buildSelectField(query, model, modelAlias, field) {
     const fieldDef = requireField(this.schema, model, field);
     if (fieldDef.computed) {
@@ -1113,6 +1126,18 @@ var BaseCrudDialect = class {
   fieldRef(model, field, eb, modelAlias, inlineComputedField = true) {
     return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
   }
+  canJoinWithoutNestedSelect(modelDef, payload) {
+    if (modelDef.computedFields) {
+      return false;
+    }
+    if (modelDef.baseModel || modelDef.isDelegate) {
+      return false;
+    }
+    if (typeof payload === "object" && (payload.orderBy || payload.skip !== void 0 || payload.take !== void 0 || payload.cursor || payload.distinct)) {
+      return false;
+    }
+    return true;
+  }
 };
 
 // src/client/crud/dialects/postgresql.ts
@@ -1138,52 +1163,58 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     }
   }
   buildRelationSelection(query, model, relationField, parentAlias, payload) {
-    const joinedQuery = this.buildRelationJSON(model, query, relationField, parentAlias, payload);
-    return joinedQuery.select(`${parentAlias}$${relationField}.$j as ${relationField}`);
+    const relationResultName = `${parentAlias}$${relationField}`;
+    const joinedQuery = this.buildRelationJSON(model, query, relationField, parentAlias, payload, relationResultName);
+    return joinedQuery.select(`${relationResultName}.$data as ${relationField}`);
   }
-  buildRelationJSON(model, qb, relationField, parentName, payload) {
+  buildRelationJSON(model, qb, relationField, parentAlias, payload, resultName) {
     const relationFieldDef = requireField(this.schema, model, relationField);
     const relationModel = relationFieldDef.type;
     return qb.leftJoinLateral((eb) => {
-      const joinTableName = `${parentName}$${relationField}`;
-      let result = eb.selectFrom(`${relationModel} as ${joinTableName}`);
-      const subQueryAlias = `${relationModel}$${relationField}$sub`;
-      result = eb.selectFrom(() => {
-        let subQuery = this.buildSelectModel(eb, relationModel, subQueryAlias);
-        subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
-        if (payload && typeof payload === "object") {
-          subQuery = this.buildFilterSortTake(relationModel, payload, subQuery, subQueryAlias);
-        }
-        const m2m = getManyToManyRelation(this.schema, model, relationField);
-        if (m2m) {
-          const parentIds = getIdFields(this.schema, model);
-          const relationIds = getIdFields(this.schema, relationModel);
-          invariant2(parentIds.length === 1, "many-to-many relation must have exactly one id field");
-          invariant2(relationIds.length === 1, "many-to-many relation must have exactly one id field");
-          subQuery = subQuery.where(eb(eb.ref(`${subQueryAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentName}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
-        } else {
-          const joinPairs = buildJoinPairs(this.schema, model, parentName, relationField, subQueryAlias);
-          subQuery = subQuery.where((eb2) => this.and(eb2, ...joinPairs.map(([left, right]) => eb2(sql2.ref(left), "=", sql2.ref(right)))));
-        }
-        return subQuery.as(joinTableName);
-      });
-      result = this.buildRelationObjectSelect(relationModel, joinTableName, relationField, relationFieldDef, result, payload, parentName);
-      result = this.buildRelationJoins(relationModel, relationField, result, payload, parentName);
-      return result.as(joinTableName);
+      const relationSelectName = `${resultName}$sub`;
+      const relationModelDef = requireModel(this.schema, relationModel);
+      let tbl;
+      if (this.canJoinWithoutNestedSelect(relationModelDef, payload)) {
+        tbl = this.buildModelSelect(eb, relationModel, relationSelectName, payload, false);
+        tbl = this.buildRelationJoinFilter(tbl, model, relationField, relationModel, relationSelectName, parentAlias);
+      } else {
+        tbl = eb.selectFrom(() => {
+          let subQuery = this.buildModelSelect(eb, relationModel, `${relationSelectName}$t`, payload, true);
+          subQuery = this.buildRelationJoinFilter(subQuery, model, relationField, relationModel, `${relationSelectName}$t`, parentAlias);
+          return subQuery.as(relationSelectName);
+        });
+      }
+      tbl = this.buildRelationObjectSelect(relationModel, relationSelectName, relationFieldDef, tbl, payload, resultName);
+      tbl = this.buildRelationJoins(tbl, relationModel, relationSelectName, payload, resultName);
+      return tbl.as(resultName);
     }, (join) => join.onTrue());
   }
-  buildRelationObjectSelect(relationModel, relationModelAlias, relationField, relationFieldDef, qb, payload, parentName) {
+  buildRelationJoinFilter(query, model, relationField, relationModel, relationModelAlias, parentAlias) {
+    const m2m = getManyToManyRelation(this.schema, model, relationField);
+    if (m2m) {
+      const parentIds = getIdFields(this.schema, model);
+      const relationIds = getIdFields(this.schema, relationModel);
+      invariant2(parentIds.length === 1, "many-to-many relation must have exactly one id field");
+      invariant2(relationIds.length === 1, "many-to-many relation must have exactly one id field");
+      query = query.where((eb) => eb(eb.ref(`${relationModelAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
+    } else {
+      const joinPairs = buildJoinPairs(this.schema, model, parentAlias, relationField, relationModelAlias);
+      query = query.where((eb) => this.and(eb, ...joinPairs.map(([left, right]) => eb(sql2.ref(left), "=", sql2.ref(right)))));
+    }
+    return query;
+  }
+  buildRelationObjectSelect(relationModel, relationModelAlias, relationFieldDef, qb, payload, parentResultName) {
     qb = qb.select((eb) => {
-      const objArgs = this.buildRelationObjectArgs(relationModel, relationModelAlias, relationField, eb, payload, parentName);
+      const objArgs = this.buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName);
       if (relationFieldDef.array) {
-        return eb.fn.coalesce(sql2`jsonb_agg(jsonb_build_object(${sql2.join(objArgs)}))`, sql2`'[]'::jsonb`).as("$j");
+        return eb.fn.coalesce(sql2`jsonb_agg(jsonb_build_object(${sql2.join(objArgs)}))`, sql2`'[]'::jsonb`).as("$data");
       } else {
-        return sql2`jsonb_build_object(${sql2.join(objArgs)})`.as("$j");
+        return sql2`jsonb_build_object(${sql2.join(objArgs)})`.as("$data");
       }
     });
     return qb;
   }
-  buildRelationObjectArgs(relationModel, relationModelAlias, relationField, eb, payload, parentAlias) {
+  buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName) {
     const relationModelDef = requireModel(this.schema, relationModel);
     const objArgs = [];
     const descendantModels = getDelegateDescendantModels(this.schema, relationModel);
@@ -1201,14 +1232,14 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
         if (field === "_count") {
-          const subJson = this.buildCountJson(relationModel, eb, `${parentAlias}$${relationField}`, value);
+          const subJson = this.buildCountJson(relationModel, eb, relationModelAlias, value);
           return [
             sql2.lit(field),
             subJson
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb, void 0, false);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentResultName}$${field}.$data`) : this.fieldRef(relationModel, field, eb, relationModelAlias, false);
           return [
             sql2.lit(field),
             fieldValue
@@ -1220,18 +1251,18 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
       objArgs.push(...Object.entries(payload.include).filter(([, value]) => value).map(([field]) => [
         sql2.lit(field),
         // reference the synthesized JSON field
-        eb.ref(`${parentAlias}$${relationField}$${field}.$j`)
+        eb.ref(`${parentResultName}$${field}.$data`)
       ]).flatMap((v) => v));
     }
     return objArgs;
   }
-  buildRelationJoins(relationModel, relationField, qb, payload, parentName) {
-    let result = qb;
+  buildRelationJoins(query, relationModel, relationModelAlias, payload, parentResultName) {
+    let result = query;
     if (typeof payload === "object") {
       const selectInclude = payload.include ?? payload.select;
       if (selectInclude && typeof selectInclude === "object") {
         Object.entries(selectInclude).filter(([, value]) => value).filter(([field]) => isRelationField(this.schema, relationModel, field)).forEach(([field, value]) => {
-          result = this.buildRelationJSON(relationModel, result, field, `${parentName}$${relationField}`, value);
+          result = this.buildRelationJSON(relationModel, result, field, relationModelAlias, value, `${parentResultName}$${field}`);
         });
       }
     }
@@ -1311,32 +1342,18 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
     const relationModel = relationFieldDef.type;
     const relationModelDef = requireModel(this.schema, relationModel);
     const subQueryName = `${parentAlias}$${relationField}`;
-    let tbl = eb.selectFrom(() => {
-      const subQueryAlias = `${parentAlias}$${relationField}$sub`;
-      let subQuery = this.buildSelectModel(eb, relationModel, subQueryAlias);
-      subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
-      if (payload && typeof payload === "object") {
-        subQuery = this.buildFilterSortTake(relationModel, payload, subQuery, subQueryAlias);
-      }
-      const m2m = getManyToManyRelation(this.schema, model, relationField);
-      if (m2m) {
-        const parentIds = getIdFields(this.schema, model);
-        const relationIds = getIdFields(this.schema, relationModel);
-        invariant3(parentIds.length === 1, "many-to-many relation must have exactly one id field");
-        invariant3(relationIds.length === 1, "many-to-many relation must have exactly one id field");
-        subQuery = subQuery.where(eb(eb.ref(`${subQueryAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
-      } else {
-        const { keyPairs, ownedByModel } = getRelationForeignKeyFieldPairs(this.schema, model, relationField);
-        keyPairs.forEach(({ fk, pk }) => {
-          if (ownedByModel) {
-            subQuery = subQuery.whereRef(`${subQueryAlias}.${pk}`, "=", `${parentAlias}.${fk}`);
-          } else {
-            subQuery = subQuery.whereRef(`${subQueryAlias}.${fk}`, "=", `${parentAlias}.${pk}`);
-          }
-        });
-      }
-      return subQuery.as(subQueryName);
-    });
+    let tbl;
+    if (this.canJoinWithoutNestedSelect(relationModelDef, payload)) {
+      tbl = this.buildModelSelect(eb, relationModel, subQueryName, payload, false);
+      tbl = this.buildRelationJoinFilter(tbl, model, relationField, subQueryName, parentAlias);
+    } else {
+      tbl = eb.selectFrom(() => {
+        const selectModelAlias = `${parentAlias}$${relationField}$sub`;
+        let selectModelQuery = this.buildModelSelect(eb, relationModel, selectModelAlias, payload, true);
+        selectModelQuery = this.buildRelationJoinFilter(selectModelQuery, model, relationField, selectModelAlias, parentAlias);
+        return selectModelQuery.as(subQueryName);
+      });
+    }
     tbl = tbl.select(() => {
       const objArgs = [];
       const descendantModels = getDelegateDescendantModels(this.schema, relationModel);
@@ -1349,7 +1366,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, void 0, false)
+          this.fieldRef(relationModel, field, eb, subQueryName, false)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1370,7 +1387,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                this.fieldRef(relationModel, field, eb, void 0, false)
+                this.fieldRef(relationModel, field, eb, subQueryName, false)
               ];
             }
           }
@@ -1386,13 +1403,35 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
         }).flatMap((v) => v));
       }
       if (relationFieldDef.array) {
-        return eb.fn.coalesce(sql3`json_group_array(json_object(${sql3.join(objArgs)}))`, sql3`json_array()`).as("$j");
+        return eb.fn.coalesce(sql3`json_group_array(json_object(${sql3.join(objArgs)}))`, sql3`json_array()`).as("$data");
       } else {
-        return sql3`json_object(${sql3.join(objArgs)})`.as("data");
+        return sql3`json_object(${sql3.join(objArgs)})`.as("$data");
       }
     });
     return tbl;
   }
+  buildRelationJoinFilter(selectModelQuery, model, relationField, relationModelAlias, parentAlias) {
+    const fieldDef = requireField(this.schema, model, relationField);
+    const relationModel = fieldDef.type;
+    const m2m = getManyToManyRelation(this.schema, model, relationField);
+    if (m2m) {
+      const parentIds = getIdFields(this.schema, model);
+      const relationIds = getIdFields(this.schema, relationModel);
+      invariant3(parentIds.length === 1, "many-to-many relation must have exactly one id field");
+      invariant3(relationIds.length === 1, "many-to-many relation must have exactly one id field");
+      selectModelQuery = selectModelQuery.where((eb) => eb(eb.ref(`${relationModelAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
+    } else {
+      const { keyPairs, ownedByModel } = getRelationForeignKeyFieldPairs(this.schema, model, relationField);
+      keyPairs.forEach(({ fk, pk }) => {
+        if (ownedByModel) {
+          selectModelQuery = selectModelQuery.whereRef(`${relationModelAlias}.${pk}`, "=", `${parentAlias}.${fk}`);
+        } else {
+          selectModelQuery = selectModelQuery.whereRef(`${relationModelAlias}.${fk}`, "=", `${parentAlias}.${pk}`);
+        }
+      });
+    }
+    return selectModelQuery;
+  }
   buildSkipTake(query, skip, take) {
     if (take !== void 0) {
       query = query.limit(take);
@@ -2704,6 +2743,16 @@ function clone(value) {
 }
 __name(clone, "clone");
 
+// src/client/contract.ts
+var TransactionIsolationLevel = /* @__PURE__ */ function(TransactionIsolationLevel2) {
+  TransactionIsolationLevel2["ReadUncommitted"] = "read uncommitted";
+  TransactionIsolationLevel2["ReadCommitted"] = "read committed";
+  TransactionIsolationLevel2["RepeatableRead"] = "repeatable read";
+  TransactionIsolationLevel2["Serializable"] = "serializable";
+  TransactionIsolationLevel2["Snapshot"] = "snapshot";
+  return TransactionIsolationLevel2;
+}({});
+
 // src/client/crud/operations/base.ts
 var BaseOperationHandler = class {
   static {
@@ -3942,7 +3991,7 @@ var BaseOperationHandler = class {
       return callback(this.kysely);
     } else {
       let txBuilder = this.kysely.transaction();
-      txBuilder = txBuilder.setIsolationLevel(isolationLevel ?? "repeatable read");
+      txBuilder = txBuilder.setIsolationLevel(isolationLevel ?? TransactionIsolationLevel.RepeatableRead);
       return txBuilder.execute(callback);
     }
   }
@@ -5508,7 +5557,11 @@ var ZenStackDriver = class {
       this.#txConnections.delete(connection);
       if (callbacks) {
         for (const callback of callbacks) {
-          await callback();
+          try {
+            await callback();
+          } catch (err) {
+            console.error(`Error executing transaction commit callback: ${err}`);
+          }
         }
       }
       return result;
@@ -5626,13 +5679,32 @@ function performanceNow() {
 __name(performanceNow, "performanceNow");
 
 // src/client/executor/zenstack-query-executor.ts
-import { AndNode as AndNode2, DefaultQueryExecutor, DeleteQueryNode as DeleteQueryNode2, InsertQueryNode as InsertQueryNode2, ReturningNode as ReturningNode2, SelectionNode as SelectionNode4, UpdateQueryNode as UpdateQueryNode2, WhereNode as WhereNode3 } from "kysely";
-import { nanoid as nanoid2 } from "nanoid";
+import { invariant as invariant11 } from "@zenstackhq/common-helpers";
+import { AndNode as AndNode2, DefaultQueryExecutor, DeleteQueryNode as DeleteQueryNode2, InsertQueryNode as InsertQueryNode2, ReturningNode as ReturningNode2, SelectionNode as SelectionNode4, SingleConnectionProvider, TableNode as TableNode5, UpdateQueryNode as UpdateQueryNode2, WhereNode as WhereNode3 } from "kysely";
 import { match as match16 } from "ts-pattern";
 
-// src/client/executor/name-mapper.ts
+// src/client/executor/kysely-utils.ts
 import { invariant as invariant9 } from "@zenstackhq/common-helpers";
-import { AliasNode as AliasNode4, ColumnNode as ColumnNode3, FromNode as FromNode3, IdentifierNode as IdentifierNode3, OperationNodeTransformer as OperationNodeTransformer2, ReferenceNode as ReferenceNode3, SelectAllNode, SelectionNode as SelectionNode3, TableNode as TableNode4 } from "kysely";
+import { AliasNode as AliasNode4, IdentifierNode as IdentifierNode3 } from "kysely";
+function stripAlias(node) {
+  if (AliasNode4.is(node)) {
+    invariant9(IdentifierNode3.is(node.alias), "Expected identifier as alias");
+    return {
+      alias: node.alias.name,
+      node: node.node
+    };
+  } else {
+    return {
+      alias: void 0,
+      node
+    };
+  }
+}
+__name(stripAlias, "stripAlias");
+
+// src/client/executor/name-mapper.ts
+import { invariant as invariant10 } from "@zenstackhq/common-helpers";
+import { AliasNode as AliasNode5, ColumnNode as ColumnNode3, FromNode as FromNode3, IdentifierNode as IdentifierNode4, OperationNodeTransformer as OperationNodeTransformer2, ReferenceNode as ReferenceNode3, SelectAllNode, SelectionNode as SelectionNode3, TableNode as TableNode4 } from "kysely";
 var QueryNameMapper = class extends OperationNodeTransformer2 {
   static {
     __name(this, "QueryNameMapper");
@@ -5640,7 +5712,7 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
   schema;
   modelToTableMap = /* @__PURE__ */ new Map();
   fieldToColumnMap = /* @__PURE__ */ new Map();
-  modelScopes = [];
+  scopes = [];
   constructor(schema) {
     super(), this.schema = schema;
     for (const [modelName, modelDef] of Object.entries(schema.models)) {
@@ -5661,12 +5733,23 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     if (!node.from?.froms) {
       return super.transformSelectQuery(node);
     }
-    const scopes = this.createScopesFromFroms(node.from, true);
+    const processedFroms = node.from.froms.map((from) => this.processSelectTable(from));
+    const processedJoins = (node.joins ?? []).map((join) => this.processSelectTable(join.table));
+    const scopes = [
+      ...processedFroms.map(({ scope }) => scope),
+      ...processedJoins.map(({ scope }) => scope)
+    ];
     return this.withScopes(scopes, () => {
+      const joins = node.joins ? node.joins.map((join, i) => ({
+        ...join,
+        table: processedJoins[i].node,
+        on: this.transformNode(join.on)
+      })) : void 0;
       return {
         ...super.transformSelectQuery(node),
-        // convert "from" to nested query as needed
-        from: this.processFrom(node.from)
+        from: FromNode3.create(processedFroms.map((f) => f.node)),
+        joins,
+        selections: this.processSelectQuerySelections(node)
       };
     });
   }
@@ -5689,27 +5772,13 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
       selections: this.processSelections(node.selections)
     };
   }
-  transformJoin(node) {
-    const { alias, node: innerNode } = this.stripAlias(node.table);
-    if (TableNode4.is(innerNode)) {
-      const modelName = innerNode.table.identifier.name;
-      if (this.hasMappedColumns(modelName)) {
-        const select = this.createSelectAll(modelName);
-        return {
-          ...super.transformJoin(node),
-          table: this.wrapAlias(select, alias ?? modelName)
-        };
-      }
-    }
-    return super.transformJoin(node);
-  }
   transformReference(node) {
     if (!ColumnNode3.is(node.column)) {
       return super.transformReference(node);
     }
-    const { fieldDef, modelDef, scope } = this.resolveFieldFromScopes(node.column.column.name, node.table?.table.identifier.name);
-    if (fieldDef && !scope.namesMapped) {
-      const mappedFieldName = this.mapFieldName(modelDef.name, fieldDef.name);
+    const scope = this.resolveFieldFromScopes(node.column.column.name, node.table?.table.identifier.name);
+    if (scope && !scope.namesMapped && scope.model) {
+      const mappedFieldName = this.mapFieldName(scope.model, node.column.column.name);
       let mappedTableName = node.table?.table.identifier.name;
       if (mappedTableName) {
         if (scope.alias === mappedTableName) {
@@ -5723,15 +5792,18 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     }
   }
   transformColumn(node) {
-    const { modelDef, fieldDef, scope } = this.resolveFieldFromScopes(node.column.name);
-    if (!fieldDef || scope.namesMapped) {
+    const scope = this.resolveFieldFromScopes(node.column.name);
+    if (!scope || scope.namesMapped || !scope.model) {
       return super.transformColumn(node);
     }
-    const mappedName = this.mapFieldName(modelDef.name, fieldDef.name);
+    const mappedName = this.mapFieldName(scope.model, node.column.name);
     return ColumnNode3.create(mappedName);
   }
   transformUpdateQuery(node) {
-    const { alias, node: innerTable } = this.stripAlias(node.table);
+    if (!node.table) {
+      return super.transformUpdateQuery(node);
+    }
+    const { alias, node: innerTable } = stripAlias(node.table);
     if (!innerTable || !TableNode4.is(innerTable)) {
       return super.transformUpdateQuery(node);
     }
@@ -5747,9 +5819,16 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     });
   }
   transformDeleteQuery(node) {
-    const scopes = this.createScopesFromFroms(node.from, false);
+    const scopes = node.from.froms.map((node2) => {
+      const { alias, node: innerNode } = stripAlias(node2);
+      return {
+        model: this.extractModelName(innerNode),
+        alias,
+        namesMapped: false
+      };
+    });
     const froms = node.from.froms.map((from) => {
-      const { alias, node: innerNode } = this.stripAlias(from);
+      const { alias, node: innerNode } = stripAlias(from);
       if (TableNode4.is(innerNode)) {
         return this.wrapAlias(this.processTableRef(innerNode), alias);
       } else {
@@ -5765,46 +5844,75 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
   }
   // #endregion
   // #region utils
+  processSelectQuerySelections(node) {
+    const selections = [];
+    for (const selection of node.selections ?? []) {
+      if (SelectAllNode.is(selection.selection)) {
+        const scope = this.scopes[this.scopes.length - 1];
+        if (scope?.model && !scope.namesMapped) {
+          selections.push(...this.createSelectAllFields(scope.model, scope.alias));
+        } else {
+          selections.push(super.transformSelection(selection));
+        }
+      } else if (ReferenceNode3.is(selection.selection) || ColumnNode3.is(selection.selection)) {
+        const transformed = this.transformNode(selection.selection);
+        if (AliasNode5.is(transformed)) {
+          selections.push(SelectionNode3.create(transformed));
+        } else {
+          const origFieldName = this.extractFieldName(selection.selection);
+          const fieldName = this.extractFieldName(transformed);
+          if (fieldName !== origFieldName) {
+            selections.push(SelectionNode3.create(this.wrapAlias(transformed, origFieldName)));
+          } else {
+            selections.push(SelectionNode3.create(transformed));
+          }
+        }
+      } else {
+        selections.push(super.transformSelection(selection));
+      }
+    }
+    return selections;
+  }
   resolveFieldFromScopes(name, qualifier) {
-    for (const scope of this.modelScopes.toReversed()) {
+    for (let i = this.scopes.length - 1; i >= 0; i--) {
+      const scope = this.scopes[i];
       if (qualifier) {
         if (scope.alias) {
-          if (qualifier !== scope.alias) {
+          if (scope.alias === qualifier) {
+            return scope;
+          } else {
             continue;
           }
-        } else {
-          if (qualifier !== scope.model) {
+        } else if (scope.model) {
+          if (scope.model === qualifier) {
+            return scope;
+          } else {
             continue;
           }
         }
-      }
-      const modelDef = getModel(this.schema, scope.model);
-      if (!modelDef) {
-        continue;
-      }
-      if (modelDef.fields[name]) {
-        return {
-          modelDef,
-          fieldDef: modelDef.fields[name],
-          scope
-        };
+      } else {
+        if (scope.model) {
+          const modelDef = getModel(this.schema, scope.model);
+          if (!modelDef) {
+            continue;
+          }
+          if (modelDef.fields[name]) {
+            return scope;
+          }
+        }
       }
     }
-    return {
-      modelDef: void 0,
-      fieldDef: void 0,
-      scope: void 0
-    };
+    return void 0;
   }
   pushScope(scope) {
-    this.modelScopes.push(scope);
+    this.scopes.push(scope);
   }
   withScope(scope, fn) {
     this.pushScope(scope);
     try {
       return fn();
     } finally {
-      this.modelScopes.pop();
+      this.scopes.pop();
     }
   }
   withScopes(scopes, fn) {
@@ -5812,17 +5920,11 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     try {
       return fn();
     } finally {
-      scopes.forEach(() => this.modelScopes.pop());
+      scopes.forEach(() => this.scopes.pop());
     }
   }
   wrapAlias(node, alias) {
-    return alias ? AliasNode4.create(node, IdentifierNode3.create(alias)) : node;
-  }
-  ensureAlias(node, alias, fallbackName) {
-    if (!node) {
-      return node;
-    }
-    return alias ? AliasNode4.create(node, IdentifierNode3.create(alias)) : AliasNode4.create(node, IdentifierNode3.create(fallbackName));
+    return alias ? AliasNode5.create(node, IdentifierNode4.create(alias)) : node;
   }
   processTableRef(node) {
     if (!node) {
@@ -5859,86 +5961,49 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
       return tableName;
     }
   }
-  stripAlias(node) {
-    if (!node) {
-      return {
-        alias: void 0,
-        node
-      };
-    }
-    if (AliasNode4.is(node)) {
-      invariant9(IdentifierNode3.is(node.alias), "Expected identifier as alias");
-      return {
-        alias: node.alias.name,
-        node: node.node
-      };
-    }
-    return {
-      alias: void 0,
-      node
-    };
-  }
   hasMappedColumns(modelName) {
     return [
       ...this.fieldToColumnMap.keys()
     ].some((key) => key.startsWith(modelName + "."));
   }
-  createScopesFromFroms(node, namesMapped) {
-    if (!node) {
-      return [];
-    }
-    return node.froms.map((from) => {
-      const { alias, node: innerNode } = this.stripAlias(from);
-      if (innerNode && TableNode4.is(innerNode)) {
-        return {
-          model: innerNode.table.identifier.name,
-          alias,
-          namesMapped
-        };
-      } else {
-        return void 0;
-      }
-    }).filter((s) => !!s);
-  }
   // convert a "from" node to a nested query if there are columns with name mapping
-  processFrom(node) {
-    return {
-      ...super.transformFrom(node),
-      froms: node.froms.map((from) => {
-        const { alias, node: innerNode } = this.stripAlias(from);
-        if (!innerNode) {
-          return super.transformNode(from);
-        }
-        if (TableNode4.is(innerNode)) {
-          if (this.hasMappedColumns(innerNode.table.identifier.name)) {
-            const selectAll = this.createSelectAll(innerNode.table.identifier.name);
-            return this.ensureAlias(selectAll, alias, innerNode.table.identifier.name);
-          }
+  processSelectTable(node) {
+    const { alias, node: innerNode } = stripAlias(node);
+    if (innerNode && TableNode4.is(innerNode)) {
+      const modelName = innerNode.table.identifier.name;
+      const mappedName = this.mapTableName(modelName);
+      const finalAlias = alias ?? (mappedName !== modelName ? modelName : void 0);
+      return {
+        node: this.wrapAlias(TableNode4.create(mappedName), finalAlias),
+        scope: {
+          alias: alias ?? modelName,
+          model: modelName,
+          namesMapped: !this.hasMappedColumns(modelName)
         }
-        return this.transformNode(from);
-      })
-    };
+      };
+    } else {
+      return {
+        node: super.transformNode(node),
+        scope: {
+          alias,
+          model: void 0,
+          namesMapped: true
+        }
+      };
+    }
   }
-  // create a `SelectQueryNode` for the given model with all columns mapped
-  createSelectAll(model) {
+  createSelectAllFields(model, alias) {
     const modelDef = requireModel(this.schema, model);
-    const tableName = this.mapTableName(model);
-    return {
-      kind: "SelectQueryNode",
-      from: FromNode3.create([
-        TableNode4.create(tableName)
-      ]),
-      selections: this.getModelFields(modelDef).map((fieldDef) => {
-        const columnName = this.mapFieldName(model, fieldDef.name);
-        const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName), TableNode4.create(tableName));
-        if (columnName !== fieldDef.name) {
-          const aliased = AliasNode4.create(columnRef, IdentifierNode3.create(fieldDef.name));
-          return SelectionNode3.create(aliased);
-        } else {
-          return SelectionNode3.create(columnRef);
-        }
-      })
-    };
+    return this.getModelFields(modelDef).map((fieldDef) => {
+      const columnName = this.mapFieldName(model, fieldDef.name);
+      const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName), alias ? TableNode4.create(alias) : void 0);
+      if (columnName !== fieldDef.name) {
+        const aliased = AliasNode5.create(columnRef, IdentifierNode4.create(fieldDef.name));
+        return SelectionNode3.create(aliased);
+      } else {
+        return SelectionNode3.create(columnRef);
+      }
+    });
   }
   getModelFields(modelDef) {
     return Object.values(modelDef.fields).filter((f) => !f.relation && !f.computed && !f.originModel);
@@ -5961,25 +6026,29 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
   }
   processSelection(node) {
     let alias;
-    if (!AliasNode4.is(node)) {
+    if (!AliasNode5.is(node)) {
       alias = this.extractFieldName(node);
     }
     const result = super.transformNode(node);
     return this.wrapAlias(result, alias);
   }
   processSelectAll(node) {
-    const scope = this.modelScopes[this.modelScopes.length - 1];
-    invariant9(scope);
-    if (!this.hasMappedColumns(scope.model)) {
+    const scope = this.scopes[this.scopes.length - 1];
+    invariant10(scope);
+    if (!scope.model || !this.hasMappedColumns(scope.model)) {
       return super.transformSelectAll(node);
     }
     const modelDef = requireModel(this.schema, scope.model);
     return this.getModelFields(modelDef).map((fieldDef) => {
-      const columnName = this.mapFieldName(scope.model, fieldDef.name);
+      const columnName = this.mapFieldName(modelDef.name, fieldDef.name);
       const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName));
       return columnName !== fieldDef.name ? this.wrapAlias(columnRef, fieldDef.name) : columnRef;
     });
   }
+  extractModelName(node) {
+    const { node: innerNode } = stripAlias(node);
+    return TableNode4.is(innerNode) ? innerNode.table.identifier.name : void 0;
+  }
   extractFieldName(node) {
     if (ReferenceNode3.is(node) && ColumnNode3.is(node.column)) {
       return node.column.column.name;
@@ -6000,9 +6069,10 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   driver;
   compiler;
   connectionProvider;
+  suppressMutationHooks;
   nameMapper;
-  constructor(client, driver, compiler, adapter, connectionProvider, plugins = []) {
-    super(compiler, adapter, connectionProvider, plugins), this.client = client, this.driver = driver, this.compiler = compiler, this.connectionProvider = connectionProvider;
+  constructor(client, driver, compiler, adapter, connectionProvider, plugins = [], suppressMutationHooks = false) {
+    super(compiler, adapter, connectionProvider, plugins), this.client = client, this.driver = driver, this.compiler = compiler, this.connectionProvider = connectionProvider, this.suppressMutationHooks = suppressMutationHooks;
     this.nameMapper = new QueryNameMapper(client.$schema);
   }
   get kysely() {
@@ -6011,38 +6081,13 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   get options() {
     return this.client.$options;
   }
-  async executeQuery(compiledQuery, _queryId) {
-    let queryNode = compiledQuery.query;
-    let mutationInterceptionInfo;
-    if (this.isMutationNode(queryNode) && this.hasMutationHooks) {
-      mutationInterceptionInfo = await this.callMutationInterceptionFilters(queryNode);
-    }
-    const task = /* @__PURE__ */ __name(async () => {
-      if (this.isMutationNode(queryNode)) {
-        await this.callBeforeMutationHooks(queryNode, mutationInterceptionInfo);
-      }
-      const oldQueryNode = queryNode;
-      if ((InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntities) {
-        queryNode = {
-          ...queryNode,
-          returning: ReturningNode2.create([
-            SelectionNode4.createSelectAll()
-          ])
-        };
-      }
-      const queryParams = compiledQuery.$raw ? compiledQuery.parameters : void 0;
-      const result = await this.proceedQueryWithKyselyInterceptors(queryNode, queryParams);
-      if (this.isMutationNode(queryNode)) {
-        await this.callAfterMutationHooks(result.result, queryNode, mutationInterceptionInfo, result.connection);
-      }
-      if (oldQueryNode !== queryNode) {
-      }
-      return result.result;
-    }, "task");
-    return task();
+  async executeQuery(compiledQuery, queryId) {
+    const queryParams = compiledQuery.$raw ? compiledQuery.parameters : void 0;
+    const result = await this.proceedQueryWithKyselyInterceptors(compiledQuery.query, queryParams, queryId.queryId);
+    return result.result;
   }
-  proceedQueryWithKyselyInterceptors(queryNode, parameters) {
-    let proceed = /* @__PURE__ */ __name((q) => this.proceedQuery(q, parameters), "proceed");
+  async proceedQueryWithKyselyInterceptors(queryNode, parameters, queryId) {
+    let proceed = /* @__PURE__ */ __name((q) => this.proceedQuery(q, parameters, queryId), "proceed");
     const hooks = [];
     for (const plugin of this.client.$options.plugins ?? []) {
       if (plugin.onKyselyQuery) {
@@ -6052,10 +6097,8 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
     for (const hook of hooks) {
       const _proceed = proceed;
       proceed = /* @__PURE__ */ __name(async (query) => {
-        let connection;
         const _p = /* @__PURE__ */ __name(async (q) => {
           const r = await _proceed(q);
-          connection = r.connection;
           return r.result;
         }, "_p");
         const hookResult = await hook({
@@ -6066,35 +6109,129 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
           proceed: _p
         });
         return {
-          result: hookResult,
-          connection
+          result: hookResult
         };
       }, "proceed");
     }
-    return proceed(queryNode);
+    const result = await proceed(queryNode);
+    return result;
   }
-  async proceedQuery(query, parameters) {
-    const finalQuery = this.nameMapper.transformNode(query);
-    let compiled = this.compileQuery(finalQuery);
-    if (parameters) {
-      compiled = {
-        ...compiled,
-        parameters
-      };
-    }
+  getMutationInfo(queryNode) {
+    const model = this.getMutationModel(queryNode);
+    const { action, where } = match16(queryNode).when(InsertQueryNode2.is, () => ({
+      action: "create",
+      where: void 0
+    })).when(UpdateQueryNode2.is, (node) => ({
+      action: "update",
+      where: node.where
+    })).when(DeleteQueryNode2.is, (node) => ({
+      action: "delete",
+      where: node.where
+    })).exhaustive();
+    return {
+      model,
+      action,
+      where
+    };
+  }
+  async proceedQuery(query, parameters, queryId) {
+    let compiled;
     try {
       return await this.provideConnection(async (connection) => {
-        const result = await connection.executeQuery(compiled);
-        return {
-          result,
-          connection
-        };
+        if (this.suppressMutationHooks || !this.isMutationNode(query) || !this.hasEntityMutationPlugins) {
+          const finalQuery2 = this.nameMapper.transformNode(query);
+          compiled = this.compileQuery(finalQuery2);
+          if (parameters) {
+            compiled = {
+              ...compiled,
+              parameters
+            };
+          }
+          const result = await connection.executeQuery(compiled);
+          return {
+            result
+          };
+        }
+        if ((InsertQueryNode2.is(query) || UpdateQueryNode2.is(query)) && this.hasEntityMutationPluginsWithAfterMutationHooks) {
+          query = {
+            ...query,
+            returning: ReturningNode2.create([
+              SelectionNode4.createSelectAll()
+            ])
+          };
+        }
+        const finalQuery = this.nameMapper.transformNode(query);
+        compiled = this.compileQuery(finalQuery);
+        if (parameters) {
+          compiled = {
+            ...compiled,
+            parameters
+          };
+        }
+        const currentlyInTx = this.driver.isTransactionConnection(connection);
+        const connectionClient = this.createClientForConnection(connection, currentlyInTx);
+        const mutationInfo = this.getMutationInfo(finalQuery);
+        let beforeMutationEntities;
+        const loadBeforeMutationEntities = /* @__PURE__ */ __name(async () => {
+          if (beforeMutationEntities === void 0 && (UpdateQueryNode2.is(query) || DeleteQueryNode2.is(query))) {
+            beforeMutationEntities = await this.loadEntities(mutationInfo.model, mutationInfo.where, connection);
+          }
+          return beforeMutationEntities;
+        }, "loadBeforeMutationEntities");
+        await this.callBeforeMutationHooks(finalQuery, mutationInfo, loadBeforeMutationEntities, connectionClient, queryId);
+        const shouldCreateTx = this.hasPluginRequestingAfterMutationWithinTransaction && !this.driver.isTransactionConnection(connection);
+        if (!shouldCreateTx) {
+          const result = await connection.executeQuery(compiled);
+          if (!this.driver.isTransactionConnection(connection)) {
+            await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "all", queryId);
+          } else {
+            await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "inTx", queryId);
+            this.driver.registerTransactionCommitCallback(connection, () => this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "outTx", queryId));
+          }
+          return {
+            result
+          };
+        } else {
+          await this.driver.beginTransaction(connection, {
+            isolationLevel: TransactionIsolationLevel.ReadCommitted
+          });
+          try {
+            const result = await connection.executeQuery(compiled);
+            await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "inTx", queryId);
+            await this.driver.commitTransaction(connection);
+            await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "outTx", queryId);
+            return {
+              result
+            };
+          } catch (err) {
+            await this.driver.rollbackTransaction(connection);
+            throw err;
+          }
+        }
       });
     } catch (err) {
-      const message = `Failed to execute query: ${err}, sql: ${compiled.sql}`;
+      const message = `Failed to execute query: ${err}, sql: ${compiled?.sql}`;
       throw new QueryError(message, err);
     }
   }
+  createClientForConnection(connection, inTx) {
+    const innerExecutor = this.withConnectionProvider(new SingleConnectionProvider(connection));
+    innerExecutor.suppressMutationHooks = true;
+    const innerClient = this.client.withExecutor(innerExecutor);
+    if (inTx) {
+      innerClient.forceTransaction();
+    }
+    return innerClient;
+  }
+  get hasEntityMutationPlugins() {
+    return (this.client.$options.plugins ?? []).some((plugin) => plugin.onEntityMutation);
+  }
+  get hasEntityMutationPluginsWithAfterMutationHooks() {
+    return (this.client.$options.plugins ?? []).some((plugin) => plugin.onEntityMutation?.afterEntityMutation);
+  }
+  get hasPluginRequestingAfterMutationWithinTransaction() {
+    return (this.client.$options.plugins ?? []).some((plugin) => plugin.onEntityMutation?.runAfterMutationWithinTransaction);
+  }
   isMutationNode(queryNode) {
     return InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode) || DeleteQueryNode2.is(queryNode);
   }
@@ -6102,154 +6239,102 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
     return new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, this.connectionProvider, [
       ...this.plugins,
       plugin
-    ]);
+    ], this.suppressMutationHooks);
   }
   withPlugins(plugins) {
     return new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, this.connectionProvider, [
       ...this.plugins,
       ...plugins
-    ]);
+    ], this.suppressMutationHooks);
   }
   withPluginAtFront(plugin) {
     return new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, this.connectionProvider, [
       plugin,
       ...this.plugins
-    ]);
+    ], this.suppressMutationHooks);
   }
   withoutPlugins() {
-    return new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, this.connectionProvider, []);
+    return new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, this.connectionProvider, [], this.suppressMutationHooks);
   }
   withConnectionProvider(connectionProvider) {
-    const newExecutor = new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, connectionProvider);
+    const newExecutor = new _ZenStackQueryExecutor(this.client, this.driver, this.compiler, this.adapter, connectionProvider, this.plugins, this.suppressMutationHooks);
     newExecutor.client = this.client.withExecutor(newExecutor);
     return newExecutor;
   }
-  get hasMutationHooks() {
-    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) => {
-      if (node.from.froms.length !== 1) {
-        throw new InternalError(`Delete query must have exactly one from table`);
-      }
-      return node.from.froms[0].table.identifier.name;
+    return match16(queryNode).when(InsertQueryNode2.is, (node) => {
+      invariant11(node.into, "InsertQueryNode must have an into clause");
+      return node.into.table.identifier.name;
+    }).when(UpdateQueryNode2.is, (node) => {
+      invariant11(node.table, "UpdateQueryNode must have a table");
+      const { node: tableNode } = stripAlias(node.table);
+      invariant11(TableNode5.is(tableNode), "UpdateQueryNode must use a TableNode");
+      return tableNode.table.identifier.name;
+    }).when(DeleteQueryNode2.is, (node) => {
+      invariant11(node.from.froms.length === 1, "Delete query must have exactly one from table");
+      const { node: tableNode } = stripAlias(node.from.froms[0]);
+      invariant11(TableNode5.is(tableNode), "DeleteQueryNode must use a TableNode");
+      return tableNode.table.identifier.name;
     }).otherwise((node) => {
       throw new InternalError(`Invalid query node: ${node}`);
     });
   }
-  async callMutationInterceptionFilters(queryNode) {
-    const plugins = this.client.$options.plugins;
-    if (plugins) {
-      const mutationModel = this.getMutationModel(queryNode);
-      const result = {
-        intercept: false
-      };
-      const { action, where } = match16(queryNode).when(InsertQueryNode2.is, () => ({
-        action: "create",
-        where: void 0
-      })).when(UpdateQueryNode2.is, (node) => ({
-        action: "update",
-        where: node.where
-      })).when(DeleteQueryNode2.is, (node) => ({
-        action: "delete",
-        where: node.where
-      })).exhaustive();
-      for (const plugin of plugins) {
-        const onEntityMutation = plugin.onEntityMutation;
-        if (!onEntityMutation) {
-          continue;
-        }
-        if (!onEntityMutation.mutationInterceptionFilter) {
-          result.intercept = true;
-        } else {
-          const filterResult = await onEntityMutation.mutationInterceptionFilter({
-            model: mutationModel,
-            action,
-            queryNode
-          });
-          result.intercept ||= filterResult.intercept;
-          result.loadBeforeMutationEntities ||= filterResult.loadBeforeMutationEntities;
-          result.loadAfterMutationEntities ||= filterResult.loadAfterMutationEntities;
-        }
-      }
-      let beforeMutationEntities;
-      if (result.loadBeforeMutationEntities && (UpdateQueryNode2.is(queryNode) || DeleteQueryNode2.is(queryNode))) {
-        beforeMutationEntities = await this.loadEntities(mutationModel, where);
-      }
-      return {
-        ...result,
-        mutationModel,
-        action,
-        where,
-        beforeMutationEntities
-      };
-    } else {
-      return void 0;
-    }
-  }
-  async callBeforeMutationHooks(queryNode, mutationInterceptionInfo) {
-    if (!mutationInterceptionInfo?.intercept) {
-      return;
-    }
+  async callBeforeMutationHooks(queryNode, mutationInfo, loadBeforeMutationEntities, client, queryId) {
     if (this.options.plugins) {
-      const mutationModel = this.getMutationModel(queryNode);
       for (const plugin of this.options.plugins) {
         const onEntityMutation = plugin.onEntityMutation;
-        if (onEntityMutation?.beforeEntityMutation) {
-          await onEntityMutation.beforeEntityMutation({
-            model: mutationModel,
-            action: mutationInterceptionInfo.action,
-            queryNode,
-            entities: mutationInterceptionInfo.beforeMutationEntities
-          });
+        if (!onEntityMutation?.beforeEntityMutation) {
+          continue;
         }
+        await onEntityMutation.beforeEntityMutation({
+          model: mutationInfo.model,
+          action: mutationInfo.action,
+          queryNode,
+          loadBeforeMutationEntities,
+          client,
+          queryId
+        });
       }
     }
   }
-  async callAfterMutationHooks(queryResult, queryNode, mutationInterceptionInfo, connection) {
-    if (!mutationInterceptionInfo?.intercept) {
-      return;
-    }
+  async callAfterMutationHooks(queryResult, queryNode, mutationInfo, client, filterFor, queryId) {
     const hooks = [];
     for (const plugin of this.options.plugins ?? []) {
       const onEntityMutation = plugin.onEntityMutation;
-      if (onEntityMutation?.afterEntityMutation) {
-        hooks.push(onEntityMutation.afterEntityMutation.bind(plugin));
+      if (!onEntityMutation?.afterEntityMutation) {
+        continue;
+      }
+      if (filterFor === "inTx" && !onEntityMutation.runAfterMutationWithinTransaction) {
+        continue;
       }
+      if (filterFor === "outTx" && onEntityMutation.runAfterMutationWithinTransaction) {
+        continue;
+      }
+      hooks.push(onEntityMutation.afterEntityMutation.bind(plugin));
     }
     if (hooks.length === 0) {
       return;
     }
     const mutationModel = this.getMutationModel(queryNode);
-    const inTransaction = this.driver.isTransactionConnection(connection);
-    for (const hook of hooks) {
-      let afterMutationEntities = void 0;
-      if (mutationInterceptionInfo.loadAfterMutationEntities) {
-        if (InsertQueryNode2.is(queryNode) || UpdateQueryNode2.is(queryNode)) {
-          afterMutationEntities = queryResult.rows;
-        }
-      }
-      const action = /* @__PURE__ */ __name(async () => {
-        try {
-          await hook({
-            model: mutationModel,
-            action: mutationInterceptionInfo.action,
-            queryNode,
-            beforeMutationEntities: mutationInterceptionInfo.beforeMutationEntities,
-            afterMutationEntities
-          });
-        } catch (err) {
-          console.error(`Error in afterEntityMutation hook for model "${mutationModel}": ${err}`);
-        }
-      }, "action");
-      if (inTransaction) {
-        this.driver.registerTransactionCommitCallback(connection, action);
+    const loadAfterMutationEntities = /* @__PURE__ */ __name(async () => {
+      if (mutationInfo.action === "delete") {
+        return void 0;
       } else {
-        await action();
+        return queryResult.rows;
       }
+    }, "loadAfterMutationEntities");
+    for (const hook of hooks) {
+      await hook({
+        model: mutationModel,
+        action: mutationInfo.action,
+        queryNode,
+        loadAfterMutationEntities,
+        client,
+        queryId
+      });
     }
   }
-  async loadEntities(model, where) {
+  async loadEntities(model, where, connection) {
     const selectQuery = this.kysely.selectFrom(model).selectAll();
     let selectQueryNode = selectQuery.toOperationNode();
     selectQueryNode = {
@@ -6257,9 +6342,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
       where: this.andNodes(selectQueryNode.where, where)
     };
     const compiled = this.compileQuery(selectQueryNode);
-    const result = await this.executeQuery(compiled, {
-      queryId: `zenstack-${nanoid2()}`
-    });
+    const result = await connection.executeQuery(compiled);
     return result.rows;
   }
   andNodes(condition1, condition2) {
@@ -6288,7 +6371,7 @@ __export(functions_exports, {
   search: () => search,
   startsWith: () => startsWith
 });
-import { invariant as invariant10, lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
+import { invariant as invariant12, lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
 import { sql as sql7, ValueNode as ValueNode4 } from "kysely";
 import { match as match17 } from "ts-pattern";
 var contains = /* @__PURE__ */ __name((eb, args) => {
@@ -6395,7 +6478,7 @@ var currentOperation = /* @__PURE__ */ __name((_eb, args, { operation }) => {
 }, "currentOperation");
 function processCasing(casing, result, model) {
   const opNode = casing.toOperationNode();
-  invariant10(ValueNode4.is(opNode) && typeof opNode.value === "string", '"casting" parameter must be a string value');
+  invariant12(ValueNode4.is(opNode) && typeof opNode.value === "string", '"casting" parameter must be a string value');
   result = match17(opNode.value).with("original", () => model).with("upper", () => result.toUpperCase()).with("lower", () => result.toLowerCase()).with("capitalize", () => upperCaseFirst(result)).with("uncapitalize", () => lowerCaseFirst(result)).otherwise(() => {
     throw new Error(`Invalid casing value: ${opNode.value}. Must be "original", "upper", "lower", "capitalize", or "uncapitalize".`);
   });
@@ -6404,7 +6487,7 @@ function processCasing(casing, result, model) {
 __name(processCasing, "processCasing");
 
 // src/client/helpers/schema-db-pusher.ts
-import { invariant as invariant11 } from "@zenstackhq/common-helpers";
+import { invariant as invariant13 } from "@zenstackhq/common-helpers";
 import { sql as sql8 } from "kysely";
 import toposort from "toposort";
 import { match as match18 } from "ts-pattern";
@@ -6465,7 +6548,7 @@ var SchemaDbPusher = class {
     return toposort(graph).reverse().filter((m) => !!m);
   }
   createModelTable(kysely, modelDef) {
-    let table = kysely.schema.createTable(modelDef.name).ifNotExists();
+    let table = kysely.schema.createTable(this.getTableName(modelDef)).ifNotExists();
     for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
       if (fieldDef.originModel && !fieldDef.id) {
         continue;
@@ -6484,6 +6567,26 @@ var SchemaDbPusher = class {
     table = this.addUniqueConstraint(table, modelDef);
     return table;
   }
+  getTableName(modelDef) {
+    const mapAttr = modelDef.attributes?.find((a) => a.name === "@@map");
+    if (mapAttr && mapAttr.args?.[0]) {
+      const mappedName = ExpressionUtils.getLiteralValue(mapAttr.args[0].value);
+      if (mappedName) {
+        return mappedName;
+      }
+    }
+    return modelDef.name;
+  }
+  getColumnName(fieldDef) {
+    const mapAttr = fieldDef.attributes?.find((a) => a.name === "@map");
+    if (mapAttr && mapAttr.args?.[0]) {
+      const mappedName = ExpressionUtils.getLiteralValue(mapAttr.args[0].value);
+      if (mappedName) {
+        return mappedName;
+      }
+    }
+    return fieldDef.name;
+  }
   isComputedField(fieldDef) {
     return fieldDef.attributes?.some((a) => a.name === "@computed");
   }
@@ -6494,29 +6597,29 @@ var SchemaDbPusher = class {
       }
     }
     if (modelDef.idFields.length > 0) {
-      table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields);
+      table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields.map((f) => this.getColumnName(modelDef.fields[f])));
     }
     return table;
   }
   addUniqueConstraint(table, modelDef) {
     for (const [key, value] of Object.entries(modelDef.uniqueFields)) {
-      invariant11(typeof value === "object", "expecting an object");
+      invariant13(typeof value === "object", "expecting an object");
       if ("type" in value) {
         const fieldDef = modelDef.fields[key];
         if (fieldDef.unique) {
           continue;
         }
         table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, [
-          key
+          this.getColumnName(fieldDef)
         ]);
       } else {
-        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value));
+        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value).map((f) => this.getColumnName(modelDef.fields[f])));
       }
     }
     return table;
   }
   createModelField(table, fieldDef, modelDef) {
-    return table.addColumn(fieldDef.name, this.mapFieldType(fieldDef), (col) => {
+    return table.addColumn(this.getColumnName(fieldDef), this.mapFieldType(fieldDef), (col) => {
       if (fieldDef.id && modelDef.idFields.length === 1) {
         col = col.primaryKey();
       }
@@ -6568,11 +6671,13 @@ var SchemaDbPusher = class {
     return fieldDef.default && ExpressionUtils.isCall(fieldDef.default) && fieldDef.default.function === "autoincrement";
   }
   addForeignKeyConstraint(table, model, fieldName, fieldDef) {
-    invariant11(fieldDef.relation, "field must be a relation");
+    invariant13(fieldDef.relation, "field must be a relation");
     if (!fieldDef.relation.fields || !fieldDef.relation.references) {
       return table;
     }
-    table = table.addForeignKeyConstraint(`fk_${model}_${fieldName}`, fieldDef.relation.fields, fieldDef.type, fieldDef.relation.references, (cb) => {
+    const modelDef = requireModel(this.schema, model);
+    const relationModelDef = requireModel(this.schema, fieldDef.type);
+    table = table.addForeignKeyConstraint(`fk_${model}_${fieldName}`, fieldDef.relation.fields.map((f) => this.getColumnName(modelDef.fields[f])), this.getTableName(relationModelDef), fieldDef.relation.references.map((f) => this.getColumnName(relationModelDef.fields[f])), (cb) => {
       if (fieldDef.relation?.onDelete) {
         cb = cb.onDelete(this.mapCascadeAction(fieldDef.relation.onDelete));
       }
@@ -6623,7 +6728,7 @@ function valueToPromise(thing) {
 __name(valueToPromise, "valueToPromise");
 
 // src/client/result-processor.ts
-import { invariant as invariant12 } from "@zenstackhq/common-helpers";
+import { invariant as invariant14 } from "@zenstackhq/common-helpers";
 import Decimal2 from "decimal.js";
 import { match as match19 } from "ts-pattern";
 var ResultProcessor = class {
@@ -6723,14 +6828,14 @@ var ResultProcessor = class {
     if (value instanceof Decimal2) {
       return value;
     }
-    invariant12(typeof value === "string" || typeof value === "number" || value instanceof Decimal2, `Expected string, number or Decimal, got ${typeof value}`);
+    invariant14(typeof value === "string" || typeof value === "number" || value instanceof Decimal2, `Expected string, number or Decimal, got ${typeof value}`);
     return new Decimal2(value);
   }
   transformBigInt(value) {
     if (typeof value === "bigint") {
       return value;
     }
-    invariant12(typeof value === "string" || typeof value === "number", `Expected string or number, got ${typeof value}`);
+    invariant14(typeof value === "string" || typeof value === "number", `Expected string or number, got ${typeof value}`);
     return BigInt(value);
   }
   transformBoolean(value) {
@@ -6774,7 +6879,7 @@ var ResultProcessor = class {
   }
   transformJson(value) {
     return match19(this.schema.provider.type).with("sqlite", () => {
-      invariant12(typeof value === "string", "Expected string, got " + typeof value);
+      invariant14(typeof value === "string", "Expected string, got " + typeof value);
       return JSON.parse(value);
     }).otherwise(() => value);
   }
@@ -6851,13 +6956,18 @@ var ClientImpl = class _ClientImpl {
   }
   // implementation
   async $transaction(input, options) {
-    invariant13(typeof input === "function" || Array.isArray(input) && input.every((p) => p.then && p.cb), "Invalid transaction input, expected a function or an array of ZenStackPromise");
+    invariant15(typeof input === "function" || Array.isArray(input) && input.every((p) => p.then && p.cb), "Invalid transaction input, expected a function or an array of ZenStackPromise");
     if (typeof input === "function") {
       return this.interactiveTransaction(input, options);
     } else {
       return this.sequentialTransaction(input, options);
     }
   }
+  forceTransaction() {
+    if (!this.kysely.isTransaction) {
+      this.kysely = new Transaction(this.kyselyProps);
+    }
+  }
   async interactiveTransaction(callback, options) {
     if (this.kysely.isTransaction) {
       return callback(this);