interaqt 1.5.0 → 1.5.3

package/dist/index.js

@@ -18,15 +18,15 @@ function ls(c, t) {
 function k(c) {
   return typeof c == "function" ? `func::${c.toString()}` : Array.isArray(c) ? c : Ni(c) && !vi(c) ? `uuid::${c.uuid}` : c;
 }
-function Qt(c, t) {
+function Bt(c, t) {
   if (c == null || typeof c != "object") return c;
-  if (Array.isArray(c)) return c.map((i) => Qt(i, t));
+  if (Array.isArray(c)) return c.map((i) => Bt(i, t));
   if (vi(c))
-    return Object.fromEntries(Object.entries(c).map(([i, r]) => [i, Qt(r, t)]));
+    return Object.fromEntries(Object.entries(c).map(([i, r]) => [i, Bt(r, t)]));
   if (c instanceof Set)
-    return new Set(Array.from(c.values()).map((i) => Qt(i, t)));
+    return new Set(Array.from(c.values()).map((i) => Bt(i, t)));
   if (c instanceof Map)
-    return new Map(Array.from(c.entries()).map(([i, r]) => [i, Qt(r, t)]));
+    return new Map(Array.from(c.entries()).map(([i, r]) => [i, Bt(r, t)]));
   const e = c;
   return t && e._type && e.constructor?.clone ? e.constructor.clone(c, t) : c;
 }
@@ -60,11 +60,11 @@ function Gi(c) {
     t.set(r, n);
   }), t;
 }
-let Ji = 0;
+let Ki = 0;
 function A(c) {
-  return c?.uuid || `id_${++Ji}`;
+  return c?.uuid || `id_${++Ki}`;
 }
