interaqt 4.0.0 → 4.0.1

package/dist/index.js

@@ -35,8 +35,8 @@ function B(s, e) {
   };
   return JSON.stringify(i);
 }
-function A(s) {
-  return typeof s == "string" && s.startsWith("func::") ? new Function("return " + s.substring(6))() : Array.isArray(s) ? s.map((e) => A(e)) : rt(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, A(t)])) : s;
+function I(s) {
+  return typeof s == "string" && s.startsWith("func::") ? new Function("return " + s.substring(6))() : Array.isArray(s) ? s.map((e) => I(e)) : rt(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, I(t)])) : s;
 }
 function yt(s, e) {
   if (s == null || typeof s != "object") return s;
@@ -66,9 +66,9 @@ function $o() {
 }
 function To(s) {
   const e = JSON.parse(s);
-  return Ia(e);
+  return Aa(e);
 }
-function Ia(s) {
+function Aa(s) {
   const e = /* @__PURE__ */ new Map();
   for (const u of s) {
     if (!qt.get(u.type))
@@ -86,8 +86,8 @@ function Ia(s) {
         const d = u.substring(6), p = t.get(d);
         if (p) return l(p);
         if (i.has(d)) {
-          const f = r.get(d) || [];
-          return f.push(l), r.set(d, f), l(void 0);
+          const m = r.get(d) || [];
+          return m.push(l), r.set(d, m), l(void 0);
         }
         const h = e.get(d);
         if (!h)
@@ -98,40 +98,40 @@ function Ia(s) {
     }
     if (Array.isArray(u)) {
       const d = new Array(u.length);
-      return u.forEach((p, h) => a(p, (f) => {
-        d[h] = f;
+      return u.forEach((p, h) => a(p, (m) => {
+        d[h] = m;
       })), l(d);
     }
     if (rt(u)) {
       const d = {};
-      return Object.entries(u).forEach(([p, h]) => a(h, (f) => {
-        d[p] = f;
+      return Object.entries(u).forEach(([p, h]) => a(h, (m) => {
+        d[p] = m;
       })), l(d);
     }
     return l(u);
   }
   const n = /* @__PURE__ */ new Set(["computation"]), o = [];
   function c(u) {
-    const { type: l, options: d = {}, uuid: p, public: h } = u, f = t.get(p);
-    if (f) return f;
+    const { type: l, options: d = {}, uuid: p, public: h } = u, m = t.get(p);
+    if (m) return m;
     i.add(p);
-    const m = qt.get(l), y = {};
-    let b;
-    Object.entries(h || {}).forEach(([w, N]) => {
-      if (n.has(w)) {
+    const f = qt.get(l), y = {};
+    let w;
+    Object.entries(h || {}).forEach(([b, N]) => {
+      if (n.has(b)) {
         o.push(() => {
           a(N, (E) => {
-            b[w] = E;
+            w[b] = E;
           });
         });
         return;
       }
       a(N, (E) => {
-        b ? b[w] = E : y[w] = E;
+        w ? w[b] = E : y[b] = E;
       });
-    }), b = m.create(y, { ...d, uuid: p }), i.delete(p), t.set(p, b);
+    }), w = f.create(y, { ...d, uuid: p }), i.delete(p), t.set(p, w);
     const g = r.get(p);
-    return g && (r.delete(p), g.forEach((w) => w(b))), b;
+    return g && (r.delete(p), g.forEach((b) => b(w))), w;
   }
   for (const u of s)
     c(u);
@@ -139,9 +139,9 @@ function Ia(s) {
     throw new Error(`Unresolved instance references after deserialization: ${Array.from(r.keys()).join(", ")}`);
   return t;
 }
-let Aa = 0;
+let Ia = 0;
 function P(s) {
-  return s?.uuid || `id_${++Aa}`;
+  return s?.uuid || `id_${++Ia}`;
 }
 function Vr(s, e, t) {
   const i = t === "Relation" ? ["id", "_rowId", "source", "target"] : ["id", "_rowId"], r = /* @__PURE__ */ new Set();
@@ -271,12 +271,12 @@ class j {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 var xi = /* @__PURE__ */ ((s) => (s.String = "string", s.Number = "number", s.Boolean = "boolean", s.Timestamp = "timestamp", s))(xi || {});
 const ii = /^[a-zA-Z0-9_]+$/;
-class Ii {
+class Ai {
   constructor(e, t) {
     this._type = "Dictionary", this._options = t, this.uuid = P(t), this.name = e.name, this.type = e.type, this.collection = e.collection ?? !1, this.args = e.args, this.defaultValue = e.defaultValue, this.computation = e.computation;
   }
@@ -331,7 +331,7 @@ class Ii {
   static create(e, t) {
     if (typeof e.name != "string" || !ii.test(e.name))
       throw new Error(`Dictionary name "${e.name}" is invalid. Dictionary names must match ${ii} (letters, numbers and underscore only).`);
-    const i = new Ii(e, t);
+    const i = new Ai(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Dictionary`);
     return this.instances.push(i), i;
@@ -355,7 +355,7 @@ class Ii {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const ri = /^[a-zA-Z0-9_]+$/;
@@ -434,7 +434,7 @@ class x {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const Fe = /^[a-zA-Z0-9_]+$/, nr = ["1:1", "1:n", "n:1", "n:n"];
@@ -641,7 +641,7 @@ class X {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const Qe = /^[a-zA-Z0-9_]+$/;
@@ -715,10 +715,10 @@ class jt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Ai {
+class Ii {
   constructor(e, t) {
     this._type = "NonNullConstraint", this._options = t, this.uuid = P(t), this.name = e.name, this.property = e.property, this.violationCode = e.violationCode;
   }
@@ -753,7 +753,7 @@ class Ai {
   static create(e, t) {
     if (typeof e.name != "string" || !Qe.test(e.name))
       throw new Error(`NonNullConstraint name "${e.name}" is invalid. Constraint names must match ${Qe} (letters, numbers and underscore only).`);
-    const i = new Ai(e, t);
+    const i = new Ii(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, NonNullConstraint`);
     return this.instances.push(i), i;
@@ -776,7 +776,7 @@ class Ai {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Ht {
@@ -891,7 +891,7 @@ class Ht {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Ke {
@@ -944,7 +944,7 @@ class Ke {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Pi {
@@ -1009,7 +1009,7 @@ class Pi {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class at {
@@ -1068,7 +1068,7 @@ class at {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class nt {
@@ -1145,7 +1145,7 @@ class nt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class st {
@@ -1223,7 +1223,7 @@ class st {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ot {
@@ -1288,7 +1288,7 @@ class ot {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ct {
@@ -1353,7 +1353,7 @@ class ct {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ut {
@@ -1432,7 +1432,7 @@ class ut {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class lt {
@@ -1509,7 +1509,7 @@ class lt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Kt {
@@ -1574,7 +1574,7 @@ class Kt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class dt {
@@ -1637,7 +1637,7 @@ class dt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Mi {
@@ -1690,7 +1690,7 @@ class Mi {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class zt {
@@ -1744,7 +1744,7 @@ class zt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Gt {
@@ -1810,7 +1810,7 @@ class Gt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class $ {
@@ -1946,11 +1946,9 @@ class $ {
       const o = n;
       return o && !i || !o && i ? !0 : { data: a, inverse: i, stack: t, error: "atom evaluate error" };
     }
-    if (this.isOr())
-      return this.left.evaluate(e, r) === !0 ? !0 : this.requireRight("or").evaluate(e, r);
-    if (this.isAnd()) {
-      const a = this.left.evaluate(e, r);
-      return a !== !0 ? a : this.requireRight("and").evaluate(e, r);
+    if (this.isOr() || this.isAnd()) {
+      const a = i ? this.isOr() : this.isAnd(), n = this.requireRight(this.isAnd() ? "and" : "or"), o = this.left.evaluate(e, r, i);
+      return a ? o !== !0 ? o : n.evaluate(e, r, i) : o === !0 ? !0 : n.evaluate(e, r, i);
     }
     if (this.isNot())
       return this.left.evaluate(e, r, !i);
@@ -1972,11 +1970,9 @@ class $ {
       const o = n;
       return o && !i || !o && i ? !0 : { data: a, inverse: i, stack: t, error: "atom evaluate error" };
     }
-    if (this.isOr())
-      return await this.left.evaluateAsync(e, r) === !0 ? !0 : this.requireRight("or").evaluateAsync(e, r);
-    if (this.isAnd()) {
-      const a = await this.left.evaluateAsync(e, r);
-      return a !== !0 ? a : this.requireRight("and").evaluateAsync(e, r);
+    if (this.isOr() || this.isAnd()) {
+      const a = i ? this.isOr() : this.isAnd(), n = this.requireRight(this.isAnd() ? "and" : "or"), o = await this.left.evaluateAsync(e, r, i);
+      return a ? o !== !0 ? o : n.evaluateAsync(e, r, i) : o === !0 ? !0 : n.evaluateAsync(e, r, i);
     }
     if (this.isNot())
       return this.left.evaluateAsync(e, r, !i);
@@ -2291,7 +2287,7 @@ class qi {
   // uuid:: 引用（entity）需要 graph 管线（createInstances）才能解析。
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const La = [
@@ -2299,7 +2295,7 @@ const La = [
   X,
   x,
   jt,
-  Ai,
+  Ii,
   Ht,
   Ke,
   Pi,
@@ -2313,7 +2309,7 @@ const La = [
   Kt,
   dt,
   Mi,
-  Ii,
+  Ai,
   Ye,
   zt,
   Gt,
@@ -2741,8 +2737,8 @@ class S {
         const c = [...n.resolvedPath, o], u = this.map.getInfoByPath(c), l = n.resolvedPath.concat(u?.isLinkFiltered() ? u.getBaseAttributeInfo().attributeName : o);
         let d = n.matchExpression;
         if (u?.isLinkFiltered()) {
-          const p = u.getLinkInfo(), h = new S(p.getResolvedBaseRecordName(), this.map, p.getResolvedMatchExpression()), f = this.map.getReversePath(l), y = [u.isRecordSource() ? "source" : "target", ...f.slice(2)], b = h.rebase(y.join("."));
-          d = d ? d.and(b) : b;
+          const p = u.getLinkInfo(), h = new S(p.getResolvedBaseRecordName(), this.map, p.getResolvedMatchExpression()), m = this.map.getReversePath(l), y = [u.isRecordSource() ? "source" : "target", ...m.slice(2)], w = h.rebase(y.join("."));
+          d = d ? d.and(w) : w;
         }
         return {
           path: [...n.path, o],
@@ -2762,12 +2758,35 @@ class S {
         const o = e.data.value[1].split(".");
         o.length > 1 && t.addField(o);
       }
-      if (i.length === 1 && a.isValue)
+      if (!this.contextRootEntity && Array.isArray(e.data.value) && typeof e.data.value[0] == "string" && e.data.value[0].toLowerCase() === "exist" && e.data.value[1] && this.collectExistReferencePaths(e.data.value[1]).forEach((o) => t.addField(o)), i.length === 1 && a.isValue)
         return;
       const n = this.map.spawnManyToManySymmetricPath(r);
       a.isRecord ? n ? n.forEach((o) => t.addRecord(o.slice(1, 1 / 0))) : t.addRecord(i) : n ? n.forEach((o) => t.addField(o.slice(1, 1 / 0))) : t.addField(i);
     }
   }
+  // CAUTION 收集 exist 子查询（含嵌套 exist）里所有 isReferenceValue 的引用路径。这些引用都
+  //  解析自最外层根实体（contextRootEntity 逐层继承），因此必须由根查询统一并入 JOIN 树。
+  //  仅返回跨关联的多段路径（length>1）；单段的是根实体自己的列，无需额外 JOIN。
+  //  节点可能是 BoolExp、ExpressionData 或裸 MatchAtom（exist 的 value[1] 允许这几种形态），统一归一化。
+  collectExistReferencePaths(e) {
+    const t = (a) => a instanceof $ ? a : $.isExpressionData(a) ? $.fromValue(a) : a && typeof a == "object" && "key" in a && "value" in a ? $.atom(a) : null, i = [], r = (a) => {
+      const n = t(a);
+      if (!n) return;
+      if (n.isExpression()) {
+        n.left && r(n.left), n.right && r(n.right);
+        return;
+      }
+      const o = n.data;
+      if (Array.isArray(o.value)) {
+        if (o.isReferenceValue && typeof o.value[1] == "string") {
+          const c = o.value[1].split(".");
+          c.length > 1 && i.push(c);
+        }
+        typeof o.value[0] == "string" && o.value[0].toLowerCase() === "exist" && o.value[1] && r(o.value[1]);
+      }
+    };
+    return r(e), i;
+  }
   getFinalFieldName(e) {
     const t = [this.entityName].concat(e.slice(0, -1));
     return this.map.getTableAliasAndFieldName(t, e.at(-1)).slice(0, 2);
@@ -2876,13 +2895,13 @@ class S {
         }
         let l;
         for (const d of u) {
-          const p = this.getFinalFieldName(d), [h, f] = this.getFinalFieldValue(r.data.isReferenceValue, r.data.key, r.data.value, p.join("."), n.fieldType, e, t), m = {
+          const p = this.getFinalFieldName(d), [h, m] = this.getFinalFieldValue(r.data.isReferenceValue, r.data.key, r.data.value, p.join("."), n.fieldType, e, t), f = {
             ...r.data,
             fieldName: p,
             fieldValue: h,
-            fieldParams: f
+            fieldParams: m
           };
-          l = l ? l.or(m) : $.atom(m);
+          l = l ? l.or(f) : $.atom(f);
         }
         return l;
       } else {
@@ -2897,12 +2916,12 @@ class S {
         for (const p of u) {
           const h = [this.entityName].concat(p);
           T(h.length === o.length, `symmetric path variant must preserve length, ${h} ${o}`);
-          const f = l({
+          const m = l({
             ...r.data,
             namePath: h,
             isFunctionMatch: !0
           });
-          d = d ? d.or(f) : $.atom(f);
+          d = d ? d.or(m) : $.atom(m);
         }
         return d;
       }
@@ -3019,8 +3038,8 @@ class Br {
   }
 }
 class G {
-  constructor(e, t, i, r, a, n, o, c, u, l = !1, d, p, h, 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 = p, this.exit = h, this.alias = f;
+  constructor(e, t, i, r, a, n, o, c, u, l = !1, d, p, h, m) {
+    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 = p, this.exit = h, this.alias = m;
   }
   static create(e, t, i, r, a, n, o, c = !1, u) {
     const d = t.getRecordInfo(e).resolvedBaseRecordName, p = new S(e, t, i.matchExpression, r), h = c ? p : p.and({
@@ -3138,33 +3157,33 @@ class K {
       const u = typeof c == "string" ? [c, {}, !1] : c, [l, d, p] = u;
       if (l === R) {
         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 m = d;
-        f.isLinkManyToManySymmetric() && (m = {
-          ...m,
+        const m = this.map.getInfo(this.parentRecord, this.attributeName);
+        let f = d;
+        m.isLinkManyToManySymmetric() && (f = {
+          ...f,
           attributeQuery: K.mergeAttributeQueryData(
-            m.attributeQuery || [],
+            f.attributeQuery || [],
             [["source", { attributeQuery: ["id"] }], ["target", { attributeQuery: ["id"] }]]
           )
-        }), this.parentLinkRecordQuery = G.create(f.linkName, this.map, m, void 0);
+        }), this.parentLinkRecordQuery = G.create(m.linkName, this.map, f, void 0);
         return;
       }
       if (l === Va) {
-        o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((f) => f.attributeName));
+        o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((m) => m.attributeName));
         return;
       }
       const h = this.map.getInfo(this.recordName, l);
       if (h.isRecord) {
-        let f = l, m = d;
+        let m = l, f = d;
         if (h.isLinkFiltered()) {
-          f = h.getBaseAttributeInfo().attributeName;
-          const b = d.matchExpression, g = h.getLinkInfo().getBaseLinkInfo(), N = new S(g.name, this.map, h.getMatchExpression()).rebase(h.isRecordSource() ? "target" : "source"), E = b ? N.and(b) : N;
-          m = {
+          m = h.getBaseAttributeInfo().attributeName;
+          const w = d.matchExpression, g = h.getLinkInfo().getBaseLinkInfo(), N = new S(g.name, this.map, h.getMatchExpression()).rebase(h.isRecordSource() ? "target" : "source"), E = w ? N.and(w) : N;
+          f = {
             ...d,
             matchExpression: E.data
           };
         }
-        const y = G.create(h.recordName, this.map, m, void 0, this.recordName, f, p, !1, l);
+        const y = G.create(h.recordName, this.map, f, void 0, this.recordName, m, p, !1, l);
         this.relatedRecords.push(y), h.isXToMany ? this.xToManyRecords.push(y) : h.isXToOne && this.xToOneRecords.push(y);
       } else
         o.add(l);
@@ -3174,13 +3193,13 @@ class K {
     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 d = {}, p = ["matchExpression", "modifier", "label", "goto", "exit"];
       for (const h of p) {
-        const f = u[h], m = l[h];
-        if (!(f === void 0 && m === void 0)) {
-          if (f !== void 0 && m !== void 0 && JSON.stringify(f) !== JSON.stringify(m))
+        const m = u[h], f = l[h];
+        if (!(m === void 0 && f === void 0)) {
+          if (m !== void 0 && f !== void 0 && JSON.stringify(m) !== JSON.stringify(f))
             throw new Error(
               `cannot merge duplicate attributeQuery entries for "${c}": both declare a different "${h}". Merging would have to silently pick one (dropping the other's ${h}), which returns wrong data with no warning. Combine them into a single entry explicitly.`
             );
-          d[h] = f !== void 0 ? f : m;
+          d[h] = m !== void 0 ? m : f;
         }
       }
       return d;
@@ -3805,8 +3824,8 @@ class Ua {
         const u = [e].concat(o);
         let l = e;
         for (let h = 0; h < o.length - 1; h++) {
-          const f = o[h], m = o.slice(0, h), y = this.map.getInfoByPath(u.slice(0, h + 2));
-          c(l, m, f), y && y.isRecord && (l = y.recordName);
+          const m = o[h], f = o.slice(0, h), y = this.map.getInfoByPath(u.slice(0, h + 2));
+          c(l, f, m), y && y.isRecord && (l = y.recordName);
         }
         const d = o[o.length - 1], p = o.slice(0, o.length - 1);
         c(l, p, d);
@@ -3905,9 +3924,9 @@ class Ua {
     for (const o of a) {
       const c = o.dependencies.filter((p) => p.entityName === e), u = /* @__PURE__ */ new Set();
       for (const p of c) {
-        if (i && !i.filter((m) => p.attributes.includes(m)).length)
+        if (i && !i.filter((f) => p.attributes.includes(f)).length)
           continue;
-        (await this.findAffectedSourceRecordIds(o, p.path, t)).forEach((f) => u.add(f));
+        (await this.findAffectedSourceRecordIds(o, p.path, t)).forEach((m) => u.add(m));
       }
       if (!u.size) continue;
       const l = Array.from(u), d = await this.checkRecordsMatchFilter(l, o.baseEntityName, o.matchExpression);
@@ -3950,8 +3969,8 @@ class Ua {
         a.matchExpression
       );
       for (const d of u) {
-        const p = ni(a.filteredEntityName, d.id), h = l.has(d.id), f = i.has(p) ? i.get(p) : o.has(d.id);
-        h !== f && t.push({
+        const p = ni(a.filteredEntityName, d.id), h = l.has(d.id), m = i.has(p) ? i.get(p) : o.has(d.id);
+        h !== m && t.push({
           type: h ? "create" : "delete",
           recordName: a.filteredEntityName,
           record: { ...d }
@@ -4075,24 +4094,24 @@ class Ha {
       l,
       t,
       u
-    ), [h, f] = this.buildSelectClause(
+    ), [h, m] = this.buildSelectClause(
       e.attributeQuery.getValueAndXToOneRecordFields(),
       t
-    ), m = this.buildFromClause(e.recordName, t), y = this.buildJoinClause(c, t), b = this.buildModifierClause(e.modifier, t, f);
+    ), f = this.buildFromClause(e.recordName, t), y = this.buildJoinClause(c, t), w = this.buildModifierClause(e.modifier, t, m);
     return [
       `
 SELECT
 ${h}
 FROM
-${m}
+${f}
 ${y}
 WHERE
 ${d}
 
-${b}
+${w}
 `,
       p,
-      f
+      m
     ];
   }
   /**
@@ -4161,13 +4180,13 @@ ${b}
       if (d !== "ASC" && d !== "DESC")
         throw new Error(`orderBy value must be 'ASC' or 'DESC', got: ${JSON.stringify(l)} for attribute ${c}`);
       const p = c.split(".");
-      let h, f;
-      p.length === 1 ? (h = [u], f = c) : (h = [u, ...p.slice(0, -1)], f = p[p.length - 1]);
-      const [m, y] = this.map.getTableAliasAndFieldName(
+      let h, m;
+      p.length === 1 ? (h = [u], m = c) : (h = [u, ...p.slice(0, -1)], m = p[p.length - 1]);
+      const [f, y] = this.map.getTableAliasAndFieldName(
         h,
-        f
+        m
       );
-      return `"${`${this.withPrefix(t)}${m}`}"."${y}" ${d}`;
+      return `"${`${this.withPrefix(t)}${f}`}"."${y}" ${d}`;
     }).join(",")}`), r != null && o.push(`LIMIT ${r}`), a != null && a !== 0 && o.push(`OFFSET ${a}`), o.join(`
 `);
   }
@@ -4191,15 +4210,15 @@ ${b}
         table: d,
         alias: p,
         linkTable: h,
-        linkAlias: f
-      } = this.map.getTableAndAliasStack(l).at(-1), [, m] = this.map.getTableAliasAndFieldName(l, "id", !0);
+        linkAlias: m
+      } = this.map.getTableAndAliasStack(l).at(-1), [, f] = this.map.getTableAliasAndFieldName(l, "id", !0);
       if (!u.isMergedWithParent())
         if (u.isLinkMergedWithParent()) {
           if (o.onlyIdField()) return;
           r.push({
             for: l,
             joinSource: n,
-            joinIdField: [u.linkField, m],
+            joinIdField: [u.linkField, f],
             joinTarget: [d, p]
           });
         } else if (u.isLinkMergedWithAttribute()) {
@@ -4213,26 +4232,26 @@ ${b}
             joinTarget: [d, p]
           });
         } else {
-          const y = u.getLinkInfo(), b = u.isLinkManyToManySymmetric() ? u.symmetricDirection === "source" : y.isRelationSource(u.parentEntityName, u.attributeName);
+          const y = u.getLinkInfo(), w = u.isLinkManyToManySymmetric() ? u.symmetricDirection === "source" : y.isRelationSource(u.parentEntityName, u.attributeName);
           r.push({
             for: l,
             joinSource: n,
-            joinIdField: [a, b ? y.record.attributes.source.field : y.record.attributes.target.field],
-            joinTarget: [h, f]
+            joinIdField: [a, w ? y.record.attributes.source.field : y.record.attributes.target.field],
+            joinTarget: [h, m]
           }), o.onlyIdField() || r.push({
             for: l,
-            joinSource: [h, f],
-            joinIdField: [b ? y.record.attributes.target.field : y.record.attributes.source.field, m],
+            joinSource: [h, m],
+            joinIdField: [w ? y.record.attributes.target.field : y.record.attributes.source.field, f],
             joinTarget: [d, p]
           });
         }
-      if (r.push(...this.getJoinTables(o, l, [m, d, p])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
-        const y = l.concat(R), [, b] = this.map.getTableAliasAndFieldName(y, "id", !0), g = [
-          b,
+      if (r.push(...this.getJoinTables(o, l, [f, d, p])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
+        const y = l.concat(R), [, w] = this.map.getTableAliasAndFieldName(y, "id", !0), g = [
+          w,
           // link 的 idField
           h,
           // link 的 tableName
-          f
+          m
           // link 的 tableAlias
         ];
         r.push(...this.getJoinTables(o.parentLinkQueryTree, y, g));
@@ -4451,16 +4470,16 @@ class za {
     if (i || (i = new Ka(e)), e.goto) {
       if (e.exit && await e.exit(r))
         return [];
-      const b = i.get(e.goto);
-      T(b, `goto ${e.goto} not found`);
-      const g = e.matchExpression.and(b.matchExpression), w = b.derive({
+      const w = i.get(e.goto);
+      T(w, `goto ${e.goto} not found`);
+      const g = e.matchExpression.and(w.matchExpression), b = w.derive({
         matchExpression: g
       });
-      return this.findRecords(w, t, i, r);
+      return this.findRecords(b, t, i, r);
     }
     if (e.label && r.label === e.label && r.stack.length > 1) {
-      const b = r.stack.at(-1);
-      if (r.stack.slice(0, -1).some((g) => g.id === b.id))
+      const w = r.stack.at(-1);
+      if (r.stack.slice(0, -1).some((g) => g.id === w.id))
         return [];
     }
     const n = e.modifier, o = (n.limit !== void 0 || n.offset !== void 0) && !(n.limit === 1 && !n.offset) && (this.queryTreeHasXToManyPath(e.matchExpression.xToOneQueryTree) || this.queryTreeHasXToManyPath(e.modifier.xToOneQueryTree)), c = o ? e.derive({
@@ -4475,48 +4494,48 @@ FOR UPDATE OF "${e.recordName}"` : u,
       l,
       t
     );
-    let f = this.dedupeIdenticalRows(h);
+    let m = this.dedupeIdenticalRows(h);
     if (o) {
-      const b = n.offset || 0;
-      f = f.slice(
-        b,
-        n.limit !== void 0 ? b + n.limit : void 0
+      const w = n.offset || 0;
+      m = m.slice(
+        w,
+        n.limit !== void 0 ? w + n.limit : void 0
       );
     }
-    const m = this.structureRawReturns(f, e.recordName, d), y = e.label && e.label !== r.label ? r.spawn(e.label) : r;
-    await this.completeXToOneLeftoverRecords(e, m, i, y);
-    for (let b of e.attributeQuery.xToOneRecords)
-      if (b.goto) {
-        const w = this.map.getInfo(b.parentRecord, b.attributeName).getReverseInfo()?.attributeName;
-        for (let N of m) {
-          const E = b.matchExpression.and({
-            key: `${w}.id`,
+    const f = this.structureRawReturns(m, e.recordName, d), y = e.label && e.label !== r.label ? r.spawn(e.label) : r;
+    await this.completeXToOneLeftoverRecords(e, f, i, y);
+    for (let w of e.attributeQuery.xToOneRecords)
+      if (w.goto) {
+        const b = this.map.getInfo(w.parentRecord, w.attributeName).getReverseInfo()?.attributeName;
+        for (let N of f) {
+          const E = w.matchExpression.and({
+            key: `${b}.id`,
             value: ["=", N.id]
-          }), v = b.derive({
+          }), v = w.derive({
             matchExpression: E
           }), k = e.label ? y.concat(N) : y;
-          N[b.alias || b.attributeName] = await this.findRecords(v, t, i, k);
+          N[w.alias || w.attributeName] = await this.findRecords(v, t, i, k);
         }
       }
-    for (let b of e.attributeQuery.xToOneRecords) {
-      const g = b.attributeQuery.parentLinkRecordQuery;
+    for (let w of e.attributeQuery.xToOneRecords) {
+      const g = w.attributeQuery.parentLinkRecordQuery;
       if (g)
-        for (let w of g.attributeQuery.xToManyRecords) {
-          const E = this.map.getInfo(w.parentRecord, w.attributeName).getReverseInfo()?.attributeName;
-          for (let v of m) {
-            if (!v[b.attributeName]?.[R]) continue;
-            const k = v[b.attributeName][R].id, q = w.derive({
-              matchExpression: w.matchExpression.and({
+        for (let b of g.attributeQuery.xToManyRecords) {
+          const E = this.map.getInfo(b.parentRecord, b.attributeName).getReverseInfo()?.attributeName;
+          for (let v of f) {
+            if (!v[w.attributeName]?.[R]) continue;
+            const k = v[w.attributeName][R].id, q = b.derive({
+              matchExpression: b.matchExpression.and({
                 key: `${E}.id`,
                 value: ["=", k]
               })
             }), F = e.label ? y.concat(v) : y;
             gt(
               v,
-              [b.alias || b.attributeName, R, w.attributeName],
+              [w.alias || w.attributeName, R, b.attributeName],
               await this.findRecords(
                 q,
-                `finding relation data: ${e.recordName}.${b.attributeName}.&.${w.attributeName}`,
+                `finding relation data: ${e.recordName}.${w.attributeName}.&.${b.attributeName}`,
                 i,
                 F
               )
@@ -4524,30 +4543,30 @@ FOR UPDATE OF "${e.recordName}"` : u,
           }
         }
     }
-    for (let b of e.attributeQuery.xToManyRecords)
-      if (!b.onlyRelationData)
-        if (this.canBatchXToManyQuery(e, b, m))
+    for (let w of e.attributeQuery.xToManyRecords)
+      if (!w.onlyRelationData)
+        if (this.canBatchXToManyQuery(e, w, f))
           await this.findXToManyRelatedRecordsBatched(
             e.recordName,
-            b.attributeName,
-            m,
-            b,
+            w.attributeName,
+            f,
+            w,
             i,
             y
           );
         else
-          for (let g of m) {
-            const w = e.label ? y.concat(g) : y;
-            g[b.alias || b.attributeName] = await this.findXToManyRelatedRecords(
+          for (let g of f) {
+            const b = e.label ? y.concat(g) : y;
+            g[w.alias || w.attributeName] = await this.findXToManyRelatedRecords(
               e.recordName,
-              b.attributeName,
+              w.attributeName,
               g.id,
-              b,
+              w,
               i,
-              w
+              b
             );
           }
-    return m;
+    return f;
   }
   /**
    * 判断查询树中是否存在 x:n 路径（会导致 LEFT JOIN fan-out）。
@@ -4587,21 +4606,21 @@ FOR UPDATE OF "${e.recordName}"` : u,
       y[l] = [], d.set(String(y.id), y);
     const p = r.attributeQuery.data.some(
       (y) => (typeof y == "string" ? y : y[0]) === u
-    ), h = p ? r.attributeQuery.data : [...r.attributeQuery.data, [u, { attributeQuery: ["id"] }]], f = r.attributeQuery.parentLinkRecordQuery, m = !!f;
+    ), h = p ? r.attributeQuery.data : [...r.attributeQuery.data, [u, { attributeQuery: ["id"] }]], m = r.attributeQuery.parentLinkRecordQuery, f = !!m;
     for (let y = 0; y < i.length; y += 500) {
-      const b = i.slice(y, y + 500), g = r.matchExpression.and({
+      const w = i.slice(y, y + 500), g = r.matchExpression.and({
         key: `${u}.id`,
-        value: ["in", b.map((v) => v.id)]
-      }), w = new K(
+        value: ["in", w.map((v) => v.id)]
+      }), b = new K(
         r.recordName,
         this.map,
         h,
         r.parentRecord,
         r.attributeName,
-        m
+        f
       ), N = r.derive({
         matchExpression: g,
-        attributeQuery: w
+        attributeQuery: b
       }), E = await this.findRecords(
         N,
         `finding related records in batch: ${r.parentRecord}.${r.attributeName}`,
@@ -4610,8 +4629,8 @@ FOR UPDATE OF "${e.recordName}"` : u,
       );
       for (const v of E) {
         const k = v[u]?.id, q = k !== void 0 ? d.get(String(k)) : void 0;
-        if (m ? (v[R] = v[u]?.[R], delete v[u]) : p || delete v[u], f)
-          for (let F of f.attributeQuery.xToManyRecords) {
+        if (f ? (v[R] = v[u]?.[R], delete v[u]) : p || delete v[u], m)
+          for (let F of m.attributeQuery.xToManyRecords) {
             const Y = v[R].id;
             gt(
               v,
@@ -4692,29 +4711,29 @@ FOR UPDATE OF "${e.recordName}"` : u,
       h = p;
     else if (!o.isLinkManyToManySymmetric())
       h = p.map((y) => {
-        const b = {
+        const w = {
           ...y,
           [R]: y[c][R]
         };
-        return delete b[c], b;
+        return delete w[c], w;
       });
     else {
-      const b = r.attributeQuery.data.find(
+      const w = r.attributeQuery.data.find(
         (v) => Array.isArray(v) && v[0] === R
-      )?.[1]?.attributeQuery || [], g = (v) => b.some((k) => k === v || Array.isArray(k) && k[0] === v), w = g("source"), N = g("target"), E = /* @__PURE__ */ new Set();
+      )?.[1]?.attributeQuery || [], g = (v) => w.some((k) => k === v || Array.isArray(k) && k[0] === v), b = g("source"), N = g("target"), E = /* @__PURE__ */ new Set();
       h = [];
       for (const v of p) {
-        const k = (I, ne) => {
-          if (!I?.id) return;
-          const L = ne ? I.source?.id : I.target?.id, ye = ne ? I.target?.id : I.source?.id;
-          return String(ye) === String(i) && String(L) === String(v.id) ? I : void 0;
+        const k = (A, ne) => {
+          if (!A?.id) return;
+          const L = ne ? A.source?.id : A.target?.id, ye = ne ? A.target?.id : A.source?.id;
+          return String(ye) === String(i) && String(L) === String(v.id) ? A : void 0;
         }, q = k(v[`${c}:source`]?.[R], !0) ?? k(v[`${c}:target`]?.[R], !1);
         if (!q) continue;
         const F = `${v.id}::${q.id}`;
         if (E.has(F)) continue;
         E.add(F);
         const Y = { ...q };
-        w || delete Y.source, N || delete Y.target;
+        b || delete Y.source, N || delete Y.target;
         const M = {
           ...v,
           [R]: Y
@@ -4722,13 +4741,13 @@ FOR UPDATE OF "${e.recordName}"` : u,
         delete M[`${c}:source`], delete M[`${c}:target`], h.push(M);
       }
     }
-    const f = d.label && d.label !== n.label ? n.spawn(d.label) : n, m = r.attributeQuery.parentLinkRecordQuery;
-    if (m)
-      for (let y of m.attributeQuery.xToManyRecords)
-        for (let b of h) {
-          const g = b[R].id, w = d.label ? f.concat(b) : f;
+    const m = d.label && d.label !== n.label ? n.spawn(d.label) : n, f = r.attributeQuery.parentLinkRecordQuery;
+    if (f)
+      for (let y of f.attributeQuery.xToManyRecords)
+        for (let w of h) {
+          const g = w[R].id, b = d.label ? m.concat(w) : m;
           gt(
-            b,
+            w,
             [R, y.attributeName],
             await this.findXToManyRelatedRecords(
               y.parentRecord,
@@ -4736,7 +4755,7 @@ FOR UPDATE OF "${e.recordName}"` : u,
               g,
               y,
               a,
-              w
+              b
             )
           );
         }
@@ -4751,23 +4770,23 @@ FOR UPDATE OF "${e.recordName}"` : u,
       value: ["=", i]
     }), u = K.getAttributeQueryDataForRecord(e, this.map, !0, !0, !1, !0), l = t;
     let d = u;
-    for (let m of o)
-      d.push([m, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
+    for (let f of o)
+      d.push([f, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
     d.push([n, { label: l, attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
-    for (let m of o)
-      d.push([m, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
+    for (let f of o)
+      d.push([f, { attributeQuery: ["*"] }]), d = d.at(-1)[1].attributeQuery;
     let p;
-    const h = async (m) => {
+    const h = async (f) => {
       if (p) return !0;
-      if (m.stack.at(-1)?.id === r)
-        return p = [...m.stack], !0;
+      if (f.stack.at(-1)?.id === r)
+        return p = [...f.stack], !0;
     };
     d.push([n, { goto: l, exit: h }]);
-    const f = (await this.findRecords(G.create(e, this.map, {
+    const m = (await this.findRecords(G.create(e, this.map, {
       matchExpression: c,
       attributeQuery: u
     }), `find records for path ${e}.${t}`))[0];
-    return p ? [f, ...p] : void 0;
+    return p ? [m, ...p] : void 0;
   }
 }
 class Ga {
@@ -4837,15 +4856,15 @@ class Ga {
           }
         ), d = await this.agent.findRecords(l, `find record with same row data for delete ${e}`);
         if (o.notRelianceCombined.some((h) => !!d[0]?.[h.attributeName]?.id)) {
-          const h = o.combinedRecords.filter((y) => !(o.isRelation && (y.attributeName === "source" || y.attributeName === "target"))).flatMap((y) => y.getLinkInfo().recordInfo.sameRowFields), [f, m] = this.sqlBuilder.buildUpdateFieldsToNullSQL(
+          const h = o.combinedRecords.filter((y) => !(o.isRelation && (y.attributeName === "source" || y.attributeName === "target"))).flatMap((y) => y.getLinkInfo().recordInfo.sameRowFields), [m, f] = this.sqlBuilder.buildUpdateFieldsToNullSQL(
             o.name,
             [.../* @__PURE__ */ new Set([...o.sameRowFields, ...h])],
             u
           );
-          await this.database.update(f, m, o.idField, `use update to delete ${e} because of sameRowData`);
+          await this.database.update(m, f, o.idField, `use update to delete ${e} because of sameRowData`);
         } else {
-          const [h, f] = this.sqlBuilder.buildDeleteSQL(o.name, o.idField, u.id);
-          await this.database.delete(h, f, `delete record ${o.name} as row`);
+          const [h, m] = this.sqlBuilder.buildDeleteSQL(o.name, o.idField, u.id);
+          await this.database.delete(h, m, `delete record ${o.name} as row`);
         }
       }
       for (let l of o.sameTableReliance)
@@ -4971,11 +4990,11 @@ class Wa {
       attributeQuery: c
     }), l = await this.agent.findRecords(u, `find record for updating ${e}`), d = Object.keys(i.getData()), p = [];
     for (let h of l) {
-      const f = Array.from(/* @__PURE__ */ new Set([
+      const m = Array.from(/* @__PURE__ */ new Set([
         ...d,
         ...i.getSameRowFieldAndValue(h).map((N) => N.name)
-      ])), m = await this.filteredEntityManager.collectMembershipChecks(u.recordName, [h.id], f, r), y = r ? await this.collectUpdateLinkChecks(i, r) : [], b = await this.agent.createRecordDependency(i, r), g = await this.updateSameRowData(u.recordName, h, b, r), w = await this.handleUpdateReliance(u.recordName, h, i, r);
-      await this.filteredEntityManager.settleMembershipChecks(m.concat(y), r), p.push({ ...i.getData(), ...g.getData(), ...w });
+      ])), f = await this.filteredEntityManager.collectMembershipChecks(u.recordName, [h.id], m, r), y = r ? await this.collectUpdateLinkChecks(i, r) : [], w = await this.agent.createRecordDependency(i, r), g = await this.updateSameRowData(u.recordName, h, w, r), b = await this.handleUpdateReliance(u.recordName, h, i, r);
+      await this.filteredEntityManager.settleMembershipChecks(f.concat(y), r), p.push({ ...i.getData(), ...g.getData(), ...b });
     }
     return p;
   }
@@ -5127,69 +5146,74 @@ class Ja {
    *  事件流只反映关系层面的事实：旧 link delete + 新 link create（见下方 events?.push）。
    */
   async flashOutCombinedRecordsAndMergedLinks(e, t, i = "", r) {
-    const a = {}, n = r?.size ? e.combinedRecordIdRefs.filter((p) => !r.has(p.info.attributeName)) : e.combinedRecordIdRefs;
+    const a = {}, n = r?.size ? e.combinedRecordIdRefs.filter((h) => !r.has(h.info.attributeName)) : e.combinedRecordIdRefs;
     if (!n.length) return a;
     let o;
     const c = K.getAttributeQueryDataForRecord(e.recordName, this.map, !0, !0, !1, !0);
-    for (let p of n) {
-      const h = {
-        key: `${p.info.attributeName}.id`,
-        value: ["=", p.getRef().id]
+    for (let h of n) {
+      const m = {
+        key: `${h.info.attributeName}.id`,
+        value: ["=", h.getRef().id]
       };
-      o ? o = o.or(h) : o = S.atom(h);
+      o ? o = o.or(m) : o = S.atom(m);
     }
     const u = G.create(e.recordName, this.map, {
       matchExpression: o,
       attributeQuery: c
-    }, void 0, void 0, void 0, !1, !0), l = await this.queryExecutor.findRecords(u, i, void 0), d = this.map.getRecordInfo(e.recordName).isRelation && !!this.map.data.links[e.recordName];
-    for (let p of l) {
-      d && p.id && t?.push({
+    }, void 0, void 0, void 0, !1, !0), l = await this.queryExecutor.findRecords(u, i, void 0), d = this.map.getRecordInfo(e.recordName).isRelation && !!this.map.data.links[e.recordName], p = [];
+    for (let h of l) {
+      d && h.id && t?.push({
         type: "delete",
         recordName: e.recordName,
         record: {
-          ...Object.fromEntries(Object.entries(p).filter(([, h]) => h === null || typeof h != "object")),
-          id: p.id,
-          source: { id: p.source?.id },
-          target: { id: p.target?.id }
+          ...Object.fromEntries(Object.entries(h).filter(([, m]) => m === null || typeof m != "object")),
+          id: h.id,
+          source: { id: h.source?.id },
+          target: { id: h.target?.id }
         }
       });
-      for (let h of n)
-        if (p[h.info?.attributeName]?.id === h.getRef().id) {
-          if (await this.deleteRecordSameRowData(h.recordName, [{ id: p[h.info?.attributeName].id }]), p.id && t?.push({
+      for (let m of n)
+        if (h[m.info?.attributeName]?.id === m.getRef().id) {
+          if (h.id && !m.info.isLinkSourceRelation() && p.push(...await this.filteredEntityManager.collectMembershipChecks(
+            e.recordName,
+            [h.id],
+            [m.info.attributeName],
+            t
+          )), await this.deleteRecordSameRowData(m.recordName, [{ id: h[m.info?.attributeName].id }]), h.id && t?.push({
             type: "delete",
-            recordName: h.info.linkName,
-            record: p[h.info?.attributeName][R]
-          }), T(!a[h.info?.attributeName], `should not have same combined record, conflict attribute: ${h.info?.attributeName}`), a[h.info?.attributeName] = {
-            ...p[h.info?.attributeName]
+            recordName: m.info.linkName,
+            record: h[m.info?.attributeName][R]
+          }), T(!a[m.info?.attributeName], `should not have same combined record, conflict attribute: ${m.info?.attributeName}`), a[m.info?.attributeName] = {
+            ...h[m.info?.attributeName]
           }, this.map.getRecordInfo(e.recordName).isRelation && this.map.data.links[e.recordName]) {
-            const m = a[h.info?.attributeName], y = this.map.getRecordInfo(h.recordName);
-            for (const b of y.mergedRecordAttributes) {
-              if (b.linkName !== e.recordName) continue;
-              const g = m[b.attributeName];
-              if (g?.id === void 0) continue;
-              const w = g[R], N = !this.map.getLinkInfoByName(e.recordName).isRelationSource(h.recordName, b.attributeName);
+            const y = a[m.info?.attributeName], w = this.map.getRecordInfo(m.recordName);
+            for (const g of w.mergedRecordAttributes) {
+              if (g.linkName !== e.recordName) continue;
+              const b = y[g.attributeName];
+              if (b?.id === void 0) continue;
+              const N = b[R], E = !this.map.getLinkInfoByName(e.recordName).isRelationSource(m.recordName, g.attributeName);
               t?.push({
                 type: "delete",
                 recordName: e.recordName,
                 record: {
-                  ...w || {},
-                  source: N ? { id: m.id } : { id: g.id },
-                  target: N ? { id: g.id } : { id: m.id }
+                  ...N || {},
+                  source: E ? { id: y.id } : { id: b.id },
+                  target: E ? { id: b.id } : { id: y.id }
                 }
-              }), delete m[b.attributeName];
+              }), delete y[g.attributeName];
             }
           }
-          h.info.isLinkSourceRelation() || (a[h.info?.attributeName][R] = {
-            ...h.linkRecordData?.getData() || {},
-            id: await this.database.getAutoId(h.info.linkName)
+          m.info.isLinkSourceRelation() || (a[m.info?.attributeName][R] = {
+            ...m.linkRecordData?.getData() || {},
+            id: await this.database.getAutoId(m.info.linkName)
           }, t?.push({
             type: "create",
-            recordName: h.info.linkName,
-            record: a[h.info?.attributeName][R]
+            recordName: m.info.linkName,
+            record: a[m.info?.attributeName][R]
           }));
         }
     }
-    return a;
+    return await this.filteredEntityManager.settleMembershipChecks(p, t), a;
   }
   /**
    * 重定位合并记录数据用于链接
@@ -5299,15 +5323,15 @@ function ur(s) {
 }
 function Xa(s, e) {
   const t = new pi(s, e), i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), n = [...s, ...e], o = /* @__PURE__ */ new Map();
-  for (const f of n) {
-    const m = H(f), { root: y } = Qr(f);
-    De(y) ? i.add(m) : o.set(m, H(y));
-  }
-  const c = /* @__PURE__ */ new Map(), u = ur(s.filter((f) => f.inputEntities)), l = ur(e.filter((f) => f.inputRelations)), d = lr(s), p = lr(e);
-  for (const f of u)
-    dr(f, t, "entity", d, o, c, i, r, a);
-  for (const f of l)
-    dr(f, t, "relation", p, o, c, i, r, a);
+  for (const m of n) {
+    const f = H(m), { root: y } = Qr(m);
+    De(y) ? i.add(f) : o.set(f, H(y));
+  }
+  const c = /* @__PURE__ */ new Map(), u = ur(s.filter((m) => m.inputEntities)), l = ur(e.filter((m) => m.inputRelations)), d = lr(s), p = lr(e);
+  for (const m of u)
+    dr(m, t, "entity", d, o, c, i, r, a);
+  for (const m of l)
+    dr(m, t, "relation", p, o, c, i, r, a);
   return { ...t.getAll(), abstractNames: i, discriminatorHostNames: r, inputWritablePropertyNames: a };
 }
 function lr(s) {
@@ -5368,22 +5392,22 @@ function dr(s, e, t, i, r, a, n, o, c) {
     ...Ya(v, r, a)
   })), h = /* @__PURE__ */ new Set();
   p.forEach((v) => v.hostedTypes.forEach((k) => h.add(k)));
-  let f = p[0]?.memberCondition;
+  let m = p[0]?.memberCondition;
   for (let v = 1; v < p.length; v++)
-    f = f.or(p[v].memberCondition);
-  const m = u ? e.getEntityByName(l) : e.getRelationByName(l), y = [
-    ...en(m, i, e),
+    m = m.or(p[v].memberCondition);
+  const f = u ? e.getEntityByName(l) : e.getRelationByName(l), y = [
+    ...en(f, i, e),
     Za(r),
     ...s.properties
-  ], b = d.some((v) => ke(v)), [g, w] = tn(
-    m,
+  ], w = d.some((v) => ke(v)), [g, b] = tn(
+    f,
     y,
-    b ? f : void 0
+    w ? m : void 0
   );
-  e.replace(g, m);
-  let N = w;
-  w !== g && (N = e.add(w), ht(g) ? g.baseEntity = N : g.baseRelation = N, n.add(H(N))), a.set(l, {
-    memberCondition: f,
+  e.replace(g, f);
+  let N = b;
+  b !== g && (N = e.add(b), ht(g) ? g.baseEntity = N : g.baseRelation = N, n.add(H(N))), a.set(l, {
+    memberCondition: m,
     hostedTypes: h,
     physicalBaseName: H(N)
   }), o.add(H(N));
@@ -5452,12 +5476,12 @@ function en(s, e, t) {
       if (!l)
         a.set(p, u);
       else {
-        const h = t.getEntityByName(p) || t.getRelationByName(p), f = h && !!De(h);
-        if (h && !f) {
-          const m = Object.fromEntries(
+        const h = t.getEntityByName(p) || t.getRelationByName(p), m = h && !!De(h);
+        if (h && !m) {
+          const f = Object.fromEntries(
             h.properties.filter((y) => y.name !== pe).map((y) => [y.name, y])
           );
-          a.set(p, m), Object.assign(n, m);
+          a.set(p, f), Object.assign(n, f);
         }
       }
       d.push(...e.get(p) || []);
@@ -5573,9 +5597,9 @@ class yi {
           `'${pe}' is the discriminator column of merged record '${n}' and is managed by the framework — it is written once at creation based on the name the record is created as, and cannot be set or changed through create/update. To move a record between input views, change the data its membership conditions depend on instead.`
         );
     }
-    const a = i && t[Ae] !== void 0;
+    const a = i && t[Ie] !== void 0;
     for (const [n, o] of Object.entries(t)) {
-      if (n === Ae || n === Pe || n === R) continue;
+      if (n === Ie || n === Pe || n === R) continue;
       const [c] = this.map.getAttributeAndSymmetricDirection(n), u = r.attributes[c];
       if (!u) {
         if (a) continue;
@@ -5924,23 +5948,23 @@ class qe {
       path: [t]
     }];
     for (let p = 0; p < i.length; p++) {
-      const [h, f] = this.getAttributeAndSymmetricDirection(i[p]), m = [t, ...i.slice(0, p + 1)];
+      const [h, m] = this.getAttributeAndSymmetricDirection(i[p]), f = [t, ...i.slice(0, p + 1)];
       if (h === R) {
-        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;
+        const { linkTable: y, linkAlias: w, path: g } = d.pop();
+        T(!u, `last attribute in path is a link, cannot read link of a link ${g.join(".")}`), a = y, n = w, r = this.data.records[l.linkName], u = !0, o = "", c = "", l = void 0;
       } else {
-        l = this.getInfoByPath(m);
+        l = this.getInfoByPath(f);
         const y = r.attributes[h];
         T(l.isRecord, `${i.slice(0, p + 1).join(".")} is not a entity attribute`);
-        const b = this.data.records[y.recordName], g = `${n}_${h}${f ? `_${f.toUpperCase()}` : ""}`, w = this.aliasManager?.registerTablePath(g) || g;
+        const w = this.data.records[y.recordName], g = `${n}_${h}${m ? `_${m.toUpperCase()}` : ""}`, b = this.aliasManager?.registerTablePath(g) || g;
         if (l.isMergedWithParent() || l.isLinkMergedWithParent())
           c = n;
         else if (l.isLinkIsolated()) {
           const N = `REL_${g}`;
           c = this.aliasManager?.registerTablePath(N) || N;
         } else
-          c = w;
-        l.isMergedWithParent() || (n = w), a = l.table, r = b, o = l.getLinkInfo()?.table, u = !1;
+          c = b;
+        l.isMergedWithParent() || (n = b), a = l.table, r = w, o = l.getLinkInfo()?.table, u = !1;
       }
       d.push({
         table: a,
@@ -5949,7 +5973,7 @@ class qe {
         isLinkRecord: u,
         linkTable: o,
         linkAlias: c,
-        path: m
+        path: f
       });
     }
     return d;
@@ -5958,19 +5982,19 @@ class qe {
     const r = this.getTableAndAliasStack(e), { table: a, alias: n, record: o, path: c, linkAlias: u, linkTable: l, isLinkRecord: d } = r.at(-1), p = !d && r.length > 1 ? this.getInfoByPath(c) : null;
     if (!i && t === "id" && !d && e.length > 1 && (p?.isLinkMergedWithParent() || p?.isLinkIsolated()))
       if (p?.isLinkMergedWithParent()) {
-        const { alias: f, table: m } = r.at(-2);
-        return [f, p.linkField, m];
+        const { alias: m, table: f } = r.at(-2);
+        return [m, p.linkField, f];
       } else {
-        const f = p.getLinkInfo().record, m = p?.isLinkManyToManySymmetric() ? p?.symmetricDirection === "source" ? f?.attributes.target.field : f?.attributes.source.field : p.isRecordSource() ? f?.attributes.target.field : f?.attributes.source.field;
-        return [u, m, l];
+        const m = p.getLinkInfo().record, f = p?.isLinkManyToManySymmetric() ? p?.symmetricDirection === "source" ? m?.attributes.target.field : m?.attributes.source.field : p.isRecordSource() ? m?.attributes.target.field : m?.attributes.source.field;
+        return [u, f, l];
       }
     else {
-      const [f] = this.getAttributeAndSymmetricDirection(t), m = o.attributes[f];
-      if (!m)
+      const [m] = this.getAttributeAndSymmetricDirection(t), f = o.attributes[m];
+      if (!f)
         throw new Error(`attribute "${t}" not found on "${e.join(".")}"`);
-      const y = m.field;
+      const y = f.field;
       if (!y)
-        throw m.isRecord ? new Error(
+        throw f.isRecord ? new Error(
           `attribute "${t}" on "${e.join(".")}" is a relation, not a value field. Use a value path through the relation instead (e.g. "${t}.someField").`
         ) : new Error(`attribute "${t}" on "${e.join(".")}" has no physical field`);
       return [n, y, a];
@@ -6062,8 +6086,8 @@ class qe {
         if (d === "source" || d === "target") {
           const p = this.getInfo(n, l);
           if (p.isRecord) {
-            const h = p.getLinkInfo().data, f = p.isRecordSource() ? h.targetRecord : h.sourceRecord, m = d === "source" ? h.sourceRecord : h.targetRecord;
-            if (f === m) {
+            const h = p.getLinkInfo().data, m = p.isRecordSource() ? h.targetRecord : h.sourceRecord, f = d === "source" ? h.sourceRecord : h.targetRecord;
+            if (m === f) {
               o += 2;
               continue;
             }
@@ -6373,8 +6397,8 @@ class le {
         }
       ];
     }));
-    t && T(!i.source && !i.target, "source and target is reserved name for relation attributes"), i[Ae] = {
-      name: Ae,
+    t && T(!i.source && !i.target, "source and target is reserved name for relation attributes"), i[Ie] = {
+      name: Ie,
       type: "id",
       fieldType: this.database.mapToDBFieldType("pk")
     };
@@ -6646,11 +6670,11 @@ class le {
    */
   validatePropertyNames() {
     const e = (t, i) => {
-      const r = new Set(i ? [Ae, Pe, "source", "target"] : [Ae, Pe]), a = /* @__PURE__ */ new Set();
+      const r = new Set(i ? [Ie, Pe, "source", "target"] : [Ie, Pe]), a = /* @__PURE__ */ new Set();
       for (const n of t.properties || []) {
         if (r.has(n.name))
           throw new Error(
-            `Property name '${n.name}' on ${i ? "relation" : "entity"} '${t.name}' is reserved: ` + (n.name === Ae || n.name === Pe ? `the framework manages the '${n.name}' column and would silently overwrite your declaration (including any defaultValue/computation on it). Use a different name, e.g. 'externalId'.` : "'source'/'target' are the relation's endpoint attributes. Use a different name for the relation property.")
+            `Property name '${n.name}' on ${i ? "relation" : "entity"} '${t.name}' is reserved: ` + (n.name === Ie || n.name === Pe ? `the framework manages the '${n.name}' column and would silently overwrite your declaration (including any defaultValue/computation on it). Use a different name, e.g. 'externalId'.` : "'source'/'target' are the relation's endpoint attributes. Use a different name for the relation property.")
           );
         if (a.has(n.name))
           throw new Error(
@@ -6822,14 +6846,14 @@ 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, p = this.map.links[d], { relType: h, sourceRecord: f, targetRecord: m } = p;
+        const u = n[c], l = this.map.records[o].attributes[u], d = l.linkName, p = this.map.links[d], { relType: h, sourceRecord: m, targetRecord: f } = p;
         T(
-          h[0] === "1" && h[1] === "1" && f !== m,
+          h[0] === "1" && h[1] === "1" && m !== f,
           `only 1:1 can merge: ${a}.${n.slice(0, c + 1).join(".")}`
         );
-        const y = f === o ? m : f, b = this.combineRecordTable(o, y, d);
-        if (b)
-          throw new Error(`conflict found when join ${d}, ${b.join(",")} already merged with ${o}`);
+        const y = m === o ? f : m, w = this.combineRecordTable(o, y, d);
+        if (w)
+          throw new Error(`conflict found when join ${d}, ${w.join(",")} already merged with ${o}`);
         p.mergedTo = "combined", i.push(p), o = l.recordName, delete e[d], delete t[d];
       }
     }), Object.values(e).forEach((r) => {
@@ -7099,7 +7123,7 @@ ${Object.values(this.tables[e].columns).map((i) => `    "${i.name}" ${i.fieldTyp
     });
   }
 }
-const We = "_System_", Z = "_Dictionary_", Ae = "id", Pe = "_rowId", fr = j.create({
+const We = "_System_", Z = "_Dictionary_", Ie = "id", Pe = "_rowId", fr = j.create({
   name: We,
   properties: [
     x.create({
@@ -8072,10 +8096,10 @@ function _(s, e) {
   if (!s)
     throw new Error(e);
 }
-function Io(s, e) {
+function Ao(s, e) {
   return new Map(Array.from(s.entries()).map(([t, i]) => [t, e(t, i)]));
 }
-function Ao(s, e) {
+function Io(s, e) {
   return Object.fromEntries(Object.entries(s).map(([t, i]) => [t, e(t, i)]));
 }
 async function Po(s, e) {
@@ -8113,15 +8137,15 @@ function Wr(s, e, t) {
       const h = l.pop();
       if (!(!h || d.has(h))) {
         d.add(h), h.name && o.add(h.name);
-        for (const f of h.properties ?? []) c.add(f.name);
+        for (const m of h.properties ?? []) c.add(m.name);
         h.baseEntity && l.push(h.baseEntity), h.baseRelation && l.push(h.baseRelation);
-        for (const f of h.inputEntities ?? []) l.push(f);
+        for (const m of h.inputEntities ?? []) l.push(m);
       }
     }
     const p = /* @__PURE__ */ new Set();
     for (const h of s.relations) {
-      const f = h.source?.name, m = h.target?.name;
-      f && o.has(f) && h.sourceProperty && p.add(h.sourceProperty), m && o.has(m) && h.targetProperty && p.add(h.targetProperty);
+      const m = h.source?.name, f = h.target?.name;
+      m && o.has(m) && h.sourceProperty && p.add(h.sourceProperty), f && o.has(f) && h.targetProperty && p.add(h.targetProperty);
     }
     for (const h of n)
       c.has(h) || (p.has(h) && a(`trigger.keys ["${h}"] refers to a relation attribute. Relation replacement does not emit a host update event carrying this key, so the transfer would never fire. Declare the trigger on the relation record's create/delete events instead (e.g. { recordName: '<relationName>', type: 'create' }).`), a(`trigger.keys ["${h}"] does not match any declared property of "${r.recordName}", so the transfer would never fire. Declare the property or fix the key name.`));
@@ -8774,7 +8798,7 @@ class de extends Error {
     super(`Retry transaction with SERIALIZABLE isolation: ${e}`), this.reason = e, this.name = "RequireSerializableRetry", Object.setPrototypeOf(this, new.target.prototype);
   }
 }
-class In extends ae {
+class An extends ae {
   constructor(e = {}) {
     super(
       "Nested dispatch is not supported inside a dispatch transaction. Model the work as one EventSource, or dispatch again after the outer dispatch commits",
@@ -8811,7 +8835,7 @@ function we(s, e = /* @__PURE__ */ new Set()) {
   const i = s;
   return i.causedBy && t.push(...we(i.causedBy, e)), i.cause && t.push(...we(i.cause, e)), i.error && t.push(...we(i.error, e)), s instanceof ae && s.causedBy && t.push(...we(s.causedBy, e)), t;
 }
-function An(s) {
+function In(s) {
   return we(s).some((e) => e instanceof de);
 }
 const Pn = /* @__PURE__ */ new Set(["40001", "40P01", "57P01", "ECONNRESET", "EPIPE", "SQLITE_BUSY"]);
@@ -8862,7 +8886,7 @@ async function Di(s, e, t = {}) {
     try {
       return await e(r, a);
     } catch (o) {
-      if (n = o, An(o)) {
+      if (n = o, In(o)) {
         if (r = "SERIALIZABLE", a < i) continue;
         throw new xt(
           s,
@@ -9939,7 +9963,7 @@ class Vt {
       if (this.computationsHandles.set(c.id, p), this.isAsyncComputation(p)) {
         const h = this.getAsyncTaskRecordKey(p);
         if (p.dataContext.type === "property") {
-          const f = new j({
+          const m = new j({
             name: h,
             properties: [
               new x({
@@ -9959,17 +9983,17 @@ class Vt {
                 type: "string"
               }, { uuid: `${h}_freshnessKey` })
             ]
-          }, { uuid: h }), m = new X({
-            name: `${f.name}_${p.dataContext.host.name}_${p.dataContext.id.name}`,
-            source: f,
+          }, { uuid: h }), f = new X({
+            name: `${m.name}_${p.dataContext.host.name}_${p.dataContext.id.name}`,
+            source: m,
             target: p.dataContext.host,
             sourceProperty: "record",
             targetProperty: `_${p.dataContext.id.name}_task`,
             type: "1:1"
           }, { uuid: `${h}_record_relation` });
-          t.push(f), i.push(m);
+          t.push(m), i.push(f);
         } else if (p.dataContext.type === "global") {
-          const f = new j({
+          const m = new j({
             name: h,
             properties: [
               new x({
@@ -9994,10 +10018,10 @@ class Vt {
               }, { uuid: `${h}_globalKey` })
             ]
           }, { uuid: h });
-          t.push(f);
+          t.push(m);
         } else if (p.dataContext.type === "entity") {
           p.dataContext;
-          const f = new j({
+          const m = new j({
             name: h,
             properties: [
               new x({
@@ -10022,10 +10046,10 @@ class Vt {
               }, { uuid: `${h}_entityName` })
             ]
           }, { uuid: h });
-          t.push(f);
+          t.push(m);
         } else if (p.dataContext.type === "relation") {
           p.dataContext;
-          const f = new j({
+          const m = new j({
             name: h,
             properties: [
               new x({
@@ -10050,7 +10074,7 @@ class Vt {
               }, { uuid: `${h}_relationName` })
             ]
           }, { uuid: h });
-          t.push(f);
+          t.push(m);
         }
       }
     }
@@ -10935,13 +10959,13 @@ function Sr(s) {
   const e = Fi.getStore();
   e?.effects && e.effects.push(...s);
 }
-const cs = new Dr(), Li = "_MigrationManifest_", Vi = "current", It = "3", Yt = "_isDeleted_";
+const cs = new Dr(), Li = "_MigrationManifest_", Vi = "current", At = "3", Yt = "_isDeleted_";
 class C extends Error {
   constructor(e, t) {
     super(e), this.details = t, this.name = new.target.name;
   }
 }
-class At extends C {
+class It extends C {
 }
 class Bo extends C {
 }
@@ -11161,7 +11185,7 @@ function ws(s) {
   return Ne($i(s));
 }
 function Ns(s, e = !1) {
-  const t = s.args, i = ms(s), r = fs(s), a = ys(s), n = a.map((E) => E.key), o = mt(s), c = O(s.dataContext), u = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, l = ca(s), d = xe("computation", o, s.args.uuid), p = gs(t, e), h = ws(t), { allocation: f, scopeSignature: m, allocationSignature: y } = sa(t), b = Ne({
+  const t = s.args, i = ms(s), r = fs(s), a = ys(s), n = a.map((E) => E.key), o = mt(s), c = O(s.dataContext), u = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, l = ca(s), d = xe("computation", o, s.args.uuid), p = gs(t, e), h = ws(t), { allocation: m, scopeSignature: f, allocationSignature: y } = sa(t), w = Ne({
     type: l,
     dataContext: c,
     dataDeps: i,
@@ -11170,7 +11194,7 @@ function Ns(s, e = !1) {
     hasCompute: typeof s.compute == "function",
     hasIncrementalCompute: typeof s.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof s.incrementalPatchCompute == "function"
-  }), g = Ne({ stateKeys: n, boundStates: a }), w = Ne({
+  }), g = Ne({ stateKeys: n, boundStates: a }), b = Ne({
     type: l,
     dataContext: c,
     outputRecord: u,
@@ -11186,7 +11210,7 @@ function Ns(s, e = !1) {
     hasCompute: typeof s.compute == "function",
     hasIncrementalCompute: typeof s.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof s.incrementalPatchCompute == "function"
-  }), N = Ne({ structuralSignature: w, stateSignature: g, functionHash: p?.hash, allocationSignature: y });
+  }), N = Ne({ structuralSignature: b, stateSignature: g, functionHash: p?.hash, allocationSignature: y });
   return {
     id: o,
     identity: d,
@@ -11207,14 +11231,14 @@ function Ns(s, e = !1) {
       dataContext: c,
       outputRecord: u
     } : void 0,
-    outputSignature: b,
+    outputSignature: w,
     stateSignature: g,
-    structuralSignature: w,
+    structuralSignature: b,
     argsSignature: h,
     functionSignature: p,
-    allocation: f,
+    allocation: m,
     allocationSignature: y,
-    scopeSignature: m,
+    scopeSignature: f,
     signature: N
   };
 }
@@ -11297,7 +11321,7 @@ function vt(s, e = s.system.storage.schema, t = {}) {
   })), u = vi({ records: i, relations: r, dictionaries: a, computations: c, sequences: o, storage: e });
   return {
     version: 2,
-    frameworkVersion: It,
+    frameworkVersion: At,
     modelHash: Ne(u),
     records: i,
     relations: r,
@@ -11315,10 +11339,10 @@ function Qo(s, e) {
   });
 }
 function Er(s) {
-  if (s.frameworkVersion !== It)
-    throw new At(
-      `Migration manifest was written by an incompatible interaqt manifest generator (found '${s.frameworkVersion}', expected '${It}'). Verify that the current definitions match the existing schema, then re-baseline with controller.createMigrationBaseline().`,
-      { foundGeneratorVersion: s.frameworkVersion, expectedGeneratorVersion: It }
+  if (s.frameworkVersion !== At)
+    throw new It(
+      `Migration manifest was written by an incompatible interaqt manifest generator (found '${s.frameworkVersion}', expected '${At}'). Verify that the current definitions match the existing schema, then re-baseline with controller.createMigrationBaseline().`,
+      { foundGeneratorVersion: s.frameworkVersion, expectedGeneratorVersion: At }
     );
 }
 function re(s) {
@@ -11558,19 +11582,19 @@ async function xs(s, e, t, i, r) {
     }), n.set(re(d), d), u !== "property") {
       const p = c.outputRecord || c.dataContext.split(":")[1], h = `${c.dataContext}:${p}`;
       if (!o.has(h)) {
-        const f = {
+        const m = {
           dataContext: c.dataContext,
           recordName: p,
           ids: l.ids || [],
           count: l.expectedExistingCount,
           reason: "fact output records will be discarded during computation takeover"
         };
-        o.set(h, f), n.set(re({ kind: "destructive-scope", ...f }), {
+        o.set(h, m), n.set(re({ kind: "destructive-scope", ...m }), {
           kind: "destructive-scope",
-          dataContext: f.dataContext,
-          recordName: f.recordName,
-          ids: f.ids,
-          reason: f.reason
+          dataContext: m.dataContext,
+          recordName: m.recordName,
+          ids: m.ids,
+          reason: m.reason
         });
       }
     }
@@ -11591,183 +11615,183 @@ async function xs(s, e, t, i, r) {
     }))
   }, e;
 }
-function Is(s, e, t, i) {
-  const r = [], a = [], n = new Map(s.computations.map((m) => [m.id, m])), o = new Map(e.computations.map((m) => [m.id, m])), c = new Map(s.records.map((m) => [m.id, m])), u = new Map(e.records.map((m) => [m.id, m])), l = new Map(s.relations.map((m) => [m.id, m])), d = new Map(e.relations.map((m) => [m.id, m])), p = new Map((s.dictionaries || []).map((m) => [m.id, m])), h = new Map((e.dictionaries || []).map((m) => [m.id, m]));
-  for (const m of s.records)
-    u.has(m.id) || r.push({
+function As(s, e, t, i) {
+  const r = [], a = [], n = new Map(s.computations.map((f) => [f.id, f])), o = new Map(e.computations.map((f) => [f.id, f])), c = new Map(s.records.map((f) => [f.id, f])), u = new Map(e.records.map((f) => [f.id, f])), l = new Map(s.relations.map((f) => [f.id, f])), d = new Map(e.relations.map((f) => [f.id, f])), p = new Map((s.dictionaries || []).map((f) => [f.id, f])), h = new Map((e.dictionaries || []).map((f) => [f.id, f]));
+  for (const f of s.records)
+    u.has(f.id) || r.push({
       kind: "record",
-      id: m.id,
+      id: f.id,
       changeType: "removed",
-      dataContext: `${m.kind}:${m.name}`,
-      reason: `${m.kind} no longer exists in the new model`
+      dataContext: `${f.kind}:${f.name}`,
+      reason: `${f.kind} no longer exists in the new model`
     });
-  for (const m of e.records) {
-    const y = c.get(m.id);
-    y ? (y.kind !== m.kind || y.name !== m.name) && r.push({
+  for (const f of e.records) {
+    const y = c.get(f.id);
+    y ? (y.kind !== f.kind || y.name !== f.name) && r.push({
       kind: "record",
-      id: m.id,
+      id: f.id,
       changeType: "changed",
-      dataContext: `${m.kind}:${m.name}`,
+      dataContext: `${f.kind}:${f.name}`,
       reason: "record kind or name changed"
     }) : r.push({
       kind: "record",
-      id: m.id,
+      id: f.id,
       changeType: "added",
-      dataContext: `${m.kind}:${m.name}`,
-      reason: `${m.kind} was added`
+      dataContext: `${f.kind}:${f.name}`,
+      reason: `${f.kind} was added`
     });
-    const b = new Map((y?.properties || []).map((w) => [w.id, w])), g = new Map(m.properties.map((w) => [w.id, w]));
-    for (const w of y?.properties || [])
-      g.has(w.id) || r.push({
+    const w = new Map((y?.properties || []).map((b) => [b.id, b])), g = new Map(f.properties.map((b) => [b.id, b]));
+    for (const b of y?.properties || [])
+      g.has(b.id) || r.push({
         kind: "property",
-        id: w.id,
+        id: b.id,
         changeType: "removed",
-        dataContext: `property:${y?.name}.${w.name}`,
+        dataContext: `property:${y?.name}.${b.name}`,
         reason: "property no longer exists in the new model"
       });
-    for (const w of m.properties) {
-      const N = b.get(w.id);
-      N ? (N.name !== w.name || N.type !== w.type || N.collection !== w.collection || N.computed !== w.computed) && r.push({
+    for (const b of f.properties) {
+      const N = w.get(b.id);
+      N ? (N.name !== b.name || N.type !== b.type || N.collection !== b.collection || N.computed !== b.computed) && r.push({
         kind: "property",
-        id: w.id,
+        id: b.id,
         changeType: "changed",
-        dataContext: `property:${m.name}.${w.name}`,
+        dataContext: `property:${f.name}.${b.name}`,
         reason: "property name, type, collection, or computed flag changed"
       }) : r.push({
         kind: "property",
-        id: w.id,
+        id: b.id,
         changeType: "added",
-        dataContext: `property:${m.name}.${w.name}`,
+        dataContext: `property:${f.name}.${b.name}`,
         reason: "property was added"
       });
     }
   }
-  for (const m of s.relations)
-    d.has(m.id) || r.push({
+  for (const f of s.relations)
+    d.has(f.id) || r.push({
       kind: "relation",
-      id: m.id,
+      id: f.id,
       changeType: "removed",
-      dataContext: `relation:${m.name}`,
+      dataContext: `relation:${f.name}`,
       reason: "relation no longer exists in the new model"
     });
-  for (const m of e.relations) {
-    const y = l.get(m.id);
-    y ? (y.name !== m.name || y.source !== m.source || y.target !== m.target || y.sourceProperty !== m.sourceProperty || y.targetProperty !== m.targetProperty || y.type !== m.type) && r.push({
+  for (const f of e.relations) {
+    const y = l.get(f.id);
+    y ? (y.name !== f.name || y.source !== f.source || y.target !== f.target || y.sourceProperty !== f.sourceProperty || y.targetProperty !== f.targetProperty || y.type !== f.type) && r.push({
       kind: "relation",
-      id: m.id,
+      id: f.id,
       changeType: "changed",
-      dataContext: `relation:${m.name}`,
+      dataContext: `relation:${f.name}`,
       reason: "relation endpoints, properties, or type changed"
     }) : r.push({
       kind: "relation",
-      id: m.id,
+      id: f.id,
       changeType: "added",
-      dataContext: `relation:${m.name}`,
+      dataContext: `relation:${f.name}`,
       reason: "relation was added"
     });
   }
-  for (const m of s.dictionaries || [])
-    h.has(m.id) || r.push({
+  for (const f of s.dictionaries || [])
+    h.has(f.id) || r.push({
       kind: "dictionary",
-      id: m.id,
+      id: f.id,
       changeType: "removed",
-      dataContext: `global:${m.name}`,
+      dataContext: `global:${f.name}`,
       reason: "dictionary no longer exists in the new model"
     });
-  for (const m of e.dictionaries || []) {
-    const y = p.get(m.id);
-    let b = "unchanged", g = "dictionary is unchanged";
-    y ? (y.type !== m.type || y.collection !== m.collection || y.computed !== m.computed) && (b = "changed", g = "dictionary type, collection, or computed flag changed") : (b = "added", g = "dictionary was added"), b !== "unchanged" && r.push({
+  for (const f of e.dictionaries || []) {
+    const y = p.get(f.id);
+    let w = "unchanged", g = "dictionary is unchanged";
+    y ? (y.type !== f.type || y.collection !== f.collection || y.computed !== f.computed) && (w = "changed", g = "dictionary type, collection, or computed flag changed") : (w = "added", g = "dictionary was added"), w !== "unchanged" && r.push({
       kind: "dictionary",
-      id: m.id,
-      changeType: b,
-      dataContext: `global:${m.name}`,
+      id: f.id,
+      changeType: w,
+      dataContext: `global:${f.name}`,
       reason: g
     });
   }
-  for (const m of s.computations)
-    o.has(m.id) || r.push({
+  for (const f of s.computations)
+    o.has(f.id) || r.push({
       kind: "computation",
-      id: m.id,
-      dataContext: m.dataContext,
-      computationType: m.type,
+      id: f.id,
+      dataContext: f.dataContext,
+      computationType: f.type,
       changeType: "removed",
       detected: {},
       recommendation: "ignore",
       reason: "computation no longer exists in the new model"
     });
-  for (const m of e.computations) {
-    const y = n.get(m.id), b = {
-      dataDepsChanged: y ? !tt(y.deps, m.deps) : !0,
-      eventDepsChanged: y ? !tt(y.eventDeps, m.eventDeps) : !0,
-      outputSignatureChanged: y ? y.outputSignature !== m.outputSignature : !0,
-      stateSignatureChanged: y ? y.stateSignature !== m.stateSignature : !0,
-      allocationSignatureChanged: y ? y.allocationSignature !== m.allocationSignature : m.allocationSignature !== void 0,
-      allocationSignature: m.allocationSignature,
+  for (const f of e.computations) {
+    const y = n.get(f.id), w = {
+      dataDepsChanged: y ? !tt(y.deps, f.deps) : !0,
+      eventDepsChanged: y ? !tt(y.eventDeps, f.eventDeps) : !0,
+      outputSignatureChanged: y ? y.outputSignature !== f.outputSignature : !0,
+      stateSignatureChanged: y ? y.stateSignature !== f.stateSignature : !0,
+      allocationSignatureChanged: y ? y.allocationSignature !== f.allocationSignature : f.allocationSignature !== void 0,
+      allocationSignature: f.allocationSignature,
       previousAllocationSignature: y?.allocationSignature,
-      functionTextChanged: y ? y.functionSignature?.hash !== m.functionSignature?.hash : m.functionSignature?.hasFunction === !0,
-      functionHash: m.functionSignature?.hash,
+      functionTextChanged: y ? y.functionSignature?.hash !== f.functionSignature?.hash : f.functionSignature?.hasFunction === !0,
+      functionHash: f.functionSignature?.hash,
       previousFunctionHash: y?.functionSignature?.hash,
-      hasFunction: m.functionSignature?.hasFunction === !0,
-      hasClosureRisk: m.functionSignature?.hasFunction === !0,
-      needsEventRebuildHandler: m.eventDeps.length > 0,
-      needsAsyncCompletionHandler: m.asyncReturn
+      hasFunction: f.functionSignature?.hasFunction === !0,
+      hasClosureRisk: f.functionSignature?.hasFunction === !0,
+      needsEventRebuildHandler: f.eventDeps.length > 0,
+      needsAsyncCompletionHandler: f.asyncReturn
     };
-    let g = "unchanged", w = "ignore", N = "unchanged", E = "computation is structurally unchanged";
-    if (y ? y.allocationSignature !== m.allocationSignature ? (g = "changed", w = "needs-review", N = "unrebuildable", E = "scoped allocation args changed") : y.structuralSignature !== m.structuralSignature ? (g = "changed", w = "needs-review", N = "changed", E = "computation structure changed") : y.stateSignature !== m.stateSignature && y.outputSignature === m.outputSignature ? (g = "state-only", w = "needs-review", N = "state-only", E = "computation state changed without output structure changes") : y.functionSignature?.hash !== m.functionSignature?.hash ? (g = "possibly-changed", w = "needs-review", N = "changed", E = "function text changed and requires human semantic review") : m.functionSignature?.hasFunction && (w = "needs-review", E = "function callback has closure risk and requires human review") : (g = "added", w = m.allocation?.kind === "scoped-sequence" ? "needs-review" : "rebuild", N = m.allocation?.kind === "scoped-sequence" ? "unrebuildable" : "changed", E = m.allocation?.kind === "scoped-sequence" ? "new scoped allocation computation requires approved sequence initialization" : "new computation requires approved rebuild"), r.push({
+    let g = "unchanged", b = "ignore", N = "unchanged", E = "computation is structurally unchanged";
+    if (y ? y.allocationSignature !== f.allocationSignature ? (g = "changed", b = "needs-review", N = "unrebuildable", E = "scoped allocation args changed") : y.structuralSignature !== f.structuralSignature ? (g = "changed", b = "needs-review", N = "changed", E = "computation structure changed") : y.stateSignature !== f.stateSignature && y.outputSignature === f.outputSignature ? (g = "state-only", b = "needs-review", N = "state-only", E = "computation state changed without output structure changes") : y.functionSignature?.hash !== f.functionSignature?.hash ? (g = "possibly-changed", b = "needs-review", N = "changed", E = "function text changed and requires human semantic review") : f.functionSignature?.hasFunction && (b = "needs-review", E = "function callback has closure risk and requires human review") : (g = "added", b = f.allocation?.kind === "scoped-sequence" ? "needs-review" : "rebuild", N = f.allocation?.kind === "scoped-sequence" ? "unrebuildable" : "changed", E = f.allocation?.kind === "scoped-sequence" ? "new scoped allocation computation requires approved sequence initialization" : "new computation requires approved rebuild"), r.push({
       kind: "computation",
-      id: m.id,
-      dataContext: m.dataContext,
-      computationType: m.type,
+      id: f.id,
+      dataContext: f.dataContext,
+      computationType: f.type,
       changeType: g,
-      detected: b,
-      recommendation: w,
+      detected: w,
+      recommendation: b,
       reason: E
-    }), w !== "ignore") {
+    }), b !== "ignore") {
       a.push({
         kind: "computation",
-        id: m.id,
-        dataContext: m.dataContext,
+        id: f.id,
+        dataContext: f.dataContext,
         recommendedDecision: N,
         reason: E
       });
-      const v = ds(m);
+      const v = ds(f);
       v && a.push(v);
     }
   }
-  for (const m of Ki(s, e))
-    m.changeType === "predicate-changed" && r.push({
+  for (const f of Ki(s, e))
+    f.changeType === "predicate-changed" && r.push({
       kind: "storage",
-      id: `filtered-predicate:${m.recordName}`,
+      id: `filtered-predicate:${f.recordName}`,
       changeType: "changed",
-      dataContext: `${m.isRelation ? "relation" : "entity"}:${m.recordName}`,
-      reason: `filtered-predicate-changed: matchExpression of filtered ${m.isRelation ? "relation" : "entity"} "${m.recordName}" changed from ${fe(m.oldRecord?.resolvedMatchExpression ?? null)} to ${fe(m.newRecord.resolvedMatchExpression ?? null)}; existing memberships will be re-evaluated and downstream computations rebuilt`
+      dataContext: `${f.isRelation ? "relation" : "entity"}:${f.recordName}`,
+      reason: `filtered-predicate-changed: matchExpression of filtered ${f.isRelation ? "relation" : "entity"} "${f.recordName}" changed from ${fe(f.oldRecord?.resolvedMatchExpression ?? null)} to ${fe(f.newRecord.resolvedMatchExpression ?? null)}; existing memberships will be re-evaluated and downstream computations rebuilt`
     });
-  for (const m of t.preRecomputeDDL)
+  for (const f of t.preRecomputeDDL)
     r.push({
       kind: "storage",
-      id: m.logicalPath || m.description,
+      id: f.logicalPath || f.description,
       changeType: "added",
-      dataContext: m.logicalPath || m.tableName || m.description,
-      reason: m.description
+      dataContext: f.logicalPath || f.tableName || f.description,
+      reason: f.description
     });
-  for (const m of i.blockingChanges)
+  for (const f of i.blockingChanges)
     r.push({
       kind: "storage",
-      id: m.logicalPath,
+      id: f.logicalPath,
       changeType: "blocked",
-      dataContext: m.logicalPath,
-      reason: m.reason
+      dataContext: f.logicalPath,
+      reason: f.reason
     });
-  for (const m of i.destructiveScopes)
+  for (const f of i.destructiveScopes)
     a.push({
       kind: "destructive-scope",
-      dataContext: m.dataContext,
-      recordName: m.recordName,
-      ids: m.ids || [],
-      reason: m.reason
+      dataContext: f.dataContext,
+      recordName: f.recordName,
+      ids: f.ids || [],
+      reason: f.reason
     });
-  const f = Array.from(new Map(a.map((m) => [re(m), m])).values());
+  const m = Array.from(new Map(a.map((f) => [re(f), f])).values());
   return {
     kind: "interaqt-migration-diff",
     version: 2,
@@ -11778,16 +11802,16 @@ function Is(s, e, t, i) {
     generatorVersion: "phase-1.5",
     summary: {
       changeCount: r.length,
-      requiredDecisionCount: f.length,
+      requiredDecisionCount: m.length,
       blockingChangeCount: i.blockingChanges.length
     },
     changes: r,
-    requiredDecisions: f,
+    requiredDecisions: m,
     decisions: [],
     safety: i
   };
 }
-function As(s, e, t) {
+function Is(s, e, t) {
   const i = ji(e), r = new Map(s.requiredDecisions.map((a) => [re(a), a]));
   for (const a of t) {
     if (!a.rebuildOutput) continue;
@@ -11851,11 +11875,11 @@ function Ps(s, e, t, i, r) {
         throw new C(`Migration computation takeover target type does not match data context: ${d.dataContext}`);
       if (!pa(e, t, h))
         throw new C(`Migration computation takeover can only discard previous fact output: ${d.dataContext}`);
-      const f = h.allocation?.kind === "scoped-sequence" && s.decisions.find(
+      const m = h.allocation?.kind === "scoped-sequence" && s.decisions.find(
         (y) => (y.kind === "scoped-sequence-seed" || y.kind === "scoped-sequence-no-seed") && y.id === d.computationId && y.dataContext === d.dataContext
       );
       if (!s.decisions.find(
-        (y) => y.kind === "computation" && y.id === d.computationId && (y.decision === "changed" || f && y.decision === "unrebuildable")
+        (y) => y.kind === "computation" && y.id === d.computationId && (y.decision === "changed" || m && y.decision === "unrebuildable")
       ))
         throw new C(`Migration computation takeover requires an approved changed computation decision: ${d.computationId}`);
       if (d.targetType !== "property") {
@@ -11871,25 +11895,25 @@ function Ps(s, e, t, i, r) {
     if (d.kind === "scoped-sequence-seed") {
       if (!o.has(p))
         throw new C(`Migration scoped sequence seed decision does not match a required review item: ${d.dataContext}`);
-      const h = t.computations.find((m) => m.id === d.id);
+      const h = t.computations.find((f) => f.id === d.id);
       if (!h || h.dataContext !== d.dataContext || h.allocation?.kind !== "scoped-sequence")
         throw new C(`Migration scoped sequence seed references unknown scoped sequence computation: ${d.id}`);
-      const f = a.requiredDecisions.find(
-        (m) => m.kind === "scoped-sequence-seed" && m.id === d.id
+      const m = a.requiredDecisions.find(
+        (f) => f.kind === "scoped-sequence-seed" && f.id === d.id
       );
-      if (!f || d.sequenceName !== f.sequenceName || d.hostRecord !== f.hostRecord || d.targetProperty !== f.targetProperty || d.scopeSignature !== f.scopeSignature || d.valuePath !== f.valuePath || d.aggregate !== f.aggregate || d.mode !== f.mode)
+      if (!m || d.sequenceName !== m.sequenceName || d.hostRecord !== m.hostRecord || d.targetProperty !== m.targetProperty || d.scopeSignature !== m.scopeSignature || d.valuePath !== m.valuePath || d.aggregate !== m.aggregate || d.mode !== m.mode)
         throw new C(`Migration scoped sequence seed decision does not match the generated seed operation: ${d.dataContext}`);
     }
     if (d.kind === "scoped-sequence-no-seed") {
       if (!o.has(p))
         throw new C(`Migration scoped sequence no-seed decision does not match a required review item: ${d.dataContext}`);
-      const h = t.computations.find((m) => m.id === d.id);
+      const h = t.computations.find((f) => f.id === d.id);
       if (!h || h.dataContext !== d.dataContext || h.allocation?.kind !== "scoped-sequence" || h.allocation.initializeFrom)
         throw new C(`Migration scoped sequence no-seed references unknown scoped sequence computation: ${d.id}`);
-      const f = a.requiredDecisions.find(
-        (m) => m.kind === "scoped-sequence-no-seed" && m.id === d.id
+      const m = a.requiredDecisions.find(
+        (f) => f.kind === "scoped-sequence-no-seed" && f.id === d.id
       );
-      if (!f || d.sequenceName !== f.sequenceName || d.hostRecord !== f.hostRecord || d.targetProperty !== f.targetProperty || d.scopeSignature !== f.scopeSignature || d.expectedHostCount !== f.expectedHostCount)
+      if (!m || d.sequenceName !== m.sequenceName || d.hostRecord !== m.hostRecord || d.targetProperty !== m.targetProperty || d.scopeSignature !== m.scopeSignature || d.expectedHostCount !== m.expectedHostCount)
         throw new C(`Migration scoped sequence no-seed decision does not match the generated no-seed operation: ${d.dataContext}`);
     }
     if (d.kind === "event-rebuild-handler") {
@@ -11907,8 +11931,8 @@ function Ps(s, e, t, i, r) {
     if (d.kind === "empty-fact-record-removal") {
       if (!o.has(p))
         throw new C(`Migration empty fact record removal decision does not match a required review item: ${d.recordName}`);
-      const h = e.storage.records.find((m) => m.recordName === d.recordName), f = t.storage.records.find((m) => m.recordName === d.recordName);
-      if (!h || f || h.tableName !== d.tableName || d.expectedCount !== 0 || !ga(e, t, d.recordName))
+      const h = e.storage.records.find((f) => f.recordName === d.recordName), m = t.storage.records.find((f) => f.recordName === d.recordName);
+      if (!h || m || h.tableName !== d.tableName || d.expectedCount !== 0 || !ga(e, t, d.recordName))
         throw new C(`Invalid empty fact record removal decision for ${d.recordName}`);
     }
     if (d.kind === "rename-candidate-reviewed")
@@ -12043,63 +12067,63 @@ function kr(s, e) {
 function Cr(s, e, t, i = [], r = {}) {
   const a = new Map(e.computations.map((g) => [St(g), g])), n = new Map(s.computations.map((g) => [g.id, g])), o = /* @__PURE__ */ new Map();
   for (const g of e.computations) {
-    for (const w of g.deps)
-      for (const N of Tr(w, g, e))
+    for (const b of g.deps)
+      for (const N of Tr(b, g, e))
         o.has(N) || o.set(N, /* @__PURE__ */ new Set()), o.get(N).add(g.id);
-    for (const w of g.eventDeps)
-      for (const N of kr(w, e))
+    for (const b of g.eventDeps)
+      for (const N of kr(b, e))
         N !== g.dataContext && (o.has(N) || o.set(N, /* @__PURE__ */ new Set()), o.get(N).add(g.id));
   }
   const c = (g) => {
-    const w = g.match(/^property:([^.]*)\._isDeleted_$/);
-    return w ? Qt(e, w[1]) : [];
+    const b = g.match(/^property:([^.]*)\._isDeleted_$/);
+    return b ? Qt(e, b[1]) : [];
   }, u = /* @__PURE__ */ new Map();
   for (const g of e.computations)
-    for (const w of c(g.dataContext))
-      u.set(w, g);
+    for (const b of c(g.dataContext))
+      u.set(b, g);
   const l = (g) => {
-    const w = [], N = a.get(g);
-    N && w.push(N);
+    const b = [], N = a.get(g);
+    N && b.push(N);
     const E = u.get(g);
-    return E && E !== N && w.push(E), w;
+    return E && E !== N && b.push(E), b;
   }, d = new Set(t.map((g) => g.id)), h = [...t.filter((g) => {
-    const w = n.get(g.id);
-    return r.outputChangedIds?.has(g.id) || !w || w.outputSignature !== g.outputSignature;
+    const b = n.get(g.id);
+    return r.outputChangedIds?.has(g.id) || !b || b.outputSignature !== g.outputSignature;
   }).flatMap((g) => [St(g), ...c(St(g))]), ...i];
   for (; h.length; ) {
     const g = h.shift();
-    for (const w of o.get(g) || []) {
-      if (d.has(w)) continue;
-      d.add(w);
-      const N = e.computations.find((E) => E.id === w);
+    for (const b of o.get(g) || []) {
+      if (d.has(b)) continue;
+      d.add(b);
+      const N = e.computations.find((E) => E.id === b);
       N && h.push(St(N));
     }
   }
-  const f = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), y = [], b = (g) => {
-    if (m.has(g)) return;
-    if (f.has(g))
+  const m = /* @__PURE__ */ new Set(), f = /* @__PURE__ */ new Set(), y = [], w = (g) => {
+    if (f.has(g)) return;
+    if (m.has(g))
       throw new et(`Migration detected a derived computation cycle at ${g}`);
-    f.add(g);
-    const w = e.computations.find((N) => N.id === g);
-    if (w) {
-      for (const N of w.deps)
-        for (const E of Tr(N, w, e))
+    m.add(g);
+    const b = e.computations.find((N) => N.id === g);
+    if (b) {
+      for (const N of b.deps)
+        for (const E of Tr(N, b, e))
           for (const v of l(E))
-            v.id !== g && d.has(v.id) && b(v.id);
-      for (const N of w.eventDeps)
+            v.id !== g && d.has(v.id) && w(v.id);
+      for (const N of b.eventDeps)
         for (const E of kr(N, e))
-          if (E !== w.dataContext)
+          if (E !== b.dataContext)
             for (const v of l(E))
-              v.id !== g && d.has(v.id) && b(v.id);
+              v.id !== g && d.has(v.id) && w(v.id);
     }
-    f.delete(g), m.add(g), y.push(g);
+    m.delete(g), f.add(g), y.push(g);
   };
-  return d.forEach(b), y.map((g) => {
-    const w = e.computations.find((F) => F.id === g), N = n.get(g), E = r.stateOnlyIds?.has(g) === !0, v = r.outputChangedIds?.has(g) || !N || N.outputSignature !== w.outputSignature, k = !N || N.stateSignature !== w.stateSignature, q = t.some((F) => F.id === g);
+  return d.forEach(w), y.map((g) => {
+    const b = e.computations.find((F) => F.id === g), N = n.get(g), E = r.stateOnlyIds?.has(g) === !0, v = r.outputChangedIds?.has(g) || !N || N.outputSignature !== b.outputSignature, k = !N || N.stateSignature !== b.stateSignature, q = t.some((F) => F.id === g);
     return {
       computationId: g,
-      dataContext: w.dataContext,
-      rebuildState: (E || k) && w.boundStates.length > 0,
+      dataContext: b.dataContext,
+      rebuildState: (E || k) && b.boundStates.length > 0,
       rebuildOutput: E ? !1 : v || !q,
       propagateOutputEvents: E ? !1 : v || !q,
       isSeed: q
@@ -12131,32 +12155,32 @@ function xr(s, e) {
       newPhysicalPath: u.tableName,
       reason: "fact record table changed"
     });
-    const d = new Map((l.attributeDetails || []).map((f) => [f.name, f])), p = new Map((u.attributeDetails || []).map((f) => [f.name, f]));
+    const d = new Map((l.attributeDetails || []).map((m) => [m.name, m])), p = new Map((u.attributeDetails || []).map((m) => [m.name, m]));
     a.get(l.recordName), n.get(u.recordName);
-    const h = (f, m, y) => y.records.find((g) => g.name === f)?.properties.find((g) => g.name === m)?.computed === !0;
-    for (const f of l.attributeDetails || [])
-      if (!p.get(f.name) && !f.name.startsWith("_")) {
-        const y = h(l.recordName, f.name, s);
+    const h = (m, f, y) => y.records.find((g) => g.name === m)?.properties.find((g) => g.name === f)?.computed === !0;
+    for (const m of l.attributeDetails || [])
+      if (!p.get(m.name) && !m.name.startsWith("_")) {
+        const y = h(l.recordName, m.name, s);
         t.push({
           kind: "unsupported-destructive-schema-change",
-          logicalPath: `${l.recordName}.${f.name}`,
-          oldPhysicalPath: ui(f.tableName, f.fieldName || f.sourceField || f.targetField),
+          logicalPath: `${l.recordName}.${m.name}`,
+          oldPhysicalPath: ui(m.tableName, m.fieldName || m.sourceField || m.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 || []) {
-      const m = d.get(f.name);
-      !m || h(l.recordName, f.name, s) || h(u.recordName, f.name, e) || ((m.kind !== f.kind || m.tableName !== f.tableName || m.fieldName !== f.fieldName || m.sourceField !== f.sourceField || m.targetField !== f.targetField) && t.push({
+    for (const m of u.attributeDetails || []) {
+      const f = d.get(m.name);
+      !f || h(l.recordName, m.name, s) || h(u.recordName, m.name, e) || ((f.kind !== m.kind || f.tableName !== m.tableName || f.fieldName !== m.fieldName || f.sourceField !== m.sourceField || f.targetField !== m.targetField) && t.push({
         kind: "physical-path-move",
-        logicalPath: `${u.recordName}.${f.name}`,
-        oldPhysicalPath: ui(m.tableName, m.fieldName || m.sourceField || m.targetField),
-        newPhysicalPath: ui(f.tableName, f.fieldName || f.sourceField || f.targetField),
+        logicalPath: `${u.recordName}.${m.name}`,
+        oldPhysicalPath: ui(f.tableName, f.fieldName || f.sourceField || f.targetField),
+        newPhysicalPath: ui(m.tableName, m.fieldName || m.sourceField || m.targetField),
         reason: "fact attribute physical path changed"
-      }), (m.type !== f.type || m.fieldType !== f.fieldType || m.collection !== f.collection) && t.push({
+      }), (f.type !== m.type || f.fieldType !== m.fieldType || f.collection !== m.collection) && t.push({
         kind: "unsupported-destructive-schema-change",
-        logicalPath: `${u.recordName}.${f.name}`,
-        oldPhysicalPath: `${m.type || "?"}/${m.fieldType || "?"}/${m.collection === !0}`,
-        newPhysicalPath: `${f.type || "?"}/${f.fieldType || "?"}/${f.collection === !0}`,
+        logicalPath: `${u.recordName}.${m.name}`,
+        oldPhysicalPath: `${f.type || "?"}/${f.fieldType || "?"}/${f.collection === !0}`,
+        newPhysicalPath: `${m.type || "?"}/${m.fieldType || "?"}/${m.collection === !0}`,
         reason: "fact attribute type, field type, or collection flag changed"
       }));
     }
@@ -12218,34 +12242,34 @@ async function Qs(s, e, t, i, r, a, n, o) {
   const l = new Map((u.attributeDetails || []).map((M) => [M.name, M])), d = l.get(i);
   if (!d?.fieldName || d.kind !== "value") return;
   const p = r.map((M) => {
-    const I = l.get(M.path);
-    return I?.fieldName && I.kind === "value" ? { ...M, fieldName: I.fieldName } : void 0;
+    const A = l.get(M.path);
+    return A?.fieldName && A.kind === "value" ? { ...M, fieldName: A.fieldName } : void 0;
   });
   if (p.some((M) => !M)) return;
-  const h = U(c), f = (M) => ce(M, h), m = Us(o, l, h);
-  if (!m) return;
-  const y = f(u.tableName), b = f(d.fieldName), g = m.sql ? ` WHERE ${m.sql}` : "", N = (await c.query(
-    `SELECT COUNT(*) AS ${f("__rowCount")}, COUNT(${b}) AS ${f("__validValueCount")} FROM ${y}${g}`,
-    m.params
+  const h = U(c), m = (M) => ce(M, h), f = Us(o, l, h);
+  if (!f) return;
+  const y = m(u.tableName), w = m(d.fieldName), g = f.sql ? ` WHERE ${f.sql}` : "", N = (await c.query(
+    `SELECT COUNT(*) AS ${m("__rowCount")}, COUNT(${w}) AS ${m("__validValueCount")} FROM ${y}${g}`,
+    f.params
   ))[0], E = Number(N?.__rowCount ?? 0), v = Number(N?.__validValueCount ?? 0);
   if (E !== v)
     throw new C(`ScopedSequence ${n} initializeFrom valuePath must be present for every matched host row`);
   if (E === 0) return [];
-  const k = p.map((M, I) => `${f(M.fieldName)} AS ${f(`__scope_${I}`)}`), q = p.map((M) => f(M.fieldName)), F = await c.query(
-    `SELECT ${[...k, `MAX(${b}) AS ${f("__maxValue")}`].join(", ")} FROM ${y}${g} GROUP BY ${q.join(", ")}`,
-    m.params
+  const k = p.map((M, A) => `${m(M.fieldName)} AS ${m(`__scope_${A}`)}`), q = p.map((M) => m(M.fieldName)), F = await c.query(
+    `SELECT ${[...k, `MAX(${w}) AS ${m("__maxValue")}`].join(", ")} FROM ${y}${g} GROUP BY ${q.join(", ")}`,
+    f.params
   ), Y = new Map(a.map((M) => [String(M.name), M]));
   return F.map((M) => {
-    const I = /* @__PURE__ */ new Map();
+    const A = /* @__PURE__ */ new Map();
     r.forEach((L, ye) => {
       if (!Y.has(L.name)) throw new Error(`ScopedSequence ${n} initializeFrom scope "${L.name}" is not declared`);
-      I.set(L.name, M[`__scope_${ye}`]);
+      A.set(L.name, M[`__scope_${ye}`]);
     });
     const ne = Number(M.__maxValue);
     if (!Number.isFinite(ne))
       throw new Error(`ScopedSequence ${n} initializeFrom valuePath must resolve to numbers`);
     return {
-      scope: ra(a, I),
+      scope: ra(a, A),
       max: ne
     };
   });
@@ -12260,29 +12284,29 @@ function Us(s, e, t) {
         if (typeof p?.key != "string" || p.key.includes(".")) return;
         const h = e.get(p.key);
         if (!h?.fieldName || h.kind !== "value" || !Array.isArray(p.value) || p.value.length !== 2 || typeof p.value[0] != "string") return;
-        const f = p.value[0].toLowerCase(), m = p.value[1], y = r(h.fieldName);
-        if (f === "is null") return `${y} IS NULL`;
-        if (f === "is not null") return `${y} IS NOT NULL`;
-        if ((f === "=" || f === "!=") && m === null)
-          return f === "=" ? `${y} IS NULL` : `${y} IS NOT NULL`;
-        if ((f === "=" || f === "!=") && m !== null) {
-          const b = a();
-          return i.push(o(m)), f === "=" ? `(${y} IS NOT NULL AND ${y} = ${b})` : `(${y} IS NOT NULL AND ${y} != ${b})`;
+        const m = p.value[0].toLowerCase(), f = p.value[1], y = r(h.fieldName);
+        if (m === "is null") return `${y} IS NULL`;
+        if (m === "is not null") return `${y} IS NOT NULL`;
+        if ((m === "=" || m === "!=") && f === null)
+          return m === "=" ? `${y} IS NULL` : `${y} IS NOT NULL`;
+        if ((m === "=" || m === "!=") && f !== null) {
+          const w = a();
+          return i.push(o(f)), m === "=" ? `(${y} IS NOT NULL AND ${y} = ${w})` : `(${y} IS NOT NULL AND ${y} != ${w})`;
         }
-        if (f === "in" || f === "not in") {
-          if (!Array.isArray(m) || m.some((N) => N === void 0)) return;
-          const b = m.filter((N) => N !== null).map(o), g = m.length !== b.length;
-          if (f === "in" && m.length === 0) return "1 = 0";
-          if (f === "not in" && m.length === 0) return `${y} IS NOT NULL`;
-          const w = b.map((N) => {
+        if (m === "in" || m === "not in") {
+          if (!Array.isArray(f) || f.some((N) => N === void 0)) return;
+          const w = f.filter((N) => N !== null).map(o), g = f.length !== w.length;
+          if (m === "in" && f.length === 0) return "1 = 0";
+          if (m === "not in" && f.length === 0) return `${y} IS NOT NULL`;
+          const b = w.map((N) => {
             const E = a();
             return i.push(N), E;
           });
-          if (f === "in") {
-            const N = w.length ? `${y} IN (${w.join(", ")})` : "1 = 0";
+          if (m === "in") {
+            const N = b.length ? `${y} IN (${b.join(", ")})` : "1 = 0";
             return g ? `(${y} IS NULL OR ${N})` : `(${y} IS NOT NULL AND ${N})`;
           }
-          return g && w.length === 0 ? `${y} IS NOT NULL` : g ? `(${y} IS NOT NULL AND ${y} NOT IN (${w.join(", ")}))` : `(${y} IS NOT NULL AND ${y} NOT IN (${w.join(", ")}))`;
+          return g && b.length === 0 ? `${y} IS NOT NULL` : g ? `(${y} IS NOT NULL AND ${y} NOT IN (${b.join(", ")}))` : `(${y} IS NOT NULL AND ${y} NOT IN (${b.join(", ")}))`;
         }
         return;
       }
@@ -12290,10 +12314,10 @@ function Us(s, e, t) {
         const p = d.operator, h = c(d.left);
         if (!h) return;
         if (p === "not") return `(NOT ${h})`;
-        const f = c(d.right);
-        if (!f) return;
-        if (p === "and") return `(${h} AND ${f})`;
-        if (p === "or") return `(${h} OR ${f})`;
+        const m = c(d.right);
+        if (!m) return;
+        if (p === "and") return `(${h} AND ${m})`;
+        if (p === "or") return `(${h} OR ${m})`;
       }
     }
   }, u = c(s);
@@ -12316,15 +12340,15 @@ async function js(s, e, t) {
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom.record must match host record ${d}`);
     if (String(o.valuePath) !== p)
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom.valuePath must match target property ${d}.${p}`);
-    const h = o.scope || [], f = r.scope || [], m = is(o.match ?? r.match), y = await Qs(
+    const h = o.scope || [], m = r.scope || [], f = is(o.match ?? r.match), y = await Qs(
       s,
       t,
       c,
       String(o.valuePath),
       h,
-      f,
+      m,
       String(r.name),
-      m
+      f
     );
     if (y) {
       for (const k of y)
@@ -12338,13 +12362,13 @@ async function js(s, e, t) {
         });
       continue;
     }
-    const b = Array.from(/* @__PURE__ */ new Set([
+    const w = Array.from(/* @__PURE__ */ new Set([
       String(o.valuePath),
       ...h.map((k) => k.path),
-      ...ts(m)
-    ])), g = b.includes("*") ? ["*"] : b, w = (await s.system.storage.find(c, void 0, void 0, g)).filter((k) => aa(m, k)), N = new Map(f.map((k) => [String(k.name), k])), E = /* @__PURE__ */ new Map();
+      ...ts(f)
+    ])), g = w.includes("*") ? ["*"] : w, b = (await s.system.storage.find(c, void 0, void 0, g)).filter((k) => aa(f, k)), N = new Map(m.map((k) => [String(k.name), k])), E = /* @__PURE__ */ new Map();
     let v = 0;
-    for (const k of w) {
+    for (const k of b) {
       const q = Ni(k, String(o.valuePath));
       if (q == null)
         throw new C(`ScopedSequence ${String(r.name)} initializeFrom valuePath must be present for every matched host row`);
@@ -12357,10 +12381,10 @@ async function js(s, e, t) {
         if (!N.get(L.name)) throw new Error(`ScopedSequence ${String(r.name)} initializeFrom scope "${L.name}" is not declared`);
         Y.set(L.name, Ni(k, L.path));
       }
-      const M = ra(f, Y), I = JSON.stringify(M), ne = E.get(I);
-      (!ne || F > ne.max) && E.set(I, { scope: M, max: F });
+      const M = ra(m, Y), A = JSON.stringify(M), ne = E.get(A);
+      (!ne || F > ne.max) && E.set(A, { scope: M, max: F });
     }
-    if (v !== w.length)
+    if (v !== b.length)
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom did not validate every matched host row`);
     for (const k of E.values())
       await s.system.storage.atomic.seedSequenceValue({
@@ -12430,12 +12454,12 @@ async function Ti(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((m) => m.recordName === o), l = u?.tableName, d = (u?.attributeDetails || []).filter((m) => m.kind === "value" && m.fieldName);
+    const u = t.storage.records.find((f) => f.recordName === o), l = u?.tableName, d = (u?.attributeDetails || []).filter((f) => f.kind === "value" && f.fieldName);
     if (!u || !l || d.length === 0) return;
     const p = s.system.storage.db || s.system.db;
     if (typeof p?.query != "function") return;
-    const h = (m) => `"${m.replace(/"/g, '""')}"`, f = d.map((m) => `${h(m.fieldName)} AS ${h(m.name)}`).join(", ");
-    return p.query(`SELECT ${f} FROM ${h(l)}`, []);
+    const h = (f) => `"${f.replace(/"/g, '""')}"`, m = d.map((f) => `${h(f.fieldName)} AS ${h(f.name)}`).join(", ");
+    return p.query(`SELECT ${m} FROM ${h(l)}`, []);
   };
   for (const o of e) {
     const c = r.get(o.computationId);
@@ -12461,12 +12485,12 @@ async function Ti(s, e, t, i) {
       if (!l || !d) continue;
       const p = await c.compute(await s.scheduler.resolveDataDeps(c));
       if (!Array.isArray(p)) continue;
-      const h = new Set(p.map((y) => `${y[l]}:${y[d]}`)), m = (await n(u) || []).filter((y) => !h.has(`${y[l]}:${y[d]}`)).map((y) => String(y.id));
-      m.length && a.push({
+      const h = new Set(p.map((y) => `${y[l]}:${y[d]}`)), f = (await n(u) || []).filter((y) => !h.has(`${y[l]}:${y[d]}`)).map((y) => String(y.id));
+      f.length && a.push({
         dataContext: O(c.dataContext),
         recordName: u,
-        ids: m,
-        count: m.length,
+        ids: f,
+        count: f.length,
         reason: "transform recompute would delete stale derived output records"
       });
     }
@@ -12484,7 +12508,7 @@ function va(s, e) {
       throw new he(`Destructive migration scope mismatch for ${o.dataContext}`);
   }
 }
-async function Ir(s, e, t, i) {
+async function Ar(s, e, t, i) {
   const r = (e.approvedDiff?.decisions || []).filter((a) => a.kind === "computation-takeover");
   for (const a of r) {
     const n = await wa(s, a.dataContext, t, i);
@@ -12510,7 +12534,7 @@ function Ki(s, e) {
   }
   return i;
 }
-function Ar(s, e) {
+function Ir(s, e) {
   return Ki(s, e).map((t) => `${t.isRelation ? "relation" : "entity"}:${t.recordName}`);
 }
 function Gs(s) {
@@ -12546,7 +12570,7 @@ async function zi(s, e, t, i, r = {}) {
     result: t
   });
 }
-async function Ie(s, e, t, i, r = {}, a = {}) {
+async function Ae(s, e, t, i, r = {}, a = {}) {
   if (t instanceof Oe) {
     if (!a.skipAsNull || e.dataContext.type !== "property") return;
     const o = e.dataContext;
@@ -12569,7 +12593,7 @@ async function Ws(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 Ie(s, e, o, i, r);
+      const u = await Ae(s, e, o, i, r);
       u && n.push(u);
       continue;
     }
@@ -12637,17 +12661,17 @@ async function Js(s, e, t = {}) {
     );
     if (!d)
       throw new he(`Migration takeover requires approved destructive scope before clearing ${r}`);
-    const p = await s.system.storage.find(r, void 0, void 0, ["*"]), h = new Set(d.ids.map(String)), f = new Set(p.map((y) => String(y.id)));
-    if (h.size !== f.size || [...f].some((y) => !h.has(y)))
+    const p = await s.system.storage.find(r, void 0, void 0, ["*"]), h = new Set(d.ids.map(String)), m = new Set(p.map((y) => String(y.id)));
+    if (h.size !== m.size || [...m].some((y) => !h.has(y)))
       throw new he(`Migration takeover destructive scope mismatch for ${O(e.dataContext)}`);
-    const m = [];
+    const f = [];
     for (const y of p)
-      await s.system.storage.delete(r, S.atom({ key: "id", value: ["=", y.id] })), m.push({ recordName: r, type: "delete", record: y });
+      await s.system.storage.delete(r, S.atom({ key: "id", value: ["=", y.id] })), f.push({ recordName: r, type: "delete", record: y });
     for (const y of i) {
-      const b = await s.system.storage.create(r, y);
-      m.push({ recordName: r, type: "create", record: b });
+      const w = await s.system.storage.create(r, y);
+      f.push({ recordName: r, type: "create", record: w });
     }
-    return m;
+    return f;
   }
   const c = await s.system.storage.find(r, void 0, void 0, ["*"]), u = new Map(c.map((d) => [`${d[a]}:${d[n]}`, d])), l = [];
   for (const d of i) {
@@ -12655,8 +12679,8 @@ async function Js(s, e, t = {}) {
     if (u.delete(p), h)
       tt({ ...h, id: void 0 }, { ...d, id: void 0 }) || (await s.system.storage.update(r, S.atom({ key: "id", value: ["=", h.id] }), d), l.push({ recordName: r, type: "update", record: { ...h, ...d }, oldRecord: h, keys: Object.keys(d) }));
     else {
-      const f = await s.system.storage.create(r, d);
-      l.push({ recordName: r, type: "create", record: f });
+      const m = await s.system.storage.create(r, d);
+      l.push({ recordName: r, type: "create", record: m });
     }
   }
   for (const d of u.values()) {
@@ -12712,16 +12736,16 @@ class Ys {
       if (e.dataContext.type === "property") {
         const l = e.dataContext.host.name, d = await this.controller.system.storage.find(l, void 0, void 0, ["*"]), p = [];
         for (const h of d) {
-          const f = t?.targetType === "property" ? Xe(h, e.dataContext.id.name) : h, m = await r({ controller: this.controller, dataContext: e.dataContext, record: f }), y = await Ie(this.controller, e, m, h, this.options, i);
+          const m = t?.targetType === "property" ? Xe(h, e.dataContext.id.name) : h, f = await r({ controller: this.controller, dataContext: e.dataContext, record: m }), y = await Ae(this.controller, e, f, h, this.options, i);
           y && p.push(y);
         }
         return p;
       }
-      const c = await r({ controller: this.controller, dataContext: e.dataContext }), u = await Ie(this.controller, e, c, void 0, this.options);
+      const c = await r({ controller: this.controller, dataContext: e.dataContext }), u = await Ae(this.controller, e, c, void 0, this.options);
       return u ? [u] : [];
     }
     if (e.dataContext.type === "global") {
-      const c = await this.controller.scheduler.resolveDataDeps(e), u = await Ie(this.controller, e, await e.compute(c), void 0, this.options);
+      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] : [];
     }
     if (e.dataContext.type === "entity" || e.dataContext.type === "relation")
@@ -12731,7 +12755,7 @@ class Ys {
       const u = await this.controller.scheduler.resolveDataDeps(e, c), l = t?.targetType === "property" ? Xe(c, e.dataContext.id.name) : c, d = t?.targetType === "property" ? Xe(u, e.dataContext.id.name) : u, p = await e.compute(
         d,
         l
-      ), h = await Ie(this.controller, e, p, c, this.options, i);
+      ), h = await Ae(this.controller, e, p, c, this.options, i);
       h && o.push(h);
     }
     return o;
@@ -12763,7 +12787,7 @@ class Ys {
             r || (r = !0, i.push(...await this.runFullRecompute(e)));
             continue;
           }
-          const d = await l({ controller: this.controller, dataContext: e.dataContext, mutationEvent: a }), p = await Ie(this.controller, e, d, void 0, this.options);
+          const d = await l({ controller: this.controller, dataContext: e.dataContext, mutationEvent: a }), p = await Ae(this.controller, e, d, void 0, this.options);
           p && i.push(p);
           continue;
         }
@@ -12781,7 +12805,7 @@ class Ys {
     if (r.mode === "skip") return [];
     if (r.mode === "patch")
       return Ws(this.controller, e, r.result, i, this.options);
-    const a = await Ie(this.controller, e, r.result, i, this.options);
+    const a = await Ae(this.controller, e, r.result, i, this.options);
     return a ? [a] : [];
   }
 }
@@ -12792,27 +12816,27 @@ async function Zs(s, e, t) {
     if (!o || !n.resolvedMatchExpression) continue;
     const c = await s.system.storage.find(o, r(n.resolvedMatchExpression), void 0, ["*"]);
     if (a.changeType === "added") {
-      for (const f of c)
+      for (const m of c)
         i.push({
           recordName: n.recordName,
           type: "create",
-          record: f
+          record: m
         });
       continue;
     }
-    const u = a.oldRecord?.resolvedBaseRecordName ?? o, l = r(a.oldRecord?.resolvedMatchExpression), d = l ? await s.system.storage.find(u, l, void 0, ["*"]) : [], p = new Set(d.map((f) => String(f.id))), h = new Set(c.map((f) => String(f.id)));
-    for (const f of c)
-      p.has(String(f.id)) || i.push({
+    const u = a.oldRecord?.resolvedBaseRecordName ?? o, l = r(a.oldRecord?.resolvedMatchExpression), d = l ? await s.system.storage.find(u, l, void 0, ["*"]) : [], p = new Set(d.map((m) => String(m.id))), h = new Set(c.map((m) => String(m.id)));
+    for (const m of c)
+      p.has(String(m.id)) || i.push({
         recordName: n.recordName,
         type: "create",
-        record: f
+        record: m
       });
-    for (const f of d)
-      h.has(String(f.id)) || i.push({
+    for (const m of d)
+      h.has(String(m.id)) || i.push({
         recordName: n.recordName,
         type: "delete",
-        record: f,
-        oldRecord: f
+        record: m,
+        oldRecord: m
       });
   }
   return i;
@@ -12854,8 +12878,8 @@ class Ho {
     this.system = t, this.ignoreGuard = u, this.forceThrowDispatchError = l, this.entities = [...i], this.relations = [...r], this.dict = [...n], this.recordMutationSideEffects = [...o], this.eventSources = [...a];
     for (const h of this.eventSources) {
       if (h.name) {
-        const f = this.eventSourcesByName.get(h.name);
-        if (f && f !== h)
+        const m = this.eventSourcesByName.get(h.name);
+        if (m && m !== h)
           throw new Error(`Duplicate eventSource name "${h.name}". Event source names must be unique within a Controller; findEventSourceByName would silently resolve to only one of them.`);
         this.eventSourcesByName.set(h.name, h);
       }
@@ -12879,8 +12903,8 @@ class Ho {
       ...c
     ];
     this.scheduler = new Vt(this, this.entities, this.relations, this.dict, p), o.forEach((h) => {
-      let f = this.recordNameToSideEffects.get(h.record.name);
-      f || this.recordNameToSideEffects.set(h.record.name, f = /* @__PURE__ */ new Set()), f.add(h);
+      let m = this.recordNameToSideEffects.get(h.record.name);
+      m || this.recordNameToSideEffects.set(h.record.name, m = /* @__PURE__ */ new Set()), m.add(h);
     });
   }
   async setup(e) {
@@ -12900,7 +12924,7 @@ class Ho {
       if (d && Er(d), d && d.modelHash !== l.modelHash)
         throw new Error(`Model manifest mismatch. Call controller.generateMigrationDiff(), review it, then call controller.migrate({ approvedDiff }). Manifest key: ${Li}/${Vi}`);
       if (!d && await this.system.hasExistingData?.())
-        throw new At("Existing database has no migration manifest. Call controller.createMigrationBaseline() before normal setup or migration.");
+        throw new It("Existing database has no migration manifest. Call controller.createMigrationBaseline() before normal setup or migration.");
       await this.system.setup(this.entities, this.relations, r, { install: t, internalRequirements: a }), await this.scheduler.setup(t);
       return;
     }
@@ -12943,7 +12967,7 @@ class Ho {
     _(typeof i.prepareMigrationSchema == "function", "Current system does not support migration baseline");
     const r = await i.prepareMigrationSchema(this.entities, this.relations, e, { internalRequirements: t });
     if (r.preRecomputeDDL.length > 0 || r.blockingChanges.length > 0)
-      throw new At("Cannot create migration baseline because current definitions do not match the existing schema", {
+      throw new It("Cannot create migration baseline because current definitions do not match the existing schema", {
         missingDDL: r.preRecomputeDDL,
         blockingChanges: r.blockingChanges
       });
@@ -12955,28 +12979,28 @@ class Ho {
     _(typeof r.prepareMigrationSchema == "function", "Current system does not support schema migration planning");
     const a = await r.prepareMigrationSchema(this.entities, this.relations, t, { internalRequirements: i }), n = await Pr(this);
     if (!n)
-      throw new At("Migration baseline manifest not found. Run setup(true) with the current framework first or createMigrationBaseline().");
+      throw new It("Migration baseline manifest not found. Run setup(true) with the current framework first or createMigrationBaseline().");
     Er(n);
     const o = vt(this, a.schema, { includeFunctionText: e.includeFunctionText === !0 });
     return { states: t, migrationSystem: r, schemaPlan: a, previousManifest: n, nextManifest: o };
   }
   async buildCurrentMigrationDiff(e, t, i, r = {}) {
     const a = i.computations.filter(
-      (m) => !t.computations.some((y) => y.id === m.id && y.signature === m.signature)
-    ), n = Ar(t, i), o = Cr(
+      (f) => !t.computations.some((y) => y.id === f.id && y.signature === f.signature)
+    ), n = Ir(t, i), o = Cr(
       t,
       i,
       a,
       n,
-      { outputChangedIds: new Set(a.map((m) => m.id)) }
+      { outputChangedIds: new Set(a.map((f) => f.id)) }
     ), c = xr(t, i), u = $r(this, e), l = r.includeDestructiveScope === !0 ? await Ti(this, o, t, u) : [], d = {
       blockingChanges: [
         ...e.blockingChanges,
         ...c
       ],
       destructiveScopes: l
-    }, p = await xs(this, Is(t, i, e, d), t, i, u), h = await Es(this, p, t, i), f = await $s(this, h, t, i, u);
-    return As(f, this, o);
+    }, p = await xs(this, As(t, i, e, d), t, i, u), h = await Es(this, p, t, i), m = await $s(this, h, t, i, u);
+    return Is(m, this, o);
   }
   async generateMigrationDiff(e = {}) {
     const { schemaPlan: t, previousManifest: i, nextManifest: r } = await this.prepareMigrationContext({
@@ -12989,16 +13013,16 @@ class Ho {
     _(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 });
     Ps(t.approvedDiff, n, o, t.handlers, c);
-    const u = t.approvedDiff, l = us(u), d = qs(u), p = Ds(u), h = Ms(n, o, u), f = h.changedComputations, m = Ar(n, o), y = Cr(n, o, f, m, {
+    const u = t.approvedDiff, l = us(u), d = qs(u), p = Ds(u), h = Ms(n, o, u), m = h.changedComputations, f = Ir(n, o), y = Cr(n, o, m, f, {
       outputChangedIds: h.outputChangedIds,
       stateOnlyIds: h.stateOnlyIds
-    }), b = await ba(this, t.approvedDiff, n), g = Cs(n, b), w = {
+    }), w = await ba(this, t.approvedDiff, n), g = Cs(n, w), b = {
       ...a,
       postRecomputeDDL: [
         ...a.postRecomputeDDL,
         ...g
       ]
-    }, N = xr(n, o).filter((L) => !(L.kind === "unsupported-destructive-schema-change" && b.has(L.logicalPath))), E = Bs(
+    }, N = xr(n, o).filter((L) => !(L.kind === "unsupported-destructive-schema-change" && w.has(L.logicalPath))), E = Bs(
       this,
       y,
       t,
@@ -13009,20 +13033,20 @@ class Ho {
       ...h.blocking,
       ...E
     ], k = Gs(v), q = $r(this, a), F = await Ti(this, y, n, q);
-    va(t, F), await Ir(this, t, n, q), await Ts(this, t.approvedDiff, n, q);
+    va(t, F), await Ar(this, t, n, q), await Ts(this, t.approvedDiff, n, q);
     const Y = Hs(this, n, o), M = {
       mode: "compute",
       dryRun: t.dryRun === !0,
-      changedComputations: f,
+      changedComputations: m,
       rebuildPlan: y,
       scopedSequenceSeedOperations: d,
       scopedSequenceNoSeedOperations: p,
       factPropertyBackfills: Y,
       schemaPlan: {
-        schema: w.schema,
-        preRecomputeDDL: w.preRecomputeDDL,
-        postRecomputeDDL: w.postRecomputeDDL,
-        verificationDDL: w.verificationDDL,
+        schema: b.schema,
+        preRecomputeDDL: b.preRecomputeDDL,
+        postRecomputeDDL: b.postRecomputeDDL,
+        verificationDDL: b.verificationDDL,
         blockingChanges: v
       },
       blockingChanges: k,
@@ -13034,32 +13058,32 @@ class Ho {
       throw new Error(`Migration plan has blocking changes:
 ${k.join(`
 `)}`);
-    let I;
+    let A;
     const ne = (L, ye) => {
       const ei = ["pending", "schema-applied", "computation-applied", "constraints-applied", "manifest-written", "succeeded"];
       return ei.indexOf(L) >= ei.indexOf(ye);
     };
     this.scheduler.teardown(), this.scheduler.registerDictDefaults();
     try {
-      I = await r.beginMigration?.(
+      A = await r.beginMigration?.(
         o.modelHash,
         l,
         u.summary,
         u.decisions.length
       );
-      const L = I?.phase || "pending";
-      await r.applyMigrationSchema(w, I?.id), ne(L, "schema-applied") || I && await r.updateMigrationPhase?.(I.id, "schema-applied"), ne(L, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
+      const L = A?.phase || "pending";
+      await r.applyMigrationSchema(b, A?.id), ne(L, "schema-applied") || A && await r.updateMigrationPhase?.(A.id, "schema-applied"), ne(L, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
         if (!ne(L, "computation-applied")) {
           await Ks(this, Y);
           const Ca = await Zs(this, n, o);
-          await Ir(this, t, n), await Xs(this, y, t, Ca, n), await js(this, u, n), I && await r.updateMigrationPhase?.(I.id, "computation-applied");
+          await Ar(this, t, n), await Xs(this, y, t, Ca, n), await js(this, u, n), A && await r.updateMigrationPhase?.(A.id, "computation-applied");
         }
-        ne(L, "constraints-applied") || (await ks(this, t.approvedDiff, n), await r.verifyMigrationSchema?.(w, I?.id), await r.applyMigrationPostSchema?.(w, I?.id), I && await r.updateMigrationPhase?.(I.id, "constraints-applied"));
+        ne(L, "constraints-applied") || (await ks(this, t.approvedDiff, n), await r.verifyMigrationSchema?.(b, A?.id), await r.applyMigrationPostSchema?.(b, A?.id), A && await r.updateMigrationPhase?.(A.id, "constraints-applied"));
         const ye = `manifest:current:${o.modelHash}:${l}`;
-        await r.isMigrationOperationComplete?.(I?.id, ye) || (await li(this, o), await r.markMigrationOperationComplete?.(I?.id, ye)), I && await r.updateMigrationPhase?.(I.id, "manifest-written");
-      }), I && await r.finishMigration?.(I.id, "succeeded");
+        await r.isMigrationOperationComplete?.(A?.id, ye) || (await li(this, o), await r.markMigrationOperationComplete?.(A?.id, ye)), A && await r.updateMigrationPhase?.(A.id, "manifest-written");
+      }), A && await r.finishMigration?.(A.id, "succeeded");
     } catch (L) {
-      throw I && await r.finishMigration?.(I.id, "failed", L), L;
+      throw A && await r.finishMigration?.(A.id, "failed", L), L;
     }
     try {
       await this.scheduler.setup(!1);
@@ -13201,7 +13225,7 @@ ${k.join(`
     _(!!e, "eventSource is required for dispatch");
     const i = Mr.getStore();
     if (i)
-      throw new In({
+      throw new An({
         outerEventSourceName: i.eventSourceName,
         nestedEventSourceName: e.name
       });
@@ -13902,13 +13926,13 @@ class to {
       increment: async (t, i) => {
         const r = this.getPlaceholder();
         if (this.isRecordTarget(t)) {
-          const { tableName: u, idField: l, fieldName: d } = this.resolveRecordTarget(t), p = r(), h = r(), f = await this.db.query(
+          const { tableName: u, idField: l, fieldName: d } = this.resolveRecordTarget(t), p = r(), h = r(), m = await this.db.query(
             `UPDATE "${u}" SET "${d}" = COALESCE("${d}", 0) + ${p} WHERE "${l}" = ${h} RETURNING "${d}" AS value`,
             [i, t.id],
             `atomic increment ${t.recordName}.${t.field}`
           );
-          if (!f.length) throw new Error(`Atomic increment target not found: ${t.recordName}.${String(t.id)}.${t.field}`);
-          return Number(f[0]?.value ?? await this.atomic.get(t) ?? 0);
+          if (!m.length) throw new Error(`Atomic increment target not found: ${t.recordName}.${String(t.id)}.${t.field}`);
+          return Number(m[0]?.value ?? await this.atomic.get(t) ?? 0);
         }
         const a = r(), n = r(), o = r(), c = await this.db.query(
           `INSERT INTO "_ComputationState_" ("key", "numberValue") VALUES (${a}, ${n})
@@ -13924,14 +13948,14 @@ RETURNING "numberValue" AS value`,
         async () => {
           const r = this.getPlaceholder();
           if (this.isRecordTarget(t)) {
-            const { tableName: y, idField: b, fieldName: g } = this.resolveRecordTarget(t), w = r(), N = await this.db.query(
-              `SELECT "${g}" AS value FROM "${y}" WHERE "${b}" = ${w}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
+            const { tableName: y, idField: w, fieldName: g } = this.resolveRecordTarget(t), b = r(), N = await this.db.query(
+              `SELECT "${g}" AS value FROM "${y}" WHERE "${w}" = ${b}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
               [t.id],
               `atomic replace lock ${t.recordName}.${t.field}`
             );
             if (!N.length) throw new Error(`Atomic replace target not found: ${t.recordName}.${String(t.id)}.${t.field}`);
             const E = this.getPlaceholder(), v = E(), k = E(), q = await this.db.query(
-              `UPDATE "${y}" SET "${g}" = ${v} WHERE "${b}" = ${k} RETURNING "${g}" AS value`,
+              `UPDATE "${y}" SET "${g}" = ${v} WHERE "${w}" = ${k} RETURNING "${g}" AS value`,
               [i, t.id],
               `atomic replace ${t.recordName}.${t.field}`
             );
@@ -13943,12 +13967,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(), p = d(), h = d(), f = [`"${a}" = ${p}`, u].filter(Boolean).join(", "), m = await this.db.query(
-            `UPDATE "_ComputationState_" SET ${f} WHERE "key" = ${h} RETURNING "${a}" AS value`,
+          ), u = e.filter((y) => y !== a).map((y) => `"${y}" = NULL`).join(", "), l = this.parseGlobalValue(c[0]?.value, a) ?? t.defaultValue ?? null, d = this.getPlaceholder(), p = d(), h = d(), m = [`"${a}" = ${p}`, u].filter(Boolean).join(", "), f = await this.db.query(
+            `UPDATE "_ComputationState_" SET ${m} WHERE "key" = ${h} RETURNING "${a}" AS value`,
             [n, t.key],
             `atomic replace ${t.key}`
           );
-          return { oldValue: l, newValue: this.parseGlobalValue(m[0]?.value, a) ?? i };
+          return { oldValue: l, newValue: this.parseGlobalValue(f[0]?.value, a) ?? i };
         }
       ),
       compareAndSet: async (t, i, r, a) => {
@@ -13961,16 +13985,16 @@ 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), p = n(), h = n(), f = n(), m = n();
+        const c = this.resolveGlobalColumn(t, r), u = this.normalizeGlobalValue(r, c), l = this.normalizeGlobalValue(o, c), d = this.normalizeGlobalValue(i, c), p = n(), h = n(), m = n(), f = n();
         if ((await this.db.query(
-          `UPDATE "_ComputationState_" SET "${c}" = ${p} WHERE "key" = ${h} AND COALESCE("${c}", ${f}) = ${m} RETURNING "${c}" AS value`,
+          `UPDATE "_ComputationState_" SET "${c}" = ${p} WHERE "key" = ${h} AND COALESCE("${c}", ${m}) = ${f} RETURNING "${c}" AS value`,
           [u, t.key, l, d],
           `atomic compareAndSet ${t.key}`
         )).length) return !0;
         if (d !== l) return !1;
-        const b = this.getPlaceholder(), g = b(), w = b();
+        const w = this.getPlaceholder(), g = w(), b = w();
         return (await this.db.query(
-          `INSERT INTO "_ComputationState_" ("key", "${c}") VALUES (${g}, ${w}) ON CONFLICT ("key") DO NOTHING RETURNING "${c}" AS value`,
+          `INSERT INTO "_ComputationState_" ("key", "${c}") VALUES (${g}, ${b}) ON CONFLICT ("key") DO NOTHING RETURNING "${c}" AS value`,
           [t.key, u],
           `atomic compareAndSet insert ${t.key}`
         )).length > 0;
@@ -14002,10 +14026,10 @@ 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(), h = U(this.db).name === "sqlite" ? `MAX("_ScopedSequence_"."lastValue", ${d})` : `GREATEST("_ScopedSequence_"."lastValue", ${d})`, f = a === "replace" ? `${d}` : h;
+        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(), h = U(this.db).name === "sqlite" ? `MAX("_ScopedSequence_"."lastValue", ${d})` : `GREATEST("_ScopedSequence_"."lastValue", ${d})`, m = a === "replace" ? `${d}` : h;
         await this.db.query(
           `INSERT INTO "_ScopedSequence_" ("sequenceName", "scopeKey", "scope", "lastValue") VALUES (${o}, ${c}, ${u}, ${l})
-ON CONFLICT ("sequenceName", "scopeKey") DO UPDATE SET "lastValue" = ${f}
+ON CONFLICT ("sequenceName", "scopeKey") DO UPDATE SET "lastValue" = ${m}
 RETURNING "lastValue" AS value`,
           [t.sequenceName, i, r, t.value, t.value],
           `atomic scoped sequence seed ${t.sequenceName}`
@@ -14029,8 +14053,8 @@ RETURNING "lastValue" AS value`,
           [t.key],
           `atomic updateGlobalFields lock ${t.key}`
         ), c = this.parseGlobalValue(o[0]?.value, "jsonValue") ?? {}, u = { ...r, ...c };
-        Object.entries(i).forEach(([h, f]) => {
-          u[h] = Number(u[h] ?? r[h] ?? 0) + f;
+        Object.entries(i).forEach(([h, m]) => {
+          u[h] = Number(u[h] ?? r[h] ?? 0) + m;
         });
         const l = this.getPlaceholder(), d = l(), p = l();
         return await this.db.update(
@@ -14065,9 +14089,9 @@ RETURNING "lastValue" AS value`,
               r
             );
           }
-          const h = p.sort((y, b) => String(y) < String(b) ? -1 : String(y) > String(b) ? 1 : 0), f = this.getPlaceholder(), m = h.map(() => f()).join(",");
+          const h = p.sort((y, w) => String(y) < String(w) ? -1 : String(y) > String(w) ? 1 : 0), m = this.getPlaceholder(), f = h.map(() => m()).join(",");
           if (await this.db.query(
-            `SELECT "${n}" AS id FROM "${a}" WHERE "${n}" IN (${m})${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
+            `SELECT "${n}" AS id FROM "${a}" WHERE "${n}" IN (${f})${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
             h,
             `atomic lockRows ${t} (round ${l + 1})`
           ), h.forEach((y) => c.set(String(y), y)), !this.supportsForUpdate()) break;
@@ -14342,9 +14366,9 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       return await this.acquireMigrationLock(l[0].id), { id: l[0].id, phase: l[0].phase };
     const d = `${Date.now()}-${Math.random().toString(36).slice(2)}`, p = (/* @__PURE__ */ new Date()).toISOString(), h = i === void 0 ? null : JSON.stringify(i);
     await this.acquireMigrationLock(d);
-    const f = ue(a, 8);
+    const m = ue(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]})`,
+      `INSERT INTO "__interaqt_migration_log" ("id", "modelHash", "approvedDiffHash", "approvedDiffSummary", "decisionCount", "reviewedAt", "phase", "status", "createdAt", "updatedAt") VALUES (${m[0]}, ${m[1]}, ${m[2]}, ${m[3]}, ${m[4]}, ${m[5]}, 'pending', 'pending', ${m[6]}, ${m[7]})`,
       [d, e, t || "", h, r, p, p, p],
       void 0,
       "write migration log pending"
@@ -14398,18 +14422,18 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
         if (h instanceof D) {
           if (!h.record)
             return;
-          let f = o.getEntityByName(h.record);
-          if (f || (f = o.getRelationByName(h.record)), !f)
+          let m = o.getEntityByName(h.record);
+          if (m || (m = o.getRelationByName(h.record)), !m)
             throw new Error(`Entity or Relation not found: ${h.record}`);
-          for (; f.baseEntity || f.baseRelation; )
-            f = f.baseEntity || f.baseRelation;
+          for (; m.baseEntity || m.baseRelation; )
+            m = m.baseEntity || m.baseRelation;
           if (h.defaultValue instanceof x)
-            h.defaultValue.name = h.key, f.properties.push(h.defaultValue);
+            h.defaultValue.name = h.key, m.properties.push(h.defaultValue);
           else {
-            const m = typeof h.defaultValue;
-            f.properties.push(x.create({
+            const f = typeof h.defaultValue;
+            m.properties.push(x.create({
               name: h.key,
-              type: m,
+              type: f,
               // 应该系统定义
               collection: Array.isArray(h.defaultValue),
               defaultValue: () => h.defaultValue
@@ -14506,10 +14530,10 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       const c = o.sourceRecordId, u = o.transformIndex;
       if (!(c instanceof D) || !(u instanceof D) || c.unique === !1 || n.type !== "entity" && n.type !== "relation")
         return [];
-      const l = n.id.name, d = r.getRecordInfo(l), [, p] = r.getTableAliasAndFieldName([l], c.key, !0), [, h] = r.getTableAliasAndFieldName([l], u.key, !0), f = `idx_transform_${this.hashIdentifier(`${d.table}_${p}_${h}`)}`;
+      const l = n.id.name, d = r.getRecordInfo(l), [, p] = r.getTableAliasAndFieldName([l], c.key, !0), [, h] = r.getTableAliasAndFieldName([l], u.key, !0), m = `idx_transform_${this.hashIdentifier(`${d.table}_${p}_${h}`)}`;
       return [{
         kind: "create-constraint",
-        sql: gi(f, d.table, [p, h], a),
+        sql: gi(m, d.table, [p, h], a),
         tableName: d.table,
         logicalPath: `${l}.${c.key}.${u.key}`,
         description: `migration setup transform unique index ${l}`
@@ -14577,7 +14601,7 @@ class Zt {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const Ut = "interaqt:builtin:action:get", Go = Zt.create({ name: "get" }, { uuid: Ut });
@@ -14647,7 +14671,7 @@ class ft {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const no = "_Interaction_", Ji = j.create({
@@ -14750,7 +14774,7 @@ class Xi {
   // `uuid::` 引用需要完整实例集合才能解析——graph 级反序列化请使用 createInstancesFromString。
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ge extends Error {
@@ -14853,9 +14877,9 @@ async function ho(s, e, t) {
     if (n.base) {
       const u = n.base.name, l = n.isCollection ? o : [o];
       for (const d of l) {
-        if (!d || typeof d != "object")
+        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" : typeof d}`,
+            `Payload validation failed for field '${n.name}': expected ${u} 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(
@@ -14971,7 +14995,7 @@ class Yi {
   // graph 级反序列化请使用 createInstancesFromString（Transfer/ActivityGroup 已注册 Klass）。
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class je {
@@ -15034,7 +15058,7 @@ class je {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class Zi {
@@ -15103,7 +15127,7 @@ class Zi {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 function Ta(s, e, t) {
@@ -15179,7 +15203,7 @@ class er {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class tr {
@@ -15237,7 +15261,7 @@ class tr {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class it {
@@ -15291,7 +15315,7 @@ class it {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ir {
@@ -15345,7 +15369,7 @@ class ir {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class rr {
@@ -15431,7 +15455,7 @@ class rr {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 class ar {
@@ -15481,7 +15505,7 @@ class ar {
   }
   static parse(e) {
     const t = JSON.parse(e);
-    return this.create(A(t.public), { ...t.options, uuid: t.uuid });
+    return this.create(I(t.public), { ...t.options, uuid: t.uuid });
   }
 }
 const mo = [
@@ -15965,7 +15989,7 @@ export {
   Z as DICTIONARY_RECORD,
   tr as DataPolicy,
   he as DestructiveComputedOutputError,
-  Ii as Dictionary,
+  Ai as Dictionary,
   yr as DictionaryEntity,
   j as Entity,
   Gn as EntityCustomHandle,
@@ -15995,7 +16019,7 @@ export {
   bn as GlobalWeightedSummationHandle,
   Mt as HARD_DELETION_PROPERTY_NAME,
   jo as HardDeletionProperty,
-  Ae as ID_ATTR,
+  Ie as ID_ATTR,
   no as INTERACTION_RECORD,
   Lt as Inequality,
   Xi as Interaction,
@@ -16008,15 +16032,15 @@ export {
   Li as MIGRATION_MANIFEST_CONCEPT,
   Vi as MIGRATION_MANIFEST_CURRENT_KEY,
   S as MatchExp,
-  At as MigrationBaselineError,
+  It as MigrationBaselineError,
   C as MigrationError,
   Br as Modifier,
   zo as MonoSystem,
   Oo as NON_DELETED_STATE,
   Do as NON_EXIST_STATE,
-  In as NestedDispatchError,
+  An as NestedDispatchError,
   ie as NewRecordData,
-  Ai as NonNullConstraint,
+  Ii as NonNullConstraint,
   xo as PHASE_AFTER_ALL,
   Co as PHASE_BEFORE_ALL,
   oi as PHASE_NORMAL,
@@ -16080,13 +16104,13 @@ export {
   Nn as WeightedSummationHandles,
   xs as addComputationTakeoverReview,
   Es as addEmptyFactRecordRemovalReview,
-  As as addMissingRebuildHandlerRequirements,
+  Is as addMissingRebuildHandlerRequirements,
   $s as addScopedSequenceNoSeedReview,
   Sr as addToCurrentEffects,
   _ as assert,
   ks as assertApprovedEmptyFactRecordRemovalsStillEmpty,
   dn as assertCallbackAttributeQueryDeclared,
-  Ir as assertComputationTakeoverAllowed,
+  Ar as assertComputationTakeoverAllowed,
   va as assertDestructiveScopeAllowed,
   Er as assertManifestGeneratorCurrent,
   Ts as assertScopedSequenceNoSeedDecisions,
@@ -16094,7 +16118,7 @@ export {
   cs as asyncInteractionContext,
   Ks as backfillNewFactPropertyDefaults,
   Cr as buildAffectedRebuildPlan,
-  Is as buildMigrationDiff,
+  As as buildMigrationDiff,
   hn as buildRelationSideMatchKey,
   uo as checkCondition,
   ho as checkPayload,
@@ -16102,7 +16126,7 @@ export {
   we as collectErrorChain,
   mt as computationManifestId,
   Cs as createEmptyFactRecordRemovalOperations,
-  Ia as createInstances,
+  Aa as createInstances,
   To as createInstancesFromString,
   vt as createMigrationManifest,
   $r as createMigrationReadHandle,
@@ -16112,7 +16136,7 @@ export {
   gi as createUniqueIndexSQL,
   O as dataContextPath,
   Ko as dbConsoleLogger,
-  A as decodeFunctionValues,
+  I as decodeFunctionValues,
   yt as deepClone,
   zr as defaultDataBasedIncrementalPlan,
   Ur as defaultEncodeLiteral,
@@ -16120,7 +16144,7 @@ export {
   Po as everyAsync,
   qo as everyWithErrorAsync,
   ln as externalDataDepKeys,
-  Io as filterMap,
+  Ao as filterMap,
   on as findConstraintViolationError,
   qn as findErrorByCode,
   Jo as findRootActivity,
@@ -16135,7 +16159,7 @@ export {
   Ki as getFilteredRecordChanges,
   Wo as getInteractions,
   Hs as getNewFactPropertyBackfills,
-  Ar as getNewFilteredDataContexts,
+  Ir as getNewFilteredDataContexts,
   Bs as getRecomputeBlockingChanges,
   U as getSchemaDialect,
   Ds as getScopedSequenceNoSeedOperations,
@@ -16146,11 +16170,11 @@ export {
   So as indexBy,
   Fr as isObject,
   rt as isPlainObject,
-  An as isRequireSerializableRetry,
+  In as isRequireSerializableRetry,
   Mn as isRetryableTransactionError,
   _o as isTransactionCapabilityError,
   Vo as isTransactionRetryExhaustedError,
-  Ao as mapObject,
+  Io as mapObject,
   kt as normalizeDatabaseError,
   Re as normalizeScopedSequenceMatchExpression,
   an as predicateSQLForOperator,