interaqt 1.5.2 → 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;
@@ -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);
@@ -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 p = l.getLinkInfo(), f = new w(p.getResolvedBaseRecordName(), this.map, p.getResolvedMatchExpression()), m = this.map.getReversePath(u), y = [l.isRecordSource() ? "source" : "target", ...m.slice(2)], b = f.rebase(y.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 {
@@ -2529,8 +2529,8 @@ class w {
       R(!t, "reference value cannot use IN to match"), o = `IN (${i[1].map((d) => s()).join(",")})`, l = i[1];
     else if (i[0].toLowerCase() === "between")
       if (t) {
-        const d = this.getReferenceFieldValue(i[1][0]), p = this.getReferenceFieldValue(i[1][1]);
-        o = `BETWEEN "${d.split(".")[0]}"."${d.split(".")[1]}" AND "${p.split(".")[0]}"."${p.split(".")[1]}"`, l = [];
+        const d = this.getReferenceFieldValue(i[1][0]), h = this.getReferenceFieldValue(i[1][1]);
+        o = `BETWEEN "${d.split(".")[0]}"."${d.split(".")[1]}" AND "${h.split(".")[0]}"."${h.split(".")[1]}"`, l = [];
       } else
         o = `BETWEEN ${s()} AND ${s()}`, l = [i[1][0], i[1][1]];
     else {
@@ -2544,20 +2544,20 @@ class w {
       const r = i.data.key.split("."), a = this.map.getInfoByPath([this.entityName].concat(r)), s = [this.entityName].concat(r), n = this.map.spawnManyToManySymmetricPath(s);
       let o, l;
       if (n && (o = n[0].slice(1, 1 / 0), l = n[1].slice(1, 1 / 0)), a.isValue) {
-        const u = this.getFinalFieldName(r), [d, p] = this.getFinalFieldValue(i.data.isReferenceValue, i.data.key, i.data.value, u.join("."), a.fieldType, t, e);
+        const u = this.getFinalFieldName(r), [d, h] = this.getFinalFieldValue(i.data.isReferenceValue, i.data.key, i.data.value, u.join("."), a.fieldType, t, e);
         if (!n)
           return {
             ...i.data,
             fieldName: u,
             fieldValue: d,
-            fieldParams: p
+            fieldParams: h
           };
         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,
-          fieldParams: p
+          fieldParams: h
         }).or({
           ...i.data,
           fieldName: this.getFinalFieldName(l),
@@ -2688,12 +2688,12 @@ class Zi {
   }
 }
 class L {
-  constructor(t, e, i, r, a, s, n, o, l, u = !1, d, p, 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 = p, this.exit = f, this.alias = m;
+  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, p = new w(d, e, i.matchExpression, r);
-    let f = o ? p : p.and({
+    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]
     }), m = f;
@@ -2802,7 +2802,7 @@ class O {
     this.recordName = t, this.map = e, this.data = i, this.parentRecord = r, this.attributeName = a, this.shouldQueryParentLinkData = s, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [], this.id = Math.random();
     let n = /* @__PURE__ */ new Set();
     i.forEach((o) => {
-      const l = typeof o == "string" ? [o, {}, !1] : o, [u, d, p] = l;
+      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 m = this.map.getInfo(this.parentRecord, this.attributeName);
@@ -2815,16 +2815,16 @@ class O {
       }
       const f = this.map.getInfo(this.recordName, u);
       if (f.isRecord) {
-        let m = u, h = d;
+        let m = u, p = d;
         if (f.isLinkFiltered()) {
           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;
-          h = {
+          p = {
             ...d,
             matchExpression: S.data
           };
         }
-        const y = L.create(f.recordName, this.map, h, void 0, this.recordName, m, p, !1, u);
+        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);
@@ -2844,7 +2844,7 @@ class O {
     const n = e.getRecordInfo(t), o = e.getRecordInfo(n.resolvedBaseRecordName);
     let l = o.valueAttributes.map((u) => u.attributeName);
     return i && o.sameTableReliance.forEach((u) => {
-      const d = O.getAttributeQueryDataForRecord(u.recordName, e, !0, r), p = [
+      const d = O.getAttributeQueryDataForRecord(u.recordName, e, !0, r), h = [
         u.attributeName,
         {
           attributeQuery: [...d]
@@ -2852,11 +2852,11 @@ class O {
       ];
       if (!o.isRelation) {
         const f = O.getAttributeQueryDataForRecord(u.linkName, e, !0, r);
-        p[1].attributeQuery.push([g, { attributeQuery: f }]);
+        h[1].attributeQuery.push([g, { attributeQuery: f }]);
       }
-      l = O.mergeAttributeQueryData(l, [p]);
+      l = O.mergeAttributeQueryData(l, [h]);
     }), s && o.notRelianceCombined.forEach((u) => {
-      const d = O.getAttributeQueryDataForRecord(u.recordName, e, !0, r), p = [
+      const d = O.getAttributeQueryDataForRecord(u.recordName, e, !0, r), h = [
         u.attributeName,
         {
           attributeQuery: [...d]
@@ -2864,9 +2864,9 @@ class O {
       ];
       if (!o.isRelation) {
         const f = O.getAttributeQueryDataForRecord(u.linkName, e, !0, r);
-        p[1].attributeQuery.push([g, { attributeQuery: f }]);
+        h[1].attributeQuery.push([g, { attributeQuery: f }]);
       }
-      l = O.mergeAttributeQueryData(l, [p]);
+      l = O.mergeAttributeQueryData(l, [h]);
     }), r && o.mergedRecordAttributes.forEach((u) => {
       const d = O.getAttributeQueryDataForRecord(u.linkName, e, i, !0);
       l = O.mergeAttributeQueryData(l, [
@@ -2954,8 +2954,8 @@ class j {
     )), this.valueAttributes = s, this.entityIdAttributes = o;
     const l = this.map.getRecordInfo(this.recordName);
     this.defaultValues = l.valueAttributes.reduce((u, d) => {
-      const p = d.data;
-      return !this.rawData?.hasOwnProperty(d.attributeName) && p.defaultValue && typeof p.defaultValue == "function" && (u[d.attributeName] = p.defaultValue(i, this.originalRecordName)), u;
+      const h = d.data;
+      return !this.rawData?.hasOwnProperty(d.attributeName) && h.defaultValue && typeof h.defaultValue == "function" && (u[d.attributeName] = h.defaultValue(i, this.originalRecordName)), u;
     }, {}), this.relatedEntitiesData.forEach((u) => {
       u.info.isMergedWithParent() ? u.isNull() ? this.combinedNullRecords.push(u) : u.isRef() ? this.combinedRecordIdRefs.push(u) : this.combinedNewRecords.push(u) : u.info.isLinkMergedWithParent() ? u.isNull() ? this.mergedLinkTargetNullRecords.push(u) : u.isRef() ? this.mergedLinkTargetRecordIdRefs.push(u) : this.mergedLinkTargetNewRecords.push(u) : u.info.isLinkMergedWithAttribute() ? u.isNull() ? this.differentTableMergedLinkNullRecords.push(u) : u.isRef() ? this.differentTableMergedLinkRecordIdRefs.push(u) : this.differentTableMergedLinkNewRecords.push(u) : u.isNull() ? this.isolatedNullRecords.push(u) : u.isRef() ? this.isolatedRecordIdRefs.push(u) : this.isolatedNewRecords.push(u);
     }), this.rawData?.[g] && (this.linkRecordData = new j(this.map, r?.linkName, this.rawData[g]));
@@ -3079,9 +3079,9 @@ class ir {
         }
       });
     else if (t.valueAttributes.length) {
-      const o = t.getSameRowFieldAndValue(r), l = this.map.getRecordInfo(t.recordName), u = new Set(l.valueAttributes.map((p) => p.attributeName)), d = { ...t.getData() };
-      o.forEach((p) => {
-        u.has(p.name) && (d[p.name] = p.value);
+      const o = t.getSameRowFieldAndValue(r), l = this.map.getRecordInfo(t.recordName), u = new Set(l.valueAttributes.map((h) => h.attributeName)), d = { ...t.getData() };
+      o.forEach((h) => {
+        u.has(h.name) && (d[h.name] = h.value);
       }), i?.push({
         type: "update",
         recordName: t.recordName,
@@ -3221,11 +3221,11 @@ class ir {
     R(!n, `cannot create ${t} for ${e} ${i}, link already exist`);
     const o = this.map.getLinkInfoByName(t);
     if (!o.isCombined() && !o.isMerged() && (o.isManyToOne || o.isOneToMany)) {
-      const u = o.isManyToOne ? "source.id" : "target.id", d = o.isManyToOne ? e : i, p = w.atom({
+      const u = o.isManyToOne ? "source.id" : "target.id", d = o.isManyToOne ? e : i, h = w.atom({
         key: u,
         value: ["=", d]
       });
-      await this.helper.unlink(t, p, !1, "unlink combined record for add new link", s);
+      await this.helper.unlink(t, h, !1, "unlink combined record for add new link", s);
     }
     const l = new j(this.map, o.name, {
       source: { id: e },
@@ -3281,11 +3281,11 @@ 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 p = d.recordName, f = n.slice(0, l), m = n[n.length - 1], h = i.find(
-              (y) => y.entityName === p && JSON.stringify(y.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)
             );
-            h ? h.attributes.includes(m) || h.attributes.push(m) : i.push({
-              entityName: p,
+            p ? p.attributes.includes(m) || p.attributes.push(m) : i.push({
+              entityName: h,
               path: f,
               attributes: [m]
             });
@@ -3385,9 +3385,9 @@ class rr {
           record: { ...r, id: e }
         }));
       if (Object.keys(u).length > 0) {
-        const p = this.map.getRecordInfo(t).data.attributes.__filtered_entities;
-        if (p && p.field) {
-          const f = p.field;
+        const h = this.map.getRecordInfo(t).data.attributes.__filtered_entities;
+        if (h && h.field) {
+          const f = h.field;
           await this.queryAgent.updateRecordDataById(
             t,
             { id: e },
@@ -3452,12 +3452,12 @@ class rr {
     }), n[t.filteredEntityName] = !1), l !== o) {
       const d = this.map.getRecordInfo(t.baseEntityName).data.attributes.__filtered_entities;
       if (d && d.field) {
-        const p = d.field;
+        const h = d.field;
         await this.queryAgent.updateRecordDataById(
           t.baseEntityName,
           { id: e },
           [{
-            field: p,
+            field: h,
             value: JSON.stringify(n)
           }]
         );
@@ -3502,27 +3502,27 @@ class sr {
    * @returns [SQL字符串, 参数数组, 字段别名映射]
    */
   buildXToOneFindQuery(t, e = "", i) {
-    const r = t.attributeQuery.xToOneQueryTree, a = t.matchExpression.xToOneQueryTree, s = t.modifier.xToOneQueryTree, n = r.merge(a).merge(s), o = this.getJoinTables(n, [t.recordName]), l = i || this.getPlaceholder(), u = t.matchExpression.buildFieldMatchExpression(l, this.database), [d, p] = this.buildWhereClause(
+    const r = t.attributeQuery.xToOneQueryTree, a = t.matchExpression.xToOneQueryTree, s = t.modifier.xToOneQueryTree, n = r.merge(a).merge(s), o = this.getJoinTables(n, [t.recordName]), l = i || this.getPlaceholder(), u = t.matchExpression.buildFieldMatchExpression(l, this.database), [d, h] = this.buildWhereClause(
       this.parseMatchExpressionValue(t.recordName, u, t.contextRootEntity, l),
       e,
       l
     ), [f, m] = this.buildSelectClause(
       t.attributeQuery.getValueAndXToOneRecordFields(),
       e
-    ), h = this.buildFromClause(t.recordName, e), y = this.buildJoinClause(o, e), b = this.buildModifierClause(t.modifier, e, m);
+    ), p = this.buildFromClause(t.recordName, e), y = this.buildJoinClause(o, e), b = this.buildModifierClause(t.modifier, e, m);
     return [
       `
 SELECT
 ${f}
 FROM
-${h}
+${p}
 ${y}
 WHERE
 ${d}
 
 ${b}
 `,
-      p,
+      h,
       m
     ];
   }
@@ -3585,13 +3585,13 @@ ${b}
     const { limit: r, offset: a, orderBy: s } = t, n = [];
     return s.length && n.push(`ORDER BY ${s.map(({ attribute: o, recordName: l, order: u }) => {
       const d = o.split(".");
-      let p, f;
-      d.length === 1 ? (p = [l], f = o) : (p = [l, ...d.slice(0, -1)], f = d[d.length - 1]);
-      const [m, h] = this.map.getTableAliasAndFieldName(
-        p,
+      let h, f;
+      d.length === 1 ? (h = [l], f = o) : (h = [l, ...d.slice(0, -1)], f = d[d.length - 1]);
+      const [m, p] = this.map.getTableAliasAndFieldName(
+        h,
         f
       );
-      return `"${`${this.withPrefix(e)}${m}`}"."${h}" ${u}`;
+      return `"${`${this.withPrefix(e)}${m}`}"."${p}" ${u}`;
     }).join(",")}`), r && n.push(`LIMIT ${r}`), a && n.push(`OFFSET ${a}`), n.join(`
 `);
   }
@@ -3613,18 +3613,18 @@ ${b}
         throw new Error(`${e.concat(o).join(".")} is not a record`);
       const u = e.concat(o), {
         table: d,
-        alias: p,
+        alias: h,
         linkTable: f,
         linkAlias: m
-      } = this.map.getTableAndAliasStack(u).at(-1), [, h] = this.map.getTableAliasAndFieldName(u, "id", !0);
+      } = this.map.getTableAndAliasStack(u).at(-1), [, p] = this.map.getTableAliasAndFieldName(u, "id", !0);
       if (!l.isMergedWithParent())
         if (l.isLinkMergedWithParent()) {
           if (n.onlyIdField()) return;
           r.push({
             for: u,
             joinSource: s,
-            joinIdField: [l.linkField, h],
-            joinTarget: [d, p]
+            joinIdField: [l.linkField, p],
+            joinTarget: [d, h]
           });
         } else if (l.isLinkMergedWithAttribute()) {
           const y = l.getReverseInfo();
@@ -3634,7 +3634,7 @@ ${b}
             for: u,
             joinSource: s,
             joinIdField: [a, y.linkField],
-            joinTarget: [d, p]
+            joinTarget: [d, h]
           });
         } else {
           const y = l.getLinkInfo(), b = l.isLinkManyToManySymmetric() ? l.symmetricDirection === "source" : y.isRelationSource(l.parentEntityName, l.attributeName);
@@ -3646,11 +3646,11 @@ ${b}
           }), n.onlyIdField() || r.push({
             for: u,
             joinSource: [f, m],
-            joinIdField: [b ? y.record.attributes.target.field : y.record.attributes.source.field, h],
-            joinTarget: [d, p]
+            joinIdField: [b ? y.record.attributes.target.field : y.record.attributes.source.field, p],
+            joinTarget: [d, h]
           });
         }
-      if (r.push(...this.getJoinTables(n, u, [h, d, p])), n.parentLinkQueryTree && !n.parentLinkQueryTree.onlyIdField()) {
+      if (r.push(...this.getJoinTables(n, u, [p, d, h])), n.parentLinkQueryTree && !n.parentLinkQueryTree.onlyIdField()) {
         const y = u.concat(g), [, b] = this.map.getTableAliasAndFieldName(y, "id", !0), v = [
           b,
           // link 的 idField
@@ -3685,13 +3685,13 @@ ${b}
         },
         // 如果上层还有，就继承上层的，如果没有， context 就只这一层
         i || t
-      ), [p, f] = this.buildXToOneFindQuery(d, o, r);
+      ), [h, f] = this.buildXToOneFindQuery(d, o, r);
       return {
         ...a.data,
         isInnerQuery: !0,
         fieldValue: `
 EXISTS (
-${p}
+${h}
 )
 `,
         fieldParams: f
@@ -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,16 +3828,16 @@ 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 m = t.matchExpression.and(f.matchExpression), h = f.derive({
+      const m = t.matchExpression.and(f.matchExpression), p = f.derive({
         matchExpression: m
       });
-      return this.findRecords(h, e, i, r);
+      return this.findRecords(p, e, i, r);
     }
     if (t.label && r.label === t.label && r.stack.length > 1 && r.stack[0].id === r.stack.at(-1).id)
       return [];
@@ -3846,39 +3846,39 @@ class or {
 FOR UPDATE` : s,
       n,
       e
-    ), d = this.structureRawReturns(u, this.map.getRecordInfo(t.recordName).JSONFields, o), p = t.label && t.label !== r.label ? r.spawn(t.label) : r;
-    await this.completeXToOneLeftoverRecords(t, d, i, p);
+    ), d = this.structureRawReturns(u, this.map.getRecordInfo(t.recordName).JSONFields, o), h = t.label && t.label !== r.label ? r.spawn(t.label) : r;
+    await this.completeXToOneLeftoverRecords(t, d, i, h);
     for (let f of t.attributeQuery.xToOneRecords)
       if (f.goto) {
-        const h = this.map.getInfo(f.parentRecord, f.attributeName).getReverseInfo()?.attributeName;
+        const p = this.map.getInfo(f.parentRecord, f.attributeName).getReverseInfo()?.attributeName;
         for (let y of d) {
           const b = f.matchExpression.and({
-            key: `${h}.id`,
+            key: `${p}.id`,
             value: ["=", y.id]
           }), v = f.derive({
             matchExpression: b
-          }), N = t.label ? p.concat(y) : p;
+          }), 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 m = f.attributeQuery.parentLinkRecordQuery;
       if (m)
-        for (let h of m.attributeQuery.xToManyRecords) {
-          const b = this.map.getInfo(h.parentRecord, h.attributeName).getReverseInfo()?.attributeName;
+        for (let p of m.attributeQuery.xToManyRecords) {
+          const b = this.map.getInfo(p.parentRecord, p.attributeName).getReverseInfo()?.attributeName;
           for (let v of d) {
-            const N = v[f.attributeName][g].id, I = h.derive({
-              matchExpression: h.matchExpression.and({
+            const N = v[f.attributeName][g].id, I = p.derive({
+              matchExpression: p.matchExpression.and({
                 key: `${b}.id`,
                 value: ["=", N]
               })
-            }), S = t.label ? p.concat(v) : p;
+            }), S = t.label ? h.concat(v) : h;
             oe(
               v,
-              [f.alias || f.attributeName, g, h.attributeName],
+              [f.alias || f.attributeName, g, p.attributeName],
               await this.findRecords(
                 I,
-                `finding relation data: ${t.recordName}.${f.attributeName}.&.${h.attributeName}`,
+                `finding relation data: ${t.recordName}.${f.attributeName}.&.${p.attributeName}`,
                 i,
                 S
               )
@@ -3889,14 +3889,14 @@ FOR UPDATE` : s,
     for (let f of t.attributeQuery.xToManyRecords)
       if (!f.onlyRelationData)
         for (let m of d) {
-          const h = t.label ? p.concat(m) : p;
+          const p = t.label ? h.concat(m) : h;
           m[f.alias || f.attributeName] = await this.findXToManyRelatedRecords(
             t.recordName,
             f.attributeName,
             m.id,
             f,
             i,
-            h
+            p
           );
         }
     return d;
@@ -3955,7 +3955,7 @@ FOR UPDATE` : s,
     }), u = r.attributeQuery.parentLinkRecordQuery ? r.attributeQuery.withParentLinkData() : r.attributeQuery, d = r.derive({
       matchExpression: l,
       attributeQuery: u
-    }), p = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, a, s), f = r.attributeQuery.parentLinkRecordQuery ? p.map((y) => {
+    }), 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 = {
         ...y,
@@ -3964,9 +3964,9 @@ FOR UPDATE` : s,
         ...y,
         [g]: y[o][g]
       }, delete b[o]), b;
-    }) : p, m = d.label && d.label !== s.label ? s.spawn(d.label) : s, h = r.attributeQuery.parentLinkRecordQuery;
-    if (h)
-      for (let y of h.attributeQuery.xToManyRecords)
+    }) : h, m = d.label && d.label !== s.label ? s.spawn(d.label) : s, p = r.attributeQuery.parentLinkRecordQuery;
+    if (p)
+      for (let y of p.attributeQuery.xToManyRecords)
         for (let b of f) {
           const v = b[g].id, N = d.label ? m.concat(b) : m;
           oe(
@@ -3992,24 +3992,24 @@ FOR UPDATE` : s,
       key: "id",
       value: ["=", i]
     }), u = O.getAttributeQueryDataForRecord(t, this.map, !0, !0, !1, !0), d = e;
-    let p = u;
+    let h = u;
     for (let y of o)
-      p.push([y, { attributeQuery: ["*"] }]), p = p.at(-1)[1].attributeQuery;
-    p.push([n, { label: d, attributeQuery: ["*"] }]), p = p.at(-1)[1].attributeQuery;
+      h.push([y, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
+    h.push([n, { label: d, attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
     for (let y of o)
-      p.push([y, { attributeQuery: ["*"] }]), p = p.at(-1)[1].attributeQuery;
+      h.push([y, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
     let f;
     const m = async (y) => {
       if (f) return !0;
       if (y.stack.at(-1)?.id === r)
         return f = [...y.stack], !0;
     };
-    p.push([n, { goto: d, exit: m }]);
-    const h = (await this.findRecords(L.create(t, this.map, {
+    h.push([n, { goto: d, exit: m }]);
+    const p = (await this.findRecords(L.create(t, this.map, {
       matchExpression: l,
       attributeQuery: u
     }), `find records for path ${t}.${e}`))[0];
-    return f ? [h, ...f] : void 0;
+    return f ? [p, ...f] : void 0;
   }
 }
 class cr {
@@ -4197,8 +4197,8 @@ class lr {
       attributeQuery: O.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0)
     }), s = await this.helper.findRecords(a, `find record for updating ${t}`), n = [];
     for (let o of s) {
-      const l = await this.helper.createRecordDependency(i, r), u = await this.updateSameRowData(a.recordName, o, l, r), d = await this.handleUpdateReliance(a.recordName, o, i, r), p = Object.keys(i.getData());
-      await this.filteredEntityManager.updateFilteredEntityFlags(a.recordName, o.id, r, o, !1, p), n.push({ ...i.getData(), ...u.getData(), ...d });
+      const l = await this.helper.createRecordDependency(i, r), u = await this.updateSameRowData(a.recordName, o, l, r), d = await this.handleUpdateReliance(a.recordName, o, i, r), h = Object.keys(i.getData());
+      await this.filteredEntityManager.updateFilteredEntityFlags(a.recordName, o.id, r, o, !1, h), n.push({ ...i.getData(), ...u.getData(), ...d });
     }
     return n;
   }
@@ -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) {
@@ -4331,9 +4331,9 @@ class ur {
       return this.creationExecutor.preprocessSameRowData(t, e, i, r);
     const a = t.getData();
     if (e && !a.id && (a.id = r.id), t.valueAttributes.length) {
-      const o = t.getSameRowFieldAndValue(r), l = this.map.getRecordInfo(t.recordName), u = new Set(l.valueAttributes.map((p) => p.attributeName)), d = { ...t.getData() };
-      o.forEach((p) => {
-        u.has(p.name) && (d[p.name] = p.value);
+      const o = t.getSameRowFieldAndValue(r), l = this.map.getRecordInfo(t.recordName), u = new Set(l.valueAttributes.map((h) => h.attributeName)), d = { ...t.getData() };
+      o.forEach((h) => {
+        u.has(h.name) && (d[h.name] = h.value);
       }), i?.push({
         type: "update",
         recordName: t.recordName,
@@ -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;
@@ -4772,8 +4772,8 @@ class ut {
     const u = [];
     for (; o = i.shift(); ) {
       u.push(o);
-      const [d, p] = this.getAttributeAndSymmetricDirection(o);
-      l = p, d === g ? (R(!!a && !!s, `reading link in wrong path ${u.join(".")}`), a = this.data.records[a].attributes[s].linkName, s = void 0, r = n.linkName, n = void 0) : (n = this.data.records[r].attributes[d], R(!!n, `attribute ${d} not found in ${r}. namePath: ${t.join(".")}`), a = r, r = n.isRecord ? n.recordName : "", s = d);
+      const [d, h] = this.getAttributeAndSymmetricDirection(o);
+      l = h, d === g ? (R(!!a && !!s, `reading link in wrong path ${u.join(".")}`), a = this.data.records[a].attributes[s].linkName, s = void 0, r = n.linkName, n = void 0) : (n = this.data.records[r].attributes[d], R(!!n, `attribute ${d} not found in ${r}. namePath: ${t.join(".")}`), a = r, r = n.isRecord ? n.recordName : "", s = d);
     }
     if (!(!a || !s))
       return new it(a, s, this, l);
@@ -4796,15 +4796,15 @@ class ut {
       // link: currentLink,
       path: [e]
     }];
-    for (let p = 0; p < i.length; p++) {
-      const [f, m] = this.getAttributeAndSymmetricDirection(i[p]), h = [e, ...i.slice(0, p + 1)];
+    for (let h = 0; h < i.length; h++) {
+      const [f, m] = this.getAttributeAndSymmetricDirection(i[h]), p = [e, ...i.slice(0, h + 1)];
       if (f === g) {
         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(h);
+        u = this.getInfoByPath(p);
         const y = r.attributes[f];
-        R(u.isRecord, `${i.slice(0, p + 1).join(".")} is not a entity attribute`);
+        R(u.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
         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;
@@ -4822,20 +4822,20 @@ class ut {
         isLinkRecord: l,
         linkTable: n,
         linkAlias: o,
-        path: h
+        path: p
       });
     }
     return d;
   }
   getTableAliasAndFieldName(t, e, i = !1) {
-    const r = this.getTableAndAliasStack(t), { table: a, alias: s, record: n, path: o, linkAlias: l, linkTable: u, isLinkRecord: d } = r.at(-1), p = !d && r.length > 1 ? this.getInfoByPath(o) : null;
-    if (!i && e === "id" && !d && t.length > 1 && (p?.isLinkMergedWithParent() || p?.isLinkIsolated()))
-      if (p?.isLinkMergedWithParent()) {
-        const { alias: m, table: h } = r.at(-2);
-        return [m, p.linkField, h];
+    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: m, table: p } = r.at(-2);
+        return [m, h.linkField, p];
       } else {
-        const m = p.getLinkInfo().record, h = p?.isLinkManyToManySymmetric() ? p?.symmetricDirection === "source" ? m?.attributes.target.field : m?.attributes.source.field : p.isRecordSource() ? m?.attributes.target.field : m?.attributes.source.field;
-        return [l, h, u];
+        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 m = n.attributes[this.getAttributeAndSymmetricDirection(e)[0]].field;
@@ -4904,11 +4904,11 @@ class ut {
         if (u === "source" || u === "target") {
           const d = this.getInfo(s, l);
           if (d.isRecord) {
-            const p = d.getLinkInfo().data;
+            const h = d.getLinkInfo().data;
             let f;
-            d.isRecordSource() ? f = p.targetRecord : f = p.sourceRecord;
+            d.isRecordSource() ? f = h.targetRecord : f = h.sourceRecord;
             let m;
-            if (u === "source" ? m = p.sourceRecord : m = p.targetRecord, f === m) {
+            if (u === "source" ? m = h.sourceRecord : m = h.targetRecord, f === m) {
               n += 2;
               continue;
             } else {
@@ -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,11 +4988,11 @@ 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((p) => c.commonProperties.some((f) => !p.properties.some((m) => m.name === f.name && m.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((p) => p.name).join(", ")}`);
+      throw new Error(`Merged ${e} ${c.name} defined commonProperties, but these ${e}s do not have commonProperties: ${d.map((h) => h.name).join(", ")}`);
   }
   if (u)
     for (const d of u)
@@ -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,30 +5043,30 @@ 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))
       for (; o.baseRelation && o.properties.length === 0; )
         o = o.baseRelation;
-    const l = Object.fromEntries(o.properties.map((p) => [p.name, p]));
+    const l = Object.fromEntries(o.properties.map((h) => [h.name, h]));
     a.set(n.name, l), Object.assign(s, l);
     const u = n.inputEntities || n.inputRelations, d = [...t.get(n.name) || []];
     for (; d.length; ) {
-      const p = d.shift();
+      const h = d.shift();
       if (!u)
-        a.set(p, l);
+        a.set(h, l);
       else {
-        const f = e.getEntityByName(p) || e.getRelationByName(p);
+        const f = e.getEntityByName(h) || e.getRelationByName(h);
         if (!(f.inputEntities || f.inputRelations)) {
-          const h = Object.fromEntries(f.properties.map((y) => [y.name, y]));
-          a.set(p, h), Object.assign(s, h);
+          const p = Object.fromEntries(f.properties.map((y) => [y.name, y]));
+          a.set(h, p), Object.assign(s, p);
         }
       }
-      d.push(...t.get(p) || []);
+      d.push(...t.get(h) || []);
     }
   }
   for (const n of Object.keys(s)) {
@@ -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,15 +5778,15 @@ 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, p = this.map.links[d], { relType: f, sourceRecord: m, targetRecord: h } = p;
+        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" && m !== h,
+          f[0] === "1" && f[1] === "1" && m !== p,
           `only 1:1 can merge: ${a}.${s.slice(0, o + 1).join(".")}`
         );
-        const y = m === n ? h : m, b = this.combineRecordTable(n, y, 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}`);
-        p.mergedTo = "combined", i.push(p), n = u.recordName, delete t[d], delete e[d];
+        h.mergedTo = "combined", i.push(h), n = u.recordName, delete t[d], delete e[d];
       }
     }), Object.values(t).forEach((r) => {
       if (r.isFilteredRelation) return;
@@ -6036,12 +6036,12 @@ ${Object.values(this.tables[t].columns).map((i) => `    "${i.name}" ${i.fieldTyp
       if (!l.isRecord) return;
       const u = l.recordName, d = `${e}_${n}`;
       if (this.aliasManager.registerTablePath(d), this.aliasManager.registerTablePath(`${d}_SOURCE`), this.aliasManager.registerTablePath(`${d}_TARGET`), this.aliasManager.registerTablePath(`REL_${d}`), this.aliasManager.registerTablePath(`REL_${d}_SOURCE`), this.aliasManager.registerTablePath(`REL_${d}_TARGET`), i.has(u)) return;
-      const p = new Set(i);
-      p.add(u), this.generateAliasesForRecord(u, d, p, r + 1, a);
+      const h = new Set(i);
+      h.add(u), this.generateAliasesForRecord(u, d, h, r + 1, a);
     });
   }
 }
-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";
@@ -6720,8 +6720,8 @@ class xr {
         this.relationAttributeQuery
       ), l = o[this.isSource ? "target" : "source"];
       l["&"] = o;
-      const u = this.matchRecordToWeight.call(this.controller, l, r), d = u.weight * u.value, { oldValue: p } = await this.state.itemResult.replace(o, d);
-      a = d - (p ?? 0);
+      const u = this.matchRecordToWeight.call(this.controller, l, r), d = u.weight * u.value, { oldValue: h } = await this.state.itemResult.replace(o, d);
+      a = d - (h ?? 0);
     }
     return this.state.total.increment(e.record, a);
   }
@@ -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";
@@ -6837,19 +6837,19 @@ class Dr {
     const a = e.relatedMutationEvent;
     let s = 0, n = 0;
     if (a.type === "create" && a.recordName === this.relation.name) {
-      const u = a.record, p = (await this.controller.system.storage.findOne(this.relation.name, w.atom({
+      const u = a.record, h = (await this.controller.system.storage.findOne(this.relation.name, w.atom({
         key: "id",
         value: ["=", u.id]
       }), void 0, this.relationAttributeQuery))[this.isSource ? "target" : "source"];
-      p["&"] = u;
-      const f = !!this.callback.call(this.controller, p, r);
+      h["&"] = u;
+      const f = !!this.callback.call(this.controller, h, r);
       let m;
       try {
         ({ oldValue: m } = await this.state.isItemMatch.replace(u, f));
-      } catch (h) {
-        if (h instanceof Error && h.message.includes("Atomic replace target not found"))
+      } catch (p) {
+        if (p instanceof Error && p.message.includes("Atomic replace target not found"))
           return x.fullRecompute("relation contribution state target not found");
-        throw h;
+        throw p;
       }
       s = Number(f) - +!!m, n = 1;
     } else if (a.type === "delete" && a.recordName === this.relation.name) {
@@ -6866,18 +6866,18 @@ class Dr {
       ), d = w.atom({
         key: u,
         value: ["=", a.oldRecord.id]
-      }), p = await this.controller.system.storage.findOne(this.relation.name, d, void 0, this.relationAttributeQuery), f = p[this.isSource ? "target" : "source"];
-      f["&"] = p;
+      }), h = await this.controller.system.storage.findOne(this.relation.name, d, void 0, this.relationAttributeQuery), f = h[this.isSource ? "target" : "source"];
+      f["&"] = h;
       const m = !!this.callback.call(this.controller, f, r);
-      let h;
+      let p;
       try {
-        ({ oldValue: h } = await this.state.isItemMatch.replace(p, m));
+        ({ 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 y;
       }
-      s = Number(m) - +!!h;
+      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";
@@ -6994,8 +6994,8 @@ class Lr {
         value: ["=", o.id]
       }), void 0, this.relationAttributeQuery))[this.isSource ? "target" : "source"];
       u["&"] = o;
-      const d = !!this.callback.call(this.controller, u, r), { oldValue: p } = await this.state.isItemMatch.replace(o, d);
-      a = Number(d) - +!!p;
+      const d = !!this.callback.call(this.controller, u, r), { oldValue: h } = await this.state.isItemMatch.replace(o, d);
+      a = Number(d) - +!!h;
     } else if (s.type === "delete" && s.recordName === this.relation.name) {
       const o = s.record;
       a = !!await this.state.isItemMatch.get(o) ? -1 : 0;
@@ -7012,8 +7012,8 @@ class Lr {
         value: ["=", s.oldRecord.id]
       }), u = await this.controller.system.storage.findOne(this.relation.name, l, void 0, this.relationAttributeQuery), d = u[this.isSource ? "target" : "source"];
       d["&"] = u;
-      const p = !!this.callback.call(this.controller, d, r), { oldValue: f } = await this.state.isItemMatch.replace(u, p);
-      a = Number(p) - +!!f;
+      const h = !!this.callback.call(this.controller, d, r), { oldValue: f } = await this.state.isItemMatch.replace(u, h);
+      a = Number(h) - +!!f;
     } else
       return x.fullRecompute("mutation is not caused by relation.");
     return await this.state.matchCount.increment(e.record, a) > 0;
@@ -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";
@@ -7132,8 +7132,8 @@ class Vr {
           this.relationAttributeQuery
         ))[this.isSource ? "target" : "source"];
         u["&"] = o;
-        const d = !!this.callback.call(this.controller, u, r), { oldValue: p } = await this.state.isItemMatchCount.replace(o, d);
-        s = Number(d) - +!!p;
+        const d = !!this.callback.call(this.controller, u, r), { oldValue: h } = await this.state.isItemMatchCount.replace(o, d);
+        s = Number(d) - +!!h;
       } else
         s = 1;
     else if (a.type === "delete" && a.recordName === this.relation.name)
@@ -7153,8 +7153,8 @@ class Vr {
           this.relationAttributeQuery
         ), u = l[this.isSource ? "target" : "source"];
         u["&"] = l;
-        const d = !!this.callback.call(this.controller, u, r), { oldValue: p } = await this.state.isItemMatchCount.replace(l, d);
-        s = Number(d) - +!!p;
+        const d = !!this.callback.call(this.controller, u, r), { oldValue: h } = await this.state.isItemMatchCount.replace(l, d);
+        s = Number(d) - +!!h;
       }
     } else
       return x.fullRecompute(`unknown related mutation event for ${this.dataContext.host.name}.${this.dataContext.id.name}`);
@@ -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) {
@@ -7489,8 +7489,8 @@ class Gr {
         );
         if (!d)
           return [];
-        const p = await this.transformCallback.call(this.controller, d);
-        s = Array.isArray(p) ? p : [p];
+        const h = await this.transformCallback.call(this.controller, d);
+        s = Array.isArray(h) ? h : [h];
       }
       const n = w.atom({ key: this.state.sourceRecordId.key, value: ["=", a] }), l = (await this.controller.system.storage.atomic.lockRows(i.id.name, n, ["*"])).reduce((u, d) => (u[Number(d[this.state.transformIndex.key])] = d, u), {});
       s.forEach((u, d) => {
@@ -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";
@@ -8069,8 +8069,8 @@ class ea {
         w.atom({ key: "id", value: ["=", e.record.id] }),
         void 0,
         this.args.attributeQuery
-      ), d = this.resolveAvgField(u) || 0, { oldValue: p } = await this.state.itemValue.replace(u, d);
-      a = d - (p ?? 0), s = 1;
+      ), d = this.resolveAvgField(u) || 0, { oldValue: h } = await this.state.itemValue.replace(u, d);
+      a = d - (h ?? 0), s = 1;
     } else if (e.type === "delete")
       a = -(await this.state.itemValue.get(e.record) || 0), s = -1;
     else if (e.type === "update") {
@@ -8079,8 +8079,8 @@ class ea {
         w.atom({ key: "id", value: ["=", e.record.id] }),
         void 0,
         this.args.attributeQuery
-      ), d = this.resolveAvgField(u) || 0, { oldValue: p } = await this.state.itemValue.replace(u, d);
-      a = d - (p ?? 0);
+      ), d = this.resolveAvgField(u) || 0, { oldValue: h } = await this.state.itemValue.replace(u, d);
+      a = d - (h ?? 0);
     }
     const n = await this.controller.system.storage.atomic.updateGlobalFields(
       {
@@ -8115,7 +8115,7 @@ class ia {
     };
   }
   static {
-    this.computationType = xt;
+    this.computationType = Mt;
   }
   static {
     this.contextType = "property";
@@ -8158,9 +8158,9 @@ class ia {
         w.atom({ key: "id", value: ["=", u.id] }),
         void 0,
         this.relationAttributeQuery
-      ), p = d[this.isSource ? "target" : "source"];
-      p["&"] = d;
-      const f = this.resolveAvgField(p) || 0, { oldValue: m } = await this.state.itemResult.replace(d, f);
+      ), h = d[this.isSource ? "target" : "source"];
+      h["&"] = d;
+      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;
@@ -8172,8 +8172,8 @@ class ia {
         this.relationAttributeQuery
       ), d = u[this.isSource ? "target" : "source"];
       d["&"] = u;
-      const p = this.resolveAvgField(d) || 0, { oldValue: f } = await this.state.itemResult.replace(u, p);
-      s = p - (f ?? 0);
+      const h = this.resolveAvgField(d) || 0, { oldValue: f } = await this.state.itemResult.replace(u, h);
+      s = h - (f ?? 0);
     }
     const o = await this.state.sum.increment(e.record, s), l = await this.state.count.increment(e.record, n);
     return l > 0 ? o / l : 0;
@@ -8540,10 +8540,10 @@ class ha {
       C(!!u, `cannot find Computation handle map for ${l.constructor.displayName || l.constructor.name}`);
       const d = u[o.type];
       C(!!d, `cannot find Computation handle for ${l.constructor.displayName || l.constructor.name} with context type ${o.type}`);
-      const p = new d(this.controller, l, o);
-      if (this.computationsHandles.set(o.id, p), this.isAsyncComputation(p)) {
-        const f = this.getAsyncTaskRecordKey(p);
-        if (p.dataContext.type === "property") {
+      const h = new d(this.controller, l, o);
+      if (this.computationsHandles.set(o.id, h), this.isAsyncComputation(h)) {
+        const f = this.getAsyncTaskRecordKey(h);
+        if (h.dataContext.type === "property") {
           const m = new D({
             name: f,
             properties: [
@@ -8564,16 +8564,16 @@ class ha {
                 type: "string"
               }, { uuid: `${f}_freshnessKey` })
             ]
-          }, { uuid: f }), h = new F({
-            name: `${m.name}_${p.dataContext.host.name}_${p.dataContext.id.name}`,
+          }, { uuid: f }), p = new F({
+            name: `${m.name}_${h.dataContext.host.name}_${h.dataContext.id.name}`,
             source: m,
-            target: p.dataContext.host,
+            target: h.dataContext.host,
             sourceProperty: "record",
-            targetProperty: `_${p.dataContext.id.name}_task`,
+            targetProperty: `_${h.dataContext.id.name}_task`,
             type: "1:1"
           }, { uuid: `${f}_record_relation` });
-          e.push(m), i.push(h);
-        } else if (p.dataContext.type === "global") {
+          e.push(m), i.push(p);
+        } else if (h.dataContext.type === "global") {
           const m = new D({
             name: f,
             properties: [
@@ -8600,8 +8600,8 @@ class ha {
             ]
           }, { uuid: f });
           e.push(m);
-        } else if (p.dataContext.type === "entity") {
-          p.dataContext;
+        } else if (h.dataContext.type === "entity") {
+          h.dataContext;
           const m = new D({
             name: f,
             properties: [
@@ -8628,8 +8628,8 @@ class ha {
             ]
           }, { uuid: f });
           e.push(m);
-        } else if (p.dataContext.type === "relation") {
-          p.dataContext;
+        } else if (h.dataContext.type === "relation") {
+          h.dataContext;
           const m = new D({
             name: f,
             properties: [
@@ -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 {
 }
@@ -9280,7 +9280,7 @@ ${i.text}`).join(`
     };
 }
 function Na(c, t = !1) {
-  const e = c.args, i = ga(c), r = ba(c), a = wa(c), s = a.map((b) => b.key), n = re(c), o = P(c.dataContext), l = c.dataContext.type === "entity" || c.dataContext.type === "relation" ? c.dataContext.id.name : void 0, u = c.constructor?.name || String(e._type || e.constructor?.name || "UnknownComputation"), d = st("computation", n, c.args.uuid), p = Ra(e, t), f = nt({
+  const e = c.args, i = ga(c), r = ba(c), a = wa(c), s = a.map((b) => b.key), n = re(c), o = P(c.dataContext), l = c.dataContext.type === "entity" || c.dataContext.type === "relation" ? c.dataContext.id.name : void 0, u = c.constructor?.name || String(e._type || e.constructor?.name || "UnknownComputation"), d = st("computation", n, c.args.uuid), h = Ra(e, t), f = nt({
     type: u,
     dataContext: o,
     dataDeps: i,
@@ -9288,19 +9288,19 @@ function Na(c, t = !1) {
     hasCompute: typeof c.compute == "function",
     hasIncrementalCompute: typeof c.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof c.incrementalPatchCompute == "function"
-  }), m = nt({ stateKeys: s, boundStates: a }), h = nt({
+  }), m = nt({ stateKeys: s, boundStates: a }), p = nt({
     type: u,
     dataContext: o,
     outputRecord: l,
     outputProperty: c.dataContext.type === "property" ? c.dataContext.id.name : void 0,
     deps: i,
     eventDeps: r,
-    callbackPaths: p?.callbackPaths || [],
-    hasFunction: p?.hasFunction === !0,
+    callbackPaths: h?.callbackPaths || [],
+    hasFunction: h?.hasFunction === !0,
     hasCompute: typeof c.compute == "function",
     hasIncrementalCompute: typeof c.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof c.incrementalPatchCompute == "function"
-  }), y = nt({ structuralSignature: h, stateSignature: m, functionHash: p?.hash });
+  }), y = nt({ structuralSignature: p, stateSignature: m, functionHash: h?.hash });
   return {
     id: n,
     identity: d,
@@ -9323,12 +9323,12 @@ function Na(c, t = !1) {
     } : void 0,
     outputSignature: f,
     stateSignature: m,
-    structuralSignature: h,
-    functionSignature: p,
+    structuralSignature: p,
+    functionSignature: h,
     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);
@@ -9338,10 +9338,10 @@ function Ht(c, t = c.system.storage.schema, e = {}) {
         name: l.name,
         kind: "entity",
         properties: (l.properties || []).map((d) => {
-          const p = st("property", `property:${l.name}.${d.name}`, d.uuid);
+          const h = st("property", `property:${l.name}.${d.name}`, d.uuid);
           return {
-            id: ct(p),
-            identity: p,
+            id: ct(h),
+            identity: h,
             name: d.name,
             type: d.type,
             collection: d.collection === !0,
@@ -9358,10 +9358,10 @@ function Ht(c, t = c.system.storage.schema, e = {}) {
         name: l.name,
         kind: "relation",
         properties: (l.properties || []).map((d) => {
-          const p = st("property", `property:${l.name}.${d.name}`, d.uuid);
+          const h = st("property", `property:${l.name}.${d.name}`, d.uuid);
           return {
-            id: ct(p),
-            identity: p,
+            id: ct(h),
+            identity: h,
             name: d.name,
             type: d.type,
             collection: d.collection === !0,
@@ -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}`;
@@ -9455,31 +9455,31 @@ function Pi(c, t) {
   return Mi(c?.handlers?.asyncCompletion, e?.handlerRef);
 }
 function Ta(c, t, e, i) {
-  const r = [], a = [], s = new Map(c.computations.map((h) => [h.id, h])), n = new Map(t.computations.map((h) => [h.id, h])), o = new Map(c.records.map((h) => [h.id, h])), l = new Map(t.records.map((h) => [h.id, h])), u = new Map(c.relations.map((h) => [h.id, h])), d = new Map(t.relations.map((h) => [h.id, h])), p = new Map((c.dictionaries || []).map((h) => [h.id, h])), f = new Map((t.dictionaries || []).map((h) => [h.id, h]));
-  for (const h of c.records)
-    l.has(h.id) || r.push({
+  const r = [], a = [], s = new Map(c.computations.map((p) => [p.id, p])), n = new Map(t.computations.map((p) => [p.id, p])), o = new Map(c.records.map((p) => [p.id, p])), l = new Map(t.records.map((p) => [p.id, p])), u = new Map(c.relations.map((p) => [p.id, p])), d = new Map(t.relations.map((p) => [p.id, p])), h = new Map((c.dictionaries || []).map((p) => [p.id, p])), f = new Map((t.dictionaries || []).map((p) => [p.id, p]));
+  for (const p of c.records)
+    l.has(p.id) || r.push({
       kind: "record",
-      id: h.id,
+      id: p.id,
       changeType: "removed",
-      dataContext: `${h.kind}:${h.name}`,
-      reason: `${h.kind} no longer exists in the new model`
+      dataContext: `${p.kind}:${p.name}`,
+      reason: `${p.kind} no longer exists in the new model`
     });
-  for (const h of t.records) {
-    const y = o.get(h.id);
-    y ? (y.kind !== h.kind || y.name !== h.name) && r.push({
+  for (const p of t.records) {
+    const y = o.get(p.id);
+    y ? (y.kind !== p.kind || y.name !== p.name) && r.push({
       kind: "record",
-      id: h.id,
+      id: p.id,
       changeType: "changed",
-      dataContext: `${h.kind}:${h.name}`,
+      dataContext: `${p.kind}:${p.name}`,
       reason: "record kind or name changed"
     }) : r.push({
       kind: "record",
-      id: h.id,
+      id: p.id,
       changeType: "added",
-      dataContext: `${h.kind}:${h.name}`,
-      reason: `${h.kind} was added`
+      dataContext: `${p.kind}:${p.name}`,
+      reason: `${p.kind} was added`
     });
-    const b = new Map((y?.properties || []).map((N) => [N.id, N])), v = new Map(h.properties.map((N) => [N.id, N]));
+    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",
@@ -9488,142 +9488,142 @@ function Ta(c, t, e, i) {
         dataContext: `property:${y?.name}.${N.name}`,
         reason: "property no longer exists in the new model"
       });
-    for (const N of h.properties) {
+    for (const N of p.properties) {
       const I = b.get(N.id);
       I ? (I.name !== N.name || I.type !== N.type || I.collection !== N.collection || I.computed !== N.computed) && r.push({
         kind: "property",
         id: N.id,
         changeType: "changed",
-        dataContext: `property:${h.name}.${N.name}`,
+        dataContext: `property:${p.name}.${N.name}`,
         reason: "property name, type, collection, or computed flag changed"
       }) : r.push({
         kind: "property",
         id: N.id,
         changeType: "added",
-        dataContext: `property:${h.name}.${N.name}`,
+        dataContext: `property:${p.name}.${N.name}`,
         reason: "property was added"
       });
     }
   }
-  for (const h of c.relations)
-    d.has(h.id) || r.push({
+  for (const p of c.relations)
+    d.has(p.id) || r.push({
       kind: "relation",
-      id: h.id,
+      id: p.id,
       changeType: "removed",
-      dataContext: `relation:${h.name}`,
+      dataContext: `relation:${p.name}`,
       reason: "relation no longer exists in the new model"
     });
-  for (const h of t.relations) {
-    const y = u.get(h.id);
-    y ? (y.name !== h.name || y.source !== h.source || y.target !== h.target || y.sourceProperty !== h.sourceProperty || y.targetProperty !== h.targetProperty || y.type !== h.type) && r.push({
+  for (const p of t.relations) {
+    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: h.id,
+      id: p.id,
       changeType: "changed",
-      dataContext: `relation:${h.name}`,
+      dataContext: `relation:${p.name}`,
       reason: "relation endpoints, properties, or type changed"
     }) : r.push({
       kind: "relation",
-      id: h.id,
+      id: p.id,
       changeType: "added",
-      dataContext: `relation:${h.name}`,
+      dataContext: `relation:${p.name}`,
       reason: "relation was added"
     });
   }
-  for (const h of c.dictionaries || [])
-    f.has(h.id) || r.push({
+  for (const p of c.dictionaries || [])
+    f.has(p.id) || r.push({
       kind: "dictionary",
-      id: h.id,
+      id: p.id,
       changeType: "removed",
-      dataContext: `global:${h.name}`,
+      dataContext: `global:${p.name}`,
       reason: "dictionary no longer exists in the new model"
     });
-  for (const h of t.dictionaries || []) {
-    const y = p.get(h.id);
+  for (const p of t.dictionaries || []) {
+    const y = h.get(p.id);
     let b = "unchanged", v = "dictionary is unchanged";
-    y ? (y.type !== h.type || y.collection !== h.collection || y.computed !== h.computed) && (b = "changed", v = "dictionary type, collection, or computed flag changed") : (b = "added", v = "dictionary was added"), b !== "unchanged" && r.push({
+    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: h.id,
+      id: p.id,
       changeType: b,
-      dataContext: `global:${h.name}`,
+      dataContext: `global:${p.name}`,
       reason: v
     });
   }
-  for (const h of c.computations)
-    n.has(h.id) || r.push({
+  for (const p of c.computations)
+    n.has(p.id) || r.push({
       kind: "computation",
-      id: h.id,
-      dataContext: h.dataContext,
-      computationType: h.type,
+      id: p.id,
+      dataContext: p.dataContext,
+      computationType: p.type,
       changeType: "removed",
       detected: {},
       recommendation: "ignore",
       reason: "computation no longer exists in the new model"
     });
-  for (const h of t.computations) {
-    const y = s.get(h.id), b = {
-      dataDepsChanged: y ? !Yt(y.deps, h.deps) : !0,
-      eventDepsChanged: y ? !Yt(y.eventDeps, h.eventDeps) : !0,
-      outputSignatureChanged: y ? y.outputSignature !== h.outputSignature : !0,
-      stateSignatureChanged: y ? y.stateSignature !== h.stateSignature : !0,
-      functionTextChanged: y ? y.functionSignature?.hash !== h.functionSignature?.hash : h.functionSignature?.hasFunction === !0,
-      functionHash: h.functionSignature?.hash,
+  for (const p of t.computations) {
+    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: y?.functionSignature?.hash,
-      hasFunction: h.functionSignature?.hasFunction === !0,
-      hasClosureRisk: h.functionSignature?.hasFunction === !0,
-      needsEventRebuildHandler: h.eventDeps.length > 0,
-      needsAsyncCompletionHandler: h.asyncReturn
+      hasFunction: p.functionSignature?.hasFunction === !0,
+      hasClosureRisk: p.functionSignature?.hasFunction === !0,
+      needsEventRebuildHandler: p.eventDeps.length > 0,
+      needsAsyncCompletionHandler: p.asyncReturn
     };
     let v = "unchanged", N = "ignore", I = "unchanged", S = "computation is structurally unchanged";
-    y ? y.structuralSignature !== h.structuralSignature ? (v = "changed", N = "needs-review", I = "changed", S = "computation structure changed") : y.stateSignature !== h.stateSignature && y.outputSignature === h.outputSignature ? (v = "state-only", N = "needs-review", I = "state-only", S = "computation state changed without output structure changes") : y.functionSignature?.hash !== h.functionSignature?.hash ? (v = "possibly-changed", N = "needs-review", I = "changed", S = "function text changed and requires human semantic review") : h.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({
+    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: h.id,
-      dataContext: h.dataContext,
-      computationType: h.type,
+      id: p.id,
+      dataContext: p.dataContext,
+      computationType: p.type,
       changeType: v,
       detected: b,
       recommendation: N,
       reason: S
     }), N !== "ignore" && a.push({
       kind: "computation",
-      id: h.id,
-      dataContext: h.dataContext,
+      id: p.id,
+      dataContext: p.dataContext,
       recommendedDecision: I,
       reason: S
     }), b.needsEventRebuildHandler && a.push({
       kind: "event-rebuild-handler",
-      dataContext: h.dataContext,
+      dataContext: p.dataContext,
       reason: "event-based computation needs an external migration rebuild handler"
     }), b.needsAsyncCompletionHandler && a.push({
       kind: "async-completion-handler",
-      dataContext: h.dataContext,
+      dataContext: p.dataContext,
       reason: "async computation needs an external migration completion handler"
     });
   }
-  for (const h of e.preRecomputeDDL)
+  for (const p of e.preRecomputeDDL)
     r.push({
       kind: "storage",
-      id: h.logicalPath || h.description,
+      id: p.logicalPath || p.description,
       changeType: "added",
-      dataContext: h.logicalPath || h.tableName || h.description,
-      reason: h.description
+      dataContext: p.logicalPath || p.tableName || p.description,
+      reason: p.description
     });
-  for (const h of i.blockingChanges)
+  for (const p of i.blockingChanges)
     r.push({
       kind: "storage",
-      id: h.logicalPath,
+      id: p.logicalPath,
       changeType: "blocked",
-      dataContext: h.logicalPath,
-      reason: h.reason
+      dataContext: p.logicalPath,
+      reason: p.reason
     });
-  for (const h of i.destructiveScopes)
+  for (const p of i.destructiveScopes)
     a.push({
       kind: "destructive-scope",
-      dataContext: h.dataContext,
-      recordName: h.recordName,
-      ids: h.ids || [],
-      reason: h.reason
+      dataContext: p.dataContext,
+      recordName: p.recordName,
+      ids: p.ids || [],
+      reason: p.reason
     });
-  const m = Array.from(new Map(a.map((h) => [Wt(h), h])).values());
+  const m = Array.from(new Map(a.map((p) => [Rt(p), p])).values());
   return {
     kind: "interaqt-migration-diff",
     version: 2,
@@ -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]));
@@ -9735,34 +9738,34 @@ function pi(c, t) {
   return e;
 }
 function fi(c, t, e, i = [], r = {}) {
-  const a = new Map(t.computations.map((h) => [pe(h), h])), s = new Map(c.computations.map((h) => [h.id, h])), n = /* @__PURE__ */ new Map();
-  for (const h of t.computations) {
-    for (const y of h.deps)
-      for (const b of hi(y, h, t))
-        n.has(b) || n.set(b, /* @__PURE__ */ new Set()), n.get(b).add(h.id);
-    for (const y of h.eventDeps)
+  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 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 y of p.eventDeps)
       for (const b of pi(y, t))
-        b !== h.dataContext && (n.has(b) || n.set(b, /* @__PURE__ */ new Set()), n.get(b).add(h.id));
+        b !== p.dataContext && (n.has(b) || n.set(b, /* @__PURE__ */ new Set()), n.get(b).add(p.id));
   }
-  const o = new Set(e.map((h) => h.id)), u = [...e.filter((h) => {
-    const y = s.get(h.id);
-    return r.outputChangedIds?.has(h.id) || !y || y.outputSignature !== h.outputSignature;
-  }).map((h) => pe(h)), ...i];
+  const o = new Set(e.map((p) => p.id)), u = [...e.filter((p) => {
+    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 h = u.shift();
-    for (const y of n.get(h) || []) {
+    const p = u.shift();
+    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(), p = /* @__PURE__ */ new Set(), f = [], m = (h) => {
-    if (p.has(h)) return;
-    if (d.has(h))
-      throw new Et(`Migration detected a derived computation cycle at ${h}`);
-    d.add(h);
-    const y = t.computations.find((b) => b.id === h);
+  const d = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Set(), f = [], m = (p) => {
+    if (h.has(p)) return;
+    if (d.has(p))
+      throw new Tt(`Migration detected a derived computation cycle at ${p}`);
+    d.add(p);
+    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)) {
@@ -9776,12 +9779,12 @@ function fi(c, t, e, i = [], r = {}) {
           N && o.has(N.id) && m(N.id);
         }
     }
-    d.delete(h), p.add(h), f.push(h);
+    d.delete(p), h.add(p), f.push(p);
   };
-  return o.forEach(m), f.map((h) => {
-    const y = t.computations.find((W) => W.id === h), b = s.get(h), v = r.stateOnlyIds?.has(h) === !0, N = r.outputChangedIds?.has(h) || !b || b.outputSignature !== y.outputSignature, I = !b || b.stateSignature !== y.stateSignature, S = e.some((W) => W.id === h);
+  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: h,
+      computationId: p,
       dataContext: y.dataContext,
       rebuildState: (v || I) && y.boundStates.length > 0,
       rebuildOutput: v ? !1 : N || !S,
@@ -9815,11 +9818,11 @@ function mi(c, t) {
       newPhysicalPath: l.tableName,
       reason: "fact record table changed"
     });
-    const d = new Map((u.attributeDetails || []).map((m) => [m.name, m])), p = new Map((l.attributeDetails || []).map((m) => [m.name, m]));
+    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, h, y) => y.records.find((v) => v.name === m)?.properties.find((v) => v.name === h)?.computed === !0;
+    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 (!p.get(m.name) && !m.name.startsWith("_")) {
+      if (!h.get(m.name) && !m.name.startsWith("_")) {
         const y = f(u.recordName, m.name, c);
         e.push({
           kind: "unsupported-destructive-schema-change",
@@ -9829,17 +9832,17 @@ function mi(c, t) {
         });
       }
     for (const m of l.attributeDetails || []) {
-      const h = d.get(m.name);
-      !h || f(u.recordName, m.name, c) || f(l.recordName, m.name, t) || ((h.kind !== m.kind || h.tableName !== m.tableName || h.fieldName !== m.fieldName || h.sourceField !== m.sourceField || h.targetField !== m.targetField) && e.push({
+      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: `${l.recordName}.${m.name}`,
-        oldPhysicalPath: fe(h.tableName, h.fieldName || h.sourceField || h.targetField),
+        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"
-      }), (h.type !== m.type || h.fieldType !== m.fieldType || h.collection !== m.collection) && e.push({
+      }), (p.type !== m.type || p.fieldType !== m.fieldType || p.collection !== m.collection) && e.push({
         kind: "unsupported-destructive-schema-change",
         logicalPath: `${l.recordName}.${m.name}`,
-        oldPhysicalPath: `${h.type || "?"}/${h.fieldType || "?"}/${h.collection === !0}`,
+        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"
       }));
@@ -9882,8 +9885,8 @@ async function Te(c, t, e) {
     if (!o || !l || u.length === 0) return;
     const d = c.system.storage.db || c.system.db;
     if (typeof d?.query != "function") return;
-    const p = (m) => `"${m.replace(/"/g, '""')}"`, f = u.map((m) => `${p(m.fieldName)} AS ${p(m.name)}`).join(", ");
-    return d.query(`SELECT ${f} FROM ${p(l)}`, []);
+    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) {
     const n = i.get(s.computationId);
@@ -9909,7 +9912,7 @@ 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 p = new Set(d.map((h) => `${h[l]}:${h[u]}`)), m = (await a(o) || []).filter((h) => !p.has(`${h[l]}:${h[u]}`)).map((h) => String(h.id));
+      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,
@@ -9925,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) {
@@ -9971,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))
@@ -9979,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) {
@@ -9990,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,
@@ -10009,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 },
@@ -10027,16 +10030,16 @@ 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]}`, p = o.get(d);
-    if (o.delete(d), p)
-      Yt({ ...p, id: void 0 }, { ...u, id: void 0 }) || (await c.system.storage.update(r, w.atom({ key: "id", value: ["=", p.id] }), u), l.push({ recordName: r, type: "update", record: { ...p, ...u }, oldRecord: p, keys: Object.keys(u) }));
+    const d = `${u[a]}:${u[s]}`, h = o.get(d);
+    if (o.delete(d), h)
+      Yt({ ...h, id: void 0 }, { ...u, id: void 0 }) || (await c.system.storage.update(r, w.atom({ key: "id", value: ["=", h.id] }), u), l.push({ recordName: r, type: "update", record: { ...h, ...u }, oldRecord: h, keys: Object.keys(u) }));
     else {
       const f = await c.system.storage.create(r, u);
       l.push({ recordName: r, type: "create", record: f });
@@ -10045,9 +10048,9 @@ async function Ma(c, t, e = {}) {
   for (const u of o.values()) {
     if (!Qe(
       e.approvedDiff,
-      (p) => p.kind === "destructive-scope" && p.dataContext === P(t.dataContext) && p.recordName === r
+      (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;
@@ -10068,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;
@@ -10095,7 +10098,7 @@ class Da {
       if (t.dataContext.type === "property") {
         const o = t.dataContext.host.name, l = await this.controller.system.storage.find(o, void 0, void 0, ["*"]), u = [];
         for (const d of l) {
-          const p = await e({ controller: this.controller, dataContext: t.dataContext, record: d }), f = await et(this.controller, t, p, d, this.options);
+          const h = await e({ controller: this.controller, dataContext: t.dataContext, record: d }), f = await et(this.controller, t, h, d, this.options);
           f && u.push(f);
         }
         return u;
@@ -10140,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;
@@ -10179,18 +10182,18 @@ async function Oa(c, t, e) {
     if (!n || !s.resolvedMatchExpression) continue;
     const o = await c.system.storage.find(n, void 0, void 0, ["id", "__filtered_entities"]), l = await c.system.storage.find(n, s.resolvedMatchExpression, void 0, ["id"]), u = new Set(l.map((d) => String(d.id)));
     for (const d of o) {
-      const p = {
+      const h = {
         ...d.__filtered_entities && typeof d.__filtered_entities == "object" ? d.__filtered_entities : {},
         [s.recordName]: u.has(String(d.id))
       };
       await c.system.storage.update(
         n,
         w.atom({ key: "id", value: ["=", d.id] }),
-        { __filtered_entities: p }
+        { __filtered_entities: h }
       ), a.push({
         recordName: s.recordName,
         type: u.has(String(d.id)) ? "create" : "delete",
-        record: { ...d, __filtered_entities: p },
+        record: { ...d, __filtered_entities: h },
         oldRecord: d,
         keys: ["__filtered_entities"]
       });
@@ -10238,9 +10241,9 @@ class xs {
     const d = new Set(this.entities.map((f) => f.name));
     for (const f of this.eventSources)
       f.entity && f.entity.name && !d.has(f.entity.name) && (this.entities.push(f.entity), d.add(f.entity.name));
-    const p = [
+    const h = [
       ...Qr,
-      ...Jr,
+      ...Kr,
       ...qr,
       ...Or,
       ...Mr,
@@ -10251,7 +10254,7 @@ class xs {
       ...ca,
       ...o
     ];
-    this.scheduler = new ha(this, this.entities, this.relations, this.dict, p), n.forEach((f) => {
+    this.scheduler = new ha(this, this.entities, this.relations, this.dict, h), n.forEach((f) => {
       let m = this.recordNameToSideEffects.get(f.record.name);
       m || this.recordNameToSideEffects.set(f.record.name, m = /* @__PURE__ */ new Set()), m.add(f);
     });
@@ -10269,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?.())
@@ -10278,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() {
@@ -10290,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 = {}) {
@@ -10299,18 +10302,18 @@ 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 = {}) {
     const a = i.computations.filter(
-      (p) => !e.computations.some((f) => f.id === p.id && f.signature === p.signature)
+      (h) => !e.computations.some((f) => f.id === h.id && f.signature === h.signature)
     ), s = yi(e, i), n = fi(
       e,
       i,
       a,
       s,
-      { outputChangedIds: new Set(a.map((p) => p.id)) }
+      { outputChangedIds: new Set(a.map((h) => h.id)) }
     ), o = mi(e, i), l = r.includeDestructiveScope === !0 ? await Te(this, n, e) : [], u = {
       blockingChanges: [
         ...t.blockingChanges,
@@ -10331,17 +10334,17 @@ 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), p = d.changedComputations, f = yi(s, n), m = fi(s, n, p, 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
-    }), h = mi(s, n), y = $a(
+    }), p = mi(s, n), y = $a(
       this,
       m,
       e,
       s
     ), b = [
       ...a.blockingChanges,
-      ...h,
+      ...p,
       ...d.blocking,
       ...y
     ], v = Ia(b), N = await Te(this, m, s);
@@ -10349,7 +10352,7 @@ class xs {
     const I = {
       mode: "compute",
       dryRun: e.dryRun === !0,
-      changedComputations: p,
+      changedComputations: h,
       rebuildPlan: m,
       schemaPlan: {
         schema: a.schema,
@@ -10591,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);
@@ -10677,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, []);
     }
   }
@@ -11104,8 +11107,8 @@ class qa {
       increment: async (e, i) => {
         const r = this.getPlaceholder();
         if (this.isRecordTarget(e)) {
-          const { tableName: l, idField: u, fieldName: d } = this.resolveRecordTarget(e), p = r(), f = r(), m = await this.db.query(
-            `UPDATE "${l}" SET "${d}" = COALESCE("${d}", 0) + ${p} WHERE "${u}" = ${f} RETURNING "${d}" AS value`,
+          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}`
           );
@@ -11145,12 +11148,12 @@ 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((y) => y !== a).map((y) => `"${y}" = NULL`).join(", "), u = this.parseGlobalValue(o[0]?.value, a) ?? e.defaultValue ?? null, d = this.getPlaceholder(), p = d(), f = d(), m = [`"${a}" = ${p}`, l].filter(Boolean).join(", "), h = await this.db.query(
+          ), 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}`
           );
-          return { oldValue: u, newValue: this.parseGlobalValue(h[0]?.value, a) ?? i };
+          return { oldValue: u, newValue: this.parseGlobalValue(p[0]?.value, a) ?? i };
         }
       ),
       compareAndSet: async (e, i, r, a) => {
@@ -11163,9 +11166,9 @@ 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), p = s(), f = s(), m = s(), h = 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}" = ${p} WHERE "key" = ${f} AND COALESCE("${o}", ${m}) = ${h} 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;
@@ -11200,9 +11203,9 @@ RETURNING "numberValue" AS value`,
         Object.entries(i).forEach(([f, m]) => {
           l[f] = Number(l[f] ?? r[f] ?? 0) + m;
         });
-        const u = this.getPlaceholder(), d = u(), p = u();
+        const u = this.getPlaceholder(), d = u(), h = u();
         return await this.db.update(
-          `UPDATE "_ComputationState_" SET "jsonValue" = ${d} WHERE "key" = ${p}`,
+          `UPDATE "_ComputationState_" SET "jsonValue" = ${d} WHERE "key" = ${h}`,
           [JSON.stringify(l), e.key],
           void 0,
           `atomic updateGlobalFields ${e.key}`
@@ -11509,16 +11512,16 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
         if (d instanceof $) {
           if (!d.record)
             return;
-          let p = a.getEntityByName(d.record);
-          if (p || (p = a.getRelationByName(d.record)), !p)
+          let h = a.getEntityByName(d.record);
+          if (h || (h = a.getRelationByName(d.record)), !h)
             throw new Error(`Entity or Relation not found: ${d.record}`);
-          for (; p.baseEntity || p.baseRelation; )
-            p = p.baseEntity || p.baseRelation;
+          for (; h.baseEntity || h.baseRelation; )
+            h = h.baseEntity || h.baseRelation;
           if (d.defaultValue instanceof T)
-            d.defaultValue.name = d.key, p.properties.push(d.defaultValue);
+            d.defaultValue.name = d.key, h.properties.push(d.defaultValue);
           else {
             const f = typeof d.defaultValue;
-            p.properties.push(T.create({
+            h.properties.push(T.create({
               name: d.key,
               type: f,
               // 应该系统定义
@@ -11599,9 +11602,9 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
       const r = i.sourceRecordId, a = i.transformIndex;
       if (!(r instanceof $) || !(a instanceof $) || r.unique === !1 || e.type !== "entity" && e.type !== "relation")
         continue;
-      const s = e.id.name, n = this.storage, o = n.queryHandle.map, l = o.getRecordInfo(s), [, u] = o.getTableAliasAndFieldName([s], r.key, !0), [, d] = o.getTableAliasAndFieldName([s], a.key, !0), p = `idx_transform_${this.hashIdentifier(`${l.table}_${u}_${d}`)}`, f = Q(n.db);
+      const s = e.id.name, n = this.storage, o = n.queryHandle.map, l = o.getRecordInfo(s), [, u] = o.getTableAliasAndFieldName([s], r.key, !0), [, d] = o.getTableAliasAndFieldName([s], a.key, !0), h = `idx_transform_${this.hashIdentifier(`${l.table}_${u}_${d}`)}`, f = Q(n.db);
       await n.db.scheme(
-        be(p, l.table, [u, d], f),
+        be(h, l.table, [u, d], f),
         `setup transform unique index ${s}`
       );
     }
@@ -11614,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), [, p] = r.getTableAliasAndFieldName([u], o.key, !0), [, f] = r.getTableAliasAndFieldName([u], l.key, !0), m = `idx_transform_${this.hashIdentifier(`${d.table}_${p}_${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(m, d.table, [p, 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}`
@@ -11687,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),
@@ -11821,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;
   }
@@ -11844,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;
@@ -11878,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),
@@ -11891,7 +11894,7 @@ function Ae(c) {
   });
 }
 function Os(c) {
-  return Vt.create({
+  return Qt.create({
     content: Ae(c)
   });
 }
@@ -11999,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) {
@@ -12021,7 +12024,7 @@ 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) {
@@ -12041,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
@@ -12059,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) ? E.fromValue(t.userAttributives.content) : E.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
@@ -12073,67 +12076,67 @@ 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 = E.and(o, e.query?.match);
     return c.system.storage.find(i, l, s, n);
@@ -12225,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 || [];
   }
@@ -12254,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;
@@ -12369,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;
   }
@@ -12395,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;
@@ -12429,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;
   }
@@ -12455,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;
@@ -12553,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;
   }
@@ -12575,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;
@@ -12865,10 +12868,10 @@ const Xa = [
   We,
   Ge,
   gt,
-  Je,
   Ke,
+  Je,
   ae,
-  kt,
+  At,
   Xe,
   ze,
   Ye,
@@ -12930,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
@@ -12972,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);
   }
@@ -12999,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, {
@@ -13013,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,
@@ -13033,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 });
@@ -13054,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))
@@ -13062,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) ? E.fromValue(
+      const r = Qt.is(e.userAttributives) ? E.fromValue(
         e.userAttributives.content
       ) : 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
@@ -13166,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) {
@@ -13293,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,
+  Ft as BoolAtomData,
   E as BoolExp,
-  Ft as BoolExpressionData,
+  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,
@@ -13338,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,
@@ -13354,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,
@@ -13366,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,
@@ -13378,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,
@@ -13412,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,
@@ -13433,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,
@@ -13467,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,
@@ -13475,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,
@@ -13507,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,