interaqt 0.4.1 → 0.4.2

package/dist/index.js

@@ -1,31 +1,31 @@
-import { uuidv7 as de } from "uuidv7";
-import { parse as Ie } from "acorn";
-import Ce from "better-sqlite3";
-import { AsyncLocalStorage as xe } from "async_hooks";
-import Me from "pg";
-import { PGlite as $e } from "@electric-sql/pglite";
-import se from "mysql2/promise";
-function he(u) {
+import { uuidv7 as pe } from "uuidv7";
+import { parse as Me } from "acorn";
+import { AsyncLocalStorage as fe } from "async_hooks";
+import $e from "better-sqlite3";
+import Pe from "pg";
+import { PGlite as De } from "@electric-sql/pglite";
+import ae from "mysql2/promise";
+function me(u) {
   return u !== null && typeof u == "object";
 }
-function pe(u) {
-  if (!he(u)) return !1;
+function ye(u) {
+  if (!me(u)) return !1;
   const t = Object.getPrototypeOf(u);
   return t === null ? !0 : t === Object.prototype || t === null;
 }
-function Pe(u, t) {
+function Oe(u, t) {
   const e = {};
   for (const i of u)
     i && i[t] !== void 0 && (e[String(i[t])] = i);
   return e;
 }
 function w(u) {
-  return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : he(u) && !pe(u) ? `uuid::${u.uuid}` : u;
+  return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : me(u) && !ye(u) ? `uuid::${u.uuid}` : u;
 }
 function Nt(u, t) {
   if (u == null || typeof u != "object") return u;
   if (Array.isArray(u)) return u.map((i) => Nt(i, t));
-  if (pe(u))
+  if (ye(u))
     return Object.fromEntries(Object.entries(u).map(([i, r]) => [i, Nt(r, t)]));
   if (u instanceof Set)
     return new Set(Array.from(u.values()).map((i) => Nt(i, t)));
@@ -34,30 +34,30 @@ function Nt(u, t) {
   const e = u;
   return t && e._type && e.constructor?.clone ? e.constructor.clone(u, t) : u;
 }
-function gr(...u) {
+function wr(...u) {
   for (const t of u)
     t.instances.length = 0;
 }
-function br() {
+function Nr() {
 }
-const Lt = /* @__PURE__ */ new Map();
-function De(u, t) {
-  t && t.isKlass && t.displayName && Lt.set(u, t);
+const _t = /* @__PURE__ */ new Map();
+function Fe(u, t) {
+  t && t.isKlass && t.displayName && _t.set(u, t);
 }
-function Rr() {
+function Tr() {
   const u = [];
-  return Array.from(Lt.entries()).forEach(([, t]) => {
+  return Array.from(_t.entries()).forEach(([, t]) => {
     t.instances && Array.isArray(t.instances) && t.stringify && u.push(...t.instances.map((e) => t.stringify(e)));
   }), `[${u.join(",")}]`;
 }
-function wr(u) {
+function vr(u) {
   const t = JSON.parse(u);
-  return Oe(t);
+  return Qe(t);
 }
-function Oe(u) {
+function Qe(u) {
   const t = /* @__PURE__ */ new Map();
   return u.forEach(({ type: e, options: i = {}, uuid: r, public: s }) => {
-    const a = Lt.get(e);
+    const a = _t.get(e);
     if (!a) {
       console.warn(`Class ${e} not found in KlassByName`);
       return;
@@ -66,10 +66,10 @@ function Oe(u) {
     t.set(r, o);
   }), t;
 }
-function Nr(u) {
+function Sr(u) {
   return console.warn("createClass is deprecated in refactored code"), null;
 }
-class Tr {
+class kr {
   static {
     this.isKlass = !0;
   }
@@ -92,9 +92,9 @@ class Tr {
   }
 }
 function v(u) {
-  return u?.uuid || de();
+  return u?.uuid || pe();
 }
-const Fe = /^[a-zA-Z0-9_]+$/;
+const Ve = /^[a-zA-Z0-9_]+$/;
 class C {
   // for Merged Entity
   constructor(t, e) {
@@ -115,7 +115,7 @@ class C {
         type: "string",
         required: !0,
         constraints: {
-          nameFormat: ({ name: t }) => Fe.test(t)
+          nameFormat: ({ name: t }) => Ve.test(t)
         }
       },
       properties: {
@@ -197,8 +197,8 @@ class C {
   }
 }
 var qt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(qt || {});
-const Qe = /^[a-zA-Z0-9_]+$/;
-class _t {
+const Le = /^[a-zA-Z0-9_]+$/;
+class Bt {
   constructor(t, e) {
     this._type = "Dictionary", this._options = e, this.uuid = v(e), this.name = t.name, this.type = t.type, this.collection = t.collection ?? !1, this.args = t.args, this.defaultValue = t.defaultValue, this.computation = t.computation;
   }
@@ -218,7 +218,7 @@ class _t {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: t }) => Qe.test(t),
+          format: ({ name: t }) => Le.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
@@ -252,7 +252,7 @@ class _t {
     };
   }
   static create(t, e) {
-    const i = new _t(t, e);
+    const i = new Bt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Dictionary`);
     return this.instances.push(i), i;
@@ -291,7 +291,7 @@ class _t {
     return this.create(e.public, e.options);
   }
 }
-const Ve = /^[a-zA-Z0-9_]+$/;
+const _e = /^[a-zA-Z0-9_]+$/;
 class T {
   constructor(t, e) {
     this._type = "Property", this._options = e, this.uuid = v(e), this.name = t.name, this.type = t.type, this.collection = t.collection, this.defaultValue = t.defaultValue, this.computed = t.computed, this.computation = t.computation;
@@ -311,7 +311,7 @@ class T {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: t }) => Ve.test(t),
+          format: ({ name: t }) => _e.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
@@ -557,7 +557,7 @@ class D {
     return this.create(e.public, e.options);
   }
 }
-class Bt {
+class Wt {
   constructor(t, e) {
     this._type = "Interaction", this._options = e, this.uuid = v(e), this.name = t.name, this.conditions = t.conditions, this.userAttributives = t.userAttributives, this.userRef = t.userRef, this.action = t.action, this.payload = t.payload, this.sideEffects = t.sideEffects || [], this.data = t.data, this.query = t.query;
   }
@@ -618,7 +618,7 @@ class Bt {
     };
   }
   static create(t, e) {
-    const i = new Bt(t, e);
+    const i = new Wt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Interaction`);
     return this.instances.push(i), i;
@@ -655,7 +655,7 @@ class Bt {
     return this.create(e.public, e.options);
   }
 }
-class Wt {
+class Jt {
   constructor(t, e) {
     this._type = "Activity", this._options = e, this.uuid = v(e), this.name = t.name, this.interactions = t.interactions || [], this.gateways = t.gateways || [], this.transfers = t.transfers || [], this.groups = t.groups || [], this.events = t.events || [];
   }
@@ -703,7 +703,7 @@ class Wt {
     };
   }
   static create(t, e) {
-    const i = new Wt(t, e);
+    const i = new Jt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Activity`);
     return this.instances.push(i), i;
@@ -804,7 +804,7 @@ class rt {
     return this.create(e.public, e.options);
   }
 }
-class fe {
+class ge {
   constructor(t, e) {
     this._type = "Transfer", this._options = e, this.uuid = v(e), this.name = t.name, this.source = t.source, this.target = t.target;
   }
@@ -837,7 +837,7 @@ class fe {
     };
   }
   static create(t, e) {
-    const i = new fe(t, e);
+    const i = new ge(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transfer`);
     return this.instances.push(i), i;
@@ -873,16 +873,16 @@ class fe {
     return this.create(e.public, e.options);
   }
 }
-function me(u, t, e) {
+function be(u, t, e) {
   u.interactions.forEach((i) => t(i, e)), u.groups.forEach((i) => {
-    i.activities?.forEach((r) => me(r, t, i));
+    i.activities?.forEach((r) => be(r, t, i));
   });
 }
-function vr(u) {
+function Ar(u) {
   const t = [];
-  return me(u, (e) => t.push(e)), t;
+  return be(u, (e) => t.push(e)), t;
 }
-function Sr(u) {
+function Er(u) {
   return null;
 }
 class ct {
@@ -1161,19 +1161,19 @@ class R {
     throw new Error(`invalid bool expression type: ${JSON.stringify(this.raw)}`);
   }
 }
-const Le = {
+const qe = {
   "&&": "and",
   "||": "or",
   "!": "not"
 };
-function qe(u) {
+function Be(u) {
   return { key: u };
 }
 function Tt(u, t, e) {
   if (u.type === "LogicalExpression")
     return {
       type: "expression",
-      operator: Le[u.operator],
+      operator: qe[u.operator],
       left: Tt(u.left, t, e),
       right: Tt(u.right, t, e)
     };
@@ -1190,8 +1190,8 @@ function Tt(u, t, e) {
     };
   throw new Error("unknown ast node type");
 }
-function kr(u, t = [], e = qe) {
-  const i = Pe(t, "name"), r = Ie(u, { ecmaVersion: 2020 });
+function Ir(u, t = [], e = Be) {
+  const i = Oe(t, "name"), r = Me(u, { ecmaVersion: 2020 });
   return new R(
     Tt(r.body[0].expression, i, e)
   );
@@ -1318,7 +1318,7 @@ class st {
     return this.create(e.public, e.options);
   }
 }
-function Dt(u) {
+function Ot(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return ct.create({
@@ -1329,16 +1329,16 @@ function Dt(u) {
   return lt.create({
     type: "expression",
     operator: t.operator,
-    left: Dt(u.left),
-    right: Dt(u.right)
+    left: Ot(u.left),
+    right: Ot(u.right)
   });
 }
-function Ar(u) {
+function Cr(u) {
   return st.create({
-    content: Dt(u)
+    content: Ot(u)
   });
 }
-class Jt {
+class jt {
   constructor(t, e) {
     this._type = "Condition", this._options = e, this.uuid = v(e), this.content = t.content, this.name = t.name;
   }
@@ -1364,7 +1364,7 @@ class Jt {
     };
   }
   static create(t, e) {
-    const i = new Jt(t, e);
+    const i = new jt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Condition`);
     return this.instances.push(i), i;
@@ -1398,7 +1398,7 @@ class Jt {
     return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
   }
 }
-class jt {
+class Ht {
   constructor(t, e) {
     this._type = "DataAttributive", this._options = e, this.uuid = v(e), this.content = t.content, this.name = t.name;
   }
@@ -1424,7 +1424,7 @@ class jt {
     };
   }
   static create(t, e) {
-    const i = new jt(t, e);
+    const i = new Ht(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataAttributive`);
     return this.instances.push(i), i;
@@ -1458,7 +1458,7 @@ class jt {
     return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
   }
 }
-class ye {
+class Re {
   constructor(t, e) {
     this._type = "QueryItem", this._options = e, this.uuid = v(e), this.name = t.name, this.value = t.value;
   }
@@ -1486,7 +1486,7 @@ class ye {
     };
   }
   static create(t, e) {
-    const i = new ye(t, e);
+    const i = new Re(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, QueryItem`);
     return this.instances.push(i), i;
@@ -1520,7 +1520,7 @@ class ye {
     return this.create(e.public, e.options);
   }
 }
-class ge {
+class we {
   constructor(t, e) {
     this._type = "Query", this._options = e, this.uuid = v(e), this.items = t.items;
   }
@@ -1543,7 +1543,7 @@ class ge {
     };
   }
   static create(t, e) {
-    const i = new ge(t, e);
+    const i = new we(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Query`);
     return this.instances.push(i), i;
@@ -1575,7 +1575,7 @@ class ge {
     return this.create(e.public, e.options);
   }
 }
-class It {
+class Ct {
   constructor(t, e) {
     this._type = "Action", this._options = e, this.uuid = v(e), this.name = t.name;
   }
@@ -1597,7 +1597,7 @@ class It {
     };
   }
   static create(t, e) {
-    const i = new It(t, e);
+    const i = new Ct(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Action`);
     return this.instances.push(i), i;
@@ -1629,7 +1629,7 @@ class It {
     return this.create(e.public, e.options);
   }
 }
-const _e = It.create({ name: "get" });
+const We = Ct.create({ name: "get" });
 class at {
   constructor(t, e) {
     this._type = "Gateway", this._options = e, this.uuid = v(e), this.name = t.name;
@@ -1684,7 +1684,7 @@ class at {
     return this.create(e.public, e.options);
   }
 }
-class Ht {
+class Ut {
   constructor(t, e) {
     this._type = "Event", this._options = e, this.uuid = v(e), this.name = t.name;
   }
@@ -1706,7 +1706,7 @@ class Ht {
     };
   }
   static create(t, e) {
-    const i = new Ht(t, e);
+    const i = new Ut(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Event`);
     return this.instances.push(i), i;
@@ -1801,7 +1801,7 @@ class Y {
     return this.create(e.public, e.options);
   }
 }
-class Ut {
+class Gt {
   constructor(t, e) {
     this._type = "StateTransfer", this._options = e, this.uuid = v(e), this.trigger = t.trigger, this.current = t.current, this.next = t.next, this.computeTarget = t.computeTarget;
   }
@@ -1839,7 +1839,7 @@ class Ut {
     };
   }
   static create(t, e) {
-    const i = new Ut(t, e);
+    const i = new Gt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateTransfer`);
     return this.instances.push(i), i;
@@ -2432,7 +2432,7 @@ class yt {
     return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class Ct {
+class xt {
   constructor(t, e) {
     this._type = "Transform", this._options = e, this.uuid = v(e), this.record = t.record, this.eventDeps = t.eventDeps, this.attributeQuery = t.attributeQuery, this.callback = t.callback;
   }
@@ -2465,7 +2465,7 @@ class Ct {
     };
   }
   static create(t, e) {
-    const i = new Ct(t, e);
+    const i = new xt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transform`);
     return this.instances.push(i), i;
@@ -2575,7 +2575,7 @@ class gt {
     return typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), typeof i.nextRecomputeTime == "string" && i.nextRecomputeTime.startsWith("func::") && (i.nextRecomputeTime = new Function("return " + i.nextRecomputeTime.substring(6))()), this.create(i, e.options);
   }
 }
-class Gt {
+class Kt {
   constructor(t, e) {
     this._type = "PayloadItem", this._options = e, this.uuid = v(e), this.name = t.name, this.attributives = t.attributives, this.base = t.base, this.isRef = t.isRef ?? !1, this.required = t.required ?? !1, this.isCollection = t.isCollection ?? !1, this.itemRef = t.itemRef;
   }
@@ -2626,7 +2626,7 @@ class Gt {
     };
   }
   static create(t, e) {
-    const i = new Gt(t, e);
+    const i = new Kt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, PayloadItem`);
     return this.instances.push(i), i;
@@ -2664,7 +2664,7 @@ class Gt {
     return this.create(e.public, e.options);
   }
 }
-class Kt {
+class Xt {
   constructor(t, e) {
     this._type = "Payload", this._options = e, this.uuid = v(e), this.items = t.items || [];
   }
@@ -2688,7 +2688,7 @@ class Kt {
     };
   }
   static create(t, e) {
-    const i = new Kt(t, e);
+    const i = new Xt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Payload`);
     return this.instances.push(i), i;
@@ -2720,7 +2720,7 @@ class Kt {
     return this.create(e.public, e.options);
   }
 }
-class Xt {
+class Yt {
   constructor(t, e) {
     this._type = "SideEffect", this._options = e, this.uuid = v(e), this.name = t.name, this.handle = t.handle;
   }
@@ -2748,7 +2748,7 @@ class Xt {
     };
   }
   static create(t, e) {
-    const i = new Xt(t, e);
+    const i = new Yt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, SideEffect`);
     return this.instances.push(i), i;
@@ -2782,7 +2782,7 @@ class Xt {
     return i.handle && typeof i.handle == "string" && i.handle.startsWith("func::") && (i.handle = new Function("return " + i.handle.substring(6))()), this.create(i, e.options);
   }
 }
-function Ot(u) {
+function Ft(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return ct.create({
@@ -2793,13 +2793,13 @@ function Ot(u) {
   return lt.create({
     type: "expression",
     operator: t.operator,
-    left: Ot(u.left),
-    right: Ot(u.right)
+    left: Ft(u.left),
+    right: Ft(u.right)
   });
 }
-class xt {
+class Mt {
   constructor(t, e) {
-    this._type = "Conditions", this._options = e, this.uuid = v(e), t.content && t.content instanceof R ? this.content = Ot(t.content) : this.content = t.content;
+    this._type = "Conditions", this._options = e, this.uuid = v(e), t.content && t.content instanceof R ? this.content = Ft(t.content) : this.content = t.content;
   }
   static {
     this.isKlass = !0;
@@ -2820,7 +2820,7 @@ class xt {
     };
   }
   static create(t, e) {
-    const i = new xt(t, e);
+    const i = new Mt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Conditions`);
     return this.instances.push(i), i;
@@ -2851,7 +2851,7 @@ class xt {
     return this.create(e.public, e.options);
   }
 }
-class Yt {
+class zt {
   constructor(t, e) {
     this._type = "DataAttributives", this._options = e, this.uuid = v(e), this.content = t.content;
   }
@@ -2874,7 +2874,7 @@ class Yt {
     };
   }
   static create(t, e) {
-    const i = new Yt(t, e);
+    const i = new zt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataAttributives`);
     return this.instances.push(i), i;
@@ -2905,20 +2905,20 @@ class Yt {
     return this.create(e.public, e.options);
   }
 }
-const Be = [
+const Je = [
   C,
   D,
   T,
-  Bt,
   Wt,
-  J,
   Jt,
+  J,
   jt,
-  It,
-  at,
   Ht,
-  Y,
+  Ct,
+  at,
   Ut,
+  Y,
+  Gt,
   ut,
   dt,
   ht,
@@ -2926,21 +2926,21 @@ const Be = [
   ft,
   mt,
   yt,
-  Ct,
+  xt,
   gt,
-  Gt,
   Kt,
   Xt,
-  _t,
+  Yt,
+  Bt,
   ct,
   lt,
-  xt,
-  Yt
+  Mt,
+  zt
 ];
-Be.forEach((u) => {
-  u && u.displayName && De(u.displayName, u);
+Je.forEach((u) => {
+  u && u.displayName && Fe(u.displayName, u);
 });
-class zt {
+class Zt {
   constructor(t, e) {
     this._type = "Custom", this._options = e, this.uuid = v(e), this.name = t.name, this.dataDeps = t.dataDeps, this.compute = t.compute, this.incrementalCompute = t.incrementalCompute, this.incrementalPatchCompute = t.incrementalPatchCompute, this.createState = t.createState, this.getDefaultValue = t.getDefaultValue, this.asyncReturn = t.asyncReturn, this.useLastValue = t.useLastValue;
   }
@@ -3003,7 +3003,7 @@ class zt {
     };
   }
   static create(t, e) {
-    const i = new zt(t, e);
+    const i = new Zt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Custom`);
     return this.instances.push(i), i;
@@ -3047,7 +3047,7 @@ class zt {
     }), this.create(i, e.options);
   }
 }
-class be {
+class Ne {
   constructor(t = [], e = []) {
     this.clonedEntities = /* @__PURE__ */ new Map(), this.clonedRelations = /* @__PURE__ */ new Map(), this.reverseEntityMap = /* @__PURE__ */ new Map(), this.reverseRelationMap = /* @__PURE__ */ new Map(), this.originalEntities = [...t], this.originalRelations = [...e], (t.length > 0 || e.length > 0) && this.initializeClones();
   }
@@ -3258,7 +3258,7 @@ class be {
     return null;
   }
 }
-function Er({ name: u, isRef: t = !1 }, e) {
+function xr({ name: u, isRef: t = !1 }, e) {
   return J.create({
     name: u,
     content: u ? new Function("user", `return user.roles.includes('${u}')`) : function() {
@@ -3271,7 +3271,7 @@ function g(u, t) {
   if (!u)
     throw new Error(t);
 }
-function $t(u, t, e) {
+function Pt(u, t, e) {
   const i = [...t];
   let r = u, s;
   const a = i.pop();
@@ -3415,7 +3415,7 @@ class m {
     const a = this.map.getRecordInfo(t);
     this.entityName = a.isFilteredEntity || a.isFilteredRelation ? a.baseRecordName : t;
     const o = a.isFilteredEntity || a.isFilteredRelation;
-    this.xToOneQueryTree = new q(this.entityName, this.map);
+    this.xToOneQueryTree = new _(this.entityName, this.map);
     let n = i;
     o && (n = i ? a.matchExpression.and(i) : a.matchExpression), n && (this.data = this.convertFilteredRelation(n), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
@@ -3463,8 +3463,8 @@ class m {
         const n = [...a.resolvedPath, o], c = this.map.getInfoByPath(n), l = a.resolvedPath.concat(c?.isLinkFiltered() ? c.getBaseAttributeInfo().attributeName : o);
         let d = a.matchExpression;
         if (c?.isLinkFiltered()) {
-          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), b = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], S = p.rebase(b.join("."));
-          d = d ? d.and(S) : S;
+          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), b = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], k = p.rebase(b.join("."));
+          d = d ? d.and(k) : k;
         }
         return {
           path: [...a.path, o],
@@ -3603,7 +3603,7 @@ class m {
     return new m(i, this.map, a, this.contextRootEntity, this.fromRelation);
   }
 }
-class We {
+class je {
   constructor(t, e, i, r) {
     this.recordName = t, this.map = e, this.data = i, this.fromRelation = r;
   }
@@ -3639,7 +3639,7 @@ class M {
       e,
       N,
       new x(h, e, i.attributeQuery || [], s, a),
-      new We(h, e, i.modifier),
+      new je(h, e, i.modifier),
       r,
       s,
       a,
@@ -3678,7 +3678,7 @@ class M {
     );
   }
 }
-class q {
+class _ {
   // 父节点和自己这个几点 link 上的 query
   constructor(t, e, i, r, s, a, o) {
     this.recordName = t, this.map = e, this.parentRecord = i, this.attributeName = r, this.data = s, this.parent = a, this.parentLinkQueryTree = o, this.fields = [], g(!!t, "recordName cannot be empty"), this.fields = s?.fields || [], this.records = s?.records || {}, i && (this.info = this.map.getInfo(this.parentRecord, this.attributeName));
@@ -3688,26 +3688,26 @@ class q {
     if (t.length === 1)
       this.fields.push(e);
     else if (e === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
     else {
       const r = this.map.getInfo(this.recordName, e);
-      this.records[e] || (this.records[e] = new q(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
+      this.records[e] || (this.records[e] = new _(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
     }
   }
   addRecord(t, e) {
     const [i, ...r] = t;
     if (t.length === 1)
       if (i === f)
-        this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
+        this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
       else {
-        const s = this.map.getInfo(this.recordName, i), a = e || new q(s.recordName, this.map, this.recordName, i, void 0, this);
+        const s = this.map.getInfo(this.recordName, i), a = e || new _(s.recordName, this.map, this.recordName, i, void 0, this);
         this.records[i] = this.records[i] ? this.records[i].merge(a) : a;
       }
     else if (i === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
     else {
       const s = this.map.getInfo(this.recordName, i);
-      this.records[i] = new q(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
+      this.records[i] = new _(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
     }
   }
   forEachRecords(t) {
@@ -3722,7 +3722,7 @@ class q {
       this.records[a] && t.records[a] ? r[a] = this.records[a].merge(t.records[a]) : this.records[a] ? r[a] = this.records[a] : r[a] = t.records[a];
     });
     let s;
-    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new q(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
+    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new _(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
   }
   getData() {
     const t = {
@@ -3733,7 +3733,7 @@ class q {
     }), this.parentLinkQueryTree && (t[f] = this.parentLinkQueryTree.getData()), t;
   }
 }
-const f = "&", Je = "*";
+const f = "&", He = "*";
 class x {
   constructor(t, e, i = [], r, s, a) {
     this.recordName = t, this.map = e, this.data = i, this.parentRecord = r, this.attributeName = s, this.shouldQueryParentLinkData = a, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [], this.id = Math.random();
@@ -3746,7 +3746,7 @@ class x {
         this.parentLinkRecordQuery = M.create(y.linkName, this.map, d, void 0);
         return;
       }
-      if (l === Je) {
+      if (l === He) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
         return;
       }
@@ -3755,10 +3755,10 @@ class x {
         let y = l, N = d;
         if (p.isLinkFiltered()) {
           y = p.getBaseAttributeInfo().attributeName;
-          const S = d.matchExpression, F = p.getLinkInfo().getBaseLinkInfo(), re = new m(F.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Ee = S ? re.and(S.data) : re;
+          const k = d.matchExpression, F = p.getLinkInfo().getBaseLinkInfo(), se = new m(F.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), xe = k ? se.and(k.data) : se;
           N = {
             ...d,
-            matchExpression: Ee.data
+            matchExpression: xe.data
           };
         }
         const b = M.create(p.recordName, this.map, N, void 0, this.recordName, y, h, !1, l);
@@ -3855,7 +3855,7 @@ class x {
     return this.buildXToOneQueryTree();
   }
   buildXToOneQueryTree() {
-    const t = new q(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new _(this.recordName, this.map, this.parentRecord, this.attributeName);
     if (this.data.forEach((e) => {
       Array.isArray(e) || t.addField([e]);
     }), this.xToOneRecords.forEach((e) => {
@@ -3867,7 +3867,7 @@ class x {
     return t;
   }
   buildFullQueryTree() {
-    const t = new q(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new _(this.recordName, this.map, this.parentRecord, this.attributeName);
     return this.relatedRecords.forEach((e) => {
       t.addRecord([e.attributeName], e.attributeQuery.fullQueryTree);
     }), t;
@@ -3876,7 +3876,7 @@ class x {
     return this.parentLinkRecordQuery ? new x(this.recordName, this.map, this.data, this.parentRecord, this.attributeName, !0) : this;
   }
 }
-function je(u) {
+function Ue(u) {
   const t = [];
   return u.forEach((e) => t.push(...Array.isArray(e) ? e : [e])), t;
 }
@@ -3886,7 +3886,7 @@ class L {
     const s = this.map.getRecordInfo(e);
     this.recordName = s.isFilteredEntity || s.isFilteredRelation ? s.resolvedBaseRecordName : e;
     const [a, o, n] = this.map.groupAttributes(this.recordName, i ? Object.keys(i) : []);
-    this.relatedEntitiesData = je(o.map(
+    this.relatedEntitiesData = Ue(o.map(
       (l) => Array.isArray(i[l.attributeName]) ? i[l.attributeName].map((d) => new L(this.map, l.recordName, d, l)) : new L(this.map, l.recordName, i[l.attributeName], l)
     )), this.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
@@ -3963,7 +3963,7 @@ class L {
     }), i;
   }
 }
-class He {
+class Ge {
   constructor(t, e) {
     this.map = t, this.queryAgent = e, this.dependencies = /* @__PURE__ */ new Map();
   }
@@ -4189,7 +4189,7 @@ class He {
     }
   }
 }
-class Ue {
+class Ke {
   constructor() {
     this.aliasToPath = /* @__PURE__ */ new Map(), this.pathStrToAlias = /* @__PURE__ */ new Map(), this.aliasPlaceholder = 0;
   }
@@ -4203,7 +4203,7 @@ class Ue {
     return this.aliasToPath.get(t);
   }
 }
-const Re = ":root";
+const Te = ":root";
 class St {
   constructor(t, e, i = []) {
     this.label = t, this.parent = e, this.stack = i;
@@ -4218,9 +4218,9 @@ class St {
     return new St(t, this);
   }
 }
-class Ge {
+class Xe {
   constructor(t) {
-    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Re, t), this.recursiveSaveLabelledRecordQuery(t);
+    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Te, t), this.recursiveSaveLabelledRecordQuery(t);
   }
   recursiveSaveLabelledRecordQuery(t) {
     t.attributeQuery?.relatedRecords.forEach((e) => {
@@ -4234,9 +4234,9 @@ class Ge {
     return this.recordQueryByName.get(t);
   }
 }
-class Ke {
+class Ye {
   constructor(t, e) {
-    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new He(t, this), this.initializeFilteredEntityDependencies();
+    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new Ge(t, this), this.initializeFilteredEntityDependencies();
   }
   /**
    * 初始化所有 filtered entity 的依赖关系
@@ -4288,15 +4288,15 @@ ${b}
       const s = {};
       return Object.entries(r).forEach(([a, o]) => {
         const n = i.getPath(a).slice(1, 1 / 0);
-        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && $t(s, n, o);
+        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && Pt(s, n, o);
       }), s;
     });
   }
   // 查 entity 和 查 relation 都是一样的。具体在 entityQuery 里面区别。
   // TODO 为了性能，也可以把信息丢到客户端，然客户端去结构化？？？
   // CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
-  async findRecords(t, e = "", i, r = new St(Re)) {
-    if (i || (i = new Ge(t)), t.goto) {
+  async findRecords(t, e = "", i, r = new St(Te)) {
+    if (i || (i = new Xe(t)), t.goto) {
       if (t.exit && await t.exit(r))
         return [];
       const l = i.get(t.goto);
@@ -4329,17 +4329,17 @@ ${b}
         for (let h of d.attributeQuery.xToManyRecords) {
           const y = this.map.getInfo(h.parentRecord, h.attributeName).getReverseInfo()?.attributeName;
           for (let N of n) {
-            const b = N[l.attributeName][f].id, S = h.derive({
+            const b = N[l.attributeName][f].id, k = h.derive({
               matchExpression: h.matchExpression.and({
                 key: `${y}.id`,
                 value: ["=", b]
               })
             }), F = t.label ? c.concat(N) : c;
-            $t(
+            Pt(
               N,
               [l.alias || l.attributeName, f, h.attributeName],
               await this.findRecords(
-                S,
+                k,
                 `finding relation data: ${t.recordName}.${l.attributeName}.&.${h.attributeName}`,
                 i,
                 F
@@ -4410,21 +4410,21 @@ ${b}
       matchExpression: c,
       attributeQuery: l
     }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, s, a), p = r.attributeQuery.parentLinkRecordQuery ? h.map((b) => {
-      let S;
-      return o.isLinkManyToManySymmetric() ? (S = {
+      let k;
+      return o.isLinkManyToManySymmetric() ? (k = {
         ...b,
         [f]: b[`${n}:source`]?.[f]?.id ? b[`${n}:source`]?.[f] : b[`${n}:target`]?.[f]
-      }, delete S[`${n}:source`], delete S[`${n}:target`]) : (S = {
+      }, delete k[`${n}:source`], delete k[`${n}:target`]) : (k = {
         ...b,
         [f]: b[n][f]
-      }, delete S[n]), S;
+      }, delete k[n]), k;
     }) : h, y = d.label && d.label !== a.label ? a.spawn(d.label) : a, N = r.attributeQuery.parentLinkRecordQuery;
     if (N)
       for (let b of N.attributeQuery.xToManyRecords)
-        for (let S of p) {
-          const F = S[f].id, ie = d.label ? y.concat(S) : y;
-          $t(
-            S,
+        for (let k of p) {
+          const F = k[f].id, re = d.label ? y.concat(k) : y;
+          Pt(
+            k,
             [f, b.attributeName],
             await this.findXToManyRelatedRecords(
               b.parentRecord,
@@ -4432,7 +4432,7 @@ ${b}
               F,
               b,
               s,
-              ie
+              re
             )
           );
         }
@@ -4474,23 +4474,23 @@ ${b}
             joinTarget: [d, h]
           });
         } else {
-          const b = c.getLinkInfo(), S = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : b.isRelationSource(c.parentEntityName, c.attributeName);
+          const b = c.getLinkInfo(), k = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : b.isRelationSource(c.parentEntityName, c.attributeName);
           r.push({
             for: l,
             joinSource: a,
             // CAUTION sourceField 是用在合并了情况里面的，指的是 target 在 source 里面的名字！所以这里不能用
-            joinIdField: [s, S ? b.record.attributes.source.field : b.record.attributes.target.field],
+            joinIdField: [s, k ? b.record.attributes.source.field : b.record.attributes.target.field],
             joinTarget: [p, y]
           }), o.onlyIdField() || r.push({
             for: l,
             joinSource: [p, y],
-            joinIdField: [S ? b.record.attributes.target.field : b.record.attributes.source.field, N],
+            joinIdField: [k ? b.record.attributes.target.field : b.record.attributes.source.field, N],
             joinTarget: [d, h]
           });
         }
       if (r.push(...this.getJoinTables(o, l, [N, d, h])), o.parentLinkQueryTree, o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
-        const b = l.concat(f), [, S] = this.map.getTableAliasAndFieldName(b, "id", !0), F = [
-          S,
+        const b = l.concat(f), [, k] = this.map.getTableAliasAndFieldName(b, "id", !0), F = [
+          k,
           // link 的 idField
           p,
           // link 的 tableName
@@ -4505,7 +4505,7 @@ ${b}
     return t ? `${t}___` : "";
   }
   buildSelectClause(t, e = "") {
-    const i = new Ue();
+    const i = new Ke();
     return t.length ? [t.map(({ tableAliasAndField: s, attribute: a, nameContext: o }) => {
       const n = [
         `${this.withPrefix(e)}${o[0]}`,
@@ -5077,9 +5077,9 @@ WHERE "${s.idField}" = ${l()}
     return p ? [N, ...p] : void 0;
   }
 }
-class Xe {
+class ze {
   constructor(t, e) {
-    this.map = t, this.database = e, this.agent = new Ke(t, e);
+    this.map = t, this.database = e, this.agent = new Ye(t, e);
   }
   async findOne(t, e, i = {}, r) {
     const s = {
@@ -5340,7 +5340,7 @@ class kt {
     return g(this.isFilteredRelation(), "only filtered relation can get resolved record name"), this.data.resolvedBaseRecordName;
   }
 }
-class Ye {
+class Ze {
   constructor(t) {
     this.data = t;
   }
@@ -5411,14 +5411,14 @@ class Ye {
     for (let h = 0; h < i.length; h++) {
       const [p, y] = this.getAttributeAndSymmetricDirection(i[h]), N = [e, ...i.slice(0, h + 1)];
       if (p === f) {
-        const { linkTable: b, linkAlias: S, path: F } = d.pop();
-        g(!c, `last attribute in path is a link, cannot read link of a link ${F.join(".")}`), s = b, a = S, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
+        const { linkTable: b, linkAlias: k, path: F } = d.pop();
+        g(!c, `last attribute in path is a link, cannot read link of a link ${F.join(".")}`), s = b, a = k, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
       } else {
         l = this.getInfoByPath(N);
         const b = r.attributes[p];
         g(l.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
-        const S = this.data.records[b.recordName], F = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`;
-        l.isMergedWithParent() || l.isLinkMergedWithParent() ? n = a : l.isLinkIsolated() ? n = `REL_${F}` : n = F, l.isMergedWithParent() || (a = F), s = l.table, r = S, o = l.getLinkInfo()?.table, c = !1;
+        const k = this.data.records[b.recordName], F = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`;
+        l.isMergedWithParent() || l.isLinkMergedWithParent() ? n = a : l.isLinkIsolated() ? n = `REL_${F}` : n = F, l.isMergedWithParent() || (a = F), s = l.table, r = k, o = l.getLinkInfo()?.table, c = !1;
       }
       d.push({
         table: s,
@@ -5536,7 +5536,7 @@ class Ye {
     return r.join(".");
   }
 }
-function ze(u) {
+function ti(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u)
     if (e.inputEntities)
@@ -5547,7 +5547,7 @@ function ze(u) {
     }
   return t;
 }
-function Ze(u) {
+function ei(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u) {
     const i = e.name || `${e.source.name}_${e.sourceProperty}_${e.targetProperty}_${e.target.name}`;
@@ -5561,36 +5561,36 @@ function Ze(u) {
   }
   return t;
 }
-function ti(u, t) {
-  const e = new be(u, t), i = ze(u), r = Ze(t);
-  return ae(
+function ii(u, t) {
+  const e = new Ne(u, t), i = ti(u), r = ei(t);
+  return oe(
     u,
     e,
     i,
     "entity"
-  ), ae(
+  ), oe(
     t,
     e,
     r,
     "relation"
   ), e.getAll();
 }
-function ae(u, t, e, i) {
+function oe(u, t, e, i) {
   const r = u.filter((s) => {
     const a = Rt(s);
     return a && a.length > 0;
   });
   if (r.length !== 0)
     for (const s of r)
-      ei(
+      ri(
         s,
         t,
         i,
         e
       );
 }
-function ei(u, t, e, i) {
-  const r = e === "entity", a = `__${z(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = oi(
+function ri(u, t, e, i) {
+  const r = e === "entity", a = `__${z(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = ci(
     o,
     a,
     i,
@@ -5600,7 +5600,7 @@ function ei(u, t, e, i) {
   const l = Rt(u);
   if (l)
     for (const d of l)
-      ii(
+      si(
         d,
         c,
         a,
@@ -5608,8 +5608,8 @@ function ei(u, t, e, i) {
         r
       );
 }
-function ii(u, t, e, i, r) {
-  const [s, a] = ni(
+function si(u, t, e, i, r) {
+  const [s, a] = li(
     u,
     t,
     e
@@ -5619,7 +5619,7 @@ function ii(u, t, e, i, r) {
   const o = z(a), n = r ? i.getEntityByName(o) : i.getRelationByName(o);
   n && i.replace(s, n);
 }
-function ri(u, t) {
+function ai(u, t) {
   const e = /* @__PURE__ */ new Map(), i = Rt(u);
   if (i && i.length > 0)
     for (const r of i) {
@@ -5633,8 +5633,8 @@ function ri(u, t) {
     }
   return e;
 }
-function si(u, t, e) {
-  const i = ri(t, e);
+function oi(u, t, e) {
+  const i = ai(t, e);
   return T.create({
     name: u,
     type: "json",
@@ -5646,14 +5646,14 @@ function si(u, t, e) {
     }
   });
 }
-function ai(u, t, e) {
+function ni(u, t, e) {
   const i = Rt(u), r = [], s = /* @__PURE__ */ new Map(), a = {};
   for (const o of i) {
     let n = o;
     if (bt(n))
       for (; n.baseEntity && n.properties.length === 0; )
         n = n.baseEntity;
-    else if (li(n))
+    else if (di(n))
       for (; n.baseRelation && n.properties.length === 0; )
         n = n.baseRelation;
     const c = Object.fromEntries(n.properties.map((h) => [h.name, h]));
@@ -5683,13 +5683,13 @@ function ai(u, t, e) {
   }
   return r;
 }
-function oi(u, t, e, i) {
-  const r = si(
+function ci(u, t, e, i) {
+  const r = oi(
     t,
     u,
     e
   ), s = [
-    ...ai(
+    ...ni(
       u,
       e,
       i
@@ -5747,7 +5747,7 @@ function oi(u, t, e, i) {
     return [o, n || o];
   }
 }
-function ni(u, t, e) {
+function li(u, t, e) {
   if (bt(u)) {
     const i = u, r = t;
     let s = i;
@@ -5761,7 +5761,7 @@ function ni(u, t, e) {
     }), [a, s];
   } else {
     const i = u, r = t, s = z(i);
-    return i.baseRelation ? [i, ci(i)] : [D.create({
+    return i.baseRelation ? [i, ui(i)] : [D.create({
       name: s,
       baseRelation: r,
       sourceProperty: i.sourceProperty,
@@ -5773,7 +5773,7 @@ function ni(u, t, e) {
     }), i];
   }
 }
-function ci(u) {
+function ui(u) {
   let t = u;
   for (; t.baseRelation; )
     t = t.baseRelation;
@@ -5782,7 +5782,7 @@ function ci(u) {
 function bt(u) {
   return "inputEntities" in u || !("sourceProperty" in u);
 }
-function li(u) {
+function di(u) {
   return "sourceProperty" in u;
 }
 function Rt(u) {
@@ -5791,7 +5791,7 @@ function Rt(u) {
 function z(u) {
   return bt(u), u.name;
 }
-class ui {
+class hi {
   constructor(t, e, i, r = []) {
     this.entities = t, this.relations = e, this.database = i, this.mergeLinks = r, this.fieldNameMap = /* @__PURE__ */ new Map(), this.usedFieldNames = /* @__PURE__ */ new Set(), this.fieldCounter = 1, this.recordToTableMap = /* @__PURE__ */ new Map(), this.tableToRecordsMap = /* @__PURE__ */ new Map(), this.mergeLog = [], this.tables = {}, this.map = { links: {}, records: {} }, this.buildMap(), this.buildTables();
   }
@@ -6070,7 +6070,7 @@ class ui {
    * 统一处理 merged entities 和 merged relations
    */
   processMergedItems() {
-    const t = ti(
+    const t = ii(
       this.entities,
       this.relations
     );
@@ -6087,9 +6087,9 @@ class ui {
           p[0] === "1" && p[1] === "1" && y !== N,
           `only 1:1 can merge: ${s}.${a.slice(0, n + 1).join(".")}`
         );
-        const b = y === o ? N : y, S = this.combineRecordTable(o, b, d);
-        if (S)
-          throw new Error(`conflict found when join ${d}, ${S.join(",")} already merged with ${o}`);
+        const b = y === o ? N : y, k = this.combineRecordTable(o, b, d);
+        if (k)
+          throw new Error(`conflict found when join ${d}, ${k.join(",")} already merged with ${o}`);
         h.mergedTo = "combined", i.push(h), o = l.recordName, delete t[d], delete e[d];
       }
     }), Object.values(t).forEach((r) => {
@@ -6189,28 +6189,28 @@ class A {
     this.skip = () => new At();
   }
   static {
-    this.resolved = (t, e) => new Te(t, e);
+    this.resolved = (t, e) => new ke(t, e);
   }
   static {
-    this.async = (t) => new Ne(t);
+    this.async = (t) => new Se(t);
   }
   static {
-    this.fullRecompute = (t) => new we(t);
+    this.fullRecompute = (t) => new ve(t);
   }
 }
 class At extends A {
 }
-class we extends A {
+class ve extends A {
   constructor(t) {
     super(), this.reason = t;
   }
 }
-class Ne extends A {
+class Se extends A {
   constructor(t) {
     super(), this.args = t;
   }
 }
-class Te extends A {
+class ke extends A {
   constructor(t, e) {
     super(), this.result = t, this.args = e;
   }
@@ -6241,18 +6241,18 @@ class B {
     return await this.controller.system.storage.dict.get(this.key);
   }
 }
-function Ft(u, t) {
+function Qt(u, t) {
   if (t == null || u === t) return !0;
   if (typeof t != "object" || t === null)
     return u === t;
   if (typeof u != "object" || u === null)
     return !1;
   for (const e in t)
-    if (!(e in u) || !Ft(u[e], t[e]))
+    if (!(e in u) || !Qt(u[e], t[e]))
       return !1;
   return !0;
 }
-class ve {
+class Ae {
   constructor(t) {
     this.data = t, this.map = {};
     for (const e of t.transfers)
@@ -6265,45 +6265,45 @@ class ve {
     const i = this.map[t];
     if (i) {
       for (const r of i)
-        if (Ft(e, r.trigger))
+        if (Qt(e, r.trigger))
           return r.next;
     }
     return null;
   }
   findTransfers(t) {
-    return this.data.transfers.filter((e) => Ft(t, e.trigger));
+    return this.data.transfers.filter((e) => Qt(t, e.trigger));
   }
 }
-function k(u, t) {
+function S(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Ir(u, t) {
+function Mr(u, t) {
   return new Map(Array.from(u.entries()).map(([e, i]) => [e, t(e, i)]));
 }
-function Cr(u, t) {
+function $r(u, t) {
   return Object.fromEntries(Object.entries(u).map(([e, i]) => [e, t(e, i)]));
 }
-async function xr(u, t) {
+async function Pr(u, t) {
   for (let e of u)
     if (!await t(e)) return !1;
   return !0;
 }
-async function di(u, t) {
+async function pi(u, t) {
   for (let e of u)
     if (await t(e)) return !0;
   return !1;
 }
-async function oe(u, t) {
+async function ne(u, t) {
   for (let e of u) {
     const i = await t(e);
     if (i !== !0) return i;
   }
   return !0;
 }
-class hi {
+class fi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ve(this.args), this.defaultState = this.args.defaultState;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new Ae(this.args), this.defaultState = this.args.defaultState;
     for (const r of this.args.transfers) {
       const s = `${r.trigger.recordName}_${r.trigger.type}`;
       this.eventDeps[s] = {
@@ -6332,9 +6332,9 @@ class hi {
     return s ? (await this.state.currentState.set(s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : A.skip();
   }
 }
-class pi {
+class mi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ve(this.args), this.defaultState = this.args.defaultState, this.dataContext = i;
+    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new Ae(this.args), this.defaultState = this.args.defaultState, this.dataContext = i;
     for (const r of this.args.transfers) {
       const s = `${r.trigger.recordName}_${r.trigger.type}`;
       this.eventDeps[s] = {
@@ -6357,7 +6357,7 @@ class pi {
   // 这里的 defaultValue 不能是 async 的模式。因为是直接创建时填入的。
   getDefaultValue(t) {
     const e = t[this.dataContext.id.name];
-    return k(
+    return S(
       !(e !== void 0 && !this.defaultState.computeValue),
       `${this.dataContext.host.name}.${this.dataContext.id.name} have been set when ${this.dataContext.host.name} created, 
 if you want to save the use the initial value, you need to define computeValue in defaultState to save it.
@@ -6374,17 +6374,17 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     return s ? (await this.state.currentState.set(i, s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : A.skip();
   }
 }
-const Mr = Y.create({
+const Dr = Y.create({
   name: "nonExistent",
   computeValue: () => null
-}), $r = Y.create({
+}), Or = Y.create({
   name: "nonDeleted",
   computeValue: () => !1
-}), Pr = Y.create({
+}), Fr = Y.create({
   name: "deleted",
   computeValue: () => !0
-}), fi = [hi, pi];
-class mi {
+}), yi = [fi, mi];
+class gi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.record = this.args.record, this.dataDeps = {
       main: {
@@ -6437,9 +6437,9 @@ class mi {
     return i;
   }
 }
-class yi {
+class bi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), k(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), S(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -6513,8 +6513,8 @@ class yi {
     return s;
   }
 }
-const gi = [mi, yi];
-class bi {
+const Ri = [gi, bi];
+class wi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6567,9 +6567,9 @@ class bi {
     return a === s;
   }
 }
-class Ri {
+class Ni {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -6641,8 +6641,8 @@ class Ri {
     return a === o;
   }
 }
-const wi = [bi, Ri];
-class Ni {
+const Ti = [wi, Ni];
+class vi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6695,14 +6695,14 @@ class Ni {
     return s > 0;
   }
 }
-class Ti {
+class Si {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), k(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), S(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
     let r = this.relation.baseRelation || this.relation;
     for (; r.baseRelation; )
       r = r.baseRelation;
     const s = r.type.split(":");
-    k(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    S(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const a = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((n) => n[0] !== f) || [];
     const o = (a.find((n) => n[0] === f) || [])[1]?.attributeQuery;
@@ -6771,8 +6771,8 @@ class Ti {
     return s > 0;
   }
 }
-const vi = [Ni, Ti];
-class Si {
+const ki = [vi, Si];
+class Ai {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, this.callback = this.args.callback?.bind(this) || (() => !0), this.dataDeps = {
       main: {
@@ -6822,9 +6822,9 @@ class Si {
     return s = Math.max(0, s), await this.state.count.set(s), s;
   }
 }
-class ki {
+class Ei {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((a) => a && a[0] !== f) || [];
     const s = (r.find((a) => a && a[0] === f) || [])[1]?.attributeQuery;
@@ -6904,19 +6904,20 @@ class ki {
     return a;
   }
 }
-const Ai = [Si, ki];
-class Ei {
+const Ii = [Ai, Ei];
+class Ci {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, k(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), this.transformCallback = this.args.callback.bind(this.controller), this.args.eventDeps ? this.eventDeps = this.args.eventDeps : this.dataDeps = {
-      main: {
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, S(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), S(!(this.args.dataDeps && this.args.eventDeps), "Transform must have either dataDeps or eventDeps"), this.transformCallback = this.args.callback.bind(this.controller), this.args.eventDeps ? this.eventDeps = this.args.eventDeps : (S(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
+      ...this.args.dataDeps || {},
+      _source: {
         type: "records",
         source: this.args.record,
         attributeQuery: this.args.attributeQuery || ["*"]
       }
-    };
+    });
   }
   static {
-    this.computationType = Ct;
+    this.computationType = xt;
   }
   static {
     this.contextType = ["entity", "relation"];
@@ -6930,8 +6931,8 @@ class Ei {
   getDefaultValue() {
     return [];
   }
-  async compute({ main: t }) {
-    k(!this.eventDeps, "Transform compute should not be called with eventDeps");
+  async compute({ _source: t }) {
+    S(!this.eventDeps, "Transform compute should not be called with eventDeps");
     const e = [];
     for (const i of t) {
       const r = await this.transformCallback.call(this.controller, i);
@@ -6946,7 +6947,7 @@ class Ei {
     return e;
   }
   async computeDirtyRecords(t) {
-    return k(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
+    return S(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
   }
   async incrementalPatchCompute(t, e) {
     return this.eventDeps ? this.eventBasedIncrementalPatchCompute(t, e) : this.dataBasedIncrementalPatchCompute(t, e);
@@ -6967,7 +6968,7 @@ class Ei {
   async dataBasedIncrementalPatchCompute(t, e) {
     const i = this.dataContext, r = [];
     if (e.type === "create") {
-      const s = m.atom({ key: "id", value: ["=", e.record.id] }), a = this.dataDeps.main, o = await this.controller.system.storage.findOne(a.source.name, s, void 0, a.attributeQuery), n = await this.transformCallback.call(this.controller, o);
+      const s = m.atom({ key: "id", value: ["=", e.record.id] }), a = this.dataDeps._source, o = await this.controller.system.storage.findOne(a.source.name, s, void 0, a.attributeQuery), n = await this.transformCallback.call(this.controller, o);
       (Array.isArray(n) ? n : [n]).forEach((l, d) => {
         l && r.push({
           type: "insert",
@@ -6982,7 +6983,7 @@ class Ei {
       const s = e.oldRecord?.id ?? e.record.id, a = m.atom({ key: this.state.sourceRecordId.key, value: ["=", s] }), n = (await this.controller.system.storage.find(i.id.name, a, void 0, ["*"])).reduce((l, d) => (l[d[this.state.transformIndex.key]] = d, l), {});
       let c = [];
       if (e.type === "update") {
-        const l = m.atom({ key: "id", value: ["=", s] }), d = await this.controller.system.storage.findOne(this.dataDeps.main.source.name, l, void 0, this.dataDeps.main.attributeQuery), h = await this.transformCallback.call(this.controller, d);
+        const l = m.atom({ key: "id", value: ["=", s] }), d = await this.controller.system.storage.findOne(this.dataDeps._source.source.name, l, void 0, this.dataDeps._source.attributeQuery), h = await this.transformCallback.call(this.controller, d);
         c = Array.isArray(h) ? h : [h];
       }
       c.forEach((l, d) => {
@@ -7012,7 +7013,7 @@ class Ei {
     return r;
   }
 }
-const Ii = [Ei];
+const xi = [Ci];
 class P {
   constructor(t) {
     this.node = t;
@@ -7117,7 +7118,7 @@ class P {
     return new Et(this, "<", t);
   }
   eq(t) {
-    return new Zt(this, t);
+    return new te(this, t);
   }
   getVariables() {
     const t = /* @__PURE__ */ new Set();
@@ -7249,7 +7250,7 @@ class Et {
     }
   }
 }
-class Zt {
+class te {
   constructor(t, e) {
     this.left = t, this.right = e;
   }
@@ -7284,7 +7285,7 @@ class Zt {
     }
   }
 }
-class Ci {
+class Mi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = this.args.dataDeps ?? {}, this.callback = (r, s) => this.args.callback.call(this.controller, r, s), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, s) => this.args.nextRecomputeTime.call(this.controller, r, s) : void 0;
   }
@@ -7309,14 +7310,14 @@ class Ci {
     let r, s;
     if (e instanceof P)
       r = e.evaluate({ now: i }), s = i + this.nextRecomputeTime(i, t);
-    else if (e instanceof Et || e instanceof Zt)
+    else if (e instanceof Et || e instanceof te)
       r = e.evaluate({ now: i }), s = e.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(i), await this.state.nextRecomputeTime.set(s), r;
   }
 }
-class xi {
+class $i {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = {
       _current: {
@@ -7347,15 +7348,15 @@ class xi {
     let s, a;
     if (i instanceof P)
       s = i.evaluate({ now: r }), a = r + this.nextRecomputeTime(r, t);
-    else if (i instanceof Et || i instanceof Zt)
+    else if (i instanceof Et || i instanceof te)
       s = i.evaluate({ now: r }), a = i.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(e, r), await this.state.nextRecomputeTime.set(e, a), s;
   }
 }
-const Mi = [Ci, xi];
-class $i {
+const Pi = [Mi, $i];
+class Di {
   constructor(t, e, i) {
     if (this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, !this.args.attributeQuery || this.args.attributeQuery.length === 0)
       throw new Error("Sum computation requires attributeQuery with at least one field");
@@ -7416,9 +7417,9 @@ class $i {
     return s;
   }
 }
-class Pi {
+class Oi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), k(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), S(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((o) => o[0] !== f) || [];
     const s = (r.find((o) => o[0] === f) || [])[1]?.attributeQuery;
@@ -7505,8 +7506,8 @@ class Pi {
     return a;
   }
 }
-const Di = [$i, Pi];
-class Oi {
+const Fi = [Di, Oi];
+class Qi {
   constructor(t, e, i) {
     if (this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, !this.args.attributeQuery || this.args.attributeQuery.length === 0)
       throw new Error("Average computation requires attributeQuery with at least one field");
@@ -7579,9 +7580,9 @@ class Oi {
     return await this.state.sum.set(a), await this.state.count.set(s), s > 0 ? a / s : 0;
   }
 }
-class Fi {
+class Vi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, S(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((o) => o && o[0] !== f) || [];
     const s = (r.find((o) => o && o[0] === f) || [])[1]?.attributeQuery;
@@ -7663,8 +7664,8 @@ class Fi {
     return await this.state.count.set(e.record, a), a > 0 ? o / a : 0;
   }
 }
-const Qi = [Oi, Fi];
-class Mt {
+const Li = [Qi, Vi];
+class $t {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.state = {}, this.dataDeps = {}, this.useLastValue = e.useLastValue !== void 0 ? e.useLastValue : !0, e.dataDeps && (this.dataDeps = e.dataDeps), e.compute && (this.computeCallback = e.compute, this.compute = async (...r) => {
       if (this.computeCallback) {
@@ -7708,7 +7709,7 @@ class Mt {
     }));
   }
   static {
-    this.computationType = zt;
+    this.computationType = Zt;
   }
   createState() {
     if (this.createStateCallback) {
@@ -7735,29 +7736,29 @@ class Mt {
     return A.skip();
   }
 }
-class Vi extends Mt {
+class _i extends $t {
   static {
     this.contextType = "global";
   }
 }
-class Li extends Mt {
+class qi extends $t {
   static {
     this.contextType = "entity";
   }
 }
-class qi extends Mt {
+class Bi extends $t {
   static {
     this.contextType = "relation";
   }
 }
-class _i extends Mt {
+class Wi extends $t {
   static {
     this.contextType = "property";
   }
   constructor(t, e, i) {
     if (e.dataDeps) {
       const r = Object.keys(e.dataDeps).filter((s) => e.dataDeps[s].type === "records");
-      k(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
+      S(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
 If you want to use related entity/relation as dataDeps, please use "property" type dataDeps with args: { type: "property", attributeQuery: [attributeQuery] }
 If you want to use aggregated data from all records in the entity/relation, you should define a different dict value to store the aggregated data, and then use the dict value as dataDeps.
 `);
@@ -7765,11 +7766,11 @@ If you want to use aggregated data from all records in the entity/relation, you
     super(t, e, i);
   }
 }
-const Bi = [
-  Vi,
-  Li,
+const Ji = [
+  _i,
   qi,
-  _i
+  Bi,
+  Wi
 ];
 class U extends Error {
   constructor(t, e = {}) {
@@ -7905,7 +7906,7 @@ class G extends U {
     }), this.interactionName = e.interactionName, this.userId = e.userId, this.payload = e.payload, this.executionPhase = e.executionPhase, this.severity = e.severity || V.HIGH;
   }
 }
-class ne extends U {
+class ce extends U {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "ActivityError",
@@ -7937,7 +7938,7 @@ class Q extends U {
     }), this.handleName = e.handleName, this.computationName = e.computationName, this.dataContext = e.dataContext, this.computationPhase = e.computationPhase, this.severity = e.severity || V.MEDIUM;
   }
 }
-class ce extends Q {
+class le extends Q {
   constructor(t, e = {}) {
     super(t, {
       ...e,
@@ -8054,7 +8055,7 @@ class $ extends U {
     });
   }
 }
-const tt = "_System_", _ = "_Dictionary_", et = "id", nt = "_rowId", Wi = C.create({
+const tt = "_System_", q = "_Dictionary_", et = "id", nt = "_rowId", ji = C.create({
   name: tt,
   properties: [
     T.create({
@@ -8073,8 +8074,8 @@ const tt = "_System_", _ = "_Dictionary_", et = "id", nt = "_rowId", Wi = C.crea
       collection: !1
     })
   ]
-}), Ji = C.create({
-  name: _,
+}), Hi = C.create({
+  name: q,
   properties: [
     T.create({
       name: "key",
@@ -8088,7 +8089,7 @@ const tt = "_System_", _ = "_Dictionary_", et = "id", nt = "_rowId", Wi = C.crea
     })
   ]
 });
-class ji {
+class Ui {
   constructor(t, e) {
     this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
   }
@@ -8149,7 +8150,7 @@ class ji {
    * @returns 是否需要触发计算
    */
   shouldTriggerUpdateComputation(t, e) {
-    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === _ ? e.record?.key === t.dataDep.source.name : !t.attributes.filter((r) => r !== "id").every(
+    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === q ? e.record?.key === t.dataDep.source.name : !t.attributes.filter((r) => r !== "id").every(
       (r) => !e.record.hasOwnProperty(r) || e.record[r] === e.oldRecord[r]
     );
   }
@@ -8176,15 +8177,15 @@ class ji {
     } else e.type === "global" && ((!r || r === "update") && a.push({
       dataDep: e,
       type: "update",
-      recordName: _,
-      sourceRecordName: _,
+      recordName: q,
+      sourceRecordName: q,
       attributes: ["value"],
       computation: i
     }), (!r || r === "create") && a.push({
       dataDep: e,
       type: "create",
-      recordName: _,
-      sourceRecordName: _,
+      recordName: q,
+      sourceRecordName: q,
       computation: i
     }));
     return a;
@@ -8279,10 +8280,10 @@ class ji {
     i[t.recordName] || (i[t.recordName] = {}), i[t.recordName][t.type] || (i[t.recordName][t.type] = []), i[t.recordName][t.type].push(t);
   }
 }
-const Pt = "_ASYNC_TASK_";
-class Hi {
+const Dt = "_ASYNC_TASK_";
+class Gi {
   constructor(t, e, i, r, s) {
-    this.controller = t, this.computations = /* @__PURE__ */ new Set(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new ji(this.controller, this), this.buildComputationHandleMap(s);
+    this.controller = t, this.computations = /* @__PURE__ */ new Set(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new Ui(this.controller, this), this.buildComputationHandleMap(s);
     const a = [];
     e.forEach((o) => {
       o.computation && a.push({ dataContext: { type: "entity", id: o }, args: o.computation }), o.properties?.forEach((n) => {
@@ -8298,9 +8299,9 @@ class Hi {
     });
     for (const o of a) {
       const n = o.dataContext, c = o.args, l = this.computationHandleMap.get(c.constructor);
-      k(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
+      S(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
       const d = l[n.type];
-      k(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
+      S(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
       const h = new d(this.controller, c, n);
       if (this.computations.add(h), this.isAsyncComputation(h)) {
         if (h.dataContext.type === "property") {
@@ -8412,7 +8413,7 @@ class Hi {
         const r = this.computationHandleMap.get(i.computationType);
         if (Array.isArray(i.contextType))
           for (const s of i.contextType)
-            k(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
+            S(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
         else
           r[i.contextType] = e;
       }
@@ -8448,7 +8449,7 @@ class Hi {
           await this.controller.applyResult(t.dataContext, e);
         } else {
           const e = t.dataContext;
-          k(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
+          S(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
             for (let r of i)
               if (r.type === "create" && r.recordName === e.host.name) {
                 const s = await t.getDefaultValue?.(r.record);
@@ -8480,11 +8481,11 @@ class Hi {
       return [e.oldRecord ?? e.record];
     let i = [];
     if (!t.isRelation)
-      k(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
+      S(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat("id").join("."),
         value: ["=", e.oldRecord.id]
       }), void 0);
-    else if (k(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
+    else if (S(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
       i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat(["&", "id"]).join("."),
         value: ["=", e.record.id]
@@ -8513,7 +8514,7 @@ class Hi {
   }
   async computeDataBasedDirtyRecordsAndEvents(t, e) {
     let i = [];
-    if (t.dataDep.type === "global" && e.recordName === _)
+    if (t.dataDep.type === "global" && e.recordName === q)
       if (t.computation.dataContext.type === "property") {
         const r = t.computation.dataContext;
         i = (await this.controller.system.storage.find(r.host.name, m.atom({ key: "id", value: ["not", null] }), {}, ["*"])).map((a) => [a, {
@@ -8595,8 +8596,8 @@ class Hi {
   getAsyncTaskRecordKey(t) {
     if (t.dataContext.type === "property") {
       const e = t.dataContext;
-      return `${Pt}_${e.host.name}_${e.id.name}`;
-    } else return t.dataContext.type === "global" ? `${Pt}_${t.dataContext.id}` : `${Pt}_${t.dataContext.type}_${t.dataContext.id?.name || t.dataContext.id}`;
+      return `${Dt}_${e.host.name}_${e.id.name}`;
+    } else return t.dataContext.type === "global" ? `${Dt}_${t.dataContext.id}` : `${Dt}_${t.dataContext.type}_${t.dataContext.id?.name || t.dataContext.id}`;
   }
   async createAsyncTask(t, e, i, r) {
     if (t.dataContext.type === "property")
@@ -8665,7 +8666,7 @@ class Hi {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, i);
               } catch (n) {
-                throw new ce("Failed to retrieve last value for incremental computation", {
+                throw new le("Failed to retrieve last value for incremental computation", {
                   handleName: t.constructor.name,
                   computationName: t.args.constructor.displayName,
                   dataContext: t.dataContext,
@@ -8679,7 +8680,7 @@ class Hi {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, i);
               } catch (n) {
-                throw new ce("Failed to retrieve last value for incremental patch computation", {
+                throw new le("Failed to retrieve last value for incremental patch computation", {
                   handleName: t.constructor.name,
                   computationName: t.args.constructor.displayName,
                   dataContext: t.dataContext,
@@ -8694,7 +8695,7 @@ class Hi {
               dataContext: t.dataContext,
               computationPhase: "type-validation"
             });
-          if (s instanceof we) {
+          if (s instanceof ve) {
             const o = t;
             if (!o.compute)
               throw new Q("compute must be defined for computation when incrementalCompute returns ComputationResultFullRecompute", {
@@ -8717,7 +8718,7 @@ class Hi {
       }
       if (s instanceof At)
         return;
-      if (s instanceof Ne)
+      if (s instanceof Se)
         try {
           return await this.createAsyncTask(t, s.args, i);
         } catch (o) {
@@ -8730,7 +8731,7 @@ class Hi {
           });
         }
       try {
-        const o = s instanceof Te ? await t.asyncReturn(s.result, s.args) : s;
+        const o = s instanceof ke ? await t.asyncReturn(s.result, s.args) : s;
         t.incrementalPatchCompute ? await this.controller.applyResultPatch(t.dataContext, o, i) : await this.controller.applyResult(t.dataContext, o, i);
       } catch (o) {
         throw new Q("Failed to apply computation result", {
@@ -8851,7 +8852,7 @@ class Hi {
     }
   }
 }
-class Se {
+class Ee {
   constructor(t, e, i) {
     this.interaction = t, this.controller = e, this.activitySeqCall = i, this.system = e.system;
   }
@@ -8905,7 +8906,7 @@ class Se {
     }
     if (this.isConceptAlias(e)) {
       const s = [];
-      return await di(e.for, async (o) => {
+      return await pi(e.for, async (o) => {
         const n = await this.isConcept(t, o);
         return n === !0 ? !0 : (s.push(n), !1);
       }) ? !0 : { name: e.name, type: "conceptAlias", stack: r, error: s };
@@ -8945,7 +8946,7 @@ class Se {
         throw $.payloadValidationFailed(r.name, "data is not a ref", s);
       if (r.base)
         if (r.isCollection) {
-          const o = await oe(s, (n) => this.checkConcept(n, r.base));
+          const o = await ne(s, (n) => this.checkConcept(n, r.base));
           if (o !== !0)
             throw $.conceptCheckFailed(r.name, o);
         } else {
@@ -8967,7 +8968,7 @@ class Se {
       if (r.attributives) {
         const o = st.is(r.attributives) ? new R(r.attributives.content) : R.atom(r.attributives);
         if (r.isCollection) {
-          const n = await oe(a, (c) => {
+          const n = await ne(a, (c) => {
             const l = this.createHandleAttributive(
               J,
               t,
@@ -8991,7 +8992,7 @@ class Se {
   }
   async checkCondition(t) {
     if (this.interaction.conditions) {
-      const e = xt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), i = async (s) => {
+      const e = Mt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), i = async (s) => {
         if (!s) return !0;
         if (s.content) {
           const a = s.content;
@@ -9022,13 +9023,13 @@ class Se {
       return [o.name, { result: n, error: c }];
     })()), a = await Promise.all(s);
     for (let [o, { result: n, error: c }] of a)
-      k(!i.sideEffects[o], `sideEffect ${o} already exists`), i.sideEffects[o] = { result: n, error: c };
+      S(!i.sideEffects[o], `sideEffect ${o} already exists`), i.sideEffects[o] = { result: n, error: c };
   }
   isGetInteraction() {
-    return this.interaction.action === _e;
+    return this.interaction.action === We;
   }
-  async saveEvent(t, e) {
-    return await this.controller.activityManager.saveEvent(t, e);
+  async saveEvent(t) {
+    return await this.controller.activityManager.saveEvent(t);
   }
   async retrieveData(t) {
     let e;
@@ -9038,7 +9039,7 @@ class Se {
       ), a = { ...t.query?.modifier || {}, ...r || {} }, o = t.query?.attributeQuery || [];
       e = await this.system.storage.find(i, t.query?.match, a, o);
     } else
-      k(!1, `unknown data type ${this.interaction.data}`);
+      S(!1, `unknown data type ${this.interaction.data}`);
     return e;
   }
   async check(t, e, i, r) {
@@ -9052,8 +9053,7 @@ class Se {
   }
   async call(t, e, i, r) {
     const s = {
-      sideEffects: {},
-      effects: []
+      sideEffects: {}
     };
     if (s.error = await this.check(t, e, i, r), !s.error) {
       const a = {
@@ -9067,7 +9067,7 @@ class Se {
           id: e
         }
       };
-      await this.saveEvent(a, s.effects), s.event = a, await this.runEffects(t, e, s), this.isGetInteraction() && (s.data = await this.retrieveData(t));
+      await this.saveEvent(a), s.event = a, await this.runEffects(t, e, s), this.isGetInteraction() && (s.data = await this.retrieveData(t));
     }
     return s;
   }
@@ -9142,7 +9142,7 @@ class O {
     this.parent.transferToNext(this.node.uuid);
   }
 }
-class le {
+class ue {
   constructor(t, e) {
     this.graph = e, this.root = K.create(t, this.graph);
   }
@@ -9161,7 +9161,7 @@ class le {
 }
 class it {
   constructor(t, e) {
-    this.activity = t, this.controller = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.uuidToInteractionCall = /* @__PURE__ */ new Map(), this.interactionCallByName = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (i, r, s) => (k(i.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[i.name] === r.id), this.system = e.system, this.graph = this.buildGraph(t);
+    this.activity = t, this.controller = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.uuidToInteractionCall = /* @__PURE__ */ new Map(), this.interactionCallByName = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (i, r, s) => (S(i.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[i.name] === r.id), this.system = e.system, this.graph = this.buildGraph(t);
   }
   static {
     this.cache = /* @__PURE__ */ new Map();
@@ -9177,7 +9177,7 @@ class it {
     for (let o of t.interactions) {
       const n = { content: o, next: null, uuid: o.uuid, parentGroup: e, parentSeq: r };
       this.uuidToNode.set(o.uuid, n), this.rawToNode.set(o, n);
-      const c = new Se(o, this.controller, this);
+      const c = new Ee(o, this.controller, this);
       this.uuidToInteractionCall.set(o.uuid, c), o.name && this.interactionCallByName.set(o.name, c);
     }
     for (let o of t.gateways) {
@@ -9197,7 +9197,7 @@ class it {
     const s = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]), a = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]);
     if (t.transfers?.forEach((o) => {
       const n = this.rawToNode.get(o.source) || i.get(o.source), c = this.rawToNode.get(o.target) || i.get(o.target);
-      k(!!n, `cannot find source ${o.source.name}`), k(!!c, `cannot find target ${o.source.name}`), at.is(n) ? n.next.push(c) : n.next = c, at.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
+      S(!!n, `cannot find source ${o.source.name}`), S(!!c, `cannot find target ${o.source.name}`), at.is(n) ? n.next.push(c) : n.next = c, at.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
     }), s.size !== 1) throw new Error(`start node must one, current: ${s.size}`);
     if (a.size !== 1) throw new Error(`end node must be one, current: ${a.size}`);
     return Object.assign(r, {
@@ -9206,7 +9206,7 @@ class it {
     }), r;
   }
   async create() {
-    const t = le.createInitialState(this.graph.head);
+    const t = ue.createInitialState(this.graph.head);
     return {
       activityId: (await this.controller.activityManager.createActivity({
         name: this.activity.name,
@@ -9265,14 +9265,14 @@ class it {
         s = (await this.create()).activityId;
       }
     } else if (!t) return { error: "activityId must be provided for non-head interaction of an activity" };
-    const a = new le(await this.getState(s), this);
+    const a = new ue(await this.getState(s), this);
     if (!a.isInteractionAvailable(e)) return { error: `interaction ${e} not available` };
     const o = await r.call(i, s, this.checkUserRef);
     if (o.error)
       return o;
     await this.saveUserRefs(s, r, i);
     const n = a.completeInteraction(e);
-    k(n, "change activity state failed");
+    S(n, "change activity state failed");
     const c = a.toJSON();
     return await this.setActivity(s, { state: c }), {
       ...o,
@@ -9293,7 +9293,7 @@ class it {
     }), await this.setActivity(t, { refs: r });
   }
 }
-class Ui extends O {
+class Ki extends O {
   onChange(t, e) {
     if (this.graph.isStartNode(t)) {
       if (e)
@@ -9304,25 +9304,25 @@ class Ui extends O {
     }
   }
 }
-O.GroupStateNodeType.set("any", Ui);
-class Gi extends O {
+O.GroupStateNodeType.set("any", Ki);
+class Xi extends O {
   onChange(t, e) {
     this.isGroupCompleted() && this.complete();
   }
 }
-O.GroupStateNodeType.set("every", Gi);
-class Ki extends O {
+O.GroupStateNodeType.set("every", Xi);
+class Yi extends O {
   onChange(t, e) {
     this.graph.isEndNode(t) && this.complete();
   }
 }
-O.GroupStateNodeType.set("race", Ki);
-class Xi extends O {
+O.GroupStateNodeType.set("race", Yi);
+class zi extends O {
   // 可以根据 group 上的具体配置逻辑，来动态决定。
 }
-O.GroupStateNodeType.set("program", Xi);
-const I = new xe(), Qt = "_Interaction_", vt = "_Activity_", ke = C.create({
-  name: Qt,
+O.GroupStateNodeType.set("program", zi);
+const I = new fe(), Vt = "_Interaction_", vt = "_Activity_", Ie = C.create({
+  name: Vt,
   properties: [
     T.create({
       name: "interactionId",
@@ -9350,7 +9350,7 @@ const I = new xe(), Qt = "_Interaction_", vt = "_Activity_", ke = C.create({
       collection: !1
     })
   ]
-}), Ae = C.create({
+}), Ce = C.create({
   name: vt,
   properties: [
     T.create({
@@ -9374,22 +9374,22 @@ const I = new xe(), Qt = "_Interaction_", vt = "_Activity_", ke = C.create({
       collection: !1
     })
   ]
-}), Yi = D.create({
+}), Zi = D.create({
   name: "activityInteraction",
-  source: Ae,
+  source: Ce,
   sourceProperty: "interaction",
-  target: ke,
+  target: Ie,
   targetProperty: "activity",
   type: "1:n"
 });
-class zi {
+class tr {
   constructor(t, e, i) {
-    this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.controller.entities.push(Ae, ke), this.controller.relations.push(Yi), e.forEach((r) => {
+    this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.controller.entities.push(Ce, Ie), this.controller.relations.push(Zi), e.forEach((r) => {
       const s = new it(r, t);
-      this.activityCalls.set(r.uuid, s), r.name && (k(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
+      this.activityCalls.set(r.uuid, s), r.name && (S(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
     }), i.forEach((r) => {
-      const s = new Se(r, t);
-      this.interactionCalls.set(r.uuid, s), r.name && (k(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
+      const s = new Ee(r, t);
+      this.interactionCalls.set(r.uuid, s), r.name && (S(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
     });
   }
   async callInteraction(t, e) {
@@ -9440,7 +9440,7 @@ class zi {
     try {
       const o = this.activityCallsByName.get(t);
       if (!o)
-        throw new ne(`Cannot find activity for ${t}`, {
+        throw new ce(`Cannot find activity for ${t}`, {
           activityName: t,
           context: {
             interactionName: e,
@@ -9463,7 +9463,7 @@ class zi {
       const c = await o.callInteraction(i, n.interaction.uuid, r);
       return c.error ? (a.error({ label: "activity", message: o.activity.name }), await this.controller.system.storage.rollbackTransaction(o.activity.name)) : (await this.controller.system.storage.commitTransaction(o.activity.name), await this.runRecordChangeSideEffects(c, a)), c;
     } catch (o) {
-      throw new ne("Unexpected error during activity interaction call", {
+      throw new ce("Unexpected error during activity interaction call", {
         activityName: t,
         context: {
           interactionName: e,
@@ -9521,11 +9521,11 @@ class zi {
       refs: e.refs
     }));
   }
-  async saveEvent(t, e = []) {
-    return this.controller.system.storage.create(Qt, t, e);
+  async saveEvent(t) {
+    return this.controller.system.storage.create(Vt, t);
   }
   async getEvent(t) {
-    return (await this.controller.system.storage.find(Qt, t, void 0, ["*"])).map((e) => ({
+    return (await this.controller.system.storage.find(Vt, t, void 0, ["*"])).map((e) => ({
       ...e
     }));
   }
@@ -9542,7 +9542,15 @@ class zi {
     return this.interactionCallsByName.get(t);
   }
 }
-const Dr = "User";
+const It = new fe();
+function er() {
+  return It.getStore()?.effects;
+}
+function de(u) {
+  const t = It.getStore();
+  t?.effects && t.effects.push(...u);
+}
+const Qr = "User";
 class X {
   constructor(t) {
     this.name = t.name, this.record = t.record, this.content = t.content;
@@ -9551,15 +9559,15 @@ class X {
     return new X(t);
   }
 }
-const Vt = "_isDeleted_", Or = {
+const Lt = "_isDeleted_", Vr = {
   create() {
     return T.create({
-      name: Vt,
+      name: Lt,
       type: "boolean"
     });
   }
 };
-class Fr {
+class Lr {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
       BoolExp: R,
@@ -9578,21 +9586,21 @@ class Fr {
       forceThtrowInteractionError: d = !1
       // 会 catch 住 error，并在 result 中返回。
     } = t;
-    this.system = e, this.ignorePermission = l, this.forceThtrowInteractionError = d, this.entities = [...i], this.relations = [...r], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new zi(this, s, a);
+    this.system = e, this.ignorePermission = l, this.forceThtrowInteractionError = d, this.entities = [...i], this.relations = [...r], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new tr(this, s, a);
     const h = [
-      ...Ai,
       ...Ii,
-      ...vi,
-      ...wi,
-      ...gi,
-      ...Di,
-      ...Qi,
-      ...Mi,
-      ...fi,
-      ...Bi,
+      ...xi,
+      ...ki,
+      ...Ti,
+      ...Ri,
+      ...Fi,
+      ...Li,
+      ...Pi,
+      ...yi,
+      ...Ji,
       ...c
     ];
-    this.scheduler = new Hi(this, this.entities, this.relations, this.dict, h), n.forEach((p) => {
+    this.scheduler = new Gi(this, this.entities, this.relations, this.dict, h), n.forEach((p) => {
       let y = this.recordNameToSideEffects.get(p.record.name);
       y || this.recordNameToSideEffects.set(p.record.name, y = /* @__PURE__ */ new Set()), y.add(p);
     });
@@ -9631,7 +9639,7 @@ class Fr {
           await this.system.storage.create(r.id.name, a);
       } else {
         const r = t;
-        r.id.name === Vt && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
+        r.id.name === Lt && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
       }
     }
   }
@@ -9654,16 +9662,16 @@ class Fr {
         }
       } else {
         const a = t;
-        a.id.name === Vt && s.data ? (k(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
+        a.id.name === Lt && s.data ? (S(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
       }
     }
   }
   async callInteraction(t, e) {
     try {
-      const i = await this.activityManager.callInteraction(t, e);
-      if (i.error && this.forceThtrowInteractionError)
-        throw i.error;
-      return i;
+      const i = { effects: [] }, r = await It.run(i, async () => await this.activityManager.callInteraction(t, e));
+      if (r.effects = i.effects, r.error && this.forceThtrowInteractionError)
+        throw r.error;
+      return r;
     } catch (i) {
       throw new G("Failed to call interaction", {
         interactionName: t,
@@ -9676,10 +9684,18 @@ class Fr {
   }
   async callActivityInteraction(t, e, i, r) {
     try {
-      const s = await this.activityManager.callActivityInteraction(t, e, i, r);
-      if (s.error && this.forceThtrowInteractionError)
-        throw s.error;
-      return s;
+      const s = { effects: [] }, a = await It.run(s, async () => await this.activityManager.callActivityInteraction(t, e, i, r));
+      if (a.effects && s.effects.length > 0) {
+        const o = s.effects.filter(
+          (n) => !a.effects.some(
+            (c) => c.type === n.type && c.recordName === n.recordName && c.record?.id === n.record?.id
+          )
+        );
+        a.effects.push(...o);
+      }
+      if (a.error && this.forceThtrowInteractionError)
+        throw a.error;
+      return a;
     } catch (s) {
       throw new G("Failed to call activity interaction", {
         interactionName: e,
@@ -9721,7 +9737,7 @@ class Fr {
     this.callbacks.has(t) || this.callbacks.set(t, /* @__PURE__ */ new Set()), this.callbacks.get(t).add(e);
   }
 }
-let Zi = class {
+let ir = class {
   constructor(t) {
     this.db = t;
   }
@@ -9733,12 +9749,12 @@ let Zi = class {
     return e === void 0 ? await this.db.scheme(`INSERT INTO _IDS_ (name, last) VALUES ('${t}', ${i})`, r) : await this.db.update("UPDATE _IDS_ SET last = ? WHERE name = ?", [i, t], void 0, r), i;
   }
 };
-class tr {
+class rr {
   constructor(t = ":memory:", e) {
-    this.file = t, this.options = e, this.idSystem = new Zi(this), this.logger = this.options?.logger || wt;
+    this.file = t, this.options = e, this.idSystem = new ir(this), this.logger = this.options?.logger || wt;
   }
   async open() {
-    this.db = new Ce(this.file, this.options), await this.idSystem.setup();
+    this.db = new $e(this.file, this.options), await this.idSystem.setup();
   }
   async query(t, e = [], i = "") {
     const r = I.getStore(), s = this.logger.child(r?.logContext || {}), a = e.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
@@ -9805,22 +9821,22 @@ class tr {
     return t === "pk" ? "INTEGER PRIMARY KEY" : t === "id" ? "INT" : e || t === "object" || t === "json" ? "JSON" : t === "string" ? "TEXT" : t === "boolean" ? "INT(2)" : t === "number" || t === "timestamp" ? "INT" : t;
   }
 }
-function er(u) {
+function sr(u) {
   return encodeURI(JSON.stringify(u));
 }
-function ir(u) {
+function ar(u) {
   return u === void 0 ? void 0 : JSON.parse(decodeURI(u));
 }
-class rr {
+class or {
   constructor(t) {
     this.db = t, this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
         const i = m.atom({ key: "key", value: ["=", e] });
-        return (await this.queryHandle.findOne(_, i, void 0, ["value"]))?.value?.raw;
+        return (await this.queryHandle.findOne(q, i, void 0, ["value"]))?.value?.raw;
       },
       set: async (e, i) => {
-        const r = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(_, r, void 0, ["value"]);
-        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [_, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [_, { key: e, value: { raw: i } }], []);
+        const r = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(q, r, void 0, ["value"]);
+        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [q, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [q, { key: e, value: { raw: i } }], []);
       }
     };
   }
@@ -9836,20 +9852,20 @@ class rr {
   // CAUTION kv 结构数据的实现也用 er。这是系统约定，因为也需要  Record 事件！
   async get(t, e, i) {
     const r = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] }), s = (await this.queryHandle.findOne(tt, r, void 0, ["value"]))?.value;
-    return s === void 0 ? i : ir(s);
+    return s === void 0 ? i : ar(s);
   }
   async set(t, e, i, r) {
     const s = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] });
-    return await this.queryHandle.findOne(tt, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [tt, s, { concept: t, key: e.toString(), value: er(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [tt, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(i)) }], r);
+    return await this.queryHandle.findOne(tt, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [tt, s, { concept: t, key: e.toString(), value: sr(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [tt, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(i)) }], r);
   }
   async setup(t, e, i = !1) {
     await this.db.open(i);
-    const r = new ui(
+    const r = new hi(
       t,
       e,
       this.db
     );
-    i && await r.createTables(), this.queryHandle = new Xe(new Ye(r.map), this.db), this.map = r.map;
+    i && await r.createTables(), this.queryHandle = new ze(new Ze(r.map), this.db), this.map = r.map;
   }
   findOne(...t) {
     return this.queryHandle.findOne(...t);
@@ -9867,8 +9883,10 @@ class rr {
     return this.callWithEvents(this.queryHandle.delete.bind(this.queryHandle), [t, e], i);
   }
   async callWithEvents(t, e, i = []) {
-    const r = await t(...e, i), s = await this.dispatch(i);
-    return i.push(...s), r;
+    const r = [], s = await t(...e, r), a = await this.dispatch(r);
+    i.push(...r, ...a);
+    const o = er();
+    return o && r.length > 0 && de(r), o && a.length > 0 && de(a), s;
   }
   findRelationByName(...t) {
     return this.queryHandle.findRelationByName(...t);
@@ -9906,8 +9924,8 @@ class rr {
     return this.db.close();
   }
 }
-var sr = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(sr || {});
-class te {
+var nr = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(nr || {});
+class ee {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9918,11 +9936,11 @@ class te {
     this.level >= 0 && console.error({ type: t, name: e, sql: i, params: r, error: s });
   }
   child() {
-    return new te(this.level);
+    return new ee(this.level);
   }
 }
-var ar = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(ar || {});
-class ee {
+var cr = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(cr || {});
+class ie {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9936,16 +9954,16 @@ class ee {
     this.level >= 2 && console.debug(`[DEBUG] ${t}: ${e}`, i);
   }
   child(t) {
-    return new ee(this.level);
+    return new ie(this.level);
   }
 }
-const wt = new te(), or = new ee();
-class Vr {
-  constructor(t = new tr(void 0, { logger: wt }), e = or) {
-    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new rr(t);
+const wt = new ee(), lr = new ie();
+class qr {
+  constructor(t = new rr(void 0, { logger: wt }), e = lr) {
+    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new or(t);
   }
   setup(t, e, i, r = !1) {
-    const s = new be(t, e), { entities: a, relations: o } = s.getAll();
+    const s = new Ne(t, e), { entities: a, relations: o } = s.getAll();
     return i.forEach(({ dataContext: n, state: c }) => {
       Object.entries(c).forEach(([l, d]) => {
         if (d instanceof E) {
@@ -9971,7 +9989,7 @@ class Vr {
         }
       });
     }), this.storage.setup(
-      [...a, Ji, Wi],
+      [...a, Hi, ji],
       o,
       r
     );
@@ -9980,8 +9998,8 @@ class Vr {
     this.storage.destroy();
   }
 }
-const { Client: ue } = Me;
-let nr = class {
+const { Client: he } = Pe;
+let ur = class {
   constructor(t) {
     this.db = t;
   }
@@ -9993,14 +10011,14 @@ let nr = class {
     return e === void 0 ? await this.db.scheme(`INSERT INTO "_IDS_" (name, last) VALUES ('${t}', ${i})`, r) : await this.db.update('UPDATE "_IDS_" SET last = $1 WHERE name = $2', [i, t], void 0, r), i;
   }
 };
-class qr {
+class Wr {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new nr(this), this.logger = this.options?.logger || wt, this.db = new ue({
+    this.database = t, this.options = e, this.idSystem = new ur(this), this.logger = this.options?.logger || wt, this.db = new he({
       ...e
     });
   }
   async open(t = !1) {
-    await this.db.connect(), (await this.db.query(`SELECT FROM pg_database WHERE datname = '${this.database}'`)).rows.length === 0 ? await this.db.query(`CREATE DATABASE ${this.database}`) : (t && (await this.db.query(`DROP DATABASE ${this.database}`), await this.db.query(`CREATE DATABASE ${this.database}`)), this.db = new ue({
+    await this.db.connect(), (await this.db.query(`SELECT FROM pg_database WHERE datname = '${this.database}'`)).rows.length === 0 ? await this.db.query(`CREATE DATABASE ${this.database}`) : (t && (await this.db.query(`DROP DATABASE ${this.database}`), await this.db.query(`CREATE DATABASE ${this.database}`)), this.db = new he({
       ...this.options,
       database: this.database
     }), await this.db.connect()), await this.idSystem.setup();
@@ -10074,7 +10092,7 @@ class qr {
     return t === "pk" ? "INT GENERATED ALWAYS AS IDENTITY" : t === "id" ? "INT" : e || t === "object" ? "JSON" : t === "string" ? "TEXT" : t === "boolean" ? "BOOLEAN" : t === "number" ? "INT" : t === "timestamp" ? "TIMESTAMP" : t;
   }
 }
-let cr = class {
+let dr = class {
   constructor(t) {
     this.db = t;
   }
@@ -10082,12 +10100,12 @@ let cr = class {
     return this.db.scheme('CREATE Table IF NOT EXISTS "_IDS_" (last INTEGER, name TEXT)');
   }
   async getAutoId(t) {
-    return de();
+    return pe();
   }
 };
-class Br {
+class jr {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new cr(this), this.logger = this.options?.logger || wt, this.db = new $e(this.database);
+    this.database = t, this.options = e, this.idSystem = new dr(this), this.logger = this.options?.logger || wt, this.db = new De(this.database);
   }
   async open(t = !1) {
     if (t) {
@@ -10202,7 +10220,7 @@ class Br {
     return t === "pk" ? "SERIAL PRIMARY KEY" : t === "id" ? "UUID" : e || t === "object" ? "JSON" : t === "string" ? "TEXT" : t === "boolean" ? "BOOL" : t === "number" ? "INT" : t === "timestamp" ? "TIMESTAMP" : t;
   }
 }
-class lr {
+class hr {
   constructor(t) {
     this.db = t;
   }
@@ -10214,16 +10232,16 @@ class lr {
     return e === void 0 ? await this.db.scheme(`INSERT INTO "_IDS_" (name, last) VALUES ('${t}', ${i})`, r) : await this.db.update('UPDATE "_IDS_" SET last = ? WHERE name = ?', [i, t], void 0, r), i;
   }
 }
-class Wr {
+class Hr {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new lr(this), this.logger = this.options?.logger || wt;
+    this.database = t, this.options = e, this.idSystem = new hr(this), this.logger = this.options?.logger || wt;
   }
   async open(t = !1) {
-    ({ ...this.options }, this.db = await se.createConnection({
+    ({ ...this.options }, this.db = await ae.createConnection({
       ...this.options
     })), await this.db.connect();
     const [e] = await this.db.query(`SHOW DATABASES LIKE '${this.database}'`);
-    e.length === 0 ? await this.db.query(`CREATE DATABASE ${this.database}`) : (t && (await this.db.query(`DROP DATABASE ${this.database}`), await this.db.query(`CREATE DATABASE ${this.database}`)), this.db = await se.createConnection({
+    e.length === 0 ? await this.db.query(`CREATE DATABASE ${this.database}`) : (t && (await this.db.query(`DROP DATABASE ${this.database}`), await this.db.query(`CREATE DATABASE ${this.database}`)), this.db = await ae.createConnection({
       ...this.options,
       database: this.database
     }), await this.db.connect()), await this.db.query("SET sql_mode='ANSI_QUOTES'"), await this.idSystem.setup();
@@ -10296,169 +10314,172 @@ class Wr {
 }
 export {
   vt as ACTIVITY_RECORD,
-  Je as ALL_ATTR_SYMBOL,
-  Pt as ASYNC_TASK_RECORD,
-  It as Action,
-  Wt as Activity,
+  He as ALL_ATTR_SYMBOL,
+  Dt as ASYNC_TASK_RECORD,
+  Ct as Action,
+  Jt as Activity,
   it as ActivityCall,
   rt as ActivityGroup,
-  Yi as ActivityInteractionRelation,
-  zi as ActivityManager,
-  Ae as ActivityStateEntity,
+  Zi as ActivityInteractionRelation,
+  tr as ActivityManager,
+  Ce as ActivityStateEntity,
   yt as Any,
-  vi as AnyHandles,
+  ki as AnyHandles,
   W as AttributeInfo,
   x as AttributeQuery,
   J as Attributive,
   st as Attributives,
   ft as Average,
-  Qi as AverageHandles,
-  Tr as BaseKlass,
+  Li as AverageHandles,
+  kr as BaseKlass,
   ct as BoolAtomData,
   R as BoolExp,
   lt as BoolExpressionData,
   j as ComputationDataDepError,
   Q as ComputationError,
   A as ComputationResult,
-  Ne as ComputationResultAsync,
-  we as ComputationResultFullRecompute,
-  Te as ComputationResultResolved,
+  Se as ComputationResultAsync,
+  ve as ComputationResultFullRecompute,
+  ke as ComputationResultResolved,
   At as ComputationResultSkip,
-  ce as ComputationStateError,
-  Jt as Condition,
+  le as ComputationStateError,
+  jt as Condition,
   $ as ConditionError,
-  xt as Conditions,
-  Fr as Controller,
+  Mt as Conditions,
+  Lr as Controller,
   ht as Count,
-  Ai as CountHandles,
-  zt as Custom,
-  Bi as CustomHandles,
-  te as DBConsoleLogger,
-  sr as DBLogLevel,
-  ui as DBSetup,
-  Pr as DELETED_STATE,
-  _ as DICTIONARY_RECORD,
-  jt as DataAttributive,
-  Yt as DataAttributives,
-  _t as Dictionary,
-  Ji as DictionaryEntity,
+  Ii as CountHandles,
+  Zt as Custom,
+  Ji as CustomHandles,
+  ee as DBConsoleLogger,
+  nr as DBLogLevel,
+  hi as DBSetup,
+  Fr as DELETED_STATE,
+  q as DICTIONARY_RECORD,
+  Ht as DataAttributive,
+  zt as DataAttributives,
+  Bt as Dictionary,
+  Hi as DictionaryEntity,
   C as Entity,
-  Li as EntityCustomHandle,
-  Xe as EntityQueryHandle,
-  Ye as EntityToTableMap,
-  Zt as Equation,
-  Ht as Event,
+  qi as EntityCustomHandle,
+  ze as EntityQueryHandle,
+  Ze as EntityToTableMap,
+  te as Equation,
+  Ut as Event,
   mt as Every,
-  wi as EveryHandles,
+  Ti as EveryHandles,
   P as Expression,
   at as Gateway,
-  _e as GetAction,
-  Ni as GlobalAnyHandle,
-  Oi as GlobalAverageHandle,
+  We as GetAction,
+  vi as GlobalAnyHandle,
+  Qi as GlobalAverageHandle,
   B as GlobalBoundState,
-  Si as GlobalCountHandle,
-  Vi as GlobalCustomHandle,
-  bi as GlobalEveryHandle,
-  Ci as GlobalRealTimeComputation,
-  hi as GlobalStateMachineHandle,
-  $i as GlobalSumHandle,
-  mi as GlobalWeightedSummationHandle,
-  Vt as HARD_DELETION_PROPERTY_NAME,
-  Or as HardDeletionProperty,
+  Ai as GlobalCountHandle,
+  _i as GlobalCustomHandle,
+  wi as GlobalEveryHandle,
+  Mi as GlobalRealTimeComputation,
+  fi as GlobalStateMachineHandle,
+  Di as GlobalSumHandle,
+  gi as GlobalWeightedSummationHandle,
+  Lt as HARD_DELETION_PROPERTY_NAME,
+  Vr as HardDeletionProperty,
   et as ID_ATTR,
-  Qt as INTERACTION_RECORD,
+  Vt as INTERACTION_RECORD,
   Et as Inequality,
-  Bt as Interaction,
-  Se as InteractionCall,
-  ke as InteractionEventEntity,
-  Lt as KlassByName,
+  Wt as Interaction,
+  Ee as InteractionCall,
+  Ie as InteractionEventEntity,
+  _t as KlassByName,
   f as LINK_SYMBOL,
   kt as LinkInfo,
   m as MatchExp,
-  We as Modifier,
-  Vr as MonoSystem,
-  Wr as MysqlDB,
-  $r as NON_DELETED_STATE,
-  Mr as NON_EXIST_STATE,
+  je as Modifier,
+  qr as MonoSystem,
+  Hr as MysqlDB,
+  Or as NON_DELETED_STATE,
+  Dr as NON_EXIST_STATE,
   L as NewRecordData,
-  Br as PGLiteDB,
-  Kt as Payload,
-  Gt as PayloadItem,
-  qr as PostgreSQLDB,
+  jr as PGLiteDB,
+  Xt as Payload,
+  Kt as PayloadItem,
+  Wr as PostgreSQLDB,
   T as Property,
-  Ti as PropertyAnyHandle,
-  Fi as PropertyAverageHandle,
-  ki as PropertyCountHandle,
-  _i as PropertyCustomHandle,
-  Ri as PropertyEveryHandle,
-  xi as PropertyRealTimeComputation,
-  pi as PropertyStateMachineHandle,
-  Pi as PropertySumHandle,
+  Si as PropertyAnyHandle,
+  Vi as PropertyAverageHandle,
+  Ei as PropertyCountHandle,
+  Wi as PropertyCustomHandle,
+  Ni as PropertyEveryHandle,
+  $i as PropertyRealTimeComputation,
+  mi as PropertyStateMachineHandle,
+  Oi as PropertySumHandle,
   qt as PropertyTypes,
-  yi as PropertyWeightedSummationHandle,
-  ge as Query,
-  ye as QueryItem,
-  Re as ROOT_LABEL,
+  bi as PropertyWeightedSummationHandle,
+  we as Query,
+  Re as QueryItem,
+  Te as ROOT_LABEL,
   nt as ROW_ID_ATTR,
   gt as RealTime,
-  Mi as RealTimeHandles,
+  Pi as RealTimeHandles,
   E as RecordBoundState,
   ot as RecordInfo,
   X as RecordMutationSideEffect,
   M as RecordQuery,
-  Ke as RecordQueryAgent,
-  q as RecordQueryTree,
-  Ei as RecordsTransformHandle,
+  Ye as RecordQueryAgent,
+  _ as RecordQueryTree,
+  Ci as RecordsTransformHandle,
   St as RecursiveContext,
-  be as RefContainer,
+  Ne as RefContainer,
   D as Relation,
-  qi as RelationCustomHandle,
-  tr as SQLiteDB,
+  Bi as RelationCustomHandle,
+  rr as SQLiteDB,
   tt as SYSTEM_RECORD,
-  Hi as Scheduler,
-  Xt as SideEffect,
+  Gi as Scheduler,
+  Yt as SideEffect,
   ut as StateMachine,
-  fi as StateMachineHandles,
+  yi as StateMachineHandles,
   Y as StateNode,
-  Ut as StateTransfer,
+  Gt as StateTransfer,
   pt as Summation,
-  Di as SummationHandles,
-  ee as SystemConsoleLogger,
-  Wi as SystemEntity,
-  ar as SystemLogLevel,
-  fe as Transfer,
-  Ct as Transform,
-  Ii as TransformHandles,
-  Dr as USER_ENTITY,
+  Fi as SummationHandles,
+  ie as SystemConsoleLogger,
+  ji as SystemEntity,
+  cr as SystemLogLevel,
+  ge as Transfer,
+  xt as Transform,
+  xi as TransformHandles,
+  Qr as USER_ENTITY,
   dt as WeightedSummation,
-  gi as WeightedSummationHandles,
-  k as assert,
+  Ri as WeightedSummationHandles,
+  de as addToCurrentEffects,
+  S as assert,
+  It as asyncEffectsContext,
   I as asyncInteractionContext,
-  Ar as boolExpToAttributives,
-  gr as clearAllInstances,
-  Nr as createClass,
-  Oe as createInstances,
-  wr as createInstancesFromString,
-  Er as createUserRoleAttributive,
+  Cr as boolExpToAttributives,
+  wr as clearAllInstances,
+  Sr as createClass,
+  Qe as createInstances,
+  vr as createInstancesFromString,
+  xr as createUserRoleAttributive,
   wt as dbConsoleLogger,
   Nt as deepClone,
-  xr as everyAsync,
-  oe as everyWithErrorAsync,
-  Ir as filterMap,
-  Sr as findRootActivity,
-  me as forEachInteraction,
+  Pr as everyAsync,
+  ne as everyWithErrorAsync,
+  Mr as filterMap,
+  Er as findRootActivity,
+  be as forEachInteraction,
   v as generateUUID,
-  vr as getInteractions,
-  Pe as indexBy,
-  he as isObject,
-  pe as isPlainObject,
-  Cr as mapObject,
-  kr as parse,
-  De as registerKlass,
-  br as removeAllInstance,
-  di as someAsync,
-  Rr as stringifyAllInstances,
+  er as getCurrentEffects,
+  Ar as getInteractions,
+  Oe as indexBy,
+  me as isObject,
+  ye as isPlainObject,
+  $r as mapObject,
+  Ir as parse,
+  Fe as registerKlass,
+  Nr as removeAllInstance,
+  pi as someAsync,
+  Tr as stringifyAllInstances,
   w as stringifyAttribute,
-  or as systemConsoleLogger
+  lr as systemConsoleLogger
 };
 //# sourceMappingURL=index.js.map