-const Ki = /^[a-zA-Z0-9_]+$/;
+const Ji = /^[a-zA-Z0-9_]+$/;
 class D {
   constructor(t, e) {
     this._type = "Entity", this._options = e, this.uuid = A(e), this.name = t.name, this.properties = t.properties || [], this.computation = t.computation, this.baseEntity = t.baseEntity, this.matchExpression = t.matchExpression, this.inputEntities = t.inputEntities, this.commonProperties = t.commonProperties, this.constraints = t.constraints;
@@ -84,7 +84,7 @@ class D {
         type: "string",
         required: !0,
         constraints: {
-          nameFormat: ({ name: t }) => Ki.test(t)
+          nameFormat: ({ name: t }) => Ji.test(t)
         }
       },
       properties: {
@@ -842,7 +842,7 @@ class xe {
     return this.create(e.public, e.options);
   }
 }
-class At {
+class Ct {
   constructor(t, e) {
     this._type = "StateMachine", this._options = e, this.uuid = A(e), this.states = t.states, this.transfers = t.transfers, this.initialState = t.initialState;
   }
@@ -875,7 +875,7 @@ class At {
     };
   }
   static create(t, e) {
-    const i = new At(t, e);
+    const i = new Ct(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateMachine`);
     return this.instances.push(i), i;
@@ -911,7 +911,7 @@ class At {
     return this.create(e.public, e.options);
   }
 }
-class Ct {
+class $t {
   constructor(t, e) {
     this._type = "WeightedSummation", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -959,7 +959,7 @@ class Ct {
     };
   }
   static create(t, e) {
-    const i = new Ct(t, e);
+    const i = new $t(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, WeightedSummation`);
     return this.instances.push(i), i;
@@ -1001,7 +1001,7 @@ class Ct {
     return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class $t {
+class It {
   constructor(t, e) {
     this._type = "Count", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -1044,7 +1044,7 @@ class $t {
     };
   }
   static create(t, e) {
-    const i = new $t(t, e);
+    const i = new It(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Count`);
     return this.instances.push(i), i;
@@ -1085,7 +1085,7 @@ class $t {
     return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class It {
+class xt {
   constructor(t, e) {
     this._type = "Summation", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.attributeQuery = t.attributeQuery;
   }
@@ -1118,7 +1118,7 @@ class It {
     };
   }
   static create(t, e) {
-    const i = new It(t, e);
+    const i = new xt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Summation`);
     return this.instances.push(i), i;
@@ -1153,7 +1153,7 @@ class It {
     return this.create(e.public, e.options);
   }
 }
-class xt {
+class Mt {
   constructor(t, e) {
     this._type = "Average", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.attributeQuery = t.attributeQuery;
   }
@@ -1186,7 +1186,7 @@ class xt {
     };
   }
   static create(t, e) {
-    const i = new xt(t, e);
+    const i = new Mt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Average`);
     return this.instances.push(i), i;
@@ -1221,7 +1221,7 @@ class xt {
     return this.create(e.public, e.options);
   }
 }
-class Mt {
+class Pt {
   constructor(t, e) {
     this._type = "Every", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps, this.notEmpty = t.notEmpty;
   }
@@ -1269,7 +1269,7 @@ class Mt {
     };
   }
   static create(t, e) {
-    const i = new Mt(t, e);
+    const i = new Pt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Every`);
     return this.instances.push(i), i;
@@ -1306,7 +1306,7 @@ class Mt {
     return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class Pt {
+class Dt {
   constructor(t, e) {
     this._type = "Any", this._options = e, this.uuid = A(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -1354,7 +1354,7 @@ class Pt {
     };
   }
   static create(t, e) {
-    const i = new Pt(t, e);
+    const i = new Dt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Any`);
     return this.instances.push(i), i;
@@ -1466,7 +1466,7 @@ class te {
     return typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class Dt {
+class Ot {
   constructor(t, e) {
     this._type = "RealTimeValue", this._options = e, this.uuid = A(e), this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps, this.nextRecomputeTime = t.nextRecomputeTime, this.callback = t.callback;
   }
@@ -1504,7 +1504,7 @@ class Dt {
     };
   }
   static create(t, e) {
-    const i = new Dt(t, e);
+    const i = new Ot(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, RealTimeValue`);
     return this.instances.push(i), i;
@@ -1601,7 +1601,7 @@ class Me {
     return typeof r.handle == "string" && r.handle.startsWith("func::") && (i.handle = new Function("return " + r.handle.substring(6))()), this.create(i, e.options);
   }
 }
-class Ot {
+class Ft {
   constructor(t, e) {
     this._type = "BoolAtomData", this._options = e, this.uuid = A(e), this.type = t.type || "atom", this.data = t.data;
   }
@@ -1630,7 +1630,7 @@ class Ot {
     };
   }
   static create(t, e) {
-    const i = new Ot(t, e);
+    const i = new Ft(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, BoolAtomData`);
     return this.instances.push(i), i;
@@ -1648,7 +1648,7 @@ class Ot {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
 }
-class Ft {
+class Lt {
   constructor(t, e) {
     this._type = "BoolExpressionData", this._options = e, this.uuid = A(e), this.type = t.type || "expression", this.operator = t.operator || "and", this.left = t.left, this.right = t.right;
   }
@@ -1689,7 +1689,7 @@ class Ft {
     };
   }
   static create(t, e) {
-    const i = new Ft(t, e);
+    const i = new Lt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, BoolExpressionData`);
     return this.instances.push(i), i;
@@ -1725,7 +1725,7 @@ class Ft {
     return this.create(e.public, e.options);
   }
 }
-class v {
+class E {
   constructor(t) {
     if (this.raw = t, !t)
       throw new Error("BoolExp raw data cannot be undefined");
@@ -1733,21 +1733,21 @@ class v {
       throw new Error(`invalid bool expression type: ${JSON.stringify(t)}`);
   }
   static atom(t) {
-    return new v({ type: "atom", data: t });
+    return new E({ type: "atom", data: t });
   }
   static and(...t) {
     const e = t.filter((a) => !!a);
     if (e.length === 0)
       return;
     const [i, ...r] = e;
-    return r.reduce((a, s) => a.and(s), i instanceof v ? i : new v(v.standardizeData(i)));
+    return r.reduce((a, s) => a.and(s), i instanceof E ? i : new E(E.standardizeData(i)));
   }
   static or(...t) {
     const e = t.filter((a) => !!a);
     if (e.length === 0)
       return;
     const [i, ...r] = e;
-    return r.reduce((a, s) => a.or(s), i instanceof v ? i : v.atom(i));
+    return r.reduce((a, s) => a.or(s), i instanceof E ? i : E.atom(i));
   }
   isAtom() {
     return this.raw.type === "atom";
@@ -1756,10 +1756,10 @@ class v {
     return this.raw.type;
   }
   get left() {
-    return new v(this.raw.left);
+    return new E(this.raw.left);
   }
   get right() {
-    return this.raw.right ? new v(this.raw.right) : void 0;
+    return this.raw.right ? new E(this.raw.right) : void 0;
   }
   get data() {
     return this.raw.data;
@@ -1769,13 +1769,13 @@ class v {
     return this.raw;
   }
   static fromValue(t) {
-    return t instanceof v ? t : new v(t);
+    return t instanceof E ? t : new E(t);
   }
   toJSON() {
     return this.raw;
   }
   static fromJSON(t) {
-    return new v(t);
+    return new E(t);
   }
   isExpression() {
     return this.raw.type === "expression";
@@ -1784,14 +1784,14 @@ class v {
     return t !== null && typeof t == "object" && "type" in t && (t.type === "atom" || t.type === "expression");
   }
   static standardizeData(t) {
-    return t instanceof v ? t.raw : v.isExpressionData(t) ? t : { type: "atom", data: t };
+    return t instanceof E ? t.raw : E.isExpressionData(t) ? t : { type: "atom", data: t };
   }
   and(t) {
-    return new v({
+    return new E({
       type: "expression",
       operator: "and",
       left: this.raw,
-      right: v.standardizeData(t)
+      right: E.standardizeData(t)
     });
   }
   isAnd() {
@@ -1804,16 +1804,16 @@ class v {
     return this.raw.operator === "not";
   }
   or(t) {
-    return new v({
+    return new E({
       type: "expression",
       operator: "or",
       left: this.raw,
-      right: t instanceof v ? t.raw : { type: "atom", data: t }
+      right: t instanceof E ? t.raw : { type: "atom", data: t }
     });
   }
   // 取反
   not() {
-    return new v({
+    return new E({
       type: "expression",
       operator: "not",
       left: this.raw
@@ -1830,7 +1830,7 @@ class v {
       }
     } else {
       const i = t(this, e);
-      return i instanceof v ? i : v.atom(i);
+      return i instanceof E ? i : E.atom(i);
     }
   }
   find(t, e) {
@@ -1891,19 +1891,19 @@ const Yi = [
   Zt,
   mt,
   xe,
-  At,
   Ct,
   $t,
   It,
   xt,
   Mt,
   Pt,
-  te,
   Dt,
+  te,
+  Ot,
   Me,
   Ie,
-  Ot,
-  Ft
+  Ft,
+  Lt
 ];
 Yi.forEach((c) => {
   c && c.displayName && Ei(c.displayName, c);
@@ -2431,14 +2431,14 @@ class it {
 }
 class w {
   constructor(t, e, i, r, a) {
-    this.map = e, this.contextRootEntity = r, this.fromRelation = a, R(!i || i instanceof v, `match data is not a BoolExpression instance, you passed: ${this.data}`);
+    this.map = e, this.contextRootEntity = r, this.fromRelation = a, R(!i || i instanceof E, `match data is not a BoolExpression instance, you passed: ${this.data}`);
     const s = this.map.getRecordInfo(t);
     this.entityName = s.resolvedBaseRecordName, this.xToOneQueryTree = new G(this.entityName, this.map);
     let n = i;
     s.resolvedMatchExpression && (n = i ? s.resolvedMatchExpression.and(i) : s.resolvedMatchExpression), n && (this.data = this.convertFilteredRelation(n), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
   static atom(t) {
-    return R(t.key !== void 0, "key cannot be undefined"), R(Array.isArray(t.value) && t.value.length === 2, "value must be array"), R(t.value[1] !== void 0, `${t.key} value cannot be undefined`), v.atom(t);
+    return R(t.key !== void 0, "key cannot be undefined"), R(Array.isArray(t.value) && t.value.length === 2, "value must be array"), R(t.value[1] !== void 0, `${t.key} value cannot be undefined`), E.atom(t);
   }
   // TODO 支持更复杂的格式
   // object 表达批量的 and
@@ -2458,7 +2458,7 @@ class w {
    * @returns 路径数组，每个路径是一个字符串数组
    */
   static extractPaths(t) {
-    const e = [], i = t instanceof v ? t : v.fromValue(t);
+    const e = [], i = t instanceof E ? t : E.fromValue(t);
     if (i.isExpression())
       i.left && e.push(...w.extractPaths(i.left.raw)), i.right && e.push(...w.extractPaths(i.right.raw));
     else if (i.isAtom()) {
@@ -2470,7 +2470,7 @@ class w {
   convertFilteredRelation(t) {
     if (t.isExpression()) {
       const e = this.convertFilteredRelation(t.left), i = t.right ? this.convertFilteredRelation(t.right) : void 0, r = t.raw;
-      return new v({
+      return new E({
         type: "expression",
         operator: r.operator,
         left: e.raw,
@@ -2481,7 +2481,7 @@ class w {
         const o = [...s.resolvedPath, n], l = this.map.getInfoByPath(o), u = s.resolvedPath.concat(l?.isLinkFiltered() ? l.getBaseAttributeInfo().attributeName : n);
         let d = s.matchExpression;
         if (l?.isLinkFiltered()) {
-          const h = l.getLinkInfo(), f = new w(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(u), m = [l.isRecordSource() ? "source" : "target", ...y.slice(2)], b = f.rebase(m.join("."));
+          const h = l.getLinkInfo(), f = new w(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), m = this.map.getReversePath(u), y = [l.isRecordSource() ? "source" : "target", ...m.slice(2)], b = f.rebase(y.join("."));
           d = d ? d.and(b) : b;
         }
         return {
@@ -2552,8 +2552,8 @@ class w {
             fieldValue: d,
             fieldParams: h
           };
-        const [f, y] = this.getFinalFieldValue(i.data.isReferenceValue, i.data.key, i.data.value, u.join("."), a.fieldType, t, e);
-        return v.atom({
+        const [f, m] = this.getFinalFieldValue(i.data.isReferenceValue, i.data.key, i.data.value, u.join("."), a.fieldType, t, e);
+        return E.atom({
           ...i.data,
           fieldName: this.getFinalFieldName(o),
           fieldValue: d,
@@ -2562,7 +2562,7 @@ class w {
           ...i.data,
           fieldName: this.getFinalFieldName(l),
           fieldValue: f,
-          fieldParams: y
+          fieldParams: m
         });
       } else {
         if (!n)
@@ -2572,7 +2572,7 @@ class w {
             isFunctionMatch: !0
           };
         const u = [this.entityName].concat(o), d = [this.entityName].concat(l);
-        return R(u.length === s.length, `symmetric entity match can only be last, ${u} ${s}`), v.atom({
+        return R(u.length === s.length, `symmetric entity match can only be last, ${u} ${s}`), E.atom({
           ...i.data,
           namePath: u,
           isFunctionMatch: !0
@@ -2585,7 +2585,7 @@ class w {
     }) : null;
   }
   and(t) {
-    return t instanceof w ? (R(this.entityName === t.entityName, `cannot and match exp of different entity: ${this.entityName} and ${t.entityName}`), new w(this.entityName, this.map, this.data ? this.data.and(t.data) : t.data, this.contextRootEntity)) : (R(t.key !== void 0, "key cannot be undefined"), R(Array.isArray(t.value) && t.value.length === 2, "value must be array"), R(t.value[1] !== void 0, `${t.key} value cannot be undefined`), new w(this.entityName, this.map, this.data ? this.data.and(t) : v.atom(t), this.contextRootEntity));
+    return t instanceof w ? (R(this.entityName === t.entityName, `cannot and match exp of different entity: ${this.entityName} and ${t.entityName}`), new w(this.entityName, this.map, this.data ? this.data.and(t.data) : t.data, this.contextRootEntity)) : (R(t.key !== void 0, "key cannot be undefined"), R(Array.isArray(t.value) && t.value.length === 2, "value must be array"), R(t.value[1] !== void 0, `${t.key} value cannot be undefined`), new w(this.entityName, this.map, this.data ? this.data.and(t) : E.atom(t), this.contextRootEntity));
   }
   rebase(t) {
     const e = this.map.getInfo(this.entityName, t);
@@ -2608,14 +2608,14 @@ class w {
           const o = n.data, l = o.key.split(".");
           if (l[0] === t) {
             const d = l.slice(1).join(".");
-            return v.atom({
+            return E.atom({
               key: d,
               value: o.value,
               isReferenceValue: o.isReferenceValue
             });
           }
           const u = this.map.getShrinkedAttribute(i, `${r}.${o.key}`);
-          return v.atom({
+          return E.atom({
             key: u,
             value: o.value,
             isReferenceValue: o.isReferenceValue
@@ -2644,7 +2644,7 @@ class w {
    * @returns MatchExp 实例
    */
   static fromJSON(t, e) {
-    const i = t.data ? v.fromValue(t.data) : void 0;
+    const i = t.data ? E.fromValue(t.data) : void 0;
     return new w(
       t.entityName,
       e,
@@ -2688,19 +2688,19 @@ class Zi {
   }
 }
 class L {
-  constructor(t, e, i, r, a, s, n, o, l, u = !1, d, h, f, y) {
-    this.recordName = t, this.map = e, this.matchExpression = i, this.attributeQuery = r, this.modifier = a, this.contextRootEntity = s, this.parentRecord = n, this.attributeName = o, this.onlyRelationData = l, this.allowNull = u, this.label = d, this.goto = h, this.exit = f, this.alias = y;
+  constructor(t, e, i, r, a, s, n, o, l, u = !1, d, h, f, m) {
+    this.recordName = t, this.map = e, this.matchExpression = i, this.attributeQuery = r, this.modifier = a, this.contextRootEntity = s, this.parentRecord = n, this.attributeName = o, this.onlyRelationData = l, this.allowNull = u, this.label = d, this.goto = h, this.exit = f, this.alias = m;
   }
   static create(t, e, i, r, a, s, n, o = !1, l) {
     const u = e.getRecordInfo(t), d = u.resolvedBaseRecordName, h = new w(d, e, i.matchExpression, r);
     let f = o ? h : h.and({
       key: "id",
       value: ["not", null]
-    }), y = f;
-    return u.resolvedMatchExpression && (y = f.and(new w(d, e, u.resolvedMatchExpression))), new L(
+    }), m = f;
+    return u.resolvedMatchExpression && (m = f.and(new w(d, e, u.resolvedMatchExpression))), new L(
       d,
       e,
-      y,
+      m,
       new O(d, e, i.attributeQuery || [], a, s),
       new Zi(d, e, i.modifier),
       r,
@@ -2805,27 +2805,27 @@ class O {
       const l = typeof o == "string" ? [o, {}, !1] : o, [u, d, h] = l;
       if (u === g) {
         R(!!(this.parentRecord && this.attributeName), `parent record and attribute name cannot be empty when query link data, you passed ${this.parentRecord} ${this.attributeName}`);
-        const y = this.map.getInfo(this.parentRecord, this.attributeName);
-        this.parentLinkRecordQuery = L.create(y.linkName, this.map, d, void 0);
+        const m = this.map.getInfo(this.parentRecord, this.attributeName);
+        this.parentLinkRecordQuery = L.create(m.linkName, this.map, d, void 0);
         return;
       }
       if (u === tr) {
-        n = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
+        n = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((m) => m.attributeName));
         return;
       }
       const f = this.map.getInfo(this.recordName, u);
       if (f.isRecord) {
-        let y = u, p = d;
+        let m = u, p = d;
         if (f.isLinkFiltered()) {
-          y = f.getBaseAttributeInfo().attributeName;
-          const b = d.matchExpression, E = f.getLinkInfo().getBaseLinkInfo(), I = new w(E.name, this.map, f.getMatchExpression()).rebase(f.isRecordSource() ? "target" : "source"), S = b ? I.and(b.data) : I;
+          m = f.getBaseAttributeInfo().attributeName;
+          const b = d.matchExpression, v = f.getLinkInfo().getBaseLinkInfo(), I = new w(v.name, this.map, f.getMatchExpression()).rebase(f.isRecordSource() ? "target" : "source"), S = b ? I.and(b.data) : I;
           p = {
             ...d,
             matchExpression: S.data
           };
         }
-        const m = L.create(f.recordName, this.map, p, void 0, this.recordName, y, h, !1, u);
-        this.relatedRecords.push(m), f.isXToMany ? this.xToManyRecords.push(m) : f.isXToOne && this.xToOneRecords.push(m);
+        const y = L.create(f.recordName, this.map, p, void 0, this.recordName, m, h, !1, u);
+        this.relatedRecords.push(y), f.isXToMany ? this.xToManyRecords.push(y) : f.isXToOne && this.xToOneRecords.push(y);
       } else
         n.add(u);
     }), this.valueAttributes = Array.from(n), this.fullQueryTree = this.buildFullQueryTree();
@@ -3264,7 +3264,7 @@ class rr {
    * 从匹配表达式中提取依赖关系
    */
   extractDependenciesFromExpression(t, e, i) {
-    const r = v.fromValue(e);
+    const r = E.fromValue(e);
     if (r.isExpression())
       r.left && this.extractDependenciesFromExpression(t, r.left.raw, i), r.right && this.extractDependenciesFromExpression(t, r.right.raw, i);
     else if (r.isAtom()) {
@@ -3281,13 +3281,13 @@ class rr {
         for (let l = 1; l < o.length - 1; l++) {
           const u = o.slice(0, l + 1), d = this.map.getInfoByPath(u);
           if (d && d.isRecord) {
-            const h = d.recordName, f = n.slice(0, l), y = n[n.length - 1], p = i.find(
-              (m) => m.entityName === h && JSON.stringify(m.path) === JSON.stringify(f)
+            const h = d.recordName, f = n.slice(0, l), m = n[n.length - 1], p = i.find(
+              (y) => y.entityName === h && JSON.stringify(y.path) === JSON.stringify(f)
             );
-            p ? p.attributes.includes(y) || p.attributes.push(y) : i.push({
+            p ? p.attributes.includes(m) || p.attributes.push(m) : i.push({
               entityName: h,
               path: f,
-              attributes: [y]
+              attributes: [m]
             });
           }
         }
@@ -3506,24 +3506,24 @@ class sr {
       this.parseMatchExpressionValue(t.recordName, u, t.contextRootEntity, l),
       e,
       l
-    ), [f, y] = this.buildSelectClause(
+    ), [f, m] = this.buildSelectClause(
       t.attributeQuery.getValueAndXToOneRecordFields(),
       e
-    ), p = this.buildFromClause(t.recordName, e), m = this.buildJoinClause(o, e), b = this.buildModifierClause(t.modifier, e, y);
+    ), p = this.buildFromClause(t.recordName, e), y = this.buildJoinClause(o, e), b = this.buildModifierClause(t.modifier, e, m);
     return [
       `
 SELECT
 ${f}
 FROM
 ${p}
-${m}
+${y}
 WHERE
 ${d}
 
 ${b}
 `,
       h,
-      y
+      m
     ];
   }
   /**
@@ -3587,11 +3587,11 @@ ${b}
       const d = o.split(".");
       let h, f;
       d.length === 1 ? (h = [l], f = o) : (h = [l, ...d.slice(0, -1)], f = d[d.length - 1]);
-      const [y, p] = this.map.getTableAliasAndFieldName(
+      const [m, p] = this.map.getTableAliasAndFieldName(
         h,
         f
       );
-      return `"${`${this.withPrefix(e)}${y}`}"."${p}" ${u}`;
+      return `"${`${this.withPrefix(e)}${m}`}"."${p}" ${u}`;
     }).join(",")}`), r && n.push(`LIMIT ${r}`), a && n.push(`OFFSET ${a}`), n.join(`
 `);
   }
@@ -3615,7 +3615,7 @@ ${b}
         table: d,
         alias: h,
         linkTable: f,
-        linkAlias: y
+        linkAlias: m
       } = this.map.getTableAndAliasStack(u).at(-1), [, p] = this.map.getTableAliasAndFieldName(u, "id", !0);
       if (!l.isMergedWithParent())
         if (l.isLinkMergedWithParent()) {
@@ -3627,39 +3627,39 @@ ${b}
             joinTarget: [d, h]
           });
         } else if (l.isLinkMergedWithAttribute()) {
-          const m = l.getReverseInfo();
-          if (!m.linkField)
-            throw new Error(`${m.parentEntityName}.${m.attributeName} has no field`);
+          const y = l.getReverseInfo();
+          if (!y.linkField)
+            throw new Error(`${y.parentEntityName}.${y.attributeName} has no field`);
           r.push({
             for: u,
             joinSource: s,
-            joinIdField: [a, m.linkField],
+            joinIdField: [a, y.linkField],
             joinTarget: [d, h]
           });
         } else {
-          const m = l.getLinkInfo(), b = l.isLinkManyToManySymmetric() ? l.symmetricDirection === "source" : m.isRelationSource(l.parentEntityName, l.attributeName);
+          const y = l.getLinkInfo(), b = l.isLinkManyToManySymmetric() ? l.symmetricDirection === "source" : y.isRelationSource(l.parentEntityName, l.attributeName);
           r.push({
             for: u,
             joinSource: s,
-            joinIdField: [a, b ? m.record.attributes.source.field : m.record.attributes.target.field],
-            joinTarget: [f, y]
+            joinIdField: [a, b ? y.record.attributes.source.field : y.record.attributes.target.field],
+            joinTarget: [f, m]
           }), n.onlyIdField() || r.push({
             for: u,
-            joinSource: [f, y],
-            joinIdField: [b ? m.record.attributes.target.field : m.record.attributes.source.field, p],
+            joinSource: [f, m],
+            joinIdField: [b ? y.record.attributes.target.field : y.record.attributes.source.field, p],
             joinTarget: [d, h]
           });
         }
       if (r.push(...this.getJoinTables(n, u, [p, d, h])), n.parentLinkQueryTree && !n.parentLinkQueryTree.onlyIdField()) {
-        const m = u.concat(g), [, b] = this.map.getTableAliasAndFieldName(m, "id", !0), E = [
+        const y = u.concat(g), [, b] = this.map.getTableAliasAndFieldName(y, "id", !0), v = [
           b,
           // link 的 idField
           f,
           // link 的 tableName
-          y
+          m
           // link 的 tableAlias
         ];
-        r.push(...this.getJoinTables(n.parentLinkQueryTree, m, E));
+        r.push(...this.getJoinTables(n.parentLinkQueryTree, y, v));
       }
     }), r;
   }
@@ -3770,7 +3770,7 @@ WHERE ${a}
     return e?.toLowerCase() === "json" ? JSON.stringify(t) : t;
   }
 }
-const Jt = ":root";
+const Kt = ":root";
 class dt {
   constructor(t, e, i = []) {
     this.label = t, this.parent = e, this.stack = i;
@@ -3790,7 +3790,7 @@ class dt {
 }
 class nr {
   constructor(t) {
-    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Jt, t), this.recursiveSaveLabelledRecordQuery(t);
+    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Kt, t), this.recursiveSaveLabelledRecordQuery(t);
   }
   recursiveSaveLabelledRecordQuery(t) {
     t.attributeQuery?.relatedRecords.forEach((e) => {
@@ -3828,14 +3828,14 @@ class or {
    * 查找记录（主查询方法）
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(t, e = "", i, r = new dt(Jt), a = !1) {
+  async findRecords(t, e = "", i, r = new dt(Kt), a = !1) {
     if (i || (i = new nr(t)), t.goto) {
       if (t.exit && await t.exit(r))
         return [];
       const f = i.get(t.goto);
       R(f, `goto ${t.goto} not found`);
-      const y = t.matchExpression.and(f.matchExpression), p = f.derive({
-        matchExpression: y
+      const m = t.matchExpression.and(f.matchExpression), p = f.derive({
+        matchExpression: m
       });
       return this.findRecords(p, e, i, r);
     }
@@ -3851,30 +3851,30 @@ FOR UPDATE` : s,
     for (let f of t.attributeQuery.xToOneRecords)
       if (f.goto) {
         const p = this.map.getInfo(f.parentRecord, f.attributeName).getReverseInfo()?.attributeName;
-        for (let m of d) {
+        for (let y of d) {
           const b = f.matchExpression.and({
             key: `${p}.id`,
-            value: ["=", m.id]
-          }), E = f.derive({
+            value: ["=", y.id]
+          }), v = f.derive({
             matchExpression: b
-          }), N = t.label ? h.concat(m) : h;
-          m[f.alias || f.attributeName] = await this.findRecords(E, e, i, N);
+          }), N = t.label ? h.concat(y) : h;
+          y[f.alias || f.attributeName] = await this.findRecords(v, e, i, N);
         }
       }
     for (let f of t.attributeQuery.xToOneRecords) {
-      const y = f.attributeQuery.parentLinkRecordQuery;
-      if (y)
-        for (let p of y.attributeQuery.xToManyRecords) {
+      const m = f.attributeQuery.parentLinkRecordQuery;
+      if (m)
+        for (let p of m.attributeQuery.xToManyRecords) {
           const b = this.map.getInfo(p.parentRecord, p.attributeName).getReverseInfo()?.attributeName;
-          for (let E of d) {
-            const N = E[f.attributeName][g].id, I = p.derive({
+          for (let v of d) {
+            const N = v[f.attributeName][g].id, I = p.derive({
               matchExpression: p.matchExpression.and({
                 key: `${b}.id`,
                 value: ["=", N]
               })
-            }), S = t.label ? h.concat(E) : h;
+            }), S = t.label ? h.concat(v) : h;
             oe(
-              E,
+              v,
               [f.alias || f.attributeName, g, p.attributeName],
               await this.findRecords(
                 I,
@@ -3888,12 +3888,12 @@ FOR UPDATE` : s,
     }
     for (let f of t.attributeQuery.xToManyRecords)
       if (!f.onlyRelationData)
-        for (let y of d) {
-          const p = t.label ? h.concat(y) : h;
-          y[f.alias || f.attributeName] = await this.findXToManyRelatedRecords(
+        for (let m of d) {
+          const p = t.label ? h.concat(m) : h;
+          m[f.alias || f.attributeName] = await this.findXToManyRelatedRecords(
             t.recordName,
             f.attributeName,
-            y.id,
+            m.id,
             f,
             i,
             p
@@ -3955,28 +3955,28 @@ FOR UPDATE` : s,
     }), u = r.attributeQuery.parentLinkRecordQuery ? r.attributeQuery.withParentLinkData() : r.attributeQuery, d = r.derive({
       matchExpression: l,
       attributeQuery: u
-    }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, a, s), f = r.attributeQuery.parentLinkRecordQuery ? h.map((m) => {
+    }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, a, s), f = r.attributeQuery.parentLinkRecordQuery ? h.map((y) => {
       let b;
       return n.isLinkManyToManySymmetric() ? (b = {
-        ...m,
-        [g]: m[`${o}:source`]?.[g]?.id ? m[`${o}:source`]?.[g] : m[`${o}:target`]?.[g]
+        ...y,
+        [g]: y[`${o}:source`]?.[g]?.id ? y[`${o}:source`]?.[g] : y[`${o}:target`]?.[g]
       }, delete b[`${o}:source`], delete b[`${o}:target`]) : (b = {
-        ...m,
-        [g]: m[o][g]
+        ...y,
+        [g]: y[o][g]
       }, delete b[o]), b;
-    }) : h, y = d.label && d.label !== s.label ? s.spawn(d.label) : s, p = r.attributeQuery.parentLinkRecordQuery;
+    }) : h, m = d.label && d.label !== s.label ? s.spawn(d.label) : s, p = r.attributeQuery.parentLinkRecordQuery;
     if (p)
-      for (let m of p.attributeQuery.xToManyRecords)
+      for (let y of p.attributeQuery.xToManyRecords)
         for (let b of f) {
-          const E = b[g].id, N = d.label ? y.concat(b) : y;
+          const v = b[g].id, N = d.label ? m.concat(b) : m;
           oe(
             b,
-            [g, m.attributeName],
+            [g, y.attributeName],
             await this.findXToManyRelatedRecords(
-              m.parentRecord,
-              m.attributeName,
-              E,
-              m,
+              y.parentRecord,
+              y.attributeName,
+              v,
+              y,
               a,
               N
             )
@@ -3993,18 +3993,18 @@ FOR UPDATE` : s,
       value: ["=", i]
     }), u = O.getAttributeQueryDataForRecord(t, this.map, !0, !0, !1, !0), d = e;
     let h = u;
-    for (let m of o)
-      h.push([m, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
+    for (let y of o)
+      h.push([y, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
     h.push([n, { label: d, attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
-    for (let m of o)
-      h.push([m, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
+    for (let y of o)
+      h.push([y, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
     let f;
-    const y = async (m) => {
+    const m = async (y) => {
       if (f) return !0;
-      if (m.stack.at(-1)?.id === r)
-        return f = [...m.stack], !0;
+      if (y.stack.at(-1)?.id === r)
+        return f = [...y.stack], !0;
     };
-    h.push([n, { goto: d, exit: y }]);
+    h.push([n, { goto: d, exit: m }]);
     const p = (await this.findRecords(L.create(t, this.map, {
       matchExpression: l,
       attributeQuery: u
@@ -4310,11 +4310,11 @@ class ur {
    * 查找记录（主查询方法）- 委托给 QueryExecutor
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(t, e = "", i, r = new dt(Jt)) {
+  async findRecords(t, e = "", i, r = new dt(Kt)) {
     return this.queryExecutor.findRecords(t, e, i, r);
   }
   async lockRecords(t, e = "") {
-    return this.queryExecutor.findRecords(t, e, void 0, new dt(Jt), !0);
+    return this.queryExecutor.findRecords(t, e, void 0, new dt(Kt), !0);
   }
   // 委托给 CreationExecutor
   async createRecordDependency(t, e) {
@@ -4544,7 +4544,7 @@ class ti {
     return this.map.getInfo(t, e).recordName;
   }
 }
-class vt {
+class Et {
   constructor(t, e) {
     this.name = t, this.map = e, this.data = this.map.data.records[t];
   }
@@ -4615,7 +4615,7 @@ class vt {
     return this.data.matchExpression;
   }
   get filteredBy() {
-    return this.data.filteredBy?.map((t) => new vt(t, this.map));
+    return this.data.filteredBy?.map((t) => new Et(t, this.map));
   }
   get isFilteredEntity() {
     return this.data?.isFilteredEntity;
@@ -4633,7 +4633,7 @@ class vt {
     return this.data?.resolvedMatchExpression;
   }
 }
-class Kt {
+class Jt {
   constructor(t, e, i, r = !0) {
     this.name = t, this.data = e, this.map = i, this.isFromSource = r;
   }
@@ -4662,10 +4662,10 @@ class Kt {
     return this.data.sourceRecord;
   }
   get sourceRecordInfo() {
-    return new vt(this.data.sourceRecord, this.map);
+    return new Et(this.data.sourceRecord, this.map);
   }
   get targetRecordInfo() {
-    return new vt(this.data.targetRecord, this.map);
+    return new Et(this.data.targetRecord, this.map);
   }
   get targetRecord() {
     return this.data.targetRecord;
@@ -4721,7 +4721,7 @@ class Kt {
   getBaseLinkInfo() {
     R(this.isFilteredRelation(), "only filtered relation can get base link info");
     const t = this.data.baseLinkName;
-    return new Kt(t, this.map.data.links[t], this.map);
+    return new Jt(t, this.map.data.links[t], this.map);
   }
   getMatchExpression() {
     if (this.isFilteredRelation())
@@ -4749,7 +4749,7 @@ class ut {
     return this.data.records[t].attributes[this.getAttributeAndSymmetricDirection(e)[0]];
   }
   getRecordInfo(t) {
-    return new vt(t, this);
+    return new Et(t, this);
   }
   getInfo(t, e) {
     const i = this.getInfoByPath([t, ...e.split(".")]);
@@ -4760,10 +4760,10 @@ class ut {
   }
   getLinkInfo(t, e) {
     const i = this.getAttributeAndSymmetricDirection(e)[0], { linkName: r, isSource: a } = this.data.records[t].attributes[i];
-    return R(!!r, `cannot find relation ${t} ${i}`), new Kt(r, this.data.links[r], this, !!a);
+    return R(!!r, `cannot find relation ${t} ${i}`), new Jt(r, this.data.links[r], this, !!a);
   }
   getLinkInfoByName(t) {
-    return R(!!this.data.links[t], `cannot find link ${t}`), new Kt(t, this.data.links[t], this);
+    return R(!!this.data.links[t], `cannot find link ${t}`), new Jt(t, this.data.links[t], this);
   }
   getInfoByPath(t) {
     const [e, ...i] = t;
@@ -4797,19 +4797,19 @@ class ut {
       path: [e]
     }];
     for (let h = 0; h < i.length; h++) {
-      const [f, y] = this.getAttributeAndSymmetricDirection(i[h]), p = [e, ...i.slice(0, h + 1)];
+      const [f, m] = this.getAttributeAndSymmetricDirection(i[h]), p = [e, ...i.slice(0, h + 1)];
       if (f === g) {
-        const { linkTable: m, linkAlias: b, path: E } = d.pop();
-        R(!l, `last attribute in path is a link, cannot read link of a link ${E.join(".")}`), a = m, s = b, r = this.data.records[u.linkName], l = !0, n = "", o = "", u = void 0;
+        const { linkTable: y, linkAlias: b, path: v } = d.pop();
+        R(!l, `last attribute in path is a link, cannot read link of a link ${v.join(".")}`), a = y, s = b, r = this.data.records[u.linkName], l = !0, n = "", o = "", u = void 0;
       } else {
         u = this.getInfoByPath(p);
-        const m = r.attributes[f];
+        const y = r.attributes[f];
         R(u.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
-        const b = this.data.records[m.recordName], E = `${s}_${f}${y ? `_${y.toUpperCase()}` : ""}`, N = this.aliasManager?.getTableAlias(E) || E;
+        const b = this.data.records[y.recordName], v = `${s}_${f}${m ? `_${m.toUpperCase()}` : ""}`, N = this.aliasManager?.getTableAlias(v) || v;
         if (u.isMergedWithParent() || u.isLinkMergedWithParent())
           o = s;
         else if (u.isLinkIsolated()) {
-          const I = `REL_${E}`;
+          const I = `REL_${v}`;
           o = this.aliasManager?.getTableAlias(I) || I;
         } else
           o = N;
@@ -4831,15 +4831,15 @@ class ut {
     const r = this.getTableAndAliasStack(t), { table: a, alias: s, record: n, path: o, linkAlias: l, linkTable: u, isLinkRecord: d } = r.at(-1), h = !d && r.length > 1 ? this.getInfoByPath(o) : null;
     if (!i && e === "id" && !d && t.length > 1 && (h?.isLinkMergedWithParent() || h?.isLinkIsolated()))
       if (h?.isLinkMergedWithParent()) {
-        const { alias: y, table: p } = r.at(-2);
-        return [y, h.linkField, p];
+        const { alias: m, table: p } = r.at(-2);
+        return [m, h.linkField, p];
       } else {
-        const y = h.getLinkInfo().record, p = h?.isLinkManyToManySymmetric() ? h?.symmetricDirection === "source" ? y?.attributes.target.field : y?.attributes.source.field : h.isRecordSource() ? y?.attributes.target.field : y?.attributes.source.field;
+        const m = h.getLinkInfo().record, p = h?.isLinkManyToManySymmetric() ? h?.symmetricDirection === "source" ? m?.attributes.target.field : m?.attributes.source.field : h.isRecordSource() ? m?.attributes.target.field : m?.attributes.source.field;
         return [l, p, u];
       }
     else {
-      const y = n.attributes[this.getAttributeAndSymmetricDirection(e)[0]].field;
-      return [s, y, a];
+      const m = n.attributes[this.getAttributeAndSymmetricDirection(e)[0]].field;
+      return [s, m, a];
     }
   }
   findManyToManySymmetricPath(t) {
@@ -4907,12 +4907,12 @@ class ut {
             const h = d.getLinkInfo().data;
             let f;
             d.isRecordSource() ? f = h.targetRecord : f = h.sourceRecord;
-            let y;
-            if (u === "source" ? y = h.sourceRecord : y = h.targetRecord, f === y) {
+            let m;
+            if (u === "source" ? m = h.sourceRecord : m = h.targetRecord, f === m) {
               n += 2;
               continue;
             } else {
-              a = y, s = a, a = "", s = "", r.push(o), r.push(u), n += 2;
+              a = m, s = a, a = "", s = "", r.push(o), r.push(u), n += 2;
               continue;
             }
           }
@@ -4971,7 +4971,7 @@ function pr(c, t) {
   ), e.getAll();
 }
 function ei(c, t, e, i) {
-  const r = c.filter((a) => qt(a) !== void 0);
+  const r = c.filter((a) => _t(a) !== void 0);
   for (const a of r)
     fr(
       a,
@@ -4988,9 +4988,9 @@ function fr(c, t, e, i) {
     t
   );
   t.replace(o, c), l !== o && t.add(l);
-  const u = qt(c) || [];
+  const u = _t(c) || [];
   if (c.commonProperties) {
-    const d = u.filter((h) => c.commonProperties.some((f) => !h.properties.some((y) => y.name === f.name && y.type === f.type)));
+    const d = u.filter((h) => c.commonProperties.some((f) => !h.properties.some((m) => m.name === f.name && m.type === f.type)));
     if (d.length > 0)
       throw new Error(`Merged ${e} ${c.name} defined commonProperties, but these ${e}s do not have commonProperties: ${d.map((h) => h.name).join(", ")}`);
   }
@@ -5016,7 +5016,7 @@ function mr(c, t, e, i, r) {
   o && i.replace(a, o);
 }
 function yr(c, t) {
-  const e = /* @__PURE__ */ new Map(), i = qt(c);
+  const e = /* @__PURE__ */ new Map(), i = _t(c);
   if (i && i.length > 0)
     for (const r of i) {
       const a = yt(r), s = [...t.get(a) || []], n = e.get(a) || [];
@@ -5035,7 +5035,7 @@ function gr(c, t, e) {
     name: c,
     type: "json",
     defaultValue: (r, a) => {
-      const s = qt(t) || [], o = (i.get(a) || []).filter(
+      const s = _t(t) || [], o = (i.get(a) || []).filter(
         (l) => s.some((u) => yt(u) === l)
       );
       return o.length > 0 ? o : [a];
@@ -5043,10 +5043,10 @@ function gr(c, t, e) {
   });
 }
 function br(c, t, e) {
-  const i = qt(c) || [], r = [], a = /* @__PURE__ */ new Map(), s = Object.fromEntries(c.commonProperties?.map((n) => [n.name, n]) || []);
+  const i = _t(c) || [], r = [], a = /* @__PURE__ */ new Map(), s = Object.fromEntries(c.commonProperties?.map((n) => [n.name, n]) || []);
   for (const n of i) {
     let o = n;
-    if (Lt(o))
+    if (qt(o))
       for (; o.baseEntity && o.properties.length === 0; )
         o = o.baseEntity;
     else if (vr(o))
@@ -5062,7 +5062,7 @@ function br(c, t, e) {
       else {
         const f = e.getEntityByName(h) || e.getRelationByName(h);
         if (!(f.inputEntities || f.inputRelations)) {
-          const p = Object.fromEntries(f.properties.map((m) => [m.name, m]));
+          const p = Object.fromEntries(f.properties.map((y) => [y.name, y]));
           a.set(h, p), Object.assign(s, p);
         }
       }
@@ -5093,7 +5093,7 @@ function wr(c, t, e, i) {
     r,
     ...c.properties
   ];
-  if (Lt(c)) {
+  if (qt(c)) {
     const s = i.getEntityByName(c.name), n = D.create({
       name: s.name
     });
@@ -5144,7 +5144,7 @@ function wr(c, t, e, i) {
   }
 }
 function Rr(c, t, e) {
-  if (Lt(c)) {
+  if (qt(c)) {
     const i = c, r = t;
     let a = i;
     if (i.baseEntity)
@@ -5175,17 +5175,17 @@ function Nr(c) {
     t = t.baseRelation;
   return t;
 }
-function Lt(c) {
+function qt(c) {
   return "inputEntities" in c || !("sourceProperty" in c);
 }
 function vr(c) {
   return "sourceProperty" in c;
 }
-function qt(c) {
-  return Lt(c) ? c.inputEntities : c.inputRelations;
+function _t(c) {
+  return qt(c) ? c.inputEntities : c.inputRelations;
 }
 function yt(c) {
-  return Lt(c), c.name;
+  return qt(c), c.name;
 }
 class Er {
   constructor() {
@@ -5308,7 +5308,7 @@ function Q(c) {
 function ot(c, t) {
   return t.name === "mysql" ? `\`${c.replace(/`/g, "``")}\`` : `"${c.replace(/"/g, '""')}"`;
 }
-function Bt(c, t) {
+function Ut(c, t) {
   return t.encodeLiteral(c);
 }
 function Tr(c, t, e) {
@@ -5319,16 +5319,16 @@ function Tr(c, t, e) {
     case "isNotNull":
       return `${i} IS NOT NULL`;
     case "equals":
-      return t.value === null ? `${i} IS NULL` : `${i} = ${Bt(t.value, e)}`;
+      return t.value === null ? `${i} IS NULL` : `${i} = ${Ut(t.value, e)}`;
     case "notEquals":
-      return t.value === null ? `${i} IS NOT NULL` : `${i} != ${Bt(t.value, e)}`;
+      return t.value === null ? `${i} IS NOT NULL` : `${i} != ${Ut(t.value, e)}`;
     case "in": {
       const r = t.value.filter((s) => s !== null), a = [];
-      return t.value.some((s) => s === null) && a.push(`${i} IS NULL`), r.length && a.push(`${i} IN (${r.map((s) => Bt(s, e)).join(", ")})`), `(${a.join(" OR ")})`;
+      return t.value.some((s) => s === null) && a.push(`${i} IS NULL`), r.length && a.push(`${i} IN (${r.map((s) => Ut(s, e)).join(", ")})`), `(${a.join(" OR ")})`;
     }
     case "notIn": {
       const r = t.value.filter((s) => s !== null), a = [];
-      return t.value.some((s) => s === null) && a.push(`${i} IS NOT NULL`), r.length && a.push(`${i} NOT IN (${r.map((s) => Bt(s, e)).join(", ")})`), `(${a.join(" AND ")})`;
+      return t.value.some((s) => s === null) && a.push(`${i} IS NOT NULL`), r.length && a.push(`${i} NOT IN (${r.map((s) => Ut(s, e)).join(", ")})`), `(${a.join(" AND ")})`;
     }
   }
 }
@@ -5778,12 +5778,12 @@ class ri {
       const [a, ...s] = r.split(".");
       let n = a;
       for (let o = 0; o < s.length; o++) {
-        const l = s[o], u = this.map.records[n].attributes[l], d = u.linkName, h = this.map.links[d], { relType: f, sourceRecord: y, targetRecord: p } = h;
+        const l = s[o], u = this.map.records[n].attributes[l], d = u.linkName, h = this.map.links[d], { relType: f, sourceRecord: m, targetRecord: p } = h;
         R(
-          f[0] === "1" && f[1] === "1" && y !== p,
+          f[0] === "1" && f[1] === "1" && m !== p,
           `only 1:1 can merge: ${a}.${s.slice(0, o + 1).join(".")}`
         );
-        const m = y === n ? p : y, b = this.combineRecordTable(n, m, d);
+        const y = m === n ? p : m, b = this.combineRecordTable(n, y, d);
         if (b)
           throw new Error(`conflict found when join ${d}, ${b.join(",")} already merged with ${n}`);
         h.mergedTo = "combined", i.push(h), n = u.recordName, delete t[d], delete e[d];
@@ -6041,7 +6041,7 @@ ${Object.values(this.tables[t].columns).map((i) => `    "${i.name}" ${i.fieldTyp
     });
   }
 }
-const wt = "_System_", J = "_Dictionary_", ai = "id", si = "_rowId", ni = D.create({
+const wt = "_System_", K = "_Dictionary_", ai = "id", si = "_rowId", ni = D.create({
   name: wt,
   properties: [
     T.create({
@@ -6061,7 +6061,7 @@ const wt = "_System_", J = "_Dictionary_", ai = "id", si = "_rowId", ni = D.crea
     })
   ]
 }), oi = D.create({
-  name: J,
+  name: K,
   properties: [
     T.create({
       name: "key",
@@ -6139,7 +6139,7 @@ class Ci {
    * @returns 是否需要触发计算
    */
   shouldTriggerUpdateComputation(t, e) {
-    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === J ? e.record?.key === t.dataDep.source.name : t.attributes.includes("*") ? Object.keys(e.record || {}).some(
+    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === K ? e.record?.key === t.dataDep.source.name : t.attributes.includes("*") ? Object.keys(e.record || {}).some(
       (r) => r !== "id" && e.record[r] !== e.oldRecord?.[r]
     ) : !t.attributes.filter((r) => r !== "id").every(
       (r) => !e.record.hasOwnProperty(r) || e.record[r] === e.oldRecord[r]
@@ -6199,15 +6199,15 @@ class Ci {
     } else e.type === "global" && ((!r || r === "update") && s.push({
       dataDep: e,
       type: "update",
-      recordName: J,
-      sourceRecordName: J,
+      recordName: K,
+      sourceRecordName: K,
       attributes: ["value"],
       computation: i
     }), (!r || r === "create") && s.push({
       dataDep: e,
       type: "create",
-      recordName: J,
-      sourceRecordName: J,
+      recordName: K,
+      sourceRecordName: K,
       computation: i
     }));
     return s;
@@ -6312,7 +6312,7 @@ class x {
     this.resolved = (t, e) => new ee(t, e);
   }
   static {
-    this.async = (t) => new _t(t);
+    this.async = (t) => new Vt(t);
   }
   static {
     this.fullRecompute = (t) => new Xt(t);
@@ -6325,7 +6325,7 @@ class Xt extends x {
     super(), this.reason = t;
   }
 }
-class _t extends x {
+class Vt extends x {
   constructor(t) {
     super(), this.args = t;
   }
@@ -6514,7 +6514,7 @@ class Ar {
     }
   }
   static {
-    this.computationType = At;
+    this.computationType = Ct;
   }
   static {
     this.contextType = "global";
@@ -6547,7 +6547,7 @@ class Cr {
     }
   }
   static {
-    this.computationType = At;
+    this.computationType = Ct;
   }
   static {
     this.contextType = "property";
@@ -6609,7 +6609,7 @@ class Ir {
     };
   }
   static {
-    this.computationType = Ct;
+    this.computationType = $t;
   }
   static {
     this.contextType = "global";
@@ -6668,7 +6668,7 @@ class xr {
     };
   }
   static {
-    this.computationType = Ct;
+    this.computationType = $t;
   }
   static {
     this.contextType = "property";
@@ -6739,7 +6739,7 @@ class Pr {
     }, this.defaultValue = !this.args.notEmpty;
   }
   static {
-    this.computationType = Mt;
+    this.computationType = Pt;
   }
   static {
     this.contextType = "global";
@@ -6807,7 +6807,7 @@ class Dr {
     };
   }
   static {
-    this.computationType = Mt;
+    this.computationType = Pt;
   }
   static {
     this.contextType = "property";
@@ -6843,15 +6843,15 @@ class Dr {
       }), void 0, this.relationAttributeQuery))[this.isSource ? "target" : "source"];
       h["&"] = u;
       const f = !!this.callback.call(this.controller, h, r);
-      let y;
+      let m;
       try {
-        ({ oldValue: y } = await this.state.isItemMatch.replace(u, f));
+        ({ oldValue: m } = await this.state.isItemMatch.replace(u, f));
       } catch (p) {
         if (p instanceof Error && p.message.includes("Atomic replace target not found"))
           return x.fullRecompute("relation contribution state target not found");
         throw p;
       }
-      s = Number(f) - +!!y, n = 1;
+      s = Number(f) - +!!m, n = 1;
     } else if (a.type === "delete" && a.recordName === this.relation.name) {
       const u = a.record;
       s = !!await this.state.isItemMatch.get(u) ? -1 : 0, n = -1;
@@ -6868,16 +6868,16 @@ class Dr {
         value: ["=", a.oldRecord.id]
       }), h = await this.controller.system.storage.findOne(this.relation.name, d, void 0, this.relationAttributeQuery), f = h[this.isSource ? "target" : "source"];
       f["&"] = h;
-      const y = !!this.callback.call(this.controller, f, r);
+      const m = !!this.callback.call(this.controller, f, r);
       let p;
       try {
-        ({ oldValue: p } = await this.state.isItemMatch.replace(h, y));
-      } catch (m) {
-        if (m instanceof Error && m.message.includes("Atomic replace target not found"))
+        ({ oldValue: p } = await this.state.isItemMatch.replace(h, m));
+      } catch (y) {
+        if (y instanceof Error && y.message.includes("Atomic replace target not found"))
           return x.fullRecompute("relation contribution state target not found");
-        throw m;
+        throw y;
       }
-      s = Number(y) - +!!p;
+      s = Number(m) - +!!p;
     } else
       return x.fullRecompute("mutation is not caused by relation.");
     const o = await this.state.matchCount.increment(e.record, s), l = await this.state.totalCount.increment(e.record, n);
@@ -6897,7 +6897,7 @@ class Fr {
     };
   }
   static {
-    this.computationType = Pt;
+    this.computationType = Dt;
   }
   static {
     this.contextType = "global";
@@ -6961,7 +6961,7 @@ class Lr {
     };
   }
   static {
-    this.computationType = Pt;
+    this.computationType = Dt;
   }
   static {
     this.contextType = "property";
@@ -7032,7 +7032,7 @@ class _r {
     };
   }
   static {
-    this.computationType = $t;
+    this.computationType = It;
   }
   static {
     this.contextType = "global";
@@ -7090,7 +7090,7 @@ class Vr {
     };
   }
   static {
-    this.computationType = $t;
+    this.computationType = It;
   }
   static {
     this.contextType = "property";
@@ -7344,14 +7344,14 @@ const ci = [10, 25, 60, 150, 350];
 function Wr(c) {
   return new Promise((t) => setTimeout(t, c));
 }
-function Ut(c, t, e, i) {
+function Ht(c, t, e, i) {
   return c && typeof c == "object" && Object.assign(c, {
     transactionAttempts: t,
     transactionIsolation: e,
     transactionName: i
   }), c;
 }
-class jt extends Error {
+class Wt extends Error {
   constructor(t, e, i, r) {
     super(`Transaction retry exhausted for ${t} after ${e} attempts`, { cause: r }), this.name = "TransactionRetryExhaustedError", this.transactionAttempts = e, this.transactionIsolation = i, this.transactionName = t, Object.assign(this, {
       transactionAttempts: e,
@@ -7361,7 +7361,7 @@ class jt extends Error {
   }
 }
 function Ss(c) {
-  return Y(c).some((t) => t instanceof jt);
+  return Y(c).some((t) => t instanceof Wt);
 }
 function ks(c) {
   return Y(c).some((t) => t instanceof Re);
@@ -7376,11 +7376,11 @@ async function De(c, t, e = {}) {
     } catch (n) {
       if (s = n, Ur(n)) {
         if (r = "SERIALIZABLE", a < i) continue;
-        throw new jt(
+        throw new Wt(
           c,
           a,
           r,
-          Ut(n, a, r, c)
+          Ht(n, a, r, c)
         );
       }
       if (Hr(n)) {
@@ -7389,17 +7389,17 @@ async function De(c, t, e = {}) {
           await Wr(o + l);
           continue;
         }
-        throw new jt(
+        throw new Wt(
           c,
           a,
           r,
-          Ut(n, a, r, c)
+          Ht(n, a, r, c)
         );
       }
-      throw Ut(n, a, r, c);
+      throw Ht(n, a, r, c);
     }
   }
-  throw new jt(c, a, r, Ut(s, a, r, c));
+  throw new Wt(c, a, r, Ht(s, a, r, c));
 }
 class Gr {
   constructor(t, e, i) {
@@ -7434,7 +7434,7 @@ class Gr {
     for (const i of t) {
       const r = await this.transformCallback.call(this.controller, i);
       (Array.isArray(r) ? r : [r]).forEach((s, n) => {
-        e.push({
+        s && e.push({
           ...s,
           [this.state.sourceRecordId.key]: i.id,
           [this.state.transformIndex.key]: n
@@ -7520,7 +7520,7 @@ class Gr {
     return r;
   }
 }
-const Jr = [Gr];
+const Kr = [Gr];
 class _ {
   constructor(t) {
     this.node = t;
@@ -7792,12 +7792,12 @@ class Oe {
     }
   }
 }
-class Kr {
+class Jr {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = this.args.dataDeps ?? {}, this.callback = (r, a) => this.args.callback.call(this.controller, r, a), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, a) => this.args.nextRecomputeTime.call(this.controller, r, a) : void 0;
   }
   static {
-    this.computationType = Dt;
+    this.computationType = Ot;
   }
   static {
     this.contextType = "global";
@@ -7835,7 +7835,7 @@ class Xr {
     }, this.isResultNumber = this.dataContext.id.type === "number", this.callback = (r, a) => this.args.callback.call(this.controller, r, a), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, a) => this.args.nextRecomputeTime.call(this.controller, r, a) : void 0;
   }
   static {
-    this.computationType = Dt;
+    this.computationType = Ot;
   }
   static {
     this.contextType = "property";
@@ -7862,7 +7862,7 @@ class Xr {
     return await this.state.lastRecomputeTime.setInternal(e, r), await this.state.nextRecomputeTime.setInternal(e, s), a;
   }
 }
-const zr = [Kr, Xr];
+const zr = [Jr, Xr];
 class Yr {
   constructor(t, e, i) {
     if (this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = {}, this.record = this.args.record, !this.args.attributeQuery || this.args.attributeQuery.length === 0)
@@ -7880,7 +7880,7 @@ class Yr {
     };
   }
   static {
-    this.computationType = It;
+    this.computationType = xt;
   }
   static {
     this.contextType = "global";
@@ -7945,7 +7945,7 @@ class Zr {
     };
   }
   static {
-    this.computationType = It;
+    this.computationType = xt;
   }
   static {
     this.contextType = "property";
@@ -8031,7 +8031,7 @@ class ea {
     };
   }
   static {
-    this.computationType = xt;
+    this.computationType = Mt;
   }
   static {
     this.contextType = "global";
@@ -8115,7 +8115,7 @@ class ia {
     };
   }
   static {
-    this.computationType = xt;
+    this.computationType = Mt;
   }
   static {
     this.contextType = "property";
@@ -8160,8 +8160,8 @@ class ia {
         this.relationAttributeQuery
       ), h = d[this.isSource ? "target" : "source"];
       h["&"] = d;
-      const f = this.resolveAvgField(h) || 0, { oldValue: y } = await this.state.itemResult.replace(d, f);
-      s = f - (y ?? 0), n = 1;
+      const f = this.resolveAvgField(h) || 0, { oldValue: m } = await this.state.itemResult.replace(d, f);
+      s = f - (m ?? 0), n = 1;
     } else if (a.type === "delete" && a.recordName === this.relation.name)
       s = -(await this.state.itemResult.get(a.record) ?? 0), n = -1;
     else if (a.type === "update") {
@@ -8544,7 +8544,7 @@ class ha {
       if (this.computationsHandles.set(o.id, h), this.isAsyncComputation(h)) {
         const f = this.getAsyncTaskRecordKey(h);
         if (h.dataContext.type === "property") {
-          const y = new D({
+          const m = new D({
             name: f,
             properties: [
               new T({
@@ -8565,16 +8565,16 @@ class ha {
               }, { uuid: `${f}_freshnessKey` })
             ]
           }, { uuid: f }), p = new F({
-            name: `${y.name}_${h.dataContext.host.name}_${h.dataContext.id.name}`,
-            source: y,
+            name: `${m.name}_${h.dataContext.host.name}_${h.dataContext.id.name}`,
+            source: m,
             target: h.dataContext.host,
             sourceProperty: "record",
             targetProperty: `_${h.dataContext.id.name}_task`,
             type: "1:1"
           }, { uuid: `${f}_record_relation` });
-          e.push(y), i.push(p);
+          e.push(m), i.push(p);
         } else if (h.dataContext.type === "global") {
-          const y = new D({
+          const m = new D({
             name: f,
             properties: [
               new T({
@@ -8599,10 +8599,10 @@ class ha {
               }, { uuid: `${f}_globalKey` })
             ]
           }, { uuid: f });
-          e.push(y);
+          e.push(m);
         } else if (h.dataContext.type === "entity") {
           h.dataContext;
-          const y = new D({
+          const m = new D({
             name: f,
             properties: [
               new T({
@@ -8627,10 +8627,10 @@ class ha {
               }, { uuid: `${f}_entityName` })
             ]
           }, { uuid: f });
-          e.push(y);
+          e.push(m);
         } else if (h.dataContext.type === "relation") {
           h.dataContext;
-          const y = new D({
+          const m = new D({
             name: f,
             properties: [
               new T({
@@ -8655,7 +8655,7 @@ class ha {
               }, { uuid: `${f}_relationName` })
             ]
           }, { uuid: f });
-          e.push(y);
+          e.push(m);
         }
       }
     }
@@ -8776,7 +8776,7 @@ class ha {
   }
   async computeDataBasedDirtyRecordsAndEvents(t, e) {
     let i = [];
-    if (t.dataDep.type === "global" && e.recordName === J)
+    if (t.dataDep.type === "global" && e.recordName === K)
       if (t.computation.dataContext.type === "property") {
         const r = t.computation.dataContext;
         i = (await this.controller.system.storage.find(r.host.name, w.atom({ key: "id", value: ["not", null] }), {}, ["*"])).map((s) => [s, {
@@ -9033,7 +9033,7 @@ class ha {
       }
       if (a instanceof ht)
         return;
-      if (a instanceof _t)
+      if (a instanceof Vt)
         try {
           return await this.createAsyncTask(t, a.args, i);
         } catch (o) {
@@ -9159,11 +9159,11 @@ class he extends M {
 }
 class As extends M {
 }
-class Et extends M {
+class Tt extends M {
 }
 class Ve extends M {
 }
-class Tt extends M {
+class St extends M {
 }
 class fa extends M {
 }
@@ -9288,7 +9288,7 @@ function Na(c, t = !1) {
     hasCompute: typeof c.compute == "function",
     hasIncrementalCompute: typeof c.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof c.incrementalPatchCompute == "function"
-  }), y = nt({ stateKeys: s, boundStates: a }), p = nt({
+  }), m = nt({ stateKeys: s, boundStates: a }), p = nt({
     type: u,
     dataContext: o,
     outputRecord: l,
@@ -9300,7 +9300,7 @@ function Na(c, t = !1) {
     hasCompute: typeof c.compute == "function",
     hasIncrementalCompute: typeof c.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof c.incrementalPatchCompute == "function"
-  }), m = nt({ structuralSignature: p, stateSignature: y, functionHash: h?.hash });
+  }), y = nt({ structuralSignature: p, stateSignature: m, functionHash: h?.hash });
   return {
     id: n,
     identity: d,
@@ -9322,13 +9322,13 @@ function Na(c, t = !1) {
       outputRecord: l
     } : void 0,
     outputSignature: f,
-    stateSignature: y,
+    stateSignature: m,
     structuralSignature: p,
     functionSignature: h,
-    signature: m
+    signature: y
   };
 }
-function Ht(c, t = c.system.storage.schema, e = {}) {
+function jt(c, t = c.system.storage.schema, e = {}) {
   const i = [
     ...c.entities.map((l) => {
       const u = st("entity", `entity:${l.name}`, l.uuid);
@@ -9423,7 +9423,7 @@ function Cs(c, t) {
     return !r || r.signature !== i.signature;
   });
 }
-function Wt(c) {
+function Rt(c) {
   if (c.kind === "computation") return `${c.kind}:${c.id}`;
   const t = c.kind === "destructive-scope" && c.recordName || "";
   return `${c.kind}:${c.dataContext}:${t}`;
@@ -9465,8 +9465,8 @@ function Ta(c, t, e, i) {
       reason: `${p.kind} no longer exists in the new model`
     });
   for (const p of t.records) {
-    const m = o.get(p.id);
-    m ? (m.kind !== p.kind || m.name !== p.name) && r.push({
+    const y = o.get(p.id);
+    y ? (y.kind !== p.kind || y.name !== p.name) && r.push({
       kind: "record",
       id: p.id,
       changeType: "changed",
@@ -9479,13 +9479,13 @@ function Ta(c, t, e, i) {
       dataContext: `${p.kind}:${p.name}`,
       reason: `${p.kind} was added`
     });
-    const b = new Map((m?.properties || []).map((N) => [N.id, N])), E = new Map(p.properties.map((N) => [N.id, N]));
-    for (const N of m?.properties || [])
-      E.has(N.id) || r.push({
+    const b = new Map((y?.properties || []).map((N) => [N.id, N])), v = new Map(p.properties.map((N) => [N.id, N]));
+    for (const N of y?.properties || [])
+      v.has(N.id) || r.push({
         kind: "property",
         id: N.id,
         changeType: "removed",
-        dataContext: `property:${m?.name}.${N.name}`,
+        dataContext: `property:${y?.name}.${N.name}`,
         reason: "property no longer exists in the new model"
       });
     for (const N of p.properties) {
@@ -9514,8 +9514,8 @@ function Ta(c, t, e, i) {
       reason: "relation no longer exists in the new model"
     });
   for (const p of t.relations) {
-    const m = u.get(p.id);
-    m ? (m.name !== p.name || m.source !== p.source || m.target !== p.target || m.sourceProperty !== p.sourceProperty || m.targetProperty !== p.targetProperty || m.type !== p.type) && r.push({
+    const y = u.get(p.id);
+    y ? (y.name !== p.name || y.source !== p.source || y.target !== p.target || y.sourceProperty !== p.sourceProperty || y.targetProperty !== p.targetProperty || y.type !== p.type) && r.push({
       kind: "relation",
       id: p.id,
       changeType: "changed",
@@ -9538,14 +9538,14 @@ function Ta(c, t, e, i) {
       reason: "dictionary no longer exists in the new model"
     });
   for (const p of t.dictionaries || []) {
-    const m = h.get(p.id);
-    let b = "unchanged", E = "dictionary is unchanged";
-    m ? (m.type !== p.type || m.collection !== p.collection || m.computed !== p.computed) && (b = "changed", E = "dictionary type, collection, or computed flag changed") : (b = "added", E = "dictionary was added"), b !== "unchanged" && r.push({
+    const y = h.get(p.id);
+    let b = "unchanged", v = "dictionary is unchanged";
+    y ? (y.type !== p.type || y.collection !== p.collection || y.computed !== p.computed) && (b = "changed", v = "dictionary type, collection, or computed flag changed") : (b = "added", v = "dictionary was added"), b !== "unchanged" && r.push({
       kind: "dictionary",
       id: p.id,
       changeType: b,
       dataContext: `global:${p.name}`,
-      reason: E
+      reason: v
     });
   }
   for (const p of c.computations)
@@ -9560,26 +9560,26 @@ function Ta(c, t, e, i) {
       reason: "computation no longer exists in the new model"
     });
   for (const p of t.computations) {
-    const m = s.get(p.id), b = {
-      dataDepsChanged: m ? !Yt(m.deps, p.deps) : !0,
-      eventDepsChanged: m ? !Yt(m.eventDeps, p.eventDeps) : !0,
-      outputSignatureChanged: m ? m.outputSignature !== p.outputSignature : !0,
-      stateSignatureChanged: m ? m.stateSignature !== p.stateSignature : !0,
-      functionTextChanged: m ? m.functionSignature?.hash !== p.functionSignature?.hash : p.functionSignature?.hasFunction === !0,
+    const y = s.get(p.id), b = {
+      dataDepsChanged: y ? !Yt(y.deps, p.deps) : !0,
+      eventDepsChanged: y ? !Yt(y.eventDeps, p.eventDeps) : !0,
+      outputSignatureChanged: y ? y.outputSignature !== p.outputSignature : !0,
+      stateSignatureChanged: y ? y.stateSignature !== p.stateSignature : !0,
+      functionTextChanged: y ? y.functionSignature?.hash !== p.functionSignature?.hash : p.functionSignature?.hasFunction === !0,
       functionHash: p.functionSignature?.hash,
-      previousFunctionHash: m?.functionSignature?.hash,
+      previousFunctionHash: y?.functionSignature?.hash,
       hasFunction: p.functionSignature?.hasFunction === !0,
       hasClosureRisk: p.functionSignature?.hasFunction === !0,
       needsEventRebuildHandler: p.eventDeps.length > 0,
       needsAsyncCompletionHandler: p.asyncReturn
     };
-    let E = "unchanged", N = "ignore", I = "unchanged", S = "computation is structurally unchanged";
-    m ? m.structuralSignature !== p.structuralSignature ? (E = "changed", N = "needs-review", I = "changed", S = "computation structure changed") : m.stateSignature !== p.stateSignature && m.outputSignature === p.outputSignature ? (E = "state-only", N = "needs-review", I = "state-only", S = "computation state changed without output structure changes") : m.functionSignature?.hash !== p.functionSignature?.hash ? (E = "possibly-changed", N = "needs-review", I = "changed", S = "function text changed and requires human semantic review") : p.functionSignature?.hasFunction && (N = "needs-review", S = "function callback has closure risk and requires human review") : (E = "added", N = "rebuild", I = "changed", S = "new computation requires approved rebuild"), r.push({
+    let v = "unchanged", N = "ignore", I = "unchanged", S = "computation is structurally unchanged";
+    y ? y.structuralSignature !== p.structuralSignature ? (v = "changed", N = "needs-review", I = "changed", S = "computation structure changed") : y.stateSignature !== p.stateSignature && y.outputSignature === p.outputSignature ? (v = "state-only", N = "needs-review", I = "state-only", S = "computation state changed without output structure changes") : y.functionSignature?.hash !== p.functionSignature?.hash ? (v = "possibly-changed", N = "needs-review", I = "changed", S = "function text changed and requires human semantic review") : p.functionSignature?.hasFunction && (N = "needs-review", S = "function callback has closure risk and requires human review") : (v = "added", N = "rebuild", I = "changed", S = "new computation requires approved rebuild"), r.push({
       kind: "computation",
       id: p.id,
       dataContext: p.dataContext,
       computationType: p.type,
-      changeType: E,
+      changeType: v,
       detected: b,
       recommendation: N,
       reason: S
@@ -9623,7 +9623,7 @@ function Ta(c, t, e, i) {
       ids: p.ids || [],
       reason: p.reason
     });
-  const y = Array.from(new Map(a.map((p) => [Wt(p), p])).values());
+  const m = Array.from(new Map(a.map((p) => [Rt(p), p])).values());
   return {
     kind: "interaqt-migration-diff",
     version: 2,
@@ -9634,11 +9634,11 @@ function Ta(c, t, e, i) {
     generatorVersion: "phase-1.5",
     summary: {
       changeCount: r.length,
-      requiredDecisionCount: y.length,
+      requiredDecisionCount: m.length,
       blockingChangeCount: i.blockingChanges.length
     },
     changes: r,
-    requiredDecisions: y,
+    requiredDecisions: m,
     decisions: [],
     safety: i
   };
@@ -9652,35 +9652,38 @@ function Sa(c, t, e, i, r) {
     throw new M("Migration approvedDiff must have status 'approved'");
   if (c.fromModelHash !== t.modelHash || c.toModelHash !== e.modelHash)
     throw new M("Migration approvedDiff is stale: model hash does not match current database and code");
-  const a = r || c, s = new Set(a.requiredDecisions.map(Wt)), n = new Set(a.changes.map(Ea)), o = /* @__PURE__ */ new Set();
-  for (const u of c.decisions) {
-    const d = va(u);
-    if (o.has(d))
-      throw new M(`Duplicate migration decision: ${d}`);
-    if (o.add(d), u.kind === "computation" && !n.has(`computation:${u.id}`))
-      throw new M(`Migration decision references a computation that is not present in the approved diff: ${u.id}`);
-    if (u.kind === "event-rebuild-handler") {
-      if (!s.has(d))
-        throw new M(`Migration event rebuild decision does not match a required review item: ${u.dataContext}`);
-      if (!i?.eventRebuild?.[u.handlerRef])
-        throw new M(`Missing migration event rebuild handler '${u.handlerRef}' for ${u.dataContext}`);
-    }
-    if (u.kind === "async-completion-handler") {
-      if (!s.has(d))
-        throw new M(`Migration async completion decision does not match a required review item: ${u.dataContext}`);
-      if (!i?.asyncCompletion?.[u.handlerRef])
-        throw new M(`Missing migration async completion handler '${u.handlerRef}' for ${u.dataContext}`);
-    }
-    if (u.kind === "rename-candidate-reviewed")
-      throw new M(`Migration rename candidate decision does not match any Phase 1.5 executable review item: ${u.from} -> ${u.to}`);
-  }
-  for (const u of a.requiredDecisions)
-    if (!o.has(Wt(u)))
-      throw new M(`Missing migration decision for required review item: ${Wt(u)}`);
-  const l = new Set(e.computations.map((u) => u.id));
-  for (const u of c.decisions)
-    if (u.kind === "computation" && !l.has(u.id))
-      throw new M(`Migration decision references unknown computation: ${u.id}`);
+  const a = r || c, s = new Set(c.requiredDecisions.map(Rt)), n = /* @__PURE__ */ new Set([
+    ...a.requiredDecisions.map(Rt),
+    ...s
+  ]), o = new Set(a.changes.map(Ea)), l = /* @__PURE__ */ new Set();
+  for (const d of c.decisions) {
+    const h = va(d);
+    if (l.has(h))
+      throw new M(`Duplicate migration decision: ${h}`);
+    if (l.add(h), d.kind === "computation" && !o.has(`computation:${d.id}`))
+      throw new M(`Migration decision references a computation that is not present in the approved diff: ${d.id}`);
+    if (d.kind === "event-rebuild-handler") {
+      if (!n.has(h))
+        throw new M(`Migration event rebuild decision does not match a required review item: ${d.dataContext}`);
+      if (!i?.eventRebuild?.[d.handlerRef])
+        throw new M(`Missing migration event rebuild handler '${d.handlerRef}' for ${d.dataContext}`);
+    }
+    if (d.kind === "async-completion-handler") {
+      if (!n.has(h))
+        throw new M(`Migration async completion decision does not match a required review item: ${d.dataContext}`);
+      if (!i?.asyncCompletion?.[d.handlerRef])
+        throw new M(`Missing migration async completion handler '${d.handlerRef}' for ${d.dataContext}`);
+    }
+    if (d.kind === "rename-candidate-reviewed")
+      throw new M(`Migration rename candidate decision does not match any Phase 1.5 executable review item: ${d.from} -> ${d.to}`);
+  }
+  for (const d of a.requiredDecisions)
+    if (!l.has(Rt(d)))
+      throw new M(`Missing migration decision for required review item: ${Rt(d)}`);
+  const u = new Set(e.computations.map((d) => d.id));
+  for (const d of c.decisions)
+    if (d.kind === "computation" && !u.has(d.id))
+      throw new M(`Migration decision references unknown computation: ${d.id}`);
 }
 function ka(c, t, e) {
   const i = [], r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set(), s = new Map(t.computations.map((o) => [o.id, o]));
@@ -9737,55 +9740,55 @@ function pi(c, t) {
 function fi(c, t, e, i = [], r = {}) {
   const a = new Map(t.computations.map((p) => [pe(p), p])), s = new Map(c.computations.map((p) => [p.id, p])), n = /* @__PURE__ */ new Map();
   for (const p of t.computations) {
-    for (const m of p.deps)
-      for (const b of hi(m, p, t))
+    for (const y of p.deps)
+      for (const b of hi(y, p, t))
         n.has(b) || n.set(b, /* @__PURE__ */ new Set()), n.get(b).add(p.id);
-    for (const m of p.eventDeps)
-      for (const b of pi(m, t))
+    for (const y of p.eventDeps)
+      for (const b of pi(y, t))
         b !== p.dataContext && (n.has(b) || n.set(b, /* @__PURE__ */ new Set()), n.get(b).add(p.id));
   }
   const o = new Set(e.map((p) => p.id)), u = [...e.filter((p) => {
-    const m = s.get(p.id);
-    return r.outputChangedIds?.has(p.id) || !m || m.outputSignature !== p.outputSignature;
+    const y = s.get(p.id);
+    return r.outputChangedIds?.has(p.id) || !y || y.outputSignature !== p.outputSignature;
   }).map((p) => pe(p)), ...i];
   for (; u.length; ) {
     const p = u.shift();
-    for (const m of n.get(p) || []) {
-      if (o.has(m)) continue;
-      o.add(m);
-      const b = t.computations.find((E) => E.id === m);
+    for (const y of n.get(p) || []) {
+      if (o.has(y)) continue;
+      o.add(y);
+      const b = t.computations.find((v) => v.id === y);
       b && u.push(pe(b));
     }
   }
-  const d = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Set(), f = [], y = (p) => {
+  const d = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Set(), f = [], m = (p) => {
     if (h.has(p)) return;
     if (d.has(p))
-      throw new Et(`Migration detected a derived computation cycle at ${p}`);
+      throw new Tt(`Migration detected a derived computation cycle at ${p}`);
     d.add(p);
-    const m = t.computations.find((b) => b.id === p);
-    if (m) {
-      for (const b of m.deps)
-        for (const E of hi(b, m, t)) {
-          const N = a.get(E);
-          N && o.has(N.id) && y(N.id);
+    const y = t.computations.find((b) => b.id === p);
+    if (y) {
+      for (const b of y.deps)
+        for (const v of hi(b, y, t)) {
+          const N = a.get(v);
+          N && o.has(N.id) && m(N.id);
         }
-      for (const b of m.eventDeps)
-        for (const E of pi(b, t)) {
-          if (E === m.dataContext) continue;
-          const N = a.get(E);
-          N && o.has(N.id) && y(N.id);
+      for (const b of y.eventDeps)
+        for (const v of pi(b, t)) {
+          if (v === y.dataContext) continue;
+          const N = a.get(v);
+          N && o.has(N.id) && m(N.id);
         }
     }
     d.delete(p), h.add(p), f.push(p);
   };
-  return o.forEach(y), f.map((p) => {
-    const m = t.computations.find((W) => W.id === p), b = s.get(p), E = r.stateOnlyIds?.has(p) === !0, N = r.outputChangedIds?.has(p) || !b || b.outputSignature !== m.outputSignature, I = !b || b.stateSignature !== m.stateSignature, S = e.some((W) => W.id === p);
+  return o.forEach(m), f.map((p) => {
+    const y = t.computations.find((W) => W.id === p), b = s.get(p), v = r.stateOnlyIds?.has(p) === !0, N = r.outputChangedIds?.has(p) || !b || b.outputSignature !== y.outputSignature, I = !b || b.stateSignature !== y.stateSignature, S = e.some((W) => W.id === p);
     return {
       computationId: p,
-      dataContext: m.dataContext,
-      rebuildState: (E || I) && m.boundStates.length > 0,
-      rebuildOutput: E ? !1 : N || !S,
-      propagateOutputEvents: E ? !1 : N || !S,
+      dataContext: y.dataContext,
+      rebuildState: (v || I) && y.boundStates.length > 0,
+      rebuildOutput: v ? !1 : N || !S,
+      propagateOutputEvents: v ? !1 : N || !S,
       isSeed: S
     };
   });
@@ -9794,47 +9797,53 @@ function fe(c, t) {
   return `${c || "?"}.${t || "?"}`;
 }
 function mi(c, t) {
-  const e = [], i = new Map(c.storage.records.map((n) => [n.recordName, n])), r = new Map(t.storage.records.map((n) => [n.recordName, n])), a = new Map(c.records.map((n) => [n.name, n])), s = new Map(t.records.map((n) => [n.name, n]));
-  for (const n of c.storage.records)
-    !r.has(n.recordName) && !n.isFiltered && e.push({
-      kind: "unsupported-destructive-schema-change",
-      logicalPath: n.recordName,
-      oldPhysicalPath: n.tableName,
-      reason: "fact record was removed from the new schema"
-    });
-  for (const n of t.storage.records) {
-    const o = i.get(n.recordName);
-    if (!o) continue;
-    o.tableName !== n.tableName && !n.attributes.some((h) => h.startsWith("_")) && e.push({
+  const e = [], i = new Map(c.storage.records.map((l) => [l.recordName, l])), r = new Map(t.storage.records.map((l) => [l.recordName, l])), a = new Map(c.records.map((l) => [l.name, l])), s = new Map(t.records.map((l) => [l.name, l])), n = (l) => l.startsWith("_ASYNC_TASK__"), o = (l) => c.computations.some((u) => u.outputRecord === l);
+  for (const l of c.storage.records)
+    if (!r.has(l.recordName) && !l.isFiltered) {
+      const u = n(l.recordName) ? "framework-generated async task record cleanup is not supported by compute-route schema migration" : o(l.recordName) ? "computed output record physical cleanup is not supported by compute-route schema migration" : "fact record was removed from the new schema";
+      e.push({
+        kind: "unsupported-destructive-schema-change",
+        logicalPath: l.recordName,
+        oldPhysicalPath: l.tableName,
+        reason: u
+      });
+    }
+  for (const l of t.storage.records) {
+    const u = i.get(l.recordName);
+    if (!u) continue;
+    u.tableName !== l.tableName && !l.attributes.some((m) => m.startsWith("_")) && e.push({
       kind: "physical-path-move",
-      logicalPath: n.recordName,
-      oldPhysicalPath: o.tableName,
-      newPhysicalPath: n.tableName,
+      logicalPath: l.recordName,
+      oldPhysicalPath: u.tableName,
+      newPhysicalPath: l.tableName,
       reason: "fact record table changed"
     });
-    const l = new Map((o.attributeDetails || []).map((h) => [h.name, h])), u = new Map((n.attributeDetails || []).map((h) => [h.name, h]));
-    a.get(o.recordName), s.get(n.recordName);
-    const d = (h, f, y) => y.records.find((m) => m.name === h)?.properties.find((m) => m.name === f)?.computed === !0;
-    for (const h of o.attributeDetails || [])
-      !u.get(h.name) && !h.name.startsWith("_") && !d(o.recordName, h.name, c) && e.push({
-        kind: "unsupported-destructive-schema-change",
-        logicalPath: `${o.recordName}.${h.name}`,
-        oldPhysicalPath: fe(h.tableName, h.fieldName || h.sourceField || h.targetField),
-        reason: "fact attribute was removed from the new schema"
-      });
-    for (const h of n.attributeDetails || []) {
-      const f = l.get(h.name);
-      !f || d(o.recordName, h.name, c) || d(n.recordName, h.name, t) || ((f.kind !== h.kind || f.tableName !== h.tableName || f.fieldName !== h.fieldName || f.sourceField !== h.sourceField || f.targetField !== h.targetField) && e.push({
+    const d = new Map((u.attributeDetails || []).map((m) => [m.name, m])), h = new Map((l.attributeDetails || []).map((m) => [m.name, m]));
+    a.get(u.recordName), s.get(l.recordName);
+    const f = (m, p, y) => y.records.find((v) => v.name === m)?.properties.find((v) => v.name === p)?.computed === !0;
+    for (const m of u.attributeDetails || [])
+      if (!h.get(m.name) && !m.name.startsWith("_")) {
+        const y = f(u.recordName, m.name, c);
+        e.push({
+          kind: "unsupported-destructive-schema-change",
+          logicalPath: `${u.recordName}.${m.name}`,
+          oldPhysicalPath: fe(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 m of l.attributeDetails || []) {
+      const p = d.get(m.name);
+      !p || f(u.recordName, m.name, c) || f(l.recordName, m.name, t) || ((p.kind !== m.kind || p.tableName !== m.tableName || p.fieldName !== m.fieldName || p.sourceField !== m.sourceField || p.targetField !== m.targetField) && e.push({
         kind: "physical-path-move",
-        logicalPath: `${n.recordName}.${h.name}`,
-        oldPhysicalPath: fe(f.tableName, f.fieldName || f.sourceField || f.targetField),
-        newPhysicalPath: fe(h.tableName, h.fieldName || h.sourceField || h.targetField),
+        logicalPath: `${l.recordName}.${m.name}`,
+        oldPhysicalPath: fe(p.tableName, p.fieldName || p.sourceField || p.targetField),
+        newPhysicalPath: fe(m.tableName, m.fieldName || m.sourceField || m.targetField),
         reason: "fact attribute physical path changed"
-      }), (f.type !== h.type || f.fieldType !== h.fieldType || f.collection !== h.collection) && e.push({
+      }), (p.type !== m.type || p.fieldType !== m.fieldType || p.collection !== m.collection) && e.push({
         kind: "unsupported-destructive-schema-change",
-        logicalPath: `${n.recordName}.${h.name}`,
-        oldPhysicalPath: `${f.type || "?"}/${f.fieldType || "?"}/${f.collection === !0}`,
-        newPhysicalPath: `${h.type || "?"}/${h.fieldType || "?"}/${h.collection === !0}`,
+        logicalPath: `${l.recordName}.${m.name}`,
+        oldPhysicalPath: `${p.type || "?"}/${p.fieldType || "?"}/${p.collection === !0}`,
+        newPhysicalPath: `${m.type || "?"}/${m.fieldType || "?"}/${m.collection === !0}`,
         reason: "fact attribute type, field type, or collection flag changed"
       }));
     }
@@ -9851,11 +9860,19 @@ function $a(c, t, e = {}, i) {
     const n = re(s);
     if (!a.has(n)) continue;
     const o = P(s.dataContext);
-    s.dataContext.type === "property" && s.dataContext.id.name === _e && !xi(e.approvedDiff, (l) => l.kind === "destructive-scope" && l.dataContext === o) && r.push({ kind: "destructive-computed-output", logicalPath: o, reason: "destructive computed output requires an approved destructive-scope decision" }), s.asyncReturn && !Pi(e, o) && r.push({ kind: "async-computation", logicalPath: o, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (s.dataContext.type === "entity" || s.dataContext.type === "relation") && !s.compute && r.push({ kind: "unrebuildable-computation", logicalPath: o, reason: "entity/relation output lacks a full compute contract" }), (s.dataContext.type === "entity" || s.dataContext.type === "relation") && i && !Ca(i, n, o, s.dataContext.id.name) && r.push({
+    if (s.dataContext.type === "property" && s.dataContext.id.name === _e && !xi(e.approvedDiff, (l) => l.kind === "destructive-scope" && l.dataContext === o) && r.push({ kind: "destructive-computed-output", logicalPath: o, reason: "destructive computed output requires an approved destructive-scope decision" }), s.asyncReturn && !Pi(e, o) && r.push({ kind: "async-computation", logicalPath: o, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (s.dataContext.type === "entity" || s.dataContext.type === "relation") && !s.compute && r.push({ kind: "unrebuildable-computation", logicalPath: o, reason: "entity/relation output lacks a full compute contract" }), s.dataContext.type === "entity" || s.dataContext.type === "relation") {
+      const l = s.state?.sourceRecordId?.key, u = s.state?.transformIndex?.key;
+      (!l || !u || typeof s.eventDeps == "object") && r.push({
+        kind: "unrebuildable-computation",
+        logicalPath: o,
+        reason: "entity/relation output migration requires a data-based Transform with sourceRecordId and transformIndex state"
+      });
+    }
+    (s.dataContext.type === "entity" || s.dataContext.type === "relation") && i && !Ca(i, n, o, s.dataContext.id.name) && r.push({
       kind: "destructive-computed-output",
       logicalPath: o,
       reason: "entity/relation output replacement requires exclusive output ownership proof in the previous manifest"
-    }), typeof s.eventDeps == "object" && !s.compute && !Gt(e, o) && r.push({ kind: "unrebuildable-computation", logicalPath: o, reason: "event-based computation requires an approved event-rebuild-handler decision and runtime handler" });
+    }), typeof s.eventDeps == "object" && !Gt(e, o) && r.push({ kind: "unrebuildable-computation", logicalPath: o, reason: "event-based computation requires an approved event-rebuild-handler decision and runtime handler" });
   }
   return r;
 }
@@ -9864,11 +9881,11 @@ async function Te(c, t, e) {
     if (c.system.storage.queryHandle)
       return c.system.storage.find(s, void 0, void 0, ["*"]);
     if (!e) return;
-    const o = e.storage.records.find((y) => y.recordName === s), l = o?.tableName, u = (o?.attributeDetails || []).filter((y) => y.kind === "value" && y.fieldName);
+    const o = e.storage.records.find((m) => m.recordName === s), l = o?.tableName, u = (o?.attributeDetails || []).filter((m) => m.kind === "value" && m.fieldName);
     if (!o || !l || u.length === 0) return;
     const d = c.system.storage.db || c.system.db;
     if (typeof d?.query != "function") return;
-    const h = (y) => `"${y.replace(/"/g, '""')}"`, f = u.map((y) => `${h(y.fieldName)} AS ${h(y.name)}`).join(", ");
+    const h = (m) => `"${m.replace(/"/g, '""')}"`, f = u.map((m) => `${h(m.fieldName)} AS ${h(m.name)}`).join(", ");
     return d.query(`SELECT ${f} FROM ${h(l)}`, []);
   };
   for (const s of t) {
@@ -9895,12 +9912,12 @@ async function Te(c, t, e) {
       if (!l || !u) continue;
       const d = await n.compute(await c.scheduler.resolveDataDeps(n));
       if (!Array.isArray(d)) continue;
-      const h = new Set(d.map((p) => `${p[l]}:${p[u]}`)), y = (await a(o) || []).filter((p) => !h.has(`${p[l]}:${p[u]}`)).map((p) => String(p.id));
-      y.length && r.push({
+      const h = new Set(d.map((p) => `${p[l]}:${p[u]}`)), m = (await a(o) || []).filter((p) => !h.has(`${p[l]}:${p[u]}`)).map((p) => String(p.id));
+      m.length && r.push({
         dataContext: P(n.dataContext),
         recordName: o,
-        ids: y,
-        count: y.length,
+        ids: m,
+        count: m.length,
         reason: "transform recompute would delete stale derived output records"
       });
     }
@@ -9911,11 +9928,11 @@ function Fi(c, t) {
   const e = (c.approvedDiff?.decisions || []).filter((s) => s.kind === "destructive-scope"), i = (s) => `${s.dataContext}:${s.recordName || ""}`, r = new Map(e.map((s) => [i(s), [...s.ids || []].sort().join(",")])), a = new Set(t.map(i));
   for (const s of e)
     if (!a.has(i(s)))
-      throw new Tt(`Destructive migration scope mismatch for ${s.dataContext}`);
+      throw new St(`Destructive migration scope mismatch for ${s.dataContext}`);
   for (const s of t) {
     const n = [...s.ids || []].sort().join(",");
     if (r.get(i(s)) !== n)
-      throw new Tt(`Destructive migration scope mismatch for ${s.dataContext}`);
+      throw new St(`Destructive migration scope mismatch for ${s.dataContext}`);
   }
 }
 function yi(c, t) {
@@ -9957,7 +9974,7 @@ async function Be(c, t, e, i, r = {}) {
 }
 async function et(c, t, e, i, r = {}) {
   if (e instanceof ht) return;
-  if (e instanceof _t && (e = await Be(c, t, e, i, r)), e instanceof ee)
+  if (e instanceof Vt && (e = await Be(c, t, e, i, r)), e instanceof ee)
     throw new Ve(`Migration requires direct final output, not asyncReturn resolution, for ${P(t.dataContext)}`);
   const a = await c.retrieveLastValue(t.dataContext, i);
   if (!Yt(a, e))
@@ -9965,7 +9982,7 @@ async function et(c, t, e, i, r = {}) {
 }
 async function xa(c, t, e, i, r = {}) {
   if (e instanceof ht || e === void 0) return [];
-  if (e instanceof _t && (e = await Be(c, t, e, i, r)), e instanceof ee)
+  if (e instanceof Vt && (e = await Be(c, t, e, i, r)), e instanceof ee)
     throw new Ve(`Migration requires direct final output for ${P(t.dataContext)}`);
   const a = Array.isArray(e) ? e : [e], s = [];
   for (const n of a) {
@@ -9976,7 +9993,7 @@ async function xa(c, t, e, i, r = {}) {
     }
     const o = n;
     if (o.type === "delete" && (t.dataContext.type === "entity" || t.dataContext.type === "relation"))
-      throw new Tt(`Migration refuses delete patch for ${P(t.dataContext)} without explicit audited scope`);
+      throw new St(`Migration refuses delete patch for ${P(t.dataContext)} without explicit audited scope`);
     if (await c.applyResultPatch(t.dataContext, o, i), t.dataContext.type === "entity" || t.dataContext.type === "relation")
       s.push({
         recordName: t.dataContext.id.name,
@@ -9995,7 +10012,7 @@ async function xa(c, t, e, i, r = {}) {
 function Li(c, t, e, i) {
   if (c.type === "global")
     return {
-      recordName: J,
+      recordName: K,
       type: e === void 0 ? "create" : "update",
       record: { key: c.id.name, value: t, id: c.id.name },
       oldRecord: e === void 0 ? void 0 : { key: c.id.name, value: e, id: c.id.name },
@@ -10013,11 +10030,11 @@ function Li(c, t, e, i) {
 async function Ma(c, t, e = {}) {
   if (t.dataContext.type !== "entity" && t.dataContext.type !== "relation") return [];
   let i = await t.compute(await c.scheduler.resolveDataDeps(t));
-  if (i instanceof _t && (i = await Be(c, t, i, void 0, e)), !Array.isArray(i))
-    throw new Et(`Entity/relation migration compute must return an array for ${P(t.dataContext)}`);
+  if (i instanceof Vt && (i = await Be(c, t, i, void 0, e)), !Array.isArray(i))
+    throw new Tt(`Entity/relation migration compute must return an array for ${P(t.dataContext)}`);
   const r = t.dataContext.id.name, a = t.state?.sourceRecordId?.key, s = t.state?.transformIndex?.key;
   if (!a || !s)
-    throw new Et(`Transform migration requires sourceRecordId and transformIndex state for ${P(t.dataContext)}`);
+    throw new Tt(`Transform migration requires sourceRecordId and transformIndex state for ${P(t.dataContext)}`);
   const n = await c.system.storage.find(r, void 0, void 0, ["*"]), o = new Map(n.map((u) => [`${u[a]}:${u[s]}`, u])), l = [];
   for (const u of i) {
     const d = `${u[a]}:${u[s]}`, h = o.get(d);
@@ -10033,7 +10050,7 @@ async function Ma(c, t, e = {}) {
       e.approvedDiff,
       (h) => h.kind === "destructive-scope" && h.dataContext === P(t.dataContext) && h.recordName === r
     )?.ids.map(String).includes(String(u.id)))
-      throw new Tt(`Migration would delete stale derived ${r} record ${u.id}; approve destructive scope before executing`);
+      throw new St(`Migration would delete stale derived ${r} record ${u.id}; approve destructive scope before executing`);
     await c.system.storage.delete(r, w.atom({ key: "id", value: ["=", u.id] })), l.push({ recordName: r, type: "delete", record: u });
   }
   return l;
@@ -10054,9 +10071,9 @@ class Da {
       const i = this.handles.get(e.computationId);
       if (!i) continue;
       if (i.dataContext.type === "property" && i.dataContext.id.name === _e && !xi(this.options.approvedDiff, (s) => s.kind === "destructive-scope" && s.dataContext === P(i.dataContext)))
-        throw new Tt(`Migration refuses to recompute destructive property ${P(i.dataContext)} without approved destructive scope`);
+        throw new St(`Migration refuses to recompute destructive property ${P(i.dataContext)} without approved destructive scope`);
       if (typeof i.compute != "function" && !Gt(this.options, P(i.dataContext)))
-        throw new Et(`Migration requires full compute support for ${P(i.dataContext)}`);
+        throw new Tt(`Migration requires full compute support for ${P(i.dataContext)}`);
       if (e.rebuildState && !e.rebuildOutput) {
         await this.rebuildStateDefaults(i);
         continue;
@@ -10126,7 +10143,7 @@ class Da {
         if (!("dataDep" in s)) {
           const o = Gt(this.options, P(t.dataContext));
           if (!o)
-            throw new Et(`Event-based migration requires an approved event rebuild handler for ${P(t.dataContext)}`);
+            throw new Tt(`Event-based migration requires an approved event rebuild handler for ${P(t.dataContext)}`);
           const l = await o({ controller: this.controller, dataContext: t.dataContext, mutationEvent: r }), u = await et(this.controller, t, l, void 0, this.options);
           u && i.push(u);
           continue;
@@ -10204,7 +10221,7 @@ const Se = "_isDeleted_", bi = new wi(), Is = {
 class xs {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
-      BoolExp: v,
+      BoolExp: E,
       MatchExp: w
     }, this.dict = [], this.recordMutationSideEffects = [], this.eventSourcesByName = /* @__PURE__ */ new Map(), this.eventSourcesByUUID = /* @__PURE__ */ new Map(), this.callbacks = /* @__PURE__ */ new Map();
     const {
@@ -10226,7 +10243,7 @@ class xs {
       f.entity && f.entity.name && !d.has(f.entity.name) && (this.entities.push(f.entity), d.add(f.entity.name));
     const h = [
       ...Qr,
-      ...Jr,
+      ...Kr,
       ...qr,
       ...Or,
       ...Mr,
@@ -10238,8 +10255,8 @@ class xs {
       ...o
     ];
     this.scheduler = new ha(this, this.entities, this.relations, this.dict, h), n.forEach((f) => {
-      let y = this.recordNameToSideEffects.get(f.record.name);
-      y || this.recordNameToSideEffects.set(f.record.name, y = /* @__PURE__ */ new Set()), y.add(f);
+      let m = this.recordNameToSideEffects.get(f.record.name);
+      m || this.recordNameToSideEffects.set(f.record.name, m = /* @__PURE__ */ new Set()), m.add(f);
     });
   }
   async setup(t) {
@@ -10255,7 +10272,7 @@ class xs {
       const s = this.system, n = s.prepareMigrationSchema;
       if (typeof n != "function")
         throw new Error("Current system does not support migration manifest validation");
-      const o = await n.call(s, this.entities, this.relations, r), l = Ht(this, o.schema), u = await gi(this);
+      const o = await n.call(s, this.entities, this.relations, r), l = jt(this, o.schema), u = await gi(this);
       if (u && u.modelHash !== l.modelHash)
         throw new Error(`Model manifest mismatch. Call controller.generateMigrationDiff(), review it, then call controller.migrate({ approvedDiff }). Manifest key: ${Le}/${qe}`);
       if (!u && await this.system.hasExistingData?.())
@@ -10264,7 +10281,7 @@ class xs {
       return;
     }
     await this.system.setup(this.entities, this.relations, r, e);
-    const a = Ht(this);
+    const a = jt(this);
     await this.scheduler.setup(e), e && await me(this, a);
   }
   async createMigrationBaseline() {
@@ -10276,7 +10293,7 @@ class xs {
         missingDDL: i.preRecomputeDDL,
         blockingChanges: i.blockingChanges
       });
-    const r = Ht(this, i.schema);
+    const r = jt(this, i.schema);
     return await me(this, r), r;
   }
   async prepareMigrationContext(t = {}) {
@@ -10285,7 +10302,7 @@ class xs {
     const r = await i.prepareMigrationSchema(this.entities, this.relations, e), a = await gi(this);
     if (!a)
       throw new he("Migration baseline manifest not found. Run setup(true) with the current framework first or createMigrationBaseline().");
-    const s = Ht(this, r.schema, { includeFunctionText: t.includeFunctionText === !0 });
+    const s = jt(this, r.schema, { includeFunctionText: t.includeFunctionText === !0 });
     return { states: e, migrationSystem: i, schemaPlan: r, previousManifest: a, nextManifest: s };
   }
   async buildCurrentMigrationDiff(t, e, i, r = {}) {
@@ -10317,26 +10334,26 @@ class xs {
     C(typeof r.applyMigrationSchema == "function", "Current system does not support schema migration application");
     const { schemaPlan: a, previousManifest: s, nextManifest: n } = i, o = await this.buildCurrentMigrationDiff(a, s, n, { includeDestructiveScope: !1 });
     Sa(e.approvedDiff, s, n, e.handlers, o);
-    const l = e.approvedDiff, u = ma(l), d = ka(s, n, l), h = d.changedComputations, f = yi(s, n), y = fi(s, n, h, f, {
+    const l = e.approvedDiff, u = ma(l), d = ka(s, n, l), h = d.changedComputations, f = yi(s, n), m = fi(s, n, h, f, {
       outputChangedIds: d.outputChangedIds,
       stateOnlyIds: d.stateOnlyIds
-    }), p = mi(s, n), m = $a(
+    }), p = mi(s, n), y = $a(
       this,
-      y,
+      m,
       e,
       s
     ), b = [
       ...a.blockingChanges,
       ...p,
       ...d.blocking,
-      ...m
-    ], E = Ia(b), N = await Te(this, y, s);
+      ...y
+    ], v = Ia(b), N = await Te(this, m, s);
     Fi(e, N);
     const I = {
       mode: "compute",
       dryRun: e.dryRun === !0,
       changedComputations: h,
-      rebuildPlan: y,
+      rebuildPlan: m,
       schemaPlan: {
         schema: a.schema,
         preRecomputeDDL: a.preRecomputeDDL,
@@ -10344,14 +10361,14 @@ class xs {
         verificationDDL: a.verificationDDL,
         blockingChanges: b
       },
-      blockingChanges: E,
+      blockingChanges: v,
       deletionScope: N,
       approvedDiffHash: u
     };
     if (I.dryRun) return I;
-    if (E.length)
+    if (v.length)
       throw new Error(`Migration plan has blocking changes:
-${E.join(`
+${v.join(`
 `)}`);
     let S;
     const W = (V, tt) => {
@@ -10369,7 +10386,7 @@ ${E.join(`
       W(V, "schema-applied") || (await r.applyMigrationSchema(a, S?.id), S && await r.updateMigrationPhase?.(S.id, "schema-applied")), W(V, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
         if (!W(V, "computation-applied")) {
           const ne = await Oa(this, s, n);
-          await Pa(this, y, e, ne, s), S && await r.updateMigrationPhase?.(S.id, "computation-applied");
+          await Pa(this, m, e, ne, s), S && await r.updateMigrationPhase?.(S.id, "computation-applied");
         }
         W(V, "constraints-applied") || (await r.verifyMigrationSchema?.(a, S?.id), await r.applyMigrationPostSchema?.(a, S?.id), S && await r.updateMigrationPhase?.(S.id, "constraints-applied"));
         const tt = `manifest:current:${n.modelHash}:${u}`;
@@ -10387,7 +10404,7 @@ ${E.join(`
       return this.system.storage.find(t.id.name, void 0, void 0, ["*"]);
     {
       const i = t;
-      return e[i.id.name] ? e[i.id.name] : (await this.system.storage.findOne(i.host.name, v.atom({ key: "id", value: ["=", e.id] }), void 0, ["*"]))[i.id.name];
+      return e[i.id.name] ? e[i.id.name] : (await this.system.storage.findOne(i.host.name, E.atom({ key: "id", value: ["=", e.id] }), void 0, ["*"]))[i.id.name];
     }
   }
   async applyResult(t, e, i) {
@@ -10399,7 +10416,7 @@ ${E.join(`
         if (this.system.storage.getTransactionIsolation() !== "SERIALIZABLE")
           throw new X("entity replace result");
         const r = t;
-        await this.system.storage.delete(r.id.name, v.atom({ key: "id", value: ["not", null] }));
+        await this.system.storage.delete(r.id.name, E.atom({ key: "id", value: ["not", null] }));
         const a = Array.isArray(e) ? e : [e];
         for (const s of a)
           await this.system.storage.create(r.id.name, s);
@@ -10408,13 +10425,13 @@ ${E.join(`
         if (this.system.storage.getTransactionIsolation() !== "SERIALIZABLE")
           throw new X("relation replace result");
         const r = t;
-        await this.system.storage.delete(r.id.name, v.atom({ key: "id", value: ["not", null] }));
+        await this.system.storage.delete(r.id.name, E.atom({ key: "id", value: ["not", null] }));
         const a = Array.isArray(e) ? e : [e];
         for (const s of a)
           await this.system.storage.create(r.id.name, s);
       } else {
         const r = t;
-        r.id.name === Se && e ? await this.system.storage.delete(r.host.name, v.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, v.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
+        r.id.name === Se && e ? await this.system.storage.delete(r.host.name, E.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, E.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
       }
     }
   }
@@ -10437,7 +10454,7 @@ ${E.join(`
         }
       } else {
         const s = t;
-        s.id.name === Se && a.data ? (C(a.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(s.host.name, v.atom({ key: "id", value: ["=", i.id] }))) : a.type === "insert" ? await this.system.storage.update(s.host.name, v.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: a.data }) : a.type === "update" ? await this.system.storage.update(s.host.name, v.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: a.data }) : a.type === "delete" && await this.system.storage.update(s.host.name, v.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: null });
+        s.id.name === Se && a.data ? (C(a.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(s.host.name, E.atom({ key: "id", value: ["=", i.id] }))) : a.type === "insert" ? await this.system.storage.update(s.host.name, E.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: a.data }) : a.type === "update" ? await this.system.storage.update(s.host.name, E.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: a.data }) : a.type === "delete" && await this.system.storage.update(s.host.name, E.atom({ key: "id", value: ["=", i.id] }), { [s.id.name]: null });
       }
   }
   cloneDispatchArgs(t) {
@@ -10577,7 +10594,7 @@ class qa {
     }, this.transactionContext = new wi(), this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
         const i = w.atom({ key: "key", value: ["=", e] });
-        return (await this.queryHandle.findOne(J, i, void 0, ["value"]))?.value?.raw;
+        return (await this.queryHandle.findOne(K, i, void 0, ["value"]))?.value?.raw;
       },
       set: async (e, i) => {
         await this.setDictionaryValue(e, i, !0);
@@ -10663,12 +10680,12 @@ class qa {
     return this.isInTransaction() ? e() : De(t, (i) => this.runInTransaction({ name: t, isolation: i }, e));
   }
   async setDictionaryValue(t, e, i) {
-    const r = w.atom({ key: "key", value: ["=", t] }), a = await this.queryHandle.findOne(J, r, void 0, ["value"]);
+    const r = w.atom({ key: "key", value: ["=", t] }), a = await this.queryHandle.findOne(K, r, void 0, ["value"]);
     if (a) {
-      const s = [J, w.atom({ key: "id", value: ["=", a.id] }), { key: t, value: { raw: e } }];
+      const s = [K, w.atom({ key: "id", value: ["=", a.id] }), { key: t, value: { raw: e } }];
       i ? await this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), s, []) : await this.queryHandle.update(...s, []);
     } else {
-      const s = [J, { key: t, value: { raw: e } }];
+      const s = [K, { key: t, value: { raw: e } }];
       i ? await this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), s, []) : await this.queryHandle.create(...s, []);
     }
   }
@@ -11090,13 +11107,13 @@ class qa {
       increment: async (e, i) => {
         const r = this.getPlaceholder();
         if (this.isRecordTarget(e)) {
-          const { tableName: l, idField: u, fieldName: d } = this.resolveRecordTarget(e), h = r(), f = r(), y = await this.db.query(
+          const { tableName: l, idField: u, fieldName: d } = this.resolveRecordTarget(e), h = r(), f = r(), m = await this.db.query(
             `UPDATE "${l}" SET "${d}" = COALESCE("${d}", 0) + ${h} WHERE "${u}" = ${f} RETURNING "${d}" AS value`,
             [i, e.id],
             `atomic increment ${e.recordName}.${e.field}`
           );
-          if (!y.length) throw new Error(`Atomic increment target not found: ${e.recordName}.${String(e.id)}.${e.field}`);
-          return Number(y[0]?.value ?? await this.atomic.get(e) ?? 0);
+          if (!m.length) throw new Error(`Atomic increment target not found: ${e.recordName}.${String(e.id)}.${e.field}`);
+          return Number(m[0]?.value ?? await this.atomic.get(e) ?? 0);
         }
         const a = r(), s = r(), n = r(), o = await this.db.query(
           `INSERT INTO "_ComputationState_" ("key", "numberValue") VALUES (${a}, ${s})
@@ -11112,14 +11129,14 @@ RETURNING "numberValue" AS value`,
         async () => {
           const r = this.getPlaceholder();
           if (this.isRecordTarget(e)) {
-            const { tableName: m, idField: b, fieldName: E } = this.resolveRecordTarget(e), N = r(), I = await this.db.query(
-              `SELECT "${E}" AS value FROM "${m}" WHERE "${b}" = ${N}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
+            const { tableName: y, idField: b, fieldName: v } = this.resolveRecordTarget(e), N = r(), I = await this.db.query(
+              `SELECT "${v}" AS value FROM "${y}" WHERE "${b}" = ${N}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
               [e.id],
               `atomic replace lock ${e.recordName}.${e.field}`
             );
             if (!I.length) throw new Error(`Atomic replace target not found: ${e.recordName}.${String(e.id)}.${e.field}`);
             const S = this.getPlaceholder(), W = S(), V = S(), tt = await this.db.query(
-              `UPDATE "${m}" SET "${E}" = ${W} WHERE "${b}" = ${V} RETURNING "${E}" AS value`,
+              `UPDATE "${y}" SET "${v}" = ${W} WHERE "${b}" = ${V} RETURNING "${v}" AS value`,
               [i, e.id],
               `atomic replace ${e.recordName}.${e.field}`
             );
@@ -11131,8 +11148,8 @@ RETURNING "numberValue" AS value`,
             `SELECT "${a}" AS value FROM "_ComputationState_" WHERE "key" = ${n}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
             [e.key],
             `atomic replace lock ${e.key}`
-          ), l = t.filter((m) => m !== a).map((m) => `"${m}" = NULL`).join(", "), u = this.parseGlobalValue(o[0]?.value, a) ?? e.defaultValue ?? null, d = this.getPlaceholder(), h = d(), f = d(), y = [`"${a}" = ${h}`, l].filter(Boolean).join(", "), p = await this.db.query(
-            `UPDATE "_ComputationState_" SET ${y} WHERE "key" = ${f} RETURNING "${a}" AS value`,
+          ), l = t.filter((y) => y !== a).map((y) => `"${y}" = NULL`).join(", "), u = this.parseGlobalValue(o[0]?.value, a) ?? e.defaultValue ?? null, d = this.getPlaceholder(), h = d(), f = d(), m = [`"${a}" = ${h}`, l].filter(Boolean).join(", "), p = await this.db.query(
+            `UPDATE "_ComputationState_" SET ${m} WHERE "key" = ${f} RETURNING "${a}" AS value`,
             [s, e.key],
             `atomic replace ${e.key}`
           );
@@ -11149,16 +11166,16 @@ RETURNING "numberValue" AS value`,
             `atomic compareAndSet ${e.recordName}.${e.field}`
           )).length > 0;
         }
-        const o = this.resolveGlobalColumn(e, r), l = this.normalizeGlobalValue(r, o), u = this.normalizeGlobalValue(n, o), d = this.normalizeGlobalValue(i, o), h = s(), f = s(), y = s(), p = s();
+        const o = this.resolveGlobalColumn(e, r), l = this.normalizeGlobalValue(r, o), u = this.normalizeGlobalValue(n, o), d = this.normalizeGlobalValue(i, o), h = s(), f = s(), m = s(), p = s();
         if ((await this.db.query(
-          `UPDATE "_ComputationState_" SET "${o}" = ${h} WHERE "key" = ${f} AND COALESCE("${o}", ${y}) = ${p} RETURNING "${o}" AS value`,
+          `UPDATE "_ComputationState_" SET "${o}" = ${h} WHERE "key" = ${f} AND COALESCE("${o}", ${m}) = ${p} RETURNING "${o}" AS value`,
           [l, e.key, u, d],
           `atomic compareAndSet ${e.key}`
         )).length) return !0;
         if (d !== u) return !1;
-        const b = this.getPlaceholder(), E = b(), N = b();
+        const b = this.getPlaceholder(), v = b(), N = b();
         return (await this.db.query(
-          `INSERT INTO "_ComputationState_" ("key", "${o}") VALUES (${E}, ${N}) ON CONFLICT ("key") DO NOTHING RETURNING "${o}" AS value`,
+          `INSERT INTO "_ComputationState_" ("key", "${o}") VALUES (${v}, ${N}) ON CONFLICT ("key") DO NOTHING RETURNING "${o}" AS value`,
           [e.key, l],
           `atomic compareAndSet insert ${e.key}`
         )).length > 0;
@@ -11183,8 +11200,8 @@ RETURNING "numberValue" AS value`,
           [e.key],
           `atomic updateGlobalFields lock ${e.key}`
         ), o = this.parseGlobalValue(n[0]?.value, "jsonValue") ?? {}, l = { ...r, ...o };
-        Object.entries(i).forEach(([f, y]) => {
-          l[f] = Number(l[f] ?? r[f] ?? 0) + y;
+        Object.entries(i).forEach(([f, m]) => {
+          l[f] = Number(l[f] ?? r[f] ?? 0) + m;
         });
         const u = this.getPlaceholder(), d = u(), h = u();
         return await this.db.update(
@@ -11600,10 +11617,10 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       const o = n.sourceRecordId, l = n.transformIndex;
       if (!(o instanceof $) || !(l instanceof $) || o.unique === !1 || s.type !== "entity" && s.type !== "relation")
         return [];
-      const u = s.id.name, d = r.getRecordInfo(u), [, h] = r.getTableAliasAndFieldName([u], o.key, !0), [, f] = r.getTableAliasAndFieldName([u], l.key, !0), y = `idx_transform_${this.hashIdentifier(`${d.table}_${h}_${f}`)}`;
+      const u = s.id.name, d = r.getRecordInfo(u), [, h] = r.getTableAliasAndFieldName([u], o.key, !0), [, f] = r.getTableAliasAndFieldName([u], l.key, !0), m = `idx_transform_${this.hashIdentifier(`${d.table}_${h}_${f}`)}`;
       return [{
         kind: "create-constraint",
-        sql: be(y, d.table, [h, f], a),
+        sql: be(m, d.table, [h, f], a),
         tableName: d.table,
         logicalPath: `${u}.${o.key}.${l.key}`,
         description: `migration setup transform unique index ${u}`
@@ -11673,12 +11690,12 @@ const Ba = ae.create({ name: "get" });
 function ke(c) {
   if (!c) return;
   if (c.raw.type === "atom")
-    return Ot.create({
+    return Ft.create({
       type: "atom",
       data: c.raw.data
     });
   const t = c.raw;
-  return Ft.create({
+  return Lt.create({
     type: "expression",
     operator: t.operator,
     left: ke(c.left),
@@ -11687,7 +11704,7 @@ function ke(c) {
 }
 class se {
   constructor(t, e) {
-    this._type = "Conditions", this._options = e, this.uuid = A(e), t.content && t.content instanceof v ? this.content = ke(t.content) : this.content = t.content;
+    this._type = "Conditions", this._options = e, this.uuid = A(e), t.content && t.content instanceof E ? this.content = ke(t.content) : this.content = t.content;
   }
   static {
     this.isKlass = !0;
@@ -11807,7 +11824,7 @@ class gt {
     return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Vt {
+class Qt {
   constructor(t, e) {
     this._type = "Attributives", this._options = e, this.uuid = A(e), this.content = t.content;
   }
@@ -11830,7 +11847,7 @@ class Vt {
     };
   }
   static create(t, e) {
-    const i = new Vt(t, e);
+    const i = new Qt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Attributives`);
     return this.instances.push(i), i;
@@ -11864,12 +11881,12 @@ class Vt {
 function Ae(c) {
   if (!c) return;
   if (c.raw.type === "atom")
-    return Ot.create({
+    return Ft.create({
       type: "atom",
       data: c.raw.data
     });
   const t = c.raw;
-  return Ft.create({
+  return Lt.create({
     type: "expression",
     operator: t.operator,
     left: Ae(c.left),
@@ -11877,7 +11894,7 @@ function Ae(c) {
   });
 }
 function Os(c) {
-  return Vt.create({
+  return Qt.create({
     content: Ae(c)
   });
 }
@@ -11985,14 +12002,14 @@ class We {
     return this.create(e.public, e.options);
   }
 }
-class K extends Error {
+class J extends Error {
   constructor(t, e) {
     super(t), this.name = "InteractionGuardError", this.type = e.type, this.checkType = e.checkType, this.error = e.error;
   }
 }
 function Ha(c) {
   return async function(t) {
-    await _i(this, c, t), await Ja(this, c, t), await Vi(this, c, t);
+    await _i(this, c, t), await Ka(this, c, t), await Vi(this, c, t);
   };
 }
 function ja(c) {
@@ -12007,12 +12024,12 @@ function ja(c) {
 }
 function Wa(c) {
   return async function(t) {
-    return Ka(this, c, t);
+    return Ja(this, c, t);
   };
 }
 async function _i(c, t, e) {
   if (!t.conditions) return;
-  const i = se.is(t.conditions) ? new v(t.conditions.content) : v.atom(t.conditions), r = async (s) => {
+  const i = se.is(t.conditions) ? new E(t.conditions.content) : E.atom(t.conditions), r = async (s) => {
     if (!s) return !0;
     if (s.content) {
       let n;
@@ -12027,7 +12044,7 @@ async function _i(c, t, e) {
     return !0;
   }, a = await i.evaluateAsync(r);
   if (a !== !0)
-    throw new K(`Condition check failed: ${a?.data?.name}`, {
+    throw new J(`Condition check failed: ${a?.data?.name}`, {
       type: "condition check failed",
       checkType: "condition",
       error: a
@@ -12045,11 +12062,11 @@ async function Ga(c, t, e, i) {
   }
   return !0;
 }
-async function Ja(c, t, e) {
+async function Ka(c, t, e) {
   if (!t.userAttributives) return;
-  const i = Vt.is(t.userAttributives) ? v.fromValue(t.userAttributives.content) : v.atom(t.userAttributives), r = (s) => Ga(c, s, e, e.user), a = await i.evaluateAsync(r);
+  const i = Qt.is(t.userAttributives) ? E.fromValue(t.userAttributives.content) : E.atom(t.userAttributives), r = (s) => Ga(c, s, e, e.user), a = await i.evaluateAsync(r);
   if (a !== !0)
-    throw new K("User check failed", {
+    throw new J("User check failed", {
       type: "check user failed",
       checkType: "user",
       error: a
@@ -12059,69 +12076,69 @@ async function Vi(c, t, e) {
   const i = e.payload || {}, r = t.payload?.items || [], a = Object.keys(i);
   for (const s of a)
     if (!r.some((n) => n.name === s))
-      throw new K(
+      throw new J(
         `${s} in payload is not defined in interaction ${t.name}`,
         { type: `${s} not defined`, checkType: "payload" }
       );
   for (const s of r) {
     if (s.required && !(s.name in i))
-      throw new K(
+      throw new J(
         `Payload validation failed for field '${s.name}': missing`,
         { type: `${s.name} missing`, checkType: "payload" }
       );
     const n = i[s.name];
     if (n === void 0) return;
     if (s.isCollection && !Array.isArray(n))
-      throw new K(
+      throw new J(
         `Payload validation failed for field '${s.name}': data is not array`,
         { type: `${s.name} data is not array`, checkType: "payload" }
       );
     if (s.isCollection) {
       if (s.isRef && !n.every((o) => !!o.id))
-        throw new K(
+        throw new J(
           `Payload validation failed for field '${s.name}': data not every is ref`,
           { type: `${s.name} data not every is ref`, checkType: "payload" }
         );
     } else if (s.isRef && !n.id)
-      throw new K(
+      throw new J(
         `Payload validation failed for field '${s.name}': data is not a ref`,
         { type: `${s.name} data is not a ref`, checkType: "payload" }
       );
     if (s.base)
       if (s.isCollection)
         for (const o of n) {
-          const l = await Rt(o, s.base);
+          const l = await Nt(o, s.base);
           if (l !== !0)
-            throw new K(
+            throw new J(
               `Concept check failed for field '${s.name}'`,
               { type: `${s.name} check concept failed`, checkType: "concept", error: l }
             );
         }
       else {
-        const o = await Rt(n, s.base);
+        const o = await Nt(n, s.base);
         if (o !== !0)
-          throw new K(
+          throw new J(
             `Concept check failed for field '${s.name}'`,
             { type: `${s.name} check concept failed`, checkType: "concept", error: o }
           );
       }
   }
 }
-async function Rt(c, t) {
+async function Nt(c, t) {
   if (t.base) {
     const e = t;
-    return e.attributive, Rt(c, e.base);
+    return e.attributive, Nt(c, e.base);
   }
   if (t.for) {
     for (const e of t.for)
-      if (await Rt(c, e) === !0) return !0;
+      if (await Nt(c, e) === !0) return !0;
     return { name: t.name || "", type: "conceptAlias", error: "no match" };
   }
   return gt.is(t) ? !0 : D.is(t) ? c && typeof c == "object" ? !0 : { name: t.name || "", type: "conceptCheck", error: "invalid entity data" } : !0;
 }
-async function Ka(c, t, e) {
+async function Ja(c, t, e) {
   if (D.is(t.data) || F.is(t.data)) {
-    const i = t.data.name, r = t.dataPolicy?.match, a = t.dataPolicy?.modifier, s = { ...e.query?.modifier || {}, ...a || {} }, n = e.query?.attributeQuery || [], o = typeof r == "function" ? await r.call(c, e) : r, l = v.and(o, e.query?.match);
+    const i = t.data.name, r = t.dataPolicy?.match, a = t.dataPolicy?.modifier, s = { ...e.query?.modifier || {}, ...a || {} }, n = e.query?.attributeQuery || [], o = typeof r == "function" ? await r.call(c, e) : r, l = E.and(o, e.query?.match);
     return c.system.storage.find(i, l, s, n);
   }
 }
@@ -12211,7 +12228,7 @@ class Ge {
     return this.create(e.public, e.options);
   }
 }
-class St {
+class kt {
   constructor(t, e) {
     this._type = "ActivityGroup", this._options = e, this.uuid = A(e), this.type = t.type, this.activities = t.activities || [];
   }
@@ -12240,7 +12257,7 @@ class St {
     };
   }
   static create(t, e) {
-    const i = new St(t, e);
+    const i = new kt(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, ActivityGroup`);
     return this.instances.push(i), i;
@@ -12355,7 +12372,7 @@ function Fs(c) {
 function Ls(c) {
   return null;
 }
-class Je {
+class Ke {
   constructor(t, e) {
     this._type = "Condition", this._options = e, this.uuid = A(e), this.content = t.content, this.name = t.name;
   }
@@ -12381,7 +12398,7 @@ class Je {
     };
   }
   static create(t, e) {
-    const i = new Je(t, e);
+    const i = new Ke(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Condition`);
     return this.instances.push(i), i;
@@ -12415,7 +12432,7 @@ class Je {
     return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Ke {
+class Je {
   constructor(t, e) {
     this._type = "DataAttributive", this._options = e, this.uuid = A(e), this.content = t.content, this.name = t.name;
   }
@@ -12441,7 +12458,7 @@ class Ke {
     };
   }
   static create(t, e) {
-    const i = new Ke(t, e);
+    const i = new Je(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataAttributive`);
     return this.instances.push(i), i;
@@ -12539,7 +12556,7 @@ class Ui {
     return this.create(e.public, e.options);
   }
 }
-class kt {
+class At {
   constructor(t, e) {
     this._type = "Gateway", this._options = e, this.uuid = A(e), this.name = t.name;
   }
@@ -12561,7 +12578,7 @@ class kt {
     };
   }
   static create(t, e) {
-    const i = new kt(t, e);
+    const i = new At(t, e);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Gateway`);
     return this.instances.push(i), i;
@@ -12851,10 +12868,10 @@ const Xa = [
   We,
   Ge,
   gt,
-  Je,
   Ke,
+  Je,
   ae,
-  kt,
+  At,
   Xe,
   ze,
   Ye,
@@ -12916,11 +12933,11 @@ class B {
   }
   static createInitialState(t) {
     const e = { uuid: t.uuid };
-    return St.is(t.content) && (e.children = t.childSeqs.map((i) => ft.createInitialState(i.head))), e;
+    return kt.is(t.content) && (e.children = t.childSeqs.map((i) => ft.createInitialState(i.head))), e;
   }
   static create(t, e, i) {
     const r = e.getNodeByUUID(t.uuid);
-    if (St.is(r.content)) {
+    if (kt.is(r.content)) {
       const s = B.GroupStateNodeType.get(r.content.type), n = new s(r, e, i);
       return n.isGroup = !0, n.children = t?.children?.map((o) => ft.create(o, e, n)), n;
     } else
@@ -12958,7 +12975,7 @@ class ye {
     return this.root.toJSON();
   }
 }
-class Nt {
+class vt {
   constructor(t) {
     this.activity = t, this.uuidToNode = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (e, i, r, a) => (C(i.isRef, "attributive must be ref"), ((await this.getActivity(e, a))?.refs)[i.name] === r.id), this.graph = this.buildGraph(t);
   }
@@ -12985,7 +13002,7 @@ class Nt {
     const a = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]), s = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]);
     if (t.transfers?.forEach((n) => {
       const o = this.rawToNode.get(n.source) || i.get(n.source), l = this.rawToNode.get(n.target) || i.get(n.target);
-      C(!!o, `cannot find source ${n.source.name}`), C(!!l, `cannot find target ${n.source.name}`), kt.is(o) ? o.next.push(l) : o.next = l, kt.is(l) ? l.prev.push(o) : l.prev = o, s.delete(n.source), a.delete(n.target);
+      C(!!o, `cannot find source ${n.source.name}`), C(!!l, `cannot find target ${n.source.name}`), At.is(o) ? o.next.push(l) : o.next = l, At.is(l) ? l.prev.push(o) : l.prev = o, s.delete(n.source), a.delete(n.target);
     }), a.size !== 1) throw new Error(`start node must one, current: ${a.size}`);
     if (s.size !== 1) throw new Error(`end node must be one, current: ${s.size}`);
     return Object.assign(r, {
@@ -12999,7 +13016,7 @@ class Nt {
   async create(t) {
     const e = ye.createInitialState(this.graph.head);
     return {
-      activityId: (await t.system.storage.create(Nt.ACTIVITY_RECORD, {
+      activityId: (await t.system.storage.create(vt.ACTIVITY_RECORD, {
         name: this.activity.name,
         uuid: this.activity.uuid,
         state: e,
@@ -13019,14 +13036,14 @@ class Nt {
       key: "id",
       value: ["=", e]
     });
-    return (await t.system.storage.find(Nt.ACTIVITY_RECORD, i, void 0, ["*"])).map((a) => ({ ...a, state: a.state, refs: a.refs }))[0];
+    return (await t.system.storage.find(vt.ACTIVITY_RECORD, i, void 0, ["*"])).map((a) => ({ ...a, state: a.state, refs: a.refs }))[0];
   }
   async setActivity(t, e, i) {
     const r = w.atom({
       key: "id",
       value: ["=", e]
     }), a = { ...i };
-    return delete a.state, delete a.refs, i.state && (a.state = i.state), i.refs && (a.refs = i.refs), await t.system.storage.update(Nt.ACTIVITY_RECORD, r, a);
+    return delete a.state, delete a.refs, i.state && (a.state = i.state), i.refs && (a.refs = i.refs), await t.system.storage.update(vt.ACTIVITY_RECORD, r, a);
   }
   async setState(t, e, i) {
     return this.setActivity(t, e, { state: i });
@@ -13040,7 +13057,7 @@ class Nt {
     return e.parentSeq.tail === e;
   }
   isActivityHead(t, e = this.graph.head) {
-    return St.is(this.graph.head.content) ? !!this.graph.head.childSeqs?.some((i) => this.isActivityHead(t, i.head)) : t === this.graph.head.content;
+    return kt.is(this.graph.head.content) ? !!this.graph.head.childSeqs?.some((i) => this.isActivityHead(t, i.head)) : t === this.graph.head.content;
   }
   async checkActivityState(t, e, i) {
     if (!new ye(await this.getState(t, e), this).isInteractionAvailable(i))
@@ -13048,13 +13065,13 @@ class Nt {
   }
   async fullGuardWithUserRef(t, e, i) {
     if (!t.ignoreGuard && e.conditions && await _i(t, e, i), e.userAttributives) {
-      const r = Vt.is(e.userAttributives) ? v.fromValue(
+      const r = Qt.is(e.userAttributives) ? E.fromValue(
         e.userAttributives.content
-      ) : v.atom(
+      ) : E.atom(
         e.userAttributives
       ), a = (n) => n.isRef ? this.checkUserRef(t, n, i.user, i.activityId) : za(t, n, i, i.user), s = await r.evaluateAsync(a);
       if (s !== !0)
-        throw new K("User check failed", {
+        throw new J("User check failed", {
           type: "check user failed",
           checkType: "user",
           error: s
@@ -13152,7 +13169,7 @@ const is = "_Activity_", Hi = D.create({
 class _s {
   constructor(t) {
     this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.activityEventSources = [], this.requiredEntities = [], this.requiredRelations = [], t.length > 0 && (this.requiredEntities.push(Hi, je), this.requiredRelations.push(rs)), t.forEach((e) => {
-      const i = new Nt(e);
+      const i = new vt(e);
       this.activityCalls.set(e.uuid, i), e.name && (C(!this.activityCallsByName.has(e.name), `activity name ${e.name} is duplicated`), this.activityCallsByName.set(e.name, i));
     });
     for (const e of t) {
@@ -13279,42 +13296,42 @@ export {
   de as ASYNC_TASK_RECORD,
   ae as Action,
   Ge as Activity,
-  Nt as ActivityCall,
+  vt as ActivityCall,
   as as ActivityError,
-  St as ActivityGroup,
+  kt as ActivityGroup,
   rs as ActivityInteractionRelation,
   _s as ActivityManager,
   Hi as ActivityStateEntity,
   Qs as ActivityStateError,
   Er as AliasManager,
   fa as AmbiguousComputationSignatureError,
-  Pt as Any,
+  Dt as Any,
   qr as AnyHandles,
   Ve as AsyncMigrationComputationError,
   it as AttributeInfo,
   O as AttributeQuery,
   gt as Attributive,
-  Vt as Attributives,
-  xt as Average,
+  Qt as Attributives,
+  Mt as Average,
   ra as AverageHandles,
-  Ot as BoolAtomData,
-  v as BoolExp,
-  Ft as BoolExpressionData,
+  Ft as BoolAtomData,
+  E as BoolExp,
+  Lt as BoolExpressionData,
   rt as ComputationDataDepError,
   H as ComputationError,
   x as ComputationResult,
-  _t as ComputationResultAsync,
+  Vt as ComputationResultAsync,
   Xt as ComputationResultFullRecompute,
   ee as ComputationResultResolved,
   ht as ComputationResultSkip,
   li as ComputationStateError,
-  Je as Condition,
+  Ke as Condition,
   lt as ConditionError,
   se as Conditions,
   at as ConstraintSetupError,
   Ii as ConstraintViolationError,
   xs as Controller,
-  $t as Count,
+  It as Count,
   Qr as CountHandles,
   ir as CreationExecutor,
   Pe as Custom,
@@ -13324,11 +13341,11 @@ export {
   ri as DBSetup,
   ii as DEFAULT_SCHEMA_DIALECT,
   Es as DELETED_STATE,
-  J as DICTIONARY_RECORD,
-  Ke as DataAttributive,
+  K as DICTIONARY_RECORD,
+  Je as DataAttributive,
   Ze as DataAttributives,
   Ui as DataPolicy,
-  Tt as DestructiveComputedOutputError,
+  St as DestructiveComputedOutputError,
   Ie as Dictionary,
   oi as DictionaryEntity,
   D as Entity,
@@ -13340,11 +13357,11 @@ export {
   q as ErrorSeverity,
   Xe as Event,
   ki as EventSource,
-  Mt as Every,
+  Pt as Every,
   Or as EveryHandles,
   _ as Expression,
   U as FrameworkError,
-  kt as Gateway,
+  At as Gateway,
   Ba as GetAction,
   Fr as GlobalAnyHandle,
   ea as GlobalAverageHandle,
@@ -13352,7 +13369,7 @@ export {
   _r as GlobalCountHandle,
   aa as GlobalCustomHandle,
   Pr as GlobalEveryHandle,
-  Kr as GlobalRealTimeComputation,
+  Jr as GlobalRealTimeComputation,
   Ar as GlobalStateMachineHandle,
   Yr as GlobalSumHandle,
   Ir as GlobalWeightedSummationHandle,
@@ -13364,10 +13381,10 @@ export {
   We as Interaction,
   je as InteractionEventEntity,
   Vs as InteractionExecutionError,
-  K as InteractionGuardError,
+  J as InteractionGuardError,
   Ce as KlassByName,
   g as LINK_SYMBOL,
-  Kt as LinkInfo,
+  Jt as LinkInfo,
   Le as MIGRATION_MANIFEST_CONCEPT,
   qe as MIGRATION_MANIFEST_CURRENT_KEY,
   w as MatchExp,
@@ -13398,12 +13415,12 @@ export {
   $e as PropertyTypes,
   xr as PropertyWeightedSummationHandle,
   or as QueryExecutor,
-  Jt as ROOT_LABEL,
+  Kt as ROOT_LABEL,
   si as ROW_ID_ATTR,
-  Dt as RealTime,
+  Ot as RealTime,
   zr as RealTimeHandles,
   $ as RecordBoundState,
-  vt as RecordInfo,
+  Et as RecordInfo,
   qi as RecordMutationSideEffect,
   L as RecordQuery,
   ur as RecordQueryAgent,
@@ -13419,24 +13436,24 @@ export {
   wt as SYSTEM_RECORD,
   ha as Scheduler,
   Me as SideEffect,
-  At as StateMachine,
+  Ct as StateMachine,
   $r as StateMachineHandles,
   mt as StateNode,
   xe as StateTransfer,
-  It as Summation,
+  xt as Summation,
   ta as SummationHandles,
   He as SystemConsoleLogger,
   ni as SystemEntity,
   Va as SystemLogLevel,
   Re as TransactionCapabilityError,
-  jt as TransactionRetryExhaustedError,
+  Wt as TransactionRetryExhaustedError,
   Qi as Transfer,
   te as Transform,
-  Jr as TransformHandles,
+  Kr as TransformHandles,
   $s as USER_ENTITY,
   Zt as UniqueConstraint,
-  Et as UnrebuildableComputationError,
-  Ct as WeightedSummation,
+  Tt as UnrebuildableComputationError,
+  $t as WeightedSummation,
   Mr as WeightedSummationHandles,
   di as addToCurrentEffects,
   C as assert,
@@ -13453,7 +13470,7 @@ export {
   re as computationManifestId,
   Gi as createInstances,
   hs as createInstancesFromString,
-  Ht as createMigrationManifest,
+  jt as createMigrationManifest,
   kr as createNonNullConstraintStatement,
   Ia as createPlanBlockingMessages,
   Sr as createUniqueConstraintStatement,
@@ -13461,7 +13478,7 @@ export {
   qs as createUserRoleAttributive,
   P as dataContextPath,
   Ms as dbConsoleLogger,
-  Qt as deepClone,
+  Bt as deepClone,
   Ai as defaultEncodeLiteral,
   bs as everyAsync,
   Rs as everyWithErrorAsync,
@@ -13493,7 +13510,7 @@ export {
   le as normalizeDatabaseError,
   Tr as predicateSQLForOperator,
   ot as quoteIdentifier,
-  Bt as quoteLiteral,
+  Ut as quoteLiteral,
   gi as readMigrationManifest,
   Pa as recomputeChangedComputations,
   Oa as recomputeFilteredMemberships,