interaqt 1.0.0 → 1.1.1

package/dist/index.js

@@ -1,57 +1,55 @@
-import { AsyncLocalStorage as de } from "async_hooks";
-function he(u) {
+import { AsyncLocalStorage as ne } from "async_hooks";
+function ce(u) {
   return u !== null && typeof u == "object";
 }
-function pe(u) {
-  if (!he(u)) return !1;
+function le(u) {
+  if (!ce(u)) return !1;
   const t = Object.getPrototypeOf(u);
   return t === null ? !0 : t === Object.prototype || t === null;
 }
-function mr(u, t) {
+function hr(u, t) {
   const e = {};
   for (const i of u)
     i && i[t] !== void 0 && (e[String(i[t])] = i);
   return e;
 }
 function w(u) {
-  return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : he(u) && !pe(u) ? `uuid::${u.uuid}` : u;
+  return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : ce(u) && !le(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((i) => wt(i, t));
-  if (pe(u))
-    return Object.fromEntries(Object.entries(u).map(([i, r]) => [i, wt(r, t)]));
+  if (Array.isArray(u)) return u.map((i) => Rt(i, t));
+  if (le(u))
+    return Object.fromEntries(Object.entries(u).map(([i, r]) => [i, Rt(r, t)]));
   if (u instanceof Set)
-    return new Set(Array.from(u.values()).map((i) => wt(i, t)));
+    return new Set(Array.from(u.values()).map((i) => Rt(i, t)));
   if (u instanceof Map)
-    return new Map(Array.from(u.entries()).map(([i, r]) => [i, wt(r, t)]));
+    return new Map(Array.from(u.entries()).map(([i, r]) => [i, Rt(r, t)]));
   const e = u;
   return t && e._type && e.constructor?.clone ? e.constructor.clone(u, t) : u;
 }
-function yr(...u) {
+function pr(...u) {
   for (const t of u)
     t.instances.length = 0;
 }
-function gr() {
-}
-const Qt = /* @__PURE__ */ new Map();
-function fe(u, t) {
-  t && t.isKlass && t.displayName && Qt.set(u, t);
+const Ft = /* @__PURE__ */ new Map();
+function ue(u, t) {
+  t && t.isKlass && t.displayName && Ft.set(u, t);
 }
-function br() {
+function fr() {
   const u = [];
-  return Array.from(Qt.entries()).forEach(([, t]) => {
+  return Array.from(Ft.entries()).forEach(([, t]) => {
     t.instances && Array.isArray(t.instances) && t.stringify && u.push(...t.instances.map((e) => t.stringify(e)));
   }), `[${u.join(",")}]`;
 }
-function Rr(u) {
+function mr(u) {
   const t = JSON.parse(u);
-  return Ce(t);
+  return ke(t);
 }
-function Ce(u) {
+function ke(u) {
   const t = /* @__PURE__ */ new Map();
   return u.forEach(({ type: e, options: i = {}, uuid: r, public: s }) => {
-    const a = Qt.get(e);
+    const a = Ft.get(e);
     if (!a) {
       console.warn(`Class ${e} not found in KlassByName`);
       return;
@@ -60,36 +58,11 @@ function Ce(u) {
     t.set(r, o);
   }), t;
 }
-function wr(u) {
-  return console.warn("createClass is deprecated in refactored code"), null;
-}
-class Nr {
-  static {
-    this.isKlass = !0;
-  }
-  static {
-    this.instances = [];
-  }
-  // 通用的 create 方法实现
-  static createBase(t, e) {
-    if (e.find((r) => r.uuid === t.uuid))
-      throw new Error(`duplicate uuid in options ${t.uuid}, ${t._type}`);
-    return e.push(t), t;
-  }
-  // 通用的 is 方法实现
-  static isBase(t, e) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === e;
-  }
-  // 通用的 check 方法实现
-  static checkBase(t) {
-    return t !== null && typeof t == "object" && typeof t.uuid == "string";
-  }
-}
-let xe = 0;
+let Se = 0;
 function T(u) {
-  return u?.uuid || `id_${++xe}`;
+  return u?.uuid || `id_${++Se}`;
 }
-const Me = /^[a-zA-Z0-9_]+$/;
+const Ee = /^[a-zA-Z0-9_]+$/;
 class I {
   // for Merged Entity
   constructor(t, e) {
@@ -110,7 +83,7 @@ class I {
         type: "string",
         required: !0,
         constraints: {
-          nameFormat: ({ name: t }) => Me.test(t)
+          nameFormat: ({ name: t }) => Ee.test(t)
         }
       },
       properties: {
@@ -201,9 +174,9 @@ class I {
     return this.create(e.public, e.options);
   }
 }
-var Lt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Lt || {});
-const Pe = /^[a-zA-Z0-9_]+$/;
-class qt {
+var Vt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Vt || {});
+const Ie = /^[a-zA-Z0-9_]+$/;
+class Qt {
   constructor(t, e) {
     this._type = "Dictionary", this._options = e, this.uuid = T(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;
   }
@@ -223,15 +196,14 @@ class qt {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: t }) => Pe.test(t),
-          length: ({ name: t }) => t.length > 1 && t.length < 5
+          format: ({ name: t }) => Ie.test(t)
         }
       },
       type: {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(Lt))
+        options: Array.from(Object.values(Vt))
       },
       collection: {
         type: "boolean",
@@ -257,7 +229,7 @@ class qt {
     };
   }
   static create(t, e) {
-    const i = new qt(t, e);
+    const i = new Qt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Dictionary`);
     return this.instances.push(i), i;
@@ -296,7 +268,7 @@ class qt {
     return this.create(e.public, e.options);
   }
 }
-const $e = /^[a-zA-Z0-9_]+$/;
+const xe = /^[a-zA-Z0-9_]+$/;
 class N {
   constructor(t, e) {
     this._type = "Property", this._options = e, this.uuid = T(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;
@@ -316,14 +288,13 @@ class N {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: t }) => $e.test(t),
-          length: ({ name: t }) => t.length > 1 && t.length < 5
+          format: ({ name: t }) => xe.test(t)
         }
       },
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(Lt)
+        options: () => Object.values(Vt)
       },
       collection: {
         type: "boolean",
@@ -379,11 +350,11 @@ class N {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.defaultValue && typeof i.defaultValue == "string" && i.defaultValue.startsWith("func::") && (i.defaultValue = new Function("return " + i.defaultValue.substring(6))()), i.computed && typeof i.computed == "string" && i.computed.startsWith("func::") && (i.computed = new Function("return " + i.computed.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.defaultValue == "string" && r.defaultValue.startsWith("func::") && (i.defaultValue = new Function("return " + r.defaultValue.substring(6))()), typeof r.computed == "string" && r.computed.startsWith("func::") && (i.computed = new Function("return " + r.computed.substring(6))()), this.create(i, e.options);
   }
 }
-class x {
+class M {
   constructor(t, e) {
     if (this._type = "Relation", this._options = e, this.uuid = T(e), t.inputRelations) {
       if (!t.inputRelations || t.inputRelations.length === 0)
@@ -415,7 +386,7 @@ class x {
   // for Merged Relation
   // Getter for name that returns computed name if _name is undefined
   get name() {
-    return this._name !== void 0 ? this._name : x.public.name.computed ? x.public.name.computed(this) : void 0;
+    return this._name !== void 0 ? this._name : M.public.name.computed ? M.public.name.computed(this) : void 0;
   }
   // Setter for name
   set name(t) {
@@ -515,7 +486,7 @@ class x {
     };
   }
   static create(t, e) {
-    const i = new x(t, e);
+    const i = new M(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Relation`);
     return this.instances.push(i), i;
@@ -529,7 +500,7 @@ class x {
       properties: t.properties
     };
     t.inputRelations || (e.source = t.source, e.target = t.target);
-    const i = t._name ?? t.name;
+    const i = (t instanceof M, t.name);
     i !== void 0 && (e.name = i), t.computation !== void 0 && (e.computation = t.computation), t.baseRelation !== void 0 && (e.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (e.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (e.inputRelations = t.inputRelations);
     const r = {
       type: "Relation",
@@ -548,8 +519,8 @@ class x {
       properties: t.properties?.map((s) => N.clone(s, e))
     };
     t.inputRelations || (i.source = t.source, i.target = t.target);
-    const r = t._name ?? t.name;
-    return r !== void 0 && (i.name = r), t.computation !== void 0 && (i.computation = t.computation), t.baseRelation !== void 0 && (i.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (i.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (i.inputRelations = t.inputRelations), new x(i, t._options);
+    const r = (t instanceof M, t.name);
+    return r !== void 0 && (i.name = r), t.computation !== void 0 && (i.computation = t.computation), t.baseRelation !== void 0 && (i.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (i.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (i.inputRelations = t.inputRelations), new M(i, t._options);
   }
   static is(t) {
     return t !== null && typeof t == "object" && "_type" in t && t._type === "Relation";
@@ -562,7 +533,7 @@ class x {
     return this.create(e.public, e.options);
   }
 }
-class z {
+class K {
   constructor(t, e) {
     this._type = "StateNode", this._options = e, this.uuid = T(e), this.name = t.name, this.computeValue = t.computeValue;
   }
@@ -590,7 +561,7 @@ class z {
     };
   }
   static create(t, e) {
-    const i = new z(t, e);
+    const i = new K(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateNode`);
     return this.instances.push(i), i;
@@ -625,7 +596,7 @@ class z {
     return this.create(e.public, e.options);
   }
 }
-class Bt {
+class Lt {
   constructor(t, e) {
     this._type = "StateTransfer", this._options = e, this.uuid = T(e), this.trigger = t.trigger, this.current = t.current, this.next = t.next, this.computeTarget = t.computeTarget;
   }
@@ -663,7 +634,7 @@ class Bt {
     };
   }
   static create(t, e) {
-    const i = new Bt(t, e);
+    const i = new Lt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateTransfer`);
     return this.instances.push(i), i;
@@ -857,8 +828,8 @@ class nt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class ct {
@@ -926,7 +897,7 @@ class ct {
   }
   static clone(t, e) {
     let i = t.record;
-    return e && (I.is(t.record) ? i = I.clone(t.record, e) : x.is(t.record) && (i = x.clone(t.record, e))), this.create({
+    return e && (I.is(t.record) ? i = I.clone(t.record, e) : M.is(t.record) && (i = M.clone(t.record, e))), this.create({
       record: i,
       direction: t.direction,
       callback: t.callback,
@@ -941,8 +912,8 @@ class ct {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class lt {
@@ -1162,8 +1133,8 @@ class dt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class ht {
@@ -1252,11 +1223,11 @@ class ht {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class At {
+class Tt {
   constructor(t, e) {
     this._type = "Transform", this._options = e, this.uuid = T(e), this.record = t.record, this.eventDeps = t.eventDeps, this.attributeQuery = t.attributeQuery, this.callback = t.callback;
   }
@@ -1289,7 +1260,7 @@ class At {
     };
   }
   static create(t, e) {
-    const i = new At(t, e);
+    const i = new Tt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transform`);
     return this.instances.push(i), i;
@@ -1389,7 +1360,7 @@ class pt {
     return t.attributeQuery !== void 0 && (i.attributeQuery = t.attributeQuery), t.dataDeps !== void 0 && (i.dataDeps = t.dataDeps), t.nextRecomputeTime !== void 0 && (i.nextRecomputeTime = t.nextRecomputeTime), this.create(i);
   }
   static is(t) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === "RealTime";
+    return t !== null && typeof t == "object" && "_type" in t && t._type === "RealTimeValue";
   }
   static check(t) {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
@@ -1399,7 +1370,7 @@ class pt {
     return typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), typeof i.nextRecomputeTime == "string" && i.nextRecomputeTime.startsWith("func::") && (i.nextRecomputeTime = new Function("return " + i.nextRecomputeTime.substring(6))()), this.create(i, e.options);
   }
 }
-class _t {
+class qt {
   constructor(t, e) {
     this._type = "SideEffect", this._options = e, this.uuid = T(e), this.name = t.name, this.handle = t.handle;
   }
@@ -1427,7 +1398,7 @@ class _t {
     };
   }
   static create(t, e) {
-    const i = new _t(t, e);
+    const i = new qt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, SideEffect`);
     return this.instances.push(i), i;
@@ -1457,8 +1428,8 @@ class _t {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.handle && typeof i.handle == "string" && i.handle.startsWith("func::") && (i.handle = new Function("return " + i.handle.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.handle == "string" && r.handle.startsWith("func::") && (i.handle = new Function("return " + r.handle.substring(6))()), this.create(i, e.options);
   }
 }
 class ft {
@@ -1640,8 +1611,11 @@ class R {
   isExpression() {
     return this.raw.type === "expression";
   }
+  static isExpressionData(t) {
+    return t !== null && typeof t == "object" && "type" in t && (t.type === "atom" || t.type === "expression");
+  }
   static standardizeData(t) {
-    return t instanceof R ? t.raw : t && typeof t == "object" && t.type === "atom" || t.type === "expression" ? t : { type: "atom", data: t };
+    return t instanceof R ? t.raw : R.isExpressionData(t) ? t : { type: "atom", data: t };
   }
   and(t) {
     return new R({
@@ -1741,12 +1715,12 @@ class R {
     throw new Error(`invalid bool expression type: ${JSON.stringify(this.raw)}`);
   }
 }
-const Oe = [
+const Me = [
   I,
-  x,
+  M,
   N,
-  z,
-  Bt,
+  K,
+  Lt,
   ot,
   nt,
   ct,
@@ -1754,17 +1728,17 @@ const Oe = [
   ut,
   dt,
   ht,
-  At,
+  Tt,
   pt,
-  _t,
   qt,
+  Qt,
   ft,
   mt
 ];
-Oe.forEach((u) => {
-  u && u.displayName && fe(u.displayName, u);
+Me.forEach((u) => {
+  u && u.displayName && ue(u.displayName, u);
 });
-class me {
+class de {
   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();
   }
@@ -1777,7 +1751,7 @@ class me {
       this.clonedEntities.set(t, e), this.reverseEntityMap.set(e, t);
     }
     for (const t of this.originalRelations) {
-      const e = x.clone(t, !1);
+      const e = M.clone(t, !1);
       this.clonedRelations.set(t, e), this.reverseRelationMap.set(e, t);
     }
     this.updateAllReferences();
@@ -1801,7 +1775,7 @@ class me {
       if (i === t || i.uuid === t.uuid)
         throw new Error(`Relation already exists in container: ${t.name}`);
     this.originalRelations.push(t);
-    const e = x.clone(t, !1);
+    const e = M.clone(t, !1);
     return this.clonedRelations.set(t, e), this.reverseRelationMap.set(e, t), this.updateReferencesInObject(e), e;
   }
   /**
@@ -1975,7 +1949,7 @@ class me {
     return null;
   }
 }
-class Wt {
+class Bt {
   constructor(t, e) {
     this._type = "Custom", this._options = e, this.uuid = T(e), this.name = t.name, this.dataDeps = t.dataDeps, this.compute = t.compute, this.incrementalCompute = t.incrementalCompute, this.incrementalPatchCompute = t.incrementalPatchCompute, this.createState = t.createState, this.getInitialValue = t.getInitialValue, this.asyncReturn = t.asyncReturn, this.useLastValue = t.useLastValue;
   }
@@ -2038,7 +2012,7 @@ class Wt {
     };
   }
   static create(t, e) {
-    const i = new Wt(t, e);
+    const i = new Bt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Custom`);
     return this.instances.push(i), i;
@@ -2082,7 +2056,7 @@ class Wt {
     }), this.create(i, e.options);
   }
 }
-class ye {
+class he {
   constructor(t, e) {
     this._type = "EventSource", this._options = e, this.uuid = T(e), this.name = t.name, this.entity = t.entity, this.guard = t.guard, this.mapEventData = t.mapEventData, this.resolve = t.resolve, this.afterDispatch = t.afterDispatch;
   }
@@ -2096,7 +2070,7 @@ class ye {
     this.instances = [];
   }
   static create(t, e) {
-    const i = new ye(t, e);
+    const i = new he(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, EventSource`);
     return this.instances.push(i), i;
@@ -2138,7 +2112,7 @@ function b(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Ct(u, t, e) {
+function Et(u, t, e) {
   const i = [...t];
   let r = u, s;
   const a = i.pop();
@@ -2146,7 +2120,7 @@ function Ct(u, t, e) {
     r[s] || (r[s] = {}), r = r[s];
   return r[a] = e, !0;
 }
-class J {
+class _ {
   constructor(t, e, i, r) {
     this.parentEntityName = t, this.attributeName = e, this.map = i, this.symmetricDirection = r, this.data = this.map.getAttributeData(t, e), b(!!this.data, `${t} has no attribute: ${e}`);
   }
@@ -2273,14 +2247,14 @@ class J {
     return b(this.isLinkFiltered(), "only filtered relation can get match expression"), this.data.matchExpression;
   }
   getBaseAttributeInfo() {
-    return b(this.isLinkFiltered(), "only filtered relation can get base attribute info"), new J(this.parentEntityName, this.data.baseRelationAttributeName, this.map, this.symmetricDirection);
+    return b(this.isLinkFiltered(), "only filtered relation can get base attribute info"), new _(this.parentEntityName, this.data.baseRelationAttributeName, this.map, this.symmetricDirection);
   }
 }
 class m {
   constructor(t, e, i, r, s) {
     this.map = e, this.contextRootEntity = r, this.fromRelation = s, b(!i || i instanceof R, `match data is not a BoolExpression instance, you passed: ${this.data}`);
     const a = this.map.getRecordInfo(t);
-    this.entityName = a.resolvedBaseRecordName, this.xToOneQueryTree = new L(this.entityName, this.map);
+    this.entityName = a.resolvedBaseRecordName, this.xToOneQueryTree = new Q(this.entityName, this.map);
     let o = i;
     a.resolvedMatchExpression && (o = i ? a.resolvedMatchExpression.and(i) : a.resolvedMatchExpression), o && (this.data = this.convertFilteredRelation(o), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
@@ -2328,8 +2302,8 @@ class m {
         const n = [...a.resolvedPath, o], c = this.map.getInfoByPath(n), l = a.resolvedPath.concat(c?.isLinkFiltered() ? c.getBaseAttributeInfo().attributeName : o);
         let d = a.matchExpression;
         if (c?.isLinkFiltered()) {
-          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), g = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], k = p.rebase(g.join("."));
-          d = d ? d.and(k) : k;
+          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), g = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], A = p.rebase(g.join("."));
+          d = d ? d.and(A) : A;
         }
         return {
           path: [...a.path, o],
@@ -2501,7 +2475,7 @@ class m {
     );
   }
 }
-class De {
+class Pe {
   constructor(t, e, i, r) {
     this.recordName = t, this.map = e, this.data = i, this.fromRelation = r;
   }
@@ -2523,7 +2497,7 @@ class De {
    * 用于确保 ORDER BY 中引用的关联字段会触发相应的 JOIN
    */
   get xToOneQueryTree() {
-    const t = new L(this.recordName, this.map);
+    const t = new Q(this.recordName, this.map);
     return Object.keys(this.data?.orderBy || {}).forEach((e) => {
       const i = e.split(".");
       if (i.length === 1) {
@@ -2534,7 +2508,7 @@ class De {
     }), t;
   }
 }
-class M {
+class P {
   constructor(t, e, i, r, s, a, o, n, c, l = !1, d, h, p, y) {
     this.recordName = t, this.map = e, this.matchExpression = i, this.attributeQuery = r, this.modifier = s, this.contextRootEntity = a, this.parentRecord = o, this.attributeName = n, this.onlyRelationData = c, this.allowNull = l, this.label = d, this.goto = h, this.exit = p, this.alias = y;
   }
@@ -2544,12 +2518,12 @@ class M {
       key: "id",
       value: ["not", null]
     }), y = p;
-    return l.resolvedMatchExpression && (y = p.and(new m(d, e, l.resolvedMatchExpression))), new M(
+    return l.resolvedMatchExpression && (y = p.and(new m(d, e, l.resolvedMatchExpression))), new P(
       d,
       e,
       y,
-      new C(d, e, i.attributeQuery || [], s, a),
-      new De(d, e, i.modifier),
+      new x(d, e, i.attributeQuery || [], s, a),
+      new Pe(d, e, i.modifier),
       r,
       s,
       a,
@@ -2571,7 +2545,7 @@ class M {
   // CAUTION 特别注意这里的参数，不能让用取用原本的 matchExpression, attributeQuery, modifier 里面的 data 传进来。
   //   因为  data 不能代表一切配置，例如 attributeQuery 里面 还有个 shouldQueryParentLinkData 就是保存在 this 上的。
   derive({ matchExpression: t, attributeQuery: e, modifier: i }) {
-    return new M(
+    return new P(
       this.recordName,
       this.map,
       t || this.matchExpression,
@@ -2588,7 +2562,7 @@ class M {
     );
   }
 }
-class L {
+class Q {
   // 父节点和自己这个几点 link 上的 query
   constructor(t, e, i, r, s, a, o) {
     this.recordName = t, this.map = e, this.parentRecord = i, this.attributeName = r, this.data = s, this.parent = a, this.parentLinkQueryTree = o, this.fields = [], b(!!t, "recordName cannot be empty"), this.fields = s?.fields || [], this.records = s?.records || {}, i && (this.info = this.map.getInfo(this.parentRecord, this.attributeName));
@@ -2598,26 +2572,26 @@ class L {
     if (t.length === 1)
       this.fields.push(e);
     else if (e === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new L(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
     else {
       const r = this.map.getInfo(this.recordName, e);
-      this.records[e] || (this.records[e] = new L(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
+      this.records[e] || (this.records[e] = new Q(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
     }
   }
   addRecord(t, e) {
     const [i, ...r] = t;
     if (t.length === 1)
       if (i === f)
-        this.parentLinkQueryTree || (this.parentLinkQueryTree = new L(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
+        this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
       else {
-        const s = this.map.getInfo(this.recordName, i), a = e || new L(s.recordName, this.map, this.recordName, i, void 0, this);
+        const s = this.map.getInfo(this.recordName, i), a = e || new Q(s.recordName, this.map, this.recordName, i, void 0, this);
         this.records[i] = this.records[i] ? this.records[i].merge(a) : a;
       }
     else if (i === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new L(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
     else {
       const s = this.map.getInfo(this.recordName, i);
-      this.records[i] = new L(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
+      this.records[i] = new Q(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
     }
   }
   forEachRecords(t) {
@@ -2632,7 +2606,7 @@ class L {
       this.records[a] && t.records[a] ? r[a] = this.records[a].merge(t.records[a]) : this.records[a] ? r[a] = this.records[a] : r[a] = t.records[a];
     });
     let s;
-    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new L(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
+    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new Q(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
   }
   getData() {
     const t = {
@@ -2643,8 +2617,8 @@ class L {
     }), this.parentLinkQueryTree && (t[f] = this.parentLinkQueryTree.getData()), t;
   }
 }
-const f = "&", Fe = "*";
-class C {
+const f = "&", Ce = "*";
+class x {
   constructor(t, e, i = [], r, s, a) {
     this.recordName = t, this.map = e, this.data = i, this.parentRecord = r, this.attributeName = s, this.shouldQueryParentLinkData = a, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [], this.id = Math.random();
     let o = /* @__PURE__ */ new Set();
@@ -2653,10 +2627,10 @@ class C {
       if (l === f) {
         b(!!(this.parentRecord && this.attributeName), `parent record and attribute name cannot be empty when query link data, you passed ${this.parentRecord} ${this.attributeName}`);
         const y = this.map.getInfo(this.parentRecord, this.attributeName);
-        this.parentLinkRecordQuery = M.create(y.linkName, this.map, d, void 0);
+        this.parentLinkRecordQuery = P.create(y.linkName, this.map, d, void 0);
         return;
       }
-      if (l === Fe) {
+      if (l === Ce) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
         return;
       }
@@ -2665,13 +2639,13 @@ class C {
         let y = l, v = d;
         if (p.isLinkFiltered()) {
           y = p.getBaseAttributeInfo().attributeName;
-          const k = d.matchExpression, F = p.getLinkInfo().getBaseLinkInfo(), Z = new m(F.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Ie = k ? Z.and(k.data) : Z;
+          const A = d.matchExpression, D = p.getLinkInfo().getBaseLinkInfo(), Y = new m(D.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Ae = A ? Y.and(A.data) : Y;
           v = {
             ...d,
-            matchExpression: Ie.data
+            matchExpression: Ae.data
           };
         }
-        const g = M.create(p.recordName, this.map, v, void 0, this.recordName, y, h, !1, l);
+        const g = P.create(p.recordName, this.map, v, void 0, this.recordName, y, h, !1, l);
         this.relatedRecords.push(g), p.isXToMany ? this.xToManyRecords.push(g) : p.isXToOne && this.xToOneRecords.push(g);
       } else
         o.add(l);
@@ -2680,7 +2654,7 @@ class C {
   static mergeAttributeQueryData(t, e) {
     const i = [...t, ...e], r = new Set(i.filter((o) => typeof o == "string")), a = i.filter((o) => typeof o != "string").reduce((o, n) => {
       const [c, l] = n;
-      return o[c] ? o[c] = { attributeQuery: C.mergeAttributeQueryData(o[c].attributeQuery, l.attributeQuery) } : o[c] = l, o;
+      return o[c] ? o[c] = { attributeQuery: x.mergeAttributeQueryData(o[c].attributeQuery, l.attributeQuery) } : o[c] = l, o;
     }, {});
     return [
       ...r,
@@ -2691,32 +2665,32 @@ class C {
     const o = e.getRecordInfo(t), n = e.getRecordInfo(o.resolvedBaseRecordName);
     let c = n.valueAttributes.map((l) => l.attributeName);
     return i && n.sameTableReliance.forEach((l) => {
-      const d = C.getAttributeQueryDataForRecord(l.recordName, e, !0, r), h = [
+      const d = x.getAttributeQueryDataForRecord(l.recordName, e, !0, r), h = [
         l.attributeName,
         {
           attributeQuery: [...d]
         }
       ];
       if (!n.isRelation) {
-        const p = C.getAttributeQueryDataForRecord(l.linkName, e, !0, r);
+        const p = x.getAttributeQueryDataForRecord(l.linkName, e, !0, r);
         h[1].attributeQuery.push([f, { attributeQuery: p }]);
       }
-      c = C.mergeAttributeQueryData(c, [h]);
+      c = x.mergeAttributeQueryData(c, [h]);
     }), a && n.notRelianceCombined.forEach((l) => {
-      const d = C.getAttributeQueryDataForRecord(l.recordName, e, !0, r), h = [
+      const d = x.getAttributeQueryDataForRecord(l.recordName, e, !0, r), h = [
         l.attributeName,
         {
           attributeQuery: [...d]
         }
       ];
       if (!n.isRelation) {
-        const p = C.getAttributeQueryDataForRecord(l.linkName, e, !0, r);
+        const p = x.getAttributeQueryDataForRecord(l.linkName, e, !0, r);
         h[1].attributeQuery.push([f, { attributeQuery: p }]);
       }
-      c = C.mergeAttributeQueryData(c, [h]);
+      c = x.mergeAttributeQueryData(c, [h]);
     }), r && n.mergedRecordAttributes.forEach((l) => {
-      const d = C.getAttributeQueryDataForRecord(l.linkName, e, i, !0);
-      c = C.mergeAttributeQueryData(c, [
+      const d = x.getAttributeQueryDataForRecord(l.linkName, e, i, !0);
+      c = x.mergeAttributeQueryData(c, [
         [
           l.attributeName,
           {
@@ -2725,7 +2699,7 @@ class C {
         ]
       ]);
     }), s && n.managedRecordAttributes.forEach((l) => {
-      c = C.mergeAttributeQueryData(c, [
+      c = x.mergeAttributeQueryData(c, [
         [
           l.attributeName,
           {
@@ -2765,7 +2739,7 @@ class C {
     return this.buildXToOneQueryTree();
   }
   buildXToOneQueryTree() {
-    const t = new L(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new Q(this.recordName, this.map, this.parentRecord, this.attributeName);
     if (this.data.forEach((e) => {
       Array.isArray(e) || t.addField([e]);
     }), this.xToOneRecords.forEach((e) => {
@@ -2777,27 +2751,27 @@ class C {
     return t;
   }
   buildFullQueryTree() {
-    const t = new L(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new Q(this.recordName, this.map, this.parentRecord, this.attributeName);
     return this.relatedRecords.forEach((e) => {
       t.addRecord([e.attributeName], e.attributeQuery.fullQueryTree);
     }), t;
   }
   withParentLinkData() {
-    return this.parentLinkRecordQuery ? new C(this.recordName, this.map, this.data, this.parentRecord, this.attributeName, !0) : this;
+    return this.parentLinkRecordQuery ? new x(this.recordName, this.map, this.data, this.parentRecord, this.attributeName, !0) : this;
   }
 }
-function Ve(u) {
+function $e(u) {
   const t = [];
   return u.forEach((e) => t.push(...Array.isArray(e) ? e : [e])), t;
 }
-class Q {
+class V {
   constructor(t, e, i, r) {
     this.map = t, this.originalRecordName = e, this.rawData = i, this.info = r, this.mergedLinkTargetNewRecords = [], this.mergedLinkTargetRecordIdRefs = [], this.mergedLinkTargetNullRecords = [], this.combinedNewRecords = [], this.combinedRecordIdRefs = [], this.combinedNullRecords = [], this.differentTableMergedLinkNewRecords = [], this.differentTableMergedLinkRecordIdRefs = [], this.differentTableMergedLinkNullRecords = [], this.isolatedNewRecords = [], this.isolatedRecordIdRefs = [], this.isolatedNullRecords = [], this.entityIdAttributes = [], this.relatedEntitiesData = [], this.valueAttributes = [], this.sameRowEntityIdRefs = [], this.defaultValues = {};
     const s = this.map.getRecordInfo(e);
     this.recordName = s.resolvedBaseRecordName;
     const [a, o, n] = this.map.groupAttributes(this.recordName, i ? Object.keys(i) : []);
-    this.relatedEntitiesData = Ve(o.map(
-      (l) => Array.isArray(i[l.attributeName]) ? i[l.attributeName].map((d) => new Q(this.map, l.recordName, d, l)) : new Q(this.map, l.recordName, i[l.attributeName], l)
+    this.relatedEntitiesData = $e(o.map(
+      (l) => Array.isArray(i[l.attributeName]) ? i[l.attributeName].map((d) => new V(this.map, l.recordName, d, l)) : new V(this.map, l.recordName, i[l.attributeName], l)
     )), this.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
     this.defaultValues = c.valueAttributes.reduce((l, d) => {
@@ -2805,10 +2779,10 @@ class Q {
       return !this.rawData?.hasOwnProperty(d.attributeName) && h.defaultValue && typeof h.defaultValue == "function" && (l[d.attributeName] = h.defaultValue(i, this.originalRecordName)), l;
     }, {}), this.relatedEntitiesData.forEach((l) => {
       l.info.isMergedWithParent() ? l.isNull() ? this.combinedNullRecords.push(l) : l.isRef() ? this.combinedRecordIdRefs.push(l) : this.combinedNewRecords.push(l) : l.info.isLinkMergedWithParent() ? l.isNull() ? this.mergedLinkTargetNullRecords.push(l) : l.isRef() ? this.mergedLinkTargetRecordIdRefs.push(l) : this.mergedLinkTargetNewRecords.push(l) : l.info.isLinkMergedWithAttribute() ? l.isNull() ? this.differentTableMergedLinkNullRecords.push(l) : l.isRef() ? this.differentTableMergedLinkRecordIdRefs.push(l) : this.differentTableMergedLinkNewRecords.push(l) : l.isNull() ? this.isolatedNullRecords.push(l) : l.isRef() ? this.isolatedRecordIdRefs.push(l) : this.isolatedNewRecords.push(l);
-    }), this.rawData?.[f] && (this.linkRecordData = new Q(this.map, r?.linkName, this.rawData[f]));
+    }), this.rawData?.[f] && (this.linkRecordData = new V(this.map, r?.linkName, this.rawData[f]));
   }
   merge(t) {
-    const e = new Q(this.map, this.originalRecordName, { ...this.rawData, ...t }, this.info);
+    const e = new V(this.map, this.originalRecordName, { ...this.rawData, ...t }, this.info);
     return this.recordName !== this.originalRecordName && (e.recordName = this.recordName), e;
   }
   getRef() {
@@ -2873,7 +2847,7 @@ class Q {
     }), i;
   }
 }
-class Qe {
+class Oe {
   constructor(t, e, i, r, s, a) {
     this.map = t, this.database = e, this.queryExecutor = i, this.helper = a, this.sqlBuilder = s, this.filteredEntityManager = r;
   }
@@ -2996,7 +2970,7 @@ class Qe {
       }), n = {
         [a.attributeName]: i,
         [f]: s.getData()[f]
-      }, [c] = await this.helper.updateRecord(a.parentEntityName, o, new Q(this.map, a.parentEntityName, n), e);
+      }, [c] = await this.helper.updateRecord(a.parentEntityName, o, new V(this.map, a.parentEntityName, n), e);
       s.info.isXToMany ? (r[s.info.attributeName] || (r[s.info.attributeName] = []), r[s.info.attributeName].push({
         ...c,
         [f]: c[a.attributeName][f]
@@ -3011,7 +2985,7 @@ class Qe {
         source: s.info.isRecordSource() ? i : a,
         target: s.info.isRecordSource() ? a : i
       });
-      const n = new Q(this.map, s.info.linkName, o), c = await this.createRecord(n, `create isolated related link record ${t.recordName}.${s.info?.attributeName}`, e);
+      const n = new V(this.map, s.info.linkName, o), c = await this.createRecord(n, `create isolated related link record ${t.recordName}.${s.info?.attributeName}`, e);
       s.info.isXToMany ? (r[s.info.attributeName] || (r[s.info.attributeName] = []), r[s.info.attributeName].push({
         ...a,
         [f]: c
@@ -3034,7 +3008,7 @@ class Qe {
         source: a.info.isRecordSource() ? i : a.getRef(),
         target: a.info.isRecordSource() ? a.getRef() : i
       });
-      const n = new Q(this.map, a.info.linkName, o), c = await this.createRecord(n, `create isolated related link record of old related ${t.recordName}.${a.info?.attributeName}`, e);
+      const n = new V(this.map, a.info.linkName, o), c = await this.createRecord(n, `create isolated related link record of old related ${t.recordName}.${a.info?.attributeName}`, e);
       a.info.isXToMany ? (r[a.info.attributeName] || (r[a.info.attributeName] = []), r[a.info.attributeName][s] = {
         ...a.getData(),
         [f]: c
@@ -3056,7 +3030,7 @@ class Qe {
    * 添加链接
    */
   async addLink(t, e, i, r = {}, s = !1, a) {
-    const o = (await this.queryExecutor.findRecords(M.create(t, this.map, {
+    const o = (await this.queryExecutor.findRecords(P.create(t, this.map, {
       matchExpression: m.atom({ key: "source.id", value: ["=", e] }).and({
         key: "target.id",
         value: ["=", i]
@@ -3074,7 +3048,7 @@ class Qe {
       });
       await this.helper.unlink(t, h, !1, "unlink combined record for add new link", a);
     }
-    const c = new Q(this.map, n.name, {
+    const c = new V(this.map, n.name, {
       source: { id: e },
       target: { id: i },
       ...r
@@ -3086,7 +3060,7 @@ class Qe {
    * 这是一个辅助方法，实际的删除逻辑在 RecordQueryAgent 中
    */
 }
-class Le {
+class De {
   constructor(t, e) {
     this.map = t, this.queryAgent = e, this.dependencies = /* @__PURE__ */ new Map();
   }
@@ -3168,7 +3142,7 @@ class Le {
     const o = s.path.concat("id").join("."), n = m.atom({
       key: o,
       value: ["=", i]
-    }), c = M.create(t.baseEntityName, this.map, {
+    }), c = P.create(t.baseEntityName, this.map, {
       matchExpression: n,
       attributeQuery: ["id"]
     });
@@ -3180,7 +3154,7 @@ class Le {
   async checkRecordMatchesFilter(t, e, i) {
     if (!this.queryAgent)
       throw new Error("QueryAgent not set in FilteredEntityManager");
-    const r = M.create(e, this.map, {
+    const r = P.create(e, this.map, {
       matchExpression: i.and({
         key: "id",
         value: ["=", t]
@@ -3275,7 +3249,7 @@ class Le {
    */
   async updateSingleFilteredEntityFlag(t, e, i) {
     const r = this.map.getRecordInfo(t.baseEntityName), s = await this.queryAgent.findRecords(
-      M.create(t.baseEntityName, this.map, {
+      P.create(t.baseEntityName, this.map, {
         matchExpression: m.atom({ key: "id", value: ["=", e] }),
         attributeQuery: r.isRelation ? ["*", ["target", { attributeQuery: ["*"] }], ["source", { attributeQuery: ["*"] }]] : ["*"]
       }),
@@ -3312,7 +3286,7 @@ class Le {
     }
   }
 }
-class qe {
+class Fe {
   constructor() {
     this.aliasToPath = /* @__PURE__ */ new Map(), this.pathStrToAlias = /* @__PURE__ */ new Map(), this.aliasPlaceholder = 0;
   }
@@ -3335,7 +3309,7 @@ class qe {
     return this.aliasToPath.get(t);
   }
 }
-class Be {
+class Ve {
   constructor(t, e) {
     this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?");
   }
@@ -3356,7 +3330,7 @@ class Be {
     ), [p, y] = this.buildSelectClause(
       t.attributeQuery.getValueAndXToOneRecordFields(),
       e
-    ), v = this.buildFromClause(t.recordName, e), g = this.buildJoinClause(n, e), k = this.buildModifierClause(t.modifier, e, y);
+    ), v = this.buildFromClause(t.recordName, e), g = this.buildJoinClause(n, e), A = this.buildModifierClause(t.modifier, e, y);
     return [
       `
 SELECT
@@ -3367,7 +3341,7 @@ ${g}
 WHERE
 ${d}
 
-${k}
+${A}
 `,
       h,
       y
@@ -3377,7 +3351,7 @@ ${k}
    * 构建 SELECT 子句
    */
   buildSelectClause(t, e = "") {
-    const i = new qe();
+    const i = new Fe();
     return t.length ? [t.map(({ tableAliasAndField: s, attribute: a, nameContext: o }) => {
       const n = [
         `${this.withPrefix(e)}${o[0]}`,
@@ -3484,29 +3458,29 @@ ${k}
             joinTarget: [d, h]
           });
         } else {
-          const g = c.getLinkInfo(), k = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : g.isRelationSource(c.parentEntityName, c.attributeName);
+          const g = c.getLinkInfo(), A = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : g.isRelationSource(c.parentEntityName, c.attributeName);
           r.push({
             for: l,
             joinSource: a,
-            joinIdField: [s, k ? g.record.attributes.source.field : g.record.attributes.target.field],
+            joinIdField: [s, A ? g.record.attributes.source.field : g.record.attributes.target.field],
             joinTarget: [p, y]
           }), o.onlyIdField() || r.push({
             for: l,
             joinSource: [p, y],
-            joinIdField: [k ? g.record.attributes.target.field : g.record.attributes.source.field, v],
+            joinIdField: [A ? g.record.attributes.target.field : g.record.attributes.source.field, v],
             joinTarget: [d, h]
           });
         }
       if (r.push(...this.getJoinTables(o, l, [v, d, h])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
-        const g = l.concat(f), [, k] = this.map.getTableAliasAndFieldName(g, "id", !0), F = [
-          k,
+        const g = l.concat(f), [, A] = this.map.getTableAliasAndFieldName(g, "id", !0), D = [
+          A,
           // link 的 idField
           p,
           // link 的 tableName
           y
           // link 的 tableAlias
         ];
-        r.push(...this.getJoinTables(o.parentLinkQueryTree, g, F));
+        r.push(...this.getJoinTables(o.parentLinkQueryTree, g, D));
       }
     }), r;
   }
@@ -3520,7 +3494,7 @@ ${k}
       if (!s.data.isFunctionMatch) return { ...s.data };
       if (s.data.value[0].toLowerCase() !== "exist")
         throw new Error(`we only support Exist function match on entity for now. yours: ${s.data.key} ${s.data.value[0]} ${s.data.value[1]}`);
-      const o = this.map.getInfoByPath(s.data.namePath), { alias: n } = this.map.getTableAndAliasStack(s.data.namePath).at(-1), c = this.map.getReverseAttribute(o.parentEntityName, o.attributeName), l = s.data.namePath.slice(1, -1), d = M.create(
+      const o = this.map.getInfoByPath(s.data.namePath), { alias: n } = this.map.getTableAndAliasStack(s.data.namePath).at(-1), c = this.map.getReverseAttribute(o.parentEntityName, o.attributeName), l = s.data.namePath.slice(1, -1), d = P.create(
         o.recordName,
         this.map,
         {
@@ -3617,20 +3591,14 @@ WHERE ${s}
     return e?.toLowerCase() === "json" ? JSON.stringify(t) : t;
   }
 }
-const Jt = ":root";
+const _t = ":root";
 class it {
   constructor(t, e, i = []) {
     this.label = t, this.parent = e, this.stack = i;
   }
-  /**
-   * 添加一个值到栈中，返回新的上下文
-   */
   concat(t) {
     return new it(this.label, this.parent, [...this.stack, t]);
   }
-  /**
-   * 获取栈数据
-   */
   getStack(t) {
     return [...this.stack];
   }
@@ -3641,9 +3609,9 @@ class it {
     return new it(t, this);
   }
 }
-class _e {
+class Qe {
   constructor(t) {
-    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Jt, t), this.recursiveSaveLabelledRecordQuery(t);
+    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(_t, t), this.recursiveSaveLabelledRecordQuery(t);
   }
   recursiveSaveLabelledRecordQuery(t) {
     t.attributeQuery?.relatedRecords.forEach((e) => {
@@ -3657,7 +3625,7 @@ class _e {
     return this.recordQueryByName.get(t);
   }
 }
-class We {
+class Le {
   constructor(t, e, i) {
     this.map = t, this.database = e, this.sqlBuilder = i;
   }
@@ -3673,7 +3641,7 @@ class We {
       const s = {};
       return Object.entries(r).forEach(([a, o]) => {
         const n = i.getPath(a).slice(1, 1 / 0);
-        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && Ct(s, n, o);
+        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && Et(s, n, o);
       }), s;
     });
   }
@@ -3681,8 +3649,8 @@ class We {
    * 查找记录（主查询方法）
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(t, e = "", i, r = new it(Jt)) {
-    if (i || (i = new _e(t)), t.goto) {
+  async findRecords(t, e = "", i, r = new it(_t)) {
+    if (i || (i = new Qe(t)), t.goto) {
       if (t.exit && await t.exit(r))
         return [];
       const d = i.get(t.goto);
@@ -3705,8 +3673,8 @@ class We {
             value: ["=", y.id]
           }), g = d.derive({
             matchExpression: v
-          }), k = t.label ? l.concat(y) : l;
-          y[d.alias || d.attributeName] = await this.findRecords(g, e, i, k);
+          }), A = t.label ? l.concat(y) : l;
+          y[d.alias || d.attributeName] = await this.findRecords(g, e, i, A);
         }
       }
     for (let d of t.attributeQuery.xToOneRecords) {
@@ -3715,20 +3683,20 @@ class We {
         for (let p of h.attributeQuery.xToManyRecords) {
           const v = this.map.getInfo(p.parentRecord, p.attributeName).getReverseInfo()?.attributeName;
           for (let g of c) {
-            const k = g[d.attributeName][f].id, F = p.derive({
+            const A = g[d.attributeName][f].id, D = p.derive({
               matchExpression: p.matchExpression.and({
                 key: `${v}.id`,
-                value: ["=", k]
+                value: ["=", A]
               })
-            }), j = t.label ? l.concat(g) : l;
-            Ct(
+            }), J = t.label ? l.concat(g) : l;
+            Et(
               g,
               [d.alias || d.attributeName, f, p.attributeName],
               await this.findRecords(
-                F,
+                D,
                 `finding relation data: ${t.recordName}.${d.attributeName}.&.${p.attributeName}`,
                 i,
-                j
+                J
               )
             );
           }
@@ -3804,29 +3772,29 @@ class We {
       matchExpression: c,
       attributeQuery: l
     }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, s, a), p = r.attributeQuery.parentLinkRecordQuery ? h.map((g) => {
-      let k;
-      return o.isLinkManyToManySymmetric() ? (k = {
+      let A;
+      return o.isLinkManyToManySymmetric() ? (A = {
         ...g,
         [f]: g[`${n}:source`]?.[f]?.id ? g[`${n}:source`]?.[f] : g[`${n}:target`]?.[f]
-      }, delete k[`${n}:source`], delete k[`${n}:target`]) : (k = {
+      }, delete A[`${n}:source`], delete A[`${n}:target`]) : (A = {
         ...g,
         [f]: g[n][f]
-      }, delete k[n]), k;
+      }, delete A[n]), A;
     }) : h, y = d.label && d.label !== a.label ? a.spawn(d.label) : a, v = r.attributeQuery.parentLinkRecordQuery;
     if (v)
       for (let g of v.attributeQuery.xToManyRecords)
-        for (let k of p) {
-          const F = k[f].id, j = d.label ? y.concat(k) : y;
-          Ct(
-            k,
+        for (let A of p) {
+          const D = A[f].id, J = d.label ? y.concat(A) : y;
+          Et(
+            A,
             [f, g.attributeName],
             await this.findXToManyRelatedRecords(
               g.parentRecord,
               g.attributeName,
-              F,
+              D,
               g,
               s,
-              j
+              J
             )
           );
         }
@@ -3839,7 +3807,7 @@ class We {
     const a = e.split("."), o = a.at(-1), n = a.slice(0, -1), c = m.atom({
       key: "id",
       value: ["=", i]
-    }), l = C.getAttributeQueryDataForRecord(t, this.map, !0, !0, !1, !0), d = e;
+    }), l = x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !1, !0), d = e;
     let h = l;
     for (let g of n)
       h.push([g, { attributeQuery: ["*"] }]), h = h.at(-1)[1].attributeQuery;
@@ -3853,14 +3821,14 @@ class We {
         return p = [...g.stack], !0;
     };
     h.push([o, { goto: d, exit: y }]);
-    const v = (await this.findRecords(M.create(t, this.map, {
+    const v = (await this.findRecords(P.create(t, this.map, {
       matchExpression: c,
       attributeQuery: l
     }), `find records for path ${t}.${e}`))[0];
     return p ? [v, ...p] : void 0;
   }
 }
-class Je {
+class qe {
   constructor(t, e, i, r, s, a) {
     this.map = t, this.database = e, this.queryExecutor = i, this.helper = a, this.sqlBuilder = s, this.filteredEntityManager = r;
   }
@@ -3868,9 +3836,9 @@ class Je {
    * 删除记录（主入口）
    */
   async deleteRecord(t, e, i, r = !1) {
-    const s = M.create(t, this.map, {
+    const s = P.create(t, this.map, {
       matchExpression: e,
-      attributeQuery: C.getAttributeQueryDataForRecord(
+      attributeQuery: x.getAttributeQueryDataForRecord(
         t,
         this.map,
         !0,
@@ -3898,7 +3866,7 @@ class Je {
     const s = this.map.getRecordInfo(t);
     for (let a of e) {
       if (!r) {
-        const o = M.create(
+        const o = P.create(
           t,
           this.map,
           {
@@ -3906,7 +3874,7 @@ class Je {
               key: "id",
               value: ["=", a.id]
             }),
-            attributeQuery: C.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0),
+            attributeQuery: x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0),
             modifier: { limit: 1 }
           }
         ), n = await this.helper.findRecords(o, `find record with same row data for delete ${t}`);
@@ -4032,7 +4000,7 @@ class Je {
     return b(!a.isTargetReliance, `cannot unlink reliance data, you can only delete record, ${t}`), a.isCombined() ? this.helper.relocateCombinedRecordDataForLink(t, e, i, s) : this.deleteRecord(t, e, s);
   }
 }
-class He {
+class Be {
   constructor(t, e, i, r, s) {
     this.map = t, this.database = e, this.helper = s, this.sqlBuilder = r, this.filteredEntityManager = i;
   }
@@ -4040,9 +4008,9 @@ class He {
    * 更新记录（主入口）
    */
   async updateRecord(t, e, i, r) {
-    const s = M.create(t, this.map, {
+    const s = P.create(t, this.map, {
       matchExpression: e,
-      attributeQuery: C.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0)
+      attributeQuery: x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0)
     }), a = await this.helper.findRecords(s, `find record for updating ${t}`), o = [];
     for (let n of a) {
       const c = await this.helper.createRecordDependency(i, r), l = await this.updateSameRowData(s.recordName, n, c, r), d = await this.handleUpdateReliance(s.recordName, n, i, r), h = Object.keys(i.getData());
@@ -4136,9 +4104,9 @@ class He {
     return await this.database.update(r, s, a.idField, `update record ${t} by id`), e;
   }
 }
-class je {
+class _e {
   constructor(t, e) {
-    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new Le(t, this), this.sqlBuilder = new Be(t, e), this.queryExecutor = new We(t, e, this.sqlBuilder), this.creationExecutor = new Qe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.deletionExecutor = new Je(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.updateExecutor = new He(t, e, this.filteredEntityManager, this.sqlBuilder, this), this.initializeFilteredEntityDependencies();
+    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new De(t, this), this.sqlBuilder = new Ve(t, e), this.queryExecutor = new Le(t, e, this.sqlBuilder), this.creationExecutor = new Oe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.deletionExecutor = new qe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.updateExecutor = new Be(t, e, this.filteredEntityManager, this.sqlBuilder, this), this.initializeFilteredEntityDependencies();
   }
   /**
    * 初始化所有 filtered entity 的依赖关系
@@ -4158,7 +4126,7 @@ class je {
    * 查找记录（主查询方法）- 委托给 QueryExecutor
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(t, e = "", i, r = new it(Jt)) {
+  async findRecords(t, e = "", i, r = new it(_t)) {
     return this.queryExecutor.findRecords(t, e, i, r);
   }
   // 委托给 CreationExecutor
@@ -4222,7 +4190,7 @@ class je {
   async flashOutCombinedRecordsAndMergedLinks(t, e, i = "") {
     const r = {};
     let s;
-    const a = C.getAttributeQueryDataForRecord(t.recordName, this.map, !0, !0, !1, !0);
+    const a = x.getAttributeQueryDataForRecord(t.recordName, this.map, !0, !0, !1, !0);
     for (let c of t.combinedRecordIdRefs) {
       const l = {
         key: `${c.info.attributeName}.id`,
@@ -4230,7 +4198,7 @@ class je {
       };
       s ? s = s.or(l) : s = m.atom(l);
     }
-    const o = M.create(t.recordName, this.map, {
+    const o = P.create(t.recordName, this.map, {
       matchExpression: s,
       attributeQuery: a
     }, void 0, void 0, void 0, !1, !0), n = await this.queryExecutor.findRecords(o, i, void 0);
@@ -4256,13 +4224,13 @@ class je {
    * 用于 unlink 场景中处理合并记录的数据迁移
    */
   async relocateCombinedRecordDataForLink(t, e, i = !1, r) {
-    const s = C.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0), a = i ? "source" : "target", o = await this.queryExecutor.findRecords(M.create(t, this.map, {
+    const s = x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0), a = i ? "source" : "target", o = await this.queryExecutor.findRecords(P.create(t, this.map, {
       matchExpression: e,
       attributeQuery: s
     }), `finding combined records for relocate ${t}.${a}`, void 0), n = this.map.getLinkInfoByName(t)[i ? "sourceRecordInfo" : "targetRecordInfo"];
     await this.deleteRecordSameRowData(n.name, o.map((c) => c[a]));
     for (let c of o) {
-      const l = new Q(this.map, n.name, c[a]);
+      const l = new V(this.map, n.name, c[a]);
       await this.creationExecutor.insertSameRowData(l, void 0), r?.push({
         type: "delete",
         recordName: t,
@@ -4306,9 +4274,9 @@ class je {
     return this.queryExecutor.findPath(t, e, i, r, s);
   }
 }
-class Ue {
+class We {
   constructor(t, e) {
-    this.map = t, this.database = e, this.agent = new je(t, e);
+    this.map = t, this.database = e, this.agent = new _e(t, e);
   }
   async findOne(t, e, i = {}, r) {
     const s = {
@@ -4319,7 +4287,7 @@ class Ue {
   }
   async find(t, e, i, r = []) {
     b(this.map.getRecord(t), `cannot find entity ${t}`);
-    const s = M.create(
+    const s = P.create(
       t,
       this.map,
       {
@@ -4331,12 +4299,12 @@ class Ue {
     return this.agent.findRecords(s, `finding ${t} from handle`);
   }
   async create(t, e, i) {
-    const r = new Q(this.map, t, e);
+    const r = new V(this.map, t, e);
     return this.agent.createRecord(r, `create record ${t} from handle`, i);
   }
   // CAUTION 不能递归更新 relate entity 的 value，如果传入了 related entity 的值，说明是建立新的联系。
   async update(t, e, i, r) {
-    const s = new Q(this.map, t, i);
+    const s = new V(this.map, t, i);
     return this.agent.updateRecord(t, e, s, r);
   }
   async delete(t, e, i) {
@@ -4349,7 +4317,7 @@ class Ue {
     return this.agent.addLinkFromRecord(t, e, i, r, s, a);
   }
   async updateRelationByName(t, e, i, r) {
-    return b(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.agent.updateRecord(t, e, new Q(this.map, t, i), r);
+    return b(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.agent.updateRecord(t, e, new V(this.map, t, i), r);
   }
   async removeRelationByName(t, e, i) {
     return this.agent.unlink(t, e, !1, `remove relation ${t}`, i);
@@ -4412,19 +4380,19 @@ class rt {
     return Object.keys(this.data.attributes).filter((t) => {
       const e = this.data.attributes[t];
       return e.isRecord && e.field;
-    }).map((t) => new J(this.name, t, this.map));
+    }).map((t) => new _(this.name, t, this.map));
   }
   get strictRecordAttributes() {
     return Object.keys(this.data.attributes).filter((t) => {
       const e = this.data.attributes[t];
       return e.isRecord && !e.field && !e.isFilteredRelation;
-    }).map((t) => new J(this.name, t, this.map));
+    }).map((t) => new _(this.name, t, this.map));
   }
   get differentTableRecordAttributes() {
     return this.strictRecordAttributes.filter((t) => !(t.isMergedWithParent() || t.isLinkMergedWithParent()));
   }
   get reliance() {
-    return Object.keys(this.data.attributes).filter((t) => this.data.attributes[t].isReliance).map((t) => new J(this.name, t, this.map));
+    return Object.keys(this.data.attributes).filter((t) => this.data.attributes[t].isReliance).map((t) => new _(this.name, t, this.map));
   }
   get notRelianceCombined() {
     return this.combinedRecords.filter((t) => !t.isReliance);
@@ -4436,10 +4404,10 @@ class rt {
     return this.reliance.filter((t) => t.table === this.table);
   }
   get valueAttributes() {
-    return Object.entries(this.data.attributes).filter(([, t]) => !t.isRecord).map(([t]) => new J(this.name, t, this.map));
+    return Object.entries(this.data.attributes).filter(([, t]) => !t.isRecord).map(([t]) => new _(this.name, t, this.map));
   }
   getAttributeInfo(t) {
-    return new J(this.name, t, this.map);
+    return new _(this.name, t, this.map);
   }
   get baseRecordName() {
     return this.data.baseRecordName;
@@ -4466,7 +4434,7 @@ class rt {
     return this.data?.resolvedMatchExpression;
   }
 }
-class vt {
+class wt {
   constructor(t, e, i, r = !0) {
     this.name = t, this.data = e, this.map = i, this.isFromSource = r;
   }
@@ -4554,7 +4522,7 @@ class vt {
   getBaseLinkInfo() {
     b(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 wt(t, this.map.data.links[t], this.map);
   }
   getMatchExpression() {
     if (this.isFilteredRelation())
@@ -4568,7 +4536,7 @@ class vt {
     return b(this.isFilteredRelation(), "only filtered relation can get resolved record name"), this.data.resolvedBaseRecordName;
   }
 }
-class Ge {
+class Je {
   constructor(t, e) {
     this.data = t, this.aliasManager = e;
   }
@@ -4593,10 +4561,10 @@ class Ge {
   }
   getLinkInfo(t, e) {
     const i = this.getAttributeAndSymmetricDirection(e)[0], { linkName: r, isSource: s } = this.data.records[t].attributes[i];
-    return b(!!r, `cannot find relation ${t} ${i}`), new vt(r, this.data.links[r], this, !!s);
+    return b(!!r, `cannot find relation ${t} ${i}`), new wt(r, this.data.links[r], this, !!s);
   }
   getLinkInfoByName(t) {
-    return b(!!this.data.links[t], `cannot find link ${t}`), new vt(t, this.data.links[t], this);
+    return b(!!this.data.links[t], `cannot find link ${t}`), new wt(t, this.data.links[t], this);
   }
   getInfoByPath(t) {
     const [e, ...i] = t;
@@ -4609,7 +4577,7 @@ class Ge {
       c = h, d === f ? (b(!!s && !!a, `reading link in wrong path ${l.join(".")}`), s = this.data.records[s].attributes[a].linkName, a = void 0, r = o.linkName, o = void 0) : (o = this.data.records[r].attributes[d], b(!!o, `attribute ${d} not found in ${r}. namePath: ${t.join(".")}`), s = r, r = o.isRecord ? o.recordName : "", a = d);
     }
     if (!(!s || !a))
-      return new J(s, a, this, c);
+      return new _(s, a, this, c);
   }
   getTableAndAliasStack(t) {
     const [e, ...i] = t;
@@ -4632,21 +4600,21 @@ class Ge {
     for (let h = 0; h < i.length; h++) {
       const [p, y] = this.getAttributeAndSymmetricDirection(i[h]), v = [e, ...i.slice(0, h + 1)];
       if (p === f) {
-        const { linkTable: g, linkAlias: k, path: F } = d.pop();
-        b(!c, `last attribute in path is a link, cannot read link of a link ${F.join(".")}`), s = g, a = k, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
+        const { linkTable: g, linkAlias: A, path: D } = d.pop();
+        b(!c, `last attribute in path is a link, cannot read link of a link ${D.join(".")}`), s = g, a = A, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
       } else {
         l = this.getInfoByPath(v);
         const g = r.attributes[p];
         b(l.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
-        const k = this.data.records[g.recordName], F = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`, j = this.aliasManager?.getTableAlias(F) || F;
+        const A = this.data.records[g.recordName], D = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`, J = this.aliasManager?.getTableAlias(D) || D;
         if (l.isMergedWithParent() || l.isLinkMergedWithParent())
           n = a;
         else if (l.isLinkIsolated()) {
-          const Z = `REL_${F}`;
-          n = this.aliasManager?.getTableAlias(Z) || Z;
+          const Y = `REL_${D}`;
+          n = this.aliasManager?.getTableAlias(Y) || Y;
         } else
-          n = j;
-        l.isMergedWithParent() || (a = j), s = l.table, r = k, o = l.getLinkInfo()?.table, c = !1;
+          n = J;
+        l.isMergedWithParent() || (a = J), s = l.table, r = A, o = l.getLinkInfo()?.table, c = !1;
       }
       d.push({
         table: s,
@@ -4764,7 +4732,7 @@ class Ge {
     return r.join(".");
   }
 }
-function Ke(u) {
+function He(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u)
     if (e.inputEntities)
@@ -4775,7 +4743,7 @@ function Ke(u) {
     }
   return t;
 }
-function Xe(u) {
+function je(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u) {
     const i = e.name || `${e.source.name}_${e.sourceProperty}_${e.targetProperty}_${e.target.name}`;
@@ -4789,32 +4757,32 @@ function Xe(u) {
   }
   return t;
 }
-function ze(u, t) {
-  const e = new me(u, t), i = Ke(u), r = Xe(t);
-  return se(
+function Ue(u, t) {
+  const e = new de(u, t), i = He(u), r = je(t);
+  return ie(
     u,
     e,
     i,
     "entity"
-  ), se(
+  ), ie(
     t,
     e,
     r,
     "relation"
   ), e.getAll();
 }
-function se(u, t, e, i) {
+function ie(u, t, e, i) {
   const r = u.filter((s) => gt(s) !== void 0);
   for (const s of r)
-    Ye(
+    Ge(
       s,
       t,
       i,
       e
     );
 }
-function Ye(u, t, e, i) {
-  const r = e === "entity", a = `__${Y(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = ri(
+function Ge(u, t, e, i) {
+  const r = e === "entity", a = `__${X(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = Ze(
     o,
     a,
     i,
@@ -4829,7 +4797,7 @@ function Ye(u, t, e, i) {
   }
   if (l)
     for (const d of l)
-      Ze(
+      Ke(
         d,
         c,
         a,
@@ -4837,22 +4805,22 @@ function Ye(u, t, e, i) {
         r
       );
 }
-function Ze(u, t, e, i, r) {
-  const [s, a] = si(
+function Ke(u, t, e, i, r) {
+  const [s, a] = ti(
     u,
     t,
     e
   );
   if (!r && s === u)
     return;
-  const o = Y(a), n = r ? i.getEntityByName(o) : i.getRelationByName(o);
+  const o = X(a), n = r ? i.getEntityByName(o) : i.getRelationByName(o);
   n && i.replace(s, n);
 }
-function ti(u, t) {
+function Xe(u, t) {
   const e = /* @__PURE__ */ new Map(), i = gt(u);
   if (i && i.length > 0)
     for (const r of i) {
-      const s = Y(r), a = [...t.get(s) || []], o = e.get(s) || [];
+      const s = X(r), a = [...t.get(s) || []], o = e.get(s) || [];
       for (o.push(s), e.set(s, o); a.length; ) {
         const n = a.shift(), c = e.get(n) || [];
         c.push(...o), e.set(n, c);
@@ -4862,27 +4830,27 @@ function ti(u, t) {
     }
   return e;
 }
-function ei(u, t, e) {
-  const i = ti(t, e);
+function ze(u, t, e) {
+  const i = Xe(t, e);
   return N.create({
     name: u,
     type: "json",
     defaultValue: (r, s) => {
       const a = gt(t) || [], n = (i.get(s) || []).filter(
-        (c) => a.some((l) => Y(l) === c)
+        (c) => a.some((l) => X(l) === c)
       );
       return n.length > 0 ? n : [s];
     }
   });
 }
-function ii(u, t, e) {
+function Ye(u, t, e) {
   const i = gt(u) || [], r = [], s = /* @__PURE__ */ new Map(), a = Object.fromEntries(u.commonProperties?.map((o) => [o.name, o]) || []);
   for (const o of i) {
     let n = o;
     if (yt(n))
       for (; n.baseEntity && n.properties.length === 0; )
         n = n.baseEntity;
-    else if (oi(n))
+    else if (ii(n))
       for (; n.baseRelation && n.properties.length === 0; )
         n = n.baseRelation;
     const c = Object.fromEntries(n.properties.map((h) => [h.name, h]));
@@ -4912,13 +4880,13 @@ function ii(u, t, e) {
   }
   return r;
 }
-function ri(u, t, e, i) {
-  const r = ei(
+function Ze(u, t, e, i) {
+  const r = ze(
     t,
     u,
     e
   ), s = [
-    ...ii(
+    ...Ye(
       u,
       e,
       i
@@ -4941,7 +4909,7 @@ function ri(u, t, e, i) {
       }))
     )) : o.properties = s, [o, n || o];
   } else {
-    const a = i.getRelationByName(u.name), o = x.create({
+    const a = i.getRelationByName(u.name), o = M.create({
       name: a.name,
       source: a.source,
       sourceProperty: a.sourceProperty,
@@ -4953,7 +4921,7 @@ function ri(u, t, e, i) {
     let n;
     if (a.inputRelations?.some((c) => c.baseRelation)) {
       const c = a.name || `${a.source.name}_${a.sourceProperty}_${a.targetProperty}_${a.target.name}`;
-      n = x.create({
+      n = M.create({
         name: `__${c}_base`,
         source: a.source,
         sourceProperty: `__${a.sourceProperty}_base`,
@@ -4964,7 +4932,7 @@ function ri(u, t, e, i) {
         properties: s
       }), o.baseRelation = n, o.sourceProperty = a.sourceProperty, o.targetProperty = a.targetProperty, o.matchExpression = m.fromArray(
         a.inputRelations.map((l) => {
-          const d = Y(l);
+          const d = X(l);
           return {
             key: t,
             value: ["contains", d]
@@ -4976,7 +4944,7 @@ function ri(u, t, e, i) {
     return [o, n || o];
   }
 }
-function si(u, t, e) {
+function ti(u, t, e) {
   if (yt(u)) {
     const i = u, r = t;
     let s = i;
@@ -4989,8 +4957,8 @@ function si(u, t, e) {
       value: ["contains", i.name]
     }), [a, s];
   } else {
-    const i = u, r = t, s = Y(i);
-    return i.baseRelation ? [i, ai(i)] : [x.create({
+    const i = u, r = t, s = X(i);
+    return i.baseRelation ? [i, ei(i)] : [M.create({
       name: s,
       baseRelation: r,
       sourceProperty: i.sourceProperty,
@@ -5002,7 +4970,7 @@ function si(u, t, e) {
     }), i];
   }
 }
-function ai(u) {
+function ei(u) {
   let t = u;
   for (; t.baseRelation; )
     t = t.baseRelation;
@@ -5011,16 +4979,16 @@ function ai(u) {
 function yt(u) {
   return "inputEntities" in u || !("sourceProperty" in u);
 }
-function oi(u) {
+function ii(u) {
   return "sourceProperty" in u;
 }
 function gt(u) {
   return yt(u) ? u.inputEntities : u.inputRelations;
 }
-function Y(u) {
+function X(u) {
   return yt(u), u.name;
 }
-class ni {
+class ri {
   constructor() {
     this.tableAliasCounter = 1, this.fieldAliasCounter = 1, this.tablePathToAlias = /* @__PURE__ */ new Map(), this.tableAliasToPath = /* @__PURE__ */ new Map(), this.fieldPathToAlias = /* @__PURE__ */ new Map(), this.fieldAliasToPath = /* @__PURE__ */ new Map(), this.MAX_IDENTIFIER_LENGTH = 63;
   }
@@ -5106,9 +5074,9 @@ class ni {
     this.tableAliasCounter = 1, this.fieldAliasCounter = 1, this.tablePathToAlias.clear(), this.tableAliasToPath.clear(), this.fieldPathToAlias.clear(), this.fieldAliasToPath.clear();
   }
 }
-class ci {
+class si {
   constructor(t, e, i, r = []) {
-    this.entities = t, this.relations = e, this.database = i, this.mergeLinks = r, this.fieldNameMap = /* @__PURE__ */ new Map(), this.usedFieldNames = /* @__PURE__ */ new Set(), this.fieldCounter = 1, this.recordToTableMap = /* @__PURE__ */ new Map(), this.tableToRecordsMap = /* @__PURE__ */ new Map(), this.mergeLog = [], this.tables = {}, this.map = { links: {}, records: {} }, this.aliasManager = new ni(), this.buildMap(), this.buildTables();
+    this.entities = t, this.relations = e, this.database = i, this.mergeLinks = r, this.fieldNameMap = /* @__PURE__ */ new Map(), this.usedFieldNames = /* @__PURE__ */ new Set(), this.fieldCounter = 1, this.recordToTableMap = /* @__PURE__ */ new Map(), this.tableToRecordsMap = /* @__PURE__ */ new Map(), this.mergeLog = [], this.tables = {}, this.map = { links: {}, records: {} }, this.aliasManager = new ri(), this.buildMap(), this.buildTables();
   }
   createRecordToTable(t, e) {
     this.recordToTableMap.set(t, e);
@@ -5203,8 +5171,8 @@ class ci {
         }
       ];
     }));
-    e && b(!i.source && !i.target, "source and target is reserved name for relation attributes"), i[ae] = {
-      name: ae,
+    e && b(!i.source && !i.target, "source and target is reserved name for relation attributes"), i[re] = {
+      name: re,
       type: "id",
       fieldType: this.database.mapToDBFieldType("pk")
     };
@@ -5499,7 +5467,7 @@ class ci {
    * 统一处理 merged entities 和 merged relations
    */
   processMergedItems() {
-    const t = ze(
+    const t = Ue(
       this.entities,
       this.relations
     );
@@ -5516,9 +5484,9 @@ class ci {
           p[0] === "1" && p[1] === "1" && y !== v,
           `only 1:1 can merge: ${s}.${a.slice(0, n + 1).join(".")}`
         );
-        const g = y === o ? v : y, k = this.combineRecordTable(o, g, d);
-        if (k)
-          throw new Error(`conflict found when join ${d}, ${k.join(",")} already merged with ${o}`);
+        const g = y === o ? v : y, A = this.combineRecordTable(o, g, d);
+        if (A)
+          throw new Error(`conflict found when join ${d}, ${A.join(",")} already merged with ${o}`);
         h.mergedTo = "combined", i.push(h), o = l.recordName, delete t[d], delete e[d];
       }
     }), Object.values(t).forEach((r) => {
@@ -5577,8 +5545,8 @@ class ci {
   buildTables() {
     Object.entries(this.map.records).forEach(([t, e]) => {
       this.tables[e.table] || (this.tables[e.table] = { columns: {
-        [oe]: {
-          name: oe,
+        [se]: {
+          name: se,
           type: "pk",
           fieldType: this.database.mapToDBFieldType("pk")
         }
@@ -5651,8 +5619,8 @@ ${Object.values(this.tables[t].columns).map((i) => `    "${i.name}" ${i.fieldTyp
     });
   }
 }
-const tt = "_System_", q = "_Dictionary_", ae = "id", oe = "_rowId", li = I.create({
-  name: tt,
+const Z = "_System_", L = "_Dictionary_", re = "id", se = "_rowId", ai = I.create({
+  name: Z,
   properties: [
     N.create({
       name: "concept",
@@ -5670,8 +5638,8 @@ const tt = "_System_", q = "_Dictionary_", ae = "id", oe = "_rowId", li = I.crea
       collection: !1
     })
   ]
-}), ui = I.create({
-  name: q,
+}), oi = I.create({
+  name: L,
   properties: [
     N.create({
       name: "key",
@@ -5684,8 +5652,8 @@ const tt = "_System_", q = "_Dictionary_", ae = "id", oe = "_rowId", li = I.crea
       collection: !1
     })
   ]
-}), vr = 0, xt = 1, Tr = 2;
-class di {
+}), yr = 0, It = 1, gr = 2;
+class ni {
   constructor(t, e) {
     this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
   }
@@ -5699,18 +5667,18 @@ class di {
       if (this.scheduler.isDataBasedComputation(i)) {
         if (Object.entries(i.dataDeps).forEach(([r, s]) => {
           const a = this.convertDataDepToERMutationEventsSourceMap(r, s, i);
-          e[s.phase || xt].push(...a);
+          e[s.phase || It].push(...a);
         }), i.dataContext.type === "property" && Object.values(i.dataDeps).some((r) => r.type === "global")) {
           const r = {
             type: "records",
             source: i.dataContext.host
           };
-          e[xt].push(...this.convertDataDepToERMutationEventsSourceMap("_self", r, i, "create"));
+          e[It].push(...this.convertDataDepToERMutationEventsSourceMap("_self", r, i, "create"));
         }
       } else {
         const { eventDeps: r } = i;
         for (const s of Object.values(r))
-          e[s.phase || xt].push({
+          e[s.phase || It].push({
             type: s.type,
             recordName: s.recordName,
             record: s.record,
@@ -5749,7 +5717,7 @@ class di {
    * @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((r) => r !== "id").every(
+    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === L ? e.record?.key === t.dataDep.source.name : !t.attributes.filter((r) => r !== "id").every(
       (r) => !e.record.hasOwnProperty(r) || e.record[r] === e.oldRecord[r]
     );
   }
@@ -5807,15 +5775,15 @@ class di {
     } else e.type === "global" && ((!r || r === "update") && a.push({
       dataDep: e,
       type: "update",
-      recordName: q,
-      sourceRecordName: q,
+      recordName: L,
+      sourceRecordName: L,
       attributes: ["value"],
       computation: i
     }), (!r || r === "create") && a.push({
       dataDep: e,
       type: "create",
-      recordName: q,
-      sourceRecordName: q,
+      recordName: L,
+      sourceRecordName: L,
       computation: i
     }));
     return a;
@@ -5912,31 +5880,31 @@ class di {
 }
 class S {
   static {
-    this.skip = () => new Tt();
+    this.skip = () => new Nt();
   }
   static {
-    this.resolved = (t, e) => new Re(t, e);
+    this.resolved = (t, e) => new me(t, e);
   }
   static {
-    this.async = (t) => new be(t);
+    this.async = (t) => new fe(t);
   }
   static {
-    this.fullRecompute = (t) => new ge(t);
+    this.fullRecompute = (t) => new pe(t);
   }
 }
-class Tt extends S {
+class Nt extends S {
 }
-class ge extends S {
+class pe extends S {
   constructor(t) {
     super(), this.reason = t;
   }
 }
-class be extends S {
+class fe extends S {
   constructor(t) {
     super(), this.args = t;
   }
 }
-class Re extends S {
+class me extends S {
   constructor(t, e) {
     super(), this.result = t, this.args = e;
   }
@@ -5949,8 +5917,8 @@ class 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 i = (await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]))?.[this.key];
+    if (!t || t[this.key] === void 0) {
+      const i = (t ? await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]) : void 0)?.[this.key];
       return i !== void 0 ? i : this.defaultValue;
     }
     return t[this.key];
@@ -5967,18 +5935,19 @@ class B {
     return await this.controller.system.storage.dict.get(this.key);
   }
 }
-function $t(u, t) {
+function Ct(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) || !$t(u[e], t[e]))
+  const e = u, i = t;
+  for (const r in i)
+    if (!(r in e) || !Ct(e[r], i[r]))
       return !1;
   return !0;
 }
-class we {
+class ye {
   constructor(t) {
     this.data = t, this.map = {};
     for (const e of t.transfers)
@@ -5991,45 +5960,45 @@ class we {
     const i = this.map[t];
     if (i) {
       for (const r of i)
-        if ($t(e, r.trigger))
+        if (Ct(e, r.trigger))
           return r.next;
     }
     return null;
   }
   findTransfers(t) {
-    return this.data.transfers.filter((e) => $t(t, e.trigger));
+    return this.data.transfers.filter((e) => Ct(t, e.trigger));
   }
 }
-function A(u, t) {
+function k(u, t) {
   if (!u)
     throw new Error(t);
 }
-function kr(u, t) {
+function br(u, t) {
   return new Map(Array.from(u.entries()).map(([e, i]) => [e, t(e, i)]));
 }
-function Ar(u, t) {
+function Rr(u, t) {
   return Object.fromEntries(Object.entries(u).map(([e, i]) => [e, t(e, i)]));
 }
-async function Sr(u, t) {
+async function wr(u, t) {
   for (let e of u)
     if (!await t(e)) return !1;
   return !0;
 }
-async function hi(u, t) {
+async function Nr(u, t) {
   for (let e of u)
     if (await t(e)) return !0;
   return !1;
 }
-async function pi(u, t) {
+async function vr(u, t) {
   for (let e of u) {
     const i = await t(e);
     if (i !== !0) return i;
   }
   return !0;
 }
-class fi {
+class ci {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new we(this.args), this.initialState = this.args.initialState;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ye(this.args), this.initialState = this.args.initialState;
     for (const r of this.args.transfers) {
       const s = `${r.trigger.recordName}_${r.trigger.type}`;
       this.eventDeps[s] = {
@@ -6057,9 +6026,9 @@ class fi {
     return s ? (await this.state.currentState.set(s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : S.skip();
   }
 }
-class mi {
+class li {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new we(this.args), this.initialState = this.args.initialState, this.dataContext = i;
+    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new ye(this.args), this.initialState = this.args.initialState, this.dataContext = i;
     for (const r of this.args.transfers) {
       const s = `${r.trigger.recordName}_${r.trigger.type}`;
       this.eventDeps[s] = {
@@ -6081,7 +6050,7 @@ class mi {
   }
   async getInitialValue(t) {
     const e = t[this.dataContext.id.name];
-    return A(
+    return k(
       !(e !== void 0 && !this.initialState.computeValue),
       `${this.dataContext.host.name}.${this.dataContext.id.name} have been set when ${this.dataContext.host.name} created, 
 if you want to save the use the initial value, you need to define computeValue in initialState to save it.
@@ -6104,17 +6073,17 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     };
   }
 }
-const Er = z.create({
+const Tr = K.create({
   name: "nonExistent",
   computeValue: () => null
-}), Ir = z.create({
+}), Ar = K.create({
   name: "nonDeleted",
   computeValue: () => !1
-}), Cr = z.create({
+}), kr = K.create({
   name: "deleted",
   computeValue: () => !0
-}), yi = [fi, mi];
-class gi {
+}), ui = [ci, li];
+class di {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.record = this.args.record, this.dataDeps = {
       main: {
@@ -6167,9 +6136,9 @@ class gi {
     return i;
   }
 }
-class bi {
+class hi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), A(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), k(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -6243,8 +6212,8 @@ class bi {
     return s;
   }
 }
-const Ri = [gi, bi];
-class wi {
+const pi = [di, hi];
+class fi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6297,9 +6266,9 @@ class wi {
     return a === s;
   }
 }
-class Ni {
+class mi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -6371,8 +6340,8 @@ class Ni {
     return a === o;
   }
 }
-const vi = [wi, Ni];
-class Ti {
+const yi = [fi, mi];
+class gi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6425,14 +6394,14 @@ class Ti {
     return s > 0;
   }
 }
-class ki {
+class bi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), A(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), k(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
     let r = this.relation.baseRelation || this.relation;
     for (; r.baseRelation; )
       r = r.baseRelation;
     const s = r.type.split(":");
-    A(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    k(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const a = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((n) => n[0] !== f) || [];
     const o = (a.find((n) => n[0] === f) || [])[1]?.attributeQuery;
@@ -6501,8 +6470,8 @@ class ki {
     return s > 0;
   }
 }
-const Ai = [Ti, ki];
-class Si {
+const Ri = [gi, bi];
+class wi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, this.callback = this.args.callback?.bind(this) || (() => !0), this.dataDeps = {
       main: {
@@ -6552,9 +6521,9 @@ class Si {
     return s = Math.max(0, s), await this.state.count.set(s), s;
   }
 }
-class Ei {
+class Ni {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((a) => a && a[0] !== f) || [];
     const s = (r.find((a) => a && a[0] === f) || [])[1]?.attributeQuery;
@@ -6636,10 +6605,10 @@ class Ei {
     return a;
   }
 }
-const Ii = [Si, Ei];
-class Ci {
+const vi = [wi, Ni];
+class Ti {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, A(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), A(!(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 : (A(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, k(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), k(!(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 : (k(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
       ...this.args.dataDeps || {},
       _source: {
         type: "records",
@@ -6649,7 +6618,7 @@ class Ci {
     });
   }
   static {
-    this.computationType = At;
+    this.computationType = Tt;
   }
   static {
     this.contextType = ["entity", "relation"];
@@ -6664,7 +6633,7 @@ class Ci {
     return [];
   }
   async compute({ _source: t }) {
-    A(!this.eventDeps, "Transform compute should not be called with eventDeps");
+    k(!this.eventDeps, "Transform compute should not be called with eventDeps");
     const e = [];
     for (const i of t) {
       const r = await this.transformCallback.call(this.controller, i);
@@ -6679,7 +6648,7 @@ class Ci {
     return e;
   }
   async computeDirtyRecords(t) {
-    return A(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
+    return k(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
   }
   async incrementalPatchCompute(t, e) {
     return this.eventDeps ? this.eventBasedIncrementalPatchCompute(t, e) : this.dataBasedIncrementalPatchCompute(t, e);
@@ -6745,20 +6714,20 @@ class Ci {
     return r;
   }
 }
-const xi = [Ci];
-class P {
+const Ai = [Ti];
+class C {
   constructor(t) {
     this.node = t;
   }
   static number(t) {
-    return new P({ type: "number", value: t });
+    return new C({ type: "number", value: t });
   }
   static variable(t) {
-    return new P({ type: "variable", variable: { id: t } });
+    return new C({ type: "variable", variable: { id: t } });
   }
   add(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "+",
       left: this.node,
@@ -6767,7 +6736,7 @@ class P {
   }
   subtract(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "-",
       left: this.node,
@@ -6776,7 +6745,7 @@ class P {
   }
   multiply(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "*",
       left: this.node,
@@ -6785,7 +6754,7 @@ class P {
   }
   divide(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "/",
       left: this.node,
@@ -6794,7 +6763,7 @@ class P {
   }
   power(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "^",
       left: this.node,
@@ -6802,7 +6771,7 @@ class P {
     });
   }
   sqrt() {
-    return new P({
+    return new C({
       type: "operation",
       operation: "sqrt",
       left: this.node
@@ -6844,13 +6813,13 @@ class P {
     }
   }
   gt(t) {
-    return new kt(this, ">", t);
+    return new vt(this, ">", t);
   }
   lt(t) {
-    return new kt(this, "<", t);
+    return new vt(this, "<", t);
   }
   eq(t) {
-    return new Ht(this, t);
+    return new Wt(this, t);
   }
   getVariables() {
     const t = /* @__PURE__ */ new Set();
@@ -6860,7 +6829,7 @@ class P {
     t.type === "variable" ? e.add(t.variable.id) : t.type === "operation" && (t.left && this.collectVariables(t.left, e), t.right && this.collectVariables(t.right, e));
   }
   clone() {
-    return new P(this.cloneNode(this.node));
+    return new C(this.cloneNode(this.node));
   }
   cloneNode(t) {
     const e = { type: t.type };
@@ -6947,7 +6916,7 @@ class P {
     }
   }
 }
-class kt {
+class vt {
   constructor(t, e, i) {
     this.left = t, this.operator = e, this.right = i;
   }
@@ -6956,7 +6925,7 @@ class kt {
     return this.operator === ">" ? e > i : e < i;
   }
   solve() {
-    const t = typeof this.right == "number" ? P.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
+    const t = typeof this.right == "number" ? C.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
     if (r.length !== 1)
       throw new Error("Can only solve inequalities with exactly one variable");
     const s = r[0];
@@ -6982,7 +6951,7 @@ class kt {
     }
   }
 }
-class Ht {
+class Wt {
   constructor(t, e) {
     this.left = t, this.right = e;
   }
@@ -6991,7 +6960,7 @@ class Ht {
     return Math.abs(e - i) < 1e-10;
   }
   solve() {
-    const t = typeof this.right == "number" ? P.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
+    const t = typeof this.right == "number" ? C.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
     if (r.length !== 1)
       throw new Error("Can only solve equations with exactly one variable");
     const s = r[0];
@@ -7017,7 +6986,7 @@ class Ht {
     }
   }
 }
-class Mi {
+class ki {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = this.args.dataDeps ?? {}, this.callback = (r, s) => this.args.callback.call(this.controller, r, s), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, s) => this.args.nextRecomputeTime.call(this.controller, r, s) : void 0;
   }
@@ -7038,18 +7007,18 @@ class Mi {
   }
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(t) {
-    const e = await this.args.callback(P.variable("now"), t), i = Date.now();
+    const e = await this.args.callback(C.variable("now"), t), i = Date.now();
     let r, s;
-    if (e instanceof P)
+    if (e instanceof C)
       r = e.evaluate({ now: i }), s = i + this.nextRecomputeTime(i, t);
-    else if (e instanceof kt || e instanceof Ht)
+    else if (e instanceof vt || e instanceof Wt)
       r = e.evaluate({ now: i }), s = e.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(i), await this.state.nextRecomputeTime.set(s), r;
   }
 }
-class Pi {
+class Si {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = {
       _current: {
@@ -7076,19 +7045,19 @@ class Pi {
   }
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(t, e) {
-    const i = await this.args.callback(P.variable("now"), t), r = Date.now();
+    const i = await this.args.callback(C.variable("now"), t), r = Date.now();
     let s, a;
-    if (i instanceof P)
+    if (i instanceof C)
       s = i.evaluate({ now: r }), a = r + this.nextRecomputeTime(r, t);
-    else if (i instanceof kt || i instanceof Ht)
+    else if (i instanceof vt || i instanceof Wt)
       s = i.evaluate({ now: r }), a = i.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(e, r), await this.state.nextRecomputeTime.set(e, a), s;
   }
 }
-const $i = [Mi, Pi];
-class Oi {
+const Ei = [ki, Si];
+class Ii {
   constructor(t, e, i) {
     if (this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, !this.args.attributeQuery || this.args.attributeQuery.length === 0)
       throw new Error("Sum computation requires attributeQuery with at least one field");
@@ -7149,9 +7118,9 @@ class Oi {
     return s;
   }
 }
-class Di {
+class xi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), A(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), k(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((o) => o[0] !== f) || [];
     const s = (r.find((o) => o[0] === f) || [])[1]?.attributeQuery;
@@ -7238,8 +7207,8 @@ class Di {
     return a;
   }
 }
-const Fi = [Oi, Di];
-class Vi {
+const Mi = [Ii, xi];
+class Pi {
   constructor(t, e, i) {
     if (this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.record = this.args.record, !this.args.attributeQuery || this.args.attributeQuery.length === 0)
       throw new Error("Average computation requires attributeQuery with at least one field");
@@ -7312,9 +7281,9 @@ class Vi {
     return await this.state.sum.set(a), await this.state.count.set(s), s > 0 ? a / s : 0;
   }
 }
-class Qi {
+class Ci {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((o) => o && o[0] !== f) || [];
     const s = (r.find((o) => o && o[0] === f) || [])[1]?.attributeQuery;
@@ -7396,8 +7365,8 @@ class Qi {
     return await this.state.count.set(e.record, a), a > 0 ? o / a : 0;
   }
 }
-const Li = [Vi, Qi];
-class St {
+const $i = [Pi, Ci];
+class At {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.state = {}, this.dataDeps = {}, this.useLastValue = e.useLastValue !== void 0 ? e.useLastValue : !0, e.dataDeps && (this.dataDeps = e.dataDeps), e.compute && (this.computeCallback = e.compute, this.compute = async (...r) => {
       if (this.computeCallback) {
@@ -7441,7 +7410,7 @@ class St {
     }));
   }
   static {
-    this.computationType = Wt;
+    this.computationType = Bt;
   }
   createState() {
     if (this.createStateCallback) {
@@ -7469,29 +7438,29 @@ class St {
     return S.skip();
   }
 }
-class qi extends St {
+class Oi extends At {
   static {
     this.contextType = "global";
   }
 }
-class Bi extends St {
+class Di extends At {
   static {
     this.contextType = "entity";
   }
 }
-class _i extends St {
+class Fi extends At {
   static {
     this.contextType = "relation";
   }
 }
-class Wi extends St {
+class Vi extends At {
   static {
     this.contextType = "property";
   }
   constructor(t, e, i) {
     if (e.dataDeps) {
       const r = Object.keys(e.dataDeps).filter((s) => e.dataDeps[s].type === "records");
-      A(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
+      k(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
 If you want to use related entity/relation as dataDeps, please use "property" type dataDeps with args: { type: "property", attributeQuery: [attributeQuery] }
 If you want to use aggregated data from all records in the entity/relation, you should define a different dict value to store the aggregated data, and then use the dict value as dataDeps.
 `);
@@ -7499,13 +7468,13 @@ If you want to use aggregated data from all records in the entity/relation, you
     super(t, e, i);
   }
 }
-const Ji = [
-  qi,
-  Bi,
-  _i,
-  Wi
+const Qi = [
+  Oi,
+  Di,
+  Fi,
+  Vi
 ];
-class H extends Error {
+class W extends Error {
   constructor(t, e = {}) {
     super(`${t}. Caused by: ${e.causedBy?.message}`), this.name = this.constructor.name, this.timestamp = /* @__PURE__ */ new Date(), this.errorId = this.generateErrorId(), this.errorType = e.errorType || this.constructor.name, this.context = e.context || {}, this.causedBy = e.causedBy, this.stackTrace = this.stack, Object.setPrototypeOf(this, new.target.prototype);
   }
@@ -7518,7 +7487,7 @@ class H extends Error {
   getErrorChain() {
     const t = [this];
     let e = this.causedBy;
-    for (; e && (t.push(e), e instanceof H); )
+    for (; e && (t.push(e), e instanceof W); )
       e = e.causedBy;
     return t;
   }
@@ -7622,13 +7591,13 @@ Stack trace:`, r.stack.split(`
     return null;
   }
 }
-var $ = /* @__PURE__ */ ((u) => (u.LOW = "low", u.MEDIUM = "medium", u.HIGH = "high", u.CRITICAL = "critical", u))($ || {}), G = /* @__PURE__ */ ((u) => (u.VALIDATION = "validation", u.PERMISSION = "permission", u.COMPUTATION = "computation", u.STORAGE = "storage", u.INTERACTION = "interaction", u.ACTIVITY = "activity", u.SYSTEM = "system", u.CONFIGURATION = "configuration", u))(G || {});
-class V extends H {
+var $ = /* @__PURE__ */ ((u) => (u.LOW = "low", u.MEDIUM = "medium", u.HIGH = "high", u.CRITICAL = "critical", u))($ || {}), j = /* @__PURE__ */ ((u) => (u.VALIDATION = "validation", u.PERMISSION = "permission", u.COMPUTATION = "computation", u.STORAGE = "storage", u.INTERACTION = "interaction", u.ACTIVITY = "activity", u.SYSTEM = "system", u.CONFIGURATION = "configuration", u))(j || {});
+class F extends W {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "ComputationError",
       context: {
-        category: G.COMPUTATION,
+        category: j.COMPUTATION,
         handleName: e.handleName,
         computationName: e.computationName,
         dataContext: e.dataContext,
@@ -7639,7 +7608,7 @@ class V extends H {
     }), this.handleName = e.handleName, this.computationName = e.computationName, this.dataContext = e.dataContext, this.computationPhase = e.computationPhase, this.severity = e.severity || $.MEDIUM;
   }
 }
-class ne extends V {
+class ae extends F {
   constructor(t, e = {}) {
     super(t, {
       ...e,
@@ -7654,7 +7623,7 @@ class ne extends V {
     }), this.stateKey = e.stateKey, this.stateValue = e.stateValue, this.expectedStateType = e.expectedStateType, this.actualStateType = e.actualStateType;
   }
 }
-class U extends V {
+class H extends F {
   constructor(t, e = {}) {
     super(t, {
       ...e,
@@ -7669,12 +7638,12 @@ class U extends V {
     }), this.depName = e.depName, this.depType = e.depType, this.missingData = e.missingData, this.invalidData = e.invalidData;
   }
 }
-class Mt extends H {
+class xt extends W {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "SchedulerError",
       context: {
-        category: G.SYSTEM,
+        category: j.SYSTEM,
         schedulingPhase: e.schedulingPhase,
         failedComputations: e.failedComputations,
         ...e.context
@@ -7683,12 +7652,12 @@ class Mt extends H {
     }), this.schedulingPhase = e.schedulingPhase, this.failedComputations = e.failedComputations, this.severity = $.HIGH;
   }
 }
-class Hi extends H {
+class Li extends W {
   constructor(t, e) {
     super(t, {
       errorType: "SideEffectError",
       context: {
-        category: G.SYSTEM,
+        category: j.SYSTEM,
         sideEffectName: e.sideEffectName,
         recordName: e.recordName,
         mutationType: e.mutationType,
@@ -7699,12 +7668,12 @@ class Hi extends H {
     }), this.sideEffectName = e.sideEffectName, this.recordName = e.recordName, this.mutationType = e.mutationType, this.severity = $.MEDIUM;
   }
 }
-class D extends H {
+class U extends W {
   constructor(t, e) {
     super(t, {
       errorType: e.context?.errorType || "ConditionError",
       context: {
-        category: G.PERMISSION,
+        category: j.PERMISSION,
         checkType: e.checkType,
         fieldName: e.fieldName,
         payload: e.payload,
@@ -7718,7 +7687,7 @@ class D extends H {
    * Helper factory methods for common condition error scenarios
    */
   static userCheckFailed(t, e) {
-    return new D("User check failed", {
+    return new U("User check failed", {
       checkType: "user",
       evaluationError: t,
       severity: $.HIGH,
@@ -7729,7 +7698,7 @@ class D extends H {
   }
   static payloadValidationFailed(t, e, i, r) {
     const s = `${t} ${e}`;
-    return new D(`Payload validation failed for field '${t}': ${e}`, {
+    return new U(`Payload validation failed for field '${t}': ${e}`, {
       checkType: "payload",
       fieldName: t,
       payload: i,
@@ -7740,7 +7709,7 @@ class D extends H {
     });
   }
   static conditionCheckFailed(t, e) {
-    return new D(`Condition check failed: ${t.data.name}`, {
+    return new U(`Condition check failed: ${t.data.name}`, {
       checkType: "condition",
       evaluationError: t,
       severity: $.HIGH,
@@ -7751,7 +7720,7 @@ class D extends H {
   }
   static attributiveCheckFailed(t, e, i, r) {
     const s = `${t} ${e}`;
-    return new D(`Attributive check failed for field '${t}': ${e}`, {
+    return new U(`Attributive check failed for field '${t}': ${e}`, {
       checkType: "attributive",
       fieldName: t,
       payload: i,
@@ -7762,7 +7731,7 @@ class D extends H {
     });
   }
   static conceptCheckFailed(t, e) {
-    return new D(`Concept check failed for field '${t}'`, {
+    return new U(`Concept check failed for field '${t}'`, {
       checkType: "concept",
       fieldName: t,
       evaluationError: e,
@@ -7772,10 +7741,10 @@ class D extends H {
     });
   }
 }
-const Pt = "_ASYNC_TASK_";
-class ji {
+const Mt = "_ASYNC_TASK_";
+class qi {
   constructor(t, e, i, r, s) {
-    this.controller = t, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new di(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 ni(this.controller, this), this.buildComputationHandleMap(s);
     const a = [];
     r.forEach((o) => {
       o.computation && a.push({ dataContext: { type: "global", id: o }, args: o.computation });
@@ -7795,9 +7764,9 @@ class ji {
     });
     for (const o of a) {
       const n = o.dataContext, c = o.args, l = this.computationHandleMap.get(c.constructor);
-      A(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
+      k(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
       const d = l[n.type];
-      A(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
+      k(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
       const h = new d(this.controller, c, n);
       if (this.computationsHandles.set(n.id, h), this.isAsyncComputation(h)) {
         if (h.dataContext.type === "property") {
@@ -7817,7 +7786,7 @@ class ji {
                 type: "json"
               })
             ]
-          }), y = x.create({
+          }), y = M.create({
             name: `${p.name}_${h.dataContext.host.name}_${h.dataContext.id.name}`,
             source: p,
             target: h.dataContext.host,
@@ -7909,7 +7878,7 @@ class ji {
         const r = this.computationHandleMap.get(i.computationType);
         if (Array.isArray(i.contextType))
           for (const s of i.contextType)
-            A(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
+            k(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
         else
           r[i.contextType] = e;
       }
@@ -7939,13 +7908,13 @@ class ji {
   }
   async createStateData(t, ...e) {
     const i = this.computationsHandles.get(t);
-    return A(!!i, "cannot find computation handle"), i.createStateData?.(...e) ?? {};
+    return k(!!i, "cannot find computation handle"), i.createStateData?.(...e) ?? {};
   }
   addMutationPropertyComputationDefaultValueListeners() {
     for (const t of this.computationsHandles.values())
       if (t.getInitialValue && t.dataContext.type === "property") {
         const e = t.dataContext;
-        A(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
+        k(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
           for (let r of i)
             if (r.type === "create" && r.recordName === e.host.name) {
               const s = await t.getInitialValue?.(r.record);
@@ -7984,11 +7953,11 @@ class ji {
       return [e.oldRecord ?? e.record];
     let i = [];
     if (!t.isRelation)
-      A(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
+      k(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat("id").join("."),
         value: ["=", e.oldRecord.id]
       }), void 0);
-    else if (A(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
+    else if (k(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
       i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat(["&", "id"]).join("."),
         value: ["=", e.record.id]
@@ -8017,7 +7986,7 @@ class ji {
   }
   async computeDataBasedDirtyRecordsAndEvents(t, e) {
     let i = [];
-    if (t.dataDep.type === "global" && e.recordName === q)
+    if (t.dataDep.type === "global" && e.recordName === L)
       if (t.computation.dataContext.type === "property") {
         const r = t.computation.dataContext;
         i = (await this.controller.system.storage.find(r.host.name, m.atom({ key: "id", value: ["not", null] }), {}, ["*"])).map((a) => [a, {
@@ -8066,7 +8035,7 @@ class ji {
         try {
           this.isDataBasedComputation(t.computation) ? i = await this.computeDataBasedDirtyRecordsAndEvents(t, e) : i = await this.computeEventBasedDirtyRecordsAndEvents(t, e);
         } catch (r) {
-          throw new V("Failed to compute dirty records and events", {
+          throw new F("Failed to compute dirty records and events", {
             handleName: t.computation.constructor.name,
             computationName: t.computation.args.constructor.displayName,
             dataContext: t.computation.dataContext,
@@ -8078,7 +8047,7 @@ class ji {
           try {
             await this.runComputation(t.computation, s, r);
           } catch (a) {
-            throw new V("Failed to run computation for dirty record", {
+            throw new F("Failed to run computation for dirty record", {
               handleName: t.computation.constructor.name,
               computationName: t.computation.args.constructor.displayName,
               dataContext: t.computation.dataContext,
@@ -8089,7 +8058,7 @@ class ji {
           }
       }
     } catch (i) {
-      throw i instanceof V ? i : new Mt("Unexpected error in dirty records computation", {
+      throw i instanceof F ? i : new xt("Unexpected error in dirty records computation", {
         schedulingPhase: "dirty-records-processing",
         failedComputations: [t.computation.args.constructor.displayName],
         causedBy: i instanceof Error ? i : new Error(String(i))
@@ -8099,8 +8068,8 @@ class ji {
   getAsyncTaskRecordKey(t) {
     if (t.dataContext.type === "property") {
       const e = t.dataContext;
-      return `${Pt}_${e.host.name}_${e.id.name}`;
-    } else return t.dataContext.type === "global" ? `${Pt}_${t.dataContext.id.name}` : `${Pt}_${t.dataContext.type}_${t.dataContext.id?.name}`;
+      return `${Mt}_${e.host.name}_${e.id.name}`;
+    } else return t.dataContext.type === "global" ? `${Mt}_${t.dataContext.id.name}` : `${Mt}_${t.dataContext.type}_${t.dataContext.id?.name}`;
   }
   async createAsyncTask(t, e, i, r) {
     if (t.dataContext.type === "property")
@@ -8152,7 +8121,7 @@ class ji {
       try {
         a = t.dataDeps ? await this.resolveDataDeps(t, i) : {};
       } catch (o) {
-        throw new U("Failed to resolve computation data dependencies", {
+        throw new H("Failed to resolve computation data dependencies", {
           handleName: t.constructor.name,
           computationName: t.args.constructor.displayName,
           dataContext: t.dataContext,
@@ -8169,7 +8138,7 @@ class ji {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, i);
               } catch (n) {
-                throw new ne("Failed to retrieve last value for incremental computation", {
+                throw new ae("Failed to retrieve last value for incremental computation", {
                   handleName: t.constructor.name,
                   computationName: t.args.constructor.displayName,
                   dataContext: t.dataContext,
@@ -8183,7 +8152,7 @@ class ji {
               try {
                 o = await this.controller.retrieveLastValue(t.dataContext, i);
               } catch (n) {
-                throw new ne("Failed to retrieve last value for incremental patch computation", {
+                throw new ae("Failed to retrieve last value for incremental patch computation", {
                   handleName: t.constructor.name,
                   computationName: t.args.constructor.displayName,
                   dataContext: t.dataContext,
@@ -8192,16 +8161,16 @@ class ji {
               }
             s = await t.incrementalPatchCompute(o, e, i, a);
           } else
-            throw new V(`Unknown computation type: ${t.constructor.name}`, {
+            throw new F(`Unknown computation type: ${t.constructor.name}`, {
               handleName: t.constructor.name,
               computationName: t.args.constructor.displayName,
               dataContext: t.dataContext,
               computationPhase: "type-validation"
             });
-          if (s instanceof ge) {
+          if (s instanceof pe) {
             const o = t;
             if (!o.compute)
-              throw new V("compute must be defined for computation when incrementalCompute returns ComputationResultFullRecompute", {
+              throw new F("compute must be defined for computation when incrementalCompute returns ComputationResultFullRecompute", {
                 handleName: t.constructor.name,
                 computationName: t.args.constructor.displayName,
                 dataContext: t.dataContext,
@@ -8211,7 +8180,7 @@ class ji {
           }
         }
       } catch (o) {
-        throw o instanceof V ? o : new V("Computation execution failed", {
+        throw o instanceof F ? o : new F("Computation execution failed", {
           handleName: t.constructor.name,
           computationName: t.args.constructor.displayName,
           dataContext: t.dataContext,
@@ -8219,13 +8188,13 @@ class ji {
           causedBy: o instanceof Error ? o : new Error(String(o))
         });
       }
-      if (s instanceof Tt)
+      if (s instanceof Nt)
         return;
-      if (s instanceof be)
+      if (s instanceof fe)
         try {
           return await this.createAsyncTask(t, s.args, i);
         } catch (o) {
-          throw new V("Failed to create async task", {
+          throw new F("Failed to create async task", {
             handleName: t.constructor.name,
             computationName: t.args.constructor.displayName,
             dataContext: t.dataContext,
@@ -8234,10 +8203,10 @@ class ji {
           });
         }
       try {
-        const o = s instanceof Re ? await t.asyncReturn(s.result, s.args) : s;
+        const o = s instanceof me ? await t.asyncReturn(s.result, s.args) : s;
         t.incrementalPatchCompute ? await this.controller.applyResultPatch(t.dataContext, o, i) : await this.controller.applyResult(t.dataContext, o, i);
       } catch (o) {
-        throw new V("Failed to apply computation result", {
+        throw new F("Failed to apply computation result", {
           handleName: t.constructor.name,
           computationName: t.args.constructor.displayName,
           dataContext: t.dataContext,
@@ -8246,7 +8215,7 @@ class ji {
         });
       }
     } catch (s) {
-      throw s instanceof V ? s : new V("Unexpected error during computation execution", {
+      throw s instanceof F ? s : new F("Unexpected error during computation execution", {
         handleName: t.constructor.name,
         computationName: t.args.constructor.displayName,
         dataContext: t.dataContext,
@@ -8264,7 +8233,7 @@ class ji {
               return await this.controller.system.storage.find(s.source.name, void 0, {}, s.attributeQuery);
             if (s.type === "property") {
               if (!e?.id)
-                throw new U("Record ID is required for property data dependency", {
+                throw new H("Record ID is required for property data dependency", {
                   depName: r,
                   depType: s.type,
                   missingData: !0,
@@ -8276,7 +8245,7 @@ class ji {
             } else {
               if (s.type === "global")
                 return await this.controller.system.storage.dict.get(s.source.name);
-              throw new U(`Unknown data dependency type: ${s.type}`, {
+              throw new H(`Unknown data dependency type: ${s.type}`, {
                 depName: r,
                 depType: s.type,
                 invalidData: !0,
@@ -8286,7 +8255,7 @@ class ji {
               });
             }
           } catch (a) {
-            throw a instanceof U ? a : new U(`Failed to resolve data dependency '${r}'`, {
+            throw a instanceof H ? a : new H(`Failed to resolve data dependency '${r}'`, {
               depName: r,
               depType: s.type,
               handleName: t.constructor.name,
@@ -8298,7 +8267,7 @@ class ji {
         }));
         return Object.fromEntries(Object.entries(t.dataDeps).map(([r], s) => [r, i[s]]));
       } catch (i) {
-        throw i instanceof U ? i : new U("Failed to resolve computation data dependencies", {
+        throw i instanceof H ? i : new H("Failed to resolve computation data dependencies", {
           handleName: t.constructor.name,
           computationName: t.args.constructor.displayName,
           dataContext: t.dataContext,
@@ -8317,39 +8286,39 @@ class ji {
     try {
       this.addMutationPropertyComputationDefaultValueListeners(), this.addMutationComputationListeners(), t && (await this.setupGlobalBoundStateDefaultValues(), await this.setupGlobalComputationDefaultValue(), await this.setupDictDefaultValue());
     } catch (e) {
-      throw e instanceof Mt ? e : new Mt("Unexpected error during scheduler setup", {
+      throw e instanceof xt ? e : new xt("Unexpected error during scheduler setup", {
         schedulingPhase: "top-level-setup",
         causedBy: e instanceof Error ? e : new Error(String(e))
       });
     }
   }
 }
-const jt = new de();
-function Ui() {
-  return jt.getStore()?.effects;
+const Jt = new ne();
+function Bi() {
+  return Jt.getStore()?.effects;
 }
-function ce(u) {
-  const t = jt.getStore();
+function oe(u) {
+  const t = Jt.getStore();
   t?.effects && t.effects.push(...u);
 }
-const xr = "User";
-class Ne {
+const Sr = "User";
+class ge {
   constructor(t) {
     this.name = t.name, this.record = t.record, this.content = t.content;
   }
   static create(t) {
-    return new Ne(t);
+    return new ge(t);
   }
 }
-const Ot = "_isDeleted_", Mr = {
+const $t = "_isDeleted_", Er = {
   create() {
     return N.create({
-      name: Ot,
+      name: $t,
       type: "boolean"
     });
   }
 };
-class Pr {
+class Ir {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
       BoolExp: R,
@@ -8373,19 +8342,19 @@ class Pr {
     for (const p of this.eventSources)
       p.entity && p.entity.name && !d.has(p.entity.name) && (this.entities.push(p.entity), d.add(p.entity.name));
     const h = [
-      ...Ii,
-      ...xi,
-      ...Ai,
       ...vi,
+      ...Ai,
       ...Ri,
-      ...Fi,
-      ...Li,
-      ...$i,
       ...yi,
-      ...Ji,
+      ...pi,
+      ...Mi,
+      ...$i,
+      ...Ei,
+      ...ui,
+      ...Qi,
       ...n
     ];
-    this.scheduler = new ji(this, this.entities, this.relations, this.dict, h), o.forEach((p) => {
+    this.scheduler = new qi(this, this.entities, this.relations, this.dict, h), o.forEach((p) => {
       let y = this.recordNameToSideEffects.get(p.record.name);
       y || this.recordNameToSideEffects.set(p.record.name, y = /* @__PURE__ */ new Set()), y.add(p);
     });
@@ -8405,7 +8374,7 @@ class Pr {
     }
   }
   async applyResult(t, e, i) {
-    if (!(e instanceof Tt)) {
+    if (!(e instanceof Nt)) {
       if (t.type === "global")
         return this.system.storage.dict.set(t.id.name, e);
       if (t.type === "entity") {
@@ -8424,17 +8393,17 @@ class Pr {
           await this.system.storage.create(r.id.name, a);
       } else {
         const r = t;
-        r.id.name === Ot && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
+        r.id.name === $t && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
       }
     }
   }
   async applyResultPatch(t, e, i) {
-    if (e instanceof Tt || e === void 0) return;
+    if (e instanceof Nt || e === void 0) return;
     const r = Array.isArray(e) ? e : [e];
-    for (const s of r) {
+    for (const s of r)
       if (t.type === "global")
-        return this.system.storage.dict.set(t.id.name, s);
-      if (t.type === "entity" || t.type === "relation") {
+        await this.system.storage.dict.set(t.id.name, s);
+      else if (t.type === "entity" || t.type === "relation") {
         const a = t;
         if (s.type === "insert")
           await this.system.storage.create(a.id.name, s.data);
@@ -8447,9 +8416,8 @@ class Pr {
         }
       } else {
         const a = t;
-        a.id.name === Ot && s.data ? (A(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
+        a.id.name === $t && s.data ? (k(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
       }
-    }
   }
   /**
    * Unified dispatch API for all event source types.
@@ -8457,7 +8425,7 @@ class Pr {
    */
   async dispatch(t, e) {
     const i = { effects: [] };
-    return jt.run(i, async () => {
+    return Jt.run(i, async () => {
       await this.system.storage.beginTransaction(t.name);
       let r;
       try {
@@ -8494,7 +8462,7 @@ class Pr {
               result: await a.content.call(this, r)
             };
           } catch (o) {
-            const n = new Hi(
+            const n = new Li(
               `Side effect '${a.name}' failed for ${r.type} on ${r.recordName}`,
               {
                 sideEffectName: a.name,
@@ -8518,55 +8486,56 @@ class Pr {
   addEventListener(t, e) {
     this.callbacks.has(t) || this.callbacks.set(t, /* @__PURE__ */ new Set()), this.callbacks.get(t).add(e);
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   findEventSourceByName(t) {
     return this.eventSourcesByName.get(t);
   }
 }
-function Gi(u) {
+function _i(u) {
   return encodeURI(JSON.stringify(u));
 }
-function Ki(u) {
+function Wi(u) {
   return u === void 0 ? void 0 : JSON.parse(decodeURI(u));
 }
-class Xi {
+class Ji {
   constructor(t) {
     this.db = t, this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
         const i = m.atom({ key: "key", value: ["=", e] });
-        return (await this.queryHandle.findOne(q, i, void 0, ["value"]))?.value?.raw;
+        return (await this.queryHandle.findOne(L, i, void 0, ["value"]))?.value?.raw;
       },
       set: async (e, i) => {
-        const r = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(q, r, void 0, ["value"]);
-        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [q, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [q, { key: e, value: { raw: i } }], []);
+        const r = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(L, r, void 0, ["value"]);
+        s ? await this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [L, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : await this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [L, { key: e, value: { raw: i } }], []);
       }
     };
   }
-  beginTransaction(t = "") {
-    return this.db.beginTransaction ? this.db.beginTransaction(t) : this.db.scheme("BEGIN", t);
+  async beginTransaction(t = "") {
+    await (this.db.beginTransaction ? this.db.beginTransaction(t) : this.db.scheme("BEGIN", t));
   }
-  commitTransaction(t = "") {
-    return this.db.commitTransaction ? this.db.commitTransaction(t) : this.db.scheme("COMMIT", t);
+  async commitTransaction(t = "") {
+    await (this.db.commitTransaction ? this.db.commitTransaction(t) : this.db.scheme("COMMIT", t));
   }
-  rollbackTransaction(t = "") {
-    return this.db.rollbackTransaction ? this.db.rollbackTransaction(t) : this.db.scheme("ROLLBACK", t);
+  async rollbackTransaction(t = "") {
+    await (this.db.rollbackTransaction ? this.db.rollbackTransaction(t) : this.db.scheme("ROLLBACK", t));
   }
   // CAUTION kv 结构数据的实现也用 er。这是系统约定，因为也需要  Record 事件！
   async get(t, e, i) {
-    const r = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] }), s = (await this.queryHandle.findOne(tt, r, void 0, ["value"]))?.value;
-    return s === void 0 ? i : Ki(s);
+    const r = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] }), s = (await this.queryHandle.findOne(Z, r, void 0, ["value"]))?.value;
+    return s === void 0 ? i : Wi(s);
   }
   async set(t, e, i, r) {
     const s = m.atom({ key: "key", value: ["=", e] }).and({ key: "concept", value: ["=", t] });
-    return await this.queryHandle.findOne(tt, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [tt, s, { concept: t, key: e.toString(), value: Gi(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [tt, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(i)) }], r);
+    return await this.queryHandle.findOne(Z, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [Z, s, { concept: t, key: e.toString(), value: _i(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [Z, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(i)) }], r);
   }
   async setup(t, e, i = !1) {
     await this.db.open(i);
-    const r = new ci(
+    const r = new si(
       t,
       e,
       this.db
     );
-    i && await r.createTables(), this.queryHandle = new Ue(new Ge(r.map, r.aliasManager), this.db), this.map = r.map;
+    i && await r.createTables(), this.queryHandle = new We(new Je(r.map, r.aliasManager), this.db), this.map = r.map;
   }
   findOne(...t) {
     return this.queryHandle.findOne(...t);
@@ -8586,8 +8555,8 @@ class Xi {
   async callWithEvents(t, e, i = []) {
     const r = [], s = await t(...e, r), a = await this.dispatch(r);
     i.push(...r, ...a);
-    const o = Ui();
-    return o && r.length > 0 && ce(r), o && a.length > 0 && ce(a), s;
+    const o = Bi();
+    return o && r.length > 0 && oe(r), o && a.length > 0 && oe(a), s;
   }
   findRelationByName(...t) {
     return this.queryHandle.findRelationByName(...t);
@@ -8625,8 +8594,8 @@ class Xi {
     return this.db.close();
   }
 }
-var zi = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(zi || {});
-class Ut {
+var Hi = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(Hi || {});
+class Ht {
   constructor(t = 0) {
     this.level = t;
   }
@@ -8637,11 +8606,11 @@ class Ut {
     this.level >= 0 && console.error({ type: t, name: e, sql: i, params: r, error: s });
   }
   child() {
-    return new Ut(this.level);
+    return new Ht(this.level);
   }
 }
-var Yi = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(Yi || {});
-class Gt {
+var ji = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(ji || {});
+class jt {
   constructor(t = 0) {
     this.level = t;
   }
@@ -8655,17 +8624,17 @@ class Gt {
     this.level >= 2 && console.debug(`[DEBUG] ${t}: ${e}`, i);
   }
   child(t) {
-    return new Gt(this.level);
+    return new jt(this.level);
   }
 }
-const $r = new Ut(), Zi = new Gt();
-class Or {
-  constructor(t, e = Zi) {
-    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new Xi(t);
+const xr = new Ht(), Ui = new jt();
+class Mr {
+  constructor(t, e = Ui) {
+    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new Ji(t);
   }
-  setup(t, e, i, r = !1) {
-    const s = new me(t, e), { entities: a, relations: o } = s.getAll();
-    return i.forEach(({ dataContext: n, state: c }) => {
+  async setup(t, e, i, r = !1) {
+    const s = new de(t, e), { entities: a, relations: o } = s.getAll();
+    i.forEach(({ dataContext: n, state: c }) => {
       Object.entries(c).forEach(([l, d]) => {
         if (d instanceof E) {
           if (!d.record)
@@ -8689,18 +8658,18 @@ class Or {
           }
         }
       });
-    }), this.storage.setup(
-      [...a, ui, li],
+    }), await this.storage.setup(
+      [...a, oi, ai],
       o,
       r
     );
   }
-  destroy() {
-    this.storage.destroy();
+  async destroy() {
+    await this.storage.destroy();
   }
 }
-const Dr = new de();
-class Et {
+const Pr = new ne();
+class kt {
   constructor(t, e) {
     this._type = "Action", this._options = e, this.uuid = T(e), this.name = t.name;
   }
@@ -8722,7 +8691,7 @@ class Et {
     };
   }
   static create(t, e) {
-    const i = new Et(t, e);
+    const i = new kt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Action`);
     return this.instances.push(i), i;
@@ -8754,8 +8723,8 @@ class Et {
     return this.create(e.public, e.options);
   }
 }
-const ve = Et.create({ name: "get" });
-function Dt(u) {
+const Gi = kt.create({ name: "get" });
+function Ot(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return ft.create({
@@ -8766,13 +8735,13 @@ function Dt(u) {
   return mt.create({
     type: "expression",
     operator: t.operator,
-    left: Dt(u.left),
-    right: Dt(u.right)
+    left: Ot(u.left),
+    right: Ot(u.right)
   });
 }
-class bt {
+class St {
   constructor(t, e) {
-    this._type = "Conditions", this._options = e, this.uuid = T(e), t.content && t.content instanceof R ? this.content = Dt(t.content) : this.content = t.content;
+    this._type = "Conditions", this._options = e, this.uuid = T(e), t.content && t.content instanceof R ? this.content = Ot(t.content) : this.content = t.content;
   }
   static {
     this.isKlass = !0;
@@ -8793,7 +8762,7 @@ class bt {
     };
   }
   static create(t, e) {
-    const i = new bt(t, e);
+    const i = new St(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Conditions`);
     return this.instances.push(i), i;
@@ -8824,7 +8793,7 @@ class bt {
     return this.create(e.public, e.options);
   }
 }
-class K {
+class z {
   constructor(t, e) {
     this._type = "Attributive", this._options = e, this.uuid = T(e), this.stringContent = t.stringContent, this.content = t.content, this.name = t.name, this.isRef = t.isRef;
   }
@@ -8856,7 +8825,7 @@ class K {
     };
   }
   static create(t, e) {
-    const i = new K(t, e);
+    const i = new z(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Attributive`);
     return this.instances.push(i), i;
@@ -8888,11 +8857,11 @@ class K {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Rt {
+class bt {
   constructor(t, e) {
     this._type = "Attributives", this._options = e, this.uuid = T(e), this.content = t.content;
   }
@@ -8915,7 +8884,7 @@ class Rt {
     };
   }
   static create(t, e) {
-    const i = new Rt(t, e);
+    const i = new bt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Attributives`);
     return this.instances.push(i), i;
@@ -8946,7 +8915,7 @@ class Rt {
     return this.create(e.public, e.options);
   }
 }
-function Ft(u) {
+function Dt(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return ft.create({
@@ -8957,26 +8926,27 @@ function Ft(u) {
   return mt.create({
     type: "expression",
     operator: t.operator,
-    left: Ft(u.left),
-    right: Ft(u.right)
+    left: Dt(u.left),
+    right: Dt(u.right)
   });
 }
-function Fr(u) {
-  return Rt.create({
-    content: Ft(u)
+function Cr(u) {
+  return bt.create({
+    content: Dt(u)
   });
 }
-const Vt = "_Interaction_", Kt = I.create({
-  name: Vt,
+const Ki = "_Interaction_", Ut = I.create({
+  name: Ki,
   properties: [
     N.create({ name: "interactionId", type: "string", collection: !1 }),
     N.create({ name: "interactionName", type: "string", collection: !1 }),
     N.create({ name: "payload", type: "object", collection: !1 }),
     N.create({ name: "user", type: "object", collection: !1 }),
-    N.create({ name: "query", type: "object", collection: !1 })
+    N.create({ name: "query", type: "object", collection: !1 }),
+    N.create({ name: "context", type: "object", collection: !1 })
   ]
 });
-class Xt {
+class Gt {
   constructor(t, e) {
     this._type = "Interaction", this._options = e, this.uuid = T(e), this.name = t.name, this.conditions = t.conditions, this.userAttributives = t.userAttributives, this.userRef = t.userRef, this.action = t.action, this.payload = t.payload, this.data = t.data, this.dataPolicy = t.dataPolicy;
   }
@@ -9032,10 +9002,10 @@ class Xt {
     };
   }
   static create(t, e) {
-    const i = new Xt(t, e);
+    const i = new Gt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Interaction`);
-    return i.entity = Kt, i.guard = tr(i), i.mapEventData = er(i), t.action === ve && (i.resolve = ir(i)), this.instances.push(i), i;
+    return i.entity = Ut, i.guard = Xi(i), i.mapEventData = zi(i), t.action === Gi && (i.resolve = Yi(i)), this.instances.push(i), i;
   }
   static stringify(t) {
     const e = {
@@ -9069,33 +9039,34 @@ class Xt {
     return this.create(e.public, e.options);
   }
 }
-class _ extends Error {
+class q extends Error {
   constructor(t, e) {
     super(t), this.name = "InteractionGuardError", this.type = e.type, this.checkType = e.checkType, this.error = e.error;
   }
 }
-function tr(u) {
+function Xi(u) {
   return async function(t) {
-    await rr(this, u, t), await ar(this, u, t), await or(this, u, t);
+    await be(this, u, t), await tr(this, u, t), await Re(this, u, t);
   };
 }
-function er(u) {
+function zi(u) {
   return (t) => ({
     interactionName: u.name,
     interactionId: u.uuid,
     user: t.user,
     query: t.query || {},
-    payload: t.payload || {}
+    payload: t.payload || {},
+    context: t.context || {}
   });
 }
-function ir(u) {
+function Yi(u) {
   return async function(t) {
-    return nr(this, u, t);
+    return er(this, u, t);
   };
 }
-async function rr(u, t, e) {
+async function be(u, t, e) {
   if (!t.conditions) return;
-  const i = bt.is(t.conditions) ? new R(t.conditions.content) : R.atom(t.conditions), r = async (a) => {
+  const i = St.is(t.conditions) ? new R(t.conditions.content) : R.atom(t.conditions), r = async (a) => {
     if (!a) return !0;
     if (a.content) {
       let o;
@@ -9110,13 +9081,13 @@ async function rr(u, t, e) {
     return !0;
   }, s = await i.evaluateAsync(r);
   if (s !== !0)
-    throw new _(`Condition check failed: ${s?.data?.name}`, {
+    throw new q(`Condition check failed: ${s?.data?.name}`, {
       type: "condition check failed",
       checkType: "condition",
       error: s
     });
 }
-async function sr(u, t, e, i) {
+async function Zi(u, t, e, i) {
   if (t.content) {
     let r;
     try {
@@ -9128,87 +9099,87 @@ async function sr(u, t, e, i) {
   }
   return !0;
 }
-async function ar(u, t, e) {
+async function tr(u, t, e) {
   if (!t.userAttributives) return;
-  const i = Rt.is(t.userAttributives) ? R.fromValue(t.userAttributives.content) : R.atom(t.userAttributives), r = (a) => sr(u, a, e, e.user), s = await i.evaluateAsync(r);
+  const i = bt.is(t.userAttributives) ? R.fromValue(t.userAttributives.content) : R.atom(t.userAttributives), r = (a) => Zi(u, a, e, e.user), s = await i.evaluateAsync(r);
   if (s !== !0)
-    throw new _("User check failed", {
+    throw new q("User check failed", {
       type: "check user failed",
       checkType: "user",
       error: s
     });
 }
-async function or(u, t, e) {
+async function Re(u, t, e) {
   const i = e.payload || {}, r = t.payload?.items || [], s = Object.keys(i);
   for (const a of s)
     if (!r.some((o) => o.name === a))
-      throw new _(
+      throw new q(
         `${a} in payload is not defined in interaction ${t.name}`,
         { type: `${a} not defined`, checkType: "payload" }
       );
   for (const a of r) {
     if (a.required && !(a.name in i))
-      throw new _(
+      throw new q(
         `Payload validation failed for field '${a.name}': missing`,
         { type: `${a.name} missing`, checkType: "payload" }
       );
     const o = i[a.name];
     if (o === void 0) return;
     if (a.isCollection && !Array.isArray(o))
-      throw new _(
+      throw new q(
         `Payload validation failed for field '${a.name}': data is not array`,
         { type: `${a.name} data is not array`, checkType: "payload" }
       );
     if (a.isCollection) {
       if (a.isRef && !o.every((n) => !!n.id))
-        throw new _(
+        throw new q(
           `Payload validation failed for field '${a.name}': data not every is ref`,
           { type: `${a.name} data not every is ref`, checkType: "payload" }
         );
     } else if (a.isRef && !o.id)
-      throw new _(
+      throw new q(
         `Payload validation failed for field '${a.name}': data is not a ref`,
         { type: `${a.name} data is not a ref`, checkType: "payload" }
       );
     if (a.base)
       if (a.isCollection)
         for (const n of o) {
-          const c = await et(n, a.base);
+          const c = await tt(n, a.base);
           if (c !== !0)
-            throw new _(
+            throw new q(
               `Concept check failed for field '${a.name}'`,
               { type: `${a.name} check concept failed`, checkType: "concept", error: c }
             );
         }
       else {
-        const n = await et(o, a.base);
+        const n = await tt(o, a.base);
         if (n !== !0)
-          throw new _(
+          throw new q(
             `Concept check failed for field '${a.name}'`,
             { type: `${a.name} check concept failed`, checkType: "concept", error: n }
           );
       }
   }
 }
-async function et(u, t) {
+async function tt(u, t) {
   if (t.base) {
     const e = t;
-    return e.attributive, et(u, e.base);
+    return e.attributive, tt(u, e.base);
   }
   if (t.for) {
     for (const e of t.for)
-      if (await et(u, e) === !0) return !0;
-    return { name: t.name, type: "conceptAlias", error: "no match" };
+      if (await tt(u, e) === !0) return !0;
+    return { name: t.name || "", type: "conceptAlias", error: "no match" };
   }
-  return K.is(t) ? !0 : I.is(t) ? u && typeof u == "object" ? !0 : { name: t.name || "", type: "conceptCheck", error: "invalid entity data" } : !0;
+  return z.is(t) ? !0 : I.is(t) ? u && typeof u == "object" ? !0 : { name: t.name || "", type: "conceptCheck", error: "invalid entity data" } : !0;
 }
-async function nr(u, t, e) {
-  if (I.is(t.data) || x.is(t.data)) {
+async function er(u, t, e) {
+  if (I.is(t.data) || M.is(t.data)) {
     const i = t.data.name, r = t.dataPolicy?.match, s = t.dataPolicy?.modifier, a = { ...e.query?.modifier || {}, ...s || {} }, o = e.query?.attributeQuery || [], n = typeof r == "function" ? await r.call(u, e) : r, c = R.and(n, e.query?.match);
     return u.system.storage.find(i, c, a, o);
   }
 }
-class zt {
+class Kt {
   constructor(t, e) {
     this._type = "Activity", this._options = e, this.uuid = T(e), this.name = t.name, this.interactions = t.interactions || [], this.gateways = t.gateways || [], this.transfers = t.transfers || [], this.groups = t.groups || [], this.events = t.events || [];
   }
@@ -9256,7 +9227,7 @@ class zt {
     };
   }
   static create(t, e) {
-    const i = new zt(t, e);
+    const i = new Kt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Activity`);
     return this.instances.push(i), i;
@@ -9357,7 +9328,7 @@ class st {
     return this.create(e.public, e.options);
   }
 }
-class Te {
+class we {
   constructor(t, e) {
     this._type = "Transfer", this._options = e, this.uuid = T(e), this.name = t.name, this.source = t.source, this.target = t.target;
   }
@@ -9390,7 +9361,7 @@ class Te {
     };
   }
   static create(t, e) {
-    const i = new Te(t, e);
+    const i = new we(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transfer`);
     return this.instances.push(i), i;
@@ -9426,19 +9397,19 @@ class Te {
     return this.create(e.public, e.options);
   }
 }
-function ke(u, t, e) {
+function Ne(u, t, e) {
   u.interactions.forEach((i) => t(i, e)), u.groups.forEach((i) => {
-    i.activities?.forEach((r) => ke(r, t, i));
+    i.activities?.forEach((r) => Ne(r, t, i));
   });
 }
-function Vr(u) {
+function $r(u) {
   const t = [];
-  return ke(u, (e) => t.push(e)), t;
+  return Ne(u, (e) => t.push(e)), t;
 }
-function Qr(u) {
+function Or(u) {
   return null;
 }
-class Yt {
+class Xt {
   constructor(t, e) {
     this._type = "Condition", this._options = e, this.uuid = T(e), this.content = t.content, this.name = t.name;
   }
@@ -9464,7 +9435,7 @@ class Yt {
     };
   }
   static create(t, e) {
-    const i = new Yt(t, e);
+    const i = new Xt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Condition`);
     return this.instances.push(i), i;
@@ -9494,11 +9465,11 @@ class Yt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Zt {
+class zt {
   constructor(t, e) {
     this._type = "DataAttributive", this._options = e, this.uuid = T(e), this.content = t.content, this.name = t.name;
   }
@@ -9524,7 +9495,7 @@ class Zt {
     };
   }
   static create(t, e) {
-    const i = new Zt(t, e);
+    const i = new zt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataAttributive`);
     return this.instances.push(i), i;
@@ -9554,11 +9525,11 @@ class Zt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Ae {
+class ve {
   constructor(t, e) {
     this._type = "DataPolicy", this._options = e, this.uuid = T(e), this.match = t.match, this.modifier = t.modifier, this.attributeQuery = t.attributeQuery;
   }
@@ -9591,7 +9562,7 @@ class Ae {
     };
   }
   static create(t, e) {
-    const i = new Ae(t, e);
+    const i = new ve(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataPolicy`);
     return this.instances.push(i), i;
@@ -9676,7 +9647,7 @@ class at {
     return this.create(e.public, e.options);
   }
 }
-class te {
+class Yt {
   constructor(t, e) {
     this._type = "Event", this._options = e, this.uuid = T(e), this.name = t.name;
   }
@@ -9698,7 +9669,7 @@ class te {
     };
   }
   static create(t, e) {
-    const i = new te(t, e);
+    const i = new Yt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Event`);
     return this.instances.push(i), i;
@@ -9730,7 +9701,7 @@ class te {
     return this.create(e.public, e.options);
   }
 }
-class ee {
+class Zt {
   constructor(t, e) {
     this._type = "PayloadItem", this._options = e, this.uuid = T(e), this.name = t.name, this.base = t.base, this.type = t.type, this.isRef = t.isRef ?? !1, this.required = t.required ?? !1, this.isCollection = t.isCollection ?? !1, this.itemRef = t.itemRef;
   }
@@ -9781,7 +9752,7 @@ class ee {
     };
   }
   static create(t, e) {
-    const i = new ee(t, e);
+    const i = new Zt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, PayloadItem`);
     return this.instances.push(i), i;
@@ -9820,7 +9791,7 @@ class ee {
     return this.create(e.public, e.options);
   }
 }
-class ie {
+class te {
   constructor(t, e) {
     this._type = "Payload", this._options = e, this.uuid = T(e), this.items = t.items || [];
   }
@@ -9844,7 +9815,7 @@ class ie {
     };
   }
   static create(t, e) {
-    const i = new ie(t, e);
+    const i = new te(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Payload`);
     return this.instances.push(i), i;
@@ -9876,7 +9847,7 @@ class ie {
     return this.create(e.public, e.options);
   }
 }
-class re {
+class ee {
   constructor(t, e) {
     this._type = "DataAttributives", this._options = e, this.uuid = T(e), this.content = t.content;
   }
@@ -9899,7 +9870,7 @@ class re {
     };
   }
   static create(t, e) {
-    const i = new re(t, e);
+    const i = new ee(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataAttributives`);
     return this.instances.push(i), i;
@@ -9930,25 +9901,25 @@ class re {
     return this.create(e.public, e.options);
   }
 }
-const cr = [
+const ir = [
+  Gt,
+  Kt,
+  z,
   Xt,
   zt,
-  K,
+  kt,
+  at,
   Yt,
   Zt,
-  Et,
-  at,
   te,
-  ee,
-  ie,
-  bt,
-  re
+  St,
+  ee
 ];
-cr.forEach((u) => {
-  u && u.displayName && fe(u.displayName, u);
+ir.forEach((u) => {
+  u && u.displayName && ue(u.displayName, u);
 });
-function Lr({ name: u, isRef: t = !1 }, e) {
-  return K.create({
+function Dr({ name: u, isRef: t = !1 }, e) {
+  return z.create({
     name: u,
     content: u ? new Function("user", `return user.roles.includes('${u}')`) : function() {
       return !0;
@@ -9956,190 +9927,7 @@ function Lr({ name: u, isRef: t = !1 }, e) {
     isRef: t
   }, e);
 }
-class It {
-  constructor(t, e, i) {
-    this.interaction = t, this.controller = e, this.activitySeqCall = i, this.system = e.system;
-  }
-  async checkAttributive(t, e, i) {
-    const r = t;
-    if (r.content) {
-      const s = r.content;
-      let a;
-      try {
-        a = await s.call(this.controller, i, e);
-      } catch {
-        a = !1;
-      }
-      return a === void 0 ? (console.warn(`attributive ${r.name} returned undefined, maybe not implemented, we will return true for now`), !0) : a;
-    } else
-      console.warn(`${r.name} not implemented`);
-    return !0;
-  }
-  async checkMixedAttributive(t, e) {
-    return Promise.resolve(!0);
-  }
-  createHandleAttributive(t, e, i) {
-    return (r) => this.checkAttributive(r, e, i);
-  }
-  async checkUser(t, e, i) {
-    let r;
-    if (!this.interaction.userAttributives) return !0;
-    const s = Rt.is(this.interaction.userAttributives) ? R.fromValue(
-      this.interaction.userAttributives.content
-    ) : R.atom(
-      this.interaction.userAttributives
-    ), a = (o) => o.isRef ? i(o, t.user, e) : this.checkAttributive(o, t, t.user);
-    if (r = await this.checkAttributives(s, a, []), r === !0) return r;
-    throw D.userCheckFailed(r);
-  }
-  async checkConcept(t, e, i, r = []) {
-    const s = r.concat({ type: "concept", values: { attributives: i, concept: e } }), a = await this.isConcept(t, e, s);
-    if (a !== !0) return a;
-    if (i) {
-      const o = (c) => this.checkMixedAttributive(c, t), n = await this.checkAttributives(R.fromValue(i), o, s);
-      if (n !== !0) return n;
-    }
-    return !0;
-  }
-  async isConcept(t, e, i = []) {
-    const r = i.concat({ type: "isConcept", values: { concept: e } });
-    if (this.isDerivedConcept(e)) {
-      const s = e;
-      return s.attributive ? this.checkConcept(t, s.base, s.attributive, r) : this.isConcept(t, s.base, r);
-    }
-    if (this.isConceptAlias(e)) {
-      const s = [];
-      return await hi(e.for, async (o) => {
-        const n = await this.isConcept(t, o);
-        return n === !0 ? !0 : (s.push(n), !1);
-      }) ? !0 : { name: e.name, type: "conceptAlias", stack: r, error: s };
-    } else {
-      if (K.is(e))
-        return await this.checkAttributive(e, void 0, t) ? !0 : { name: e.name, type: "conceptCheck", stack: r, error: "role check error" };
-      const s = e.constructor?.check;
-      return s ? s(t) ? !0 : { name: e.name, type: "conceptCheck", stack: r, error: "constructor check error" } : e.constructor && typeof e.constructor.check == "function" ? e.constructor.check(t) ? !0 : { name: e.name || "", type: "conceptCheck", stack: r, error: "constructor check error" } : I.is(e) ? t && typeof t == "object" && "id" in t || t && typeof t == "object" ? !0 : { name: e.name || "", type: "conceptCheck", stack: r, error: "invalid entity data" } : t && typeof t == "object" ? !0 : typeof e == "function" ? t instanceof e ? !0 : { name: e.name, type: "conceptCheck", stack: r, error: "instanceof check error" } : (console.warn(`unknown concept ${e}, cannot check ${t}. pass.`), !0);
-    }
-  }
-  isDerivedConcept(t) {
-    return !!t.base;
-  }
-  isConceptAlias(t) {
-    return !!t.for;
-  }
-  async checkAttributives(t, e, i = []) {
-    const r = await t.evaluateAsync(e);
-    return r === !0 ? !0 : { name: "", type: "matchAttributives", stack: i, error: r };
-  }
-  async checkPayload(t) {
-    const e = t.payload || {}, i = this.interaction.payload?.items || [], r = Object.keys(e);
-    for (let s of r)
-      if (!i.some((a) => a.name === s))
-        throw new Error(`${s} in payload is not defined in interaction ${this.interaction.name}`);
-    for (let s of i) {
-      if (s.required && !(s.name in e))
-        throw D.payloadValidationFailed(s.name, "missing", e);
-      const a = e[s.name];
-      if (a === void 0) return;
-      if (s.isCollection && !Array.isArray(a))
-        throw D.payloadValidationFailed(s.name, "data is not array", a);
-      if (s.isCollection) {
-        if (s.isRef && !a.every((o) => !!o.id))
-          throw D.payloadValidationFailed(s.name, "data not every is ref", a);
-      } else if (s.isRef && !a.id)
-        throw D.payloadValidationFailed(s.name, "data is not a ref", a);
-      if (s.base)
-        if (s.isCollection) {
-          const o = await pi(a, (n) => this.checkConcept(n, s.base));
-          if (o !== !0)
-            throw D.conceptCheckFailed(s.name, o);
-        } else {
-          const o = await this.checkConcept(a, s.base);
-          if (o !== !0)
-            throw D.conceptCheckFailed(s.name, o);
-        }
-      if (s.isRef) {
-        const o = s.isCollection ? m.atom({
-          key: "id",
-          value: ["in", a.map((n) => n.id)]
-        }) : m.atom({
-          key: "id",
-          value: ["=", a.id]
-        });
-        s.isCollection ? await this.system.storage.find(s.base.name, o, void 0, ["*"]) : await this.system.storage.findOne(s.base.name, o, void 0, ["*"]);
-      }
-    }
-  }
-  async checkCondition(t) {
-    if (this.interaction.conditions) {
-      const e = bt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), i = async (s) => {
-        if (!s) return !0;
-        if (s.content) {
-          const a = s.content;
-          let o;
-          try {
-            o = await a.call(this.controller, t);
-          } catch (n) {
-            console.warn("check function throw", n);
-            const c = n instanceof Error ? n.message : String(n);
-            return `Condition '${s.name}' threw exception: ${c}`;
-          }
-          return o === void 0 ? (console.warn(`condition ${s.name} returned undefined, maybe not implemented, we will return true for now`), !0) : o;
-        } else
-          console.warn(`${s.name} not implemented`);
-        return !0;
-      }, r = await e.evaluateAsync(i);
-      if (r !== !0)
-        throw D.conditionCheckFailed(r);
-    }
-  }
-  isGetInteraction() {
-    return this.interaction.action === ve;
-  }
-  static {
-    this.INTERACTION_RECORD = "_Interaction_";
-  }
-  async saveEvent(t) {
-    return await this.system.storage.create(It.INTERACTION_RECORD, t);
-  }
-  async retrieveData(t) {
-    let e;
-    if (I.is(this.interaction.data) || x.is(this.interaction.data)) {
-      const i = this.interaction.data.name, r = this.interaction.dataPolicy?.match, s = this.interaction.dataPolicy?.modifier;
-      this.interaction.dataPolicy?.attributeQuery;
-      const a = { ...t.query?.modifier || {}, ...s || {} }, o = t.query?.attributeQuery || [], n = typeof r == "function" ? await r.call(this.controller, t) : r, c = R.and(n, t.query?.match);
-      e = await this.system.storage.find(i, c, a, o);
-    } else
-      A(!1, `unknown data type ${this.interaction.data}`);
-    return e;
-  }
-  async check(t, e, i, r) {
-    let s;
-    try {
-      this.controller.ignoreGuard || await this.checkCondition(t), await this.checkUser(t, e, i), await this.checkPayload(t);
-    } catch (a) {
-      s = a;
-    }
-    return s;
-  }
-  async call(t, e, i, r) {
-    const s = {
-      sideEffects: {}
-    };
-    if (s.error = await this.check(t, e, i, r), !s.error) {
-      const a = {
-        interactionName: this.interaction.name,
-        interactionId: this.interaction.uuid,
-        user: t.user,
-        query: t.query || {},
-        payload: t.payload || {},
-        args: t
-      };
-      e && e !== void 0 && (a.activity = { id: e }), await this.saveEvent(a), s.event = a, this.isGetInteraction() && (s.data = await this.retrieveData(t));
-    }
-    return s;
-  }
-}
-class X {
+class G {
   constructor(t, e) {
     this.graph = t, this.parent = e;
   }
@@ -10149,7 +9937,7 @@ class X {
     };
   }
   static create(t, e, i) {
-    const r = new X(e, i);
+    const r = new G(e, i);
     return t.current && (r.current = O.create(t.current, e, r)), r;
   }
   isInteractionAvailable(t) {
@@ -10182,13 +9970,13 @@ class O {
   }
   static createInitialState(t) {
     const e = { uuid: t.uuid };
-    return st.is(t.content) && (e.children = t.childSeqs.map((i) => X.createInitialState(i.head))), e;
+    return st.is(t.content) && (e.children = t.childSeqs.map((i) => G.createInitialState(i.head))), e;
   }
   static create(t, e, i) {
     const r = e.getNodeByUUID(t.uuid);
     if (st.is(r.content)) {
       const a = O.GroupStateNodeType.get(r.content.type), o = new a(r, e, i);
-      return o.isGroup = !0, o.children = t?.children?.map((n) => X.create(n, e, o)), o;
+      return o.isGroup = !0, o.children = t?.children?.map((n) => G.create(n, e, o)), o;
     } else
       return new O(r, e, i);
   }
@@ -10207,12 +9995,12 @@ class O {
     this.parent.transferToNext(this.node.uuid);
   }
 }
-class le {
+class Pt {
   constructor(t, e) {
-    this.graph = e, this.root = X.create(t, this.graph);
+    this.graph = e, this.root = G.create(t, this.graph);
   }
   static createInitialState(t) {
-    return X.createInitialState(t);
+    return G.createInitialState(t);
   }
   isInteractionAvailable(t) {
     return this.root.isInteractionAvailable(t);
@@ -10224,26 +10012,15 @@ class le {
     return this.root.toJSON();
   }
 }
-class W {
-  constructor(t, e) {
-    this.activity = t, this.controller = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.uuidToInteractionCall = /* @__PURE__ */ new Map(), this.interactionCallByName = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (i, r, s) => (A(i.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[i.name] === r.id), this.system = e.system, this.graph = this.buildGraph(t);
-  }
-  static {
-    this.cache = /* @__PURE__ */ new Map();
-  }
-  static {
-    this.from = (t, e) => {
-      let i = W.cache.get(t);
-      return i || (i = new W(t, e), W.cache.set(t, i)), i;
-    };
+class et {
+  constructor(t) {
+    this.activity = t, this.uuidToNode = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (e, i, r, s) => (k(i.isRef, "attributive must be ref"), ((await this.getActivity(e, s))?.refs)[i.name] === r.id), this.graph = this.buildGraph(t);
   }
   buildGraph(t, e) {
     const i = /* @__PURE__ */ new Map(), r = {};
     for (let o of t.interactions) {
       const n = { content: o, next: null, uuid: o.uuid, parentGroup: e, parentSeq: r };
       this.uuidToNode.set(o.uuid, n), this.rawToNode.set(o, n);
-      const c = new It(o, this.controller, this);
-      this.uuidToInteractionCall.set(o.uuid, c), o.name && this.interactionCallByName.set(o.name, c);
     }
     for (let o of t.gateways) {
       const n = { content: o, next: [], prev: [], uuid: o.uuid };
@@ -10262,7 +10039,7 @@ class W {
     const s = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]), a = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]);
     if (t.transfers?.forEach((o) => {
       const n = this.rawToNode.get(o.source) || i.get(o.source), c = this.rawToNode.get(o.target) || i.get(o.target);
-      A(!!n, `cannot find source ${o.source.name}`), A(!!c, `cannot find target ${o.source.name}`), at.is(n) ? n.next.push(c) : n.next = c, at.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
+      k(!!n, `cannot find source ${o.source.name}`), k(!!c, `cannot find target ${o.source.name}`), at.is(n) ? n.next.push(c) : n.next = c, at.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
     }), s.size !== 1) throw new Error(`start node must one, current: ${s.size}`);
     if (a.size !== 1) throw new Error(`end node must be one, current: ${a.size}`);
     return Object.assign(r, {
@@ -10273,40 +10050,40 @@ class W {
   static {
     this.ACTIVITY_RECORD = "_Activity_";
   }
-  async create() {
-    const t = le.createInitialState(this.graph.head);
+  async create(t) {
+    const e = Pt.createInitialState(this.graph.head);
     return {
-      activityId: (await this.system.storage.create(W.ACTIVITY_RECORD, {
+      activityId: (await t.system.storage.create(et.ACTIVITY_RECORD, {
         name: this.activity.name,
         uuid: this.activity.uuid,
-        state: t,
+        state: e,
         refs: {}
       })).id,
-      state: t
+      state: e
     };
   }
   getNodeByUUID(t) {
     return this.uuidToNode.get(t);
   }
-  async getState(t) {
-    return (await this.getActivity(t))?.state;
+  async getState(t, e) {
+    return (await this.getActivity(t, e))?.state;
   }
-  async getActivity(t) {
-    const e = m.atom({
+  async getActivity(t, e) {
+    const i = m.atom({
       key: "id",
-      value: ["=", t]
+      value: ["=", e]
     });
-    return (await this.system.storage.find(W.ACTIVITY_RECORD, e, void 0, ["*"])).map((r) => ({ ...r, state: r.state, refs: r.refs }))[0];
+    return (await t.system.storage.find(et.ACTIVITY_RECORD, i, void 0, ["*"])).map((s) => ({ ...s, state: s.state, refs: s.refs }))[0];
   }
-  async setActivity(t, e) {
-    const i = m.atom({
+  async setActivity(t, e, i) {
+    const r = m.atom({
       key: "id",
-      value: ["=", t]
-    }), r = { ...e };
-    return delete r.state, delete r.refs, e.state && (r.state = e.state), e.refs && (r.refs = e.refs), await this.system.storage.update(W.ACTIVITY_RECORD, i, r);
+      value: ["=", e]
+    }), s = { ...i };
+    return delete s.state, delete s.refs, i.state && (s.state = i.state), i.refs && (s.refs = i.refs), await t.system.storage.update(et.ACTIVITY_RECORD, r, s);
   }
-  async setState(t, e) {
-    return this.setActivity(t, { state: e });
+  async setState(t, e, i) {
+    return this.setActivity(t, e, { state: i });
   }
   isStartNode(t) {
     const e = this.uuidToNode.get(t);
@@ -10319,44 +10096,55 @@ class W {
   isActivityHead(t, e = this.graph.head) {
     return st.is(this.graph.head.content) ? !!this.graph.head.childSeqs?.some((i) => this.isActivityHead(t, i.head)) : t === this.graph.head.content;
   }
-  async callInteraction(t, e, i) {
-    const r = this.uuidToInteractionCall.get(e);
-    let s = t;
-    if (this.isActivityHead(r.interaction)) {
-      if (!s) {
-        const l = await r.check(i, t, this.checkUserRef);
-        if (l) return { error: l };
-        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);
-    if (!a.isInteractionAvailable(e)) return { error: `interaction ${e} not available` };
-    const o = await r.call(i, s, this.checkUserRef);
-    if (o.error)
-      return o;
-    await this.saveUserRefs(s, r, i);
-    const n = a.completeInteraction(e);
-    A(n, "change activity state failed");
-    const c = a.toJSON();
-    return await this.setActivity(s, { state: c }), {
-      ...o,
-      context: {
-        activityId: s,
-        nextState: c
-      }
-    };
+  async checkActivityState(t, e, i) {
+    if (!new Pt(await this.getState(t, e), this).isInteractionAvailable(i))
+      throw new Error(`interaction ${i} not available`);
+  }
+  async fullGuardWithUserRef(t, e, i) {
+    if (!t.ignoreGuard && e.conditions && await be(t, e, i), e.userAttributives) {
+      const r = bt.is(e.userAttributives) ? R.fromValue(
+        e.userAttributives.content
+      ) : R.atom(
+        e.userAttributives
+      ), s = (o) => o.isRef ? this.checkUserRef(t, o, i.user, i.activityId) : rr(t, o, i, i.user), a = await r.evaluateAsync(s);
+      if (a !== !0)
+        throw new q("User check failed", {
+          type: "check user failed",
+          checkType: "user",
+          error: a
+        });
+    }
+    e.payload && await Re(t, e, i);
   }
-  async saveUserRefs(t, e, i) {
-    const r = (await this.getActivity(t))?.refs || {};
-    e.interaction.userRef?.name && (r[e.interaction.userRef?.name] = i.user.id), e.interaction.payload?.items.forEach((s) => {
-      if (K.is(s.itemRef) && s.itemRef?.name && i.payload[s.name]) {
-        const a = i.payload[s.name];
-        s.isCollection ? (r[s.itemRef.name] || (r[s.itemRef.name] = []), r[s.itemRef.name].push(a.id)) : r[s.itemRef.name] = a.id;
+  async completeInteractionState(t, e, i) {
+    const r = new Pt(await this.getState(t, e), this), s = r.completeInteraction(i);
+    k(s, "change activity state failed");
+    const a = r.toJSON();
+    await this.setActivity(t, e, { state: a });
+  }
+  async saveUserRefs(t, e, i, r) {
+    const s = (await this.getActivity(t, e))?.refs || {};
+    i.userRef?.name && (s[i.userRef?.name] = r.user.id), i.payload?.items.forEach((a) => {
+      if (z.is(a.itemRef) && a.itemRef?.name && r.payload[a.name]) {
+        const o = r.payload[a.name];
+        a.isCollection ? (s[a.itemRef.name] || (s[a.itemRef.name] = []), s[a.itemRef.name].push(o.id)) : s[a.itemRef.name] = o.id;
       }
-    }), await this.setActivity(t, { refs: r });
+    }), await this.setActivity(t, e, { refs: s });
+  }
+}
+async function rr(u, t, e, i) {
+  if (t.content) {
+    let r;
+    try {
+      r = await t.content.call(u, i, e);
+    } catch {
+      r = !1;
+    }
+    return r === void 0 ? !0 : r;
   }
+  return !0;
 }
-class lr extends O {
+class sr extends O {
   onChange(t, e) {
     if (this.graph.isStartNode(t)) {
       if (e)
@@ -10367,70 +10155,24 @@ class lr extends O {
     }
   }
 }
-O.GroupStateNodeType.set("any", lr);
-class ur extends O {
+O.GroupStateNodeType.set("any", sr);
+class ar extends O {
   onChange(t, e) {
     this.isGroupCompleted() && this.complete();
   }
 }
-O.GroupStateNodeType.set("every", ur);
-class dr extends O {
+O.GroupStateNodeType.set("every", ar);
+class or extends O {
   onChange(t, e) {
     this.graph.isEndNode(t) && this.complete();
   }
 }
-O.GroupStateNodeType.set("race", dr);
-class hr extends O {
-}
-O.GroupStateNodeType.set("program", hr);
-class Se extends H {
-  constructor(t, e = {}) {
-    super(t, {
-      errorType: e.context?.errorType || "ActivityError",
-      context: {
-        category: G.ACTIVITY,
-        activityName: e.activityName,
-        activityId: e.activityId,
-        activityInstanceId: e.activityInstanceId,
-        currentState: e.currentState,
-        ...e.context
-      },
-      causedBy: e.causedBy
-    }), this.activityName = e.activityName, this.activityId = e.activityId, this.activityInstanceId = e.activityInstanceId, this.currentState = e.currentState, this.severity = e.severity || $.MEDIUM;
-  }
-}
-class qr extends Se {
-  constructor(t, e = {}) {
-    super(t, {
-      ...e,
-      severity: $.HIGH,
-      context: {
-        errorType: "ActivityStateError",
-        expectedState: e.expectedState,
-        actualState: e.actualState,
-        stateTransition: e.stateTransition
-      }
-    }), this.expectedState = e.expectedState, this.actualState = e.actualState, this.stateTransition = e.stateTransition;
-  }
+O.GroupStateNodeType.set("race", or);
+class nr extends O {
 }
-class ue extends H {
-  constructor(t, e = {}) {
-    super(t, {
-      errorType: e.context?.errorType || "InteractionExecutionError",
-      context: {
-        category: G.INTERACTION,
-        interactionName: e.interactionName,
-        userId: e.userId,
-        payload: e.payload,
-        executionPhase: e.executionPhase,
-        ...e.context
-      },
-      causedBy: e.causedBy
-    }), this.interactionName = e.interactionName, this.userId = e.userId, this.payload = e.payload, this.executionPhase = e.executionPhase, this.severity = e.severity || $.HIGH;
-  }
-}
-const Nt = "_Activity_", Ee = I.create({
-  name: Nt,
+O.GroupStateNodeType.set("program", nr);
+const cr = "_Activity_", Te = I.create({
+  name: cr,
   properties: [
     N.create({
       name: "name",
@@ -10453,121 +10195,83 @@ const Nt = "_Activity_", Ee = I.create({
       collection: !1
     })
   ]
-}), pr = x.create({
+}), lr = M.create({
   name: "activityInteraction",
-  source: Ee,
+  source: Te,
   sourceProperty: "interaction",
-  target: Kt,
+  target: Ut,
   targetProperty: "activity",
   type: "1:n"
 });
-class Br {
-  constructor(t, e, i) {
-    this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.activityEventSources = [], (e.length > 0 || i.length > 0) && (this.controller.entities.push(Ee, Kt), this.controller.relations.push(pr)), e.forEach((r) => {
-      const s = new W(r, t);
-      this.activityCalls.set(r.uuid, s), r.name && (A(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
-    }), i.forEach((r) => {
-      const s = new It(r, t);
-      this.interactionCalls.set(r.uuid, s), r.name && (A(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
+class Fr {
+  constructor(t) {
+    this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.activityEventSources = [], this.requiredEntities = [], this.requiredRelations = [], t.length > 0 && (this.requiredEntities.push(Te, Ut), this.requiredRelations.push(lr)), t.forEach((e) => {
+      const i = new et(e);
+      this.activityCalls.set(e.uuid, i), e.name && (k(!this.activityCallsByName.has(e.name), `activity name ${e.name} is duplicated`), this.activityCallsByName.set(e.name, i));
     });
-    for (const r of e)
-      for (const s of r.interactions) {
-        const a = this.getActivityInteractionEventSourceName(r.name, s.name), o = {
-          uuid: `${r.uuid}_${s.uuid}`,
-          _type: "EventSource",
-          name: a,
-          entity: s.entity,
-          guard: s.guard,
-          mapEventData: s.mapEventData,
-          resolve: s.resolve,
-          afterDispatch: s.afterDispatch
-        };
+    for (const e of t) {
+      const i = this.activityCallsByName.get(e.name), r = this.collectAllInteractions(e);
+      for (const s of r) {
+        const a = this.getActivityInteractionEventSourceName(e.name, s.name), o = this.buildActivityInteractionEventSource(
+          a,
+          s,
+          i
+        );
         this.activityEventSources.push(o);
       }
-  }
-  getActivityEventSources() {
-    return this.activityEventSources;
-  }
-  getActivityInteractionEventSourceName(t, e) {
-    return `${t}:${e}`;
-  }
-  async callInteraction(t, e) {
-    const i = this.interactionCallsByName.get(t);
-    if (!i)
-      throw new ue(`Cannot find interaction for ${t}`, {
-        interactionName: t,
-        userId: e.user?.id,
-        payload: e.payload,
-        executionPhase: "interaction-lookup"
-      });
-    await this.controller.system.storage.beginTransaction(i.interaction.name);
-    let r, s;
-    try {
-      s = await i.call(e);
-    } catch (a) {
-      r = a, s = {
-        error: a,
-        effects: [],
-        sideEffects: {},
-        data: void 0,
-        event: void 0
-      };
-    } finally {
-      r || s.error ? await this.controller.system.storage.rollbackTransaction(i.interaction.name) : await this.controller.system.storage.commitTransaction(i.interaction.name);
     }
-    return s;
-  }
-  async callActivityInteraction(t, e, i, r) {
-    const s = this.activityCallsByName.get(t);
-    if (!s)
-      throw new Se(`Cannot find activity for ${t}`, {
-        activityName: t,
-        context: {
-          interactionName: e,
-          activityId: i,
-          userId: r.user?.id
-        }
-      });
-    await this.controller.system.storage.beginTransaction(s.activity.name);
-    const a = s.interactionCallByName.get(e);
-    if (!a)
-      throw await this.controller.system.storage.rollbackTransaction(s.activity.name), new ue(`Cannot find interaction ${e} in activity ${t}`, {
-        interactionName: e,
-        userId: r.user?.id,
-        payload: r.payload,
-        executionPhase: "activity-interaction-lookup",
-        context: { activityName: t, activityId: i }
-      });
-    const o = await s.callInteraction(i, a.interaction.uuid, r);
-    return o.error ? await this.controller.system.storage.rollbackTransaction(s.activity.name) : await this.controller.system.storage.commitTransaction(s.activity.name), o;
-  }
-  async createActivity(t) {
-    return this.controller.system.storage.create(Nt, {
-      ...t,
-      state: t.state,
-      refs: t.refs
-    });
   }
-  async updateActivity(t, e) {
-    const i = {
-      ...e
+  buildActivityInteractionEventSource(t, e, i) {
+    const r = i.isActivityHead(e), s = async function(n) {
+      if (r && !n.activityId) {
+        e.guard && await e.guard.call(this, n);
+        const c = await i.create(this);
+        n.activityId = c.activityId;
+      } else if (r && n.activityId)
+        await i.checkActivityState(this, n.activityId, e.uuid), e.guard && await e.guard.call(this, n);
+      else {
+        if (!n.activityId)
+          throw new Error("activityId must be provided for non-head interaction of an activity");
+        await i.checkActivityState(this, n.activityId, e.uuid), await i.fullGuardWithUserRef(this, e, n);
+      }
+    }, a = (n) => {
+      const c = e.mapEventData ? e.mapEventData(n) : {};
+      return n.activityId && (c.activity = { id: n.activityId }), c;
+    }, o = async function(n, c) {
+      const l = n.activityId;
+      return await i.saveUserRefs(this, l, e, n), await i.completeInteractionState(this, l, e.uuid), {
+        ...(e.afterDispatch ? await e.afterDispatch.call(this, n, c) : void 0) || {},
+        activityId: l,
+        nextState: await i.getState(this, l)
+      };
     };
-    return delete i.state, delete i.refs, e.state && (i.state = e.state), e.refs && (i.refs = e.refs), this.controller.system.storage.update(Nt, t, i);
-  }
-  async getActivity(t) {
-    return (await this.controller.system.storage.find(Nt, t, void 0, ["*"])).map((e) => ({
-      ...e,
-      state: e.state,
-      refs: e.refs
-    }));
+    return {
+      uuid: `${i.activity.uuid}_${e.uuid}`,
+      _type: "EventSource",
+      name: t,
+      entity: e.entity,
+      guard: s,
+      mapEventData: a,
+      resolve: e.resolve,
+      afterDispatch: o
+    };
+  }
+  collectAllInteractions(t) {
+    const e = [...t.interactions];
+    for (const i of t.groups || [])
+      for (const r of i.activities || [])
+        e.push(...this.collectAllInteractions(r));
+    return e;
   }
-  async saveEvent(t) {
-    return this.controller.system.storage.create(Vt, t);
+  getOutput() {
+    return {
+      eventSources: this.activityEventSources,
+      entities: this.requiredEntities,
+      relations: this.requiredRelations
+    };
   }
-  async getEvent(t) {
-    return (await this.controller.system.storage.find(Vt, t, void 0, ["*"])).map((e) => ({
-      ...e
-    }));
+  getActivityInteractionEventSourceName(t, e) {
+    return `${t}:${e}`;
   }
   getActivityCall(t) {
     return this.activityCalls.get(t);
@@ -10575,188 +10279,229 @@ class Br {
   getActivityCallByName(t) {
     return this.activityCallsByName.get(t);
   }
-  getInteractionCall(t) {
-    return this.interactionCalls.get(t);
+}
+class Vr extends W {
+  constructor(t, e = {}) {
+    super(t, {
+      errorType: e.context?.errorType || "InteractionExecutionError",
+      context: {
+        category: j.INTERACTION,
+        interactionName: e.interactionName,
+        userId: e.userId,
+        payload: e.payload,
+        executionPhase: e.executionPhase,
+        ...e.context
+      },
+      causedBy: e.causedBy
+    }), this.interactionName = e.interactionName, this.userId = e.userId, this.payload = e.payload, this.executionPhase = e.executionPhase, this.severity = e.severity || $.HIGH;
   }
-  getInteractionCallByName(t) {
-    return this.interactionCallsByName.get(t);
+}
+class ur extends W {
+  constructor(t, e = {}) {
+    super(t, {
+      errorType: e.context?.errorType || "ActivityError",
+      context: {
+        category: j.ACTIVITY,
+        activityName: e.activityName,
+        activityId: e.activityId,
+        activityInstanceId: e.activityInstanceId,
+        currentState: e.currentState,
+        ...e.context
+      },
+      causedBy: e.causedBy
+    }), this.activityName = e.activityName, this.activityId = e.activityId, this.activityInstanceId = e.activityInstanceId, this.currentState = e.currentState, this.severity = e.severity || $.MEDIUM;
+  }
+}
+class Qr extends ur {
+  constructor(t, e = {}) {
+    super(t, {
+      ...e,
+      severity: $.HIGH,
+      context: {
+        errorType: "ActivityStateError",
+        expectedState: e.expectedState,
+        actualState: e.actualState,
+        stateTransition: e.stateTransition
+      }
+    }), this.expectedState = e.expectedState, this.actualState = e.actualState, this.stateTransition = e.stateTransition;
   }
 }
 export {
-  Nt as ACTIVITY_RECORD,
-  Fe as ALL_ATTR_SYMBOL,
-  Pt as ASYNC_TASK_RECORD,
-  Et as Action,
-  zt as Activity,
-  W as ActivityCall,
-  Se as ActivityError,
+  cr as ACTIVITY_RECORD,
+  Ce as ALL_ATTR_SYMBOL,
+  Mt as ASYNC_TASK_RECORD,
+  kt as Action,
+  Kt as Activity,
+  et as ActivityCall,
+  ur as ActivityError,
   st as ActivityGroup,
-  pr as ActivityInteractionRelation,
-  Br as ActivityManager,
-  Ee as ActivityStateEntity,
-  qr as ActivityStateError,
-  ni as AliasManager,
+  lr as ActivityInteractionRelation,
+  Fr as ActivityManager,
+  Te as ActivityStateEntity,
+  Qr as ActivityStateError,
+  ri as AliasManager,
   ht as Any,
-  Ai as AnyHandles,
-  J as AttributeInfo,
-  C as AttributeQuery,
-  K as Attributive,
-  Rt as Attributives,
+  Ri as AnyHandles,
+  _ as AttributeInfo,
+  x as AttributeQuery,
+  z as Attributive,
+  bt as Attributives,
   ut as Average,
-  Li as AverageHandles,
-  Nr as BaseKlass,
+  $i as AverageHandles,
   ft as BoolAtomData,
   R as BoolExp,
   mt as BoolExpressionData,
-  U as ComputationDataDepError,
-  V as ComputationError,
+  H as ComputationDataDepError,
+  F as ComputationError,
   S as ComputationResult,
-  be as ComputationResultAsync,
-  ge as ComputationResultFullRecompute,
-  Re as ComputationResultResolved,
-  Tt as ComputationResultSkip,
-  ne as ComputationStateError,
-  Yt as Condition,
-  D as ConditionError,
-  bt as Conditions,
-  Pr as Controller,
+  fe as ComputationResultAsync,
+  pe as ComputationResultFullRecompute,
+  me as ComputationResultResolved,
+  Nt as ComputationResultSkip,
+  ae as ComputationStateError,
+  Xt as Condition,
+  U as ConditionError,
+  St as Conditions,
+  Ir as Controller,
   ct as Count,
-  Ii as CountHandles,
-  Qe as CreationExecutor,
-  Wt as Custom,
-  Ji as CustomHandles,
-  Ut as DBConsoleLogger,
-  zi as DBLogLevel,
-  ci as DBSetup,
-  Cr as DELETED_STATE,
-  q as DICTIONARY_RECORD,
-  Zt as DataAttributive,
-  re as DataAttributives,
-  Ae as DataPolicy,
-  qt as Dictionary,
-  ui as DictionaryEntity,
+  vi as CountHandles,
+  Oe as CreationExecutor,
+  Bt as Custom,
+  Qi as CustomHandles,
+  Ht as DBConsoleLogger,
+  Hi as DBLogLevel,
+  si as DBSetup,
+  kr as DELETED_STATE,
+  L as DICTIONARY_RECORD,
+  zt as DataAttributive,
+  ee as DataAttributives,
+  ve as DataPolicy,
+  Qt as Dictionary,
+  oi as DictionaryEntity,
   I as Entity,
-  Bi as EntityCustomHandle,
-  Ue as EntityQueryHandle,
-  Ge as EntityToTableMap,
-  Ht as Equation,
-  te as Event,
-  ye as EventSource,
+  Di as EntityCustomHandle,
+  We as EntityQueryHandle,
+  Je as EntityToTableMap,
+  Wt as Equation,
+  j as ErrorCategory,
+  $ as ErrorSeverity,
+  Yt as Event,
+  he as EventSource,
   dt as Every,
-  vi as EveryHandles,
-  P as Expression,
+  yi as EveryHandles,
+  C as Expression,
+  W as FrameworkError,
   at as Gateway,
-  ve as GetAction,
-  Ti as GlobalAnyHandle,
-  Vi as GlobalAverageHandle,
+  Gi as GetAction,
+  gi as GlobalAnyHandle,
+  Pi as GlobalAverageHandle,
   B as GlobalBoundState,
-  Si as GlobalCountHandle,
-  qi as GlobalCustomHandle,
-  wi as GlobalEveryHandle,
-  Mi as GlobalRealTimeComputation,
-  fi as GlobalStateMachineHandle,
-  Oi as GlobalSumHandle,
-  gi as GlobalWeightedSummationHandle,
-  Ot as HARD_DELETION_PROPERTY_NAME,
-  Mr as HardDeletionProperty,
-  ae as ID_ATTR,
-  Vt as INTERACTION_RECORD,
-  kt as Inequality,
-  Xt as Interaction,
-  It as InteractionCall,
-  Kt as InteractionEventEntity,
-  ue as InteractionExecutionError,
-  _ as InteractionGuardError,
-  Qt as KlassByName,
+  wi as GlobalCountHandle,
+  Oi as GlobalCustomHandle,
+  fi as GlobalEveryHandle,
+  ki as GlobalRealTimeComputation,
+  ci as GlobalStateMachineHandle,
+  Ii as GlobalSumHandle,
+  di as GlobalWeightedSummationHandle,
+  $t as HARD_DELETION_PROPERTY_NAME,
+  Er as HardDeletionProperty,
+  re as ID_ATTR,
+  Ki as INTERACTION_RECORD,
+  vt as Inequality,
+  Gt as Interaction,
+  Ut as InteractionEventEntity,
+  Vr as InteractionExecutionError,
+  q as InteractionGuardError,
+  Ft as KlassByName,
   f as LINK_SYMBOL,
-  vt as LinkInfo,
+  wt as LinkInfo,
   m as MatchExp,
-  De as Modifier,
-  Or as MonoSystem,
-  Ir as NON_DELETED_STATE,
-  Er as NON_EXIST_STATE,
-  Q as NewRecordData,
-  Tr as PHASE_AFTER_ALL,
-  vr as PHASE_BEFORE_ALL,
-  xt as PHASE_NORMAL,
-  ie as Payload,
-  ee as PayloadItem,
+  Pe as Modifier,
+  Mr as MonoSystem,
+  Ar as NON_DELETED_STATE,
+  Tr as NON_EXIST_STATE,
+  V as NewRecordData,
+  gr as PHASE_AFTER_ALL,
+  yr as PHASE_BEFORE_ALL,
+  It as PHASE_NORMAL,
+  te as Payload,
+  Zt as PayloadItem,
   N as Property,
-  ki as PropertyAnyHandle,
-  Qi as PropertyAverageHandle,
-  Ei as PropertyCountHandle,
-  Wi as PropertyCustomHandle,
-  Ni as PropertyEveryHandle,
-  Pi as PropertyRealTimeComputation,
-  mi as PropertyStateMachineHandle,
-  Di as PropertySumHandle,
-  Lt as PropertyTypes,
-  bi as PropertyWeightedSummationHandle,
-  We as QueryExecutor,
-  Jt as ROOT_LABEL,
-  oe as ROW_ID_ATTR,
+  bi as PropertyAnyHandle,
+  Ci as PropertyAverageHandle,
+  Ni as PropertyCountHandle,
+  Vi as PropertyCustomHandle,
+  mi as PropertyEveryHandle,
+  Si as PropertyRealTimeComputation,
+  li as PropertyStateMachineHandle,
+  xi as PropertySumHandle,
+  Vt as PropertyTypes,
+  hi as PropertyWeightedSummationHandle,
+  Le as QueryExecutor,
+  _t as ROOT_LABEL,
+  se as ROW_ID_ATTR,
   pt as RealTime,
-  $i as RealTimeHandles,
+  Ei as RealTimeHandles,
   E as RecordBoundState,
   rt as RecordInfo,
-  Ne as RecordMutationSideEffect,
-  M as RecordQuery,
-  je as RecordQueryAgent,
-  _e as RecordQueryRef,
-  L as RecordQueryTree,
-  Ci as RecordsTransformHandle,
+  ge as RecordMutationSideEffect,
+  P as RecordQuery,
+  _e as RecordQueryAgent,
+  Qe as RecordQueryRef,
+  Q as RecordQueryTree,
+  Ti as RecordsTransformHandle,
   it as RecursiveContext,
-  me as RefContainer,
-  x as Relation,
-  _i as RelationCustomHandle,
-  Be as SQLBuilder,
-  tt as SYSTEM_RECORD,
-  ji as Scheduler,
-  _t as SideEffect,
+  de as RefContainer,
+  M as Relation,
+  Fi as RelationCustomHandle,
+  Ve as SQLBuilder,
+  Z as SYSTEM_RECORD,
+  qi as Scheduler,
+  qt as SideEffect,
   ot as StateMachine,
-  yi as StateMachineHandles,
-  z as StateNode,
-  Bt as StateTransfer,
+  ui as StateMachineHandles,
+  K as StateNode,
+  Lt as StateTransfer,
   lt as Summation,
-  Fi as SummationHandles,
-  Gt as SystemConsoleLogger,
-  li as SystemEntity,
-  Yi as SystemLogLevel,
-  Te as Transfer,
-  At as Transform,
-  xi as TransformHandles,
-  xr as USER_ENTITY,
+  Mi as SummationHandles,
+  jt as SystemConsoleLogger,
+  ai as SystemEntity,
+  ji as SystemLogLevel,
+  we as Transfer,
+  Tt as Transform,
+  Ai as TransformHandles,
+  Sr as USER_ENTITY,
   nt as WeightedSummation,
-  Ri as WeightedSummationHandles,
-  ce as addToCurrentEffects,
-  A as assert,
-  jt as asyncEffectsContext,
-  Dr as asyncInteractionContext,
-  Fr as boolExpToAttributives,
-  yr as clearAllInstances,
-  wr as createClass,
-  Ce as createInstances,
-  Rr as createInstancesFromString,
-  Lr as createUserRoleAttributive,
-  $r as dbConsoleLogger,
-  wt as deepClone,
-  Sr as everyAsync,
-  pi as everyWithErrorAsync,
-  kr as filterMap,
-  Qr as findRootActivity,
-  ke as forEachInteraction,
+  pi as WeightedSummationHandles,
+  oe as addToCurrentEffects,
+  k as assert,
+  Jt as asyncEffectsContext,
+  Pr as asyncInteractionContext,
+  Cr as boolExpToAttributives,
+  be as checkCondition,
+  Re as checkPayload,
+  pr as clearAllInstances,
+  ke as createInstances,
+  mr as createInstancesFromString,
+  Dr as createUserRoleAttributive,
+  xr as dbConsoleLogger,
+  Rt as deepClone,
+  wr as everyAsync,
+  vr as everyWithErrorAsync,
+  br as filterMap,
+  Or as findRootActivity,
+  Ne as forEachInteraction,
   T as generateUUID,
-  Ui as getCurrentEffects,
-  Vr as getInteractions,
-  mr as indexBy,
-  he as isObject,
-  pe as isPlainObject,
-  Ar as mapObject,
-  fe as registerKlass,
-  gr as removeAllInstance,
-  hi as someAsync,
-  br as stringifyAllInstances,
+  Bi as getCurrentEffects,
+  $r as getInteractions,
+  hr as indexBy,
+  ce as isObject,
+  le as isPlainObject,
+  Rr as mapObject,
+  ue as registerKlass,
+  Nr as someAsync,
+  fr as stringifyAllInstances,
   w as stringifyAttribute,
-  Zi as systemConsoleLogger
+  Ui as systemConsoleLogger
 };
 //# sourceMappingURL=index.js.map