interaqt 0.4.10 → 0.4.12

package/dist/index.js

@@ -1,63 +1,63 @@
-import { uuidv7 as he } from "uuidv7";
-import { parse as xe } from "acorn";
-import { AsyncLocalStorage as pe } from "async_hooks";
-import Me from "better-sqlite3";
-import $e from "pg";
-import { PGlite as Pe } from "@electric-sql/pglite";
+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 fe(u) {
+function me(u) {
   return u !== null && typeof u == "object";
 }
-function me(u) {
-  if (!fe(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 De(u, t) {
+function Oe(u, t) {
   const e = {};
   for (const r of u)
     r && r[t] !== void 0 && (e[String(r[t])] = r);
   return e;
 }
 function w(u) {
-  return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : fe(u) && !me(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 wt(u, t) {
+function Rt(u, t) {
   if (u == null || typeof u != "object") return u;
-  if (Array.isArray(u)) return u.map((r) => wt(r, t));
-  if (me(u))
-    return Object.fromEntries(Object.entries(u).map(([r, i]) => [r, wt(i, t)]));
+  if (Array.isArray(u)) return u.map((r) => Rt(r, t));
+  if (ye(u))
+    return Object.fromEntries(Object.entries(u).map(([r, i]) => [r, Rt(i, t)]));
   if (u instanceof Set)
-    return new Set(Array.from(u.values()).map((r) => wt(r, t)));
+    return new Set(Array.from(u.values()).map((r) => Rt(r, t)));
   if (u instanceof Map)
-    return new Map(Array.from(u.entries()).map(([r, i]) => [r, wt(i, t)]));
+    return new Map(Array.from(u.entries()).map(([r, i]) => [r, Rt(i, t)]));
   const e = u;
   return t && e._type && e.constructor?.clone ? e.constructor.clone(u, t) : u;
 }
-function wi(...u) {
+function Ni(...u) {
   for (const t of u)
     t.instances.length = 0;
 }
-function Ni() {
+function Ti() {
 }
-const qt = /* @__PURE__ */ new Map();
-function Oe(u, t) {
-  t && t.isKlass && t.displayName && qt.set(u, t);
+const _t = /* @__PURE__ */ new Map();
+function Fe(u, t) {
+  t && t.isKlass && t.displayName && _t.set(u, t);
 }
-function Ti() {
+function Si() {
   const u = [];
-  return Array.from(qt.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 Si(u) {
+function vi(u) {
   const t = JSON.parse(u);
-  return Fe(t);
+  return Qe(t);
 }
-function Fe(u) {
+function Qe(u) {
   const t = /* @__PURE__ */ new Map();
   return u.forEach(({ type: e, options: r = {}, uuid: i, public: s }) => {
-    const a = qt.get(e);
+    const a = _t.get(e);
     if (!a) {
       console.warn(`Class ${e} not found in KlassByName`);
       return;
@@ -66,10 +66,10 @@ function Fe(u) {
     t.set(i, o);
   }), t;
 }
-function vi(u) {
+function ki(u) {
   return console.warn("createClass is deprecated in refactored code"), null;
 }
-class ki {
+class Ai {
   static {
     this.isKlass = !0;
   }
@@ -92,9 +92,9 @@ class ki {
   }
 }
 function S(u) {
-  return u?.uuid || he();
+  return u?.uuid || pe();
 }
-const Qe = /^[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 }) => Qe.test(t)
+          nameFormat: ({ name: t }) => Ve.test(t)
         }
       },
       properties: {
@@ -196,8 +196,8 @@ class C {
     return this.create(e.public, e.options);
   }
 }
-var _t = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(_t || {});
-const Ve = /^[a-zA-Z0-9_]+$/;
+var qt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(qt || {});
+const Le = /^[a-zA-Z0-9_]+$/;
 class Bt {
   constructor(t, e) {
     this._type = "Dictionary", this._options = e, this.uuid = S(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 Bt {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: t }) => Ve.test(t),
+          format: ({ name: t }) => Le.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
@@ -226,7 +226,7 @@ class Bt {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(_t))
+        options: Array.from(Object.values(qt))
       },
       collection: {
         type: "boolean",
@@ -291,7 +291,7 @@ class Bt {
     return this.create(e.public, e.options);
   }
 }
-const Le = /^[a-zA-Z0-9_]+$/;
+const _e = /^[a-zA-Z0-9_]+$/;
 class T {
   constructor(t, e) {
     this._type = "Property", this._options = e, this.uuid = S(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,14 +311,14 @@ class T {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: t }) => Le.test(t),
+          format: ({ name: t }) => _e.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(_t)
+        options: () => Object.values(qt)
       },
       collection: {
         type: "boolean",
@@ -741,7 +741,7 @@ class Jt {
     return this.create(e.public, e.options);
   }
 }
-class it {
+class rt {
   constructor(t, e) {
     this._type = "ActivityGroup", this._options = e, this.uuid = S(e), this.type = t.type, this.activities = t.activities || [];
   }
@@ -770,7 +770,7 @@ class it {
     };
   }
   static create(t, e) {
-    const r = new it(t, e);
+    const r = new rt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, ActivityGroup`);
     return this.instances.push(r), r;
@@ -804,7 +804,7 @@ class it {
     return this.create(e.public, e.options);
   }
 }
-class ye {
+class ge {
   constructor(t, e) {
     this._type = "Transfer", this._options = e, this.uuid = S(e), this.name = t.name, this.source = t.source, this.target = t.target;
   }
@@ -837,7 +837,7 @@ class ye {
     };
   }
   static create(t, e) {
-    const r = new ye(t, e);
+    const r = new ge(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Transfer`);
     return this.instances.push(r), r;
@@ -873,19 +873,19 @@ class ye {
     return this.create(e.public, e.options);
   }
 }
-function ge(u, t, e) {
+function be(u, t, e) {
   u.interactions.forEach((r) => t(r, e)), u.groups.forEach((r) => {
-    r.activities?.forEach((i) => ge(i, t, r));
+    r.activities?.forEach((i) => be(i, t, r));
   });
 }
-function Ai(u) {
+function Ei(u) {
   const t = [];
-  return ge(u, (e) => t.push(e)), t;
+  return be(u, (e) => t.push(e)), t;
 }
-function Ei(u) {
+function Ii(u) {
   return null;
 }
-class nt {
+class ot {
   constructor(t, e) {
     this._type = "BoolAtomData", this._options = e, this.uuid = S(e), this.type = t.type || "atom", this.data = t.data;
   }
@@ -914,7 +914,7 @@ class nt {
     };
   }
   static create(t, e) {
-    const r = new nt(t, e);
+    const r = new ot(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, BoolAtomData`);
     return this.instances.push(r), r;
@@ -948,7 +948,7 @@ class nt {
     return this.create(e.public, e.options);
   }
 }
-class ct {
+class nt {
   constructor(t, e) {
     this._type = "BoolExpressionData", this._options = e, this.uuid = S(e), this.type = t.type || "expression", this.operator = t.operator || "and", this.left = t.left, this.right = t.right;
   }
@@ -989,7 +989,7 @@ class ct {
     };
   }
   static create(t, e) {
-    const r = new ct(t, e);
+    const r = new nt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, BoolExpressionData`);
     return this.instances.push(r), r;
@@ -1180,16 +1180,16 @@ const qe = {
   "||": "or",
   "!": "not"
 };
-function _e(u) {
+function Be(u) {
   return { key: u };
 }
-function Nt(u, t, e) {
+function wt(u, t, e) {
   if (u.type === "LogicalExpression")
     return {
       type: "expression",
       operator: qe[u.operator],
-      left: Nt(u.left, t, e),
-      right: Nt(u.right, t, e)
+      left: wt(u.left, t, e),
+      right: wt(u.right, t, e)
     };
   if (u.type === "Identifier")
     return {
@@ -1200,14 +1200,14 @@ function Nt(u, t, e) {
     return {
       type: "expression",
       operator: "not",
-      left: Nt(u.argument, t, e)
+      left: wt(u.argument, t, e)
     };
   throw new Error("unknown ast node type");
 }
-function Ii(u, t = [], e = _e) {
-  const r = De(t, "name"), i = xe(u, { ecmaVersion: 2020 });
+function Ci(u, t = [], e = Be) {
+  const r = Oe(t, "name"), i = Me(u, { ecmaVersion: 2020 });
   return new R(
-    Nt(i.body[0].expression, r, e)
+    wt(i.body[0].expression, r, e)
   );
 }
 class X {
@@ -1278,7 +1278,7 @@ class X {
     return r.content && typeof r.content == "string" && r.content.startsWith("func::") && (r.content = new Function("return " + r.content.substring(6))()), this.create(r, e.options);
   }
 }
-class It {
+class Et {
   constructor(t, e) {
     this._type = "Attributives", this._options = e, this.uuid = S(e), this.content = t.content;
   }
@@ -1301,7 +1301,7 @@ class It {
     };
   }
   static create(t, e) {
-    const r = new It(t, e);
+    const r = new Et(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Attributives`);
     return this.instances.push(r), r;
@@ -1335,20 +1335,20 @@ class It {
 function Ot(u) {
   if (!u) return;
   if (u.raw.type === "atom")
-    return nt.create({
+    return ot.create({
       type: "atom",
       data: u.raw.data
     });
   const t = u.raw;
-  return ct.create({
+  return nt.create({
     type: "expression",
     operator: t.operator,
     left: Ot(u.left),
     right: Ot(u.right)
   });
 }
-function Ci(u) {
-  return It.create({
+function xi(u) {
+  return Et.create({
     content: Ot(u)
   });
 }
@@ -1472,7 +1472,7 @@ class jt {
     return r.content && typeof r.content == "string" && r.content.startsWith("func::") && (r.content = new Function("return " + r.content.substring(6))()), this.create(r, e.options);
   }
 }
-class be {
+class Re {
   constructor(t, e) {
     this._type = "QueryItem", this._options = e, this.uuid = S(e), this.name = t.name, this.value = t.value;
   }
@@ -1500,7 +1500,7 @@ class be {
     };
   }
   static create(t, e) {
-    const r = new be(t, e);
+    const r = new Re(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, QueryItem`);
     return this.instances.push(r), r;
@@ -1534,7 +1534,7 @@ class be {
     return this.create(e.public, e.options);
   }
 }
-class Re {
+class we {
   constructor(t, e) {
     this._type = "Query", this._options = e, this.uuid = S(e), this.items = t.items;
   }
@@ -1557,7 +1557,7 @@ class Re {
     };
   }
   static create(t, e) {
-    const r = new Re(t, e);
+    const r = new we(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Query`);
     return this.instances.push(r), r;
@@ -1589,7 +1589,7 @@ class Re {
     return this.create(e.public, e.options);
   }
 }
-class Ct {
+class It {
   constructor(t, e) {
     this._type = "Action", this._options = e, this.uuid = S(e), this.name = t.name;
   }
@@ -1611,7 +1611,7 @@ class Ct {
     };
   }
   static create(t, e) {
-    const r = new Ct(t, e);
+    const r = new It(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Action`);
     return this.instances.push(r), r;
@@ -1643,8 +1643,8 @@ class Ct {
     return this.create(e.public, e.options);
   }
 }
-const Be = Ct.create({ name: "get" });
-class st {
+const We = It.create({ name: "get" });
+class it {
   constructor(t, e) {
     this._type = "Gateway", this._options = e, this.uuid = S(e), this.name = t.name;
   }
@@ -1666,7 +1666,7 @@ class st {
     };
   }
   static create(t, e) {
-    const r = new st(t, e);
+    const r = new it(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Gateway`);
     return this.instances.push(r), r;
@@ -1892,7 +1892,7 @@ class Gt {
     return this.create(e.public, e.options);
   }
 }
-class lt {
+class ct {
   constructor(t, e) {
     this._type = "StateMachine", this._options = e, this.uuid = S(e), this.states = t.states, this.transfers = t.transfers, this.defaultState = t.defaultState;
   }
@@ -1925,7 +1925,7 @@ class lt {
     };
   }
   static create(t, e) {
-    const r = new lt(t, e);
+    const r = new ct(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, StateMachine`);
     return this.instances.push(r), r;
@@ -1961,7 +1961,7 @@ class lt {
     return this.create(e.public, e.options);
   }
 }
-class ut {
+class lt {
   constructor(t, e) {
     this._type = "WeightedSummation", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -2009,7 +2009,7 @@ class ut {
     };
   }
   static create(t, e) {
-    const r = new ut(t, e);
+    const r = new lt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, WeightedSummation`);
     return this.instances.push(r), r;
@@ -2051,7 +2051,7 @@ class ut {
     return r.callback && typeof r.callback == "string" && r.callback.startsWith("func::") && (r.callback = new Function("return " + r.callback.substring(6))()), this.create(r, e.options);
   }
 }
-class dt {
+class ut {
   constructor(t, e) {
     this._type = "Count", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -2094,7 +2094,7 @@ class dt {
     };
   }
   static create(t, e) {
-    const r = new dt(t, e);
+    const r = new ut(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Count`);
     return this.instances.push(r), r;
@@ -2135,7 +2135,7 @@ class dt {
     return r.callback && typeof r.callback == "string" && r.callback.startsWith("func::") && (r.callback = new Function("return " + r.callback.substring(6))()), this.create(r, e.options);
   }
 }
-class ht {
+class dt {
   constructor(t, e) {
     this._type = "Summation", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.attributeQuery = t.attributeQuery;
   }
@@ -2168,7 +2168,7 @@ class ht {
     };
   }
   static create(t, e) {
-    const r = new ht(t, e);
+    const r = new dt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Summation`);
     return this.instances.push(r), r;
@@ -2203,7 +2203,7 @@ class ht {
     return this.create(e.public, e.options);
   }
 }
-class pt {
+class ht {
   constructor(t, e) {
     this._type = "Average", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.attributeQuery = t.attributeQuery;
   }
@@ -2236,7 +2236,7 @@ class pt {
     };
   }
   static create(t, e) {
-    const r = new pt(t, e);
+    const r = new ht(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Average`);
     return this.instances.push(r), r;
@@ -2271,7 +2271,7 @@ class pt {
     return this.create(e.public, e.options);
   }
 }
-class ft {
+class pt {
   constructor(t, e) {
     this._type = "Every", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps, this.notEmpty = t.notEmpty;
   }
@@ -2319,7 +2319,7 @@ class ft {
     };
   }
   static create(t, e) {
-    const r = new ft(t, e);
+    const r = new pt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Every`);
     return this.instances.push(r), r;
@@ -2356,7 +2356,7 @@ class ft {
     return r.callback && typeof r.callback == "string" && r.callback.startsWith("func::") && (r.callback = new Function("return " + r.callback.substring(6))()), this.create(r, e.options);
   }
 }
-class mt {
+class ft {
   constructor(t, e) {
     this._type = "Any", this._options = e, this.uuid = S(e), this.record = t.record, this.property = t.property, this.direction = t.direction, this.callback = t.callback, this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps;
   }
@@ -2404,7 +2404,7 @@ class mt {
     };
   }
   static create(t, e) {
-    const r = new mt(t, e);
+    const r = new ft(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Any`);
     return this.instances.push(r), r;
@@ -2446,7 +2446,7 @@ class mt {
     return r.callback && typeof r.callback == "string" && r.callback.startsWith("func::") && (r.callback = new Function("return " + r.callback.substring(6))()), this.create(r, e.options);
   }
 }
-class xt {
+class Ct {
   constructor(t, e) {
     this._type = "Transform", this._options = e, this.uuid = S(e), this.record = t.record, this.eventDeps = t.eventDeps, this.attributeQuery = t.attributeQuery, this.callback = t.callback;
   }
@@ -2479,7 +2479,7 @@ class xt {
     };
   }
   static create(t, e) {
-    const r = new xt(t, e);
+    const r = new Ct(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Transform`);
     return this.instances.push(r), r;
@@ -2516,7 +2516,7 @@ class xt {
     return typeof r.callback == "string" && r.callback.startsWith("func::") && (r.callback = new Function("return " + r.callback.substring(6))()), this.create(r, e.options);
   }
 }
-class yt {
+class mt {
   constructor(t, e) {
     this._type = "RealTimeValue", this._options = e, this.uuid = S(e), this.attributeQuery = t.attributeQuery, this.dataDeps = t.dataDeps, this.nextRecomputeTime = t.nextRecomputeTime, this.callback = t.callback;
   }
@@ -2554,7 +2554,7 @@ class yt {
     };
   }
   static create(t, e) {
-    const r = new yt(t, e);
+    const r = new mt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, RealTimeValue`);
     return this.instances.push(r), r;
@@ -2800,19 +2800,19 @@ class Yt {
 function Ft(u) {
   if (!u) return;
   if (u.raw.type === "atom")
-    return nt.create({
+    return ot.create({
       type: "atom",
       data: u.raw.data
     });
   const t = u.raw;
-  return ct.create({
+  return nt.create({
     type: "expression",
     operator: t.operator,
     left: Ft(u.left),
     right: Ft(u.right)
   });
 }
-class Mt {
+class xt {
   constructor(t, e) {
     this._type = "Conditions", this._options = e, this.uuid = S(e), t.content && t.content instanceof R ? this.content = Ft(t.content) : this.content = t.content;
   }
@@ -2835,7 +2835,7 @@ class Mt {
     };
   }
   static create(t, e) {
-    const r = new Mt(t, e);
+    const r = new xt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Conditions`);
     return this.instances.push(r), r;
@@ -2920,7 +2920,7 @@ class zt {
     return this.create(e.public, e.options);
   }
 }
-const We = [
+const Je = [
   C,
   P,
   T,
@@ -2929,31 +2929,31 @@ const We = [
   X,
   Ht,
   jt,
-  Ct,
-  st,
+  It,
+  it,
   Ut,
   Y,
   Gt,
+  ct,
   lt,
   ut,
   dt,
   ht,
   pt,
   ft,
+  Ct,
   mt,
-  xt,
-  yt,
   Kt,
   Xt,
   Yt,
   Bt,
+  ot,
   nt,
-  ct,
-  Mt,
+  xt,
   zt
 ];
-We.forEach((u) => {
-  u && u.displayName && Oe(u.displayName, u);
+Je.forEach((u) => {
+  u && u.displayName && Fe(u.displayName, u);
 });
 class Zt {
   constructor(t, e) {
@@ -3062,7 +3062,7 @@ class Zt {
     }), this.create(r, e.options);
   }
 }
-class we {
+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();
   }
@@ -3273,7 +3273,7 @@ class we {
     return null;
   }
 }
-function xi({ name: u, isRef: t = !1 }, e) {
+function Mi({ name: u, isRef: t = !1 }, e) {
   return X.create({
     name: u,
     content: u ? new Function("user", `return user.roles.includes('${u}')`) : function() {
@@ -3286,7 +3286,7 @@ function g(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Pt(u, t, e) {
+function $t(u, t, e) {
   const r = [...t];
   let i = u, s;
   const a = r.pop();
@@ -3430,7 +3430,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 = r;
     o && (n = r ? a.matchExpression.and(r) : a.matchExpression), n && (this.data = this.convertFilteredRelation(n), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
@@ -3646,7 +3646,7 @@ class m {
     );
   }
 }
-class Je {
+class He {
   constructor(t, e, r, i) {
     this.recordName = t, this.map = e, this.data = r, this.fromRelation = i;
   }
@@ -3682,7 +3682,7 @@ class M {
       e,
       N,
       new x(h, e, r.attributeQuery || [], s, a),
-      new Je(h, e, r.modifier),
+      new He(h, e, r.modifier),
       i,
       s,
       a,
@@ -3721,7 +3721,7 @@ class M {
     );
   }
 }
-class q {
+class _ {
   // 父节点和自己这个几点 link 上的 query
   constructor(t, e, r, i, s, a, o) {
     this.recordName = t, this.map = e, this.parentRecord = r, this.attributeName = i, 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 || {}, r && (this.info = this.map.getInfo(this.parentRecord, this.attributeName));
@@ -3731,26 +3731,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(r);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(r);
     else {
       const i = this.map.getInfo(this.recordName, e);
-      this.records[e] || (this.records[e] = new q(i.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(r);
+      this.records[e] || (this.records[e] = new _(i.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(r);
     }
   }
   addRecord(t, e) {
     const [r, ...i] = t;
     if (t.length === 1)
       if (r === 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, r), a = e || new q(s.recordName, this.map, this.recordName, r, void 0, this);
+        const s = this.map.getInfo(this.recordName, r), a = e || new _(s.recordName, this.map, this.recordName, r, void 0, this);
         this.records[r] = this.records[r] ? this.records[r].merge(a) : a;
       }
     else if (r === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(i, e);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(i, e);
     else {
       const s = this.map.getInfo(this.recordName, r);
-      this.records[r] = new q(s.recordName, this.map, this.recordName, r, void 0, this), this.records[r].addRecord(i, e);
+      this.records[r] = new _(s.recordName, this.map, this.recordName, r, void 0, this), this.records[r].addRecord(i, e);
     }
   }
   forEachRecords(t) {
@@ -3765,7 +3765,7 @@ class q {
       this.records[a] && t.records[a] ? i[a] = this.records[a].merge(t.records[a]) : this.records[a] ? i[a] = this.records[a] : i[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: i }, 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: i }, this.parent, s);
   }
   getData() {
     const t = {
@@ -3776,7 +3776,7 @@ class q {
     }), this.parentLinkQueryTree && (t[f] = this.parentLinkQueryTree.getData()), t;
   }
 }
-const f = "&", He = "*";
+const f = "&", je = "*";
 class x {
   constructor(t, e, r = [], i, s, a) {
     this.recordName = t, this.map = e, this.data = r, this.parentRecord = i, this.attributeName = s, this.shouldQueryParentLinkData = a, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [], this.id = Math.random();
@@ -3789,7 +3789,7 @@ class x {
         this.parentLinkRecordQuery = M.create(y.linkName, this.map, d, void 0);
         return;
       }
-      if (l === He) {
+      if (l === je) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
         return;
       }
@@ -3798,10 +3798,10 @@ class x {
         let y = l, N = d;
         if (p.isLinkFiltered()) {
           y = p.getBaseAttributeInfo().attributeName;
-          const k = d.matchExpression, F = p.getLinkInfo().getBaseLinkInfo(), se = new m(F.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Ce = k ? se.and(k.data) : se;
+          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: Ce.data
+            matchExpression: xe.data
           };
         }
         const b = M.create(p.recordName, this.map, N, void 0, this.recordName, y, h, !1, l);
@@ -3898,7 +3898,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) => {
@@ -3910,7 +3910,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;
@@ -3919,7 +3919,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;
 }
@@ -3929,7 +3929,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, r ? Object.keys(r) : []);
-    this.relatedEntitiesData = je(o.map(
+    this.relatedEntitiesData = Ue(o.map(
       (l) => Array.isArray(r[l.attributeName]) ? r[l.attributeName].map((d) => new L(this.map, l.recordName, d, l)) : new L(this.map, l.recordName, r[l.attributeName], l)
     )), this.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
@@ -4006,7 +4006,7 @@ class L {
     }), r;
   }
 }
-class Ue {
+class Ge {
   constructor(t, e) {
     this.map = t, this.queryAgent = e, this.dependencies = /* @__PURE__ */ new Map();
   }
@@ -4232,7 +4232,7 @@ class Ue {
     }
   }
 }
-class Ge {
+class Ke {
   constructor() {
     this.aliasToPath = /* @__PURE__ */ new Map(), this.pathStrToAlias = /* @__PURE__ */ new Map(), this.aliasPlaceholder = 0;
   }
@@ -4246,24 +4246,24 @@ class Ge {
     return this.aliasToPath.get(t);
   }
 }
-const Ne = ":root";
-class St {
+const Te = ":root";
+class Tt {
   constructor(t, e, r = []) {
     this.label = t, this.parent = e, this.stack = r;
   }
   concat(t) {
-    return new St(this.label, this.parent, [...this.stack, t]);
+    return new Tt(this.label, this.parent, [...this.stack, t]);
   }
   getStack(t) {
     return [...this.stack];
   }
   spawn(t) {
-    return new St(t, this);
+    return new Tt(t, this);
   }
 }
-class Ke {
+class Xe {
   constructor(t) {
-    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Ne, 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) => {
@@ -4277,9 +4277,9 @@ class Ke {
     return this.recordQueryByName.get(t);
   }
 }
-class Xe {
+class Ye {
   constructor(t, e) {
-    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (r) => "?"), this.filteredEntityManager = new Ue(t, this), this.initializeFilteredEntityDependencies();
+    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (r) => "?"), this.filteredEntityManager = new Ge(t, this), this.initializeFilteredEntityDependencies();
   }
   /**
    * 初始化所有 filtered entity 的依赖关系
@@ -4331,15 +4331,15 @@ ${b}
       const s = {};
       return Object.entries(i).forEach(([a, o]) => {
         const n = r.getPath(a).slice(1, 1 / 0);
-        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && Pt(s, n, o);
+        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && $t(s, n, o);
       }), s;
     });
   }
   // 查 entity 和 查 relation 都是一样的。具体在 entityQuery 里面区别。
   // TODO 为了性能，也可以把信息丢到客户端，然客户端去结构化？？？
   // CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
-  async findRecords(t, e = "", r, i = new St(Ne)) {
-    if (r || (r = new Ke(t)), t.goto) {
+  async findRecords(t, e = "", r, i = new Tt(Te)) {
+    if (r || (r = new Xe(t)), t.goto) {
       if (t.exit && await t.exit(i))
         return [];
       const l = r.get(t.goto);
@@ -4378,7 +4378,7 @@ ${b}
                 value: ["=", b]
               })
             }), F = t.label ? c.concat(N) : c;
-            Pt(
+            $t(
               N,
               [l.alias || l.attributeName, f, h.attributeName],
               await this.findRecords(
@@ -4466,7 +4466,7 @@ ${b}
       for (let b of N.attributeQuery.xToManyRecords)
         for (let k of p) {
           const F = k[f].id, ie = d.label ? y.concat(k) : y;
-          Pt(
+          $t(
             k,
             [f, b.attributeName],
             await this.findXToManyRelatedRecords(
@@ -4548,7 +4548,7 @@ ${b}
     return t ? `${t}___` : "";
   }
   buildSelectClause(t, e = "") {
-    const r = new Ge();
+    const r = new Ke();
     return t.length ? [t.map(({ tableAliasAndField: s, attribute: a, nameContext: o }) => {
       const n = [
         `${this.withPrefix(e)}${o[0]}`,
@@ -5120,9 +5120,9 @@ WHERE "${s.idField}" = ${l()}
     return p ? [N, ...p] : void 0;
   }
 }
-class Ye {
+class ze {
   constructor(t, e) {
-    this.map = t, this.database = e, this.agent = new Xe(t, e);
+    this.map = t, this.database = e, this.agent = new Ye(t, e);
   }
   async findOne(t, e, r = {}, i) {
     const s = {
@@ -5145,7 +5145,6 @@ class Ye {
     return this.agent.findRecords(s, `finding ${t} from handle`);
   }
   async create(t, e, r) {
-    g(e[et] === null || e[et] === void 0, `${et} should be null or undefined when creating new record`);
     const i = new L(this.map, t, e);
     return this.agent.createRecord(i, `create record ${t} from handle`, r);
   }
@@ -5192,7 +5191,7 @@ class Ye {
     return this.map.getInfo(t, e).recordName;
   }
 }
-class at {
+class st {
   constructor(t, e) {
     this.name = t, this.map = e, this.data = this.map.data.records[t];
   }
@@ -5263,7 +5262,7 @@ class at {
     return this.data.matchExpression;
   }
   get filteredBy() {
-    return this.data.filteredBy?.map((t) => new at(t, this.map));
+    return this.data.filteredBy?.map((t) => new st(t, this.map));
   }
   get isFilteredEntity() {
     return this.data?.isFilteredEntity;
@@ -5281,7 +5280,7 @@ class at {
     return this.data?.resolvedMatchExpression;
   }
 }
-class vt {
+class St {
   constructor(t, e, r, i = !0) {
     this.name = t, this.data = e, this.map = r, this.isFromSource = i;
   }
@@ -5310,10 +5309,10 @@ class vt {
     return this.data.sourceRecord;
   }
   get sourceRecordInfo() {
-    return new at(this.data.sourceRecord, this.map);
+    return new st(this.data.sourceRecord, this.map);
   }
   get targetRecordInfo() {
-    return new at(this.data.targetRecord, this.map);
+    return new st(this.data.targetRecord, this.map);
   }
   get targetRecord() {
     return this.data.targetRecord;
@@ -5369,7 +5368,7 @@ class vt {
   getBaseLinkInfo() {
     g(this.isFilteredRelation(), "only filtered relation can get base link info");
     const t = this.data.baseLinkName;
-    return new vt(t, this.map.data.links[t], this.map);
+    return new St(t, this.map.data.links[t], this.map);
   }
   getMatchExpression() {
     if (this.isFilteredRelation())
@@ -5383,7 +5382,7 @@ class vt {
     return g(this.isFilteredRelation(), "only filtered relation can get resolved record name"), this.data.resolvedBaseRecordName;
   }
 }
-class ze {
+class Ze {
   constructor(t) {
     this.data = t;
   }
@@ -5397,7 +5396,7 @@ class ze {
     return this.data.records[t].attributes[this.getAttributeAndSymmetricDirection(e)[0]];
   }
   getRecordInfo(t) {
-    return new at(t, this);
+    return new st(t, this);
   }
   getInfo(t, e) {
     const r = this.getInfoByPath([t, ...e.split(".")]);
@@ -5408,10 +5407,10 @@ class ze {
   }
   getLinkInfo(t, e) {
     const r = this.getAttributeAndSymmetricDirection(e)[0], { linkName: i, isSource: s } = this.data.records[t].attributes[r];
-    return g(!!i, `cannot find relation ${t} ${r}`), new vt(i, this.data.links[i], this, !!s);
+    return g(!!i, `cannot find relation ${t} ${r}`), new St(i, this.data.links[i], this, !!s);
   }
   getLinkInfoByName(t) {
-    return g(!!this.data.links[t], `cannot find link ${t}`), new vt(t, this.data.links[t], this);
+    return g(!!this.data.links[t], `cannot find link ${t}`), new St(t, this.data.links[t], this);
   }
   getInfoByPath(t) {
     const [e, ...r] = t;
@@ -5579,7 +5578,7 @@ class ze {
     return i.join(".");
   }
 }
-function Ze(u) {
+function tr(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u)
     if (e.inputEntities)
@@ -5590,7 +5589,7 @@ function Ze(u) {
     }
   return t;
 }
-function tr(u) {
+function er(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u) {
     const r = e.name || `${e.source.name}_${e.sourceProperty}_${e.targetProperty}_${e.target.name}`;
@@ -5604,8 +5603,8 @@ function tr(u) {
   }
   return t;
 }
-function er(u, t) {
-  const e = new we(u, t), r = Ze(u), i = tr(t);
+function rr(u, t) {
+  const e = new Ne(u, t), r = tr(u), i = er(t);
   return oe(
     u,
     e,
@@ -5620,30 +5619,30 @@ function er(u, t) {
 }
 function oe(u, t, e, r) {
   const i = u.filter((s) => {
-    const a = bt(s);
+    const a = gt(s);
     return a && a.length > 0;
   });
   if (i.length !== 0)
     for (const s of i)
-      rr(
+      ir(
         s,
         t,
         r,
         e
       );
 }
-function rr(u, t, e, r) {
-  const i = e === "entity", a = `__${z(u)}_input_${e}`, o = i ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = nr(
+function ir(u, t, e, r) {
+  const i = e === "entity", a = `__${z(u)}_input_${e}`, o = i ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = cr(
     o,
     a,
     r,
     t
   );
   t.replace(n, u), c !== n && t.add(c);
-  const l = bt(u);
+  const l = gt(u);
   if (l)
     for (const d of l)
-      ir(
+      sr(
         d,
         c,
         a,
@@ -5651,8 +5650,8 @@ function rr(u, t, e, r) {
         i
       );
 }
-function ir(u, t, e, r, i) {
-  const [s, a] = cr(
+function sr(u, t, e, r, i) {
+  const [s, a] = lr(
     u,
     t,
     e
@@ -5662,8 +5661,8 @@ function ir(u, t, e, r, i) {
   const o = z(a), n = i ? r.getEntityByName(o) : r.getRelationByName(o);
   n && r.replace(s, n);
 }
-function sr(u, t) {
-  const e = /* @__PURE__ */ new Map(), r = bt(u);
+function ar(u, t) {
+  const e = /* @__PURE__ */ new Map(), r = gt(u);
   if (r && r.length > 0)
     for (const i of r) {
       const s = z(i), a = [...t.get(s) || []], o = e.get(s) || [];
@@ -5676,27 +5675,27 @@ function sr(u, t) {
     }
   return e;
 }
-function ar(u, t, e) {
-  const r = sr(t, e);
+function or(u, t, e) {
+  const r = ar(t, e);
   return T.create({
     name: u,
     type: "json",
     defaultValue: (i, s) => {
-      const a = bt(t), n = (r.get(s) || []).filter(
+      const a = gt(t), n = (r.get(s) || []).filter(
         (c) => a.some((l) => z(l) === c)
       );
       return n.length > 0 ? n : [s];
     }
   });
 }
-function or(u, t, e) {
-  const r = bt(u), i = [], s = /* @__PURE__ */ new Map(), a = {};
+function nr(u, t, e) {
+  const r = gt(u), i = [], s = /* @__PURE__ */ new Map(), a = {};
   for (const o of r) {
     let n = o;
-    if (gt(n))
+    if (yt(n))
       for (; n.baseEntity && n.properties.length === 0; )
         n = n.baseEntity;
-    else if (ur(n))
+    else if (dr(n))
       for (; n.baseRelation && n.properties.length === 0; )
         n = n.baseRelation;
     const c = Object.fromEntries(n.properties.map((h) => [h.name, h]));
@@ -5726,13 +5725,13 @@ function or(u, t, e) {
   }
   return i;
 }
-function nr(u, t, e, r) {
-  const i = ar(
+function cr(u, t, e, r) {
+  const i = or(
     t,
     u,
     e
   ), s = [
-    ...or(
+    ...nr(
       u,
       e,
       r
@@ -5740,7 +5739,7 @@ function nr(u, t, e, r) {
     i,
     ...u.properties
   ];
-  if (gt(u)) {
+  if (yt(u)) {
     const a = r.getEntityByName(u.name), o = C.create({
       name: a.name
     });
@@ -5790,8 +5789,8 @@ function nr(u, t, e, r) {
     return [o, n || o];
   }
 }
-function cr(u, t, e) {
-  if (gt(u)) {
+function lr(u, t, e) {
+  if (yt(u)) {
     const r = u, i = t;
     let s = r;
     if (r.baseEntity)
@@ -5804,7 +5803,7 @@ function cr(u, t, e) {
     }), [a, s];
   } else {
     const r = u, i = t, s = z(r);
-    return r.baseRelation ? [r, lr(r)] : [P.create({
+    return r.baseRelation ? [r, ur(r)] : [P.create({
       name: s,
       baseRelation: i,
       sourceProperty: r.sourceProperty,
@@ -5816,25 +5815,25 @@ function cr(u, t, e) {
     }), r];
   }
 }
-function lr(u) {
+function ur(u) {
   let t = u;
   for (; t.baseRelation; )
     t = t.baseRelation;
   return t;
 }
-function gt(u) {
+function yt(u) {
   return "inputEntities" in u || !("sourceProperty" in u);
 }
-function ur(u) {
+function dr(u) {
   return "sourceProperty" in u;
 }
-function bt(u) {
-  return gt(u) ? u.inputEntities || [] : u.inputRelations || [];
+function gt(u) {
+  return yt(u) ? u.inputEntities || [] : u.inputRelations || [];
 }
 function z(u) {
-  return gt(u), u.name;
+  return yt(u), u.name;
 }
-class dr {
+class hr {
   constructor(t, e, r, i = []) {
     this.entities = t, this.relations = e, this.database = r, this.mergeLinks = i, 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();
   }
@@ -5929,8 +5928,8 @@ class dr {
         }
       ];
     }));
-    e && g(!r.source && !r.target, "source and target is reserved name for relation attributes"), r[et] = {
-      name: et,
+    e && g(!r.source && !r.target, "source and target is reserved name for relation attributes"), r[ne] = {
+      name: ne,
       type: "id",
       fieldType: this.database.mapToDBFieldType("pk")
     };
@@ -6113,7 +6112,7 @@ class dr {
    * 统一处理 merged entities 和 merged relations
    */
   processMergedItems() {
-    const t = er(
+    const t = rr(
       this.entities,
       this.relations
     );
@@ -6182,8 +6181,8 @@ class dr {
   buildTables() {
     Object.entries(this.map.records).forEach(([t, e]) => {
       this.tables[e.table] || (this.tables[e.table] = { columns: {
-        [ot]: {
-          name: ot,
+        [at]: {
+          name: at,
           type: "pk",
           fieldType: this.database.mapToDBFieldType("pk")
         }
@@ -6227,86 +6226,345 @@ ${Object.values(this.tables[t].columns).map((r) => `    "${r.name}" ${r.fieldTyp
     return this.fieldCounter++, this.fieldNameMap.set(t, i), this.usedFieldNames.add(i), i;
   }
 }
-class A {
-  static {
-    this.skip = () => new kt();
-  }
-  static {
-    this.resolved = (t, e) => new ve(t, e);
-  }
-  static {
-    this.async = (t) => new Se(t);
-  }
-  static {
-    this.fullRecompute = (t) => new Te(t);
-  }
-}
-class kt extends A {
-}
-class Te extends A {
-  constructor(t) {
-    super(), this.reason = t;
-  }
-}
-class Se extends A {
-  constructor(t) {
-    super(), this.args = t;
-  }
-}
-class ve extends A {
+const tt = "_System_", q = "_Dictionary_", ne = "id", at = "_rowId", pr = C.create({
+  name: tt,
+  properties: [
+    T.create({
+      name: "concept",
+      type: "string",
+      collection: !1
+    }),
+    T.create({
+      name: "key",
+      type: "string",
+      collection: !1
+    }),
+    T.create({
+      name: "value",
+      type: "string",
+      collection: !1
+    })
+  ]
+}), fr = C.create({
+  name: q,
+  properties: [
+    T.create({
+      name: "key",
+      type: "string",
+      collection: !1
+    }),
+    T.create({
+      name: "value",
+      type: "json",
+      collection: !1
+    })
+  ]
+}), $i = 0, Pt = 1, Pi = 2;
+class mr {
   constructor(t, e) {
-    super(), this.result = t, this.args = e;
+    this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
   }
-}
-class E {
-  constructor(t, e) {
-    this.defaultValue = t, this.record = e;
+  /**
+   * 初始化或重新初始化 SourceMap 数据
+   * @param sourceMaps EntityEventSourceMap 数组
+   */
+  initialize(t) {
+    const e = [[], [], []];
+    for (const r of t)
+      if (this.scheduler.isDataBasedComputation(r)) {
+        if (Object.entries(r.dataDeps).forEach(([i, s]) => {
+          const a = this.convertDataDepToERMutationEventsSourceMap(i, s, r);
+          e[s.phase || Pt].push(...a);
+        }), r.dataContext.type === "property" && Object.values(r.dataDeps).some((i) => i.type === "global")) {
+          const i = {
+            type: "records",
+            source: r.dataContext.host
+          };
+          e[Pt].push(...this.convertDataDepToERMutationEventsSourceMap("_self", i, r, "create"));
+        }
+      } else {
+        const { eventDeps: i } = r;
+        for (const s of Object.values(i))
+          e[s.phase || Pt].push({
+            type: s.type,
+            recordName: s.recordName,
+            record: s.record,
+            oldRecord: s.oldRecord,
+            computation: r
+          });
+      }
+    this.sourceMaps = e.flat(), this.sourceMapTree = this.buildDataSourceMapTree(this.sourceMaps);
   }
-  async set(t, e) {
-    return await this.controller.system.storage.update(this.record, m.atom({ key: "id", value: ["=", t.id] }), { [this.key]: e }), e;
+  /**
+   * 添加新的 SourceMap
+   * @param sourceMap 要添加的 EntityEventSourceMap
+   */
+  addSourceMap(t) {
+    this.sourceMaps.push(t), this.addToTree(t);
   }
-  async get(t) {
-    if (t[this.key] === void 0) {
-      const r = (await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]))?.[this.key];
-      return r !== void 0 ? r : this.defaultValue;
-    }
-    return t[this.key];
+  /**
+   * 批量添加 SourceMap
+   * @param sourceMaps 要添加的 EntityEventSourceMap 数组
+   */
+  addSourceMaps(t) {
+    this.sourceMaps.push(...t), t.forEach((e) => this.addToTree(e));
   }
-}
-class B {
-  constructor(t) {
-    this.defaultValue = t;
+  /**
+   * 根据 mutation event 查找对应的 SourceMap
+   * @param mutationEvent RecordMutationEvent
+   * @returns 匹配的 EntityEventSourceMap 数组
+   */
+  findSourceMapsForMutation(t) {
+    return this.sourceMapTree[t.recordName]?.[t.type] || [];
   }
-  async set(t) {
-    return await this.controller.system.storage.dict.set(this.key, t), t;
+  /**
+   * 检查 update 类型的更新对 DataBasedComputation 是否需要触发计算
+   * @param source EntityEventSourceMap
+   * @param mutationEvent RecordMutationEvent
+   * @returns 是否需要触发计算
+   */
+  shouldTriggerUpdateComputation(t, e) {
+    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((i) => i !== "id").every(
+      (i) => !e.record.hasOwnProperty(i) || e.record[i] === e.oldRecord[i]
+    );
   }
-  async get() {
-    return await this.controller.system.storage.dict.get(this.key);
+  /**
+   * 检查 EventBasedComputation 的 eventDep 是否匹配当前的 mutation event
+   * @param source EventBasedEntityEventsSourceMap  
+   * @param mutationEvent RecordMutationEvent
+   * @returns 是否匹配
+   */
+  shouldTriggerEventBasedComputation(t, e) {
+    const r = t;
+    if (r.record !== void 0) {
+      let i = e.record;
+      if (e.type === "update" && e.oldRecord && (i = { ...e.oldRecord, ...e.record }), !this.deepMatch(i, r.record))
+        return !1;
+    }
+    return !(r.oldRecord !== void 0 && !this.deepMatch(e.oldRecord, r.oldRecord));
   }
-}
-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) || !Qt(u[e], t[e]))
+  /**
+   * 深度匹配对象
+   * @param actual 实际的对象
+   * @param expected 期望匹配的模式
+   * @returns 是否匹配
+   */
+  deepMatch(t, e) {
+    if (e == null || typeof e != "object")
+      return t === e;
+    if (typeof t != "object" || t === null)
       return !1;
-  return !0;
-}
-class ke {
-  constructor(t) {
-    this.data = t, this.map = {};
-    for (const e of t.transfers)
-      this.map[e.current.name] || (this.map[e.current.name] = []), this.map[e.current.name].push({
-        trigger: e.trigger,
-        next: e.next
-      });
+    for (const r in e)
+      if (e.hasOwnProperty(r) && (!(r in t) || !this.deepMatch(t[r], e[r])))
+        return !1;
+    return !0;
   }
-  findNextState(t, e) {
-    const r = this.map[t];
-    if (r) {
+  convertDataDepToERMutationEventsSourceMap(t, e, r, i, s = !1) {
+    const a = [];
+    if (e.type === "records")
+      (!i || i === "create") && a.push({
+        dataDep: e,
+        type: "create",
+        recordName: e.source.name,
+        sourceRecordName: e.source.name,
+        computation: r,
+        isInitial: s
+      }), (!i || i === "delete") && a.push({
+        dataDep: e,
+        type: "delete",
+        recordName: e.source.name,
+        sourceRecordName: e.source.name,
+        computation: r
+      }), (!i || i === "update") && e.attributeQuery && a.push(...this.convertAttrsToERMutationEventsSourceMap(e, e.source.name, e.attributeQuery, [], r, !1));
+    else if (e.type === "property") {
+      const o = r.dataContext;
+      e.attributeQuery && a.push(...this.convertAttrsToERMutationEventsSourceMap(e, o.host.name, e.attributeQuery, [], r, !0));
+    } else e.type === "global" && ((!i || i === "update") && a.push({
+      dataDep: e,
+      type: "update",
+      recordName: q,
+      sourceRecordName: q,
+      attributes: ["value"],
+      computation: r
+    }), (!i || i === "create") && a.push({
+      dataDep: e,
+      type: "create",
+      recordName: q,
+      sourceRecordName: q,
+      computation: r
+    }));
+    return a;
+  }
+  convertAttrsToERMutationEventsSourceMap(t, e, r, i, s, a = !1) {
+    const o = [], n = [], c = [];
+    if (r.forEach((l) => {
+      if (typeof l == "string" && l !== "*")
+        n.push(l);
+      else if (l !== "*") if (Array.isArray(l))
+        c.push(l);
+      else
+        throw new Error(`unknown attribute type: ${l}`);
+    }), n.length > 0) {
+      let l = e;
+      i.length > 0 && (i.at(-1) === "&" ? l = this.controller.system.storage.getRelationName(e, i.slice(0, -1).join(".")) : l = this.controller.system.storage.getEntityName(e, i.join("."))), a && o.push({
+        dataDep: t,
+        type: "create",
+        recordName: l,
+        sourceRecordName: e,
+        targetPath: i,
+        computation: s
+      }), o.push({
+        dataDep: t,
+        type: "update",
+        recordName: l,
+        sourceRecordName: e,
+        targetPath: i,
+        attributes: n,
+        computation: s
+      });
+    }
+    return c.forEach(([l, d]) => {
+      o.push(...this.convertRelationAttrToERMutationEventsSourceMap(t, e, d.attributeQuery, i.concat(l), s));
+    }), o;
+  }
+  convertRelationAttrToERMutationEventsSourceMap(t, e, r, i, s) {
+    const a = [];
+    if (i.at(-1) !== "&") {
+      const o = this.controller.system.storage.getRelationName(e, i.join("."));
+      a.push({
+        dataDep: t,
+        type: "create",
+        recordName: o,
+        sourceRecordName: e,
+        isRelation: !0,
+        targetPath: i,
+        computation: s
+      }, {
+        dataDep: t,
+        type: "delete",
+        recordName: o,
+        sourceRecordName: e,
+        isRelation: !0,
+        targetPath: i,
+        computation: s
+      });
+    }
+    return r.length > 0 && a.push(...this.convertAttrsToERMutationEventsSourceMap(t, e, r, i, s)), a;
+  }
+  /**
+   * 获取 SourceMapTree 的只读副本
+   * @returns DataSourceMapTree 的副本
+   */
+  getSourceMapTree() {
+    const t = {};
+    for (const [e, r] of Object.entries(this.sourceMapTree)) {
+      t[e] = {};
+      for (const [i, s] of Object.entries(r))
+        t[e][i] = [...s];
+    }
+    return t;
+  }
+  /**
+   * 私有方法：构建 SourceMap 树结构
+   * @param sourceMaps EntityEventSourceMap 数组
+   * @returns 两层结构的树，第一层是 recordName，第二层是 type
+   */
+  buildDataSourceMapTree(t) {
+    const e = {};
+    return t.forEach((r) => {
+      this.addToTree(r, e);
+    }), e;
+  }
+  /**
+   * 私有方法：将单个 SourceMap 添加到树结构中
+   * @param source EntityEventSourceMap
+   * @param tree 可选的目标树，默认使用实例的 sourceMapTree
+   */
+  addToTree(t, e) {
+    const r = e || this.sourceMapTree;
+    r[t.recordName] || (r[t.recordName] = {}), r[t.recordName][t.type] || (r[t.recordName][t.type] = []), r[t.recordName][t.type].push(t);
+  }
+}
+class A {
+  static {
+    this.skip = () => new vt();
+  }
+  static {
+    this.resolved = (t, e) => new ke(t, e);
+  }
+  static {
+    this.async = (t) => new ve(t);
+  }
+  static {
+    this.fullRecompute = (t) => new Se(t);
+  }
+}
+class vt extends A {
+}
+class Se extends A {
+  constructor(t) {
+    super(), this.reason = t;
+  }
+}
+class ve extends A {
+  constructor(t) {
+    super(), this.args = t;
+  }
+}
+class ke extends A {
+  constructor(t, e) {
+    super(), this.result = t, this.args = e;
+  }
+}
+class E {
+  constructor(t, e) {
+    this.defaultValue = t, this.record = e;
+  }
+  async set(t, e) {
+    return await this.controller.system.storage.update(this.record, m.atom({ key: "id", value: ["=", t.id] }), { [this.key]: e }), e;
+  }
+  async get(t) {
+    if (t[this.key] === void 0) {
+      const r = (await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]))?.[this.key];
+      return r !== void 0 ? r : this.defaultValue;
+    }
+    return t[this.key];
+  }
+}
+class B {
+  constructor(t) {
+    this.defaultValue = t;
+  }
+  async set(t) {
+    return await this.controller.system.storage.dict.set(this.key, t), t;
+  }
+  async get() {
+    return await this.controller.system.storage.dict.get(this.key);
+  }
+}
+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) || !Qt(u[e], t[e]))
+      return !1;
+  return !0;
+}
+class Ae {
+  constructor(t) {
+    this.data = t, this.map = {};
+    for (const e of t.transfers)
+      this.map[e.current.name] || (this.map[e.current.name] = []), this.map[e.current.name].push({
+        trigger: e.trigger,
+        next: e.next
+      });
+  }
+  findNextState(t, e) {
+    const r = this.map[t];
+    if (r) {
       for (const i of r)
         if (Qt(e, i.trigger))
           return i.next;
@@ -6321,32 +6579,32 @@ function v(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Mi(u, t) {
+function Di(u, t) {
   return new Map(Array.from(u.entries()).map(([e, r]) => [e, t(e, r)]));
 }
-function $i(u, t) {
+function Oi(u, t) {
   return Object.fromEntries(Object.entries(u).map(([e, r]) => [e, t(e, r)]));
 }
-async function Pi(u, t) {
+async function Fi(u, t) {
   for (let e of u)
     if (!await t(e)) return !1;
   return !0;
 }
-async function hr(u, t) {
+async function yr(u, t) {
   for (let e of u)
     if (await t(e)) return !0;
   return !1;
 }
-async function pr(u, t) {
+async function gr(u, t) {
   for (let e of u) {
     const r = await t(e);
     if (r !== !0) return r;
   }
   return !0;
 }
-class fr {
+class br {
   constructor(t, e, r) {
-    this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ke(this.args), this.defaultState = this.args.defaultState;
+    this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new Ae(this.args), this.defaultState = this.args.defaultState;
     for (const i of this.args.transfers) {
       const s = `${i.trigger.recordName}_${i.trigger.type}`;
       this.eventDeps[s] = {
@@ -6356,7 +6614,7 @@ class fr {
     }
   }
   static {
-    this.computationType = lt;
+    this.computationType = ct;
   }
   static {
     this.contextType = "global";
@@ -6375,9 +6633,9 @@ class fr {
     return s ? (await this.state.currentState.set(s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : A.skip();
   }
 }
-class mr {
+class Rr {
   constructor(t, e, r) {
-    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ke(this.args), this.defaultState = this.args.defaultState, this.dataContext = r;
+    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 = r;
     for (const i of this.args.transfers) {
       const s = `${i.trigger.recordName}_${i.trigger.type}`;
       this.eventDeps[s] = {
@@ -6387,7 +6645,7 @@ class mr {
     }
   }
   static {
-    this.computationType = lt;
+    this.computationType = ct;
   }
   static {
     this.contextType = "property";
@@ -6423,17 +6681,17 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     };
   }
 }
-const Di = Y.create({
+const Qi = Y.create({
   name: "nonExistent",
   computeValue: () => null
-}), Oi = Y.create({
+}), Vi = Y.create({
   name: "nonDeleted",
   computeValue: () => !1
-}), Fi = Y.create({
+}), Li = Y.create({
   name: "deleted",
   computeValue: () => !0
-}), yr = [fr, mr];
-class gr {
+}), wr = [br, Rr];
+class Nr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.record = this.args.record, this.dataDeps = {
       main: {
@@ -6445,7 +6703,7 @@ class gr {
     };
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "global";
@@ -6486,7 +6744,7 @@ class gr {
     return r;
   }
 }
-class br {
+class Tr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === r.host && a.sourceProperty === this.args.property || a.target === r.host && a.targetProperty === this.args.property), v(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.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 i = this.args.attributeQuery || [];
@@ -6504,7 +6762,7 @@ class br {
     };
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "property";
@@ -6562,8 +6820,8 @@ class br {
     return s;
   }
 }
-const Rr = [gr, br];
-class wr {
+const Sr = [Nr, Tr];
+class vr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6575,7 +6833,7 @@ class wr {
     }, this.defaultValue = !this.args.notEmpty;
   }
   static {
-    this.computationType = ft;
+    this.computationType = pt;
   }
   static {
     this.contextType = "global";
@@ -6616,7 +6874,7 @@ class wr {
     return a === s;
   }
 }
-class Nr {
+class kr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === r.host && a.sourceProperty === this.args.property || a.target === r.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.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 i = this.args.attributeQuery || [];
@@ -6635,7 +6893,7 @@ class Nr {
     };
   }
   static {
-    this.computationType = ft;
+    this.computationType = pt;
   }
   static {
     this.contextType = "property";
@@ -6690,8 +6948,8 @@ class Nr {
     return a === o;
   }
 }
-const Tr = [wr, Nr];
-class Sr {
+const Ar = [vr, kr];
+class Er {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6703,7 +6961,7 @@ class Sr {
     };
   }
   static {
-    this.computationType = mt;
+    this.computationType = ft;
   }
   static {
     this.contextType = "global";
@@ -6744,7 +7002,7 @@ class Sr {
     return s > 0;
   }
 }
-class vr {
+class Ir {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === r.host && n.sourceProperty === this.args.property || n.target === r.host && n.targetProperty === this.args.property), v(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 === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.host, "any computation relation direction error");
     let i = this.relation.baseRelation || this.relation;
@@ -6767,7 +7025,7 @@ class vr {
     };
   }
   static {
-    this.computationType = mt;
+    this.computationType = ft;
   }
   static {
     this.contextType = "property";
@@ -6820,8 +7078,8 @@ class vr {
     return s > 0;
   }
 }
-const kr = [Sr, vr];
-class Ar {
+const Cr = [Er, Ir];
+class xr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, this.callback = this.args.callback?.bind(this) || (() => !0), this.dataDeps = {
       main: {
@@ -6833,7 +7091,7 @@ class Ar {
     };
   }
   static {
-    this.computationType = dt;
+    this.computationType = ut;
   }
   static {
     this.contextType = "global";
@@ -6871,7 +7129,7 @@ class Ar {
     return s = Math.max(0, s), await this.state.count.set(s), s;
   }
 }
-class Er {
+class Mr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, 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 === r.host && a.sourceProperty === this.args.property || a.target === r.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.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 i = this.args.attributeQuery || [];
@@ -6889,7 +7147,7 @@ class Er {
     };
   }
   static {
-    this.computationType = dt;
+    this.computationType = ut;
   }
   static {
     this.contextType = "property";
@@ -6953,8 +7211,8 @@ class Er {
     return a;
   }
 }
-const Ir = [Ar, Er];
-class Cr {
+const $r = [xr, Mr];
+class Pr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, v(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), v(!(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 : (v(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
       ...this.args.dataDeps || {},
@@ -6966,7 +7224,7 @@ class Cr {
     });
   }
   static {
-    this.computationType = xt;
+    this.computationType = Ct;
   }
   static {
     this.contextType = ["entity", "relation"];
@@ -7062,7 +7320,7 @@ class Cr {
     return i;
   }
 }
-const xr = [Cr];
+const Dr = [Pr];
 class $ {
   constructor(t) {
     this.node = t;
@@ -7161,10 +7419,10 @@ class $ {
     }
   }
   gt(t) {
-    return new At(this, ">", t);
+    return new kt(this, ">", t);
   }
   lt(t) {
-    return new At(this, "<", t);
+    return new kt(this, "<", t);
   }
   eq(t) {
     return new te(this, t);
@@ -7264,7 +7522,7 @@ class $ {
     }
   }
 }
-class At {
+class kt {
   constructor(t, e, r) {
     this.left = t, this.operator = e, this.right = r;
   }
@@ -7334,12 +7592,12 @@ class te {
     }
   }
 }
-class Mr {
+class Or {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !1, this.dataDeps = this.args.dataDeps ?? {}, this.callback = (i, s) => this.args.callback.call(this.controller, i, s), this.nextRecomputeTime = this.args.nextRecomputeTime ? (i, s) => this.args.nextRecomputeTime.call(this.controller, i, s) : void 0;
   }
   static {
-    this.computationType = yt;
+    this.computationType = mt;
   }
   static {
     this.contextType = "global";
@@ -7359,14 +7617,14 @@ class Mr {
     let i, s;
     if (e instanceof $)
       i = e.evaluate({ now: r }), s = r + this.nextRecomputeTime(r, t);
-    else if (e instanceof At || e instanceof te)
+    else if (e instanceof kt || e instanceof te)
       i = e.evaluate({ now: r }), s = e.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(r), await this.state.nextRecomputeTime.set(s), i;
   }
 }
-class $r {
+class Fr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !1, this.dataDeps = {
       _current: {
@@ -7377,7 +7635,7 @@ class $r {
     }, this.isResultNumber = this.dataContext.id.type === "number", this.callback = (i, s) => this.args.callback.call(this.controller, i, s), this.nextRecomputeTime = this.args.nextRecomputeTime ? (i, s) => this.args.nextRecomputeTime.call(this.controller, i, s) : void 0;
   }
   static {
-    this.computationType = yt;
+    this.computationType = mt;
   }
   static {
     this.contextType = "property";
@@ -7397,15 +7655,15 @@ class $r {
     let s, a;
     if (r instanceof $)
       s = r.evaluate({ now: i }), a = i + this.nextRecomputeTime(i, t);
-    else if (r instanceof At || r instanceof te)
+    else if (r instanceof kt || r instanceof te)
       s = r.evaluate({ now: i }), a = r.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(e, i), await this.state.nextRecomputeTime.set(e, a), s;
   }
 }
-const Pr = [Mr, $r];
-class Dr {
+const Qr = [Or, Fr];
+class Vr {
   constructor(t, e, r) {
     if (this.controller = t, this.args = e, this.dataContext = r, 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");
@@ -7422,7 +7680,7 @@ class Dr {
     };
   }
   static {
-    this.computationType = ht;
+    this.computationType = dt;
   }
   static {
     this.contextType = "global";
@@ -7466,7 +7724,7 @@ class Dr {
     return s;
   }
 }
-class Or {
+class Lr {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === r.host && o.sourceProperty === this.args.property || o.target === r.host && o.targetProperty === this.args.property), v(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.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 i = this.args.attributeQuery || [];
@@ -7487,7 +7745,7 @@ class Or {
     };
   }
   static {
-    this.computationType = ht;
+    this.computationType = dt;
   }
   static {
     this.contextType = "property";
@@ -7555,8 +7813,8 @@ class Or {
     return a;
   }
 }
-const Fr = [Dr, Or];
-class Qr {
+const _r = [Vr, Lr];
+class qr {
   constructor(t, e, r) {
     if (this.controller = t, this.args = e, this.dataContext = r, 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");
@@ -7573,7 +7831,7 @@ class Qr {
     };
   }
   static {
-    this.computationType = pt;
+    this.computationType = ht;
   }
   static {
     this.contextType = "global";
@@ -7629,7 +7887,7 @@ class Qr {
     return await this.state.sum.set(a), await this.state.count.set(s), s > 0 ? a / s : 0;
   }
 }
-class Vr {
+class Br {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === r.host && o.sourceProperty === this.args.property || o.target === r.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === r.host.name, v(this.isSource ? this.relation.source === r.host : this.relation.target === r.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 i = this.args.attributeQuery || [];
@@ -7650,7 +7908,7 @@ class Vr {
     };
   }
   static {
-    this.computationType = pt;
+    this.computationType = ht;
   }
   static {
     this.contextType = "property";
@@ -7713,8 +7971,8 @@ class Vr {
     return await this.state.count.set(e.record, a), a > 0 ? o / a : 0;
   }
 }
-const Lr = [Qr, Vr];
-class $t {
+const Wr = [qr, Br];
+class Mt {
   constructor(t, e, r) {
     this.controller = t, this.args = e, this.dataContext = r, 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 (...i) => {
       if (this.computeCallback) {
@@ -7785,22 +8043,22 @@ class $t {
     return A.skip();
   }
 }
-class qr extends $t {
+class Jr extends Mt {
   static {
     this.contextType = "global";
   }
 }
-class _r extends $t {
+class Hr extends Mt {
   static {
     this.contextType = "entity";
   }
 }
-class Br extends $t {
+class jr extends Mt {
   static {
     this.contextType = "relation";
   }
 }
-class Wr extends $t {
+class Ur extends Mt {
   static {
     this.contextType = "property";
   }
@@ -7815,11 +8073,11 @@ If you want to use aggregated data from all records in the entity/relation, you
     super(t, e, r);
   }
 }
-const Jr = [
-  qr,
-  _r,
-  Br,
-  Wr
+const Gr = [
+  Jr,
+  Hr,
+  jr,
+  Ur
 ];
 class j extends Error {
   constructor(t, e = {}) {
@@ -7955,7 +8213,7 @@ class U extends j {
     }), 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 j {
+class ce extends j {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "ActivityError",
@@ -7987,7 +8245,7 @@ class Q extends j {
     }), 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,
@@ -8104,235 +8362,10 @@ class O extends j {
     });
   }
 }
-const tt = "_System_", _ = "_Dictionary_", et = "id", ot = "_rowId", Hr = C.create({
-  name: tt,
-  properties: [
-    T.create({
-      name: "concept",
-      type: "string",
-      collection: !1
-    }),
-    T.create({
-      name: "key",
-      type: "string",
-      collection: !1
-    }),
-    T.create({
-      name: "value",
-      type: "string",
-      collection: !1
-    })
-  ]
-}), jr = C.create({
-  name: _,
-  properties: [
-    T.create({
-      name: "key",
-      type: "string",
-      collection: !1
-    }),
-    T.create({
-      name: "value",
-      type: "json",
-      collection: !1
-    })
-  ]
-});
-class Ur {
-  constructor(t, e) {
-    this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
-  }
-  /**
-   * 初始化或重新初始化 SourceMap 数据
-   * @param sourceMaps EntityEventSourceMap 数组
-   */
-  initialize(t) {
-    const e = [];
-    for (const r of t)
-      if (this.scheduler.isDataBasedComputation(r)) {
-        if (e.push(
-          ...Object.entries(r.dataDeps).map(([i, s]) => this.convertDataDepToERMutationEventsSourceMap(i, s, r)).flat()
-        ), r.dataContext.type === "property" && Object.values(r.dataDeps).some((i) => i.type === "global")) {
-          const i = {
-            type: "records",
-            source: r.dataContext.host
-          };
-          e.push(...this.convertDataDepToERMutationEventsSourceMap("_self", i, r, "create"));
-        }
-      } else {
-        const { eventDeps: i } = r;
-        for (const s of Object.values(i))
-          e.push({
-            type: s.type,
-            recordName: s.recordName,
-            computation: r
-          });
-      }
-    this.sourceMaps = [...e], this.sourceMapTree = this.buildDataSourceMapTree(this.sourceMaps);
-  }
-  /**
-   * 添加新的 SourceMap
-   * @param sourceMap 要添加的 EntityEventSourceMap
-   */
-  addSourceMap(t) {
-    this.sourceMaps.push(t), this.addToTree(t);
-  }
-  /**
-   * 批量添加 SourceMap
-   * @param sourceMaps 要添加的 EntityEventSourceMap 数组
-   */
-  addSourceMaps(t) {
-    this.sourceMaps.push(...t), t.forEach((e) => this.addToTree(e));
-  }
-  /**
-   * 根据 mutation event 查找对应的 SourceMap
-   * @param mutationEvent RecordMutationEvent
-   * @returns 匹配的 EntityEventSourceMap 数组
-   */
-  findSourceMapsForMutation(t) {
-    return this.sourceMapTree[t.recordName]?.[t.type] || [];
-  }
-  /**
-   * 检查 update 类型的更新对 DataBasedComputation 是否需要触发计算
-   * @param source EntityEventSourceMap
-   * @param mutationEvent RecordMutationEvent
-   * @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((i) => i !== "id").every(
-      (i) => !e.record.hasOwnProperty(i) || e.record[i] === e.oldRecord[i]
-    );
-  }
-  convertDataDepToERMutationEventsSourceMap(t, e, r, i, s = !1) {
-    const a = [];
-    if (e.type === "records")
-      (!i || i === "create") && a.push({
-        dataDep: e,
-        type: "create",
-        recordName: e.source.name,
-        sourceRecordName: e.source.name,
-        computation: r,
-        isInitial: s
-      }), (!i || i === "delete") && a.push({
-        dataDep: e,
-        type: "delete",
-        recordName: e.source.name,
-        sourceRecordName: e.source.name,
-        computation: r
-      }), (!i || i === "update") && e.attributeQuery && a.push(...this.convertAttrsToERMutationEventsSourceMap(e, e.source.name, e.attributeQuery, [], r, !1));
-    else if (e.type === "property") {
-      const o = r.dataContext;
-      e.attributeQuery && a.push(...this.convertAttrsToERMutationEventsSourceMap(e, o.host.name, e.attributeQuery, [], r, !0));
-    } else e.type === "global" && ((!i || i === "update") && a.push({
-      dataDep: e,
-      type: "update",
-      recordName: _,
-      sourceRecordName: _,
-      attributes: ["value"],
-      computation: r
-    }), (!i || i === "create") && a.push({
-      dataDep: e,
-      type: "create",
-      recordName: _,
-      sourceRecordName: _,
-      computation: r
-    }));
-    return a;
-  }
-  convertAttrsToERMutationEventsSourceMap(t, e, r, i, s, a = !1) {
-    const o = [], n = [], c = [];
-    if (r.forEach((l) => {
-      if (typeof l == "string" && l !== "*")
-        n.push(l);
-      else if (l !== "*") if (Array.isArray(l))
-        c.push(l);
-      else
-        throw new Error(`unknown attribute type: ${l}`);
-    }), n.length > 0) {
-      let l = e;
-      i.length > 0 && (i.at(-1) === "&" ? l = this.controller.system.storage.getRelationName(e, i.slice(0, -1).join(".")) : l = this.controller.system.storage.getEntityName(e, i.join("."))), a && o.push({
-        dataDep: t,
-        type: "create",
-        recordName: l,
-        sourceRecordName: e,
-        targetPath: i,
-        computation: s
-      }), o.push({
-        dataDep: t,
-        type: "update",
-        recordName: l,
-        sourceRecordName: e,
-        targetPath: i,
-        attributes: n,
-        computation: s
-      });
-    }
-    return c.forEach(([l, d]) => {
-      o.push(...this.convertRelationAttrToERMutationEventsSourceMap(t, e, d.attributeQuery, i.concat(l), s));
-    }), o;
-  }
-  convertRelationAttrToERMutationEventsSourceMap(t, e, r, i, s) {
-    const a = [];
-    if (i.at(-1) !== "&") {
-      const o = this.controller.system.storage.getRelationName(e, i.join("."));
-      a.push({
-        dataDep: t,
-        type: "create",
-        recordName: o,
-        sourceRecordName: e,
-        isRelation: !0,
-        targetPath: i,
-        computation: s
-      }, {
-        dataDep: t,
-        type: "delete",
-        recordName: o,
-        sourceRecordName: e,
-        isRelation: !0,
-        targetPath: i,
-        computation: s
-      });
-    }
-    return r.length > 0 && a.push(...this.convertAttrsToERMutationEventsSourceMap(t, e, r, i, s)), a;
-  }
-  /**
-   * 获取 SourceMapTree 的只读副本
-   * @returns DataSourceMapTree 的副本
-   */
-  getSourceMapTree() {
-    const t = {};
-    for (const [e, r] of Object.entries(this.sourceMapTree)) {
-      t[e] = {};
-      for (const [i, s] of Object.entries(r))
-        t[e][i] = [...s];
-    }
-    return t;
-  }
-  /**
-   * 私有方法：构建 SourceMap 树结构
-   * @param sourceMaps EntityEventSourceMap 数组
-   * @returns 两层结构的树，第一层是 recordName，第二层是 type
-   */
-  buildDataSourceMapTree(t) {
-    const e = {};
-    return t.forEach((r) => {
-      this.addToTree(r, e);
-    }), e;
-  }
-  /**
-   * 私有方法：将单个 SourceMap 添加到树结构中
-   * @param source EntityEventSourceMap
-   * @param tree 可选的目标树，默认使用实例的 sourceMapTree
-   */
-  addToTree(t, e) {
-    const r = e || this.sourceMapTree;
-    r[t.recordName] || (r[t.recordName] = {}), r[t.recordName][t.type] || (r[t.recordName][t.type] = []), r[t.recordName][t.type].push(t);
-  }
-}
 const Dt = "_ASYNC_TASK_";
-class Gr {
+class Kr {
   constructor(t, e, r, i, s) {
-    this.controller = t, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new Ur(this.controller, this), this.buildComputationHandleMap(s);
+    this.controller = t, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new mr(this.controller, this), this.buildComputationHandleMap(s);
     const a = [];
     i.forEach((o) => {
       o.computation && a.push({ dataContext: { type: "global", id: o }, args: o.computation });
@@ -8529,7 +8562,7 @@ class Gr {
         const r = this.sourceMapManager.findSourceMapsForMutation(e);
         if (r.length > 0)
           for (const i of r)
-            this.sourceMapManager.shouldTriggerUpdateComputation(i, e) && await this.runDirtyRecordsComputation(i, e);
+            this.sourceMapManager.shouldTriggerUpdateComputation(i, e) && (!("dataDep" in i) && !this.sourceMapManager.shouldTriggerEventBasedComputation(i, e) || await this.runDirtyRecordsComputation(i, e));
       }
     });
   }
@@ -8571,7 +8604,7 @@ class Gr {
   }
   async computeDataBasedDirtyRecordsAndEvents(t, e) {
     let r = [];
-    if (t.dataDep.type === "global" && e.recordName === _)
+    if (t.dataDep.type === "global" && e.recordName === q)
       if (t.computation.dataContext.type === "property") {
         const i = t.computation.dataContext;
         r = (await this.controller.system.storage.find(i.host.name, m.atom({ key: "id", value: ["not", null] }), {}, ["*"])).map((a) => [a, {
@@ -8723,7 +8756,7 @@ class Gr {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, r);
               } 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,
@@ -8737,7 +8770,7 @@ class Gr {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, r);
               } 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,
@@ -8752,7 +8785,7 @@ class Gr {
               dataContext: t.dataContext,
               computationPhase: "type-validation"
             });
-          if (s instanceof Te) {
+          if (s instanceof Se) {
             const o = t;
             if (!o.compute)
               throw new Q("compute must be defined for computation when incrementalCompute returns ComputationResultFullRecompute", {
@@ -8773,9 +8806,9 @@ class Gr {
           causedBy: o instanceof Error ? o : new Error(String(o))
         });
       }
-      if (s instanceof kt)
+      if (s instanceof vt)
         return;
-      if (s instanceof Se)
+      if (s instanceof ve)
         try {
           return await this.createAsyncTask(t, s.args, r);
         } catch (o) {
@@ -8788,7 +8821,7 @@ class Gr {
           });
         }
       try {
-        const o = s instanceof ve ? 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, r) : await this.controller.applyResult(t.dataContext, o, r);
       } catch (o) {
         throw new Q("Failed to apply computation result", {
@@ -8909,7 +8942,7 @@ class Gr {
     }
   }
 }
-class Ae {
+class Ee {
   constructor(t, e, r) {
     this.interaction = t, this.controller = e, this.activitySeqCall = r, this.system = e.system;
   }
@@ -8937,7 +8970,7 @@ class Ae {
   async checkUser(t, e, r) {
     let i;
     if (!this.interaction.userAttributives) return !0;
-    const s = It.is(this.interaction.userAttributives) ? R.fromValue(
+    const s = Et.is(this.interaction.userAttributives) ? R.fromValue(
       this.interaction.userAttributives.content
     ) : R.atom(
       this.interaction.userAttributives
@@ -8963,7 +8996,7 @@ class Ae {
     }
     if (this.isConceptAlias(e)) {
       const s = [];
-      return await hr(e.for, async (o) => {
+      return await yr(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: i, error: s };
@@ -9003,7 +9036,7 @@ class Ae {
         throw O.payloadValidationFailed(i.name, "data is not a ref", s);
       if (i.base)
         if (i.isCollection) {
-          const a = await pr(s, (o) => this.checkConcept(o, i.base));
+          const a = await gr(s, (o) => this.checkConcept(o, i.base));
           if (a !== !0)
             throw O.conceptCheckFailed(i.name, a);
         } else {
@@ -9025,7 +9058,7 @@ class Ae {
   }
   async checkCondition(t) {
     if (this.interaction.conditions) {
-      const e = Mt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), r = async (s) => {
+      const e = xt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), r = async (s) => {
         if (!s) return !0;
         if (s.content) {
           const a = s.content;
@@ -9059,7 +9092,7 @@ class Ae {
       v(!r.sideEffects[o], `sideEffect ${o} already exists`), r.sideEffects[o] = { result: n, error: c };
   }
   isGetInteraction() {
-    return this.interaction.action === Be;
+    return this.interaction.action === We;
   }
   async saveEvent(t) {
     return await this.controller.activityManager.saveEvent(t);
@@ -9149,11 +9182,11 @@ class D {
   }
   static createInitialState(t) {
     const e = { uuid: t.uuid };
-    return it.is(t.content) && (e.children = t.childSeqs.map((r) => G.createInitialState(r.head))), e;
+    return rt.is(t.content) && (e.children = t.childSeqs.map((r) => G.createInitialState(r.head))), e;
   }
   static create(t, e, r) {
     const i = e.getNodeByUUID(t.uuid);
-    if (it.is(i.content)) {
+    if (rt.is(i.content)) {
       const a = D.GroupStateNodeType.get(i.content.type), o = new a(i, e, r);
       return o.isGroup = !0, o.children = t?.children?.map((n) => G.create(n, e, o)), o;
     } else
@@ -9175,7 +9208,7 @@ class D {
     this.parent.transferToNext(this.node.uuid);
   }
 }
-class le {
+class ue {
   constructor(t, e) {
     this.graph = e, this.root = G.create(t, this.graph);
   }
@@ -9192,7 +9225,7 @@ class le {
     return this.root.toJSON();
   }
 }
-class rt {
+class et {
   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 (r, i, s) => (v(r.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[r.name] === i.id), this.system = e.system, this.graph = this.buildGraph(t);
   }
@@ -9201,8 +9234,8 @@ class rt {
   }
   static {
     this.from = (t, e) => {
-      let r = rt.cache.get(t);
-      return r || (r = new rt(t, e), rt.cache.set(t, r)), r;
+      let r = et.cache.get(t);
+      return r || (r = new et(t, e), et.cache.set(t, r)), r;
     };
   }
   buildGraph(t, e) {
@@ -9210,7 +9243,7 @@ class rt {
     for (let o of t.interactions) {
       const n = { content: o, next: null, uuid: o.uuid, parentGroup: e, parentSeq: i };
       this.uuidToNode.set(o.uuid, n), this.rawToNode.set(o, n);
-      const c = new Ae(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) {
@@ -9230,7 +9263,7 @@ class rt {
     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) || r.get(o.source), c = this.rawToNode.get(o.target) || r.get(o.target);
-      v(!!n, `cannot find source ${o.source.name}`), v(!!c, `cannot find target ${o.source.name}`), st.is(n) ? n.next.push(c) : n.next = c, st.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
+      v(!!n, `cannot find source ${o.source.name}`), v(!!c, `cannot find target ${o.source.name}`), it.is(n) ? n.next.push(c) : n.next = c, it.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(i, {
@@ -9239,7 +9272,7 @@ class rt {
     }), i;
   }
   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,
@@ -9286,7 +9319,7 @@ class rt {
     return e.parentSeq.tail === e;
   }
   isActivityHead(t, e = this.graph.head) {
-    return it.is(this.graph.head.content) ? !!this.graph.head.childSeqs?.some((r) => this.isActivityHead(t, r.head)) : t === this.graph.head.content;
+    return rt.is(this.graph.head.content) ? !!this.graph.head.childSeqs?.some((r) => this.isActivityHead(t, r.head)) : t === this.graph.head.content;
   }
   async callInteraction(t, e, r) {
     const i = this.uuidToInteractionCall.get(e);
@@ -9298,7 +9331,7 @@ class rt {
         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 i.call(r, s, this.checkUserRef);
     if (o.error)
@@ -9326,7 +9359,7 @@ class rt {
     }), await this.setActivity(t, { refs: i });
   }
 }
-class Kr extends D {
+class Xr extends D {
   onChange(t, e) {
     if (this.graph.isStartNode(t)) {
       if (e)
@@ -9337,24 +9370,24 @@ class Kr extends D {
     }
   }
 }
-D.GroupStateNodeType.set("any", Kr);
-class Xr extends D {
+D.GroupStateNodeType.set("any", Xr);
+class Yr extends D {
   onChange(t, e) {
     this.isGroupCompleted() && this.complete();
   }
 }
-D.GroupStateNodeType.set("every", Xr);
-class Yr extends D {
+D.GroupStateNodeType.set("every", Yr);
+class zr extends D {
   onChange(t, e) {
     this.graph.isEndNode(t) && this.complete();
   }
 }
-D.GroupStateNodeType.set("race", Yr);
-class zr extends D {
+D.GroupStateNodeType.set("race", zr);
+class Zr extends D {
   // 可以根据 group 上的具体配置逻辑，来动态决定。
 }
-D.GroupStateNodeType.set("program", zr);
-const I = new pe(), Vt = "_Interaction_", Tt = "_Activity_", Ee = C.create({
+D.GroupStateNodeType.set("program", Zr);
+const I = new fe(), Vt = "_Interaction_", Nt = "_Activity_", Ie = C.create({
   name: Vt,
   properties: [
     T.create({
@@ -9383,8 +9416,8 @@ const I = new pe(), Vt = "_Interaction_", Tt = "_Activity_", Ee = C.create({
       collection: !1
     })
   ]
-}), Ie = C.create({
-  name: Tt,
+}), Ce = C.create({
+  name: Nt,
   properties: [
     T.create({
       name: "name",
@@ -9407,21 +9440,21 @@ const I = new pe(), Vt = "_Interaction_", Tt = "_Activity_", Ee = C.create({
       collection: !1
     })
   ]
-}), Zr = P.create({
+}), ti = P.create({
   name: "activityInteraction",
-  source: Ie,
+  source: Ce,
   sourceProperty: "interaction",
-  target: Ee,
+  target: Ie,
   targetProperty: "activity",
   type: "1:n"
 });
-class ti {
+class ei {
   constructor(t, e, 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(Ie, Ee), this.controller.relations.push(Zr), e.forEach((i) => {
-      const s = new rt(i, t);
+    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(ti), e.forEach((i) => {
+      const s = new et(i, t);
       this.activityCalls.set(i.uuid, s), i.name && (v(!this.activityCallsByName.has(i.name), `activity name ${i.name} is duplicated`), this.activityCallsByName.set(i.name, s));
     }), r.forEach((i) => {
-      const s = new Ae(i, t);
+      const s = new Ee(i, t);
       this.interactionCalls.set(i.uuid, s), i.name && (v(!this.interactionCallsByName.has(i.name), `interaction name ${i.name} is duplicated`), this.interactionCallsByName.set(i.name, s));
     });
   }
@@ -9473,7 +9506,7 @@ class ti {
     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,
@@ -9496,7 +9529,7 @@ class ti {
       const c = await o.callInteraction(r, n.interaction.uuid, i);
       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,
@@ -9535,7 +9568,7 @@ class ti {
     }
   }
   async createActivity(t) {
-    return this.controller.system.storage.create(Tt, {
+    return this.controller.system.storage.create(Nt, {
       ...t,
       state: t.state,
       refs: t.refs
@@ -9545,10 +9578,10 @@ class ti {
     const r = {
       ...e
     };
-    return delete r.state, delete r.refs, e.state && (r.state = e.state), e.refs && (r.refs = e.refs), this.controller.system.storage.update(Tt, t, r);
+    return delete r.state, delete r.refs, e.state && (r.state = e.state), e.refs && (r.refs = e.refs), this.controller.system.storage.update(Nt, t, r);
   }
   async getActivity(t) {
-    return (await this.controller.system.storage.find(Tt, t, void 0, ["*"])).map((e) => ({
+    return (await this.controller.system.storage.find(Nt, t, void 0, ["*"])).map((e) => ({
       ...e,
       state: e.state,
       refs: e.refs
@@ -9575,15 +9608,15 @@ class ti {
     return this.interactionCallsByName.get(t);
   }
 }
-const Et = new pe();
-function ei() {
-  return Et.getStore()?.effects;
+const At = new fe();
+function ri() {
+  return At.getStore()?.effects;
 }
-function ue(u) {
-  const t = Et.getStore();
+function de(u) {
+  const t = At.getStore();
   t?.effects && t.effects.push(...u);
 }
-const Qi = "User";
+const _i = "User";
 class K {
   constructor(t) {
     this.name = t.name, this.record = t.record, this.content = t.content;
@@ -9592,7 +9625,7 @@ class K {
     return new K(t);
   }
 }
-const Lt = "_isDeleted_", Vi = {
+const Lt = "_isDeleted_", qi = {
   create() {
     return T.create({
       name: Lt,
@@ -9600,7 +9633,7 @@ const Lt = "_isDeleted_", Vi = {
     });
   }
 };
-class Li {
+class Bi {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
       BoolExp: R,
@@ -9619,21 +9652,21 @@ class Li {
       forceThtrowInteractionError: d = !1
       // 会 catch 住 error，并在 result 中返回。
     } = t;
-    this.system = e, this.ignorePermission = l, this.forceThtrowInteractionError = d, this.entities = [...r], this.relations = [...i], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new ti(this, s, a);
+    this.system = e, this.ignorePermission = l, this.forceThtrowInteractionError = d, this.entities = [...r], this.relations = [...i], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new ei(this, s, a);
     const h = [
-      ...Ir,
-      ...xr,
-      ...kr,
-      ...Tr,
-      ...Rr,
-      ...Fr,
-      ...Lr,
-      ...Pr,
-      ...yr,
-      ...Jr,
+      ...$r,
+      ...Dr,
+      ...Cr,
+      ...Ar,
+      ...Sr,
+      ..._r,
+      ...Wr,
+      ...Qr,
+      ...wr,
+      ...Gr,
       ...c
     ];
-    this.scheduler = new Gr(this, this.entities, this.relations, this.dict, h), n.forEach((p) => {
+    this.scheduler = new Kr(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);
     });
@@ -9653,7 +9686,7 @@ class Li {
     }
   }
   async applyResult(t, e, r) {
-    if (!(e instanceof kt)) {
+    if (!(e instanceof vt)) {
       if (t.type === "global")
         return this.system.storage.dict.set(t.id.name, e);
       if (t.type === "entity") {
@@ -9677,7 +9710,7 @@ class Li {
     }
   }
   async applyResultPatch(t, e, r) {
-    if (e instanceof kt || e === void 0) return;
+    if (e instanceof vt || e === void 0) return;
     const i = Array.isArray(e) ? e : [e];
     for (const s of i) {
       if (t.type === "global")
@@ -9701,7 +9734,7 @@ class Li {
   }
   async callInteraction(t, e) {
     try {
-      const r = { effects: [] }, i = await Et.run(r, async () => await this.activityManager.callInteraction(t, e));
+      const r = { effects: [] }, i = await At.run(r, async () => await this.activityManager.callInteraction(t, e));
       if (i.effects = r.effects, i.error && this.forceThtrowInteractionError)
         throw i.error;
       return i;
@@ -9717,7 +9750,7 @@ class Li {
   }
   async callActivityInteraction(t, e, r, i) {
     try {
-      const s = { effects: [] }, a = await Et.run(s, async () => await this.activityManager.callActivityInteraction(t, e, r, i));
+      const s = { effects: [] }, a = await At.run(s, async () => await this.activityManager.callActivityInteraction(t, e, r, i));
       if (a.effects && s.effects.length > 0) {
         const o = s.effects.filter(
           (n) => !a.effects.some(
@@ -9770,7 +9803,7 @@ class Li {
     this.callbacks.has(t) || this.callbacks.set(t, /* @__PURE__ */ new Set()), this.callbacks.get(t).add(e);
   }
 }
-let ri = class {
+let ii = class {
   constructor(t) {
     this.db = t;
   }
@@ -9782,12 +9815,12 @@ let ri = class {
     return e === void 0 ? await this.db.scheme(`INSERT INTO _IDS_ (name, last) VALUES ('${t}', ${r})`, i) : await this.db.update("UPDATE _IDS_ SET last = ? WHERE name = ?", [r, t], void 0, i), r;
   }
 };
-class ii {
+class si {
   constructor(t = ":memory:", e) {
-    this.file = t, this.options = e, this.idSystem = new ri(this), this.logger = this.options?.logger || Rt;
+    this.file = t, this.options = e, this.idSystem = new ii(this), this.logger = this.options?.logger || bt;
   }
   async open() {
-    this.db = new Me(this.file, this.options), await this.idSystem.setup();
+    this.db = new $e(this.file, this.options), await this.idSystem.setup();
   }
   async query(t, e = [], r = "") {
     const i = I.getStore(), s = this.logger.child(i?.logContext || {}), a = e.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
@@ -9814,7 +9847,7 @@ class ii {
       name: r,
       sql: t,
       params: a
-    }), this.db.prepare(`${t} RETURNING ${ot}`).run(...a);
+    }), this.db.prepare(`${t} RETURNING ${at}`).run(...a);
   }
   async delete(t, e, r = "") {
     const i = I.getStore(), s = this.logger.child(i?.logContext || {}), a = e.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
@@ -9854,22 +9887,22 @@ class ii {
     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 si(u) {
+function ai(u) {
   return encodeURI(JSON.stringify(u));
 }
-function ai(u) {
+function oi(u) {
   return u === void 0 ? void 0 : JSON.parse(decodeURI(u));
 }
-class oi {
+class ni {
   constructor(t) {
     this.db = t, this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
         const r = m.atom({ key: "key", value: ["=", e] });
-        return (await this.queryHandle.findOne(_, r, void 0, ["value"]))?.value?.raw;
+        return (await this.queryHandle.findOne(q, r, void 0, ["value"]))?.value?.raw;
       },
       set: async (e, r) => {
-        const i = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(_, i, void 0, ["value"]);
-        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [_, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: r } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [_, { key: e, value: { raw: r } }], []);
+        const i = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(q, i, 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: r } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [q, { key: e, value: { raw: r } }], []);
       }
     };
   }
@@ -9885,20 +9918,20 @@ class oi {
   // CAUTION kv 结构数据的实现也用 er。这是系统约定，因为也需要  Record 事件！
   async get(t, e, r) {
     const i = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] }), s = (await this.queryHandle.findOne(tt, i, void 0, ["value"]))?.value;
-    return s === void 0 ? r : ai(s);
+    return s === void 0 ? r : oi(s);
   }
   async set(t, e, r, i) {
     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: si(r) }], i) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [tt, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(r)) }], i);
+    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: ai(r) }], i) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [tt, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(r)) }], i);
   }
   async setup(t, e, r = !1) {
     await this.db.open(r);
-    const i = new dr(
+    const i = new hr(
       t,
       e,
       this.db
     );
-    r && await i.createTables(), this.queryHandle = new Ye(new ze(i.map), this.db), this.map = i.map;
+    r && await i.createTables(), this.queryHandle = new ze(new Ze(i.map), this.db), this.map = i.map;
   }
   findOne(...t) {
     return this.queryHandle.findOne(...t);
@@ -9918,8 +9951,8 @@ class oi {
   async callWithEvents(t, e, r = []) {
     const i = [], s = await t(...e, i), a = await this.dispatch(i);
     r.push(...i, ...a);
-    const o = ei();
-    return o && i.length > 0 && ue(i), o && a.length > 0 && ue(a), s;
+    const o = ri();
+    return o && i.length > 0 && de(i), o && a.length > 0 && de(a), s;
   }
   findRelationByName(...t) {
     return this.queryHandle.findRelationByName(...t);
@@ -9957,7 +9990,7 @@ class oi {
     return this.db.close();
   }
 }
-var ni = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(ni || {});
+var ci = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(ci || {});
 class ee {
   constructor(t = 0) {
     this.level = t;
@@ -9972,7 +10005,7 @@ class ee {
     return new ee(this.level);
   }
 }
-var ci = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(ci || {});
+var li = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(li || {});
 class re {
   constructor(t = 0) {
     this.level = t;
@@ -9990,13 +10023,13 @@ class re {
     return new re(this.level);
   }
 }
-const Rt = new ee(), li = new re();
-class _i {
-  constructor(t = new ii(void 0, { logger: Rt }), e = li) {
-    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new oi(t);
+const bt = new ee(), ui = new re();
+class Ji {
+  constructor(t = new si(void 0, { logger: bt }), e = ui) {
+    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new ni(t);
   }
   setup(t, e, r, i = !1) {
-    const s = new we(t, e), { entities: a, relations: o } = s.getAll();
+    const s = new Ne(t, e), { entities: a, relations: o } = s.getAll();
     return r.forEach(({ dataContext: n, state: c }) => {
       Object.entries(c).forEach(([l, d]) => {
         if (d instanceof E) {
@@ -10022,7 +10055,7 @@ class _i {
         }
       });
     }), this.storage.setup(
-      [...a, jr, Hr],
+      [...a, fr, pr],
       o,
       i
     );
@@ -10031,8 +10064,8 @@ class _i {
     this.storage.destroy();
   }
 }
-const { Client: de } = $e;
-let ui = class {
+const { Client: he } = Pe;
+let di = class {
   constructor(t) {
     this.db = t;
   }
@@ -10044,14 +10077,14 @@ let ui = class {
     return e === void 0 ? await this.db.scheme(`INSERT INTO "_IDS_" (name, last) VALUES ('${t}', ${r})`, i) : await this.db.update('UPDATE "_IDS_" SET last = $1 WHERE name = $2', [r, t], void 0, i), r;
   }
 };
-class Wi {
+class ji {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new ui(this), this.logger = this.options?.logger || Rt, this.db = new de({
+    this.database = t, this.options = e, this.idSystem = new di(this), this.logger = this.options?.logger || bt, 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 de({
+    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();
@@ -10082,7 +10115,7 @@ class Wi {
       sql: t,
       params: a
     });
-    const o = `${t} RETURNING "${ot}"`;
+    const o = `${t} RETURNING "${at}"`;
     return (await this.db.query(o, a)).rows[0];
   }
   async delete(t, e, r = "") {
@@ -10125,7 +10158,7 @@ class Wi {
     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 di = class {
+let hi = class {
   constructor(t) {
     this.db = t;
   }
@@ -10133,12 +10166,12 @@ let di = class {
     return this.db.scheme('CREATE Table IF NOT EXISTS "_IDS_" (last INTEGER, name TEXT)');
   }
   async getAutoId(t) {
-    return he();
+    return pe();
   }
 };
-class Hi {
+class Gi {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new di(this), this.logger = this.options?.logger || Rt, this.db = new Pe(this.database);
+    this.database = t, this.options = e, this.idSystem = new hi(this), this.logger = this.options?.logger || bt, this.db = new De(this.database);
   }
   async open(t = !1) {
     if (t) {
@@ -10190,7 +10223,7 @@ class Hi {
       sql: t,
       params: a
     });
-    const o = `${t} RETURNING "${ot}"`;
+    const o = `${t} RETURNING "${at}"`;
     try {
       return (await this.db.query(o, a)).rows[0];
     } catch (n) {
@@ -10253,7 +10286,7 @@ class Hi {
     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 hi {
+class pi {
   constructor(t) {
     this.db = t;
   }
@@ -10265,9 +10298,9 @@ class hi {
     return e === void 0 ? await this.db.scheme(`INSERT INTO "_IDS_" (name, last) VALUES ('${t}', ${r})`, i) : await this.db.update('UPDATE "_IDS_" SET last = ? WHERE name = ?', [r, t], void 0, i), r;
   }
 }
-class ji {
+class Ki {
   constructor(t, e = {}) {
-    this.database = t, this.options = e, this.idSystem = new hi(this), this.logger = this.options?.logger || Rt;
+    this.database = t, this.options = e, this.idSystem = new pi(this), this.logger = this.options?.logger || bt;
   }
   async open(t = !1) {
     ({ ...this.options }, this.db = await ae.createConnection({
@@ -10346,173 +10379,176 @@ class ji {
   }
 }
 export {
-  Tt as ACTIVITY_RECORD,
-  He as ALL_ATTR_SYMBOL,
+  Nt as ACTIVITY_RECORD,
+  je as ALL_ATTR_SYMBOL,
   Dt as ASYNC_TASK_RECORD,
-  Ct as Action,
+  It as Action,
   Jt as Activity,
-  rt as ActivityCall,
-  it as ActivityGroup,
-  Zr as ActivityInteractionRelation,
-  ti as ActivityManager,
-  Ie as ActivityStateEntity,
-  mt as Any,
-  kr as AnyHandles,
+  et as ActivityCall,
+  rt as ActivityGroup,
+  ti as ActivityInteractionRelation,
+  ei as ActivityManager,
+  Ce as ActivityStateEntity,
+  ft as Any,
+  Cr as AnyHandles,
   W as AttributeInfo,
   x as AttributeQuery,
   X as Attributive,
-  It as Attributives,
-  pt as Average,
-  Lr as AverageHandles,
-  ki as BaseKlass,
-  nt as BoolAtomData,
+  Et as Attributives,
+  ht as Average,
+  Wr as AverageHandles,
+  Ai as BaseKlass,
+  ot as BoolAtomData,
   R as BoolExp,
-  ct as BoolExpressionData,
+  nt as BoolExpressionData,
   J as ComputationDataDepError,
   Q as ComputationError,
   A as ComputationResult,
-  Se as ComputationResultAsync,
-  Te as ComputationResultFullRecompute,
-  ve as ComputationResultResolved,
-  kt as ComputationResultSkip,
-  ce as ComputationStateError,
+  ve as ComputationResultAsync,
+  Se as ComputationResultFullRecompute,
+  ke as ComputationResultResolved,
+  vt as ComputationResultSkip,
+  le as ComputationStateError,
   Ht as Condition,
   O as ConditionError,
-  Mt as Conditions,
-  Li as Controller,
-  dt as Count,
-  Ir as CountHandles,
+  xt as Conditions,
+  Bi as Controller,
+  ut as Count,
+  $r as CountHandles,
   Zt as Custom,
-  Jr as CustomHandles,
+  Gr as CustomHandles,
   ee as DBConsoleLogger,
-  ni as DBLogLevel,
-  dr as DBSetup,
-  Fi as DELETED_STATE,
-  _ as DICTIONARY_RECORD,
+  ci as DBLogLevel,
+  hr as DBSetup,
+  Li as DELETED_STATE,
+  q as DICTIONARY_RECORD,
   jt as DataAttributive,
   zt as DataAttributives,
   Bt as Dictionary,
-  jr as DictionaryEntity,
+  fr as DictionaryEntity,
   C as Entity,
-  _r as EntityCustomHandle,
-  Ye as EntityQueryHandle,
-  ze as EntityToTableMap,
+  Hr as EntityCustomHandle,
+  ze as EntityQueryHandle,
+  Ze as EntityToTableMap,
   te as Equation,
   Ut as Event,
-  ft as Every,
-  Tr as EveryHandles,
+  pt as Every,
+  Ar as EveryHandles,
   $ as Expression,
-  st as Gateway,
-  Be as GetAction,
-  Sr as GlobalAnyHandle,
-  Qr as GlobalAverageHandle,
+  it as Gateway,
+  We as GetAction,
+  Er as GlobalAnyHandle,
+  qr as GlobalAverageHandle,
   B as GlobalBoundState,
-  Ar as GlobalCountHandle,
-  qr as GlobalCustomHandle,
-  wr as GlobalEveryHandle,
-  Mr as GlobalRealTimeComputation,
-  fr as GlobalStateMachineHandle,
-  Dr as GlobalSumHandle,
-  gr as GlobalWeightedSummationHandle,
+  xr as GlobalCountHandle,
+  Jr as GlobalCustomHandle,
+  vr as GlobalEveryHandle,
+  Or as GlobalRealTimeComputation,
+  br as GlobalStateMachineHandle,
+  Vr as GlobalSumHandle,
+  Nr as GlobalWeightedSummationHandle,
   Lt as HARD_DELETION_PROPERTY_NAME,
-  Vi as HardDeletionProperty,
-  et as ID_ATTR,
+  qi as HardDeletionProperty,
+  ne as ID_ATTR,
   Vt as INTERACTION_RECORD,
-  At as Inequality,
+  kt as Inequality,
   Wt as Interaction,
-  Ae as InteractionCall,
-  Ee as InteractionEventEntity,
-  qt as KlassByName,
+  Ee as InteractionCall,
+  Ie as InteractionEventEntity,
+  _t as KlassByName,
   f as LINK_SYMBOL,
-  vt as LinkInfo,
+  St as LinkInfo,
   m as MatchExp,
-  Je as Modifier,
-  _i as MonoSystem,
-  ji as MysqlDB,
-  Oi as NON_DELETED_STATE,
-  Di as NON_EXIST_STATE,
+  He as Modifier,
+  Ji as MonoSystem,
+  Ki as MysqlDB,
+  Vi as NON_DELETED_STATE,
+  Qi as NON_EXIST_STATE,
   L as NewRecordData,
-  Hi as PGLiteDB,
+  Gi as PGLiteDB,
+  Pi as PHASE_AFTER_ALL,
+  $i as PHASE_BEFORE_ALL,
+  Pt as PHASE_NORMAL,
   Xt as Payload,
   Kt as PayloadItem,
-  Wi as PostgreSQLDB,
+  ji as PostgreSQLDB,
   T as Property,
-  vr as PropertyAnyHandle,
-  Vr as PropertyAverageHandle,
-  Er as PropertyCountHandle,
-  Wr as PropertyCustomHandle,
-  Nr as PropertyEveryHandle,
-  $r as PropertyRealTimeComputation,
-  mr as PropertyStateMachineHandle,
-  Or as PropertySumHandle,
-  _t as PropertyTypes,
-  br as PropertyWeightedSummationHandle,
-  Re as Query,
-  be as QueryItem,
-  Ne as ROOT_LABEL,
-  ot as ROW_ID_ATTR,
-  yt as RealTime,
-  Pr as RealTimeHandles,
+  Ir as PropertyAnyHandle,
+  Br as PropertyAverageHandle,
+  Mr as PropertyCountHandle,
+  Ur as PropertyCustomHandle,
+  kr as PropertyEveryHandle,
+  Fr as PropertyRealTimeComputation,
+  Rr as PropertyStateMachineHandle,
+  Lr as PropertySumHandle,
+  qt as PropertyTypes,
+  Tr as PropertyWeightedSummationHandle,
+  we as Query,
+  Re as QueryItem,
+  Te as ROOT_LABEL,
+  at as ROW_ID_ATTR,
+  mt as RealTime,
+  Qr as RealTimeHandles,
   E as RecordBoundState,
-  at as RecordInfo,
+  st as RecordInfo,
   K as RecordMutationSideEffect,
   M as RecordQuery,
-  Xe as RecordQueryAgent,
-  q as RecordQueryTree,
-  Cr as RecordsTransformHandle,
-  St as RecursiveContext,
-  we as RefContainer,
+  Ye as RecordQueryAgent,
+  _ as RecordQueryTree,
+  Pr as RecordsTransformHandle,
+  Tt as RecursiveContext,
+  Ne as RefContainer,
   P as Relation,
-  Br as RelationCustomHandle,
-  ii as SQLiteDB,
+  jr as RelationCustomHandle,
+  si as SQLiteDB,
   tt as SYSTEM_RECORD,
-  Gr as Scheduler,
+  Kr as Scheduler,
   Yt as SideEffect,
-  lt as StateMachine,
-  yr as StateMachineHandles,
+  ct as StateMachine,
+  wr as StateMachineHandles,
   Y as StateNode,
   Gt as StateTransfer,
-  ht as Summation,
-  Fr as SummationHandles,
+  dt as Summation,
+  _r as SummationHandles,
   re as SystemConsoleLogger,
-  Hr as SystemEntity,
-  ci as SystemLogLevel,
-  ye as Transfer,
-  xt as Transform,
-  xr as TransformHandles,
-  Qi as USER_ENTITY,
-  ut as WeightedSummation,
-  Rr as WeightedSummationHandles,
-  ue as addToCurrentEffects,
+  pr as SystemEntity,
+  li as SystemLogLevel,
+  ge as Transfer,
+  Ct as Transform,
+  Dr as TransformHandles,
+  _i as USER_ENTITY,
+  lt as WeightedSummation,
+  Sr as WeightedSummationHandles,
+  de as addToCurrentEffects,
   v as assert,
-  Et as asyncEffectsContext,
+  At as asyncEffectsContext,
   I as asyncInteractionContext,
-  Ci as boolExpToAttributives,
-  wi as clearAllInstances,
-  vi as createClass,
-  Fe as createInstances,
-  Si as createInstancesFromString,
-  xi as createUserRoleAttributive,
-  Rt as dbConsoleLogger,
-  wt as deepClone,
-  Pi as everyAsync,
-  pr as everyWithErrorAsync,
-  Mi as filterMap,
-  Ei as findRootActivity,
-  ge as forEachInteraction,
+  xi as boolExpToAttributives,
+  Ni as clearAllInstances,
+  ki as createClass,
+  Qe as createInstances,
+  vi as createInstancesFromString,
+  Mi as createUserRoleAttributive,
+  bt as dbConsoleLogger,
+  Rt as deepClone,
+  Fi as everyAsync,
+  gr as everyWithErrorAsync,
+  Di as filterMap,
+  Ii as findRootActivity,
+  be as forEachInteraction,
   S as generateUUID,
-  ei as getCurrentEffects,
-  Ai as getInteractions,
-  De as indexBy,
-  fe as isObject,
-  me as isPlainObject,
-  $i as mapObject,
-  Ii as parse,
-  Oe as registerKlass,
-  Ni as removeAllInstance,
-  hr as someAsync,
-  Ti as stringifyAllInstances,
+  ri as getCurrentEffects,
+  Ei as getInteractions,
+  Oe as indexBy,
+  me as isObject,
+  ye as isPlainObject,
+  Oi as mapObject,
+  Ci as parse,
+  Fe as registerKlass,
+  Ti as removeAllInstance,
+  yr as someAsync,
+  Si as stringifyAllInstances,
   w as stringifyAttribute,
-  li as systemConsoleLogger
+  ui as systemConsoleLogger
 };
 //# sourceMappingURL=index.js.map