interaqt 4.0.3 → 4.0.4

package/dist/index.js

@@ -70,52 +70,52 @@ function Co(s) {
 }
 function Pa(s) {
   const e = /* @__PURE__ */ new Map();
-  for (const u of s) {
-    if (!Ot.get(u.type))
-      throw new Error(`Cannot create instance of unknown class "${u.type}". Make sure the class is registered via registerKlass (see core/init.ts and builtins/init.ts).`);
-    if (e.has(u.uuid))
-      throw new Error(`Duplicate uuid "${u.uuid}" in serialized instances`);
-    e.set(u.uuid, u);
+  for (const l of s) {
+    if (!Ot.get(l.type))
+      throw new Error(`Cannot create instance of unknown class "${l.type}". Make sure the class is registered via registerKlass (see core/init.ts and builtins/init.ts).`);
+    if (e.has(l.uuid))
+      throw new Error(`Duplicate uuid "${l.uuid}" in serialized instances`);
+    e.set(l.uuid, l);
   }
   const t = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map();
-  function a(u, l) {
-    if (typeof u == "string") {
-      if (u.startsWith("func::"))
-        return l(new Function("return " + u.substring(6))());
-      if (u.startsWith("uuid::")) {
-        const d = u.substring(6), h = t.get(d);
-        if (h) return l(h);
+  function a(l, u) {
+    if (typeof l == "string") {
+      if (l.startsWith("func::"))
+        return u(new Function("return " + l.substring(6))());
+      if (l.startsWith("uuid::")) {
+        const d = l.substring(6), h = t.get(d);
+        if (h) return u(h);
         if (i.has(d)) {
           const f = r.get(d) || [];
-          return f.push(l), r.set(d, f), l(void 0);
+          return f.push(u), r.set(d, f), u(void 0);
         }
         const m = e.get(d);
         if (!m)
           throw new Error(`Cannot resolve reference "uuid::${d}": no serialized instance with this uuid`);
-        return l(c(m));
+        return u(c(m));
       }
-      return l(u);
+      return u(l);
     }
-    if (Array.isArray(u)) {
-      const d = new Array(u.length);
-      return u.forEach((h, m) => a(h, (f) => {
+    if (Array.isArray(l)) {
+      const d = new Array(l.length);
+      return l.forEach((h, m) => a(h, (f) => {
         d[m] = f;
-      })), l(d);
+      })), u(d);
     }
-    if (nt(u)) {
+    if (nt(l)) {
       const d = {};
-      return Object.entries(u).forEach(([h, m]) => a(m, (f) => {
+      return Object.entries(l).forEach(([h, m]) => a(m, (f) => {
         d[h] = f;
-      })), l(d);
+      })), u(d);
     }
-    return l(u);
+    return u(l);
   }
   const n = /* @__PURE__ */ new Set(["computation"]), o = [];
-  function c(u) {
-    const { type: l, options: d = {}, uuid: h, public: m } = u, f = t.get(h);
+  function c(l) {
+    const { type: u, options: d = {}, uuid: h, public: m } = l, f = t.get(h);
     if (f) return f;
     i.add(h);
-    const p = Ot.get(l), y = {};
+    const p = Ot.get(u), y = {};
     let b;
     Object.entries(m || {}).forEach(([w, R]) => {
       if (n.has(w)) {
@@ -133,9 +133,9 @@ function Pa(s) {
     const g = r.get(h);
     return g && (r.delete(h), g.forEach((w) => w(b))), b;
   }
-  for (const u of s)
-    c(u);
-  if (o.forEach((u) => u()), r.size > 0)
+  for (const l of s)
+    c(l);
+  if (o.forEach((l) => l()), r.size > 0)
     throw new Error(`Unresolved instance references after deserialization: ${Array.from(r.keys()).join(", ")}`);
   return t;
 }
@@ -1053,10 +1053,30 @@ class st {
     };
   }
   static create(e, t) {
-    const i = new st(e, t);
-    if (this.instances.find((a) => a.uuid === i.uuid))
-      throw new Error(`duplicate uuid in options ${i.uuid}, StateMachine`);
-    return this.instances.push(i), i;
+    if (!e.states || e.states.length === 0)
+      throw new Error("StateMachine requires a non-empty states array.");
+    const i = (o) => o !== null && typeof o == "object" && typeof o.name == "string";
+    if (e.states.every(i) && i(e.initialState) && (e.transfers || []).every((o) => i(o?.current) && i(o?.next))) {
+      const o = /* @__PURE__ */ new Set();
+      for (const l of e.states) {
+        if (o.has(l.name))
+          throw new Error(`StateMachine declares duplicate state name "${l.name}". State names must be unique — transitions are keyed by state name, so duplicates make the machine ambiguous.`);
+        o.add(l.name);
+      }
+      const c = new Set(e.states);
+      if (!c.has(e.initialState))
+        throw new Error(`StateMachine initialState "${e.initialState?.name}" is not in the states array. Declare every state node in states.`);
+      for (const l of e.transfers || []) {
+        if (!c.has(l.current))
+          throw new Error(`StateMachine transfer references current state "${l.current?.name}" which is not in the states array. Declare every state node in states.`);
+        if (!c.has(l.next))
+          throw new Error(`StateMachine transfer references next state "${l.next?.name}" which is not in the states array. Declare every state node in states.`);
+      }
+    }
+    const a = new st(e, t);
+    if (this.instances.find((o) => o.uuid === a.uuid))
+      throw new Error(`duplicate uuid in options ${a.uuid}, StateMachine`);
+    return this.instances.push(a), a;
   }
   static stringify(e) {
     return B(this, e);
@@ -1234,7 +1254,7 @@ class ct {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ut {
+class lt {
   constructor(e, t) {
     this._type = "Summation", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.attributeQuery = e.attributeQuery;
   }
@@ -1272,7 +1292,7 @@ class ut {
     };
   }
   static create(e, t) {
-    const i = new ut(e, t);
+    const i = new lt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Summation`);
     return this.instances.push(i), i;
@@ -1299,7 +1319,7 @@ class ut {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class lt {
+class ut {
   constructor(e, t) {
     this._type = "Average", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.attributeQuery = e.attributeQuery;
   }
@@ -1337,7 +1357,7 @@ class lt {
     };
   }
   static create(e, t) {
-    const i = new lt(e, t);
+    const i = new ut(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Average`);
     return this.instances.push(i), i;
@@ -2314,8 +2334,8 @@ const _a = [
   st,
   ot,
   ct,
-  ut,
   lt,
+  ut,
   dt,
   ht,
   zt,
@@ -2746,15 +2766,15 @@ class E {
       });
     } else {
       const t = e.data.key.split("."), { resolvedPath: i, matchExpression: r } = t.reduce((n, o) => {
-        const c = [...n.resolvedPath, o], u = this.map.getInfoByPath(c), l = n.resolvedPath.concat(u?.isLinkFiltered() ? u.getBaseAttributeInfo().attributeName : o);
+        const c = [...n.resolvedPath, o], l = this.map.getInfoByPath(c), u = n.resolvedPath.concat(l?.isLinkFiltered() ? l.getBaseAttributeInfo().attributeName : o);
         let d = n.matchExpression;
-        if (u?.isLinkFiltered()) {
-          const h = u.getLinkInfo(), m = new E(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), f = this.map.getReversePath(l), y = [u.isRecordSource() ? "source" : "target", ...f.slice(2)], b = m.rebase(y.join("."));
+        if (l?.isLinkFiltered()) {
+          const h = l.getLinkInfo(), m = new E(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), f = this.map.getReversePath(u), y = [l.isRecordSource() ? "source" : "target", ...f.slice(2)], b = m.rebase(y.join("."));
           d = d ? d.and(b) : b;
         }
         return {
           path: [...n.path, o],
-          resolvedPath: l,
+          resolvedPath: u,
           matchExpression: d
         };
       }, { path: [this.entityName], resolvedPath: [this.entityName], matchExpression: void 0 });
@@ -2829,12 +2849,12 @@ class E {
       );
   }
   getFinalFieldValue(e, t, i, r, a, n, o) {
-    let c = "", u = [];
-    const l = ["=", ">", "<", "<=", ">=", "like", "!="], d = typeof i[0] == "string" ? i[0].toLowerCase() : i[0];
-    if (l.includes(d))
+    let c = "", l = [];
+    const u = ["=", ">", "<", "<=", ">=", "like", "!="], d = typeof i[0] == "string" ? i[0].toLowerCase() : i[0];
+    if (u.includes(d))
       if (e) {
         const h = this.getReferenceFieldValue(i[1]);
-        c = `${i[0]} "${h.split(".")[0]}"."${h.split(".")[1]}"`, u = [];
+        c = `${i[0]} "${h.split(".")[0]}"."${h.split(".")[1]}"`, l = [];
       } else if (i[1] === null) {
         if (i[0] === "=")
           c = "IS NULL";
@@ -2842,12 +2862,12 @@ class E {
           c = "IS NOT NULL";
         else
           throw new Error(`match operator '${i[0]}' does not support null for key "${t}". Use ['=', null] (IS NULL) or ['!=', null] (IS NOT NULL)`);
-        u = [];
+        l = [];
       } else if (a?.toLowerCase() === "json" && (i[0] === "=" || i[0] === "!=")) {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `${i[0]} ${n()}`, u = [Tt(i[1])]);
+        h ? (c = h.fieldValue, l = h.fieldParams || []) : (c = `${i[0]} ${n()}`, l = [Tt(i[1])]);
       } else
-        c = `${i[0]} ${n()}`, u = [i[1]];
+        c = `${i[0]} ${n()}`, l = [i[1]];
     else if (d === "is null" || d === "is not null") {
       if (i[1] !== null)
         throw new Error(`match operator '${i[0]}' requires null as its value, got: ${JSON.stringify(i[1])} for key "${t}"`);
@@ -2860,22 +2880,22 @@ class E {
       if (T(!e, "reference value cannot use IN to match"), !Array.isArray(i[1]))
         throw new Error(`match operator 'in' requires an array value, got: ${JSON.stringify(i[1])} for key "${t}"`);
       if (T(!i[1].some((h) => h === null), `'in' value list must have null split out before compilation (key "${t}")`), this.assertParamCountWithinDriverLimit(t, "in", i[1].length, o), i[1].length === 0)
-        c = a?.toLowerCase() === "json" ? "IS NOT NULL AND 1=0" : "IN (NULL) AND 1=0", u = [];
+        c = a?.toLowerCase() === "json" ? "IS NOT NULL AND 1=0" : "IN (NULL) AND 1=0", l = [];
       else if (a?.toLowerCase() === "json") {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => Tt(m)));
+        h ? (c = h.fieldValue, l = h.fieldParams || []) : (c = `IN (${i[1].map((m) => n()).join(",")})`, l = i[1].map((m) => Tt(m)));
       } else
-        c = `IN (${i[1].map((h) => n()).join(",")})`, u = i[1];
+        c = `IN (${i[1].map((h) => n()).join(",")})`, l = i[1];
     } else if (d === "not in") {
       if (T(!e, "reference value cannot use NOT IN to match"), !Array.isArray(i[1]))
         throw new Error(`match operator 'not in' requires an array value, got: ${JSON.stringify(i[1])} for key "${t}"`);
       if (T(!i[1].some((h) => h === null), `'not in' value list must have null split out before compilation (key "${t}")`), this.assertParamCountWithinDriverLimit(t, "not in", i[1].length, o), i[1].length === 0)
-        c = a?.toLowerCase() === "json" ? "IS NULL OR 1=1" : "NOT IN (NULL) OR 1=1", u = [];
+        c = a?.toLowerCase() === "json" ? "IS NULL OR 1=1" : "NOT IN (NULL) OR 1=1", l = [];
       else if (a?.toLowerCase() === "json") {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `NOT IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => Tt(m)));
+        h ? (c = h.fieldValue, l = h.fieldParams || []) : (c = `NOT IN (${i[1].map((m) => n()).join(",")})`, l = i[1].map((m) => Tt(m)));
       } else
-        c = `NOT IN (${i[1].map((h) => n()).join(",")})`, u = i[1];
+        c = `NOT IN (${i[1].map((h) => n()).join(",")})`, l = i[1];
     } else if (d === "between") {
       if (!Array.isArray(i[1]) || i[1].length !== 2)
         throw new Error(`match operator 'between' requires a two-element array value [min, max], got: ${JSON.stringify(i[1])} for key "${t}"`);
@@ -2885,14 +2905,14 @@ class E {
         );
       if (e) {
         const h = this.getReferenceFieldValue(i[1][0]), m = this.getReferenceFieldValue(i[1][1]);
-        c = `BETWEEN "${h.split(".")[0]}"."${h.split(".")[1]}" AND "${m.split(".")[0]}"."${m.split(".")[1]}"`, u = [];
+        c = `BETWEEN "${h.split(".")[0]}"."${h.split(".")[1]}" AND "${m.split(".")[0]}"."${m.split(".")[1]}"`, l = [];
       } else
-        c = `BETWEEN ${n()} AND ${n()}`, u = [i[1][0], i[1][1]];
+        c = `BETWEEN ${n()} AND ${n()}`, l = [i[1][0], i[1][1]];
     } else {
       let h;
-      o && (h = o.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n)), h ? (c = h.fieldValue, u = h.fieldParams || []) : T(h, `unknown value expression ${JSON.stringify(i)}`);
+      o && (h = o.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n)), h ? (c = h.fieldValue, l = h.fieldParams || []) : T(h, `unknown value expression ${JSON.stringify(i)}`);
     }
-    return [c, u];
+    return [c, l];
   }
   // CAUTION SQL 三值逻辑下 `col IN (…, NULL)` 恒不匹配 NULL 行、`col NOT IN (…, NULL)` 对任意行
   //  求值 UNKNOWN（静默过滤掉所有行）。含 null 的 in/not in 在编译期拆分成显式的 null 分支：
@@ -2916,14 +2936,14 @@ class E {
   //  内层子查询分配，EXIST 之后的值原子编号就会和参数数组错位，导致查询结果静默错误。
   buildFieldMatchExpression(e, t, i) {
     return this.data ? this.data.map((r) => {
-      const a = r.data.key.split("."), n = this.map.getInfoByPath([this.entityName].concat(a)), o = [this.entityName].concat(a), u = this.map.spawnManyToManySymmetricPath(o)?.map((l) => l.slice(1, 1 / 0));
+      const a = r.data.key.split("."), n = this.map.getInfoByPath([this.entityName].concat(a)), o = [this.entityName].concat(a), l = this.map.spawnManyToManySymmetricPath(o)?.map((u) => u.slice(1, 1 / 0));
       if (n.isValue) {
         if (typeof r.data.value?.[0] == "string" && r.data.value[0].toLowerCase() === "contains" && !n.isCollection)
           throw new Error(
             `match operator 'contains' on key "${r.data.key}" requires a collection property, but "${this.entityName}.${r.data.key}" is not declared with collection: true. To match inside a non-collection JSON object, query a dedicated value property instead.`
           );
-        const l = E.splitNullInListValue(r.data.value), d = (f) => {
-          if (!l) {
+        const u = E.splitNullInListValue(r.data.value), d = (f) => {
+          if (!u) {
             const [y, b] = this.getFinalFieldValue(r.data.isReferenceValue, r.data.key, r.data.value, f.join("."), n.fieldType, e, t);
             return {
               ...r.data,
@@ -2933,7 +2953,7 @@ class E {
             };
           }
           let p;
-          for (const y of l.parts) {
+          for (const y of u.parts) {
             const [b, g] = this.getFinalFieldValue(r.data.isReferenceValue, r.data.key, y, f.join("."), n.fieldType, e, t), w = {
               ...r.data,
               value: y,
@@ -2941,31 +2961,31 @@ class E {
               fieldValue: b,
               fieldParams: g
             };
-            p = p ? l.connector === "or" ? p.or(w) : p.and(w) : k.atom(w);
+            p = p ? u.connector === "or" ? p.or(w) : p.and(w) : k.atom(w);
           }
           return p;
         }, h = (f) => f instanceof k ? f : k.atom(f);
-        if (!u)
+        if (!l)
           return d(this.getFinalFieldName(a));
         let m;
-        for (const f of u) {
+        for (const f of l) {
           const p = h(d(this.getFinalFieldName(f)));
           m = m ? m.or(p) : p;
         }
         return m;
       } else {
-        const l = i || ((h) => h);
-        if (!u)
-          return l({
+        const u = i || ((h) => h);
+        if (!l)
+          return u({
             ...r.data,
             namePath: o,
             isFunctionMatch: !0
           });
         let d;
-        for (const h of u) {
+        for (const h of l) {
           const m = [this.entityName].concat(h);
           T(m.length === o.length, `symmetric path variant must preserve length, ${m} ${o}`);
-          const f = l({
+          const f = u({
             ...r.data,
             namePath: m,
             isFunctionMatch: !0
@@ -2985,30 +3005,30 @@ class E {
     const i = t.recordName, r = this.map.getReverseAttribute(this.entityName, e), a = (o) => {
       if (o) {
         if (o.isExpression()) {
-          const c = a(o.left), u = a(o.right);
-          if (!c && !u) return;
-          if (!c) return u;
-          if (!u) return c;
-          const l = o.raw.operator;
-          if (l === "and")
-            return c.and(u);
-          if (l === "or")
-            return c.or(u);
-          if (l === "not")
+          const c = a(o.left), l = a(o.right);
+          if (!c && !l) return;
+          if (!c) return l;
+          if (!l) return c;
+          const u = o.raw.operator;
+          if (u === "and")
+            return c.and(l);
+          if (u === "or")
+            return c.or(l);
+          if (u === "not")
             return c.not();
         } else if (o.isAtom()) {
-          const c = o.data, u = c.key.split(".");
-          if (u[0] === e) {
-            const d = u.slice(1).join(".");
+          const c = o.data, l = c.key.split(".");
+          if (l[0] === e) {
+            const d = l.slice(1).join(".");
             return k.atom({
               key: d,
               value: c.value,
               isReferenceValue: c.isReferenceValue
             });
           }
-          const l = this.map.getShrinkedAttribute(i, `${r}.${c.key}`);
+          const u = this.map.getShrinkedAttribute(i, `${r}.${c.key}`);
           return k.atom({
-            key: l,
+            key: u,
             value: c.value,
             isReferenceValue: c.isReferenceValue
           });
@@ -3087,10 +3107,10 @@ class Ur {
   }
 }
 class G {
-  constructor(e, t, i, r, a, n, o, c, u, l = !1, d, h, m, f) {
-    this.recordName = e, this.map = t, this.matchExpression = i, this.attributeQuery = r, this.modifier = a, this.contextRootEntity = n, this.parentRecord = o, this.attributeName = c, this.onlyRelationData = u, this.allowNull = l, this.label = d, this.goto = h, this.exit = m, this.alias = f;
+  constructor(e, t, i, r, a, n, o, c, l, u = !1, d, h, m, f) {
+    this.recordName = e, this.map = t, this.matchExpression = i, this.attributeQuery = r, this.modifier = a, this.contextRootEntity = n, this.parentRecord = o, this.attributeName = c, this.onlyRelationData = l, this.allowNull = u, this.label = d, this.goto = h, this.exit = m, this.alias = f;
   }
-  static create(e, t, i, r, a, n, o, c = !1, u) {
+  static create(e, t, i, r, a, n, o, c = !1, l) {
     const d = t.getRecordInfo(e).resolvedBaseRecordName, h = new E(e, t, i.matchExpression, r), m = c ? h : h.and({
       key: "id",
       value: ["not", null]
@@ -3109,7 +3129,7 @@ class G {
       i.label,
       i.goto,
       i.exit,
-      u
+      l
     );
   }
   getData() {
@@ -3203,8 +3223,8 @@ class K {
     this.recordName = e, this.map = t, this.data = i, this.parentRecord = r, this.attributeName = a, this.shouldQueryParentLinkData = n, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [];
     let o = /* @__PURE__ */ new Set();
     i.forEach((c) => {
-      const u = typeof c == "string" ? [c, {}, !1] : c, [l, d, h] = u;
-      if (l === v) {
+      const l = typeof c == "string" ? [c, {}, !1] : c, [u, d, h] = l;
+      if (u === v) {
         T(!!(this.parentRecord && this.attributeName), `parent record and attribute name cannot be empty when query link data, you passed ${this.parentRecord} ${this.attributeName}`);
         const f = this.map.getInfo(this.parentRecord, this.attributeName);
         let p = d;
@@ -3217,13 +3237,13 @@ class K {
         }), this.parentLinkRecordQuery = G.create(f.linkName, this.map, p, void 0);
         return;
       }
-      if (l === Ba) {
+      if (u === Ba) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((f) => f.attributeName));
         return;
       }
-      const m = this.map.getInfo(this.recordName, l);
+      const m = this.map.getInfo(this.recordName, u);
       if (m.isRecord) {
-        let f = l, p = d;
+        let f = u, p = d;
         if (m.isLinkFiltered()) {
           f = m.getBaseAttributeInfo().attributeName;
           const b = d.matchExpression, g = m.getLinkInfo().getBaseLinkInfo(), R = new E(g.name, this.map, m.getMatchExpression()).rebase(m.isRecordSource() ? "target" : "source"), S = b ? R.and(b) : R;
@@ -3232,17 +3252,17 @@ class K {
             matchExpression: S.data
           };
         }
-        const y = G.create(m.recordName, this.map, p, void 0, this.recordName, f, h, !1, l);
+        const y = G.create(m.recordName, this.map, p, void 0, this.recordName, f, h, !1, u);
         this.relatedRecords.push(y), m.isXToMany ? this.xToManyRecords.push(y) : m.isXToOne && this.xToOneRecords.push(y);
       } else
-        o.add(l);
+        o.add(u);
     }), this.valueAttributes = Array.from(o), this.fullQueryTree = this.buildFullQueryTree();
   }
   static mergeAttributeQueryData(e, t) {
-    const i = [...e, ...t], r = new Set(i.filter((c) => typeof c == "string")), a = i.filter((c) => typeof c != "string"), n = (c, u, l) => {
+    const i = [...e, ...t], r = new Set(i.filter((c) => typeof c == "string")), a = i.filter((c) => typeof c != "string"), n = (c, l, u) => {
       const d = {}, h = ["matchExpression", "modifier", "label", "goto", "exit"];
       for (const m of h) {
-        const f = u[m], p = l[m];
+        const f = l[m], p = u[m];
         if (!(f === void 0 && p === void 0)) {
           if (f !== void 0 && p !== void 0 && JSON.stringify(f) !== JSON.stringify(p))
             throw new Error(
@@ -3252,71 +3272,71 @@ class K {
         }
       }
       return d;
-    }, o = a.reduce((c, u) => {
-      const [l, d, h] = u, m = c[l];
-      return m ? c[l] = {
+    }, o = a.reduce((c, l) => {
+      const [u, d, h] = l, m = c[u];
+      return m ? c[u] = {
         subQueryData: {
-          ...n(l, m.subQueryData, d),
+          ...n(u, m.subQueryData, d),
           attributeQuery: K.mergeAttributeQueryData(m.subQueryData.attributeQuery || [], d.attributeQuery || [])
         },
         // onlyRelationData 表示"只取关系数据不取实体数据"：任一方需要实体数据则取全量（false 更宽）。
         onlyRelationData: m.onlyRelationData && !!h
-      } : c[l] = { subQueryData: d, onlyRelationData: !!h }, c;
+      } : c[u] = { subQueryData: d, onlyRelationData: !!h }, c;
     }, {});
     return [
       ...r,
       ...Object.entries(o).map(
-        ([c, { subQueryData: u, onlyRelationData: l }]) => l ? [c, u, !0] : [c, u]
+        ([c, { subQueryData: l, onlyRelationData: u }]) => u ? [c, l, !0] : [c, l]
       )
     ];
   }
   static getAttributeQueryDataForRecord(e, t, i, r, a, n) {
     const o = t.getRecordInfo(e), c = t.getRecordInfo(o.resolvedBaseRecordName);
-    let u = c.valueAttributes.map((l) => l.attributeName);
-    return i && c.sameTableReliance.forEach((l) => {
-      const d = K.getAttributeQueryDataForRecord(l.recordName, t, !0, r), h = [
-        l.attributeName,
+    let l = c.valueAttributes.map((u) => u.attributeName);
+    return i && c.sameTableReliance.forEach((u) => {
+      const d = K.getAttributeQueryDataForRecord(u.recordName, t, !0, r), h = [
+        u.attributeName,
         {
           attributeQuery: [...d]
         }
       ];
       if (!c.isRelation) {
-        const m = K.getAttributeQueryDataForRecord(l.linkName, t, !0, r);
+        const m = K.getAttributeQueryDataForRecord(u.linkName, t, !0, r);
         h[1].attributeQuery.push([v, { attributeQuery: m }]);
       }
-      u = K.mergeAttributeQueryData(u, [h]);
-    }), n && c.notRelianceCombined.forEach((l) => {
-      const d = K.getAttributeQueryDataForRecord(l.recordName, t, !0, r), h = [
-        l.attributeName,
+      l = K.mergeAttributeQueryData(l, [h]);
+    }), n && c.notRelianceCombined.forEach((u) => {
+      const d = K.getAttributeQueryDataForRecord(u.recordName, t, !0, r), h = [
+        u.attributeName,
         {
           attributeQuery: [...d]
         }
       ];
       if (!c.isRelation) {
-        const m = K.getAttributeQueryDataForRecord(l.linkName, t, !0, r);
+        const m = K.getAttributeQueryDataForRecord(u.linkName, t, !0, r);
         h[1].attributeQuery.push([v, { attributeQuery: m }]);
       }
-      u = K.mergeAttributeQueryData(u, [h]);
-    }), r && c.mergedRecordAttributes.forEach((l) => {
-      const d = K.getAttributeQueryDataForRecord(l.linkName, t, i, !0);
-      u = K.mergeAttributeQueryData(u, [
+      l = K.mergeAttributeQueryData(l, [h]);
+    }), r && c.mergedRecordAttributes.forEach((u) => {
+      const d = K.getAttributeQueryDataForRecord(u.linkName, t, i, !0);
+      l = K.mergeAttributeQueryData(l, [
         [
-          l.attributeName,
+          u.attributeName,
           {
             attributeQuery: ["id", [v, { attributeQuery: d }]]
           }
         ]
       ]);
-    }), a && c.managedRecordAttributes.forEach((l) => {
-      u = K.mergeAttributeQueryData(u, [
+    }), a && c.managedRecordAttributes.forEach((u) => {
+      l = K.mergeAttributeQueryData(l, [
         [
-          l.attributeName,
+          u.attributeName,
           {
             attributeQuery: ["id"]
           }
         ]
       ]);
-    }), u;
+    }), l;
   }
   getValueAndXToOneRecordFields(e = [this.recordName], t = [this.recordName]) {
     const r = (this.valueAttributes.includes("id") ? this.valueAttributes : ["id"].concat(this.valueAttributes)).map((a) => ({
@@ -3329,15 +3349,15 @@ class K {
       r.push(
         ...a.attributeQuery.getValueAndXToOneRecordFields(n, o)
       );
-      const c = n.concat(v), u = o.concat(v);
+      const c = n.concat(v), l = o.concat(v);
       a.attributeQuery.parentLinkRecordQuery && r.push(
-        ...a.attributeQuery.parentLinkRecordQuery.attributeQuery.getValueAndXToOneRecordFields(c, u)
+        ...a.attributeQuery.parentLinkRecordQuery.attributeQuery.getValueAndXToOneRecordFields(c, l)
       );
     }), this.shouldQueryParentLinkData && this.parentLinkRecordQuery) {
-      const a = this.map.getInfo(this.parentRecord, this.attributeName).getReverseInfo()?.attributeName, n = e.concat(a, v), o = t.concat(a, v), c = this.map.spawnManyToManySymmetricPath(n), u = this.map.spawnManyToManySymmetricPath(o);
-      c ? c.forEach((l, d) => {
+      const a = this.map.getInfo(this.parentRecord, this.attributeName).getReverseInfo()?.attributeName, n = e.concat(a, v), o = t.concat(a, v), c = this.map.spawnManyToManySymmetricPath(n), l = this.map.spawnManyToManySymmetricPath(o);
+      c ? c.forEach((u, d) => {
         r.push(
-          ...this.parentLinkRecordQuery.attributeQuery.getValueAndXToOneRecordFields(l, u[d])
+          ...this.parentLinkRecordQuery.attributeQuery.getValueAndXToOneRecordFields(u, l[d])
         );
       }) : r.push(
         ...this.parentLinkRecordQuery.attributeQuery.getValueAndXToOneRecordFields(n, o)
@@ -3377,25 +3397,25 @@ function Ua(s) {
 function Qa(s) {
   return s !== null && typeof s == "object" && "source" in s && "target" in s;
 }
-class ie {
+class ee {
   constructor(e, t, i, r) {
     this.map = e, this.originalRecordName = t, this.rawData = i, this.info = r, this.mergedLinkTargetNewRecords = [], this.mergedLinkTargetRecordIdRefs = [], this.mergedLinkTargetNullRecords = [], this.combinedNewRecords = [], this.combinedRecordIdRefs = [], this.combinedNullRecords = [], this.differentTableMergedLinkNewRecords = [], this.differentTableMergedLinkRecordIdRefs = [], this.differentTableMergedLinkNullRecords = [], this.isolatedNewRecords = [], this.isolatedRecordIdRefs = [], this.isolatedNullRecords = [], this.entityIdAttributes = [], this.relatedEntitiesData = [], this.valueAttributes = [], this.sameRowEntityIdRefs = [], this.defaultValues = {};
     const a = this.map.getRecordInfo(t);
     this.recordName = a.resolvedBaseRecordName;
     const [n, o, c] = this.map.groupAttributes(this.recordName, i ? Object.keys(i) : []);
     this.relatedEntitiesData = Ua(o.map(
-      (l) => Array.isArray(i[l.attributeName]) ? ie.dedupeRefItems(i[l.attributeName], l.attributeName, this.recordName).map((d) => new ie(this.map, l.recordName, d, l)) : new ie(this.map, l.recordName, i[l.attributeName], l)
+      (u) => Array.isArray(i[u.attributeName]) ? ee.dedupeRefItems(i[u.attributeName], u.attributeName, this.recordName).map((d) => new ee(this.map, u.recordName, d, u)) : new ee(this.map, u.recordName, i[u.attributeName], u)
     )), this.valueAttributes = n, this.entityIdAttributes = c;
-    const u = this.map.getRecordInfo(this.recordName);
-    this.defaultValues = u.valueAttributes.reduce((l, d) => {
+    const l = this.map.getRecordInfo(this.recordName);
+    this.defaultValues = l.valueAttributes.reduce((u, d) => {
       const h = d.data;
-      return !this.rawData?.hasOwnProperty(d.attributeName) && h.defaultValue && typeof h.defaultValue == "function" && (l[d.attributeName] = h.defaultValue(i, this.originalRecordName)), l;
-    }, {}), this.relatedEntitiesData.forEach((l) => {
-      l.info.isMergedWithParent() ? l.isNull() ? this.combinedNullRecords.push(l) : l.isRef() ? this.combinedRecordIdRefs.push(l) : this.combinedNewRecords.push(l) : l.info.isLinkMergedWithParent() ? l.isNull() ? this.mergedLinkTargetNullRecords.push(l) : l.isRef() ? this.mergedLinkTargetRecordIdRefs.push(l) : this.mergedLinkTargetNewRecords.push(l) : l.info.isLinkMergedWithAttribute() ? l.isNull() ? this.differentTableMergedLinkNullRecords.push(l) : l.isRef() ? this.differentTableMergedLinkRecordIdRefs.push(l) : this.differentTableMergedLinkNewRecords.push(l) : l.isNull() ? this.isolatedNullRecords.push(l) : l.isRef() ? this.isolatedRecordIdRefs.push(l) : this.isolatedNewRecords.push(l);
-    }), this.rawData?.[v] && (this.linkRecordData = new ie(this.map, r?.linkName, this.rawData[v]));
+      return !this.rawData?.hasOwnProperty(d.attributeName) && h.defaultValue && typeof h.defaultValue == "function" && (u[d.attributeName] = h.defaultValue(i, this.originalRecordName)), u;
+    }, {}), this.relatedEntitiesData.forEach((u) => {
+      u.info.isMergedWithParent() ? u.isNull() ? this.combinedNullRecords.push(u) : u.isRef() ? this.combinedRecordIdRefs.push(u) : this.combinedNewRecords.push(u) : u.info.isLinkMergedWithParent() ? u.isNull() ? this.mergedLinkTargetNullRecords.push(u) : u.isRef() ? this.mergedLinkTargetRecordIdRefs.push(u) : this.mergedLinkTargetNewRecords.push(u) : u.info.isLinkMergedWithAttribute() ? u.isNull() ? this.differentTableMergedLinkNullRecords.push(u) : u.isRef() ? this.differentTableMergedLinkRecordIdRefs.push(u) : this.differentTableMergedLinkNewRecords.push(u) : u.isNull() ? this.isolatedNullRecords.push(u) : u.isRef() ? this.isolatedRecordIdRefs.push(u) : this.isolatedNewRecords.push(u);
+    }), this.rawData?.[v] && (this.linkRecordData = new ee(this.map, r?.linkName, this.rawData[v]));
   }
   merge(e) {
-    const t = new ie(this.map, this.originalRecordName, { ...this.rawData, ...e }, this.info);
+    const t = new ee(this.map, this.originalRecordName, { ...this.rawData, ...e }, this.info);
     return this.recordName !== this.originalRecordName && (t.recordName = this.recordName), t;
   }
   getRef() {
@@ -3417,8 +3437,8 @@ class ie {
         r.set(String(o), n), a.push(n);
         continue;
       }
-      const u = JSON.stringify(c[v] ?? null), l = JSON.stringify(n[v] ?? null);
-      if (u !== l)
+      const l = JSON.stringify(c[v] ?? null), u = JSON.stringify(n[v] ?? null);
+      if (l !== u)
         throw new Error(
           `duplicate reference to id "${o}" in "${i}.${t}" carries conflicting '&' link data. A target may appear at most once, or its duplicates must declare identical link attributes.`
         );
@@ -3436,64 +3456,64 @@ class ie {
   }
   getSameRowFieldAndValue(e = {}) {
     const t = { ...e, ...this.rawData }, i = [], r = /* @__PURE__ */ new Set(), a = this.map.getRecordInfo(this.recordName), n = new Set(
-      Object.keys(a.data.attributes).filter((u) => a.data.attributes[u].isRecord)
-    ), o = (u, l) => new Proxy(u, {
+      Object.keys(a.data.attributes).filter((l) => a.data.attributes[l].isRecord)
+    ), o = (l, u) => new Proxy(l, {
       get: (d, h) => {
         if (typeof h == "string" && n.has(h))
           throw new Error(
-            `computed property "${l}" on "${this.recordName}" accessed relation property "${h}". "computed" only receives the record's own same-row value fields; relation data is not loaded here and would be silently stale. Use a reactive computation (Count/Summation/Custom/StateMachine, etc.) for derivations that depend on related records.`
+            `computed property "${u}" on "${this.recordName}" accessed relation property "${h}". "computed" only receives the record's own same-row value fields; relation data is not loaded here and would be silently stale. Use a reactive computation (Count/Summation/Custom/StateMachine, etc.) for derivations that depend on related records.`
           );
         return d[h];
       }
     }), c = /* @__PURE__ */ new Set();
-    return this.valueAttributes.forEach((u) => {
-      c.add(u.attributeName);
-      let l = u.isComputed ? u.computed(o(t, u.attributeName)) : this.rawData[u.attributeName];
-      const d = u.data;
-      l === void 0 && d.defaultValue && typeof d.defaultValue == "function" && (l = d.defaultValue(this.rawData, this.originalRecordName)), i.push({
-        name: u.attributeName,
-        field: u.field,
-        value: l,
-        fieldType: u.fieldType
-      }), u.isComputed && r.add(u.attributeName);
-    }), a.valueAttributes.forEach((u) => {
-      const l = u.data;
-      if (!c.has(u.attributeName) && l.defaultValue && typeof l.defaultValue == "function" && this.rawData[u.attributeName] === void 0 && e[u.attributeName] === void 0) {
-        const d = this.defaultValues[u.attributeName];
+    return this.valueAttributes.forEach((l) => {
+      c.add(l.attributeName);
+      let u = l.isComputed ? l.computed(o(t, l.attributeName)) : this.rawData[l.attributeName];
+      const d = l.data;
+      u === void 0 && d.defaultValue && typeof d.defaultValue == "function" && (u = d.defaultValue(this.rawData, this.originalRecordName)), i.push({
+        name: l.attributeName,
+        field: l.field,
+        value: u,
+        fieldType: l.fieldType
+      }), l.isComputed && r.add(l.attributeName);
+    }), a.valueAttributes.forEach((l) => {
+      const u = l.data;
+      if (!c.has(l.attributeName) && u.defaultValue && typeof u.defaultValue == "function" && this.rawData[l.attributeName] === void 0 && e[l.attributeName] === void 0) {
+        const d = this.defaultValues[l.attributeName];
         i.push({
-          name: u.attributeName,
-          field: u.field,
+          name: l.attributeName,
+          field: l.field,
           value: d,
-          fieldType: u.fieldType
+          fieldType: l.fieldType
         });
       }
-    }), a.valueAttributes.forEach((u) => {
-      if (u.isComputed && !r.has(u.attributeName)) {
-        const l = u.computed(o(t, u.attributeName));
-        l !== e[u.attributeName] && i.push({
-          name: u.attributeName,
-          field: u.field,
-          value: l,
-          fieldType: u.fieldType
+    }), a.valueAttributes.forEach((l) => {
+      if (l.isComputed && !r.has(l.attributeName)) {
+        const u = l.computed(o(t, l.attributeName));
+        u !== e[l.attributeName] && i.push({
+          name: l.attributeName,
+          field: l.field,
+          value: u,
+          fieldType: l.fieldType
         });
       }
-    }), this.entityIdAttributes.forEach((u) => {
+    }), this.entityIdAttributes.forEach((l) => {
       i.push({
-        name: u.attributeName,
-        field: u.linkField,
-        value: this.rawData[u.attributeName].id
+        name: l.attributeName,
+        field: l.linkField,
+        value: this.rawData[l.attributeName].id
       });
-    }), this.mergedLinkTargetRecordIdRefs.forEach((u) => {
+    }), this.mergedLinkTargetRecordIdRefs.forEach((l) => {
       if (i.push({
-        name: u.info?.attributeName,
-        field: u.info?.linkField,
-        value: u.getRef().id
-      }), u.linkRecordData) {
-        const l = u.info?.attributeName, d = e[l]?.id === u.getRef().id ? e[l]?.[v] : void 0;
-        i.push(...u.linkRecordData.getSameRowFieldAndValue(d).filter((h) => h.field !== u.info?.linkField));
+        name: l.info?.attributeName,
+        field: l.info?.linkField,
+        value: l.getRef().id
+      }), l.linkRecordData) {
+        const u = l.info?.attributeName, d = e[u]?.id === l.getRef().id ? e[u]?.[v] : void 0;
+        i.push(...l.linkRecordData.getSameRowFieldAndValue(d).filter((h) => h.field !== l.info?.linkField));
       }
-    }), this.info && this.linkRecordData && this.info.isLinkMergedWithAttribute() && i.push(...this.linkRecordData.getSameRowFieldAndValue()), this.combinedNewRecords.concat(this.combinedRecordIdRefs).forEach((u) => {
-      i.push(...u.getSameRowFieldAndValue(e[u.info?.attributeName])), u.linkRecordData && i.push(...u.linkRecordData.getSameRowFieldAndValue(e[u.info?.attributeName]?.[v]));
+    }), this.info && this.linkRecordData && this.info.isLinkMergedWithAttribute() && i.push(...this.linkRecordData.getSameRowFieldAndValue()), this.combinedNewRecords.concat(this.combinedRecordIdRefs).forEach((l) => {
+      i.push(...l.getSameRowFieldAndValue(e[l.info?.attributeName])), l.linkRecordData && i.push(...l.linkRecordData.getSameRowFieldAndValue(e[l.info?.attributeName]?.[v]));
     }), i;
   }
 }
@@ -3537,10 +3557,10 @@ class ja {
       );
     const a = await this.createRecordDependency(e, i);
     await this.unlinkOldOwnersOfExclusiveTargets(a, i);
-    const n = await this.collectCreationLinkChecks(a, i), o = await this.insertSameRowData(a, t, i), c = await this.handleCreationReliance(a.merge(o), i), u = Object.assign({}, e.getData(), o, c);
+    const n = await this.collectCreationLinkChecks(a, i), o = await this.insertSameRowData(a, t, i), c = await this.handleCreationReliance(a.merge(o), i), l = Object.assign({}, e.getData(), o, c);
     await this.filteredEntityManager.settleMembershipChecks(n, i);
-    const l = Object.assign({}, a.defaultValues, u);
-    return delete l[Pe], await this.filteredEntityManager.handleRecordCreation(e.recordName, o.id, l, i), Object.assign(o, c);
+    const u = Object.assign({}, a.defaultValues, l);
+    return delete u[Pe], await this.filteredEntityManager.handleRecordCreation(e.recordName, o.id, u, i), Object.assign(o, c);
   }
   /**
    * 采集本次创建涉及的"既有记录端"成员资格快照：
@@ -3596,9 +3616,9 @@ class ja {
    * keys = 本次实际写入的属性名（含被联动重算的 computed 属性），record 带 id，oldRecord 为变更前快照。
    */
   buildSameRowUpdateEvent(e, t, i) {
-    const r = e.getSameRowFieldAndValue(i), a = this.map.getRecordInfo(t), n = new Set(a.valueAttributes.map((u) => u.attributeName)), o = { ...e.getData() }, c = [];
-    return r.forEach((u) => {
-      u.name !== "id" && n.has(u.name) && (o[u.name] = u.value, c.push(u.name));
+    const r = e.getSameRowFieldAndValue(i), a = this.map.getRecordInfo(t), n = new Set(a.valueAttributes.map((l) => l.attributeName)), o = { ...e.getData() }, c = [];
+    return r.forEach((l) => {
+      l.name !== "id" && n.has(l.name) && (o[l.name] = l.value, c.push(l.name));
     }), c.length ? {
       type: "update",
       recordName: t,
@@ -3626,60 +3646,60 @@ class ja {
       });
     else {
       if (e.valueAttributes.length) {
-        const u = this.buildSameRowUpdateEvent(e, e.recordName, r);
-        u && i?.push(u);
+        const l = this.buildSameRowUpdateEvent(e, e.recordName, r);
+        l && i?.push(l);
       }
-      for (const u of e.mergedLinkTargetRecordIdRefs.concat(e.combinedRecordIdRefs)) {
-        const l = u.info.attributeName, d = r?.[l];
-        if (!(!d?.id || a[l]?.id !== d.id)) {
-          if (u.info.isMergedWithParent() && u.valueAttributes.length) {
-            const h = this.buildSameRowUpdateEvent(u, u.recordName, d);
-            h && (i?.push(h), await this.filteredEntityManager.enqueuePostWriteUpdateCheck(i, u.recordName, d.id, h.keys));
+      for (const l of e.mergedLinkTargetRecordIdRefs.concat(e.combinedRecordIdRefs)) {
+        const u = l.info.attributeName, d = r?.[u];
+        if (!(!d?.id || a[u]?.id !== d.id)) {
+          if (l.info.isMergedWithParent() && l.valueAttributes.length) {
+            const h = this.buildSameRowUpdateEvent(l, l.recordName, d);
+            h && (i?.push(h), await this.filteredEntityManager.enqueuePostWriteUpdateCheck(i, l.recordName, d.id, h.keys));
           }
-          if (u.linkRecordData?.valueAttributes.length && d[v]?.id) {
-            const h = this.buildSameRowUpdateEvent(u.linkRecordData, u.info.linkName, d[v]);
-            h && (i?.push(h), await this.filteredEntityManager.enqueuePostWriteUpdateCheck(i, u.info.linkName, d[v].id, h.keys));
+          if (l.linkRecordData?.valueAttributes.length && d[v]?.id) {
+            const h = this.buildSameRowUpdateEvent(l.linkRecordData, l.info.linkName, d[v]);
+            h && (i?.push(h), await this.filteredEntityManager.enqueuePostWriteUpdateCheck(i, l.info.linkName, d[v].id, h.keys));
           }
         }
       }
     }
-    for (let u of e.combinedNewRecords)
-      a[u.info.attributeName] = {
-        ...a[u.info.attributeName],
-        id: await this.database.getAutoId(u.info.recordName)
+    for (let l of e.combinedNewRecords)
+      a[l.info.attributeName] = {
+        ...a[l.info.attributeName],
+        id: await this.database.getAutoId(l.info.recordName)
       }, i?.push({
         type: "create",
-        recordName: u.recordName,
-        record: a[u.info.attributeName]
+        recordName: l.recordName,
+        record: a[l.info.attributeName]
       }), this.filteredEntityManager.enqueuePostWriteCreationCheck(
         i,
-        u.recordName,
-        a[u.info.attributeName].id,
-        { ...u.defaultValues, ...a[u.info.attributeName] }
+        l.recordName,
+        a[l.info.attributeName].id,
+        { ...l.defaultValues, ...a[l.info.attributeName] }
       );
-    for (let u of e.mergedLinkTargetNewRecords.concat(e.mergedLinkTargetRecordIdRefs, e.combinedNewRecords))
-      if (a[u.info.attributeName].id !== r?.[u.info.attributeName]?.id) {
-        a[u.info.attributeName][v] = {
-          ...a[u.info.attributeName][v] || {},
-          id: await this.database.getAutoId(u.info.linkName)
+    for (let l of e.mergedLinkTargetNewRecords.concat(e.mergedLinkTargetRecordIdRefs, e.combinedNewRecords))
+      if (a[l.info.attributeName].id !== r?.[l.info.attributeName]?.id) {
+        a[l.info.attributeName][v] = {
+          ...a[l.info.attributeName][v] || {},
+          id: await this.database.getAutoId(l.info.linkName)
         };
-        const l = { ...a[u.info.attributeName][v] };
-        l[u.info.isRecordSource() ? "target" : "source"] = u.getData(), l[u.info.isRecordSource() ? "source" : "target"] = { ...a }, delete l.target[v], delete l.source[v], i?.push({
+        const u = { ...a[l.info.attributeName][v] };
+        u[l.info.isRecordSource() ? "target" : "source"] = l.getData(), u[l.info.isRecordSource() ? "source" : "target"] = { ...a }, delete u.target[v], delete u.source[v], i?.push({
           type: "create",
-          recordName: u.info.linkName,
-          record: l
+          recordName: l.info.linkName,
+          record: u
         }), this.filteredEntityManager.enqueuePostWriteCreationCheck(
           i,
-          u.info.linkName,
-          l.id,
-          { ...u.linkRecordData?.defaultValues || {}, ...l }
+          l.info.linkName,
+          u.id,
+          { ...l.linkRecordData?.defaultValues || {}, ...u }
         );
       }
     const n = e.merge(a), o = /* @__PURE__ */ new Set();
     if (t && r)
-      for (const u of e.combinedRecordIdRefs) {
-        const l = u.info.attributeName;
-        r[l]?.id !== void 0 && r[l].id === u.getRef().id && o.add(l);
+      for (const l of e.combinedRecordIdRefs) {
+        const u = l.info.attributeName;
+        r[u]?.id !== void 0 && r[u].id === l.getRef().id && o.add(u);
       }
     const c = await this.agent.flashOutCombinedRecordsAndMergedLinks(
       e,
@@ -3718,15 +3738,15 @@ class ja {
       const n = a.info.getReverseInfo(), o = E.atom({
         key: "id",
         value: ["=", a.getRef().id]
-      }), c = a.getData()[v], u = {
+      }), c = a.getData()[v], l = {
         [n.attributeName]: c === void 0 ? i : { ...i, [v]: c }
-      }, [l] = await this.agent.updateRecord(n.parentEntityName, o, new ie(this.map, n.parentEntityName, u), t);
+      }, [u] = await this.agent.updateRecord(n.parentEntityName, o, new ee(this.map, n.parentEntityName, l), t);
       a.info.isXToMany ? (r[a.info.attributeName] || (r[a.info.attributeName] = []), r[a.info.attributeName].push({
-        ...l,
-        [v]: l[n.attributeName][v]
+        ...u,
+        [v]: u[n.attributeName][v]
       })) : r[a.info.attributeName] = {
-        ...l,
-        [v]: l[n.attributeName][v]
+        ...u,
+        [v]: u[n.attributeName][v]
       };
     }
     for (let a of e.isolatedNewRecords) {
@@ -3735,36 +3755,36 @@ class ja {
         source: a.info.isRecordSource() ? i : n,
         target: a.info.isRecordSource() ? n : i
       });
-      const c = new ie(this.map, a.info.linkName, o), u = await this.createRecord(c, `create isolated related link record ${e.recordName}.${a.info?.attributeName}`, t);
+      const c = new ee(this.map, a.info.linkName, o), l = await this.createRecord(c, `create isolated related link record ${e.recordName}.${a.info?.attributeName}`, t);
       a.info.isXToMany ? (r[a.info.attributeName] || (r[a.info.attributeName] = []), r[a.info.attributeName].push({
         ...n,
-        [v]: u
+        [v]: l
       })) : r[a.info.attributeName] = {
         ...n,
-        [v]: u
+        [v]: l
       };
     }
     for (let a in e.isolatedRecordIdRefs) {
       const n = e.isolatedRecordIdRefs[a];
       if (n.info.isXToOne) {
-        const l = E.atom({
+        const u = E.atom({
           key: n.info?.isRecordSource() ? "target.id" : "source.id",
           value: ["=", n.getRef().id]
         });
-        await this.agent.unlink(n.info.linkName, l, !1, "unlink xToOne old link", t);
+        await this.agent.unlink(n.info.linkName, u, !1, "unlink xToOne old link", t);
       }
       const o = n.linkRecordData?.getData() || {};
       Object.assign(o, {
         source: n.info.isRecordSource() ? i : n.getRef(),
         target: n.info.isRecordSource() ? n.getRef() : i
       });
-      const c = new ie(this.map, n.info.linkName, o), u = await this.createRecord(c, `create isolated related link record of old related ${e.recordName}.${n.info?.attributeName}`, t);
+      const c = new ee(this.map, n.info.linkName, o), l = await this.createRecord(c, `create isolated related link record of old related ${e.recordName}.${n.info?.attributeName}`, t);
       n.info.isXToMany ? (r[n.info.attributeName] || (r[n.info.attributeName] = []), r[n.info.attributeName][a] = {
         ...n.getData(),
-        [v]: u
+        [v]: l
       }) : r[n.info.attributeName] = {
         ...n.getData(),
-        [v]: u
+        [v]: l
       };
     }
     return r;
@@ -3773,8 +3793,8 @@ class ja {
    * 从记录添加链接
    */
   addLinkFromRecord(e, t, i, r, a = {}, n) {
-    const o = this.map.getLinkInfo(e, t), c = o.isRelationSource(e, t), u = c ? i : r, l = c ? r : i;
-    return this.addLink(o.name, u, l, a, !o.isRelationSource(e, t), n);
+    const o = this.map.getLinkInfo(e, t), c = o.isRelationSource(e, t), l = c ? i : r, u = c ? r : i;
+    return this.addLink(o.name, l, u, a, !o.isRelationSource(e, t), n);
   }
   /**
    * 添加链接
@@ -3795,16 +3815,16 @@ class ja {
       if (!c.isMerged())
         (c.isManyToOne || c.isOneToOne) && await this.agent.unlink(e, E.atom({ key: "source.id", value: ["=", t] }), !1, "unlink old link of exclusive source for add new link", n), (c.isOneToMany || c.isOneToOne) && await this.agent.unlink(e, E.atom({ key: "target.id", value: ["=", i] }), !1, "unlink old link of exclusive target for add new link", n);
       else if (c.isOneToOne) {
-        const l = c.isMergedToSource() ? "target" : "source", d = l === "target" ? i : t;
-        await this.agent.unlink(e, E.atom({ key: `${l}.id`, value: ["=", d] }), !1, "unlink old owner of exclusive 1:1 target for add new link", n);
+        const u = c.isMergedToSource() ? "target" : "source", d = u === "target" ? i : t;
+        await this.agent.unlink(e, E.atom({ key: `${u}.id`, value: ["=", d] }), !1, "unlink old owner of exclusive 1:1 target for add new link", n);
       }
     }
-    const u = new ie(this.map, c.name, {
+    const l = new ee(this.map, c.name, {
       source: { id: t },
       target: { id: i },
       ...r
     });
-    return this.createRecord(u, `create link record ${c.name}`, n);
+    return this.createRecord(l, `create link record ${c.name}`, n);
   }
   /**
    * 删除记录的同行数据（用于 flashOut）
@@ -3819,7 +3839,7 @@ function Ct(s) {
 function oi(s, e) {
   return `${s}:${e}`;
 }
-function ur(s, e) {
+function lr(s, e) {
   !s || !e || s === e || gi.set(s, Ct(e));
 }
 class Ha {
@@ -3840,19 +3860,33 @@ class Ha {
       );
   }
   // ============ 依赖管理功能 ============
+  /**
+   * 实体名 → 物理 base 名的统一归一化。
+   * CAUTION 名字空间收口（r22 F-1）：同一条物理记录可以有多个声明名——filtered entity/
+   *  relation 的视图名、以 filtered entity 为端点的 relation 存下的 link.sourceRecord/
+   *  targetRecord（Setup 原样保存声明名）。依赖表按物理 base 名注册（initializeDependencies
+   *  用 resolvedBaseRecordName），任何以声明名查询依赖的读者（collectLinkMembershipChecks
+   *  经 link 端点名进来）都会拿到空集——查询面正确、成员资格事件整族缺失。
+   *  所有「实体名 → 依赖/视图」的入口一律先经这里归一化，不允许第二套解析。
+   */
+  resolveBaseRecordName(e) {
+    return this.map.data.records[e]?.resolvedBaseRecordName || e;
+  }
   /**
    * 分析 filtered entity 的过滤条件，提取所有依赖的实体和路径
    */
   analyzeDependencies(e, t, i) {
     const r = [];
     this.extractDependenciesFromExpression(t, i, r);
+    for (const o of r)
+      o.entityName = this.resolveBaseRecordName(o.entityName);
     const a = {
       filteredEntityName: e,
       baseEntityName: t,
       matchExpression: i,
       dependencies: r
     }, n = new Set(r.map((o) => o.entityName));
-    n.add(t);
+    n.add(this.resolveBaseRecordName(t));
     for (const o of n) {
       this.dependencies.has(o) || this.dependencies.set(o, []);
       const c = this.dependencies.get(o);
@@ -3868,35 +3902,36 @@ class Ha {
     if (r.isExpression())
       r.left && this.extractDependenciesFromExpression(e, r.left.raw, i), r.right && this.extractDependenciesFromExpression(e, r.right.raw, i);
     else if (r.isAtom()) {
-      const o = r.data.key.split("."), c = (u, l, d) => {
+      const o = r.data.key.split("."), c = (l, u, d) => {
         const h = i.find(
-          (m) => m.entityName === u && JSON.stringify(m.path) === JSON.stringify(l)
+          (m) => m.entityName === l && JSON.stringify(m.path) === JSON.stringify(u)
         );
         h ? h.attributes.includes(d) || h.attributes.push(d) : i.push({
-          entityName: u,
-          path: l,
+          entityName: l,
+          path: u,
           attributes: [d]
         });
       };
       if (o.length === 1)
         c(e, [], o[0]);
       else {
-        const u = [e].concat(o);
-        let l = e;
+        const l = [e].concat(o);
+        let u = e;
         for (let m = 0; m < o.length - 1; m++) {
-          const f = o[m], p = o.slice(0, m), y = this.map.getInfoByPath(u.slice(0, m + 2));
-          c(l, p, f), y && y.isRecord && (l = y.recordName);
+          const f = o[m], p = o.slice(0, m), y = this.map.getInfoByPath(l.slice(0, m + 2));
+          c(u, p, f), y && y.isRecord && (u = y.recordName);
         }
         const d = o[o.length - 1], h = o.slice(0, o.length - 1);
-        c(l, h, d);
+        c(u, h, d);
       }
     }
   }
   /**
    * 获取某个实体变更时影响的所有 filtered entity
+   * （入口名可以是声明名——filtered 视图名、filtered 端点 relation 存下的端点名——统一归一化）
    */
   getAffectedFilteredEntities(e) {
-    return this.dependencies.get(e) || [];
+    return this.dependencies.get(this.resolveBaseRecordName(e)) || [];
   }
   /**
    * 清除所有依赖关系（同时失效按 MapData 共享的缓存）
@@ -3953,19 +3988,19 @@ class Ha {
       if (r.has(n)) return;
       r.add(n);
       const c = this.map.getRecordInfo(n).filteredBy || [];
-      for (const u of c) {
-        if (!i.has(u.name)) {
-          i.add(u.name);
-          const d = this.map.getRecordInfo(u.name).data.resolvedMatchExpression;
+      for (const l of c) {
+        if (!i.has(l.name)) {
+          i.add(l.name);
+          const d = this.map.getRecordInfo(l.name).data.resolvedMatchExpression;
           t.push({
-            name: u.name,
+            name: l.name,
             matchExpression: d
           });
         }
-        a(u.name);
+        a(l.name);
       }
     };
-    return a(e), t;
+    return a(this.resolveBaseRecordName(e)), t;
   }
   // ============ 变更钩子：before（快照）/ settle（diff + 事件） ============
   /**
@@ -3978,21 +4013,21 @@ class Ha {
    */
   async collectMembershipChecks(e, t, i, r) {
     if (!r || !t.length) return [];
-    const a = this.getAffectedFilteredEntities(e);
-    if (!a.length) return [];
-    const n = [];
-    for (const o of a) {
-      const c = o.dependencies.filter((h) => h.entityName === e), u = /* @__PURE__ */ new Set();
-      for (const h of c) {
-        if (i && !i.filter((p) => h.attributes.includes(p)).length)
+    const a = this.resolveBaseRecordName(e), n = this.getAffectedFilteredEntities(a);
+    if (!n.length) return [];
+    const o = [];
+    for (const c of n) {
+      const l = c.dependencies.filter((m) => m.entityName === a), u = /* @__PURE__ */ new Set();
+      for (const m of l) {
+        if (i && !i.filter((y) => m.attributes.includes(y)).length)
           continue;
-        (await this.findAffectedSourceRecordIds(o, h.path, t)).forEach((f) => u.add(f));
+        (await this.findAffectedSourceRecordIds(c, m.path, t)).forEach((p) => u.add(p));
       }
       if (!u.size) continue;
-      const l = Array.from(u), d = await this.checkRecordsMatchFilter(l, o.baseEntityName, o.matchExpression);
-      n.push({ dependency: o, recordIds: l, beforeMemberIds: d });
+      const d = Array.from(u), h = await this.checkRecordsMatchFilter(d, c.baseEntityName, c.matchExpression);
+      o.push({ dependency: c, recordIds: d, beforeMemberIds: h });
     }
-    return n;
+    return o;
   }
   /**
    * 关系（link）变更前采集：关系的建立/解除会改变两端实体的成员资格。
@@ -4015,21 +4050,21 @@ class Ha {
     for (const r of e) {
       const { dependency: a, recordIds: n, beforeMemberIds: o } = r;
       if (!n.length) continue;
-      const c = this.map.getRecordInfo(a.baseEntityName), u = await this.queryAgent.findRecords(
+      const c = this.map.getRecordInfo(a.baseEntityName), l = await this.queryAgent.findRecords(
         G.create(a.baseEntityName, this.map, {
           matchExpression: E.atom({ key: "id", value: ["in", n] }),
           attributeQuery: c.isRelation ? ["*", ["target", { attributeQuery: ["*"] }], ["source", { attributeQuery: ["*"] }]] : ["*"]
         }),
         `get current records for membership settle of ${a.filteredEntityName}`
       );
-      if (!u.length) continue;
-      const l = await this.checkRecordsMatchFilter(
-        u.map((d) => d.id),
+      if (!l.length) continue;
+      const u = await this.checkRecordsMatchFilter(
+        l.map((d) => d.id),
         a.baseEntityName,
         a.matchExpression
       );
-      for (const d of u) {
-        const h = oi(a.filteredEntityName, d.id), m = l.has(d.id), f = i.has(h) ? i.get(h) : o.has(d.id);
+      for (const d of l) {
+        const h = oi(a.filteredEntityName, d.id), m = u.has(d.id), f = i.has(h) ? i.get(h) : o.has(d.id);
         m !== f && t.push({
           type: m ? "create" : "delete",
           recordName: a.filteredEntityName,
@@ -4048,23 +4083,31 @@ class Ha {
     if (!a.length) return;
     const n = Ct(r);
     for (const o of a) {
-      const c = oi(o.name, t), u = await this.checkRecordMatchesFilter(t, e, o.matchExpression), l = n.has(c) ? n.get(c) : !1;
-      u && !l && r.push({
+      const c = oi(o.name, t), l = await this.checkRecordMatchesFilter(t, e, o.matchExpression), u = n.has(c) ? n.get(c) : !1;
+      l && !u && r.push({
         type: "create",
         recordName: o.name,
         record: { ...i, id: t }
-      }), n.set(c, u);
+      }), n.set(c, l);
     }
   }
   // ============ 行内写路径（merged link / combined 记录）的视图成员资格 ============
   /**
    * 登记一个"物理写入完成后需要求值"的行内记录创建（merged link / combined 记录）。
    * 写入完成点（insertSameRowData / updateSameRowData）调用 settlePostWriteChecks 统一结算。
+   *
+   * CAUTION 视图 create 事件的 payload 契约是 defaults + payload（与 base create 事件、
+   *  createRecord 的 membershipEventPayload 同构，r16 R-1）。行内记录的产生点（preprocess
+   *  的 combined/merged link、flashOut 的抢夺新 link）拼 payload 时只有用户显式给出 `&`
+   *  数据才带 defaults——「谓词/匹配字段仅有默认值」的形态下所有产生点都会漏（r22 I-4）。
+   *  这里是行内视图 creation 检查的唯一入口，统一用 NewRecordData 的 defaults 规则补齐
+   *  （只补缺失键；物理写入本身已按同一规则落列，这里只是让事件 payload 与行一致）。
    */
   enqueuePostWriteCreationCheck(e, t, i, r) {
     if (!e || !this.getFilteredEntitiesForBase(t).length) return;
-    let a = Fe.get(e);
-    a || (a = [], Fe.set(e, a)), a.push({ kind: "creation", recordName: t, recordId: i, fullRecord: r });
+    const { [v]: a, ...n } = r, o = new ee(this.map, t, n).defaultValues;
+    let c = Fe.get(e);
+    c || (c = [], Fe.set(e, c)), c.push({ kind: "creation", recordName: t, recordId: i, fullRecord: { ...o, ...r } });
   }
   /**
    * 登记一个行内记录的原地更新（同 id `&` 关系属性 / combined 嵌套值）。
@@ -4120,42 +4163,42 @@ class Ha {
     const r = this.map.getRecordInfo(e), a = this.getFilteredEntitiesForBase(e), n = {
       recordName: e,
       membersByFilteredEntity: /* @__PURE__ */ new Map(),
-      recordsById: new Map(t.map((u) => [u.id, u])),
+      recordsById: new Map(t.map((l) => [l.id, l])),
       children: []
     };
     if (a.length) {
-      const u = t.map((l) => l.id);
-      for (const l of a) {
-        const d = await this.checkRecordsMatchFilter(u, e, l.matchExpression);
-        d.size && n.membersByFilteredEntity.set(l.name, d);
+      const l = t.map((u) => u.id);
+      for (const u of a) {
+        const d = await this.checkRecordsMatchFilter(l, e, u.matchExpression);
+        d.size && n.membersByFilteredEntity.set(u.name, d);
       }
     }
-    for (const u of r.sameTableReliance) {
-      const l = t.map((d) => d[u.attributeName]).filter((d) => !!d?.id);
-      if (l.length) {
-        const d = await this.collectDeletionMemberships(u.recordName, l, i);
+    for (const l of r.sameTableReliance) {
+      const u = t.map((d) => d[l.attributeName]).filter((d) => !!d?.id);
+      if (u.length) {
+        const d = await this.collectDeletionMemberships(l.recordName, u, i);
         d && n.children.push(d);
       }
     }
     const o = [
       ...r.mergedRecordAttributes,
-      ...r.notRelianceCombined.filter((u) => !(r.isRelation && (u.attributeName === "source" || u.attributeName === "target"))),
+      ...r.notRelianceCombined.filter((l) => !(r.isRelation && (l.attributeName === "source" || l.attributeName === "target"))),
       ...r.sameTableReliance
     ], c = /* @__PURE__ */ new Map();
-    for (const u of t)
-      for (const l of o) {
-        const d = u[l.attributeName], h = d?.id !== void 0 ? d[v] : void 0;
+    for (const l of t)
+      for (const u of o) {
+        const d = l[u.attributeName], h = d?.id !== void 0 ? d[v] : void 0;
         if (!h?.id) continue;
         const m = {
           ...h,
-          [l.isRecordSource() ? "source" : "target"]: { id: u.id },
-          [l.isRecordSource() ? "target" : "source"]: { id: d.id }
+          [u.isRecordSource() ? "source" : "target"]: { id: l.id },
+          [u.isRecordSource() ? "target" : "source"]: { id: d.id }
         };
-        let f = c.get(l.linkName);
-        f || (f = [], c.set(l.linkName, f)), f.push(m);
+        let f = c.get(u.linkName);
+        f || (f = [], c.set(u.linkName, f)), f.push(m);
       }
-    for (const [u, l] of c) {
-      const d = await this.collectInlineDeletionSnapshot(u, l, i);
+    for (const [l, u] of c) {
+      const d = await this.collectInlineDeletionSnapshot(l, u, i);
       d && n.children.push(d);
     }
     return n;
@@ -4171,13 +4214,13 @@ class Ha {
     if (!n) return;
     const o = Ct(a);
     for (const c of i)
-      for (const [u, l] of n.membersByFilteredEntity) {
-        const d = oi(u, c.id);
-        if (o.has(d) ? o.get(d) : l.has(c.id)) {
+      for (const [l, u] of n.membersByFilteredEntity) {
+        const d = oi(l, c.id);
+        if (o.has(d) ? o.get(d) : u.has(c.id)) {
           const m = n.recordsById.get(c.id) || c;
           r.push({
             type: "delete",
-            recordName: u,
+            recordName: l,
             record: { ...m }
           });
         }
@@ -4222,14 +4265,14 @@ class Wa {
    * @returns [SQL字符串, 参数数组, 字段别名映射]
    */
   buildXToOneFindQuery(e, t = "", i) {
-    const r = e.attributeQuery.xToOneQueryTree, a = e.matchExpression.xToOneQueryTree, n = e.modifier.xToOneQueryTree, o = r.merge(a).merge(n), c = this.getJoinTables(o, [e.recordName]), u = i || this.getPlaceholder(), l = e.matchExpression.buildFieldMatchExpression(
-      u,
+    const r = e.attributeQuery.xToOneQueryTree, a = e.matchExpression.xToOneQueryTree, n = e.modifier.xToOneQueryTree, o = r.merge(a).merge(n), c = this.getJoinTables(o, [e.recordName]), l = i || this.getPlaceholder(), u = e.matchExpression.buildFieldMatchExpression(
+      l,
       this.database,
-      (g) => this.parseFunctionMatchAtom(e.recordName, g, e.contextRootEntity, u)
+      (g) => this.parseFunctionMatchAtom(e.recordName, g, e.contextRootEntity, l)
     ), [d, h] = this.buildWhereClause(
-      l,
+      u,
       t,
-      u
+      l
     ), [m, f] = this.buildSelectClause(
       e.attributeQuery.getValueAndXToOneRecordFields(),
       t
@@ -4260,8 +4303,8 @@ ${b}
         `${this.withPrefix(t)}${o[0]}`,
         ...o.slice(1, 1 / 0),
         n
-      ], u = i.getAlias(c, !0);
-      return `"${this.withPrefix(t)}${a[0]}"."${a[1]}" AS "${u}"`;
+      ], l = i.getAlias(c, !0);
+      return `"${this.withPrefix(t)}${a[0]}"."${a[1]}" AS "${l}"`;
     }).join(`,
 `), i] : ["1", i];
   }
@@ -4291,11 +4334,11 @@ ${b}
     if (e.isAtom())
       e.data.isInnerQuery ? (r = e.data.fieldValue, a.push(...e.data.fieldParams)) : (r = `("${this.withPrefix(t)}${e.data.fieldName[0]}"."${e.data.fieldName[1]}" ${e.data.fieldValue})`, a.push(...e.data.fieldParams));
     else if (e.isAnd()) {
-      const [n, o] = this.buildWhereClause(e.left, t, i), [c, u] = this.buildWhereClause(e.right, t, i);
-      r = `(${n} AND ${c})`, a.push(...o, ...u);
+      const [n, o] = this.buildWhereClause(e.left, t, i), [c, l] = this.buildWhereClause(e.right, t, i);
+      r = `(${n} AND ${c})`, a.push(...o, ...l);
     } else if (e.isOr()) {
-      const [n, o] = this.buildWhereClause(e.left, t, i), [c, u] = this.buildWhereClause(e.right, t, i);
-      r = `(${n} OR ${c})`, a.push(...o, ...u);
+      const [n, o] = this.buildWhereClause(e.left, t, i), [c, l] = this.buildWhereClause(e.right, t, i);
+      r = `(${n} OR ${c})`, a.push(...o, ...l);
     } else {
       const [n, o] = this.buildWhereClause(e.left, t, i);
       r = `NOT (${n})`, a.push(...o);
@@ -4311,13 +4354,13 @@ ${b}
       throw new Error(`modifier.limit must be a non-negative integer, got: ${JSON.stringify(r)}`);
     if (a != null && (typeof a != "number" || !Number.isInteger(a) || a < 0))
       throw new Error(`modifier.offset must be a non-negative integer, got: ${JSON.stringify(a)}`);
-    return n.length && o.push(`ORDER BY ${n.map(({ attribute: c, recordName: u, order: l }) => {
-      const d = String(l).toUpperCase();
+    return n.length && o.push(`ORDER BY ${n.map(({ attribute: c, recordName: l, order: u }) => {
+      const d = String(u).toUpperCase();
       if (d !== "ASC" && d !== "DESC")
-        throw new Error(`orderBy value must be 'ASC' or 'DESC', got: ${JSON.stringify(l)} for attribute ${c}`);
+        throw new Error(`orderBy value must be 'ASC' or 'DESC', got: ${JSON.stringify(u)} for attribute ${c}`);
       const h = c.split(".");
       let m, f;
-      h.length === 1 ? (m = [u], f = c) : (m = [u, ...h.slice(0, -1)], f = h[h.length - 1]);
+      h.length === 1 ? (m = [l], f = c) : (m = [l, ...h.slice(0, -1)], f = h[h.length - 1]);
       const [p, y] = this.map.getTableAliasAndFieldName(
         m,
         f
@@ -4334,55 +4377,55 @@ ${b}
   getJoinTables(e, t = [], i) {
     const r = [];
     if (!i) {
-      const o = [t[0]], [c, u, l] = this.map.getTableAliasAndFieldName(o, "id");
-      i = [u, l, c];
+      const o = [t[0]], [c, l, u] = this.map.getTableAliasAndFieldName(o, "id");
+      i = [l, u, c];
     }
     const [a, ...n] = i;
     return e.forEachRecords((o) => {
-      const c = o.attributeName, u = o.info;
-      if (!u.isRecord)
+      const c = o.attributeName, l = o.info;
+      if (!l.isRecord)
         throw new Error(`${t.concat(c).join(".")} is not a record`);
-      const l = t.concat(c), {
+      const u = t.concat(c), {
         table: d,
         alias: h,
         linkTable: m,
         linkAlias: f
-      } = this.map.getTableAndAliasStack(l).at(-1), [, p] = this.map.getTableAliasAndFieldName(l, "id", !0);
-      if (!u.isMergedWithParent())
-        if (u.isLinkMergedWithParent()) {
+      } = this.map.getTableAndAliasStack(u).at(-1), [, p] = this.map.getTableAliasAndFieldName(u, "id", !0);
+      if (!l.isMergedWithParent())
+        if (l.isLinkMergedWithParent()) {
           if (o.onlyIdField()) return;
           r.push({
-            for: l,
+            for: u,
             joinSource: n,
-            joinIdField: [u.linkField, p],
+            joinIdField: [l.linkField, p],
             joinTarget: [d, h]
           });
-        } else if (u.isLinkMergedWithAttribute()) {
-          const y = u.getReverseInfo();
+        } else if (l.isLinkMergedWithAttribute()) {
+          const y = l.getReverseInfo();
           if (!y.linkField)
             throw new Error(`${y.parentEntityName}.${y.attributeName} has no field`);
           r.push({
-            for: l,
+            for: u,
             joinSource: n,
             joinIdField: [a, y.linkField],
             joinTarget: [d, h]
           });
         } else {
-          const y = u.getLinkInfo(), b = u.isLinkManyToManySymmetric() ? u.symmetricDirection === "source" : y.isRelationSource(u.parentEntityName, u.attributeName);
+          const y = l.getLinkInfo(), b = l.isLinkManyToManySymmetric() ? l.symmetricDirection === "source" : y.isRelationSource(l.parentEntityName, l.attributeName);
           r.push({
-            for: l,
+            for: u,
             joinSource: n,
             joinIdField: [a, b ? y.record.attributes.source.field : y.record.attributes.target.field],
             joinTarget: [m, f]
           }), o.onlyIdField() || r.push({
-            for: l,
+            for: u,
             joinSource: [m, f],
             joinIdField: [b ? y.record.attributes.target.field : y.record.attributes.source.field, p],
             joinTarget: [d, h]
           });
         }
-      if (r.push(...this.getJoinTables(o, l, [p, d, h])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
-        const y = l.concat(v), [, b] = this.map.getTableAliasAndFieldName(y, "id", !0), g = [
+      if (r.push(...this.getJoinTables(o, u, [p, d, h])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
+        const y = u.concat(v), [, b] = this.map.getTableAliasAndFieldName(y, "id", !0), g = [
           b,
           // link 的 idField
           m,
@@ -4404,7 +4447,7 @@ ${b}
       throw new Error(`match value is not a array ${t.key}`);
     if (t.value[0].toLowerCase() !== "exist")
       throw new Error(`we only support Exist function match on entity for now. yours: ${t.key} ${t.value[0]} ${t.value[1]}`);
-    const a = this.map.getInfoByPath(t.namePath), { alias: n } = this.map.getTableAndAliasStack(t.namePath).at(-1), o = this.map.getReverseAttribute(a.parentEntityName, a.attributeName), c = t.namePath.slice(1, -1), u = G.create(
+    const a = this.map.getInfoByPath(t.namePath), { alias: n } = this.map.getTableAndAliasStack(t.namePath).at(-1), o = this.map.getReverseAttribute(a.parentEntityName, a.attributeName), c = t.namePath.slice(1, -1), l = G.create(
       a.recordName,
       this.map,
       {
@@ -4416,13 +4459,13 @@ ${b}
       },
       // 如果上层还有，就继承上层的，如果没有， context 就只这一层
       i || e
-    ), [l, d] = this.buildXToOneFindQuery(u, n, r);
+    ), [u, d] = this.buildXToOneFindQuery(l, n, r);
     return {
       ...t,
       isInnerQuery: !0,
       fieldValue: `
 EXISTS (
-${l}
+${u}
 )
 `,
       fieldParams: d
@@ -4467,7 +4510,7 @@ VALUES
 UPDATE "${a.table}"
 SET ${i.map(({ field: c }) => `"${c}" = ${r()}`).join(",")}
 WHERE "${a.idField}" = (${r()})
-`, o = [...i.map(({ value: c, fieldType: u }) => this.prepareFieldValue(c, u)), t.id];
+`, o = [...i.map(({ value: c, fieldType: l }) => this.prepareFieldValue(c, l)), t.id];
     return [n, o];
   }
   /**
@@ -4557,30 +4600,30 @@ class Ga {
     const r = /* @__PURE__ */ new Map(), a = (o) => {
       const c = o.join(".");
       if (r.has(c)) return r.get(c);
-      let u;
+      let l;
       try {
-        const l = this.map.getInfoByPath([t, ...o]);
-        if (l && l.isValue) {
-          const d = l.data;
-          u = d.collection || d.type === "object" || d.type === "json" ? "json" : d.type;
+        const u = this.map.getInfoByPath([t, ...o]);
+        if (u && u.isValue) {
+          const d = u.data;
+          l = d.collection || d.type === "object" || d.type === "json" ? "json" : d.type;
         }
       } catch {
-        u = void 0;
+        l = void 0;
       }
-      return r.set(c, u), u;
+      return r.set(c, l), l;
     }, n = this.database.returnsParsedJSON === !0;
     return e.map((o) => {
       const c = {};
-      return Object.entries(o).forEach(([u, l]) => {
-        const d = i.getPath(u).slice(1, 1 / 0), h = a(d);
-        if (!n && typeof l == "string" && h === "json")
+      return Object.entries(o).forEach(([l, u]) => {
+        const d = i.getPath(l).slice(1, 1 / 0), h = a(d);
+        if (!n && typeof u == "string" && h === "json")
           try {
-            l = JSON.parse(l);
+            u = JSON.parse(u);
           } catch (m) {
-            throw new Error(`Failed to parse JSON field "${t}.${d.join(".")}": ${m instanceof Error ? m.message : String(m)}. Raw value: ${l.slice(0, 200)}`);
+            throw new Error(`Failed to parse JSON field "${t}.${d.join(".")}": ${m instanceof Error ? m.message : String(m)}. Raw value: ${u.slice(0, 200)}`);
           }
-        else typeof l == "number" && h === "boolean" && (l = l !== 0);
-        l !== null && wt(c, d, l);
+        else typeof u == "number" && h === "boolean" && (u = u !== 0);
+        u !== null && wt(c, d, u);
       }), c;
     });
   }
@@ -4624,10 +4667,10 @@ class Ga {
         limit: void 0,
         offset: void 0
       })
-    }) : e, [u, l, d] = this.sqlBuilder.buildXToOneFindQuery(c, ""), h = this.database.supportsSelectForUpdate ?? this.database.constructor.name !== "SQLiteDB", m = await this.database.query(
-      a && h ? `${u}
-FOR UPDATE OF "${e.recordName}"` : u,
-      l,
+    }) : e, [l, u, d] = this.sqlBuilder.buildXToOneFindQuery(c, ""), h = this.database.supportsSelectForUpdate ?? this.database.constructor.name !== "SQLiteDB", m = await this.database.query(
+      a && h ? `${l}
+FOR UPDATE OF "${e.recordName}"` : l,
+      u,
       t
     );
     let f = this.dedupeIdenticalRows(m);
@@ -4737,15 +4780,15 @@ FOR UPDATE OF "${e.recordName}"` : u,
    * 只是把"每个父记录一次查询"合并为"每批父记录一次查询"。
    */
   async findXToManyRelatedRecordsBatched(e, t, i, r, a, n) {
-    const u = this.map.getInfo(e, t).getReverseInfo()?.attributeName, l = r.alias || r.attributeName, d = /* @__PURE__ */ new Map();
+    const l = this.map.getInfo(e, t).getReverseInfo()?.attributeName, u = r.alias || r.attributeName, d = /* @__PURE__ */ new Map();
     for (const y of i)
-      y[l] = [], d.set(String(y.id), y);
+      y[u] = [], d.set(String(y.id), y);
     const h = r.attributeQuery.data.some(
-      (y) => (typeof y == "string" ? y : y[0]) === u
-    ), m = h ? r.attributeQuery.data : [...r.attributeQuery.data, [u, { attributeQuery: ["id"] }]], f = r.attributeQuery.parentLinkRecordQuery, p = !!f;
+      (y) => (typeof y == "string" ? y : y[0]) === l
+    ), m = h ? r.attributeQuery.data : [...r.attributeQuery.data, [l, { attributeQuery: ["id"] }]], f = r.attributeQuery.parentLinkRecordQuery, p = !!f;
     for (let y = 0; y < i.length; y += 500) {
       const b = i.slice(y, y + 500), g = r.matchExpression.and({
-        key: `${u}.id`,
+        key: `${l}.id`,
         value: ["in", b.map((N) => N.id)]
       }), w = new K(
         r.recordName,
@@ -4764,8 +4807,8 @@ FOR UPDATE OF "${e.recordName}"` : u,
         n
       );
       for (const N of S) {
-        const $ = N[u]?.id, I = $ !== void 0 ? d.get(String($)) : void 0;
-        if (p ? (N[v] = N[u]?.[v], delete N[u]) : h || delete N[u], f)
+        const $ = N[l]?.id, I = $ !== void 0 ? d.get(String($)) : void 0;
+        if (p ? (N[v] = N[l]?.[v], delete N[l]) : h || delete N[l], f)
           for (let D of f.attributeQuery.xToManyRecords) {
             const W = N[v].id;
             wt(
@@ -4781,7 +4824,7 @@ FOR UPDATE OF "${e.recordName}"` : u,
               )
             );
           }
-        I && I[l].push(N);
+        I && I[u].push(N);
       }
     }
   }
@@ -4793,16 +4836,16 @@ FOR UPDATE OF "${e.recordName}"` : u,
       const n = this.map.getInfo(e.parentRecord, e.attributeName).getReverseInfo()?.attributeName;
       for (let o of e.attributeQuery.parentLinkRecordQuery.attributeQuery.xToOneRecords)
         for (let c of o.attributeQuery.xToManyRecords)
-          for (let u of t) {
-            if (!u[n]?.[v]?.[o.attributeName]) continue;
-            const l = e.label ? r.concat(u) : r;
-            u[n][v][o.attributeName][c.attributeName] = await this.findXToManyRelatedRecords(
+          for (let l of t) {
+            if (!l[n]?.[v]?.[o.attributeName]) continue;
+            const u = e.label ? r.concat(l) : r;
+            l[n][v][o.attributeName][c.attributeName] = await this.findXToManyRelatedRecords(
               c.parentRecord,
               c.attributeName,
-              u[n][v][o.attributeName].id,
+              l[n][v][o.attributeName].id,
               c,
               i,
-              l
+              u
             );
           }
     }
@@ -4834,13 +4877,13 @@ FOR UPDATE OF "${e.recordName}"` : u,
    * CAUTION 任何两个具体的实体之间只能有一条关系，但是可以在关系上有多条数据。1:n 的数据
    */
   async findXToManyRelatedRecords(e, t, i, r, a, n) {
-    const o = this.map.getInfo(e, t), c = o.getReverseInfo()?.attributeName, u = r.matchExpression.and({
+    const o = this.map.getInfo(e, t), c = o.getReverseInfo()?.attributeName, l = r.matchExpression.and({
       key: `${c}.id`,
       // 这里不能用 EXIST，因为 EXIST 会把 join 变成子查询，而我们还需要关系上的数据，不能用子查询
       value: ["=", i]
-    }), l = r.attributeQuery.parentLinkRecordQuery ? r.attributeQuery.withParentLinkData() : r.attributeQuery, d = r.derive({
-      matchExpression: u,
-      attributeQuery: l
+    }), u = r.attributeQuery.parentLinkRecordQuery ? r.attributeQuery.withParentLinkData() : r.attributeQuery, d = r.derive({
+      matchExpression: l,
+      attributeQuery: u
     }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, a, n);
     let m;
     if (!r.attributeQuery.parentLinkRecordQuery)
@@ -4904,11 +4947,11 @@ FOR UPDATE OF "${e.recordName}"` : u,
     const a = t.split("."), n = a.at(-1), o = a.slice(0, -1), c = E.atom({
       key: "id",
       value: ["=", i]
-    }), u = K.getAttributeQueryDataForRecord(e, this.map, !0, !0, !1, !0), l = t;
-    let d = u;
+    }), l = K.getAttributeQueryDataForRecord(e, this.map, !0, !0, !1, !0), u = t;
+    let d = l;
     for (let p of o)
       d.push([p, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
-    d.push([n, { label: l, attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
+    d.push([n, { label: u, attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
     for (let p of o)
       d.push([p, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
     let h;
@@ -4917,10 +4960,10 @@ FOR UPDATE OF "${e.recordName}"` : u,
       if (p.stack.at(-1)?.id === r)
         return h = [...p.stack], !0;
     };
-    d.push([n, { goto: l, exit: m }]);
+    d.push([n, { goto: u, exit: m }]);
     const f = (await this.findRecords(G.create(e, this.map, {
       matchExpression: c,
-      attributeQuery: u
+      attributeQuery: l
     }), `find records for path ${e}.${t}`))[0];
     return h ? [f, ...h] : void 0;
   }
@@ -4950,10 +4993,10 @@ class Ja {
         targetIds: n.map((h) => h.target?.id)
       }, i) : [];
       await this.deleteNotReliantSeparateLinkRecords(a.recordName, n, i);
-      const u = [];
-      ur(u, i), await this.deleteDifferentTableReliance(a.recordName, n, u);
-      const { linkAndCascadeEvents: l, recordDeleteEvents: d } = await this.deleteRecordSameRowDataGrouped(a.recordName, n, r, o, i);
-      i?.push(...l, ...u, ...d), await this.filteredEntityManager.settleMembershipChecks(c, i);
+      const l = [];
+      lr(l, i), await this.deleteDifferentTableReliance(a.recordName, n, l);
+      const { linkAndCascadeEvents: u, recordDeleteEvents: d } = await this.deleteRecordSameRowDataGrouped(a.recordName, n, r, o, i);
+      i?.push(...u, ...l, ...d), await this.filteredEntityManager.settleMembershipChecks(c, i);
     }
     return n;
   }
@@ -4975,9 +5018,9 @@ class Ja {
    */
   async deleteRecordSameRowDataGrouped(e, t, i = !1, r, a) {
     const n = [];
-    ur(n, a);
+    lr(n, a);
     const o = this.map.getRecordInfo(e);
-    for (let u of t) {
+    for (let l of t) {
       if (!i) {
         const d = G.create(
           e,
@@ -4985,7 +5028,7 @@ class Ja {
           {
             matchExpression: E.atom({
               key: "id",
-              value: ["=", u.id]
+              value: ["=", l.id]
             }),
             attributeQuery: K.getAttributeQueryDataForRecord(e, this.map, !0, !0, !0, !0),
             modifier: { limit: 1 }
@@ -4995,76 +5038,76 @@ class Ja {
           const f = o.combinedRecords.filter((b) => !(o.isRelation && (b.attributeName === "source" || b.attributeName === "target"))).flatMap((b) => b.getLinkInfo().recordInfo.sameRowFields), [p, y] = this.sqlBuilder.buildUpdateFieldsToNullSQL(
             o.name,
             [.../* @__PURE__ */ new Set([...o.sameRowFields, ...f])],
-            u
+            l
           );
           await this.database.update(p, y, o.idField, `use update to delete ${e} because of sameRowData`);
         } else {
-          const [f, p] = this.sqlBuilder.buildDeleteSQL(o.name, o.idField, u.id);
+          const [f, p] = this.sqlBuilder.buildDeleteSQL(o.name, o.idField, l.id);
           await this.database.delete(f, p, `delete record ${o.name} as row`);
         }
       }
-      const l = (d, h) => {
+      const u = (d, h) => {
         this.filteredEntityManager.settleDeletionMemberships(r, d, [h], n, a);
       };
       for (let d of o.sameTableReliance)
-        if (u[d.attributeName]?.id) {
+        if (l[d.attributeName]?.id) {
           const h = {
-            ...u[d.attributeName][v],
+            ...l[d.attributeName][v],
             [d.isRecordSource() ? "source" : "target"]: {
-              id: u.id
+              id: l.id
             },
             [d.isRecordSource() ? "target" : "source"]: {
-              id: u[d.attributeName].id
+              id: l[d.attributeName].id
             }
           };
           n.push({
             type: "delete",
             recordName: d.linkName,
             record: h
-          }), l(d.linkName, h);
+          }), u(d.linkName, h);
           const m = r?.children.find((f) => f.recordName === d.recordName);
-          await this.handleDeletedRecordReliance(d.recordName, u[d.attributeName], n, m, a);
+          await this.handleDeletedRecordReliance(d.recordName, l[d.attributeName], n, m, a);
         }
       o.mergedRecordAttributes.forEach((d) => {
-        if (u[d.attributeName]?.id) {
+        if (l[d.attributeName]?.id) {
           const h = {
-            ...u[d.attributeName][v],
+            ...l[d.attributeName][v],
             [d.isRecordSource() ? "source" : "target"]: {
-              id: u.id
+              id: l.id
             },
             [d.isRecordSource() ? "target" : "source"]: {
-              id: u[d.attributeName].id
+              id: l[d.attributeName].id
             }
           };
           n.push({
             type: "delete",
             recordName: d.linkName,
             record: h
-          }), l(d.linkName, h);
+          }), u(d.linkName, h);
         }
       }), o.notRelianceCombined.forEach((d) => {
-        if (o.isRelation && (d.attributeName === "target" || d.attributeName === "source") || u[d.attributeName]?.id === void 0) return;
+        if (o.isRelation && (d.attributeName === "target" || d.attributeName === "source") || l[d.attributeName]?.id === void 0) return;
         const h = {
-          ...u[d.attributeName][v],
+          ...l[d.attributeName][v],
           [d.isRecordSource() ? "source" : "target"]: {
-            id: u.id
+            id: l.id
           },
           [d.isRecordSource() ? "target" : "source"]: {
-            id: u[d.attributeName].id
+            id: l[d.attributeName].id
           }
         };
         n.push({
           type: "delete",
           recordName: d.linkName,
           record: h
-        }), l(d.linkName, h);
+        }), u(d.linkName, h);
       });
     }
     this.filteredEntityManager.settleDeletionMemberships(r, e, t, n, a);
-    const c = t.map((u) => ({
+    const c = t.map((l) => ({
       type: "delete",
       recordName: e,
-      record: u
+      record: l
     }));
     return { linkAndCascadeEvents: n, recordDeleteEvents: c };
   }
@@ -5096,14 +5139,14 @@ class Ja {
     for (let n of r.differentTableReliance) {
       const o = E.atom({
         key: `${n.getReverseInfo()?.attributeName}.id`,
-        value: ["in", t.map((u) => u.id)]
+        value: ["in", t.map((l) => l.id)]
       }), c = i?.length ?? 0;
       if (await this.deleteRecord(n.recordName, o, i), i)
-        for (let u = c; u < i.length; u++) {
-          const l = i[u];
-          if (l.recordName === n.linkName) {
-            const d = a.get(l.record[n.isRecordSource() ? "source" : "target"].id);
-            d && (l.record[n.isRecordSource() ? "source" : "target"] = d);
+        for (let l = c; l < i.length; l++) {
+          const u = i[l];
+          if (u.recordName === n.linkName) {
+            const d = a.get(u.record[n.isRecordSource() ? "source" : "target"].id);
+            d && (u.record[n.isRecordSource() ? "source" : "target"] = d);
           }
         }
     }
@@ -5128,11 +5171,11 @@ class Xa {
     n.managedRecordAttributes.forEach((f) => o.add(f.attributeName));
     const c = a.filter(
       (f) => typeof f == "string" || o.has(f[0])
-    ), u = G.create(e, this.map, {
+    ), l = G.create(e, this.map, {
       matchExpression: t,
       attributeQuery: c
-    }), l = await this.agent.findRecords(u, `find record for updating ${e}`), d = Object.keys(i.getData()), h = !!this.map.data.links[i.recordName], m = [];
-    for (let f of l) {
+    }), u = await this.agent.findRecords(l, `find record for updating ${e}`), d = Object.keys(i.getData()), h = !!this.map.data.links[i.recordName], m = [];
+    for (let f of u) {
       if (h)
         for (const S of ["source", "target"]) {
           if (!Object.prototype.hasOwnProperty.call(i.rawData || {}, S)) continue;
@@ -5145,7 +5188,7 @@ class Xa {
       const p = Array.from(/* @__PURE__ */ new Set([
         ...d,
         ...i.getSameRowFieldAndValue(f).map((S) => S.name)
-      ])), y = await this.filteredEntityManager.collectMembershipChecks(u.recordName, [f.id], p, r), b = r ? await this.collectUpdateLinkChecks(i, r) : [], g = await this.agent.createRecordDependency(i, r), w = await this.updateSameRowData(u.recordName, f, g, r), R = await this.handleUpdateReliance(u.recordName, f, i, r);
+      ])), y = await this.filteredEntityManager.collectMembershipChecks(l.recordName, [f.id], p, r), b = r ? await this.collectUpdateLinkChecks(i, r) : [], g = await this.agent.createRecordDependency(i, r), w = await this.updateSameRowData(l.recordName, f, g, r), R = await this.handleUpdateReliance(l.recordName, f, i, r);
       await this.filteredEntityManager.settleMembershipChecks(y.concat(b), r), m.push({ ...i.getData(), ...w.getData(), ...R });
     }
     return m;
@@ -5176,24 +5219,24 @@ class Xa {
       i.mergedLinkTargetNullRecords,
       i.mergedLinkTargetRecordIdRefs
     );
-    for (let u of a) {
-      const l = u.info.getLinkInfo(), d = l.isRelationSource(e, u.info.attributeName) ? "source" : "target";
-      u.isRef() && t[u.info?.attributeName]?.id === u.getData().id || await this.agent.unlink(
-        l.name,
+    for (let l of a) {
+      const u = l.info.getLinkInfo(), d = u.isRelationSource(e, l.info.attributeName) ? "source" : "target";
+      l.isRef() && t[l.info?.attributeName]?.id === l.getData().id || await this.agent.unlink(
+        u.name,
         E.atom({
           key: `${d}.id`,
           value: ["=", t.id]
         }),
-        !l.isRelationSource(e, u.info.attributeName),
-        `unlink ${u.info?.parentEntityName} ${u.info?.attributeName} for update ${e}`,
+        !u.isRelationSource(e, l.info.attributeName),
+        `unlink ${l.info?.parentEntityName} ${l.info?.attributeName} for update ${e}`,
         r
       );
     }
     await this.agent.unlinkOldOwnersOfExclusiveTargets(i, r, t);
-    const n = await this.agent.preprocessSameRowData(i, !0, r, t), c = n.getSameRowFieldAndValue(t).map(({ field: u, value: l, fieldType: d }) => ({
-      field: u,
+    const n = await this.agent.preprocessSameRowData(i, !0, r, t), c = n.getSameRowFieldAndValue(t).map(({ field: l, value: u, fieldType: d }) => ({
+      field: l,
       /// TODO value 要考虑引用自身或者 related entity 其他 field 的情况？例如 age+5
-      value: l,
+      value: u,
       // fieldType 让 buildUpdateSQL 走 prepareFieldValue（json 规范序列化），与 create 路径一致。
       fieldType: d
     }));
@@ -5211,18 +5254,18 @@ class Xa {
       i.isolatedNullRecords
     ), n = /* @__PURE__ */ new Set();
     for (let c of a) {
-      const u = c.info.getLinkInfo();
-      if (n.has(u.name))
+      const l = c.info.getLinkInfo();
+      if (n.has(l.name))
         continue;
-      n.add(u.name);
-      const l = u.isRelationSource(e, c.info.attributeName) ? "source" : "target", d = c.info.isManyToMany && u.isSymmetric() ? E.atom({ key: "source.id", value: ["=", t.id] }).or({ key: "target.id", value: ["=", t.id] }) : E.atom({
-        key: `${l}.id`,
+      n.add(l.name);
+      const u = l.isRelationSource(e, c.info.attributeName) ? "source" : "target", d = c.info.isManyToMany && l.isSymmetric() ? E.atom({ key: "source.id", value: ["=", t.id] }).or({ key: "target.id", value: ["=", t.id] }) : E.atom({
+        key: `${u}.id`,
         value: ["=", t.id]
       });
       await this.agent.unlink(
-        u.name,
+        l.name,
         d,
-        !u.isRelationSource(e, c.info.attributeName),
+        !l.isRelationSource(e, c.info.attributeName),
         "unlink old reliance for update",
         r
       );
@@ -5231,15 +5274,15 @@ class Xa {
     for (let c of a) {
       if (i.rawData[c.info?.attributeName] === null)
         continue;
-      let u;
-      c.isRef() ? u = c.getRef() : u = await this.agent.createRecord(c, `create new related record for update ${i.recordName}.${c.info?.attributeName}`, r);
-      const l = await this.agent.addLinkFromRecord(e, c.info?.attributeName, t.id, u.id, c.linkRecordData?.getData(), r);
+      let l;
+      c.isRef() ? l = c.getRef() : l = await this.agent.createRecord(c, `create new related record for update ${i.recordName}.${c.info?.attributeName}`, r);
+      const u = await this.agent.addLinkFromRecord(e, c.info?.attributeName, t.id, l.id, c.linkRecordData?.getData(), r);
       c.info.isXToMany ? (o[c.info.attributeName] || (o[c.info.attributeName] = []), o[c.info.attributeName].push({
-        ...u,
-        [v]: l
+        ...l,
+        [v]: u
       })) : o[c.info.attributeName] = {
-        ...u,
-        [v]: l
+        ...l,
+        [v]: u
       };
     }
     return o;
@@ -5301,7 +5344,7 @@ class Ya {
     const n = {}, o = r?.size ? e.combinedRecordIdRefs.filter((f) => !r.has(f.info.attributeName)) : e.combinedRecordIdRefs;
     if (!o.length) return n;
     let c;
-    const u = K.getAttributeQueryDataForRecord(e.recordName, this.map, !0, !0, !1, !0);
+    const l = K.getAttributeQueryDataForRecord(e.recordName, this.map, !0, !0, !1, !0);
     for (let f of o) {
       const p = {
         key: `${f.info.attributeName}.id`,
@@ -5309,10 +5352,10 @@ class Ya {
       };
       c ? c = c.or(p) : c = E.atom(p);
     }
-    const l = G.create(e.recordName, this.map, {
+    const u = G.create(e.recordName, this.map, {
       matchExpression: c,
-      attributeQuery: u
-    }, void 0, void 0, void 0, !1, !0), d = await this.queryExecutor.findRecords(l, i, void 0), h = this.map.getRecordInfo(e.recordName).isRelation && !!this.map.data.links[e.recordName], m = [];
+      attributeQuery: l
+    }, void 0, void 0, void 0, !1, !0), d = await this.queryExecutor.findRecords(u, i, void 0), h = this.map.getRecordInfo(e.recordName).isRelation && !!this.map.data.links[e.recordName], m = [];
     for (let f of d) {
       if (h && f.id) {
         const p = {
@@ -5427,15 +5470,15 @@ class Ya {
     }), `finding combined records for relocate ${e}.${n}`, void 0), c = await this.filteredEntityManager.collectLinkMembershipChecks(e, {
       sourceIds: o.map((d) => d.source?.id),
       targetIds: o.map((d) => d.target?.id)
-    }, r), u = await this.filteredEntityManager.collectInlineDeletionSnapshot(e, o, r), l = this.map.getLinkInfoByName(e)[i ? "sourceRecordInfo" : "targetRecordInfo"];
-    await this.deleteRecordSameRowData(l.name, o.map((d) => d[n]));
+    }, r), l = await this.filteredEntityManager.collectInlineDeletionSnapshot(e, o, r), u = this.map.getLinkInfoByName(e)[i ? "sourceRecordInfo" : "targetRecordInfo"];
+    await this.deleteRecordSameRowData(u.name, o.map((d) => d[n]));
     for (let d of o) {
-      const h = new ie(this.map, l.name, d[n]);
+      const h = new ee(this.map, u.name, d[n]);
       await this.creationExecutor.insertSameRowData(h, void 0), r?.push({
         type: "delete",
         recordName: e,
         record: d
-      }), r && u && this.filteredEntityManager.settleDeletionMemberships(u, e, [d], r, r);
+      }), r && l && this.filteredEntityManager.settleDeletionMemberships(l, e, [d], r, r);
     }
     return await this.filteredEntityManager.settleMembershipChecks(c, r), o;
   }
@@ -5500,7 +5543,7 @@ function Qr(s) {
   }
   return { root: e, match: t };
 }
-function lr(s) {
+function ur(s) {
   const e = new Map(s.map((n) => [H(n), n])), t = [], i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), a = (n) => {
     const o = H(n);
     if (!i.has(o)) {
@@ -5508,8 +5551,8 @@ function lr(s) {
         throw new Error(`Circular merged item dependency detected at "${o}"`);
       r.add(o);
       for (const c of De(n) || []) {
-        const u = H(c), l = e.get(u);
-        l && a(l);
+        const l = H(c), u = e.get(l);
+        u && a(u);
       }
       r.delete(o), i.add(o), t.push(n);
     }
@@ -5522,10 +5565,10 @@ function Za(s, e) {
     const p = H(f), { root: y } = Qr(f);
     De(y) ? i.add(p) : o.set(p, H(y));
   }
-  const c = /* @__PURE__ */ new Map(), u = lr(s.filter((f) => f.inputEntities)), l = lr(e.filter((f) => f.inputRelations)), d = dr(s), h = dr(e);
-  for (const f of u)
-    hr(f, t, "entity", d, o, c, i, r, a);
+  const c = /* @__PURE__ */ new Map(), l = ur(s.filter((f) => f.inputEntities)), u = ur(e.filter((f) => f.inputRelations)), d = dr(s), h = dr(e);
   for (const f of l)
+    hr(f, t, "entity", d, o, c, i, r, a);
+  for (const f of u)
     hr(f, t, "relation", h, o, c, i, r, a);
   return { ...t.getAll(), abstractNames: i, discriminatorHostNames: r, inputWritablePropertyNames: a };
 }
@@ -5560,9 +5603,9 @@ function en(s, e, t) {
         throw new Error(`Merged item "${o}" has no input items (empty union) and cannot be used as the base of a filtered input.`);
       return { memberCondition: n ? c.memberCondition.and(n) : c.memberCondition, hostedTypes: new Set(c.hostedTypes) };
     }
-    const u = E.atom({ key: pe, value: ["=", o] });
+    const l = E.atom({ key: pe, value: ["=", o] });
     return {
-      memberCondition: n ? u.and(n) : u,
+      memberCondition: n ? l.and(n) : l,
       hostedTypes: /* @__PURE__ */ new Set([o]),
       rootToRebase: a
     };
@@ -5573,11 +5616,11 @@ function en(s, e, t) {
   };
 }
 function hr(s, e, t, i, r, a, n, o, c) {
-  const u = t === "entity", l = H(s), d = De(s) || [];
+  const l = t === "entity", u = H(s), d = De(s) || [];
   if (s.commonProperties) {
     const N = d.filter(($) => s.commonProperties.some((I) => !$.properties.some((D) => D.name === I.name && D.type === I.type)));
     if (N.length > 0)
-      throw new Error(`Merged ${t} ${l} defined commonProperties, but these ${t}s do not have commonProperties: ${N.map(($) => H($)).join(", ")}`);
+      throw new Error(`Merged ${t} ${u} defined commonProperties, but these ${t}s do not have commonProperties: ${N.map(($) => H($)).join(", ")}`);
   }
   for (const N of d)
     if (N.properties.some(($) => $.name === pe))
@@ -5590,7 +5633,7 @@ function hr(s, e, t, i, r, a, n, o, c) {
   let f = h[0]?.memberCondition;
   for (let N = 1; N < h.length; N++)
     f = f.or(h[N].memberCondition);
-  const p = u ? e.getEntityByName(l) : e.getRelationByName(l), y = [
+  const p = l ? e.getEntityByName(u) : e.getRelationByName(u), y = [
     ...rn(p, i, e),
     tn(r),
     ...s.properties
@@ -5601,7 +5644,7 @@ function hr(s, e, t, i, r, a, n, o, c) {
   );
   e.replace(g, p);
   let R = w;
-  w !== g && (R = e.add(w), mt(g) ? g.baseEntity = R : g.baseRelation = R, n.add(H(R))), a.set(l, {
+  w !== g && (R = e.add(w), mt(g) ? g.baseEntity = R : g.baseRelation = R, n.add(H(R))), a.set(u, {
     memberCondition: f,
     hostedTypes: m,
     physicalBaseName: H(R)
@@ -5609,13 +5652,13 @@ function hr(s, e, t, i, r, a, n, o, c) {
   const S = /* @__PURE__ */ new Map();
   for (const { inputItem: N, memberCondition: $ } of h) {
     const I = H(N);
-    c.set(I, pr(I, e, u)), mr(I, R, $, e, u);
+    c.set(I, pr(I, e, l)), mr(I, R, $, e, l);
   }
   for (const { rootToRebase: N } of h)
     N && H(N) !== H(R) && S.set(H(N), N);
   for (const [N] of S) {
     const $ = E.atom({ key: pe, value: ["=", N] });
-    c.set(N, pr(N, e, u)), mr(N, R, $, e, u);
+    c.set(N, pr(N, e, l)), mr(N, R, $, e, l);
   }
 }
 function pr(s, e, t) {
@@ -5661,15 +5704,15 @@ function rn(s, e, t) {
     let c = o;
     for (; Te(c) && c.properties.length === 0; )
       c = Te(c);
-    const u = Object.fromEntries(
+    const l = Object.fromEntries(
       c.properties.filter((h) => h.name !== pe).map((h) => [h.name, h])
     );
-    a.set(H(o), u), Object.assign(n, u);
-    const l = !!De(o), d = [...e.get(H(o)) || []];
+    a.set(H(o), l), Object.assign(n, l);
+    const u = !!De(o), d = [...e.get(H(o)) || []];
     for (; d.length; ) {
       const h = d.shift();
-      if (!l)
-        a.set(h, u);
+      if (!u)
+        a.set(h, l);
       else {
         const m = t.getEntityByName(h) || t.getRelationByName(h), f = m && !!De(m);
         if (m && !f) {
@@ -5684,10 +5727,10 @@ function rn(s, e, t) {
   }
   for (const o of Object.keys(n)) {
     const c = x.clone(n[o], !0);
-    c.defaultValue = (u, l) => {
-      const d = a.get(l)?.[o];
+    c.defaultValue = (l, u) => {
+      const d = a.get(u)?.[o];
       if (d?.defaultValue)
-        return d.defaultValue(u, l);
+        return d.defaultValue(l, u);
     }, r.push(c);
   }
   return r;
@@ -5795,18 +5838,18 @@ class bi {
     const a = i && t[Ie] !== void 0;
     for (const [n, o] of Object.entries(t)) {
       if (n === Ie || n === Pe || n === v) continue;
-      const [c] = this.map.getAttributeAndSymmetricDirection(n), u = r.attributes[c];
-      if (!u) {
+      const [c] = this.map.getAttributeAndSymmetricDirection(n), l = r.attributes[c];
+      if (!l) {
         if (a) continue;
         throw new Error(
           `unknown attribute "${n}" in write payload for "${e}". Unknown keys were previously dropped silently (zero-warning data loss). Declared attributes: ${Object.keys(r.attributes).join(", ")}.`
         );
       }
-      if (u.isRecord) {
+      if (l.isRecord) {
         if (!o || typeof o != "object") continue;
-        this.validateWritePayload(u.recordName, o, !0);
-        const l = o[v];
-        l && u.linkName && this.validateWritePayload(u.linkName, l, !0);
+        this.validateWritePayload(l.recordName, o, !0);
+        const u = o[v];
+        u && l.linkName && this.validateWritePayload(l.linkName, u, !0);
       } else if (!a && r.writablePropertyNames && !r.writablePropertyNames.includes(c))
         throw new Error(
           `property "${c}" is not declared on "${e}" — it belongs to another input of merged record "${r.resolvedBaseRecordName || e}". Writing it through "${e}" would silently pollute a column owned by a sibling input view. Properties writable through "${e}": ${r.writablePropertyNames.join(", ")}.`
@@ -5815,13 +5858,13 @@ class bi {
   }
   async create(e, t, i) {
     this.validateWritePayload(e, t);
-    const r = new ie(this.map, e, t);
+    const r = new ee(this.map, e, t);
     return this.agent.createRecord(r, `create record ${e} from handle`, i);
   }
   // CAUTION 不能递归更新 relate entity 的 value，如果传入了 related entity 的值，说明是建立新的联系。
   async update(e, t, i, r) {
     this.validateWritePayload(e, i);
-    const a = new ie(this.map, e, i);
+    const a = new ee(this.map, e, i);
     return this.agent.updateRecord(e, t, a, r);
   }
   async delete(e, t, i) {
@@ -5834,7 +5877,7 @@ class bi {
     return this.validateWritePayload(this.map.getInfo(e, t).linkName, a), this.agent.addLinkFromRecord(e, t, i, r, a, n);
   }
   async updateRelationByName(e, t, i, r) {
-    return T(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.validateWritePayload(e, i), this.agent.updateRecord(e, t, new ie(this.map, e, i), r);
+    return T(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.validateWritePayload(e, i), this.agent.updateRecord(e, t, new ee(this.map, e, i), r);
   }
   async removeRelationByName(e, t, i) {
     return this.agent.unlink(e, t, !1, `remove relation ${e}`, i);
@@ -6105,13 +6148,13 @@ class qe {
   computeInfoByPath(e) {
     const [t, ...i] = e;
     T(this.data.records[t], `entity ${t} not found`), T(i.length > 0, "getInfoByPath should have a name path.");
-    let r = t, a, n, o, c, u;
-    const l = [];
+    let r = t, a, n, o, c, l;
+    const u = [];
     for (; c = i.shift(); ) {
-      l.push(c);
+      u.push(c);
       const [d, h] = this.getAttributeAndSymmetricDirection(c);
-      if (u = h, d === v)
-        T(!!a && !!n, `reading link in wrong path ${l.join(".")}`), a = this.data.records[a].attributes[n].linkName, n = void 0, r = o.linkName, o = void 0;
+      if (l = h, d === v)
+        T(!!a && !!n, `reading link in wrong path ${u.join(".")}`), a = this.data.records[a].attributes[n].linkName, n = void 0, r = o.linkName, o = void 0;
       else {
         const m = this.data.records[r];
         if (!m)
@@ -6122,11 +6165,11 @@ class qe {
       }
     }
     if (!(!a || !n))
-      return new ke(a, n, this, u);
+      return new ke(a, n, this, l);
   }
   getTableAndAliasStack(e) {
     const [t, ...i] = e;
-    let r = this.data.records[t], a = r.table, n = t, o, c, u = !1, l;
+    let r = this.data.records[t], a = r.table, n = t, o, c, l = !1, u;
     const d = [{
       // 最后一张表名
       table: a,
@@ -6134,7 +6177,7 @@ class qe {
       alias: n,
       // 最后表代表的 entity 数据，
       record: r,
-      isLinkRecord: u,
+      isLinkRecord: l,
       // 上一张表和最后一张表的关联表（如果是 relation 和  entity 的连接，这个link 就是虚拟的，table 是空，因为肯定是个合并的），
       // linkTable: relationTable,
       // 上一张表和最后一张表的关联表的 alias.
@@ -6146,26 +6189,26 @@ class qe {
       const [m, f] = this.getAttributeAndSymmetricDirection(i[h]), p = [t, ...i.slice(0, h + 1)];
       if (m === v) {
         const { linkTable: y, linkAlias: b, path: g } = d.pop();
-        T(!u, `last attribute in path is a link, cannot read link of a link ${g.join(".")}`), a = y, n = b, r = this.data.records[l.linkName], u = !0, o = "", c = "", l = void 0;
+        T(!l, `last attribute in path is a link, cannot read link of a link ${g.join(".")}`), a = y, n = b, r = this.data.records[u.linkName], l = !0, o = "", c = "", u = void 0;
       } else {
-        l = this.getInfoByPath(p);
+        u = this.getInfoByPath(p);
         const y = r.attributes[m];
-        T(l.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
+        T(u.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
         const b = this.data.records[y.recordName], g = `${n}_${m}${f ? `_${f.toUpperCase()}` : ""}`, w = this.aliasManager?.registerTablePath(g) || g;
-        if (l.isMergedWithParent() || l.isLinkMergedWithParent())
+        if (u.isMergedWithParent() || u.isLinkMergedWithParent())
           c = n;
-        else if (l.isLinkIsolated()) {
+        else if (u.isLinkIsolated()) {
           const R = `REL_${g}`;
           c = this.aliasManager?.registerTablePath(R) || R;
         } else
           c = w;
-        l.isMergedWithParent() || (n = w), a = l.table, r = b, o = l.getLinkInfo()?.table, u = !1;
+        u.isMergedWithParent() || (n = w), a = u.table, r = b, o = u.getLinkInfo()?.table, l = !1;
       }
       d.push({
         table: a,
         alias: n,
         record: r,
-        isLinkRecord: u,
+        isLinkRecord: l,
         linkTable: o,
         linkAlias: c,
         path: p
@@ -6174,14 +6217,14 @@ class qe {
     return d;
   }
   getTableAliasAndFieldName(e, t, i = !1) {
-    const r = this.getTableAndAliasStack(e), { table: a, alias: n, record: o, path: c, linkAlias: u, linkTable: l, isLinkRecord: d } = r.at(-1), h = !d && r.length > 1 ? this.getInfoByPath(c) : null;
+    const r = this.getTableAndAliasStack(e), { table: a, alias: n, record: o, path: c, linkAlias: l, linkTable: u, isLinkRecord: d } = r.at(-1), h = !d && r.length > 1 ? this.getInfoByPath(c) : null;
     if (!i && t === "id" && !d && e.length > 1 && (h?.isLinkMergedWithParent() || h?.isLinkIsolated()))
       if (h?.isLinkMergedWithParent()) {
         const { alias: f, table: p } = r.at(-2);
         return [f, h.linkField, p];
       } else {
         const f = h.getLinkInfo().record, p = h?.isLinkManyToManySymmetric() ? h?.symmetricDirection === "source" ? f?.attributes.target.field : f?.attributes.source.field : h.isRecordSource() ? f?.attributes.target.field : f?.attributes.source.field;
-        return [u, p, l];
+        return [l, p, u];
       }
     else {
       const [f] = this.getAttributeAndSymmetricDirection(t), p = o.attributes[f];
@@ -6277,9 +6320,9 @@ class qe {
     for (; o < i.length; ) {
       const c = i[o];
       if (c === v && o > 0 && o < i.length - 1) {
-        const l = r[r.length - 1], d = i[o + 1];
+        const u = r[r.length - 1], d = i[o + 1];
         if (d === "source" || d === "target") {
-          const h = this.getInfo(n, l);
+          const h = this.getInfo(n, u);
           if (h.isRecord) {
             const m = h.getLinkInfo().data, f = h.isRecordSource() ? m.targetRecord : m.sourceRecord, p = d === "source" ? m.sourceRecord : m.targetRecord;
             if (f === p) {
@@ -6294,8 +6337,8 @@ class qe {
         r.push(c), o++;
       } else if (c !== v) {
         if (n = a, a) {
-          const l = this.getInfo(a, c);
-          l.isRecord && (a = l.recordName);
+          const u = this.getInfo(a, c);
+          u.isRecord && (a = u.recordName);
         }
         r.push(c), o++;
       } else
@@ -6451,10 +6494,10 @@ function sn(s, e, t) {
   }
 }
 function wi(s, e, t, i, r, a) {
-  const n = i.supportsCreateIndexIfNotExists ? " IF NOT EXISTS" : "", o = t.map((u) => ce(u, i)).join(", "), c = r ? `
-WHERE ${Object.entries(r).map(([u, l]) => {
-    const d = a?.(u) ?? u;
-    return sn(d, l, i);
+  const n = i.supportsCreateIndexIfNotExists ? " IF NOT EXISTS" : "", o = t.map((l) => ce(l, i)).join(", "), c = r ? `
+WHERE ${Object.entries(r).map(([l, u]) => {
+    const d = a?.(l) ?? l;
+    return sn(d, u, i);
   }).join(" AND ")}` : "";
   return `CREATE UNIQUE INDEX${n} ${ce(s, i)} ON ${ce(e, i)} (${o})${c}`;
 }
@@ -6488,7 +6531,7 @@ function cn(s, e) {
     sql: `ALTER TABLE ${t} ADD CONSTRAINT ${i} CHECK (${r} IS NOT NULL)`
   };
 }
-class le {
+class ue {
   constructor(e, t, i, r = []) {
     this.entities = e, this.relations = t, this.database = i, this.mergeLinks = r, this.fieldNameMap = /* @__PURE__ */ new Map(), this.usedFieldNames = /* @__PURE__ */ new Set(), this.fieldCounter = 1, this.recordToTableMap = /* @__PURE__ */ new Map(), this.tableToRecordsMap = /* @__PURE__ */ new Map(), this.mergeLog = [], this.tables = {}, this.map = { links: {}, records: {} }, this.aliasManager = new nn(), this.constraintSchemaItems = [], this.mergedAbstractNames = /* @__PURE__ */ new Set(), this.mergedDiscriminatorHostNames = /* @__PURE__ */ new Set(), this.mergedInputWritablePropertyNames = /* @__PURE__ */ new Map(), this.buildMap(), this.buildTables(), this.buildConstraints();
   }
@@ -6503,11 +6546,11 @@ class le {
     const r = this.recordToTableMap.get(t), a = this.recordToTableMap.get(e), n = this.tableToRecordsMap.get(a);
     if (T(!!r && !!a, `table not exists for ${t} ${r} to join ${e} ${a}`), r == a) return;
     const o = this.tableToRecordsMap.get(r), c = [];
-    if (o.forEach((u) => {
-      n.has(u) && c.push(u);
+    if (o.forEach((l) => {
+      n.has(l) && c.push(l);
     }), c.length)
       return this.mergeLog.push({ joinTargetRecord: e, record: t, link: i, conflicts: c }), c;
-    this.tableToRecordsMap.set(r, /* @__PURE__ */ new Set()), o.forEach((u) => this.recordToTableMap.set(u, a)), this.tableToRecordsMap.set(a, new Set(Array.from(n).concat(Array.from(o)))), this.mergeLog.push({ joinTargetRecord: e, record: t, link: i });
+    this.tableToRecordsMap.set(r, /* @__PURE__ */ new Set()), o.forEach((l) => this.recordToTableMap.set(l, a)), this.tableToRecordsMap.set(a, new Set(Array.from(n).concat(Array.from(o)))), this.mergeLog.push({ joinTargetRecord: e, record: t, link: i });
   }
   combineRecordTable(e, t, i) {
     let r;
@@ -6626,16 +6669,16 @@ class le {
   }
   createFilteredRelationRecord(e) {
     const t = Object.fromEntries(e.properties.map((c) => {
-      const u = c;
+      const l = c;
       return [
-        u.name,
+        l.name,
         {
-          name: u.name,
-          type: u.type,
-          computed: u.computed,
-          collection: u.collection,
-          defaultValue: u.defaultValue,
-          fieldType: this.database.mapToDBFieldType(u.type, u.collection)
+          name: l.name,
+          type: l.type,
+          computed: l.computed,
+          collection: l.collection,
+          defaultValue: l.defaultValue,
+          fieldType: this.database.mapToDBFieldType(l.type, l.collection)
         }
       ];
     }));
@@ -6657,15 +6700,15 @@ class le {
   resolveRootBaseRecordNameAndMatchExpression(e) {
     const { baseEntity: t, baseRelation: i, matchExpression: r } = e;
     let a, n, o = t || i;
-    const u = [r || e.matchExpression];
+    const l = [r || e.matchExpression];
     for (; o.baseEntity || o.baseRelation; ) {
-      const l = o.baseEntity || o.baseRelation, d = o.matchExpression;
-      d && u.push(d), o = l;
+      const u = o.baseEntity || o.baseRelation, d = o.matchExpression;
+      d && l.push(d), o = u;
     }
-    if (a = o.name, u.length > 0) {
-      n = u[0];
-      for (let l = 1; l < u.length; l++)
-        n = n.and(u[l]);
+    if (a = o.name, l.length > 0) {
+      n = l[0];
+      for (let u = 1; u < l.length; u++)
+        n = n.and(l[u]);
     }
     return { resolvedBaseRecordName: a, resolvedMatchExpression: n };
   }
@@ -6781,7 +6824,7 @@ class le {
       if (o.length) {
         const c = this.resolveEndpointRootName(i);
         throw new Error(
-          `Filtered ${r} '${i.name}' cannot declare its own propert${o.length > 1 ? "ies" : "y"} ${o.map((u) => `'${u.name}'`).join(", ")}. Filtered ${r === "entity" ? "entities" : "relations"} are views sharing the base ${r}'s table row, so new properties (including computed/computation properties) must be declared on the base ${r} '${c}'. Re-declaring a property name that already exists on the base is allowed and resolves to the base column.`
+          `Filtered ${r} '${i.name}' cannot declare its own propert${o.length > 1 ? "ies" : "y"} ${o.map((l) => `'${l.name}'`).join(", ")}. Filtered ${r === "entity" ? "entities" : "relations"} are views sharing the base ${r}'s table row, so new properties (including computed/computation properties) must be declared on the base ${r} '${c}'. Re-declaring a property name that already exists on the base is allowed and resolves to the base column.`
         );
       }
     };
@@ -6797,8 +6840,8 @@ class le {
     this.relations.forEach((n) => {
       if (n.source.baseEntity) {
         const o = this.getBaseEntityChain(n.source), c = [];
-        for (const u of o)
-          this.getRelationPropertyNames(u.name).has(n.sourceProperty) && c.push(u.name);
+        for (const l of o)
+          this.getRelationPropertyNames(l.name).has(n.sourceProperty) && c.push(l.name);
         if (c.length > 0)
           throw new Error(
             `Relation property name conflict: filtered entity '${n.source.name}' uses sourceProperty '${n.sourceProperty}', but this property name is already defined on base entity '${c[0]}'. Filtered entities inherit all relation properties from their base entities, so you cannot redefine the same property name. Please use a different property name for this relation.`
@@ -6806,8 +6849,8 @@ class le {
       }
       if (n.target.baseEntity && n.targetProperty) {
         const o = this.getBaseEntityChain(n.target), c = [];
-        for (const u of o)
-          this.getRelationPropertyNames(u.name).has(n.targetProperty) && c.push(u.name);
+        for (const l of o)
+          this.getRelationPropertyNames(l.name).has(n.targetProperty) && c.push(l.name);
         if (c.length > 0)
           throw new Error(
             `Relation property name conflict: filtered entity '${n.target.name}' uses targetProperty '${n.targetProperty}', but this property name is already defined on base entity '${c[0]}'. Filtered entities inherit all relation properties from their base entities, so you cannot redefine the same property name. Please use a different property name for this relation.`
@@ -6816,19 +6859,19 @@ class le {
     });
     const e = /* @__PURE__ */ new Map(), t = (n, o, c) => {
       if (!o) return;
-      const u = this.resolveEndpointRootName(n);
-      let l = e.get(u);
-      l || e.set(u, l = /* @__PURE__ */ new Map());
-      let d = l.get(o);
-      d || l.set(o, d = { relations: /* @__PURE__ */ new Set(), declarers: /* @__PURE__ */ new Set() }), d.relations.add(c), d.declarers.add(n.name);
+      const l = this.resolveEndpointRootName(n);
+      let u = e.get(l);
+      u || e.set(l, u = /* @__PURE__ */ new Map());
+      let d = u.get(o);
+      d || u.set(o, d = { relations: /* @__PURE__ */ new Set(), declarers: /* @__PURE__ */ new Set() }), d.relations.add(c), d.declarers.add(n.name);
     };
     this.relations.forEach((n) => {
       t(n.source, n.sourceProperty, n), t(n.target, n.targetProperty, n);
     }), e.forEach((n, o) => {
-      n.forEach((c, u) => {
+      n.forEach((c, l) => {
         if (c.relations.size > 1)
           throw new Error(
-            `Relation property name conflict: property '${u}' is declared by multiple relations within the same base record family '${o}' (declared on: ${Array.from(c.declarers).join(", ")}). Each relation property name must be unique across the base entity and all its filtered entities — otherwise the relations silently overwrite each other in the shared attribute namespace.`
+            `Relation property name conflict: property '${l}' is declared by multiple relations within the same base record family '${o}' (declared on: ${Array.from(c.declarers).join(", ")}). Each relation property name must be unique across the base entity and all its filtered entities — otherwise the relations silently overwrite each other in the shared attribute namespace.`
           );
       });
     });
@@ -6836,8 +6879,8 @@ class le {
       const o = this.resolveEndpointRootName(n);
       let c = i.get(o);
       c || i.set(o, c = /* @__PURE__ */ new Map());
-      for (const u of n.properties || [])
-        c.has(u.name) || c.set(u.name, n.name);
+      for (const l of n.properties || [])
+        c.has(l.name) || c.set(l.name, n.name);
     };
     this.entities.forEach(r), this.relations.forEach(r);
     const a = (n, o) => {
@@ -7001,15 +7044,15 @@ class le {
   }
   validateRecordNames() {
     this.entities.forEach((e) => {
-      if (typeof e.name != "string" || !le.VALID_NAME_FORMAT.test(e.name))
-        throw new Error(`Entity name "${e.name}" is invalid. Entity names must match ${le.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
+      if (typeof e.name != "string" || !ue.VALID_NAME_FORMAT.test(e.name))
+        throw new Error(`Entity name "${e.name}" is invalid. Entity names must match ${ue.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
     }), this.relations.forEach((e) => {
-      if (e.name !== void 0 && !le.VALID_NAME_FORMAT.test(e.name))
-        throw new Error(`Relation name "${e.name}" is invalid. Relation names must match ${le.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
-      if (!le.VALID_NAME_FORMAT.test(e.sourceProperty))
-        throw new Error(`Relation sourceProperty "${e.sourceProperty}" is invalid. Property names must match ${le.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
-      if (e.targetProperty !== void 0 && !le.VALID_NAME_FORMAT.test(e.targetProperty))
-        throw new Error(`Relation targetProperty "${e.targetProperty}" is invalid. Property names must match ${le.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
+      if (e.name !== void 0 && !ue.VALID_NAME_FORMAT.test(e.name))
+        throw new Error(`Relation name "${e.name}" is invalid. Relation names must match ${ue.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
+      if (!ue.VALID_NAME_FORMAT.test(e.sourceProperty))
+        throw new Error(`Relation sourceProperty "${e.sourceProperty}" is invalid. Property names must match ${ue.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
+      if (e.targetProperty !== void 0 && !ue.VALID_NAME_FORMAT.test(e.targetProperty))
+        throw new Error(`Relation targetProperty "${e.targetProperty}" is invalid. Property names must match ${ue.VALID_NAME_FORMAT} (letters, numbers and underscore only).`);
     });
   }
   buildMap() {
@@ -7041,7 +7084,7 @@ class le {
       const [a, ...n] = r.split(".");
       let o = a;
       for (let c = 0; c < n.length; c++) {
-        const u = n[c], l = this.map.records[o].attributes[u], d = l.linkName, h = this.map.links[d], { relType: m, sourceRecord: f, targetRecord: p } = h;
+        const l = n[c], u = this.map.records[o].attributes[l], d = u.linkName, h = this.map.links[d], { relType: m, sourceRecord: f, targetRecord: p } = h;
         T(
           m[0] === "1" && m[1] === "1" && f !== p,
           `only 1:1 can merge: ${a}.${n.slice(0, c + 1).join(".")}`
@@ -7049,27 +7092,27 @@ class le {
         const y = f === o ? p : f, b = this.combineRecordTable(o, y, d);
         if (b)
           throw new Error(`conflict found when join ${d}, ${b.join(",")} already merged with ${o}`);
-        h.mergedTo = "combined", i.push(h), o = l.recordName, delete e[d], delete t[d];
+        h.mergedTo = "combined", i.push(h), o = u.recordName, delete e[d], delete t[d];
       }
     }), Object.values(e).forEach((r) => {
       if (r.isFilteredRelation) return;
       const { sourceRecord: a, targetRecord: n, recordName: o } = r;
       if (a === n) {
-        const u = this.map.records[o].attributes.source.linkName;
-        this.joinTables(a, o, u) || (r.mergedTo = "source", i.push(r));
+        const l = this.map.records[o].attributes.source.linkName;
+        this.joinTables(a, o, l) || (r.mergedTo = "source", i.push(r));
         return;
       }
       const c = this.combineRecordTable(a, n, o);
       if (!c)
         r.mergedTo = "combined", i.push(r);
       else {
-        const u = this.map.records[o].attributes.source.linkName;
-        this.joinTables(a, o, u) || (this.mergeLog.push(c), r.mergedTo = "source", i.push(r));
+        const l = this.map.records[o].attributes.source.linkName;
+        this.joinTables(a, o, l) || (this.mergeLog.push(c), r.mergedTo = "source", i.push(r));
       }
     }), Object.values(t).forEach((r) => {
       if (r.isFilteredRelation) return;
-      const { relType: a, sourceRecord: n, targetRecord: o, recordName: c } = r, u = a[1] !== "n", l = u ? n : o, d = this.map.records[c].attributes[u ? "source" : "target"].linkName;
-      this.joinTables(l, c, d) || (r.mergedTo = u ? "source" : "target", i.push(r));
+      const { relType: a, sourceRecord: n, targetRecord: o, recordName: c } = r, l = a[1] !== "n", u = l ? n : o, d = this.map.records[c].attributes[l ? "source" : "target"].linkName;
+      this.joinTables(u, c, d) || (r.mergedTo = l ? "source" : "target", i.push(r));
     }), Object.values(this.map.links).forEach((r) => {
       r.isFilteredRelation || r.isSourceRelation && (r.mergedTo = "source");
     }), i.forEach((r) => {
@@ -7098,8 +7141,8 @@ class le {
         const a = this.map.records[i.resolvedBaseRecordName];
         a && Object.entries(i.attributes).forEach(([n, o]) => {
           if (o.isRecord) return;
-          const c = o, u = a.attributes[n];
-          u && u.field && (c.field = u.field, c.fieldType = u.fieldType);
+          const c = o, l = a.attributes[n];
+          l && l.field && (c.field = l.field, c.fieldType = l.fieldType);
         });
       }
     }), Object.entries(this.map.links).forEach(([t, i]) => {
@@ -7309,12 +7352,12 @@ ${Object.values(this.tables[e].columns).map((i) => `    "${i.name}" ${i.fieldTyp
     if (this.aliasManager.registerTablePath(t), r >= a) return;
     const n = this.map.records[e];
     n && Object.entries(n.attributes).forEach(([o, c]) => {
-      const u = c;
-      if (!u.isRecord) return;
-      const l = u.recordName, d = `${t}_${o}`;
-      if (this.aliasManager.registerTablePath(d), this.aliasManager.registerTablePath(`${d}_SOURCE`), this.aliasManager.registerTablePath(`${d}_TARGET`), this.aliasManager.registerTablePath(`REL_${d}`), this.aliasManager.registerTablePath(`REL_${d}_SOURCE`), this.aliasManager.registerTablePath(`REL_${d}_TARGET`), i.has(l)) return;
+      const l = c;
+      if (!l.isRecord) return;
+      const u = l.recordName, d = `${t}_${o}`;
+      if (this.aliasManager.registerTablePath(d), this.aliasManager.registerTablePath(`${d}_SOURCE`), this.aliasManager.registerTablePath(`${d}_TARGET`), this.aliasManager.registerTablePath(`REL_${d}`), this.aliasManager.registerTablePath(`REL_${d}_SOURCE`), this.aliasManager.registerTablePath(`REL_${d}_TARGET`), i.has(u)) return;
       const h = new Set(i);
-      h.add(l), this.generateAliasesForRecord(l, d, h, r + 1, a);
+      h.add(u), this.generateAliasesForRecord(u, d, h, r + 1, a);
     });
   }
 }
@@ -7469,7 +7512,7 @@ Stack trace:`, r.stack.split(`
     return null;
   }
 }
-var te = /* @__PURE__ */ ((s) => (s.LOW = "low", s.MEDIUM = "medium", s.HIGH = "high", s.CRITICAL = "critical", s))(te || {}), ve = /* @__PURE__ */ ((s) => (s.VALIDATION = "validation", s.PERMISSION = "permission", s.COMPUTATION = "computation", s.STORAGE = "storage", s.INTERACTION = "interaction", s.ACTIVITY = "activity", s.SYSTEM = "system", s.CONFIGURATION = "configuration", s))(ve || {});
+var ie = /* @__PURE__ */ ((s) => (s.LOW = "low", s.MEDIUM = "medium", s.HIGH = "high", s.CRITICAL = "critical", s))(ie || {}), ve = /* @__PURE__ */ ((s) => (s.VALIDATION = "validation", s.PERMISSION = "permission", s.COMPUTATION = "computation", s.STORAGE = "storage", s.INTERACTION = "interaction", s.ACTIVITY = "activity", s.SYSTEM = "system", s.CONFIGURATION = "configuration", s))(ve || {});
 class V extends ae {
   constructor(e, t = {}) {
     super(e, {
@@ -7483,14 +7526,14 @@ class V extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.handleName = t.handleName, this.computationName = t.computationName, this.dataContext = t.dataContext, this.computationPhase = t.computationPhase, this.severity = t.severity || te.MEDIUM;
+    }), this.handleName = t.handleName, this.computationName = t.computationName, this.dataContext = t.dataContext, this.computationPhase = t.computationPhase, this.severity = t.severity || ie.MEDIUM;
   }
 }
 class ci extends V {
   constructor(e, t = {}) {
     super(e, {
       ...t,
-      severity: te.HIGH,
+      severity: ie.HIGH,
       context: {
         errorType: "ComputationStateError",
         stateKey: t.stateKey,
@@ -7505,7 +7548,7 @@ class Se extends V {
   constructor(e, t = {}) {
     super(e, {
       ...t,
-      severity: te.MEDIUM,
+      severity: ie.MEDIUM,
       context: {
         errorType: "ComputationDataDepError",
         depName: t.depName,
@@ -7520,7 +7563,7 @@ class z extends V {
   constructor(e, t = {}) {
     super(e, {
       ...t,
-      severity: te.HIGH,
+      severity: ie.HIGH,
       context: {
         ...t.context,
         errorType: "ComputationProtocolError"
@@ -7541,7 +7584,7 @@ class Hr extends ae {
         retryable: !1,
         driver: t.driver,
         rawCode: t.rawCode,
-        severity: te.MEDIUM,
+        severity: ie.MEDIUM,
         category: ve.STORAGE
       },
       causedBy: t.causedBy
@@ -7562,14 +7605,14 @@ class Ce extends ae {
         retryable: !1,
         driver: t.driver,
         rawCode: t.rawCode,
-        severity: te.HIGH,
+        severity: ie.HIGH,
         category: ve.STORAGE
       },
       causedBy: t.causedBy
     }), this.constraintName = t.constraintName, this.recordName = t.recordName, this.properties = t.properties;
   }
 }
-function un(s) {
+function ln(s) {
   let e = s;
   const t = /* @__PURE__ */ new Set();
   for (; e && !t.has(e); ) {
@@ -7577,7 +7620,7 @@ function un(s) {
     e instanceof Error ? e = (e instanceof ae ? e.causedBy : void 0) || e.cause : e = void 0;
   }
 }
-function ln(s, e) {
+function un(s, e) {
   for (const t of e) {
     const i = s[t];
     if (typeof i == "string" && i.length > 0) return i;
@@ -7593,7 +7636,7 @@ function dn(s) {
   };
 }
 function xt(s, e) {
-  const t = s && typeof s == "object" ? s : {}, i = s instanceof Error ? s.message : String(s), r = t.code ?? t.errno, a = ln(t, ["constraint", "constraintName", "index", "sqlMessage"]), n = dn(i), o = r === "23505" || r === "SQLITE_CONSTRAINT_UNIQUE" || r === "SQLITE_CONSTRAINT" || r === 1062 || i.includes("UNIQUE constraint failed") || i.includes("duplicate key value violates unique constraint") || i.includes("Duplicate entry");
+  const t = s && typeof s == "object" ? s : {}, i = s instanceof Error ? s.message : String(s), r = t.code ?? t.errno, a = un(t, ["constraint", "constraintName", "index", "sqlMessage"]), n = dn(i), o = r === "23505" || r === "SQLITE_CONSTRAINT_UNIQUE" || r === "SQLITE_CONSTRAINT" || r === 1062 || i.includes("UNIQUE constraint failed") || i.includes("duplicate key value violates unique constraint") || i.includes("Duplicate entry");
   return {
     driver: e?.constructor?.name,
     message: i,
@@ -7616,7 +7659,7 @@ class Be extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.schedulingPhase = t.schedulingPhase, this.failedComputations = t.failedComputations, this.severity = te.HIGH;
+    }), this.schedulingPhase = t.schedulingPhase, this.failedComputations = t.failedComputations, this.severity = ie.HIGH;
   }
 }
 class br extends ae {
@@ -7632,7 +7675,7 @@ class br extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.sideEffectName = t.sideEffectName, this.recordName = t.recordName, this.mutationType = t.mutationType, this.severity = te.MEDIUM;
+    }), this.sideEffectName = t.sideEffectName, this.recordName = t.recordName, this.mutationType = t.mutationType, this.severity = ie.MEDIUM;
   }
 }
 class Ni extends ae {
@@ -7648,7 +7691,7 @@ class Ni extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.checkType = t.checkType, this.fieldName = t.fieldName, this.payload = t.payload, this.evaluationError = t.evaluationError, this.error = t.evaluationError, this.type = t.type || e, this.severity = t.severity || te.HIGH;
+    }), this.checkType = t.checkType, this.fieldName = t.fieldName, this.payload = t.payload, this.evaluationError = t.evaluationError, this.error = t.evaluationError, this.type = t.type || e, this.severity = t.severity || ie.HIGH;
   }
   /**
    * Helper factory methods for common condition error scenarios
@@ -7660,7 +7703,7 @@ class Ni extends ae {
       fieldName: e,
       payload: i,
       evaluationError: r,
-      severity: te.MEDIUM,
+      severity: ie.MEDIUM,
       type: a
       // For backward compatibility
     });
@@ -7669,7 +7712,7 @@ class Ni extends ae {
     return new Ni(`Condition check failed: ${e.data.name}`, {
       checkType: "condition",
       evaluationError: e,
-      severity: te.HIGH,
+      severity: ie.HIGH,
       context: t,
       type: "condition check failed"
       // For backward compatibility
@@ -7732,7 +7775,7 @@ class Wr {
     return this.data.transfers.filter((t) => wr(e, t.trigger));
   }
 }
-const Ao = 0, ui = 1, Io = 2;
+const Ao = 0, li = 1, Io = 2;
 class zr {
   constructor(e, t) {
     this.controller = e, this.scheduler = t, this.sourceMaps = [], this.sourceMapTree = {}, this.filteredToPhysicalName = /* @__PURE__ */ new Map(), this.knownRecordNames = /* @__PURE__ */ new Set();
@@ -7793,6 +7836,15 @@ class zr {
    * 被写进了注释，但只在数据驱动轨道上被执行——注释没有执行力，不变量有。
    */
   assertListenerReachable(e) {
+    if (e.type !== "create" && e.type !== "update" && e.type !== "delete")
+      throw new z(
+        `${this.describeComputation(e.computation)} listens to "${e.type}" events of record "${e.recordName}", but mutation events only have type 'create' | 'update' | 'delete' — this listener can never fire and the computation would stay silently stale. Check the trigger/eventDep type for a typo.`,
+        {
+          handleName: e.computation.constructor.name,
+          dataContext: e.computation.dataContext,
+          computationPhase: "source-map-initialization"
+        }
+      );
     if (!this.knownRecordNames.has(e.recordName)) {
       const t = this.controller.dict.some((i) => i.name === e.recordName) ? ` "${e.recordName}" is a global dictionary: dictionary changes are emitted as events on the "${Z}" record — declare { recordName: '${Z}', type: 'update', record: { key: '${e.recordName}' } } instead.` : " Check for a typo, and make sure the entity/relation is registered on the Controller.";
       throw new z(
@@ -7843,7 +7895,7 @@ class zr {
               }
             );
           const o = this.convertDataDepToERMutationEventsSourceMap(a, n, i);
-          r[n.phase || ui].push(...o);
+          r[n.phase || li].push(...o);
         }), i.dataContext.type === "property" && Object.values(i.dataDeps).some((a) => a.type === "global")) {
           const a = i.dataContext.host.name;
           if (!r.some(
@@ -7853,7 +7905,7 @@ class zr {
               type: "records",
               source: i.dataContext.host
             };
-            r[ui].push(...this.convertDataDepToERMutationEventsSourceMap("_self", o, i, "create"));
+            r[li].push(...this.convertDataDepToERMutationEventsSourceMap("_self", o, i, "create"));
           }
         }
         r.forEach((a, n) => {
@@ -7862,7 +7914,7 @@ class zr {
       } else {
         const { eventDeps: r } = i;
         for (const a of Object.values(r))
-          t[a.phase || ui].push({
+          t[a.phase || li].push({
             type: a.type,
             recordName: a.recordName,
             record: a.record,
@@ -8036,37 +8088,37 @@ class zr {
     return t;
   }
   convertAttrsToERMutationEventsSourceMap(e, t, i, r, a, n = !1) {
-    const o = [], c = [], u = [];
-    if (i.forEach((l) => {
-      if (typeof l == "string" && l !== "*")
-        c.push(l);
-      else if (l === "*")
+    const o = [], c = [], l = [];
+    if (i.forEach((u) => {
+      if (typeof u == "string" && u !== "*")
+        c.push(u);
+      else if (u === "*")
         c.push("*");
-      else if (Array.isArray(l))
-        u.push(l);
+      else if (Array.isArray(u))
+        l.push(u);
       else
-        throw new Error(`unknown attribute type: ${l}`);
+        throw new Error(`unknown attribute type: ${u}`);
     }), c.length > 0) {
-      let l = t;
-      r.length > 0 && (r.at(-1) === "&" ? l = this.controller.system.storage.getRelationName(t, r.slice(0, -1).join(".")) : l = this.controller.system.storage.getEntityName(t, r.join("."))), n && o.push({
+      let u = t;
+      r.length > 0 && (r.at(-1) === "&" ? u = this.controller.system.storage.getRelationName(t, r.slice(0, -1).join(".")) : u = this.controller.system.storage.getEntityName(t, r.join("."))), n && o.push({
         dataDep: e,
         type: "create",
-        recordName: l,
+        recordName: u,
         sourceRecordName: t,
         targetPath: r,
         computation: a
       }), o.push({
         dataDep: e,
         type: "update",
-        recordName: l,
+        recordName: u,
         sourceRecordName: t,
         targetPath: r,
         attributes: c,
         computation: a
       });
     }
-    return u.forEach(([l, d]) => {
-      o.push(...this.convertRelationAttrToERMutationEventsSourceMap(e, t, d.attributeQuery, r.concat(l), a));
+    return l.forEach(([u, d]) => {
+      o.push(...this.convertRelationAttrToERMutationEventsSourceMap(e, t, d.attributeQuery, r.concat(u), a));
     }), o;
   }
   convertRelationAttrToERMutationEventsSourceMap(e, t, i, r, a) {
@@ -8330,16 +8382,16 @@ function Xr(s, e, t) {
       );
     };
     (!Array.isArray(r.keys) || r.keys.length === 0) && a("trigger.keys must be a non-empty array of property names. An empty array matches every update vacuously — omit keys entirely to match any update.");
-    const n = r.keys, o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(["id"]), u = s.entities.find((m) => m.name === r.recordName) ?? s.relations.find((m) => m.name === r.recordName);
-    if (!u) continue;
-    const l = [u], d = /* @__PURE__ */ new Set();
-    for (; l.length; ) {
-      const m = l.pop();
+    const n = r.keys, o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(["id"]), l = s.entities.find((m) => m.name === r.recordName) ?? s.relations.find((m) => m.name === r.recordName);
+    if (!l) continue;
+    const u = [l], d = /* @__PURE__ */ new Set();
+    for (; u.length; ) {
+      const m = u.pop();
       if (!(!m || d.has(m))) {
         d.add(m), m.name && o.add(m.name);
         for (const f of m.properties ?? []) c.add(f.name);
-        m.baseEntity && l.push(m.baseEntity), m.baseRelation && l.push(m.baseRelation);
-        for (const f of m.inputEntities ?? []) l.push(f);
+        m.baseEntity && u.push(m.baseEntity), m.baseRelation && u.push(m.baseRelation);
+        for (const f of m.inputEntities ?? []) u.push(f);
       }
     }
     const h = /* @__PURE__ */ new Set();
@@ -8372,15 +8424,15 @@ async function fn(s, e, t, i) {
             `StateMachine computation of property "${t.host.name}.${t.id.name}" ${i()}: computeTarget returned a {source, target} endpoint form, but the host is not a relation. Return {id} (or an array of {id}) identifying the ${t.host.name} record(s) to transition.`,
             { handleName: "StateMachine", computationPhase: "compute-dirty-records" }
           );
-        const c = Array.isArray(o) ? [o[0]].flat() : [o.source].flat(), u = Array.isArray(o) ? [o[1]].flat() : [o.target].flat();
-        for (const l of c)
-          for (const d of u) {
-            if (!l?.id || !d?.id)
+        const c = Array.isArray(o) ? [o[0]].flat() : [o.source].flat(), l = Array.isArray(o) ? [o[1]].flat() : [o.target].flat();
+        for (const u of c)
+          for (const d of l) {
+            if (!u?.id || !d?.id)
               throw new z(
-                `StateMachine computation of property "${t.host.name}.${t.id.name}" ${i()}: computeTarget returned an endpoint form whose ${l?.id ? "target" : "source"} has no id (got ${JSON.stringify({ source: l, target: d })}). Every endpoint must be {id} (or an array of {id}); return undefined to skip the transfer explicitly.`,
+                `StateMachine computation of property "${t.host.name}.${t.id.name}" ${i()}: computeTarget returned an endpoint form whose ${u?.id ? "target" : "source"} has no id (got ${JSON.stringify({ source: u, target: d })}). Every endpoint must be {id} (or an array of {id}); return undefined to skip the transfer explicitly.`,
                 { handleName: "StateMachine", computationPhase: "compute-dirty-records" }
               );
-            const h = k.atom({ key: "source.id", value: ["=", l.id] }).and({ key: "target.id", value: ["=", d.id] }), m = await s.system.storage.find(t.host.name, h, void 0, ["id"]);
+            const h = k.atom({ key: "source.id", value: ["=", u.id] }).and({ key: "target.id", value: ["=", d.id] }), m = await s.system.storage.find(t.host.name, h, void 0, ["id"]);
             n.push(...m);
           }
       } else if (typeof o == "object" && o.id !== void 0)
@@ -8603,8 +8655,8 @@ class Ge {
       let c = this.relation.baseRelation || this.relation;
       for (; c.baseRelation; )
         c = c.baseRelation;
-      const u = c.type.split(":");
-      _(u[this.isSource ? 1 : 0] === "n", `property-level ${r.computationName} computation argument must be an x:n relation. ${i.host.name}.${t.property}" is a ${this.isSource ? u.join(":") : u.slice().reverse().join(":")} relation`);
+      const l = c.type.split(":");
+      _(l[this.isSource ? 1 : 0] === "n", `property-level ${r.computationName} computation argument must be an x:n relation. ${i.host.name}.${t.property}" is a ${this.isSource ? l.join(":") : l.slice().reverse().join(":")} relation`);
     }
     this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = t.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     let a = this.relation;
@@ -8684,12 +8736,12 @@ class Ge {
       );
       if (!c)
         return U.fullRecompute(`relation record ${o} not found for ${X(this.dataContext)}`);
-      const u = c[this.relationSide];
-      if (!u)
+      const l = c[this.relationSide];
+      if (!l)
         return U.fullRecompute(`relation ${this.relationSide} endpoint missing for ${X(this.dataContext)}`);
-      u[v] = c;
-      const l = this.computeItemValue(u, r), d = await this.replaceItemState(c, l);
-      return d instanceof U ? d : this.applyDelta(n, l, d.oldValue, 1);
+      l[v] = c;
+      const u = this.computeItemValue(l, r), d = await this.replaceItemState(c, u);
+      return d instanceof U ? d : this.applyDelta(n, u, d.oldValue, 1);
     }
     if (a.type === "delete" && a.recordName === this.relation.name) {
       let o;
@@ -8706,12 +8758,12 @@ class Ge {
       );
       if (!c)
         return U.fullRecompute(`relation record not found by ${o} for ${X(this.dataContext)}`);
-      const u = c[this.relationSide];
-      if (!u)
+      const l = c[this.relationSide];
+      if (!l)
         return U.fullRecompute(`relation ${this.relationSide} endpoint missing for ${X(this.dataContext)}`);
-      u[v] = c;
-      const l = this.computeItemValue(u, r), d = await this.replaceItemState(c, l);
-      return d instanceof U ? d : this.applyDelta(n, l, d.oldValue, 0);
+      l[v] = c;
+      const u = this.computeItemValue(l, r), d = await this.replaceItemState(c, u);
+      return d instanceof U ? d : this.applyDelta(n, u, d.oldValue, 0);
     }
     return U.fullRecompute(`unknown related mutation event for ${X(this.dataContext)}`);
   }
@@ -9097,8 +9149,8 @@ async function Li(s, e, t = {}) {
       }
       if (Dn(o)) {
         if (a < i) {
-          const c = Nr[Math.min(a - 1, Nr.length - 1)], u = Math.floor(Math.random() * c);
-          await Ln(c + u);
+          const c = Nr[Math.min(a - 1, Nr.length - 1)], l = Math.floor(Math.random() * c);
+          await Ln(c + l);
           continue;
         }
         throw new It(
@@ -9187,11 +9239,11 @@ class Fn {
     const i = this.dataContext, r = [];
     if (t.type === "create") {
       const a = E.atom({ key: "id", value: ["=", t.record.id] }), n = this.dataDeps._source, o = await this.controller.system.storage.findOne(n.source.name, a, void 0, n.attributeQuery), c = await this.transformCallback.call(this.controller, o);
-      (Array.isArray(c) ? c : [c]).forEach((l, d) => {
-        l && (vt(l, this.dataContext), r.push({
+      (Array.isArray(c) ? c : [c]).forEach((u, d) => {
+        u && (vt(u, this.dataContext), r.push({
           type: "insert",
           data: {
-            ...l,
+            ...u,
             [this.state.sourceRecordId.key]: t.record.id,
             [this.state.transformIndex.key]: d
           }
@@ -9203,38 +9255,38 @@ class Fn {
       const a = t.oldRecord?.id ?? t.record.id;
       let n = [];
       if (t.type === "update") {
-        const l = this.dataDeps._source, d = await this.controller.system.storage.atomic.lockRecord(
-          l.source.name,
+        const u = this.dataDeps._source, d = await this.controller.system.storage.atomic.lockRecord(
+          u.source.name,
           a,
-          l.attributeQuery
+          u.attributeQuery
         );
         if (d) {
           const h = await this.transformCallback.call(this.controller, d);
           n = Array.isArray(h) ? h : [h];
         }
       }
-      const o = E.atom({ key: this.state.sourceRecordId.key, value: ["=", a] }), u = (await this.controller.system.storage.atomic.lockRows(i.id.name, o, ["*"])).reduce((l, d) => (l[Number(d[this.state.transformIndex.key])] = d, l), {});
-      n.forEach((l, d) => {
-        l && (vt(l, this.dataContext), u[d] ? (r.push({
+      const o = E.atom({ key: this.state.sourceRecordId.key, value: ["=", a] }), l = (await this.controller.system.storage.atomic.lockRows(i.id.name, o, ["*"])).reduce((u, d) => (u[Number(d[this.state.transformIndex.key])] = d, u), {});
+      n.forEach((u, d) => {
+        u && (vt(u, this.dataContext), l[d] ? (r.push({
           type: "update",
           data: {
-            ...l,
+            ...u,
             [this.state.sourceRecordId.key]: a,
             [this.state.transformIndex.key]: d
           },
-          affectedId: u[d].id
-        }), delete u[d]) : r.push({
+          affectedId: l[d].id
+        }), delete l[d]) : r.push({
           type: "insert",
           data: {
-            ...l,
+            ...u,
             [this.state.sourceRecordId.key]: a,
             [this.state.transformIndex.key]: d
           }
         }));
-      }), Object.values(u).forEach((l) => {
+      }), Object.values(l).forEach((u) => {
         r.push({
           type: "delete",
-          affectedId: l.id
+          affectedId: u.id
         });
       });
     }
@@ -9618,7 +9670,7 @@ class Qn extends ze {
     super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.sumFieldPath = Yt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "global";
@@ -9648,7 +9700,7 @@ class jn extends Ge {
     super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.sumFieldPath = Yt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "property";
@@ -9685,7 +9737,7 @@ class Kn extends ze {
     super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.avgFieldPath = Yt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
   }
   static {
-    this.computationType = lt;
+    this.computationType = ut;
   }
   static {
     this.contextType = "global";
@@ -9724,7 +9776,7 @@ class Wn extends Ge {
     super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.avgFieldPath = Yt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
   }
   static {
-    this.computationType = lt;
+    this.computationType = ut;
   }
   static {
     this.contextType = "property";
@@ -9772,37 +9824,37 @@ class Zt {
         const [n, o] = a, c = {
           controller: this.controller,
           state: this.state,
-          getState: (u) => this.state[u]
+          getState: (l) => this.state[l]
         };
         return await this.computeCallback.call(c, n, o);
       }
     }), t.incrementalCompute && (this.incrementalComputeCallback = t.incrementalCompute, this.incrementalCompute = async (...a) => {
       if (this.incrementalComputeCallback) {
-        const [n, o, c, u] = a, l = {
+        const [n, o, c, l] = a, u = {
           controller: this.controller,
           state: this.state,
           getState: (d) => this.state[d]
         };
-        return await this.incrementalComputeCallback.call(l, n, o, c, u);
+        return await this.incrementalComputeCallback.call(u, n, o, c, l);
       }
       return U.fullRecompute("No incrementalCompute defined");
     }), t.incrementalPatchCompute && (this.incrementalPatchComputeCallback = t.incrementalPatchCompute, this.incrementalPatchCompute = async (...a) => {
       if (this.incrementalPatchComputeCallback) {
-        const [n, o, c, u] = a, l = {
+        const [n, o, c, l] = a, u = {
           controller: this.controller,
           state: this.state,
           getState: (d) => this.state[d]
         };
-        return await this.incrementalPatchComputeCallback.call(l, n, o, c, u);
+        return await this.incrementalPatchComputeCallback.call(u, n, o, c, l);
       }
     }), t.createState && (this.createStateCallback = t.createState), t.getInitialValue && (this.getInitialValueCallback = t.getInitialValue), t.asyncReturn && (this.asyncReturnCallback = t.asyncReturn, this.asyncReturn = async (...a) => {
       if (this.asyncReturnCallback) {
-        const [n, o, c] = a, u = {
+        const [n, o, c] = a, l = {
           controller: this.controller,
           state: this.state,
-          getState: (l) => this.state[l]
+          getState: (u) => this.state[u]
         };
-        return await this.asyncReturnCallback.call(u, n, o, c);
+        return await this.asyncReturnCallback.call(l, n, o, c);
       }
     }), (t.incrementalCompute || t.incrementalPatchCompute) && !t.planIncremental && !t.incrementalDataDeps)
       throw new z("Custom incremental computation must declare planIncremental or incrementalDataDeps", {
@@ -10133,7 +10185,7 @@ function ca(s) {
 function cs(s, e) {
   return `computation:property:${s}.${e}:ScopedSequence`;
 }
-const li = "_ASYNC_TASK_";
+const ui = "_ASYNC_TASK_";
 class Bt {
   constructor(e, t, i, r, a) {
     this.controller = e, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.registeredMutationListeners = [], this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.scopedSequenceScopeGuards = [], this.propagationContext = new Ai(), this.plainValuePropertyNamesBySource = /* @__PURE__ */ new WeakMap(), this.sourceMapManager = new zr(this.controller, this), this.buildComputationHandleMap(a);
@@ -10150,16 +10202,16 @@ class Bt {
         c.computation && n.push({ dataContext: { type: "property", host: o, id: c }, args: c.computation });
       });
     }), i.forEach((o) => {
-      o.properties?.forEach((u) => {
-        u.computation && n.push({ dataContext: { type: "property", host: o, id: u }, args: u.computation });
+      o.properties?.forEach((l) => {
+        l.computation && n.push({ dataContext: { type: "property", host: o, id: l }, args: l.computation });
       });
     });
     for (const o of n) {
-      const c = o.dataContext, u = o.args, l = this.computationHandleMap.get(u.constructor);
-      _(!!l, `cannot find Computation handle map for ${u.constructor.displayName || u.constructor.name}`);
-      const d = l[c.type];
-      _(!!d, `cannot find Computation handle for ${u.constructor.displayName || u.constructor.name} with context type ${c.type}`);
-      const h = new d(this.controller, u, c);
+      const c = o.dataContext, l = o.args, u = this.computationHandleMap.get(l.constructor);
+      _(!!u, `cannot find Computation handle map for ${l.constructor.displayName || l.constructor.name}`);
+      const d = u[c.type];
+      _(!!d, `cannot find Computation handle for ${l.constructor.displayName || l.constructor.name} with context type ${c.type}`);
+      const h = new d(this.controller, l, c);
       if (this.computationsHandles.set(c.id, h), this.isAsyncComputation(h)) {
         const m = this.getAsyncTaskRecordKey(h);
         if (h.dataContext.type === "property") {
@@ -10411,12 +10463,12 @@ class Bt {
       for (const o of t.scope || []) {
         const c = o.path.split(".")[0];
         if (o.type === "ref") {
-          const u = this.controller.relations.find(
-            (l) => l.source?.name === r && l.sourceProperty === c || l.target?.name === r && l.targetProperty === c
+          const l = this.controller.relations.find(
+            (u) => u.source?.name === r && u.sourceProperty === c || u.target?.name === r && u.targetProperty === c
           );
-          u ? n.set(c, {
-            relationName: u.name,
-            hostIsSource: u.source?.name === r && u.sourceProperty === c
+          l ? n.set(c, {
+            relationName: l.name,
+            hostIsSource: l.source?.name === r && l.sourceProperty === c
           }) : a.push(c);
         } else
           a.push(c);
@@ -10649,8 +10701,8 @@ class Bt {
   getAsyncTaskRecordKey(e) {
     if (e.dataContext.type === "property") {
       const t = e.dataContext;
-      return `${li}_${t.host.name}_${t.id.name}`;
-    } else return e.dataContext.type === "global" ? `${li}_${e.dataContext.id.name}` : `${li}_${e.dataContext.type}_${e.dataContext.id?.name}`;
+      return `${ui}_${t.host.name}_${t.id.name}`;
+    } else return e.dataContext.type === "global" ? `${ui}_${e.dataContext.id.name}` : `${ui}_${e.dataContext.type}_${e.dataContext.id?.name}`;
   }
   getComputationName(e) {
     return e.args.name || e.args.constructor.displayName;
@@ -10775,7 +10827,7 @@ class Bt {
         requiresFullRecompute: !0,
         reason: "records match over related path requires full recompute"
       };
-    const i = this.getPlainValuePropertyNames(e.source), r = t.oldRecord, a = t.type === "update" ? { ...t.oldRecord || {}, ...t.record || {} } : t.record, n = t.type === "create" ? !1 : this.evaluateRecordsMatch(e.match, r, i), o = t.type === "delete" ? !1 : this.evaluateRecordsMatch(e.match, a, i);
+    const i = this.getPlainValuePropertyNames(e.source), r = t.type === "delete" ? t.record : t.oldRecord, a = t.type === "update" ? { ...t.oldRecord || {}, ...t.record || {} } : t.record, n = t.type === "create" ? !1 : this.evaluateRecordsMatch(e.match, r, i), o = t.type === "delete" ? !1 : this.evaluateRecordsMatch(e.match, a, i);
     return n === void 0 || o === void 0 ? {
       membershipChange: "unknown",
       requiresFullRecompute: !0,
@@ -10799,15 +10851,15 @@ class Bt {
     };
   }
   buildDataDepEventContext(e, t) {
-    const i = Object.entries(e.dataDeps || {}).find(([, d]) => d === t.dataDep), r = i?.[0], a = i?.[1], n = new Set(e.primaryDataDepKeys || []), o = r === void 0 ? "unknown" : r === "_self" ? "self" : n.has(r) ? "primary" : "external", c = this.hasUnsafeRecordsModifier(a), u = this.buildMatchEventContext(a, t), l = !!(c || u.requiresFullRecompute);
+    const i = Object.entries(e.dataDeps || {}).find(([, d]) => d === t.dataDep), r = i?.[0], a = i?.[1], n = new Set(e.primaryDataDepKeys || []), o = r === void 0 ? "unknown" : r === "_self" ? "self" : n.has(r) ? "primary" : "external", c = this.hasUnsafeRecordsModifier(a), l = this.buildMatchEventContext(a, t), u = !!(c || l.requiresFullRecompute);
     return {
       depKey: r,
       dep: a,
       depRole: o,
-      membershipChange: c ? "maybe" : u.membershipChange || "none",
-      requiresFullRecompute: l,
-      skip: u.skip,
-      reason: c ? `records data dependency ${r} has modifier membership risk` : u.reason
+      membershipChange: c ? "maybe" : l.membershipChange || "none",
+      requiresFullRecompute: u,
+      skip: l.skip,
+      reason: c ? `records data dependency ${r} has modifier membership risk` : l.reason
     };
   }
   normalizeLastValuePolicy(e) {
@@ -10888,7 +10940,7 @@ class Bt {
         });
       return { mode: "full", result: await e.compute(h, i) };
     }
-    const c = this.normalizePlanDataDepKeys(e, o.dataDepKeys), u = await this.resolveSelectedDataDeps(e, i, c), l = await this.resolvePlannedLastValue(e, i, o, n), d = e.incrementalCompute ? await e.incrementalCompute(l, t, i, u) : await e.incrementalPatchCompute(l, t, i, u);
+    const c = this.normalizePlanDataDepKeys(e, o.dataDepKeys), l = await this.resolveSelectedDataDeps(e, i, c), u = await this.resolvePlannedLastValue(e, i, o, n), d = e.incrementalCompute ? await e.incrementalCompute(u, t, i, l) : await e.incrementalPatchCompute(u, t, i, l);
     if (d instanceof Gr) {
       if (this.controller.system.storage.getTransactionIsolation() !== "SERIALIZABLE")
         throw new de(`full recompute ${e.args.name || e.args.constructor.displayName}`);
@@ -11011,7 +11063,7 @@ class Bt {
             return;
           a = c.result, n = c.mode;
         } else if (r || !e.incrementalCompute && !e.incrementalPatchCompute) {
-          const c = e, u = c.dataDeps ? await this.resolveAllDataDeps(c, i) : {};
+          const c = e, l = c.dataDeps ? await this.resolveAllDataDeps(c, i) : {};
           if (!c.compute)
             throw new V("compute must be defined for full computation", {
               handleName: e.constructor.name,
@@ -11019,18 +11071,18 @@ class Bt {
               dataContext: e.dataContext,
               computationPhase: "full-compute"
             });
-          a = await c.compute(u, i), n = "full";
+          a = await c.compute(l, i), n = "full";
         } else if (e.incrementalCompute) {
           let c;
           if (e.useLastValue)
             try {
               c = await this.controller.retrieveLastValue(e.dataContext, i);
-            } catch (u) {
+            } catch (l) {
               throw new ci("Failed to retrieve last value for incremental computation", {
                 handleName: e.constructor.name,
                 computationName: e.args.constructor.displayName,
                 dataContext: e.dataContext,
-                causedBy: u instanceof Error ? u : new Error(String(u))
+                causedBy: l instanceof Error ? l : new Error(String(l))
               });
             }
           a = await e.incrementalCompute(c, t, i, {}), n = "incremental";
@@ -11039,12 +11091,12 @@ class Bt {
           if (e.useLastValue)
             try {
               c = await this.controller.retrieveLastValue(e.dataContext, i);
-            } catch (u) {
+            } catch (l) {
               throw new ci("Failed to retrieve last value for incremental patch computation", {
                 handleName: e.constructor.name,
                 computationName: e.args.constructor.displayName,
                 dataContext: e.dataContext,
-                causedBy: u instanceof Error ? u : new Error(String(u))
+                causedBy: l instanceof Error ? l : new Error(String(l))
               });
             }
           a = await e.incrementalPatchCompute(c, t, i, {}), n = "patch";
@@ -11199,14 +11251,14 @@ class Bt {
   }
 }
 const Vi = new Or();
-function us() {
+function ls() {
   return Vi.getStore()?.effects;
 }
 function Er(s) {
   const e = Vi.getStore();
   e?.effects && e.effects.push(...s);
 }
-const ls = new Or(), _i = "_MigrationManifest_", Bi = "current", Pt = "3", ei = "_isDeleted_";
+const us = new Or(), _i = "_MigrationManifest_", Bi = "current", Pt = "3", ei = "_isDeleted_";
 class C extends Error {
   constructor(e, t) {
     super(e), this.details = t, this.name = new.target.name;
@@ -11222,7 +11274,7 @@ class Ui extends C {
 }
 class he extends C {
 }
-class ua extends C {
+class la extends C {
 }
 function Ne(s) {
   return Lr("sha256").update(fe(s)).digest("hex");
@@ -11262,25 +11314,25 @@ function hs(s) {
   for (const t of s) {
     const i = `${t.kind}:${t.namePath}`;
     if (e.get(i))
-      throw new ua(`Migration identity is ambiguous for ${t.namePath}`);
+      throw new la(`Migration identity is ambiguous for ${t.namePath}`);
     e.set(i, t);
   }
 }
 function L(s) {
   return s.type === "property" ? `property:${s.host.name}.${s.id.name}` : `${s.type}:${s.id.name}`;
 }
-function la(s) {
+function ua(s) {
   const e = s.constructor?.computationType?.displayName || s.args._type || s.args.constructor?.displayName || s.constructor?.displayName;
   if (!e) {
     const t = s.dataContext ? ` for ${L(s.dataContext)}` : "";
-    throw new ua(
+    throw new la(
       `Cannot derive a stable migration identity${t}: the computation type must declare an explicit name. Set a static 'displayName' on the computation type (or handle class), or an '_type' string on the computation args. Class names are not accepted because minified builds rewrite them.`
     );
   }
   return e;
 }
 function yt(s) {
-  return `computation:${L(s.dataContext)}:${la(s)}`;
+  return `computation:${L(s.dataContext)}:${ua(s)}`;
 }
 function ps(s) {
   if (s.allocation?.kind !== "scoped-sequence" || !s.allocation.initializeFrom) return;
@@ -11432,8 +11484,8 @@ function Rs(s) {
   return Ne(Ti(s));
 }
 function vs(s, e = !1) {
-  const t = s.args, i = ys(s), r = gs(s), a = bs(s), n = a.map((S) => S.key), o = yt(s), c = L(s.dataContext), u = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, l = la(s), d = xe("computation", o, s.args.uuid), h = ws(t, e), m = Rs(t), { allocation: f, scopeSignature: p, allocationSignature: y } = ca(t), b = Ne({
-    type: l,
+  const t = s.args, i = ys(s), r = gs(s), a = bs(s), n = a.map((S) => S.key), o = yt(s), c = L(s.dataContext), l = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, u = ua(s), d = xe("computation", o, s.args.uuid), h = ws(t, e), m = Rs(t), { allocation: f, scopeSignature: p, allocationSignature: y } = ca(t), b = Ne({
+    type: u,
     dataContext: c,
     dataDeps: i,
     eventDeps: r,
@@ -11442,9 +11494,9 @@ function vs(s, e = !1) {
     hasIncrementalCompute: typeof s.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof s.incrementalPatchCompute == "function"
   }), g = Ne({ stateKeys: n, boundStates: a }), w = Ne({
-    type: l,
+    type: u,
     dataContext: c,
-    outputRecord: u,
+    outputRecord: l,
     outputProperty: s.dataContext.type === "property" ? s.dataContext.id.name : void 0,
     deps: i,
     eventDeps: r,
@@ -11461,9 +11513,9 @@ function vs(s, e = !1) {
   return {
     id: o,
     identity: d,
-    type: l,
+    type: u,
     dataContext: c,
-    outputRecord: u,
+    outputRecord: l,
     outputProperty: s.dataContext.type === "property" ? s.dataContext.id.name : void 0,
     deps: i.map((S) => ({ type: String(S.type), source: S.source, phase: S.phase, attributeQuery: S.attributeQuery })),
     eventDeps: r,
@@ -11471,12 +11523,12 @@ function vs(s, e = !1) {
     boundStates: a,
     asyncReturn: typeof s.asyncReturn == "function",
     owner: s.dataContext.type === "entity" || s.dataContext.type === "relation" ? "exclusive" : void 0,
-    ownershipProof: u ? {
+    ownershipProof: l ? {
       kind: "computed-output",
       owner: "exclusive",
       ownerComputationId: o,
       dataContext: c,
-      outputRecord: u
+      outputRecord: l
     } : void 0,
     outputSignature: b,
     stateSignature: g,
@@ -11491,15 +11543,15 @@ function vs(s, e = !1) {
 }
 function Et(s, e = s.system.storage.schema, t = {}) {
   const i = [
-    ...s.entities.map((l) => {
-      const d = xe("entity", `entity:${l.name}`, l.uuid);
+    ...s.entities.map((u) => {
+      const d = xe("entity", `entity:${u.name}`, u.uuid);
       return {
         id: Ve(d),
         identity: d,
-        name: l.name,
+        name: u.name,
         kind: "entity",
-        properties: (l.properties || []).map((h) => {
-          const m = xe("property", `property:${l.name}.${h.name}`, h.uuid);
+        properties: (u.properties || []).map((h) => {
+          const m = xe("property", `property:${u.name}.${h.name}`, h.uuid);
           return {
             id: Ve(m),
             identity: m,
@@ -11511,15 +11563,15 @@ function Et(s, e = s.system.storage.schema, t = {}) {
         })
       };
     }),
-    ...s.relations.map((l) => {
-      const d = xe("relation", `relation:${l.name}`, l.uuid);
+    ...s.relations.map((u) => {
+      const d = xe("relation", `relation:${u.name}`, u.uuid);
       return {
         id: Ve(d),
         identity: d,
-        name: l.name,
+        name: u.name,
         kind: "relation",
-        properties: (l.properties || []).map((h) => {
-          const m = xe("property", `property:${l.name}.${h.name}`, h.uuid);
+        properties: (u.properties || []).map((h) => {
+          const m = xe("property", `property:${u.name}.${h.name}`, h.uuid);
           return {
             id: Ve(m),
             identity: m,
@@ -11531,45 +11583,45 @@ function Et(s, e = s.system.storage.schema, t = {}) {
         })
       };
     })
-  ], r = s.relations.map((l) => {
-    const d = xe("relation", `relation:${l.name}`, l.uuid);
+  ], r = s.relations.map((u) => {
+    const d = xe("relation", `relation:${u.name}`, u.uuid);
     return {
       id: Ve(d),
       identity: d,
-      name: l.name,
-      source: l.source.name,
-      target: l.target.name,
-      sourceProperty: l.sourceProperty,
-      targetProperty: l.targetProperty,
-      type: l.type
+      name: u.name,
+      source: u.source.name,
+      target: u.target.name,
+      sourceProperty: u.sourceProperty,
+      targetProperty: u.targetProperty,
+      type: u.type
     };
-  }), a = s.dict.map((l) => {
-    const d = xe("dictionary", `dictionary:${l.name}`, l.uuid);
+  }), a = s.dict.map((u) => {
+    const d = xe("dictionary", `dictionary:${u.name}`, u.uuid);
     return {
       id: Ve(d),
       identity: d,
-      name: l.name,
-      type: l.type,
-      collection: l.collection === !0,
-      computed: !!l.computation
+      name: u.name,
+      type: u.type,
+      collection: u.collection === !0,
+      computed: !!u.computation
     };
-  }), n = Array.from(s.scheduler.computationsHandles.values()).map((l) => vs(l, t.includeFunctionText === !0)), o = fs(n);
+  }), n = Array.from(s.scheduler.computationsHandles.values()).map((u) => vs(u, t.includeFunctionText === !0)), o = fs(n);
   hs([
-    ...i.flatMap((l) => [l.identity, ...l.properties.map((d) => d.identity)]),
-    ...a.map((l) => l.identity),
-    ...n.map((l) => l.identity)
+    ...i.flatMap((u) => [u.identity, ...u.properties.map((d) => d.identity)]),
+    ...a.map((u) => u.identity),
+    ...n.map((u) => u.identity)
   ]);
-  const c = n.map((l) => ({
-    ...l,
-    functionSignature: l.functionSignature ? {
-      ...l.functionSignature,
+  const c = n.map((u) => ({
+    ...u,
+    functionSignature: u.functionSignature ? {
+      ...u.functionSignature,
       text: void 0
     } : void 0
-  })), u = Ei({ records: i, relations: r, dictionaries: a, computations: c, sequences: o, storage: e });
+  })), l = Ei({ records: i, relations: r, dictionaries: a, computations: c, sequences: o, storage: e });
   return {
     version: 2,
     frameworkVersion: Pt,
-    modelHash: Ne(u),
+    modelHash: Ne(l),
     records: i,
     relations: r,
     dictionaries: a,
@@ -11637,16 +11689,16 @@ function fa(s, e, t) {
   if (i.startsWith("property:")) {
     const r = i.match(/^property:([^.]*)\.([^.]*)$/);
     if (!r) return !1;
-    const [, a, n] = r, o = s.records.find((d) => d.name === a), c = e.records.find((d) => d.name === a), u = o?.properties.find((d) => d.name === n), l = c?.properties.find((d) => d.name === n);
-    return u?.computed === !1 && l?.computed === !0;
+    const [, a, n] = r, o = s.records.find((d) => d.name === a), c = e.records.find((d) => d.name === a), l = o?.properties.find((d) => d.name === n), u = c?.properties.find((d) => d.name === n);
+    return l?.computed === !1 && u?.computed === !0;
   }
   if (i.startsWith("entity:") || i.startsWith("relation:")) {
-    const [r, a] = i.split(":"), n = s.records.find((l) => l.kind === r && l.name === a), o = e.records.find((l) => l.kind === r && l.name === a);
+    const [r, a] = i.split(":"), n = s.records.find((u) => u.kind === r && u.name === a), o = e.records.find((u) => u.kind === r && u.name === a);
     if (!n || !o) return !1;
-    const c = s.computations.some((l) => l.dataContext === i), u = e.computations.some(
-      (l) => l.id === t.id && l.dataContext === i && l.ownershipProof?.kind === "computed-output"
+    const c = s.computations.some((u) => u.dataContext === i), l = e.computations.some(
+      (u) => u.id === t.id && u.dataContext === i && u.ownershipProof?.kind === "computed-output"
     );
-    return !c && u;
+    return !c && l;
   }
   return !1;
 }
@@ -11684,20 +11736,20 @@ async function ks(s, e, t, i) {
     if (!$s(o)) continue;
     const c = o.logicalPath;
     if (i.storage.records.some((h) => h.recordName === c) || !wa(t, i, c) || await Es(s, t, c) !== 0) continue;
-    const l = o.oldPhysicalPath;
+    const u = o.oldPhysicalPath;
     r.add(c);
     const d = "empty fact record was removed from the new schema and requires explicit approval before cleanup";
     a.set(`empty-fact-record-removal:${c}`, {
       kind: "empty-fact-record-removal",
       id: `empty-fact-record-removal:${c}`,
       recordName: c,
-      tableName: l,
+      tableName: u,
       expectedCount: 0,
       reason: d
     }), n.set(`empty-fact-record-removal:${c}`, {
       kind: "empty-fact-record-removal",
       recordName: c,
-      tableName: l,
+      tableName: u,
       expectedCount: 0,
       reason: d
     });
@@ -11719,8 +11771,8 @@ async function Ts(s, e, t, i, r) {
     if (o.kind !== "computation" || o.recommendation !== "needs-review" || !e.requiredDecisions.find(
       (h) => h.kind === "computation" && h.id === o.id && h.recommendedDecision === "unrebuildable"
     )) continue;
-    const u = i.computations.find((h) => h.id === o.id), l = u ? ms(u) : void 0;
-    !l || (await Qt(s, t, l.hostRecord, ["id"], r)).length !== 0 || (a.set(re(l), l), n = !0);
+    const l = i.computations.find((h) => h.id === o.id), u = l ? ms(l) : void 0;
+    !u || (await Qt(s, t, u.hostRecord, ["id"], r)).length !== 0 || (a.set(re(u), u), n = !0);
   }
   return n && (e.requiredDecisions = Array.from(a.values()), e.summary = {
     ...e.summary,
@@ -11786,10 +11838,10 @@ async function Ra(s, e, t, i) {
   if (e.startsWith("property:")) {
     const n = e.match(/^property:([^.]*)\.([^.]*)$/);
     if (!n) throw new C(`Invalid property data context for computation takeover: ${e}`);
-    const [, o, c] = n, u = await Qt(s, t, o, ["id", c], i);
+    const [, o, c] = n, l = await Qt(s, t, o, ["id", c], i);
     return {
-      expectedExistingCount: u.filter((l) => l[c] !== void 0 && l[c] !== null).length,
-      expectedHostCount: u.length
+      expectedExistingCount: l.filter((u) => u[c] !== void 0 && u[c] !== null).length,
+      expectedHostCount: l.length
     };
   }
   const [, r] = e.split(":"), a = await Qt(s, t, r, ["id"], i);
@@ -11802,17 +11854,17 @@ async function Is(s, e, t, i, r) {
   const a = new Map(e.changes.map((c) => [ji(c), c])), n = new Map(e.requiredDecisions.map((c) => [re(c), c])), o = new Map(e.safety.destructiveScopes.map((c) => [`${c.dataContext}:${c.recordName || ""}`, c]));
   for (const c of i.computations) {
     if (!fa(t, i, c)) continue;
-    const u = ya(c.dataContext), l = await Ra(s, c.dataContext, t, r), d = {
+    const l = ya(c.dataContext), u = await Ra(s, c.dataContext, t, r), d = {
       kind: "computation-takeover",
       dataContext: c.dataContext,
       computationId: c.id,
-      targetType: u,
+      targetType: l,
       previousAuthority: "fact",
       nextAuthority: "computation",
       oldDataStrategy: "discard-and-rebuild",
-      expectedExistingCount: l.expectedExistingCount,
-      expectedHostCount: l.expectedHostCount,
-      destructiveScopeRef: u === "property" ? void 0 : `${c.dataContext}:${c.outputRecord || c.dataContext.split(":")[1]}`,
+      expectedExistingCount: u.expectedExistingCount,
+      expectedHostCount: u.expectedHostCount,
+      destructiveScopeRef: l === "property" ? void 0 : `${c.dataContext}:${c.outputRecord || c.dataContext.split(":")[1]}`,
       reason: `${c.dataContext} changes from fact authority to computation authority and existing output must be discarded before rebuild`
     };
     if (a.set(`computation-takeover:${c.dataContext}`, {
@@ -11820,20 +11872,20 @@ async function Is(s, e, t, i, r) {
       id: `computation-takeover:${c.dataContext}`,
       dataContext: c.dataContext,
       computationId: c.id,
-      targetType: u,
+      targetType: l,
       previousAuthority: "fact",
       nextAuthority: "computation",
-      expectedExistingCount: l.expectedExistingCount,
-      expectedHostCount: l.expectedHostCount,
+      expectedExistingCount: u.expectedExistingCount,
+      expectedHostCount: u.expectedHostCount,
       reason: d.reason
-    }), n.set(re(d), d), u !== "property") {
+    }), n.set(re(d), d), l !== "property") {
       const h = c.outputRecord || c.dataContext.split(":")[1], m = `${c.dataContext}:${h}`;
       if (!o.has(m)) {
         const f = {
           dataContext: c.dataContext,
           recordName: h,
-          ids: l.ids || [],
-          count: l.expectedExistingCount,
+          ids: u.ids || [],
+          count: u.expectedExistingCount,
           reason: "fact output records will be discarded during computation takeover"
         };
         o.set(m, f), n.set(re({ kind: "destructive-scope", ...f }), {
@@ -11863,9 +11915,9 @@ async function Is(s, e, t, i, r) {
   }, e;
 }
 function Ps(s, e, t, i) {
-  const r = [], a = [], n = new Map(s.computations.map((p) => [p.id, p])), o = new Map(e.computations.map((p) => [p.id, p])), c = new Map(s.records.map((p) => [p.id, p])), u = new Map(e.records.map((p) => [p.id, p])), l = new Map(s.relations.map((p) => [p.id, p])), d = new Map(e.relations.map((p) => [p.id, p])), h = new Map((s.dictionaries || []).map((p) => [p.id, p])), m = new Map((e.dictionaries || []).map((p) => [p.id, p]));
+  const r = [], a = [], n = new Map(s.computations.map((p) => [p.id, p])), o = new Map(e.computations.map((p) => [p.id, p])), c = new Map(s.records.map((p) => [p.id, p])), l = new Map(e.records.map((p) => [p.id, p])), u = new Map(s.relations.map((p) => [p.id, p])), d = new Map(e.relations.map((p) => [p.id, p])), h = new Map((s.dictionaries || []).map((p) => [p.id, p])), m = new Map((e.dictionaries || []).map((p) => [p.id, p]));
   for (const p of s.records)
-    u.has(p.id) || r.push({
+    l.has(p.id) || r.push({
       kind: "record",
       id: p.id,
       changeType: "removed",
@@ -11922,7 +11974,7 @@ function Ps(s, e, t, i) {
       reason: "relation no longer exists in the new model"
     });
   for (const p of e.relations) {
-    const y = l.get(p.id);
+    const y = u.get(p.id);
     y ? (y.name !== p.name || y.source !== p.source || y.target !== p.target || y.sourceProperty !== p.sourceProperty || y.targetProperty !== p.targetProperty || y.type !== p.type) && r.push({
       kind: "relation",
       id: p.id,
@@ -12066,20 +12118,20 @@ function Ms(s, e, t) {
     if (!n || n.args?._type === "ScopedSequence") continue;
     const o = typeof n.eventDeps == "object", c = typeof n.compute != "function";
     if (o || c) {
-      const u = {
+      const l = {
         kind: "event-rebuild-handler",
         dataContext: a.dataContext,
         reason: o ? "event-based computation needs an external migration rebuild handler" : "computation without full compute support needs an external migration rebuild handler"
       };
-      r.set(re(u), u);
+      r.set(re(l), l);
     }
     if (typeof n.asyncReturn == "function") {
-      const u = {
+      const l = {
         kind: "async-completion-handler",
         dataContext: a.dataContext,
         reason: "async computation needs an external migration completion handler"
       };
-      r.set(re(u), u);
+      r.set(re(l), l);
     }
   }
   return s.requiredDecisions = Array.from(r.values()), s.summary = {
@@ -12099,12 +12151,12 @@ function qs(s, e, t, i, r) {
   const a = r || s, n = new Set(s.requiredDecisions.map(re)), o = /* @__PURE__ */ new Set([
     ...a.requiredDecisions.map(re),
     ...n
-  ]), c = new Set(a.changes.map(ji)), u = /* @__PURE__ */ new Set();
+  ]), c = new Set(a.changes.map(ji)), l = /* @__PURE__ */ new Set();
   for (const d of s.decisions) {
     const h = Ss(d);
-    if (u.has(h))
+    if (l.has(h))
       throw new C(`Duplicate migration decision: ${h}`);
-    if (u.add(h), d.kind === "computation" && !c.has(`computation:${d.id}`))
+    if (l.add(h), d.kind === "computation" && !c.has(`computation:${d.id}`))
       throw new C(`Migration decision references a computation that is not present in the approved diff: ${d.id}`);
     if (d.kind === "computation-takeover") {
       if (!o.has(h))
@@ -12186,36 +12238,36 @@ function qs(s, e, t, i, r) {
       throw new C(`Migration rename candidate decision does not match any Phase 1.5 executable review item: ${d.from} -> ${d.to}`);
   }
   for (const d of a.requiredDecisions)
-    if (!u.has(re(d)))
+    if (!l.has(re(d)))
       throw new C(`Missing migration decision for required review item: ${re(d)}`);
-  const l = new Set(t.computations.map((d) => d.id));
+  const u = new Set(t.computations.map((d) => d.id));
   for (const d of s.decisions)
-    if (d.kind === "computation" && !l.has(d.id))
+    if (d.kind === "computation" && !u.has(d.id))
       throw new C(`Migration decision references unknown computation: ${d.id}`);
 }
 function Ds(s, e, t) {
-  const i = [], r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set(), n = new Map(e.computations.map((l) => [l.id, l])), o = (l) => t.decisions.some(
-    (d) => d.kind === "scoped-sequence-seed" && d.id === l.id && l.allocation?.kind === "scoped-sequence" && l.allocation.initializeFrom
-  ), c = (l) => t.decisions.some(
-    (d) => d.kind === "scoped-sequence-no-seed" && d.id === l.id && l.allocation?.kind === "scoped-sequence" && !l.allocation.initializeFrom
+  const i = [], r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set(), n = new Map(e.computations.map((u) => [u.id, u])), o = (u) => t.decisions.some(
+    (d) => d.kind === "scoped-sequence-seed" && d.id === u.id && u.allocation?.kind === "scoped-sequence" && u.allocation.initializeFrom
+  ), c = (u) => t.decisions.some(
+    (d) => d.kind === "scoped-sequence-no-seed" && d.id === u.id && u.allocation?.kind === "scoped-sequence" && !u.allocation.initializeFrom
   );
-  for (const l of t.decisions) {
-    if (l.kind !== "computation") continue;
-    const d = n.get(l.id);
-    d && l.decision !== "unrebuildable" && ((l.decision === "changed" || l.decision === "state-only") && i.push(d), l.decision === "changed" && r.add(l.id), l.decision === "state-only" && a.add(l.id));
+  for (const u of t.decisions) {
+    if (u.kind !== "computation") continue;
+    const d = n.get(u.id);
+    d && u.decision !== "unrebuildable" && ((u.decision === "changed" || u.decision === "state-only") && i.push(d), u.decision === "changed" && r.add(u.id), u.decision === "state-only" && a.add(u.id));
   }
-  for (const l of e.computations)
-    if (!s.computations.some((d) => d.id === l.id) && !i.some((d) => d.id === l.id)) {
+  for (const u of e.computations)
+    if (!s.computations.some((d) => d.id === u.id) && !i.some((d) => d.id === u.id)) {
       if (t.decisions.some(
-        (h) => h.kind === "computation" && h.id === l.id && h.decision === "unrebuildable"
-      ) && (o(l) || c(l))) continue;
-      throw new C(`New computation requires approved changed decision: ${l.id}`);
+        (h) => h.kind === "computation" && h.id === u.id && h.decision === "unrebuildable"
+      ) && (o(u) || c(u))) continue;
+      throw new C(`New computation requires approved changed decision: ${u.id}`);
     }
-  const u = t.decisions.filter((l) => l.kind === "computation" && l.decision === "unrebuildable").filter((l) => {
-    const d = n.get(l.id);
+  const l = t.decisions.filter((u) => u.kind === "computation" && u.decision === "unrebuildable").filter((u) => {
+    const d = n.get(u.id);
     return !(d && (o(d) || c(d)));
-  }).map((l) => ({ kind: "unrebuildable-computation", logicalPath: l.dataContext, reason: l.reason }));
-  return { changedComputations: i, outputChangedIds: r, stateOnlyIds: a, blocking: u };
+  }).map((u) => ({ kind: "unrebuildable-computation", logicalPath: u.dataContext, reason: u.reason }));
+  return { changedComputations: i, outputChangedIds: r, stateOnlyIds: a, blocking: l };
 }
 function Os(s) {
   return s.decisions.filter((e) => e.kind === "scoped-sequence-seed").map((e) => ({
@@ -12282,7 +12334,7 @@ function Wi(s, e, t) {
     if (!Array.isArray(i) || typeof i[0] != "string") return [];
     const r = Fs(s, e, i[0]);
     if (!r) return [];
-    const a = r.source === e ? r.target : r.source, n = i[1], c = (Array.isArray(n?.attributeQuery) ? n.attributeQuery : []).flatMap((u) => typeof u == "string" && u !== "*" && u !== v ? [`property:${a}.${u}`] : Array.isArray(u) && u[0] === v ? [`relation:${r.name}`] : Array.isArray(u) ? Wi(s, a, [u]) : []);
+    const a = r.source === e ? r.target : r.source, n = i[1], c = (Array.isArray(n?.attributeQuery) ? n.attributeQuery : []).flatMap((l) => typeof l == "string" && l !== "*" && l !== v ? [`property:${a}.${l}`] : Array.isArray(l) && l[0] === v ? [`relation:${r.name}`] : Array.isArray(l) ? Wi(s, a, [l]) : []);
     return [`relation:${r.name}`, ...c];
   });
 }
@@ -12298,7 +12350,7 @@ function Tr(s, e, t) {
   if (s.type === "property") {
     const i = e.dataContext.match(/^property:([^.]*)\./);
     if (!i) return [];
-    const r = i[1], a = Array.isArray(s.attributeQuery) ? s.attributeQuery : [], n = Wi(t, r, a), c = [...a.filter((u) => typeof u == "string" && u !== "*").map((u) => `property:${r}.${u}`), ...n];
+    const r = i[1], a = Array.isArray(s.attributeQuery) ? s.attributeQuery : [], n = Wi(t, r, a), c = [...a.filter((l) => typeof l == "string" && l !== "*").map((l) => `property:${r}.${l}`), ...n];
     return c.length ? c : jt(t, r);
   }
   return [];
@@ -12324,14 +12376,14 @@ function xr(s, e, t, i = [], r = {}) {
   const c = (g) => {
     const w = g.match(/^property:([^.]*)\._isDeleted_$/);
     return w ? jt(e, w[1]) : [];
-  }, u = /* @__PURE__ */ new Map();
+  }, l = /* @__PURE__ */ new Map();
   for (const g of e.computations)
     for (const w of c(g.dataContext))
-      u.set(w, g);
-  const l = (g) => {
+      l.set(w, g);
+  const u = (g) => {
     const w = [], R = a.get(g);
     R && w.push(R);
-    const S = u.get(g);
+    const S = l.get(g);
     return S && S !== R && w.push(S), w;
   }, d = new Set(t.map((g) => g.id)), m = [...t.filter((g) => {
     const w = n.get(g.id);
@@ -12355,12 +12407,12 @@ function xr(s, e, t, i = [], r = {}) {
     if (w) {
       for (const R of w.deps)
         for (const S of Tr(R, w, e))
-          for (const N of l(S))
+          for (const N of u(S))
             N.id !== g && d.has(N.id) && b(N.id);
       for (const R of w.eventDeps)
         for (const S of Cr(R, e))
           if (S !== w.dataContext)
-            for (const N of l(S))
+            for (const N of u(S))
               N.id !== g && d.has(N.id) && b(N.id);
     }
     f.delete(g), p.add(g), y.push(g);
@@ -12381,51 +12433,51 @@ function di(s, e) {
   return `${s || "?"}.${e || "?"}`;
 }
 function Ar(s, e) {
-  const t = [], i = new Map(s.storage.records.map((u) => [u.recordName, u])), r = new Map(e.storage.records.map((u) => [u.recordName, u])), a = new Map(s.records.map((u) => [u.name, u])), n = new Map(e.records.map((u) => [u.name, u])), o = (u) => u.startsWith("_ASYNC_TASK__"), c = (u) => s.computations.some((l) => l.outputRecord === u);
-  for (const u of s.storage.records)
-    if (!r.has(u.recordName) && !u.isFiltered) {
-      const l = o(u.recordName) ? "framework-generated async task record cleanup is not supported by compute-route schema migration" : c(u.recordName) ? "computed output record physical cleanup is not supported by compute-route schema migration" : "fact record was removed from the new schema";
+  const t = [], i = new Map(s.storage.records.map((l) => [l.recordName, l])), r = new Map(e.storage.records.map((l) => [l.recordName, l])), a = new Map(s.records.map((l) => [l.name, l])), n = new Map(e.records.map((l) => [l.name, l])), o = (l) => l.startsWith("_ASYNC_TASK__"), c = (l) => s.computations.some((u) => u.outputRecord === l);
+  for (const l of s.storage.records)
+    if (!r.has(l.recordName) && !l.isFiltered) {
+      const u = o(l.recordName) ? "framework-generated async task record cleanup is not supported by compute-route schema migration" : c(l.recordName) ? "computed output record physical cleanup is not supported by compute-route schema migration" : "fact record was removed from the new schema";
       t.push({
         kind: "unsupported-destructive-schema-change",
-        logicalPath: u.recordName,
-        oldPhysicalPath: u.tableName,
-        reason: l
+        logicalPath: l.recordName,
+        oldPhysicalPath: l.tableName,
+        reason: u
       });
     }
-  for (const u of e.storage.records) {
-    const l = i.get(u.recordName);
-    if (!l) continue;
-    l.tableName !== u.tableName && t.push({
+  for (const l of e.storage.records) {
+    const u = i.get(l.recordName);
+    if (!u) continue;
+    u.tableName !== l.tableName && t.push({
       kind: "physical-path-move",
-      logicalPath: u.recordName,
-      oldPhysicalPath: l.tableName,
-      newPhysicalPath: u.tableName,
+      logicalPath: l.recordName,
+      oldPhysicalPath: u.tableName,
+      newPhysicalPath: l.tableName,
       reason: "fact record table changed"
     });
-    const d = new Map((l.attributeDetails || []).map((f) => [f.name, f])), h = new Map((u.attributeDetails || []).map((f) => [f.name, f]));
-    a.get(l.recordName), n.get(u.recordName);
+    const d = new Map((u.attributeDetails || []).map((f) => [f.name, f])), h = new Map((l.attributeDetails || []).map((f) => [f.name, f]));
+    a.get(u.recordName), n.get(l.recordName);
     const m = (f, p, y) => y.records.find((g) => g.name === f)?.properties.find((g) => g.name === p)?.computed === !0;
-    for (const f of l.attributeDetails || [])
+    for (const f of u.attributeDetails || [])
       if (!h.get(f.name) && !f.name.startsWith("_")) {
-        const y = m(l.recordName, f.name, s);
+        const y = m(u.recordName, f.name, s);
         t.push({
           kind: "unsupported-destructive-schema-change",
-          logicalPath: `${l.recordName}.${f.name}`,
+          logicalPath: `${u.recordName}.${f.name}`,
           oldPhysicalPath: di(f.tableName, f.fieldName || f.sourceField || f.targetField),
           reason: y ? "computed attribute physical cleanup is not supported by compute-route schema migration" : "fact attribute was removed from the new schema"
         });
       }
-    for (const f of u.attributeDetails || []) {
+    for (const f of l.attributeDetails || []) {
       const p = d.get(f.name);
-      !p || m(l.recordName, f.name, s) || m(u.recordName, f.name, e) || ((p.kind !== f.kind || p.tableName !== f.tableName || p.fieldName !== f.fieldName || p.sourceField !== f.sourceField || p.targetField !== f.targetField) && t.push({
+      !p || m(u.recordName, f.name, s) || m(l.recordName, f.name, e) || ((p.kind !== f.kind || p.tableName !== f.tableName || p.fieldName !== f.fieldName || p.sourceField !== f.sourceField || p.targetField !== f.targetField) && t.push({
         kind: "physical-path-move",
-        logicalPath: `${u.recordName}.${f.name}`,
+        logicalPath: `${l.recordName}.${f.name}`,
         oldPhysicalPath: di(p.tableName, p.fieldName || p.sourceField || p.targetField),
         newPhysicalPath: di(f.tableName, f.fieldName || f.sourceField || f.targetField),
         reason: "fact attribute physical path changed"
       }), (p.type !== f.type || p.fieldType !== f.fieldType || p.collection !== f.collection) && t.push({
         kind: "unsupported-destructive-schema-change",
-        logicalPath: `${u.recordName}.${f.name}`,
+        logicalPath: `${l.recordName}.${f.name}`,
         oldPhysicalPath: `${p.type || "?"}/${p.fieldType || "?"}/${p.collection === !0}`,
         newPhysicalPath: `${f.type || "?"}/${f.fieldType || "?"}/${f.collection === !0}`,
         reason: "fact attribute type, field type, or collection flag changed"
@@ -12449,13 +12501,13 @@ function Qs(s, e, t = {}, i) {
     if (!a.has(o)) continue;
     const c = L(n.dataContext);
     if (n.args._type === "ScopedSequence") {
-      const u = !!n.args.initializeFrom;
-      if (u && Xe(
+      const l = !!n.args.initializeFrom;
+      if (l && Xe(
         t.approvedDiff,
-        (l) => l.kind === "scoped-sequence-seed" && l.id === o && l.dataContext === c
-      ) || !u && Xe(
+        (u) => u.kind === "scoped-sequence-seed" && u.id === o && u.dataContext === c
+      ) || !l && Xe(
         t.approvedDiff,
-        (l) => l.kind === "scoped-sequence-no-seed" && l.id === o && l.dataContext === c
+        (u) => u.kind === "scoped-sequence-no-seed" && u.id === o && u.dataContext === c
       ))
         continue;
       r.push({
@@ -12465,9 +12517,9 @@ function Qs(s, e, t = {}, i) {
       });
       continue;
     }
-    if (n.dataContext.type === "property" && n.dataContext.id.name === ei && !Xe(t.approvedDiff, (u) => u.kind === "destructive-scope" && u.dataContext === c) && r.push({ kind: "destructive-computed-output", logicalPath: c, reason: "destructive computed output requires an approved destructive-scope decision" }), n.asyncReturn && !ma(t, c) && r.push({ kind: "async-computation", logicalPath: c, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (n.dataContext.type === "entity" || n.dataContext.type === "relation") && !n.compute && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "entity/relation output lacks a full compute contract" }), n.dataContext.type === "entity" || n.dataContext.type === "relation") {
-      const u = n.state?.sourceRecordId?.key, l = n.state?.transformIndex?.key;
-      (!u || !l || typeof n.eventDeps == "object") && r.push({
+    if (n.dataContext.type === "property" && n.dataContext.id.name === ei && !Xe(t.approvedDiff, (l) => l.kind === "destructive-scope" && l.dataContext === c) && r.push({ kind: "destructive-computed-output", logicalPath: c, reason: "destructive computed output requires an approved destructive-scope decision" }), n.asyncReturn && !ma(t, c) && r.push({ kind: "async-computation", logicalPath: c, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (n.dataContext.type === "entity" || n.dataContext.type === "relation") && !n.compute && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "entity/relation output lacks a full compute contract" }), n.dataContext.type === "entity" || n.dataContext.type === "relation") {
+      const l = n.state?.sourceRecordId?.key, u = n.state?.transformIndex?.key;
+      (!l || !u || typeof n.eventDeps == "object") && r.push({
         kind: "unrebuildable-computation",
         logicalPath: c,
         reason: "entity/relation output migration requires a data-based Transform with sourceRecordId and transformIndex state"
@@ -12484,18 +12536,18 @@ function Qs(s, e, t = {}, i) {
 async function js(s, e, t, i, r, a, n, o) {
   const c = ga(s);
   if (typeof c?.query != "function" || !e) return;
-  const u = e.storage.records.find((P) => P.recordName === t);
-  if (!u || u.isFiltered || !u.tableName) return;
-  const l = new Map((u.attributeDetails || []).map((P) => [P.name, P])), d = l.get(i);
+  const l = e.storage.records.find((P) => P.recordName === t);
+  if (!l || l.isFiltered || !l.tableName) return;
+  const u = new Map((l.attributeDetails || []).map((P) => [P.name, P])), d = u.get(i);
   if (!d?.fieldName || d.kind !== "value") return;
   const h = r.map((P) => {
-    const A = l.get(P.path);
+    const A = u.get(P.path);
     return A?.fieldName && A.kind === "value" ? { ...P, fieldName: A.fieldName } : void 0;
   });
   if (h.some((P) => !P)) return;
-  const m = Q(c), f = (P) => ce(P, m), p = Hs(o, l, m);
+  const m = Q(c), f = (P) => ce(P, m), p = Hs(o, u, m);
   if (!p) return;
-  const y = f(u.tableName), b = f(d.fieldName), g = p.sql ? ` WHERE ${p.sql}` : "", R = (await c.query(
+  const y = f(l.tableName), b = f(d.fieldName), g = p.sql ? ` WHERE ${p.sql}` : "", R = (await c.query(
     `SELECT COUNT(*) AS ${f("__rowCount")}, COUNT(${b}) AS ${f("__validValueCount")} FROM ${y}${g}`,
     p.params
   ))[0], S = Number(R?.__rowCount ?? 0), N = Number(R?.__validValueCount ?? 0);
@@ -12523,8 +12575,8 @@ async function js(s, e, t, i, r, a, n, o) {
 }
 function Hs(s, e, t) {
   if (s == null) return { sql: "", params: [] };
-  const i = [], r = (l) => ce(l, t), a = () => t.name === "postgres" ? `$${i.length + 1}` : "?", n = (l) => l && typeof l == "object" && "raw" in l ? l.raw : l, o = (l) => l && typeof l == "object" && "id" in l ? l.id : l, c = (l) => {
-    const d = n(l);
+  const i = [], r = (u) => ce(u, t), a = () => t.name === "postgres" ? `$${i.length + 1}` : "?", n = (u) => u && typeof u == "object" && "raw" in u ? u.raw : u, o = (u) => u && typeof u == "object" && "id" in u ? u.id : u, c = (u) => {
+    const d = n(u);
     if (!(!d || typeof d != "object")) {
       if (d.type === "atom") {
         const h = d.data;
@@ -12567,8 +12619,8 @@ function Hs(s, e, t) {
         if (h === "or") return `(${m} OR ${f})`;
       }
     }
-  }, u = c(s);
-  return u === void 0 ? void 0 : { sql: u, params: i };
+  }, l = c(s);
+  return l === void 0 ? void 0 : { sql: l, params: i };
 }
 async function Ks(s, e, t) {
   for (const i of s.scheduler.computationsHandles.values()) {
@@ -12582,7 +12634,7 @@ async function Ks(s, e, t) {
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom requires an approved scoped-sequence-seed migration decision`);
     const o = r.initializeFrom, c = o.record?.name;
     if (!c) throw new Error(`ScopedSequence ${String(r.name)} initializeFrom.record is missing`);
-    const u = n.startsWith("property:") ? n.slice(9) : "", l = u.lastIndexOf("."), d = l >= 0 ? u.slice(0, l) : "", h = l >= 0 ? u.slice(l + 1) : "";
+    const l = n.startsWith("property:") ? n.slice(9) : "", u = l.lastIndexOf("."), d = u >= 0 ? l.slice(0, u) : "", h = u >= 0 ? l.slice(u + 1) : "";
     if (c !== d)
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom.record must match host record ${d}`);
     if (String(o.valuePath) !== h)
@@ -12689,8 +12741,8 @@ async function Gs(s, e, t, i) {
     if (o.type === "global") {
       const c = await i.findOne(Z, E.atom({ key: "key", value: ["=", o.source.name] }), void 0, ["value"]);
       if (c) return [n, c.value?.raw];
-      const u = s.dict.find((l) => l.name === o.source.name);
-      return [n, u?.defaultValue !== void 0 ? u.defaultValue() : void 0];
+      const l = s.dict.find((u) => u.name === o.source.name);
+      return [n, l?.defaultValue !== void 0 ? l.defaultValue() : void 0];
     }
     throw new C(`Unknown data dependency type '${o.type}' for ${L(e.dataContext)}`);
   }));
@@ -12701,41 +12753,41 @@ async function Ci(s, e, t, i) {
     if (s.system.storage.queryHandle)
       return s.system.storage.find(o, void 0, void 0, ["*"]);
     if (!t) return;
-    const u = t.storage.records.find((p) => p.recordName === o), l = u?.tableName, d = (u?.attributeDetails || []).filter((p) => p.kind === "value" && p.fieldName);
-    if (!u || !l || d.length === 0) return;
+    const l = t.storage.records.find((p) => p.recordName === o), u = l?.tableName, d = (l?.attributeDetails || []).filter((p) => p.kind === "value" && p.fieldName);
+    if (!l || !u || d.length === 0) return;
     const h = s.system.storage.db || s.system.db;
     if (typeof h?.query != "function") return;
     const m = (p) => `"${p.replace(/"/g, '""')}"`, f = d.map((p) => `${m(p.fieldName)} AS ${m(p.name)}`).join(", ");
-    return h.query(`SELECT ${f} FROM ${m(l)}`, []);
+    return h.query(`SELECT ${f} FROM ${m(u)}`, []);
   };
   for (const o of e) {
     const c = r.get(o.computationId);
     if (c?.dataContext.type === "property" && c.dataContext.id.name === ei) {
-      const u = c.dataContext.host.name, l = await n(u), d = [];
-      if (l && typeof c.compute == "function")
-        for (const h of l)
+      const l = c.dataContext.host.name, u = await n(l), d = [];
+      if (u && typeof c.compute == "function")
+        for (const h of u)
           await c.compute(
             await Gs(s, c, h, i),
             h
           ) === !0 && d.push(String(h.id));
       a.push({
         dataContext: L(c.dataContext),
-        recordName: u,
+        recordName: l,
         ids: d,
-        count: d.length || l?.length,
+        count: d.length || u?.length,
         reason: "hard deletion computed property may delete host records whose recomputed value is true"
       });
     }
-    if ((c?.dataContext.type === "entity" || c?.dataContext.type === "relation") && t?.storage.records.some((u) => u.recordName === c.dataContext.id.name) && typeof c.compute == "function") {
+    if ((c?.dataContext.type === "entity" || c?.dataContext.type === "relation") && t?.storage.records.some((l) => l.recordName === c.dataContext.id.name) && typeof c.compute == "function") {
       if (!s.system.storage.queryHandle) continue;
-      const u = c.dataContext.id.name, l = c.state?.sourceRecordId?.key, d = c.state?.transformIndex?.key;
-      if (!l || !d) continue;
+      const l = c.dataContext.id.name, u = c.state?.sourceRecordId?.key, d = c.state?.transformIndex?.key;
+      if (!u || !d) continue;
       const h = await c.compute(await s.scheduler.resolveDataDeps(c));
       if (!Array.isArray(h)) continue;
-      const m = new Set(h.map((y) => `${y[l]}:${y[d]}`)), p = (await n(u) || []).filter((y) => !m.has(`${y[l]}:${y[d]}`)).map((y) => String(y.id));
+      const m = new Set(h.map((y) => `${y[u]}:${y[d]}`)), p = (await n(l) || []).filter((y) => !m.has(`${y[u]}:${y[d]}`)).map((y) => String(y.id));
       p.length && a.push({
         dataContext: L(c.dataContext),
-        recordName: u,
+        recordName: l,
         ids: p,
         count: p.length,
         reason: "transform recompute would delete stale derived output records"
@@ -12764,10 +12816,10 @@ async function Ir(s, e, t, i) {
     if (a.expectedHostCount !== void 0 && n.expectedHostCount !== a.expectedHostCount)
       throw new he(`Computation takeover host count mismatch for ${a.dataContext}`);
     if (a.targetType !== "property") {
-      const o = [...n.ids || []].sort().join(","), c = a.dataContext.split(":")[1], u = e.approvedDiff?.decisions.find(
-        (l) => l.kind === "destructive-scope" && l.dataContext === a.dataContext && l.recordName === c
+      const o = [...n.ids || []].sort().join(","), c = a.dataContext.split(":")[1], l = e.approvedDiff?.decisions.find(
+        (u) => u.kind === "destructive-scope" && u.dataContext === a.dataContext && u.recordName === c
       );
-      if (!u || [...u.ids || []].sort().join(",") !== o)
+      if (!l || [...l.ids || []].sort().join(",") !== o)
         throw new he(`Computation takeover destructive scope mismatch for ${a.dataContext}`);
     }
   }
@@ -12822,7 +12874,7 @@ async function Ae(s, e, t, i, r = {}, a = {}) {
     if (!a.skipAsNull || e.dataContext.type !== "property") return;
     const o = e.dataContext;
     if (s.system.storage.schema.constraints.some(
-      (u) => u.kind === "non-null" && u.recordName === o.host.name && u.property === o.id.name
+      (l) => l.kind === "non-null" && l.recordName === o.host.name && l.property === o.id.name
     ))
       throw new C(`Computation takeover cannot keep old value for non-null property ${L(e.dataContext)} when computation returns skip`);
     t = null;
@@ -12840,8 +12892,8 @@ async function Xs(s, e, t, i, r = {}) {
   const a = Array.isArray(t) ? t : [t], n = [];
   for (const o of a) {
     if (!o || typeof o != "object" || !("type" in o)) {
-      const u = await Ae(s, e, o, i, r);
-      u && n.push(u);
+      const l = await Ae(s, e, o, i, r);
+      l && n.push(l);
       continue;
     }
     const c = o;
@@ -12856,8 +12908,8 @@ async function Xs(s, e, t, i, r = {}) {
         keys: c.data && typeof c.data == "object" ? Object.keys(c.data) : void 0
       });
     else {
-      const u = $a(e.dataContext, c.data, void 0, i);
-      u && n.push(u);
+      const l = $a(e.dataContext, c.data, void 0, i);
+      l && n.push(l);
     }
   }
   return n;
@@ -12920,25 +12972,25 @@ async function Ys(s, e, t = {}) {
     }
     return p;
   }
-  const c = await s.system.storage.find(r, void 0, void 0, ["*"]), u = new Map(c.map((d) => [`${d[a]}:${d[n]}`, d])), l = [];
+  const c = await s.system.storage.find(r, void 0, void 0, ["*"]), l = new Map(c.map((d) => [`${d[a]}:${d[n]}`, d])), u = [];
   for (const d of i) {
-    const h = `${d[a]}:${d[n]}`, m = u.get(h);
-    if (u.delete(h), m)
-      rt({ ...m, id: void 0 }, { ...d, id: void 0 }) || (await s.system.storage.update(r, E.atom({ key: "id", value: ["=", m.id] }), d), l.push({ recordName: r, type: "update", record: { ...m, ...d }, oldRecord: m, keys: Object.keys(d) }));
+    const h = `${d[a]}:${d[n]}`, m = l.get(h);
+    if (l.delete(h), m)
+      rt({ ...m, id: void 0 }, { ...d, id: void 0 }) || (await s.system.storage.update(r, E.atom({ key: "id", value: ["=", m.id] }), d), u.push({ recordName: r, type: "update", record: { ...m, ...d }, oldRecord: m, keys: Object.keys(d) }));
     else {
       const f = await s.system.storage.create(r, d);
-      l.push({ recordName: r, type: "create", record: f });
+      u.push({ recordName: r, type: "create", record: f });
     }
   }
-  for (const d of u.values()) {
+  for (const d of l.values()) {
     if (!Ut(
       t.approvedDiff,
       (m) => m.kind === "destructive-scope" && m.dataContext === L(e.dataContext) && m.recordName === r
     )?.ids.map(String).includes(String(d.id)))
       throw new he(`Migration would delete stale derived ${r} record ${d.id}; approve destructive scope before executing`);
-    await s.system.storage.delete(r, E.atom({ key: "id", value: ["=", d.id] })), l.push({ recordName: r, type: "delete", record: d });
+    await s.system.storage.delete(r, E.atom({ key: "id", value: ["=", d.id] })), u.push({ recordName: r, type: "delete", record: d });
   }
-  return l;
+  return u;
 }
 async function Zs(s, e, t = {}, i = [], r) {
   return Ea(t, await Ci(s, e, r)), new eo(s, e, t, i).run();
@@ -12981,27 +13033,27 @@ class eo {
     const t = Hi(this.options.approvedDiff, L(e.dataContext)), i = t?.targetType === "property" ? { forceMutationEvent: !0, skipAsNull: !0 } : {}, r = qt(this.options, L(e.dataContext));
     if (r && typeof e.compute != "function") {
       if (e.dataContext.type === "property") {
-        const l = e.dataContext.host.name, d = await this.controller.system.storage.find(l, void 0, void 0, ["*"]), h = [];
+        const u = e.dataContext.host.name, d = await this.controller.system.storage.find(u, void 0, void 0, ["*"]), h = [];
         for (const m of d) {
           const f = t?.targetType === "property" ? Ye(m, e.dataContext.id.name) : m, p = await r({ controller: this.controller, dataContext: e.dataContext, record: f }), y = await Ae(this.controller, e, p, m, this.options, i);
           y && h.push(y);
         }
         return h;
       }
-      const c = await r({ controller: this.controller, dataContext: e.dataContext }), u = await Ae(this.controller, e, c, void 0, this.options);
-      return u ? [u] : [];
+      const c = await r({ controller: this.controller, dataContext: e.dataContext }), l = await Ae(this.controller, e, c, void 0, this.options);
+      return l ? [l] : [];
     }
     if (e.dataContext.type === "global") {
-      const c = await this.controller.scheduler.resolveDataDeps(e), u = await Ae(this.controller, e, await e.compute(c), void 0, this.options);
-      return u ? [u] : [];
+      const c = await this.controller.scheduler.resolveDataDeps(e), l = await Ae(this.controller, e, await e.compute(c), void 0, this.options);
+      return l ? [l] : [];
     }
     if (e.dataContext.type === "entity" || e.dataContext.type === "relation")
       return Ys(this.controller, e, this.options);
     const a = e.dataContext.host.name, n = await this.controller.system.storage.find(a, void 0, void 0, ["*"]), o = [];
     for (const c of n) {
-      const u = await this.controller.scheduler.resolveDataDeps(e, c), l = t?.targetType === "property" ? Ye(c, e.dataContext.id.name) : c, d = t?.targetType === "property" ? Ye(u, e.dataContext.id.name) : u, h = await e.compute(
+      const l = await this.controller.scheduler.resolveDataDeps(e, c), u = t?.targetType === "property" ? Ye(c, e.dataContext.id.name) : c, d = t?.targetType === "property" ? Ye(l, e.dataContext.id.name) : l, h = await e.compute(
         d,
-        l
+        u
       ), m = await Ae(this.controller, e, h, c, this.options, i);
       m && o.push(m);
     }
@@ -13027,22 +13079,22 @@ class eo {
       const n = this.sourceMapManager.findSourceMapsForMutation(a).filter((o) => o.computation === e);
       for (const o of n) {
         if (!("dataDep" in o)) {
-          const l = qt(this.options, L(e.dataContext));
-          if (!l)
+          const u = qt(this.options, L(e.dataContext));
+          if (!u)
             throw new it(`Event-based migration requires an approved event rebuild handler for ${L(e.dataContext)}`);
           if (e.dataContext.type === "property") {
             r || (r = !0, i.push(...await this.runFullRecompute(e)));
             continue;
           }
-          const d = await l({ controller: this.controller, dataContext: e.dataContext, mutationEvent: a }), h = await Ae(this.controller, e, d, void 0, this.options);
+          const d = await u({ controller: this.controller, dataContext: e.dataContext, mutationEvent: a }), h = await Ae(this.controller, e, d, void 0, this.options);
           h && i.push(h);
           continue;
         }
         const c = await this.controller.scheduler.resolveFilteredUpdateEvent(o, a, t);
         if (!c) continue;
-        const u = await this.controller.scheduler.computeDataBasedDirtyRecordsAndEvents(o, c);
-        for (const [l, d] of u)
-          i.push(...await this.runOneDirtyComputation(e, d, l));
+        const l = await this.controller.scheduler.computeDataBasedDirtyRecordsAndEvents(o, c);
+        for (const [u, d] of l)
+          i.push(...await this.runOneDirtyComputation(e, d, u));
       }
     }
     return i;
@@ -13071,7 +13123,7 @@ async function to(s, e, t) {
         });
       continue;
     }
-    const u = a.oldRecord?.resolvedBaseRecordName ?? o, l = r(a.oldRecord?.resolvedMatchExpression), d = l ? await s.system.storage.find(u, l, void 0, ["*"]) : [], h = new Set(d.map((f) => String(f.id))), m = new Set(c.map((f) => String(f.id)));
+    const l = a.oldRecord?.resolvedBaseRecordName ?? o, u = r(a.oldRecord?.resolvedMatchExpression), d = u ? await s.system.storage.find(l, u, void 0, ["*"]) : [], h = new Set(d.map((f) => String(f.id))), m = new Set(c.map((f) => String(f.id)));
     for (const f of c)
       h.has(String(f.id)) || i.push({
         recordName: n.recordName,
@@ -13119,10 +13171,10 @@ class Wo {
       dict: n = [],
       recordMutationSideEffects: o = [],
       computations: c = [],
-      ignoreGuard: u = !1,
-      forceThrowDispatchError: l = !1
+      ignoreGuard: l = !1,
+      forceThrowDispatchError: u = !1
     } = e;
-    this.system = t, this.ignoreGuard = u, this.forceThrowDispatchError = l, this.entities = [...i], this.relations = [...r], this.dict = [...n], this.recordMutationSideEffects = [...o], this.eventSources = [...a];
+    this.system = t, this.ignoreGuard = l, this.forceThrowDispatchError = u, this.entities = [...i], this.relations = [...r], this.dict = [...n], this.recordMutationSideEffects = [...o], this.eventSources = [...a];
     for (const m of this.eventSources) {
       if (m.name) {
         const f = this.eventSourcesByName.get(m.name);
@@ -13132,9 +13184,16 @@ class Wo {
       }
       this.eventSourcesByUUID.set(m.uuid, m);
     }
-    const d = new Set(this.entities.map((m) => m.name));
-    for (const m of this.eventSources)
-      m.entity && m.entity.name && !d.has(m.entity.name) && (this.entities.push(m.entity), d.add(m.entity.name));
+    const d = new Map(this.entities.map((m) => [m.name, m]));
+    for (const m of this.eventSources) {
+      if (!m.entity || !m.entity.name) continue;
+      const f = d.get(m.entity.name);
+      if (f && f !== m.entity)
+        throw new Error(
+          `Entity name "${m.entity.name}" conflicts with the event entity of eventSource "${m.name || m.uuid}". Event records are written with the event source's own schema; shadowing it with a user entity silently drops event fields. Rename the user entity (names starting with "_" are reserved for system records).`
+        );
+      f || (this.entities.push(m.entity), d.set(m.entity.name, m.entity));
+    }
     const h = [
       ...In,
       ...Vn,
@@ -13167,8 +13226,8 @@ class Wo {
       const o = this.system, c = o.prepareMigrationSchema;
       if (typeof c != "function")
         throw new Error("Current system does not support migration manifest validation");
-      const u = await c.call(o, this.entities, this.relations, r, { internalRequirements: a }), l = Et(this, u.schema), d = await Mr(this);
-      if (d && $r(d), d && d.modelHash !== l.modelHash)
+      const l = await c.call(o, this.entities, this.relations, r, { internalRequirements: a }), u = Et(this, l.schema), d = await Mr(this);
+      if (d && $r(d), d && d.modelHash !== u.modelHash)
         throw new Error(`Model manifest mismatch. Call controller.generateMigrationDiff(), review it, then call controller.migrate({ approvedDiff }). Manifest key: ${_i}/${Bi}`);
       if (!d && await this.system.hasExistingData?.())
         throw new Mt("Existing database has no migration manifest. Call controller.createMigrationBaseline() before normal setup or migration.");
@@ -13240,13 +13299,13 @@ class Wo {
       a,
       n,
       { outputChangedIds: new Set(a.map((p) => p.id)) }
-    ), c = Ar(t, i), u = kr(this, e), l = r.includeDestructiveScope === !0 ? await Ci(this, o, t, u) : [], d = {
+    ), c = Ar(t, i), l = kr(this, e), u = r.includeDestructiveScope === !0 ? await Ci(this, o, t, l) : [], d = {
       blockingChanges: [
         ...e.blockingChanges,
         ...c
       ],
-      destructiveScopes: l
-    }, h = await Is(this, Ps(t, i, e, d), t, i, u), m = await ks(this, h, t, i), f = await Ts(this, m, t, i, u);
+      destructiveScopes: u
+    }, h = await Is(this, Ps(t, i, e, d), t, i, l), m = await ks(this, h, t, i), f = await Ts(this, m, t, i, l);
     return Ms(f, this, o);
   }
   async generateMigrationDiff(e = {}) {
@@ -13260,7 +13319,7 @@ class Wo {
     _(typeof r.applyMigrationSchema == "function", "Current system does not support schema migration application");
     const { schemaPlan: a, previousManifest: n, nextManifest: o } = i, c = await this.buildCurrentMigrationDiff(a, n, o, { includeDestructiveScope: !1 });
     qs(t.approvedDiff, n, o, t.handlers, c);
-    const u = t.approvedDiff, l = ds(u), d = Os(u), h = Ls(u), m = Ds(n, o, u), f = m.changedComputations, p = Pr(n, o), y = xr(n, o, f, p, {
+    const l = t.approvedDiff, u = ds(l), d = Os(l), h = Ls(l), m = Ds(n, o, l), f = m.changedComputations, p = Pr(n, o), y = xr(n, o, f, p, {
       outputChangedIds: m.outputChangedIds,
       stateOnlyIds: m.stateOnlyIds
     }), b = await Na(this, t.approvedDiff, n), g = As(n, b), w = {
@@ -13298,7 +13357,7 @@ class Wo {
       },
       blockingChanges: $,
       deletionScope: D,
-      approvedDiffHash: l
+      approvedDiffHash: u
     };
     if (P.dryRun) return P;
     if ($.length)
@@ -13314,19 +13373,19 @@ ${$.join(`
     try {
       A = await r.beginMigration?.(
         o.modelHash,
-        l,
-        u.summary,
-        u.decisions.length
+        u,
+        l.summary,
+        l.decisions.length
       );
       const F = A?.phase || "pending";
       await r.applyMigrationSchema(w, A?.id), ne(F, "schema-applied") || A && await r.updateMigrationPhase?.(A.id, "schema-applied"), ne(F, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
         if (!ne(F, "computation-applied")) {
           await zs(this, W);
           const Aa = await to(this, n, o);
-          await Ir(this, t, n), await Zs(this, y, t, Aa, n), await Ks(this, u, n), A && await r.updateMigrationPhase?.(A.id, "computation-applied");
+          await Ir(this, t, n), await Zs(this, y, t, Aa, n), await Ks(this, l, n), A && await r.updateMigrationPhase?.(A.id, "computation-applied");
         }
         ne(F, "constraints-applied") || (await xs(this, t.approvedDiff, n), await r.verifyMigrationSchema?.(w, A?.id), await r.applyMigrationPostSchema?.(w, A?.id), A && await r.updateMigrationPhase?.(A.id, "constraints-applied"));
-        const ye = `manifest:current:${o.modelHash}:${l}`;
+        const ye = `manifest:current:${o.modelHash}:${u}`;
         await r.isMigrationOperationComplete?.(A?.id, ye) || (await hi(this, o), await r.markMigrationOperationComplete?.(A?.id, ye)), A && await r.updateMigrationPhase?.(A.id, "manifest-written");
       }), A && await r.finishMigration?.(A.id, "succeeded");
     } catch (F) {
@@ -13484,12 +13543,12 @@ ${$.join(`
     };
     let n;
     try {
-      n = await ls.run(a, () => Li(e.name || "dispatch", async (o) => {
-        const c = this.cloneDispatchArgs(t), u = { effects: [] };
-        return Vi.run(u, async () => this.system.storage.runInTransaction({ name: e.name, isolation: o }, async () => qr.run({ eventSourceName: e.name }, async () => {
+      n = await us.run(a, () => Li(e.name || "dispatch", async (o) => {
+        const c = this.cloneDispatchArgs(t), l = { effects: [] };
+        return Vi.run(l, async () => this.system.storage.runInTransaction({ name: e.name, isolation: o }, async () => qr.run({ eventSourceName: e.name }, async () => {
           !this.ignoreGuard && e.guard && await e.guard.call(this, c);
-          const l = e.mapEventData ? await e.mapEventData(c) : {};
-          await this.system.storage.create(e.entity.name, l);
+          const u = e.mapEventData ? await e.mapEventData(c) : {};
+          await this.system.storage.create(e.entity.name, u);
           let d;
           e.resolve && (d = await e.resolve.call(this, c));
           let h;
@@ -13497,7 +13556,7 @@ ${$.join(`
             const m = await e.afterDispatch.call(this, c, { data: d });
             m && (h = m);
           }
-          return { data: d, effects: u.effects, sideEffects: {}, context: h };
+          return { data: d, effects: l.effects, sideEffects: {}, context: h };
         })));
       }));
     } catch (o) {
@@ -13581,7 +13640,7 @@ function Dr(s) {
   const e = JSON.stringify(s);
   return encodeURI(e === void 0 ? "null" : e);
 }
-function ue(s, e) {
+function le(s, e) {
   return Array.from({ length: e }, (t, i) => s === "postgres" ? `$${i + 1}` : "?");
 }
 function io(s) {
@@ -13674,17 +13733,17 @@ class ro {
         return this.db.runInTransaction({ name: e.name, isolation: i }, o);
       await this.db.scheme("BEGIN", e.name);
       try {
-        const u = await o();
-        return await this.db.scheme("COMMIT", e.name), u;
-      } catch (u) {
-        throw await this.db.scheme("ROLLBACK", e.name), u;
+        const l = await o();
+        return await this.db.scheme("COMMIT", e.name), l;
+      } catch (l) {
+        throw await this.db.scheme("ROLLBACK", e.name), l;
       }
     };
     if (r.concurrentTransactions === "unsupported") {
-      const u = this.transactionQueue.then(() => c());
-      return this.transactionQueue = u.then(() => {
+      const l = this.transactionQueue.then(() => c());
+      return this.transactionQueue = l.then(() => {
       }, () => {
-      }), u;
+      }), l;
     }
     return c();
   }
@@ -13760,7 +13819,7 @@ class ro {
     await this.db.open(i), i && this.db.setupInternalComputationState && await this.db.setupInternalComputationState(), i && this.requiresScopedSequenceState(r) && this.db.setupScopedSequenceState && await this.db.setupScopedSequenceState();
     let a;
     try {
-      a = new le(
+      a = new ue(
         e,
         t,
         this.db
@@ -13777,13 +13836,13 @@ class ro {
     if (i && await a.createTables(), await this.createConstraints(a), this.db.setupRecordSequences) {
       const n = new qe(a.map, a.aliasManager);
       await this.db.setupRecordSequences(Object.keys(a.map.records).map((o) => {
-        const c = n.getRecordInfo(o), u = c.idField;
-        if (!u)
+        const c = n.getRecordInfo(o), l = c.idField;
+        if (!l)
           throw new Error(`id field not found for ${o}`);
         return {
           recordName: o,
           tableName: c.table,
-          idField: u
+          idField: l
         };
       }));
     }
@@ -13793,29 +13852,29 @@ class ro {
     await this.ensureDbOpenForSchemaRead(), this.db.setupInternalComputationState;
     let r;
     try {
-      r = new le(
+      r = new ue(
         e,
         t,
         this.db
       );
-    } catch (u) {
+    } catch (l) {
       throw new Ce(
-        u instanceof Error ? u.message : String(u),
+        l instanceof Error ? l.message : String(l),
         {
           driver: this.db.constructor?.name,
-          causedBy: u instanceof Error ? u : void 0
+          causedBy: l instanceof Error ? l : void 0
         }
       );
     }
     const a = await this.createAdditiveSchemaPlan(r), n = await this.getExistingTables();
     if (this.requiresScopedSequenceState(i) && this.db.setupScopedSequenceState && !n.has("_ScopedSequence_")) {
-      const u = Q(this.db).name;
+      const l = Q(this.db).name;
       a.unshift({
         kind: "create-table",
         tableName: "_ScopedSequence_",
         logicalPath: "internal:_ScopedSequence_",
         description: "create scoped sequence state table",
-        sql: u === "sqlite" ? 'CREATE TABLE IF NOT EXISTS "_ScopedSequence_" ("sequenceName" TEXT NOT NULL, "scopeKey" TEXT NOT NULL, "scope" JSON NOT NULL, "lastValue" NUMERIC NOT NULL, PRIMARY KEY ("sequenceName", "scopeKey"))' : 'CREATE TABLE IF NOT EXISTS "_ScopedSequence_" ("sequenceName" TEXT NOT NULL, "scopeKey" TEXT NOT NULL, "scope" JSONB NOT NULL, "lastValue" NUMERIC NOT NULL, PRIMARY KEY ("sequenceName", "scopeKey"))'
+        sql: l === "sqlite" ? 'CREATE TABLE IF NOT EXISTS "_ScopedSequence_" ("sequenceName" TEXT NOT NULL, "scopeKey" TEXT NOT NULL, "scope" JSON NOT NULL, "lastValue" NUMERIC NOT NULL, PRIMARY KEY ("sequenceName", "scopeKey"))' : 'CREATE TABLE IF NOT EXISTS "_ScopedSequence_" ("sequenceName" TEXT NOT NULL, "scopeKey" TEXT NOT NULL, "scope" JSONB NOT NULL, "lastValue" NUMERIC NOT NULL, PRIMARY KEY ("sequenceName", "scopeKey"))'
       });
     }
     const { verificationDDL: o, postRecomputeDDL: c } = this.createPostRecomputeSchemaPlan(r);
@@ -13834,7 +13893,7 @@ class ro {
   }
   async isMigrationOperationComplete(e, t) {
     if (!e) return !1;
-    const i = Q(this.db).name, [r, a] = ue(i, 2);
+    const i = Q(this.db).name, [r, a] = le(i, 2);
     return (await this.db.query(
       `SELECT "status" FROM "__interaqt_migration_operation_log" WHERE "migrationId" = ${r} AND "operationKey" = ${a} LIMIT 1`,
       [e, t],
@@ -13843,7 +13902,7 @@ class ro {
   }
   async markMigrationOperationComplete(e, t) {
     if (!e) return;
-    const i = Q(this.db).name, [r, a] = ue(i, 2), n = i === "mysql" ? 'ON DUPLICATE KEY UPDATE "status" = VALUES("status")' : 'ON CONFLICT ("migrationId", "operationKey") DO UPDATE SET "status" = EXCLUDED."status"';
+    const i = Q(this.db).name, [r, a] = le(i, 2), n = i === "mysql" ? 'ON DUPLICATE KEY UPDATE "status" = VALUES("status")' : 'ON CONFLICT ("migrationId", "operationKey") DO UPDATE SET "status" = EXCLUDED."status"';
     await this.db.update(
       `INSERT INTO "__interaqt_migration_operation_log" ("migrationId", "operationKey", "status") VALUES (${r}, ${a}, 'succeeded') ${n}`,
       [e, t],
@@ -14173,8 +14232,8 @@ class ro {
       increment: async (t, i) => {
         const r = this.getPlaceholder();
         if (this.isRecordTarget(t)) {
-          const { tableName: u, idField: l, fieldName: d } = this.resolveRecordTarget(t), h = r(), m = r(), f = await this.db.query(
-            `UPDATE "${u}" SET "${d}" = COALESCE("${d}", 0) + ${h} WHERE "${l}" = ${m} RETURNING "${d}" AS value`,
+          const { tableName: l, idField: u, fieldName: d } = this.resolveRecordTarget(t), h = r(), m = r(), f = await this.db.query(
+            `UPDATE "${l}" SET "${d}" = COALESCE("${d}", 0) + ${h} WHERE "${u}" = ${m} RETURNING "${d}" AS value`,
             [i, t.id],
             `atomic increment ${t.recordName}.${t.field}`
           );
@@ -14214,12 +14273,12 @@ RETURNING "numberValue" AS value`,
             `SELECT "${a}" AS value FROM "_ComputationState_" WHERE "key" = ${o}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
             [t.key],
             `atomic replace lock ${t.key}`
-          ), u = e.filter((y) => y !== a).map((y) => `"${y}" = NULL`).join(", "), l = this.parseGlobalValue(c[0]?.value, a) ?? t.defaultValue ?? null, d = this.getPlaceholder(), h = d(), m = d(), f = [`"${a}" = ${h}`, u].filter(Boolean).join(", "), p = await this.db.query(
+          ), l = e.filter((y) => y !== a).map((y) => `"${y}" = NULL`).join(", "), u = this.parseGlobalValue(c[0]?.value, a) ?? t.defaultValue ?? null, d = this.getPlaceholder(), h = d(), m = d(), f = [`"${a}" = ${h}`, l].filter(Boolean).join(", "), p = await this.db.query(
             `UPDATE "_ComputationState_" SET ${f} WHERE "key" = ${m} RETURNING "${a}" AS value`,
             [n, t.key],
             `atomic replace ${t.key}`
           );
-          return { oldValue: l, newValue: this.parseGlobalValue(p[0]?.value, a) ?? i };
+          return { oldValue: u, newValue: this.parseGlobalValue(p[0]?.value, a) ?? i };
         }
       ),
       compareAndSet: async (t, i, r, a) => {
@@ -14232,17 +14291,17 @@ RETURNING "numberValue" AS value`,
             `atomic compareAndSet ${t.recordName}.${t.field}`
           )).length > 0;
         }
-        const c = this.resolveGlobalColumn(t, r), u = this.normalizeGlobalValue(r, c), l = this.normalizeGlobalValue(o, c), d = this.normalizeGlobalValue(i, c), h = n(), m = n(), f = n(), p = n();
+        const c = this.resolveGlobalColumn(t, r), l = this.normalizeGlobalValue(r, c), u = this.normalizeGlobalValue(o, c), d = this.normalizeGlobalValue(i, c), h = n(), m = n(), f = n(), p = n();
         if ((await this.db.query(
           `UPDATE "_ComputationState_" SET "${c}" = ${h} WHERE "key" = ${m} AND COALESCE("${c}", ${f}) = ${p} RETURNING "${c}" AS value`,
-          [u, t.key, l, d],
+          [l, t.key, u, d],
           `atomic compareAndSet ${t.key}`
         )).length) return !0;
-        if (d !== l) return !1;
+        if (d !== u) return !1;
         const b = this.getPlaceholder(), g = b(), w = b();
         return (await this.db.query(
           `INSERT INTO "_ComputationState_" ("key", "${c}") VALUES (${g}, ${w}) ON CONFLICT ("key") DO NOTHING RETURNING "${c}" AS value`,
-          [t.key, u],
+          [t.key, l],
           `atomic compareAndSet insert ${t.key}`
         )).length > 0;
       },
@@ -14259,8 +14318,8 @@ RETURNING "numberValue" AS value`,
       },
       nextSequenceValue: async (t) => {
         this.validateAtomicSequenceTarget(t), this.requireTransaction(`atomic scoped sequence ${t.sequenceName}`);
-        const i = this.sequenceScopeKey(t.scope), r = JSON.stringify(this.normalizeSequenceScope(t.scope)), a = t.initialValue + t.step, n = this.getPlaceholder(), o = n(), c = n(), u = n(), l = n(), d = n(), h = await this.db.query(
-          `INSERT INTO "_ScopedSequence_" ("sequenceName", "scopeKey", "scope", "lastValue") VALUES (${o}, ${c}, ${u}, ${l})
+        const i = this.sequenceScopeKey(t.scope), r = JSON.stringify(this.normalizeSequenceScope(t.scope)), a = t.initialValue + t.step, n = this.getPlaceholder(), o = n(), c = n(), l = n(), u = n(), d = n(), h = await this.db.query(
+          `INSERT INTO "_ScopedSequence_" ("sequenceName", "scopeKey", "scope", "lastValue") VALUES (${o}, ${c}, ${l}, ${u})
 ON CONFLICT ("sequenceName", "scopeKey") DO UPDATE SET "lastValue" = "_ScopedSequence_"."lastValue" + ${d}
 RETURNING "lastValue" AS value`,
           [t.sequenceName, i, r, a, t.step],
@@ -14273,9 +14332,9 @@ RETURNING "lastValue" AS value`,
         if (this.validateAtomicSequenceTarget(t), t.mode !== void 0 && t.mode !== "max" && t.mode !== "replace")
           throw new Error('Atomic sequence seed mode must be "max" or "replace"');
         this.requireTransaction(`atomic scoped sequence seed ${t.sequenceName}`);
-        const i = this.sequenceScopeKey(t.scope), r = JSON.stringify(this.normalizeSequenceScope(t.scope)), a = t.mode ?? "max", n = this.getPlaceholder(), o = n(), c = n(), u = n(), l = n(), d = n(), m = Q(this.db).name === "sqlite" ? `MAX("_ScopedSequence_"."lastValue", ${d})` : `GREATEST("_ScopedSequence_"."lastValue", ${d})`, f = a === "replace" ? `${d}` : m;
+        const i = this.sequenceScopeKey(t.scope), r = JSON.stringify(this.normalizeSequenceScope(t.scope)), a = t.mode ?? "max", n = this.getPlaceholder(), o = n(), c = n(), l = n(), u = n(), d = n(), m = Q(this.db).name === "sqlite" ? `MAX("_ScopedSequence_"."lastValue", ${d})` : `GREATEST("_ScopedSequence_"."lastValue", ${d})`, f = a === "replace" ? `${d}` : m;
         await this.db.query(
-          `INSERT INTO "_ScopedSequence_" ("sequenceName", "scopeKey", "scope", "lastValue") VALUES (${o}, ${c}, ${u}, ${l})
+          `INSERT INTO "_ScopedSequence_" ("sequenceName", "scopeKey", "scope", "lastValue") VALUES (${o}, ${c}, ${l}, ${u})
 ON CONFLICT ("sequenceName", "scopeKey") DO UPDATE SET "lastValue" = ${f}
 RETURNING "lastValue" AS value`,
           [t.sequenceName, i, r, t.value, t.value],
@@ -14299,17 +14358,17 @@ RETURNING "lastValue" AS value`,
           `SELECT "jsonValue" AS value FROM "_ComputationState_" WHERE "key" = ${n()}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
           [t.key],
           `atomic updateGlobalFields lock ${t.key}`
-        ), c = this.parseGlobalValue(o[0]?.value, "jsonValue") ?? {}, u = { ...r, ...c };
+        ), c = this.parseGlobalValue(o[0]?.value, "jsonValue") ?? {}, l = { ...r, ...c };
         Object.entries(i).forEach(([m, f]) => {
-          u[m] = Number(u[m] ?? r[m] ?? 0) + f;
+          l[m] = Number(l[m] ?? r[m] ?? 0) + f;
         });
-        const l = this.getPlaceholder(), d = l(), h = l();
+        const u = this.getPlaceholder(), d = u(), h = u();
         return await this.db.update(
           `UPDATE "_ComputationState_" SET "jsonValue" = ${d} WHERE "key" = ${h}`,
-          [JSON.stringify(u), t.key],
+          [JSON.stringify(l), t.key],
           void 0,
           `atomic updateGlobalFields ${t.key}`
-        ), u;
+        ), l;
       },
       lockRecord: async (t, i, r = ["*"]) => {
         this.requireTransaction(`atomic lockRecord ${t}`);
@@ -14324,7 +14383,7 @@ RETURNING "lastValue" AS value`,
       lockRows: async (t, i, r = ["*"]) => {
         this.requireTransaction(`atomic lockRows ${t}`);
         const { tableName: a, idField: n } = this.resolveRecordTable(t), o = 5, c = /* @__PURE__ */ new Map();
-        for (let l = 0; l < o; l++) {
+        for (let u = 0; u < o; u++) {
           const h = (await this.queryHandle.find(t, i, void 0, ["id"])).map((y) => y.id).filter((y) => !c.has(String(y)));
           if (!h.length) {
             if (!c.size) return [];
@@ -14340,13 +14399,13 @@ RETURNING "lastValue" AS value`,
           if (await this.db.query(
             `SELECT "${n}" AS id FROM "${a}" WHERE "${n}" IN (${p})${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
             m,
-            `atomic lockRows ${t} (round ${l + 1})`
+            `atomic lockRows ${t} (round ${u + 1})`
           ), m.forEach((y) => c.set(String(y), y)), !this.supportsForUpdate()) break;
         }
-        const u = [...c.values()];
-        return u.length ? this.queryHandle.find(
+        const l = [...c.values()];
+        return l.length ? this.queryHandle.find(
           t,
-          i.and({ key: "id", value: ["in", u] }),
+          i.and({ key: "id", value: ["in", l] }),
           void 0,
           r
         ) : [];
@@ -14394,7 +14453,7 @@ RETURNING "lastValue" AS value`,
     });
   }
   mapConstraintError(e) {
-    const t = un(e);
+    const t = ln(e);
     if (t) return t;
     const i = xt(e, this.db);
     if (!i.isUniqueViolation) return e;
@@ -14414,13 +14473,16 @@ RETURNING "lastValue" AS value`,
     );
   }
   async callWithEvents(e, t, i = [], r) {
-    if (!this.isInTransaction())
-      return this.withAtomicTransaction("storage mutation with events", async () => this.callWithEvents(e, t, i, r));
+    if (!this.isInTransaction()) {
+      let a = [];
+      const n = await this.withAtomicTransaction("storage mutation with events", async () => (a = [], this.callWithEvents(e, t, a, r)));
+      return i.push(...a), n;
+    }
     try {
       const a = [], n = await e(...t, a), o = r ? a.filter(r) : a, c = await this.dispatch(o);
       i.push(...a, ...c);
-      const u = us();
-      return u && o.length > 0 && Er(o), u && c.length > 0 && Er(c), n;
+      const l = ls();
+      return l && o.length > 0 && Er(o), l && c.length > 0 && Er(c), n;
     } catch (a) {
       throw this.mapConstraintError(a);
     }
@@ -14552,7 +14614,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   }
   async readMigrationManifest() {
     if (!(await this.storage.getExistingTables()).has("__interaqt_migration_manifest")) return;
-    const t = Q(this.db).name, [i] = ue(t, 1), r = await this.db.query(
+    const t = Q(this.db).name, [i] = le(t, 1), r = await this.db.query(
       `SELECT "value" FROM "__interaqt_migration_manifest" WHERE "key" = ${i} LIMIT 1`,
       ["current"],
       "read migration manifest"
@@ -14561,7 +14623,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   }
   async writeMigrationManifest(e) {
     await this.ensureMigrationManifestTable();
-    const t = JSON.stringify(e), i = Q(this.db).name, [r, a] = ue(i, 2), n = i === "mysql" ? 'ON DUPLICATE KEY UPDATE "value" = VALUES("value")' : 'ON CONFLICT ("key") DO UPDATE SET "value" = EXCLUDED."value"';
+    const t = JSON.stringify(e), i = Q(this.db).name, [r, a] = le(i, 2), n = i === "mysql" ? 'ON DUPLICATE KEY UPDATE "value" = VALUES("value")' : 'ON CONFLICT ("key") DO UPDATE SET "value" = EXCLUDED."value"';
     await this.db.update(
       `INSERT INTO "__interaqt_migration_manifest" ("key", "value") VALUES (${r}, ${a}) ${n}`,
       ["current", t],
@@ -14583,7 +14645,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     return !1;
   }
   async acquireMigrationLock(e) {
-    const t = Q(this.db).name, [i] = ue(t, 1);
+    const t = Q(this.db).name, [i] = le(t, 1);
     try {
       await this.db.update(
         `INSERT INTO "__interaqt_migration_lock" ("key", "migrationId") VALUES ('current', ${i})`,
@@ -14597,23 +14659,23 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   }
   async beginMigration(e, t, i, r = 0) {
     await this.ensureMigrationManifestTable();
-    const a = Q(this.db).name, [n] = ue(a, 1), o = await this.db.query(
+    const a = Q(this.db).name, [n] = le(a, 1), o = await this.db.query(
       `SELECT "migrationId" FROM "__interaqt_migration_lock" WHERE "key" = ${n} LIMIT 1`,
       ["current"],
       "read migration lock"
     );
     if (o[0])
       throw new Error(`Migration is already running: ${o[0].migrationId}. If that process crashed, call controller.forceReleaseMigrationLock() after confirming no migration is actually running, then retry.`);
-    const [c, u] = ue(a, 2), l = await this.db.query(
-      `SELECT "id", "phase", "status" FROM "__interaqt_migration_log" WHERE "modelHash" = ${c} AND COALESCE("approvedDiffHash", '') = ${u} AND "status" IN ('pending', 'failed') AND "phase" IN ('pending', 'schema-applied', 'computation-applied', 'constraints-applied', 'manifest-written') ORDER BY "updatedAt" DESC LIMIT 1`,
+    const [c, l] = le(a, 2), u = await this.db.query(
+      `SELECT "id", "phase", "status" FROM "__interaqt_migration_log" WHERE "modelHash" = ${c} AND COALESCE("approvedDiffHash", '') = ${l} AND "status" IN ('pending', 'failed') AND "phase" IN ('pending', 'schema-applied', 'computation-applied', 'constraints-applied', 'manifest-written') ORDER BY "updatedAt" DESC LIMIT 1`,
       [e, t || ""],
       "read resumable migration"
     );
-    if (l[0])
-      return await this.acquireMigrationLock(l[0].id), { id: l[0].id, phase: l[0].phase };
+    if (u[0])
+      return await this.acquireMigrationLock(u[0].id), { id: u[0].id, phase: u[0].phase };
     const d = `${Date.now()}-${Math.random().toString(36).slice(2)}`, h = (/* @__PURE__ */ new Date()).toISOString(), m = i === void 0 ? null : JSON.stringify(i);
     await this.acquireMigrationLock(d);
-    const f = ue(a, 8);
+    const f = le(a, 8);
     return await this.db.update(
       `INSERT INTO "__interaqt_migration_log" ("id", "modelHash", "approvedDiffHash", "approvedDiffSummary", "decisionCount", "reviewedAt", "phase", "status", "createdAt", "updatedAt") VALUES (${f[0]}, ${f[1]}, ${f[2]}, ${f[3]}, ${f[4]}, ${f[5]}, 'pending', 'pending', ${f[6]}, ${f[7]})`,
       [d, e, t || "", m, r, h, h, h],
@@ -14623,7 +14685,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   }
   async updateMigrationPhase(e, t) {
     await this.ensureMigrationManifestTable();
-    const i = (/* @__PURE__ */ new Date()).toISOString(), [r, a, n] = ue(Q(this.db).name, 3);
+    const i = (/* @__PURE__ */ new Date()).toISOString(), [r, a, n] = le(Q(this.db).name, 3);
     await this.db.update(
       `UPDATE "__interaqt_migration_log" SET "phase" = ${r}, "status" = 'pending', "updatedAt" = ${a} WHERE "id" = ${n}`,
       [t, i, e],
@@ -14633,14 +14695,14 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   }
   async finishMigration(e, t, i) {
     await this.ensureMigrationManifestTable();
-    const r = (/* @__PURE__ */ new Date()).toISOString(), a = i === void 0 ? null : String(i instanceof Error ? i.message : i), n = Q(this.db).name, [o, c, u, l] = ue(n, 4);
+    const r = (/* @__PURE__ */ new Date()).toISOString(), a = i === void 0 ? null : String(i instanceof Error ? i.message : i), n = Q(this.db).name, [o, c, l, u] = le(n, 4);
     await this.db.update(
-      `UPDATE "__interaqt_migration_log" SET "status" = ${o}, "error" = ${c}, "updatedAt" = ${u} WHERE "id" = ${l}`,
+      `UPDATE "__interaqt_migration_log" SET "status" = ${o}, "error" = ${c}, "updatedAt" = ${l} WHERE "id" = ${u}`,
       [t, a, r, e],
       void 0,
       "finish migration log"
     );
-    const [d] = ue(n, 1);
+    const [d] = le(n, 1);
     await this.db.update(
       `DELETE FROM "__interaqt_migration_lock" WHERE "key" = 'current' AND "migrationId" = ${d}`,
       [e],
@@ -14663,8 +14725,8 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     await this.ensureMigrationManifestTable(), await this.storage.markMigrationOperationComplete(e, t);
   }
   async setup(e, t, i, r = !1) {
-    const a = typeof r == "boolean" ? r : r.install === !0, n = typeof r == "boolean" ? { install: a } : r, o = new fi(e, t), { entities: c, relations: u } = o.getAll();
-    i.forEach(({ dataContext: l, state: d }) => {
+    const a = typeof r == "boolean" ? r : r.install === !0, n = typeof r == "boolean" ? { install: a } : r, o = new fi(e, t), { entities: c, relations: l } = o.getAll();
+    i.forEach(({ dataContext: u, state: d }) => {
       Object.entries(d).forEach(([h, m]) => {
         if (m instanceof O) {
           if (!m.record)
@@ -14690,7 +14752,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       });
     }), await this.storage.setup(
       [...c, gr, yr],
-      u,
+      l,
       a,
       n
     ), await this.setupTransformUniqueIndexes(i);
@@ -14702,18 +14764,18 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
         if (c instanceof O) {
           if (!c.record)
             return;
-          let u = r.getEntityByName(c.record);
-          if (u || (u = r.getRelationByName(c.record)), !u)
+          let l = r.getEntityByName(c.record);
+          if (l || (l = r.getRelationByName(c.record)), !l)
             throw new Error(`Entity or Relation not found: ${c.record}`);
-          for (; u.baseEntity || u.baseRelation; )
-            u = u.baseEntity || u.baseRelation;
+          for (; l.baseEntity || l.baseRelation; )
+            l = l.baseEntity || l.baseRelation;
           if (c.defaultValue instanceof x)
-            c.defaultValue.name = c.key, u.properties.push(c.defaultValue);
+            c.defaultValue.name = c.key, l.properties.push(c.defaultValue);
           else {
-            const l = typeof c.defaultValue;
-            u.properties.push(x.create({
+            const u = typeof c.defaultValue;
+            l.properties.push(x.create({
               name: c.key,
-              type: l,
+              type: u,
               // 应该系统定义
               collection: Array.isArray(c.defaultValue),
               defaultValue: () => c.defaultValue
@@ -14762,9 +14824,9 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       const r = i.sourceRecordId, a = i.transformIndex;
       if (!(r instanceof O) || !(a instanceof O) || r.unique === !1 || t.type !== "entity" && t.type !== "relation")
         continue;
-      const n = t.id.name, o = this.storage, c = o.queryHandle.map, u = c.getRecordInfo(n), [, l] = c.getTableAliasAndFieldName([n], r.key, !0), [, d] = c.getTableAliasAndFieldName([n], a.key, !0), h = `idx_transform_${this.hashIdentifier(`${u.table}_${l}_${d}`)}`, m = Q(o.db);
+      const n = t.id.name, o = this.storage, c = o.queryHandle.map, l = c.getRecordInfo(n), [, u] = c.getTableAliasAndFieldName([n], r.key, !0), [, d] = c.getTableAliasAndFieldName([n], a.key, !0), h = `idx_transform_${this.hashIdentifier(`${l.table}_${u}_${d}`)}`, m = Q(o.db);
       await o.db.scheme(
-        wi(h, u.table, [l, d], m),
+        wi(h, l.table, [u, d], m),
         `setup transform unique index ${n}`
       );
     }
@@ -14774,16 +14836,16 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     if (!i) return [];
     const r = new qe(i.map, i.aliasManager), a = Q(this.storage.db);
     return t.flatMap(({ dataContext: n, state: o }) => {
-      const c = o.sourceRecordId, u = o.transformIndex;
-      if (!(c instanceof O) || !(u instanceof O) || c.unique === !1 || n.type !== "entity" && n.type !== "relation")
+      const c = o.sourceRecordId, l = o.transformIndex;
+      if (!(c instanceof O) || !(l instanceof O) || c.unique === !1 || n.type !== "entity" && n.type !== "relation")
         return [];
-      const l = n.id.name, d = r.getRecordInfo(l), [, h] = r.getTableAliasAndFieldName([l], c.key, !0), [, m] = r.getTableAliasAndFieldName([l], u.key, !0), f = `idx_transform_${this.hashIdentifier(`${d.table}_${h}_${m}`)}`;
+      const u = n.id.name, d = r.getRecordInfo(u), [, h] = r.getTableAliasAndFieldName([u], c.key, !0), [, m] = r.getTableAliasAndFieldName([u], l.key, !0), f = `idx_transform_${this.hashIdentifier(`${d.table}_${h}_${m}`)}`;
       return [{
         kind: "create-constraint",
         sql: wi(f, d.table, [h, m], a),
         tableName: d.table,
-        logicalPath: `${l}.${c.key}.${u.key}`,
-        description: `migration setup transform unique index ${l}`
+        logicalPath: `${u}.${c.key}.${l.key}`,
+        description: `migration setup transform unique index ${u}`
       }];
     });
   }
@@ -14995,7 +15057,7 @@ class Zi {
     const a = new Zi(e, t);
     if (this.instances.find((o) => o.uuid === a.uuid))
       throw new Error(`duplicate uuid in options ${a.uuid}, Interaction`);
-    return a.entity = Yi, a.guard = co(a), a.mapEventData = uo(a), r && (a.resolve = lo(a)), this.instances.push(a), a;
+    return a.entity = Yi, a.guard = co(a), a.mapEventData = lo(a), r && (a.resolve = uo(a)), this.instances.push(a), a;
   }
   // CAUTION 必须走统一的 stringifyInstance 管线：嵌套的 Klass 实例（Action/Conditions/Payload/Entity 等）
   //  会被编码为 `uuid::` 引用、函数编码为 `func::`。此前手写的 JSON.stringify 会把嵌套实例内联成
@@ -15034,7 +15096,7 @@ function co(s) {
     await Ta(this, s, e);
   };
 }
-function uo(s) {
+function lo(s) {
   return (e) => ({
     interactionName: s.name,
     interactionId: s.uuid,
@@ -15044,7 +15106,7 @@ function uo(s) {
     context: e.context || {}
   });
 }
-function lo(s) {
+function uo(s) {
   return async function(e) {
     return fo(this, s, e);
   };
@@ -15061,8 +15123,8 @@ async function ho(s, e, t) {
     try {
       o = await n.content.call(s, t);
     } catch (c) {
-      const u = c instanceof Error ? c.message : String(c);
-      return `Condition '${n.name}' threw exception: ${u}`;
+      const l = c instanceof Error ? c.message : String(c);
+      return `Condition '${n.name}' threw exception: ${l}`;
     }
     return typeof o != "boolean" ? `Condition '${n.name}' returned ${o === void 0 ? "undefined" : JSON.stringify(o)} (${typeof o}); guard callbacks must explicitly return a boolean (did you forget a return statement, or a !! coercion?)` : o;
   }, a = await i.evaluateAsync(r);
@@ -15102,16 +15164,16 @@ async function mo(s, e, t) {
       );
     const c = po[n.type];
     if (c) {
-      const u = n.isCollection ? o : [o];
-      for (const l of u)
-        if (!c(l))
+      const l = n.isCollection ? o : [o];
+      for (const u of l)
+        if (!c(u))
           throw new ge(
-            `Payload validation failed for field '${n.name}': expected ${n.type}, got ${l === null ? "null" : typeof l}`,
+            `Payload validation failed for field '${n.name}': expected ${n.type}, got ${u === null ? "null" : typeof u}`,
             { type: `${n.name} type mismatch`, checkType: "payload" }
           );
     }
     if (n.isCollection) {
-      if (n.isRef && !o.every((u) => !!u.id))
+      if (n.isRef && !o.every((l) => !!l.id))
         throw new ge(
           `Payload validation failed for field '${n.name}': data not every is ref`,
           { type: `${n.name} data not every is ref`, checkType: "payload" }
@@ -15122,21 +15184,21 @@ async function mo(s, e, t) {
         { type: `${n.name} data is not a ref`, checkType: "payload" }
       );
     if (n.base) {
-      const u = n.base.name, l = n.isCollection ? o : [o];
-      for (const d of l) {
+      const l = n.base.name, u = n.isCollection ? o : [o];
+      for (const d of u) {
         if (!d || typeof d != "object" || Array.isArray(d))
           throw new ge(
-            `Payload validation failed for field '${n.name}': expected ${u} data (object), got ${d === null ? "null" : Array.isArray(d) ? "array" : typeof d}`,
+            `Payload validation failed for field '${n.name}': expected ${l} data (object), got ${d === null ? "null" : Array.isArray(d) ? "array" : typeof d}`,
             { type: `${n.name} check concept failed`, checkType: "payload" }
           );
         if (n.isRef && !await s.system.storage.findOne(
-          u,
+          l,
           k.atom({ key: "id", value: ["=", d.id] }),
           void 0,
           ["id"]
         ))
           throw new ge(
-            `Payload validation failed for field '${n.name}': referenced ${u} with id '${d.id}' does not exist`,
+            `Payload validation failed for field '${n.name}': referenced ${l} with id '${d.id}' does not exist`,
             { type: `${n.name} ref not found`, checkType: "payload" }
           );
       }
@@ -15147,13 +15209,13 @@ async function fo(s, e, t) {
   if (j.is(e.data) || Y.is(e.data)) {
     const i = e.data.name, r = e.dataPolicy?.match, a = e.dataPolicy?.modifier, n = { ...t.query?.modifier || {}, ...a || {} };
     if (a && typeof a == "object" && "limit" in a) {
-      const l = t.query?.modifier || {};
+      const u = t.query?.modifier || {};
       for (const d of ["offset", "orderBy"])
-        if (!(d in a) && d in l)
+        if (!(d in a) && d in u)
           throw new Error(`Interaction "${e.name}": caller cannot override modifier "${d}" restricted by dataPolicy`);
     }
-    const o = e.dataPolicy?.attributeQuery ?? (t.query?.attributeQuery || []), c = typeof r == "function" ? await r.call(s, t) : r, u = k.and(c, t.query?.match);
-    return s.system.storage.find(i, u, n, o);
+    const o = e.dataPolicy?.attributeQuery ?? (t.query?.attributeQuery || []), c = typeof r == "function" ? await r.call(s, t) : r, l = k.and(c, t.query?.match);
+    return s.system.storage.find(i, l, n, o);
   }
 }
 class er {
@@ -15805,14 +15867,14 @@ class be extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.activityName = t.activityName, this.activityId = t.activityId, this.activityInstanceId = t.activityInstanceId, this.currentState = t.currentState, this.severity = t.severity || te.MEDIUM;
+    }), this.activityName = t.activityName, this.activityId = t.activityId, this.activityInstanceId = t.activityInstanceId, this.currentState = t.currentState, this.severity = t.severity || ie.MEDIUM;
   }
 }
 class Me extends be {
   constructor(e, t = {}) {
     super(e, {
       ...t,
-      severity: te.HIGH,
+      severity: ie.HIGH,
       context: {
         errorType: "ActivityStateError",
         expectedState: t.expectedState,
@@ -15828,12 +15890,12 @@ class Ke {
   }
   static createInitialState(e) {
     return {
-      current: ee.createInitialState(e)
+      current: te.createInitialState(e)
     };
   }
   static create(e, t, i) {
     const r = new Ke(t, i);
-    return e.current && (r.current = ee.create(e.current, t, r)), r;
+    return e.current && (r.current = te.create(e.current, t, r)), r;
   }
   isInteractionAvailable(e) {
     return this.current ? this.current?.children ? Object.values(this.current.children).some((t) => t.isInteractionAvailable(e)) : this.current.node.uuid === e : !1;
@@ -15850,8 +15912,8 @@ class Ke {
   transferToNext(e) {
     const t = this.graph.getNodeByUUID(e);
     if (delete this.current, t.next) {
-      const i = ee.createInitialState(t.next);
-      this.current = ee.create(i, this.graph, this);
+      const i = te.createInitialState(t.next);
+      this.current = te.create(i, this.graph, this);
     }
     this.parent?.onChange(e, t.next?.uuid);
   }
@@ -15861,7 +15923,7 @@ class Ke {
     };
   }
 }
-class ee {
+class te {
   constructor(e, t, i) {
     this.node = e, this.graph = t, this.parent = i;
   }
@@ -15875,12 +15937,12 @@ class ee {
   static create(e, t, i) {
     const r = t.getNodeByUUID(e.uuid);
     if (He.is(r.content)) {
-      const n = ee.GroupStateNodeType.get(r.content.type);
+      const n = te.GroupStateNodeType.get(r.content.type);
       _(!!n, `unknown ActivityGroup type "${r.content.type}"`);
       const o = new n(r, t, i);
       return o.isGroup = !0, o.children = e?.children?.map((c) => Ke.create(c, t, o)), o;
     } else
-      return new ee(r, t, i);
+      return new te(r, t, i);
   }
   toJSON() {
     return {
@@ -15932,8 +15994,8 @@ class Ue {
       this.uuidToNode.set(n.uuid, o), this.rawToNode.set(n, o);
     }
     for (let n of e.groups) {
-      if (!ee.GroupStateNodeType.has(n.type)) {
-        const c = Array.from(ee.GroupStateNodeType.keys()).map((u) => `'${u}'`).join(", ");
+      if (!te.GroupStateNodeType.has(n.type)) {
+        const c = Array.from(te.GroupStateNodeType.keys()).map((l) => `'${l}'`).join(", ");
         throw new be(`ActivityGroup type "${n.type}" in activity "${e.name}" is not supported. Supported types: ${c}.`, { activityName: e.name });
       }
       if (this.uuidToNode.has(n.uuid))
@@ -16047,7 +16109,7 @@ class Ue {
     await this.setActivity(e, t, { state: n });
   }
 }
-class go extends ee {
+class go extends te {
   onChange(e, t) {
     if (this.graph.isStartNode(e))
       if (t)
@@ -16059,19 +16121,19 @@ class go extends ee {
     this.isGroupCompleted() && this.complete();
   }
 }
-ee.GroupStateNodeType.set("any", go);
-class bo extends ee {
+te.GroupStateNodeType.set("any", go);
+class bo extends te {
   onChange(e, t) {
     this.isGroupCompleted() && this.complete();
   }
 }
-ee.GroupStateNodeType.set("every", bo);
-class wo extends ee {
+te.GroupStateNodeType.set("every", bo);
+class wo extends te {
   onChange(e, t) {
     this.graph.isEndNode(e) && this.complete();
   }
 }
-ee.GroupStateNodeType.set("race", wo);
+te.GroupStateNodeType.set("race", wo);
 const No = "_Activity_", xa = j.create({
   name: No,
   properties: [
@@ -16128,8 +16190,8 @@ class Zo {
     const r = i.isActivityHead(t), a = async function(c) {
       if (r && !c.activityId) {
         await i.fullGuard(this, t, c);
-        const u = await i.create(this);
-        c.activityId = u.activityId;
+        const l = await i.create(this);
+        c.activityId = l.activityId;
       } else if (r && c.activityId)
         await i.checkActivityState(this, c.activityId, t.uuid), await i.fullGuard(this, t, c);
       else {
@@ -16138,14 +16200,14 @@ class Zo {
         await i.checkActivityState(this, c.activityId, t.uuid), await i.fullGuard(this, t, c);
       }
     }, n = async (c) => {
-      const u = t.mapEventData ? await t.mapEventData(c) : {};
-      return c.activityId && (u.activity = { id: c.activityId }), u;
-    }, o = async function(c, u) {
-      const l = c.activityId;
-      return await i.completeInteractionState(this, l, t.uuid), {
-        ...(t.afterDispatch ? await t.afterDispatch.call(this, c, u) : void 0) || {},
-        activityId: l,
-        nextState: await i.getState(this, l)
+      const l = t.mapEventData ? await t.mapEventData(c) : {};
+      return c.activityId && (l.activity = { id: c.activityId }), l;
+    }, o = async function(c, l) {
+      const u = c.activityId;
+      return await i.completeInteractionState(this, u, t.uuid), {
+        ...(t.afterDispatch ? await t.afterDispatch.call(this, c, l) : void 0) || {},
+        activityId: u,
+        nextState: await i.getState(this, u)
       };
     };
     return {
@@ -16197,13 +16259,13 @@ class ec extends ae {
         ...t.context
       },
       causedBy: t.causedBy
-    }), this.interactionName = t.interactionName, this.userId = t.userId, this.payload = t.payload, this.executionPhase = t.executionPhase, this.severity = t.severity || te.HIGH;
+    }), this.interactionName = t.interactionName, this.userId = t.userId, this.payload = t.payload, this.executionPhase = t.executionPhase, this.severity = t.severity || ie.HIGH;
   }
 }
 export {
   No as ACTIVITY_RECORD,
   Ba as ALL_ATTR_SYMBOL,
-  li as ASYNC_TASK_RECORD,
+  ui as ASYNC_TASK_RECORD,
   ti as Action,
   er as Activity,
   Ue as ActivityCall,
@@ -16214,13 +16276,13 @@ export {
   xa as ActivityStateEntity,
   Me as ActivityStateError,
   nn as AliasManager,
-  ua as AmbiguousComputationSignatureError,
+  la as AmbiguousComputationSignatureError,
   ht as Any,
   Cn as AnyHandles,
   Ui as AsyncMigrationComputationError,
   ke as AttributeInfo,
   K as AttributeQuery,
-  lt as Average,
+  ut as Average,
   zn as AverageHandles,
   Gt as BoolAtomData,
   k as BoolExp,
@@ -16247,7 +16309,7 @@ export {
   Zn as CustomHandles,
   Ji as DBConsoleLogger,
   ao as DBLogLevel,
-  le as DBSetup,
+  ue as DBSetup,
   fr as DEFAULT_SCHEMA_DIALECT,
   Vo as DELETED_STATE,
   Z as DICTIONARY_RECORD,
@@ -16261,7 +16323,7 @@ export {
   qe as EntityToTableMap,
   Fi as Equation,
   ve as ErrorCategory,
-  te as ErrorSeverity,
+  ie as ErrorSeverity,
   ar as Event,
   Oi as EventSource,
   dt as Every,
@@ -16303,11 +16365,11 @@ export {
   Fo as NON_DELETED_STATE,
   Lo as NON_EXIST_STATE,
   Pn as NestedDispatchError,
-  ie as NewRecordData,
+  ee as NewRecordData,
   Mi as NonNullConstraint,
   Io as PHASE_AFTER_ALL,
   Ao as PHASE_BEFORE_ALL,
-  ui as PHASE_NORMAL,
+  li as PHASE_NORMAL,
   nr as Payload,
   Ze as PayloadItem,
   Qo as PhysicalLayoutChangeError,
@@ -16351,7 +16413,7 @@ export {
   bn as StateMachineHandles,
   We as StateNode,
   qi as StateTransfer,
-  ut as Summation,
+  lt as Summation,
   Hn as SummationHandles,
   Xi as SystemConsoleLogger,
   yr as SystemEntity,
@@ -16379,7 +16441,7 @@ export {
   $r as assertManifestGeneratorCurrent,
   Cs as assertScopedSequenceNoSeedDecisions,
   Vi as asyncEffectsContext,
-  ls as asyncInteractionContext,
+  us as asyncInteractionContext,
   zs as backfillNewFactPropertyDefaults,
   xr as buildAffectedRebuildPlan,
   Ps as buildMigrationDiff,
@@ -16409,7 +16471,7 @@ export {
   Oo as everyWithErrorAsync,
   hn as externalDataDepKeys,
   Po as filterMap,
-  un as findConstraintViolationError,
+  ln as findConstraintViolationError,
   On as findErrorByCode,
   Yo as findRootActivity,
   Ca as forEachInteraction,
@@ -16417,7 +16479,7 @@ export {
   Na as getApprovedEmptyFactRecordRemovals,
   jo as getChangedComputations,
   Ds as getChangedComputationsFromApprovedDiff,
-  us as getCurrentEffects,
+  ls as getCurrentEffects,
   Ci as getDestructiveDeletionScope,
   Oa as getEffectiveScopedSequenceInitializerMatch,
   zi as getFilteredRecordChanges,