interaqt 0.7.3 → 0.8.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { parse as Ee } from "acorn";
+import { parse as Se } from "acorn";
 import { AsyncLocalStorage as le } from "async_hooks";
 function ue(u) {
   return u !== null && typeof u == "object";
@@ -8,7 +8,7 @@ function de(u) {
   const t = Object.getPrototypeOf(u);
   return t === null ? !0 : t === Object.prototype || t === null;
 }
-function Ie(u, t) {
+function Ee(u, t) {
   const e = {};
   for (const i of u)
     i && i[t] !== void 0 && (e[String(i[t])] = i);
@@ -17,42 +17,42 @@ function Ie(u, t) {
 function w(u) {
   return typeof u == "function" ? `func::${u.toString()}` : Array.isArray(u) ? u : ue(u) && !de(u) ? `uuid::${u.uuid}` : u;
 }
-function ft(u, t) {
+function mt(u, t) {
   if (u == null || typeof u != "object") return u;
-  if (Array.isArray(u)) return u.map((i) => ft(i, t));
+  if (Array.isArray(u)) return u.map((i) => mt(i, t));
   if (de(u))
-    return Object.fromEntries(Object.entries(u).map(([i, r]) => [i, ft(r, t)]));
+    return Object.fromEntries(Object.entries(u).map(([i, r]) => [i, mt(r, t)]));
   if (u instanceof Set)
-    return new Set(Array.from(u.values()).map((i) => ft(i, t)));
+    return new Set(Array.from(u.values()).map((i) => mt(i, t)));
   if (u instanceof Map)
-    return new Map(Array.from(u.entries()).map(([i, r]) => [i, ft(r, t)]));
+    return new Map(Array.from(u.entries()).map(([i, r]) => [i, mt(r, t)]));
   const e = u;
   return t && e._type && e.constructor?.clone ? e.constructor.clone(u, t) : u;
 }
-function or(...u) {
+function ar(...u) {
   for (const t of u)
     t.instances.length = 0;
 }
-function nr() {
+function or() {
 }
-const Ft = /* @__PURE__ */ new Map();
-function Ce(u, t) {
-  t && t.isKlass && t.displayName && Ft.set(u, t);
+const Dt = /* @__PURE__ */ new Map();
+function Ie(u, t) {
+  t && t.isKlass && t.displayName && Dt.set(u, t);
 }
-function cr() {
+function nr() {
   const u = [];
-  return Array.from(Ft.entries()).forEach(([, t]) => {
+  return Array.from(Dt.entries()).forEach(([, t]) => {
     t.instances && Array.isArray(t.instances) && t.stringify && u.push(...t.instances.map((e) => t.stringify(e)));
   }), `[${u.join(",")}]`;
 }
-function lr(u) {
+function cr(u) {
   const t = JSON.parse(u);
-  return xe(t);
+  return Ce(t);
 }
-function xe(u) {
+function Ce(u) {
   const t = /* @__PURE__ */ new Map();
   return u.forEach(({ type: e, options: i = {}, uuid: r, public: s }) => {
-    const a = Ft.get(e);
+    const a = Dt.get(e);
     if (!a) {
       console.warn(`Class ${e} not found in KlassByName`);
       return;
@@ -61,10 +61,10 @@ function xe(u) {
     t.set(r, o);
   }), t;
 }
-function ur(u) {
+function lr(u) {
   return console.warn("createClass is deprecated in refactored code"), null;
 }
-class dr {
+class ur {
   static {
     this.isKlass = !0;
   }
@@ -86,11 +86,11 @@ class dr {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
 }
-let Me = 0;
+let xe = 0;
 function k(u) {
-  return u?.uuid || `id_${++Me}`;
+  return u?.uuid || `id_${++xe}`;
 }
-const Pe = /^[a-zA-Z0-9_]+$/;
+const Me = /^[a-zA-Z0-9_]+$/;
 class I {
   // for Merged Entity
   constructor(t, e) {
@@ -111,7 +111,7 @@ class I {
         type: "string",
         required: !0,
         constraints: {
-          nameFormat: ({ name: t }) => Pe.test(t)
+          nameFormat: ({ name: t }) => Me.test(t)
         }
       },
       properties: {
@@ -192,9 +192,9 @@ class I {
     return this.create(e.public, e.options);
   }
 }
-var Dt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Dt || {});
-const $e = /^[a-zA-Z0-9_]+$/;
-class Vt {
+var Vt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Vt || {});
+const Pe = /^[a-zA-Z0-9_]+$/;
+class Qt {
   constructor(t, e) {
     this._type = "Dictionary", this._options = e, this.uuid = k(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;
   }
@@ -214,7 +214,7 @@ class Vt {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: t }) => $e.test(t),
+          format: ({ name: t }) => Pe.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
@@ -222,7 +222,7 @@ class Vt {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(Dt))
+        options: Array.from(Object.values(Vt))
       },
       collection: {
         type: "boolean",
@@ -248,7 +248,7 @@ class Vt {
     };
   }
   static create(t, e) {
-    const i = new Vt(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;
@@ -287,7 +287,7 @@ class Vt {
     return this.create(e.public, e.options);
   }
 }
-const Oe = /^[a-zA-Z0-9_]+$/;
+const $e = /^[a-zA-Z0-9_]+$/;
 class v {
   constructor(t, e) {
     this._type = "Property", this._options = e, this.uuid = k(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;
@@ -307,14 +307,14 @@ class v {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: t }) => Oe.test(t),
+          format: ({ name: t }) => $e.test(t),
           length: ({ name: t }) => t.length > 1 && t.length < 5
         }
       },
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(Dt)
+        options: () => Object.values(Vt)
       },
       collection: {
         type: "boolean",
@@ -553,9 +553,9 @@ class P {
     return this.create(e.public, e.options);
   }
 }
-class Qt {
+class Lt {
   constructor(t, e) {
-    this._type = "Interaction", this._options = e, this.uuid = k(e), this.name = t.name, this.conditions = t.conditions, this.userAttributives = t.userAttributives, this.userRef = t.userRef, this.action = t.action, this.payload = t.payload, this.sideEffects = t.sideEffects || [], this.data = t.data, this.query = t.query;
+    this._type = "Interaction", this._options = e, this.uuid = k(e), this.name = t.name, this.conditions = t.conditions, this.userAttributives = t.userAttributives, this.userRef = t.userRef, this.action = t.action, this.payload = t.payload, this.sideEffects = t.sideEffects || [], this.data = t.data, this.dataPolicy = t.dataPolicy;
   }
   static {
     this.isKlass = !0;
@@ -606,15 +606,15 @@ class Qt {
         required: !1,
         collection: !1
       },
-      query: {
-        type: "Query",
+      dataPolicy: {
+        type: "DataPolicy",
         required: !1,
         collection: !1
       }
     };
   }
   static create(t, e) {
-    const i = new Qt(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}, Interaction`);
     return this.instances.push(i), i;
@@ -624,7 +624,7 @@ class Qt {
       name: t.name,
       action: t.action
     };
-    t.conditions !== void 0 && (e.conditions = t.conditions), t.userAttributives !== void 0 && (e.userAttributives = t.userAttributives), t.userRef !== void 0 && (e.userRef = t.userRef), t.payload !== void 0 && (e.payload = t.payload), t.sideEffects && t.sideEffects.length > 0 && (e.sideEffects = t.sideEffects), t.data !== void 0 && (e.data = t.data), t.query !== void 0 && (e.query = t.query);
+    t.conditions !== void 0 && (e.conditions = t.conditions), t.userAttributives !== void 0 && (e.userAttributives = t.userAttributives), t.userRef !== void 0 && (e.userRef = t.userRef), t.payload !== void 0 && (e.payload = t.payload), t.sideEffects && t.sideEffects.length > 0 && (e.sideEffects = t.sideEffects), t.data !== void 0 && (e.data = t.data), t.dataPolicy !== void 0 && (e.dataPolicy = t.dataPolicy);
     const i = {
       type: "Interaction",
       options: t._options,
@@ -638,7 +638,7 @@ class Qt {
       name: t.name,
       action: t.action
     };
-    return t.conditions !== void 0 && (i.conditions = t.conditions), t.userAttributives !== void 0 && (i.userAttributives = t.userAttributives), t.userRef !== void 0 && (i.userRef = t.userRef), t.payload !== void 0 && (i.payload = t.payload), t.sideEffects && t.sideEffects.length > 0 && (i.sideEffects = t.sideEffects), t.data !== void 0 && (i.data = t.data), t.query !== void 0 && (i.query = t.query), this.create(i);
+    return t.conditions !== void 0 && (i.conditions = t.conditions), t.userAttributives !== void 0 && (i.userAttributives = t.userAttributives), t.userRef !== void 0 && (i.userRef = t.userRef), t.payload !== void 0 && (i.payload = t.payload), t.sideEffects && t.sideEffects.length > 0 && (i.sideEffects = t.sideEffects), t.data !== void 0 && (i.data = t.data), t.dataPolicy !== void 0 && (i.dataPolicy = t.dataPolicy), this.create(i);
   }
   static is(t) {
     return t !== null && typeof t == "object" && "_type" in t && t._type === "Interaction";
@@ -651,7 +651,7 @@ class Qt {
     return this.create(e.public, e.options);
   }
 }
-class Lt {
+class qt {
   constructor(t, e) {
     this._type = "Activity", this._options = e, this.uuid = k(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 || [];
   }
@@ -699,7 +699,7 @@ class Lt {
     };
   }
   static create(t, e) {
-    const i = new Lt(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}, Activity`);
     return this.instances.push(i), i;
@@ -874,11 +874,11 @@ function pe(u, t, e) {
     i.activities?.forEach((r) => pe(r, t, i));
   });
 }
-function hr(u) {
+function dr(u) {
   const t = [];
   return pe(u, (e) => t.push(e)), t;
 }
-function pr(u) {
+function hr(u) {
   return null;
 }
 class it {
@@ -1176,16 +1176,16 @@ const Fe = {
   "||": "or",
   "!": "not"
 };
-function De(u) {
+function Oe(u) {
   return { key: u };
 }
-function mt(u, t, e) {
+function yt(u, t, e) {
   if (u.type === "LogicalExpression")
     return {
       type: "expression",
       operator: Fe[u.operator],
-      left: mt(u.left, t, e),
-      right: mt(u.right, t, e)
+      left: yt(u.left, t, e),
+      right: yt(u.right, t, e)
     };
   if (u.type === "Identifier")
     return {
@@ -1196,14 +1196,14 @@ function mt(u, t, e) {
     return {
       type: "expression",
       operator: "not",
-      left: mt(u.argument, t, e)
+      left: yt(u.argument, t, e)
     };
   throw new Error("unknown ast node type");
 }
-function fr(u, t = [], e = De) {
-  const i = Ie(t, "name"), r = Ee(u, { ecmaVersion: 2020 });
+function pr(u, t = [], e = Oe) {
+  const i = Ee(t, "name"), r = Se(u, { ecmaVersion: 2020 });
   return new R(
-    mt(r.body[0].expression, i, e)
+    yt(r.body[0].expression, i, e)
   );
 }
 class U {
@@ -1274,7 +1274,7 @@ class U {
     return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Nt {
+class vt {
   constructor(t, e) {
     this._type = "Attributives", this._options = e, this.uuid = k(e), this.content = t.content;
   }
@@ -1297,7 +1297,7 @@ class Nt {
     };
   }
   static create(t, e) {
-    const i = new Nt(t, e);
+    const i = new vt(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;
@@ -1328,7 +1328,7 @@ class Nt {
     return this.create(e.public, e.options);
   }
 }
-function xt(u) {
+function Mt(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return it.create({
@@ -1339,16 +1339,16 @@ function xt(u) {
   return rt.create({
     type: "expression",
     operator: t.operator,
-    left: xt(u.left),
-    right: xt(u.right)
+    left: Mt(u.left),
+    right: Mt(u.right)
   });
 }
-function mr(u) {
-  return Nt.create({
-    content: xt(u)
+function fr(u) {
+  return vt.create({
+    content: Mt(u)
   });
 }
-class qt {
+class Bt {
   constructor(t, e) {
     this._type = "Condition", this._options = e, this.uuid = k(e), this.content = t.content, this.name = t.name;
   }
@@ -1374,7 +1374,7 @@ class qt {
     };
   }
   static create(t, e) {
-    const i = new qt(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}, Condition`);
     return this.instances.push(i), i;
@@ -1408,7 +1408,7 @@ class qt {
     return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
   }
 }
-class Bt {
+class _t {
   constructor(t, e) {
     this._type = "DataAttributive", this._options = e, this.uuid = k(e), this.content = t.content, this.name = t.name;
   }
@@ -1434,7 +1434,7 @@ class Bt {
     };
   }
   static create(t, e) {
-    const i = new Bt(t, e);
+    const i = new _t(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;
@@ -1470,27 +1470,32 @@ class Bt {
 }
 class fe {
   constructor(t, e) {
-    this._type = "QueryItem", this._options = e, this.uuid = k(e), this.name = t.name, this.value = t.value;
+    this._type = "DataPolicy", this._options = e, this.uuid = k(e), this.match = t.match, this.modifier = t.modifier, this.attributeQuery = t.attributeQuery;
   }
   static {
     this.isKlass = !0;
   }
   static {
-    this.displayName = "QueryItem";
+    this.displayName = "DataPolicy";
   }
   static {
     this.instances = [];
   }
   static {
     this.public = {
-      name: {
-        type: "string",
-        required: !0,
+      match: {
+        type: "any",
+        required: !1,
         collection: !1
       },
-      value: {
-        type: "string",
-        required: !0,
+      modifier: {
+        type: "any",
+        required: !1,
+        collection: !1
+      },
+      attributeQuery: {
+        type: "any",
+        required: !1,
         collection: !1
       }
     };
@@ -1498,84 +1503,26 @@ class fe {
   static create(t, e) {
     const i = new fe(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
-      throw new Error(`duplicate uuid in options ${i.uuid}, QueryItem`);
-    return this.instances.push(i), i;
-  }
-  static stringify(t) {
-    const e = {
-      type: "QueryItem",
-      options: t._options,
-      uuid: t.uuid,
-      public: {
-        name: t.name,
-        value: t.value
-      }
-    };
-    return JSON.stringify(e);
-  }
-  static clone(t, e) {
-    return this.create({
-      name: t.name,
-      value: t.value
-    });
-  }
-  static is(t) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === "QueryItem";
-  }
-  static check(t) {
-    return t !== null && typeof t == "object" && typeof t.uuid == "string";
-  }
-  static parse(t) {
-    const e = JSON.parse(t);
-    return this.create(e.public, e.options);
-  }
-}
-class me {
-  constructor(t, e) {
-    this._type = "Query", this._options = e, this.uuid = k(e), this.items = t.items;
-  }
-  static {
-    this.isKlass = !0;
-  }
-  static {
-    this.displayName = "Query";
-  }
-  static {
-    this.instances = [];
-  }
-  static {
-    this.public = {
-      items: {
-        type: "QueryItem",
-        required: !0,
-        collection: !0
-      }
-    };
-  }
-  static create(t, e) {
-    const i = new me(t, e);
-    if (this.instances.find((s) => s.uuid === i.uuid))
-      throw new Error(`duplicate uuid in options ${i.uuid}, Query`);
+      throw new Error(`duplicate uuid in options ${i.uuid}, DataPolicy`);
     return this.instances.push(i), i;
   }
   static stringify(t) {
-    const e = {
-      type: "Query",
+    const e = {};
+    t.match !== void 0 && (e.match = t.match), t.modifier !== void 0 && (e.modifier = t.modifier), t.attributeQuery !== void 0 && (e.attributeQuery = t.attributeQuery);
+    const i = {
+      type: "DataPolicy",
       options: t._options,
       uuid: t.uuid,
-      public: {
-        items: t.items
-      }
+      public: e
     };
-    return JSON.stringify(e);
+    return JSON.stringify(i);
   }
   static clone(t, e) {
-    return this.create({
-      items: t.items
-    });
+    const i = {};
+    return t.match !== void 0 && (i.match = t.match), t.modifier !== void 0 && (i.modifier = t.modifier), t.attributeQuery !== void 0 && (i.attributeQuery = t.attributeQuery), this.create(i);
   }
   static is(t) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === "Query";
+    return t !== null && typeof t == "object" && "_type" in t && t._type === "DataPolicy";
   }
   static check(t) {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
@@ -1585,7 +1532,7 @@ class me {
     return this.create(e.public, e.options);
   }
 }
-class vt {
+class kt {
   constructor(t, e) {
     this._type = "Action", this._options = e, this.uuid = k(e), this.name = t.name;
   }
@@ -1607,7 +1554,7 @@ class vt {
     };
   }
   static create(t, e) {
-    const i = new vt(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;
@@ -1639,7 +1586,7 @@ class vt {
     return this.create(e.public, e.options);
   }
 }
-const Ve = vt.create({ name: "get" });
+const De = kt.create({ name: "get" });
 class tt {
   constructor(t, e) {
     this._type = "Gateway", this._options = e, this.uuid = k(e), this.name = t.name;
@@ -1694,7 +1641,7 @@ class tt {
     return this.create(e.public, e.options);
   }
 }
-class _t {
+class Wt {
   constructor(t, e) {
     this._type = "Event", this._options = e, this.uuid = k(e), this.name = t.name;
   }
@@ -1716,7 +1663,7 @@ class _t {
     };
   }
   static create(t, e) {
-    const i = new _t(t, e);
+    const i = new Wt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Event`);
     return this.instances.push(i), i;
@@ -1811,7 +1758,7 @@ class K {
     return this.create(e.public, e.options);
   }
 }
-class Wt {
+class Jt {
   constructor(t, e) {
     this._type = "StateTransfer", this._options = e, this.uuid = k(e), this.trigger = t.trigger, this.current = t.current, this.next = t.next, this.computeTarget = t.computeTarget;
   }
@@ -1849,7 +1796,7 @@ class Wt {
     };
   }
   static create(t, e) {
-    const i = new Wt(t, e);
+    const i = new Jt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateTransfer`);
     return this.instances.push(i), i;
@@ -2442,7 +2389,7 @@ class ut {
     return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
   }
 }
-class kt {
+class Tt {
   constructor(t, e) {
     this._type = "Transform", this._options = e, this.uuid = k(e), this.record = t.record, this.eventDeps = t.eventDeps, this.attributeQuery = t.attributeQuery, this.callback = t.callback;
   }
@@ -2475,7 +2422,7 @@ class kt {
     };
   }
   static create(t, e) {
-    const i = new kt(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;
@@ -2585,7 +2532,7 @@ class dt {
     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 Jt {
+class Ht {
   constructor(t, e) {
     this._type = "PayloadItem", this._options = e, this.uuid = k(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;
   }
@@ -2636,7 +2583,7 @@ class Jt {
     };
   }
   static create(t, e) {
-    const i = new Jt(t, e);
+    const i = new Ht(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, PayloadItem`);
     return this.instances.push(i), i;
@@ -2675,7 +2622,7 @@ class Jt {
     return this.create(e.public, e.options);
   }
 }
-class Ht {
+class jt {
   constructor(t, e) {
     this._type = "Payload", this._options = e, this.uuid = k(e), this.items = t.items || [];
   }
@@ -2699,7 +2646,7 @@ class Ht {
     };
   }
   static create(t, e) {
-    const i = new Ht(t, e);
+    const i = new jt(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Payload`);
     return this.instances.push(i), i;
@@ -2731,7 +2678,7 @@ class Ht {
     return this.create(e.public, e.options);
   }
 }
-class jt {
+class Ut {
   constructor(t, e) {
     this._type = "SideEffect", this._options = e, this.uuid = k(e), this.name = t.name, this.handle = t.handle;
   }
@@ -2759,7 +2706,7 @@ class jt {
     };
   }
   static create(t, e) {
-    const i = new jt(t, e);
+    const i = new Ut(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, SideEffect`);
     return this.instances.push(i), i;
@@ -2793,7 +2740,7 @@ class jt {
     return i.handle && typeof i.handle == "string" && i.handle.startsWith("func::") && (i.handle = new Function("return " + i.handle.substring(6))()), this.create(i, e.options);
   }
 }
-function Mt(u) {
+function Pt(u) {
   if (!u) return;
   if (u.raw.type === "atom")
     return it.create({
@@ -2804,13 +2751,13 @@ function Mt(u) {
   return rt.create({
     type: "expression",
     operator: t.operator,
-    left: Mt(u.left),
-    right: Mt(u.right)
+    left: Pt(u.left),
+    right: Pt(u.right)
   });
 }
-class Tt {
+class At {
   constructor(t, e) {
-    this._type = "Conditions", this._options = e, this.uuid = k(e), t.content && t.content instanceof R ? this.content = Mt(t.content) : this.content = t.content;
+    this._type = "Conditions", this._options = e, this.uuid = k(e), t.content && t.content instanceof R ? this.content = Pt(t.content) : this.content = t.content;
   }
   static {
     this.isKlass = !0;
@@ -2831,7 +2778,7 @@ class Tt {
     };
   }
   static create(t, e) {
-    const i = new Tt(t, e);
+    const i = new At(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;
@@ -2862,7 +2809,7 @@ class Tt {
     return this.create(e.public, e.options);
   }
 }
-class Ut {
+class Kt {
   constructor(t, e) {
     this._type = "DataAttributives", this._options = e, this.uuid = k(e), this.content = t.content;
   }
@@ -2885,7 +2832,7 @@ class Ut {
     };
   }
   static create(t, e) {
-    const i = new Ut(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}, DataAttributives`);
     return this.instances.push(i), i;
@@ -2916,20 +2863,20 @@ class Ut {
     return this.create(e.public, e.options);
   }
 }
-const Qe = [
+const Ve = [
   I,
   P,
   v,
-  Qt,
   Lt,
-  U,
   qt,
+  U,
   Bt,
-  vt,
-  tt,
   _t,
-  K,
+  kt,
+  tt,
   Wt,
+  K,
+  Jt,
   st,
   at,
   ot,
@@ -2937,21 +2884,21 @@ const Qe = [
   ct,
   lt,
   ut,
-  kt,
+  Tt,
   dt,
-  Jt,
   Ht,
   jt,
-  Vt,
+  Ut,
+  Qt,
   it,
   rt,
-  Tt,
-  Ut
+  At,
+  Kt
 ];
-Qe.forEach((u) => {
-  u && u.displayName && Ce(u.displayName, u);
+Ve.forEach((u) => {
+  u && u.displayName && Ie(u.displayName, u);
 });
-class Kt {
+class Gt {
   constructor(t, e) {
     this._type = "Custom", this._options = e, this.uuid = k(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;
   }
@@ -3014,7 +2961,7 @@ class Kt {
     };
   }
   static create(t, e) {
-    const i = new Kt(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}, Custom`);
     return this.instances.push(i), i;
@@ -3058,7 +3005,7 @@ class Kt {
     }), this.create(i, e.options);
   }
 }
-class ye {
+class me {
   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();
   }
@@ -3269,7 +3216,7 @@ class ye {
     return null;
   }
 }
-function yr({ name: u, isRef: t = !1 }, e) {
+function mr({ name: u, isRef: t = !1 }, e) {
   return U.create({
     name: u,
     content: u ? new Function("user", `return user.roles.includes('${u}')`) : function() {
@@ -3282,7 +3229,7 @@ function g(u, t) {
   if (!u)
     throw new Error(t);
 }
-function St(u, t, e) {
+function Et(u, t, e) {
   const i = [...t];
   let r = u, s;
   const a = i.pop();
@@ -3642,7 +3589,7 @@ class m {
     );
   }
 }
-class Le {
+class Qe {
   constructor(t, e, i, r) {
     this.recordName = t, this.map = e, this.data = i, this.fromRelation = r;
   }
@@ -3678,7 +3625,7 @@ class x {
       e,
       N,
       new C(h, e, i.attributeQuery || [], s, a),
-      new Le(h, e, i.modifier),
+      new Qe(h, e, i.modifier),
       r,
       s,
       a,
@@ -3772,7 +3719,7 @@ class L {
     }), this.parentLinkQueryTree && (t[f] = this.parentLinkQueryTree.getData()), t;
   }
 }
-const f = "&", qe = "*";
+const f = "&", Le = "*";
 class C {
   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();
@@ -3785,7 +3732,7 @@ class C {
         this.parentLinkRecordQuery = x.create(y.linkName, this.map, d, void 0);
         return;
       }
-      if (l === qe) {
+      if (l === Le) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
         return;
       }
@@ -3794,10 +3741,10 @@ class C {
         let y = l, N = d;
         if (p.isLinkFiltered()) {
           y = p.getBaseAttributeInfo().attributeName;
-          const A = d.matchExpression, D = p.getLinkInfo().getBaseLinkInfo(), te = new m(D.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Se = A ? te.and(A.data) : te;
+          const A = d.matchExpression, D = p.getLinkInfo().getBaseLinkInfo(), te = new m(D.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), Ae = A ? te.and(A.data) : te;
           N = {
             ...d,
-            matchExpression: Se.data
+            matchExpression: Ae.data
           };
         }
         const b = x.create(p.recordName, this.map, N, void 0, this.recordName, y, h, !1, l);
@@ -3915,7 +3862,7 @@ class C {
     return this.parentLinkRecordQuery ? new C(this.recordName, this.map, this.data, this.parentRecord, this.attributeName, !0) : this;
   }
 }
-function Be(u) {
+function qe(u) {
   const t = [];
   return u.forEach((e) => t.push(...Array.isArray(e) ? e : [e])), t;
 }
@@ -3925,7 +3872,7 @@ class Q {
     const s = this.map.getRecordInfo(e);
     this.recordName = s.isFilteredEntity || s.isFilteredRelation ? s.resolvedBaseRecordName : e;
     const [a, o, n] = this.map.groupAttributes(this.recordName, i ? Object.keys(i) : []);
-    this.relatedEntitiesData = Be(o.map(
+    this.relatedEntitiesData = qe(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.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
@@ -4002,7 +3949,7 @@ class Q {
     }), i;
   }
 }
-class _e {
+class Be {
   constructor(t, e) {
     this.map = t, this.queryAgent = e, this.dependencies = /* @__PURE__ */ new Map();
   }
@@ -4228,7 +4175,7 @@ class _e {
     }
   }
 }
-class We {
+class _e {
   constructor() {
     this.aliasToPath = /* @__PURE__ */ new Map(), this.pathStrToAlias = /* @__PURE__ */ new Map(), this.aliasPlaceholder = 0;
   }
@@ -4242,24 +4189,24 @@ class We {
     return this.aliasToPath.get(t);
   }
 }
-const ge = ":root";
-class gt {
+const ye = ":root";
+class bt {
   constructor(t, e, i = []) {
     this.label = t, this.parent = e, this.stack = i;
   }
   concat(t) {
-    return new gt(this.label, this.parent, [...this.stack, t]);
+    return new bt(this.label, this.parent, [...this.stack, t]);
   }
   getStack(t) {
     return [...this.stack];
   }
   spawn(t) {
-    return new gt(t, this);
+    return new bt(t, this);
   }
 }
-class Je {
+class We {
   constructor(t) {
-    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(ge, t), this.recursiveSaveLabelledRecordQuery(t);
+    this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(ye, t), this.recursiveSaveLabelledRecordQuery(t);
   }
   recursiveSaveLabelledRecordQuery(t) {
     t.attributeQuery?.relatedRecords.forEach((e) => {
@@ -4273,9 +4220,9 @@ class Je {
     return this.recordQueryByName.get(t);
   }
 }
-class He {
+class Je {
   constructor(t, e) {
-    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new _e(t, this), this.initializeFilteredEntityDependencies();
+    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new Be(t, this), this.initializeFilteredEntityDependencies();
   }
   /**
    * 初始化所有 filtered entity 的依赖关系
@@ -4327,80 +4274,80 @@ ${b}
       const s = {};
       return Object.entries(r).forEach(([a, o]) => {
         const n = i.getPath(a).slice(1, 1 / 0);
-        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && St(s, n, o);
+        n.length === 1 && e.includes(n[0]) && typeof o == "string" && (o = JSON.parse(o)), o !== null && Et(s, n, o);
       }), s;
     });
   }
   // 查 entity 和 查 relation 都是一样的。具体在 entityQuery 里面区别。
   // TODO 为了性能，也可以把信息丢到客户端，然客户端去结构化？？？
   // CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
-  async findRecords(t, e = "", i, r = new gt(ge)) {
-    if (i || (i = new Je(t)), t.goto) {
+  async findRecords(t, e = "", i, r = new bt(ye)) {
+    if (i || (i = new We(t)), t.goto) {
       if (t.exit && await t.exit(r))
         return [];
-      const l = i.get(t.goto);
-      g(l, `goto ${t.goto} not found`);
-      const d = t.matchExpression.and(l.matchExpression), h = l.derive({
-        matchExpression: d
+      const d = i.get(t.goto);
+      g(d, `goto ${t.goto} not found`);
+      const h = t.matchExpression.and(d.matchExpression), p = d.derive({
+        matchExpression: h
       });
-      return this.findRecords(h, e, i, r);
+      return this.findRecords(p, e, i, r);
     }
     if (t.label && r.label === t.label && r.stack.length > 1 && r.stack[0].id === r.stack.at(-1).id)
       return [];
-    const [s, a, o] = this.buildXToOneFindQuery(t, ""), n = this.structureRawReturns(await this.database.query(s, a, e), this.map.getRecordInfo(t.recordName).JSONFields, o), c = t.label && t.label !== r.label ? r.spawn(t.label) : r;
-    this.completeXToOneLeftoverRecords(t, n, i, c);
-    for (let l of t.attributeQuery.xToOneRecords)
-      if (l.goto) {
-        const h = this.map.getInfo(l.parentRecord, l.attributeName).getReverseInfo()?.attributeName;
-        for (let p of n) {
-          const y = l.matchExpression.and({
-            key: `${h}.id`,
-            value: ["=", p.id]
-          }), N = l.derive({
-            matchExpression: y
-          }), b = t.label ? c.concat(p) : c;
-          p[l.alias || l.attributeName] = await this.findRecords(N, e, i, b);
+    const [s, a, o] = this.buildXToOneFindQuery(t, ""), n = await this.database.query(s, a, e), c = this.structureRawReturns(n, this.map.getRecordInfo(t.recordName).JSONFields, o), l = t.label && t.label !== r.label ? r.spawn(t.label) : r;
+    await this.completeXToOneLeftoverRecords(t, c, i, l);
+    for (let d of t.attributeQuery.xToOneRecords)
+      if (d.goto) {
+        const p = this.map.getInfo(d.parentRecord, d.attributeName).getReverseInfo()?.attributeName;
+        for (let y of c) {
+          const N = d.matchExpression.and({
+            key: `${p}.id`,
+            value: ["=", y.id]
+          }), b = d.derive({
+            matchExpression: N
+          }), A = t.label ? l.concat(y) : l;
+          y[d.alias || d.attributeName] = await this.findRecords(b, e, i, A);
         }
       }
-    for (let l of t.attributeQuery.xToOneRecords) {
-      const d = l.attributeQuery.parentLinkRecordQuery;
-      if (d)
-        for (let h of d.attributeQuery.xToManyRecords) {
-          const y = this.map.getInfo(h.parentRecord, h.attributeName).getReverseInfo()?.attributeName;
-          for (let N of n) {
-            const b = N[l.attributeName][f].id, A = h.derive({
-              matchExpression: h.matchExpression.and({
-                key: `${y}.id`,
-                value: ["=", b]
+    for (let d of t.attributeQuery.xToOneRecords) {
+      const h = d.attributeQuery.parentLinkRecordQuery;
+      if (h)
+        for (let p of h.attributeQuery.xToManyRecords) {
+          const N = this.map.getInfo(p.parentRecord, p.attributeName).getReverseInfo()?.attributeName;
+          for (let b of c) {
+            const A = b[d.attributeName][f].id, D = p.derive({
+              matchExpression: p.matchExpression.and({
+                key: `${N}.id`,
+                value: ["=", A]
               })
-            }), D = t.label ? c.concat(N) : c;
-            St(
-              N,
-              [l.alias || l.attributeName, f, h.attributeName],
+            }), ft = t.label ? l.concat(b) : l;
+            Et(
+              b,
+              [d.alias || d.attributeName, f, p.attributeName],
               await this.findRecords(
-                A,
-                `finding relation data: ${t.recordName}.${l.attributeName}.&.${h.attributeName}`,
+                D,
+                `finding relation data: ${t.recordName}.${d.attributeName}.&.${p.attributeName}`,
                 i,
-                D
+                ft
               )
             );
           }
         }
     }
-    for (let l of t.attributeQuery.xToManyRecords)
-      if (!l.onlyRelationData)
-        for (let d of n) {
-          const h = t.label ? c.concat(d) : c;
-          d[l.alias || l.attributeName] = await this.findXToManyRelatedRecords(
+    for (let d of t.attributeQuery.xToManyRecords)
+      if (!d.onlyRelationData)
+        for (let h of c) {
+          const p = t.label ? l.concat(h) : l;
+          h[d.alias || d.attributeName] = await this.findXToManyRelatedRecords(
             t.recordName,
-            l.attributeName,
-            d.id,
-            l,
+            d.attributeName,
+            h.id,
+            d,
             i,
-            h
+            p
           );
         }
-    return n;
+    return c;
   }
   async completeXToOneLeftoverRecords(t, e, i, r) {
     if (t.attributeQuery.parentLinkRecordQuery) {
@@ -4422,6 +4369,8 @@ ${b}
     for (let s of t.attributeQuery.xToOneRecords) {
       for (let a of s.attributeQuery.xToManyRecords)
         for (let o of e) {
+          if (!o[s.attributeName])
+            continue;
           const n = t.label ? r.concat(o) : r;
           o[s.attributeName][a.attributeName] = await this.findXToManyRelatedRecords(
             a.parentRecord,
@@ -4461,8 +4410,8 @@ ${b}
     if (N)
       for (let b of N.attributeQuery.xToManyRecords)
         for (let A of p) {
-          const D = A[f].id, Zt = d.label ? y.concat(A) : y;
-          St(
+          const D = A[f].id, ft = d.label ? y.concat(A) : y;
+          Et(
             A,
             [f, b.attributeName],
             await this.findXToManyRelatedRecords(
@@ -4471,7 +4420,7 @@ ${b}
               D,
               b,
               s,
-              Zt
+              ft
             )
           );
         }
@@ -4544,7 +4493,7 @@ ${b}
     return t ? `${t}___` : "";
   }
   buildSelectClause(t, e = "") {
-    const i = new We();
+    const i = new _e();
     return t.length ? [t.map(({ tableAliasAndField: s, attribute: a, nameContext: o }) => {
       const n = [
         `${this.withPrefix(e)}${o[0]}`,
@@ -5116,9 +5065,9 @@ WHERE "${s.idField}" = ${l()}
     return p ? [N, ...p] : void 0;
   }
 }
-class je {
+class He {
   constructor(t, e) {
-    this.map = t, this.database = e, this.agent = new He(t, e);
+    this.map = t, this.database = e, this.agent = new Je(t, e);
   }
   async findOne(t, e, i = {}, r) {
     const s = {
@@ -5276,7 +5225,7 @@ class et {
     return this.data?.resolvedMatchExpression;
   }
 }
-class bt {
+class Rt {
   constructor(t, e, i, r = !0) {
     this.name = t, this.data = e, this.map = i, this.isFromSource = r;
   }
@@ -5364,7 +5313,7 @@ class bt {
   getBaseLinkInfo() {
     g(this.isFilteredRelation(), "only filtered relation can get base link info");
     const t = this.data.baseLinkName;
-    return new bt(t, this.map.data.links[t], this.map);
+    return new Rt(t, this.map.data.links[t], this.map);
   }
   getMatchExpression() {
     if (this.isFilteredRelation())
@@ -5378,7 +5327,7 @@ class bt {
     return g(this.isFilteredRelation(), "only filtered relation can get resolved record name"), this.data.resolvedBaseRecordName;
   }
 }
-class Ue {
+class je {
   constructor(t) {
     this.data = t;
   }
@@ -5403,10 +5352,10 @@ class Ue {
   }
   getLinkInfo(t, e) {
     const i = this.getAttributeAndSymmetricDirection(e)[0], { linkName: r, isSource: s } = this.data.records[t].attributes[i];
-    return g(!!r, `cannot find relation ${t} ${i}`), new bt(r, this.data.links[r], this, !!s);
+    return g(!!r, `cannot find relation ${t} ${i}`), new Rt(r, this.data.links[r], this, !!s);
   }
   getLinkInfoByName(t) {
-    return g(!!this.data.links[t], `cannot find link ${t}`), new bt(t, this.data.links[t], this);
+    return g(!!this.data.links[t], `cannot find link ${t}`), new Rt(t, this.data.links[t], this);
   }
   getInfoByPath(t) {
     const [e, ...i] = t;
@@ -5574,7 +5523,7 @@ class Ue {
     return r.join(".");
   }
 }
-function Ke(u) {
+function Ue(u) {
   const t = /* @__PURE__ */ new Map();
   for (const e of u)
     if (e.inputEntities)
@@ -5585,7 +5534,7 @@ function Ke(u) {
     }
   return t;
 }
-function Ge(u) {
+function Ke(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}`;
@@ -5599,8 +5548,8 @@ function Ge(u) {
   }
   return t;
 }
-function Xe(u, t) {
-  const e = new ye(u, t), i = Ke(u), r = Ge(t);
+function Ge(u, t) {
+  const e = new me(u, t), i = Ue(u), r = Ke(t);
   return ee(
     u,
     e,
@@ -5620,15 +5569,15 @@ function ee(u, t, e, i) {
   });
   if (r.length !== 0)
     for (const s of r)
-      ze(
+      Xe(
         s,
         t,
         i,
         e
       );
 }
-function ze(u, t, e, i) {
-  const r = e === "entity", a = `__${G(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = ii(
+function Xe(u, t, e, i) {
+  const r = e === "entity", a = `__${G(u)}_input_${e}`, o = r ? t.getEntityByName(u.name) : t.getRelationByName(u.name), [n, c] = ei(
     o,
     a,
     i,
@@ -5638,7 +5587,7 @@ function ze(u, t, e, i) {
   const l = pt(u);
   if (l)
     for (const d of l)
-      Ye(
+      ze(
         d,
         c,
         a,
@@ -5646,8 +5595,8 @@ function ze(u, t, e, i) {
         r
       );
 }
-function Ye(u, t, e, i, r) {
-  const [s, a] = ri(
+function ze(u, t, e, i, r) {
+  const [s, a] = ii(
     u,
     t,
     e
@@ -5657,7 +5606,7 @@ function Ye(u, t, e, i, r) {
   const o = G(a), n = r ? i.getEntityByName(o) : i.getRelationByName(o);
   n && i.replace(s, n);
 }
-function Ze(u, t) {
+function Ye(u, t) {
   const e = /* @__PURE__ */ new Map(), i = pt(u);
   if (i && i.length > 0)
     for (const r of i) {
@@ -5671,8 +5620,8 @@ function Ze(u, t) {
     }
   return e;
 }
-function ti(u, t, e) {
-  const i = Ze(t, e);
+function Ze(u, t, e) {
+  const i = Ye(t, e);
   return v.create({
     name: u,
     type: "json",
@@ -5684,14 +5633,14 @@ function ti(u, t, e) {
     }
   });
 }
-function ei(u, t, e) {
+function ti(u, t, e) {
   const i = pt(u), r = [], s = /* @__PURE__ */ new Map(), a = {};
   for (const o of i) {
     let n = o;
     if (ht(n))
       for (; n.baseEntity && n.properties.length === 0; )
         n = n.baseEntity;
-    else if (ai(n))
+    else if (si(n))
       for (; n.baseRelation && n.properties.length === 0; )
         n = n.baseRelation;
     const c = Object.fromEntries(n.properties.map((h) => [h.name, h]));
@@ -5721,13 +5670,13 @@ function ei(u, t, e) {
   }
   return r;
 }
-function ii(u, t, e, i) {
-  const r = ti(
+function ei(u, t, e, i) {
+  const r = Ze(
     t,
     u,
     e
   ), s = [
-    ...ei(
+    ...ti(
       u,
       e,
       i
@@ -5785,7 +5734,7 @@ function ii(u, t, e, i) {
     return [o, n || o];
   }
 }
-function ri(u, t, e) {
+function ii(u, t, e) {
   if (ht(u)) {
     const i = u, r = t;
     let s = i;
@@ -5799,7 +5748,7 @@ function ri(u, t, e) {
     }), [a, s];
   } else {
     const i = u, r = t, s = G(i);
-    return i.baseRelation ? [i, si(i)] : [P.create({
+    return i.baseRelation ? [i, ri(i)] : [P.create({
       name: s,
       baseRelation: r,
       sourceProperty: i.sourceProperty,
@@ -5811,7 +5760,7 @@ function ri(u, t, e) {
     }), i];
   }
 }
-function si(u) {
+function ri(u) {
   let t = u;
   for (; t.baseRelation; )
     t = t.baseRelation;
@@ -5820,7 +5769,7 @@ function si(u) {
 function ht(u) {
   return "inputEntities" in u || !("sourceProperty" in u);
 }
-function ai(u) {
+function si(u) {
   return "sourceProperty" in u;
 }
 function pt(u) {
@@ -5829,7 +5778,7 @@ function pt(u) {
 function G(u) {
   return ht(u), u.name;
 }
-class oi {
+class ai {
   constructor(t, e, i, r = []) {
     this.entities = t, this.relations = e, this.database = i, this.mergeLinks = r, this.fieldNameMap = /* @__PURE__ */ new Map(), this.usedFieldNames = /* @__PURE__ */ new Set(), this.fieldCounter = 1, this.recordToTableMap = /* @__PURE__ */ new Map(), this.tableToRecordsMap = /* @__PURE__ */ new Map(), this.mergeLog = [], this.tables = {}, this.map = { links: {}, records: {} }, this.buildMap(), this.buildTables();
   }
@@ -6108,7 +6057,7 @@ class oi {
    * 统一处理 merged entities 和 merged relations
    */
   processMergedItems() {
-    const t = Xe(
+    const t = Ge(
       this.entities,
       this.relations
     );
@@ -6222,7 +6171,7 @@ ${Object.values(this.tables[t].columns).map((i) => `    "${i.name}" ${i.fieldTyp
     return this.fieldCounter++, this.fieldNameMap.set(t, r), this.usedFieldNames.add(r), r;
   }
 }
-const X = "_System_", q = "_Dictionary_", ie = "id", re = "_rowId", ni = I.create({
+const X = "_System_", q = "_Dictionary_", ie = "id", re = "_rowId", oi = I.create({
   name: X,
   properties: [
     v.create({
@@ -6241,7 +6190,7 @@ const X = "_System_", q = "_Dictionary_", ie = "id", re = "_rowId", ni = I.creat
       collection: !1
     })
   ]
-}), ci = I.create({
+}), ni = I.create({
   name: q,
   properties: [
     v.create({
@@ -6255,8 +6204,8 @@ const X = "_System_", q = "_Dictionary_", ie = "id", re = "_rowId", ni = I.creat
       collection: !1
     })
   ]
-}), gr = 0, Et = 1, br = 2;
-class li {
+}), yr = 0, It = 1, gr = 2;
+class ci {
   constructor(t, e) {
     this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
   }
@@ -6270,18 +6219,18 @@ class li {
       if (this.scheduler.isDataBasedComputation(i)) {
         if (Object.entries(i.dataDeps).forEach(([r, s]) => {
           const a = this.convertDataDepToERMutationEventsSourceMap(r, s, i);
-          e[s.phase || Et].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[Et].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 || Et].push({
+          e[s.phase || It].push({
             type: s.type,
             recordName: s.recordName,
             record: s.record,
@@ -6483,31 +6432,31 @@ class li {
 }
 class S {
   static {
-    this.skip = () => new Rt();
+    this.skip = () => new wt();
   }
   static {
-    this.resolved = (t, e) => new we(t, e);
+    this.resolved = (t, e) => new Re(t, e);
   }
   static {
-    this.async = (t) => new Re(t);
+    this.async = (t) => new be(t);
   }
   static {
-    this.fullRecompute = (t) => new be(t);
+    this.fullRecompute = (t) => new ge(t);
   }
 }
-class Rt extends S {
+class wt extends S {
 }
-class be extends S {
+class ge extends S {
   constructor(t) {
     super(), this.reason = t;
   }
 }
-class Re extends S {
+class be extends S {
   constructor(t) {
     super(), this.args = t;
   }
 }
-class we extends S {
+class Re extends S {
   constructor(t, e) {
     super(), this.result = t, this.args = e;
   }
@@ -6538,18 +6487,18 @@ class B {
     return await this.controller.system.storage.dict.get(this.key);
   }
 }
-function Pt(u, t) {
+function $t(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) || !Pt(u[e], t[e]))
+    if (!(e in u) || !$t(u[e], t[e]))
       return !1;
   return !0;
 }
-class Ne {
+class we {
   constructor(t) {
     this.data = t, this.map = {};
     for (const e of t.transfers)
@@ -6562,45 +6511,45 @@ class Ne {
     const i = this.map[t];
     if (i) {
       for (const r of i)
-        if (Pt(e, r.trigger))
+        if ($t(e, r.trigger))
           return r.next;
     }
     return null;
   }
   findTransfers(t) {
-    return this.data.transfers.filter((e) => Pt(t, e.trigger));
+    return this.data.transfers.filter((e) => $t(t, e.trigger));
   }
 }
 function T(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Rr(u, t) {
+function br(u, t) {
   return new Map(Array.from(u.entries()).map(([e, i]) => [e, t(e, i)]));
 }
-function wr(u, t) {
+function Rr(u, t) {
   return Object.fromEntries(Object.entries(u).map(([e, i]) => [e, t(e, i)]));
 }
-async function Nr(u, t) {
+async function wr(u, t) {
   for (let e of u)
     if (!await t(e)) return !1;
   return !0;
 }
-async function ui(u, t) {
+async function li(u, t) {
   for (let e of u)
     if (await t(e)) return !0;
   return !1;
 }
-async function di(u, t) {
+async function ui(u, t) {
   for (let e of u) {
     const i = await t(e);
     if (i !== !0) return i;
   }
   return !0;
 }
-class hi {
+class di {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new Ne(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 we(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] = {
@@ -6628,9 +6577,9 @@ class hi {
     return s ? (await this.state.currentState.set(s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : S.skip();
   }
 }
-class pi {
+class hi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.useLastValue = !0, this.eventDeps = {}, this.useMutationEvent = !0, this.transitionFinder = new Ne(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 we(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] = {
@@ -6675,17 +6624,17 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     };
   }
 }
-const vr = K.create({
+const Nr = K.create({
   name: "nonExistent",
   computeValue: () => null
-}), kr = K.create({
+}), vr = K.create({
   name: "nonDeleted",
   computeValue: () => !1
-}), Tr = K.create({
+}), kr = K.create({
   name: "deleted",
   computeValue: () => !0
-}), fi = [hi, pi];
-class mi {
+}), pi = [di, hi];
+class fi {
   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: {
@@ -6738,7 +6687,7 @@ class mi {
     return i;
   }
 }
-class yi {
+class mi {
   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), T(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, T(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 || [];
@@ -6814,8 +6763,8 @@ class yi {
     return s;
   }
 }
-const gi = [mi, yi];
-class bi {
+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: {
@@ -6868,7 +6817,7 @@ class bi {
     return a === s;
   }
 }
-class Ri {
+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((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, T(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 || [];
@@ -6942,8 +6891,8 @@ class Ri {
     return a === o;
   }
 }
-const wi = [bi, Ri];
-class Ni {
+const Ri = [gi, bi];
+class wi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.dataDeps = {
       main: {
@@ -6996,7 +6945,7 @@ class Ni {
     return s > 0;
   }
 }
-class vi {
+class Ni {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), T(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, T(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
     let r = this.relation.baseRelation || this.relation;
@@ -7072,8 +7021,8 @@ class vi {
     return s > 0;
   }
 }
-const ki = [Ni, vi];
-class Ti {
+const vi = [wi, Ni];
+class ki {
   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: {
@@ -7123,7 +7072,7 @@ class Ti {
     return s = Math.max(0, s), await this.state.count.set(s), s;
   }
 }
-class Ai {
+class Ti {
   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, T(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 || [];
@@ -7205,8 +7154,8 @@ class Ai {
     return a;
   }
 }
-const Si = [Ti, Ai];
-class Ei {
+const Ai = [ki, Ti];
+class Si {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, T(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), T(!(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 : (T(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
       ...this.args.dataDeps || {},
@@ -7218,7 +7167,7 @@ class Ei {
     });
   }
   static {
-    this.computationType = kt;
+    this.computationType = Tt;
   }
   static {
     this.contextType = ["entity", "relation"];
@@ -7314,7 +7263,7 @@ class Ei {
     return r;
   }
 }
-const Ii = [Ei];
+const Ei = [Si];
 class M {
   constructor(t) {
     this.node = t;
@@ -7413,13 +7362,13 @@ class M {
     }
   }
   gt(t) {
-    return new wt(this, ">", t);
+    return new Nt(this, ">", t);
   }
   lt(t) {
-    return new wt(this, "<", t);
+    return new Nt(this, "<", t);
   }
   eq(t) {
-    return new Gt(this, t);
+    return new Xt(this, t);
   }
   getVariables() {
     const t = /* @__PURE__ */ new Set();
@@ -7516,7 +7465,7 @@ class M {
     }
   }
 }
-class wt {
+class Nt {
   constructor(t, e, i) {
     this.left = t, this.operator = e, this.right = i;
   }
@@ -7551,7 +7500,7 @@ class wt {
     }
   }
 }
-class Gt {
+class Xt {
   constructor(t, e) {
     this.left = t, this.right = e;
   }
@@ -7586,7 +7535,7 @@ class Gt {
     }
   }
 }
-class Ci {
+class Ii {
   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;
   }
@@ -7611,14 +7560,14 @@ class Ci {
     let r, s;
     if (e instanceof M)
       r = e.evaluate({ now: i }), s = i + this.nextRecomputeTime(i, t);
-    else if (e instanceof wt || e instanceof Gt)
+    else if (e instanceof Nt || e instanceof Xt)
       r = e.evaluate({ now: i }), s = e.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(i), await this.state.nextRecomputeTime.set(s), r;
   }
 }
-class xi {
+class Ci {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !1, this.dataDeps = {
       _current: {
@@ -7649,15 +7598,15 @@ class xi {
     let s, a;
     if (i instanceof M)
       s = i.evaluate({ now: r }), a = r + this.nextRecomputeTime(r, t);
-    else if (i instanceof wt || i instanceof Gt)
+    else if (i instanceof Nt || i instanceof Xt)
       s = i.evaluate({ now: r }), a = i.solve();
     else
       throw new Error("Invalid result type");
     return await this.state.lastRecomputeTime.set(e, r), await this.state.nextRecomputeTime.set(e, a), s;
   }
 }
-const Mi = [Ci, xi];
-class Pi {
+const xi = [Ii, Ci];
+class Mi {
   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");
@@ -7718,7 +7667,7 @@ class Pi {
     return s;
   }
 }
-class $i {
+class Pi {
   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), T(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, T(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 || [];
@@ -7807,7 +7756,7 @@ class $i {
     return a;
   }
 }
-const Oi = [Pi, $i];
+const $i = [Mi, Pi];
 class Fi {
   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)
@@ -7881,7 +7830,7 @@ class Fi {
     return await this.state.sum.set(a), await this.state.count.set(s), s > 0 ? a / s : 0;
   }
 }
-class Di {
+class Oi {
   constructor(t, e, i) {
     this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, T(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 || [];
@@ -7965,8 +7914,8 @@ class Di {
     return await this.state.count.set(e.record, a), a > 0 ? o / a : 0;
   }
 }
-const Vi = [Fi, Di];
-class At {
+const Di = [Fi, Oi];
+class St {
   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) {
@@ -8010,7 +7959,7 @@ class At {
     }));
   }
   static {
-    this.computationType = Kt;
+    this.computationType = Gt;
   }
   createState() {
     if (this.createStateCallback) {
@@ -8037,22 +7986,22 @@ class At {
     return S.skip();
   }
 }
-class Qi extends At {
+class Vi extends St {
   static {
     this.contextType = "global";
   }
 }
-class Li extends At {
+class Qi extends St {
   static {
     this.contextType = "entity";
   }
 }
-class qi extends At {
+class Li extends St {
   static {
     this.contextType = "relation";
   }
 }
-class Bi extends At {
+class qi extends St {
   static {
     this.contextType = "property";
   }
@@ -8067,11 +8016,11 @@ If you want to use aggregated data from all records in the entity/relation, you
     super(t, e, i);
   }
 }
-const _i = [
+const Bi = [
+  Vi,
   Qi,
   Li,
-  qi,
-  Bi
+  qi
 ];
 class W extends Error {
   constructor(t, e = {}) {
@@ -8190,7 +8139,7 @@ Stack trace:`, r.stack.split(`
     return null;
   }
 }
-var F = /* @__PURE__ */ ((u) => (u.LOW = "low", u.MEDIUM = "medium", u.HIGH = "high", u.CRITICAL = "critical", u))(F || {}), H = /* @__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))(H || {});
+var O = /* @__PURE__ */ ((u) => (u.LOW = "low", u.MEDIUM = "medium", u.HIGH = "high", u.CRITICAL = "critical", u))(O || {}), H = /* @__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))(H || {});
 class z extends W {
   constructor(t, e = {}) {
     super(t, {
@@ -8204,7 +8153,7 @@ class z extends W {
         ...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 || F.HIGH;
+    }), this.interactionName = e.interactionName, this.userId = e.userId, this.payload = e.payload, this.executionPhase = e.executionPhase, this.severity = e.severity || O.HIGH;
   }
 }
 class se extends W {
@@ -8220,7 +8169,7 @@ class se extends W {
         ...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 || F.MEDIUM;
+    }), this.activityName = e.activityName, this.activityId = e.activityId, this.activityInstanceId = e.activityInstanceId, this.currentState = e.currentState, this.severity = e.severity || O.MEDIUM;
   }
 }
 class V extends W {
@@ -8236,14 +8185,14 @@ class V extends W {
         ...e.context
       },
       causedBy: e.causedBy
-    }), this.handleName = e.handleName, this.computationName = e.computationName, this.dataContext = e.dataContext, this.computationPhase = e.computationPhase, this.severity = e.severity || F.MEDIUM;
+    }), this.handleName = e.handleName, this.computationName = e.computationName, this.dataContext = e.dataContext, this.computationPhase = e.computationPhase, this.severity = e.severity || O.MEDIUM;
   }
 }
 class ae extends V {
   constructor(t, e = {}) {
     super(t, {
       ...e,
-      severity: F.HIGH,
+      severity: O.HIGH,
       context: {
         errorType: "ComputationStateError",
         stateKey: e.stateKey,
@@ -8258,7 +8207,7 @@ class J extends V {
   constructor(t, e = {}) {
     super(t, {
       ...e,
-      severity: F.MEDIUM,
+      severity: O.MEDIUM,
       context: {
         errorType: "ComputationDataDepError",
         depName: e.depName,
@@ -8269,7 +8218,7 @@ class J extends V {
     }), this.depName = e.depName, this.depType = e.depType, this.missingData = e.missingData, this.invalidData = e.invalidData;
   }
 }
-class It extends W {
+class Ct extends W {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "SchedulerError",
@@ -8280,10 +8229,10 @@ class It extends W {
         ...e.context
       },
       causedBy: e.causedBy
-    }), this.schedulingPhase = e.schedulingPhase, this.failedComputations = e.failedComputations, this.severity = F.HIGH;
+    }), this.schedulingPhase = e.schedulingPhase, this.failedComputations = e.failedComputations, this.severity = O.HIGH;
   }
 }
-class Wi extends W {
+class _i extends W {
   constructor(t, e) {
     super(t, {
       errorType: "SideEffectError",
@@ -8296,10 +8245,10 @@ class Wi extends W {
         ...e.context
       },
       causedBy: e.causedBy
-    }), this.sideEffectName = e.sideEffectName, this.recordName = e.recordName, this.mutationType = e.mutationType, this.severity = F.MEDIUM;
+    }), this.sideEffectName = e.sideEffectName, this.recordName = e.recordName, this.mutationType = e.mutationType, this.severity = O.MEDIUM;
   }
 }
-class O extends W {
+class F extends W {
   constructor(t, e) {
     super(t, {
       errorType: e.context?.errorType || "ConditionError",
@@ -8312,16 +8261,16 @@ class O extends W {
         ...e.context
       },
       causedBy: e.causedBy
-    }), this.checkType = e.checkType, this.fieldName = e.fieldName, this.payload = e.payload, this.evaluationError = e.evaluationError, this.error = e.evaluationError, this.type = e.type || t, this.severity = e.severity || F.HIGH;
+    }), this.checkType = e.checkType, this.fieldName = e.fieldName, this.payload = e.payload, this.evaluationError = e.evaluationError, this.error = e.evaluationError, this.type = e.type || t, this.severity = e.severity || O.HIGH;
   }
   /**
    * Helper factory methods for common condition error scenarios
    */
   static userCheckFailed(t, e) {
-    return new O("User check failed", {
+    return new F("User check failed", {
       checkType: "user",
       evaluationError: t,
-      severity: F.HIGH,
+      severity: O.HIGH,
       context: e,
       type: "check user failed"
       // For backward compatibility
@@ -8329,21 +8278,21 @@ class O extends W {
   }
   static payloadValidationFailed(t, e, i, r) {
     const s = `${t} ${e}`;
-    return new O(`Payload validation failed for field '${t}': ${e}`, {
+    return new F(`Payload validation failed for field '${t}': ${e}`, {
       checkType: "payload",
       fieldName: t,
       payload: i,
       evaluationError: r,
-      severity: F.MEDIUM,
+      severity: O.MEDIUM,
       type: s
       // For backward compatibility
     });
   }
   static conditionCheckFailed(t, e) {
-    return new O(`Condition check failed: ${t.data.name}`, {
+    return new F(`Condition check failed: ${t.data.name}`, {
       checkType: "condition",
       evaluationError: t,
-      severity: F.HIGH,
+      severity: O.HIGH,
       context: e,
       type: "condition check failed"
       // For backward compatibility
@@ -8351,31 +8300,31 @@ class O extends W {
   }
   static attributiveCheckFailed(t, e, i, r) {
     const s = `${t} ${e}`;
-    return new O(`Attributive check failed for field '${t}': ${e}`, {
+    return new F(`Attributive check failed for field '${t}': ${e}`, {
       checkType: "attributive",
       fieldName: t,
       payload: i,
       evaluationError: r,
-      severity: F.MEDIUM,
+      severity: O.MEDIUM,
       type: s
       // For backward compatibility
     });
   }
   static conceptCheckFailed(t, e) {
-    return new O(`Concept check failed for field '${t}'`, {
+    return new F(`Concept check failed for field '${t}'`, {
       checkType: "concept",
       fieldName: t,
       evaluationError: e,
-      severity: F.MEDIUM,
+      severity: O.MEDIUM,
       type: `${t} check concept failed`
       // For backward compatibility
     });
   }
 }
-const Ct = "_ASYNC_TASK_";
-class Ji {
+const xt = "_ASYNC_TASK_";
+class Wi {
   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 li(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 ci(this.controller, this), this.buildComputationHandleMap(s);
     const a = [];
     r.forEach((o) => {
       o.computation && a.push({ dataContext: { type: "global", id: o }, args: o.computation });
@@ -8689,7 +8638,7 @@ class Ji {
           }
       }
     } catch (i) {
-      throw i instanceof V ? i : new It("Unexpected error in dirty records computation", {
+      throw i instanceof V ? i : new Ct("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))
@@ -8699,8 +8648,8 @@ class Ji {
   getAsyncTaskRecordKey(t) {
     if (t.dataContext.type === "property") {
       const e = t.dataContext;
-      return `${Ct}_${e.host.name}_${e.id.name}`;
-    } else return t.dataContext.type === "global" ? `${Ct}_${t.dataContext.id.name}` : `${Ct}_${t.dataContext.type}_${t.dataContext.id?.name}`;
+      return `${xt}_${e.host.name}_${e.id.name}`;
+    } else return t.dataContext.type === "global" ? `${xt}_${t.dataContext.id.name}` : `${xt}_${t.dataContext.type}_${t.dataContext.id?.name}`;
   }
   async createAsyncTask(t, e, i, r) {
     if (t.dataContext.type === "property")
@@ -8798,7 +8747,7 @@ class Ji {
               dataContext: t.dataContext,
               computationPhase: "type-validation"
             });
-          if (s instanceof be) {
+          if (s instanceof ge) {
             const o = t;
             if (!o.compute)
               throw new V("compute must be defined for computation when incrementalCompute returns ComputationResultFullRecompute", {
@@ -8819,9 +8768,9 @@ class Ji {
           causedBy: o instanceof Error ? o : new Error(String(o))
         });
       }
-      if (s instanceof Rt)
+      if (s instanceof wt)
         return;
-      if (s instanceof Re)
+      if (s instanceof be)
         try {
           return await this.createAsyncTask(t, s.args, i);
         } catch (o) {
@@ -8834,7 +8783,7 @@ class Ji {
           });
         }
       try {
-        const o = s instanceof we ? await t.asyncReturn(s.result, s.args) : s;
+        const o = s instanceof Re ? 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", {
@@ -8917,14 +8866,14 @@ class Ji {
     try {
       this.addMutationPropertyComputationDefaultValueListeners(), this.addMutationComputationListeners(), t && (await this.setupGlobalBoundStateDefaultValues(), await this.setupGlobalComputationDefaultValue(), await this.setupDictDefaultValue());
     } catch (e) {
-      throw e instanceof It ? e : new It("Unexpected error during scheduler setup", {
+      throw e instanceof Ct ? e : new Ct("Unexpected error during scheduler setup", {
         schedulingPhase: "top-level-setup",
         causedBy: e instanceof Error ? e : new Error(String(e))
       });
     }
   }
 }
-class ve {
+class Ne {
   constructor(t, e, i) {
     this.interaction = t, this.controller = e, this.activitySeqCall = i, this.system = e.system;
   }
@@ -8952,13 +8901,13 @@ class ve {
   async checkUser(t, e, i) {
     let r;
     if (!this.interaction.userAttributives) return !0;
-    const s = Nt.is(this.interaction.userAttributives) ? R.fromValue(
+    const s = vt.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 O.userCheckFailed(r);
+    throw F.userCheckFailed(r);
   }
   // 用来check attributive 形容的后面的  target 到底是不是那个概念的实例。
   async checkConcept(t, e, i, r = []) {
@@ -8978,7 +8927,7 @@ class ve {
     }
     if (this.isConceptAlias(e)) {
       const s = [];
-      return await ui(e.for, async (o) => {
+      return await li(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 };
@@ -9006,25 +8955,25 @@ class ve {
         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 O.payloadValidationFailed(s.name, "missing", e);
+        throw F.payloadValidationFailed(s.name, "missing", e);
       const a = e[s.name];
       if (a === void 0) return;
       if (s.isCollection && !Array.isArray(a))
-        throw O.payloadValidationFailed(s.name, "data is not array", a);
+        throw F.payloadValidationFailed(s.name, "data is not array", a);
       if (s.isCollection) {
         if (s.isRef && !a.every((o) => !!o.id))
-          throw O.payloadValidationFailed(s.name, "data not every is ref", a);
+          throw F.payloadValidationFailed(s.name, "data not every is ref", a);
       } else if (s.isRef && !a.id)
-        throw O.payloadValidationFailed(s.name, "data is not a ref", a);
+        throw F.payloadValidationFailed(s.name, "data is not a ref", a);
       if (s.base)
         if (s.isCollection) {
-          const o = await di(a, (n) => this.checkConcept(n, s.base));
+          const o = await ui(a, (n) => this.checkConcept(n, s.base));
           if (o !== !0)
-            throw O.conceptCheckFailed(s.name, o);
+            throw F.conceptCheckFailed(s.name, o);
         } else {
           const o = await this.checkConcept(a, s.base);
           if (o !== !0)
-            throw O.conceptCheckFailed(s.name, o);
+            throw F.conceptCheckFailed(s.name, o);
         }
       if (s.isRef) {
         const o = s.isCollection ? m.atom({
@@ -9040,7 +8989,7 @@ class ve {
   }
   async checkCondition(t) {
     if (this.interaction.conditions) {
-      const e = Tt.is(this.interaction.conditions) ? new R(this.interaction.conditions.content) : R.atom(this.interaction.conditions), i = async (s) => {
+      const e = At.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;
@@ -9056,7 +9005,7 @@ class ve {
         return !0;
       }, r = await e.evaluateAsync(i);
       if (r !== !0)
-        throw O.conditionCheckFailed(r);
+        throw F.conditionCheckFailed(r);
     }
   }
   // CAUTION sideEffect 是并行的。如果要串行，用户应该自己写在一个里面
@@ -9074,7 +9023,7 @@ class ve {
       T(!i.sideEffects[o], `sideEffect ${o} already exists`), i.sideEffects[o] = { result: n, error: c };
   }
   isGetInteraction() {
-    return this.interaction.action === Ve;
+    return this.interaction.action === De;
   }
   async saveEvent(t) {
     return await this.controller.activityManager.saveEvent(t);
@@ -9082,10 +9031,10 @@ class ve {
   async retrieveData(t) {
     let e;
     if (I.is(this.interaction.data) || P.is(this.interaction.data)) {
-      const i = this.interaction.data.name, r = Object.fromEntries(
-        this.interaction.query?.items?.map((p) => [p.name, p.value]) || []
-      ), { match: s, modifier: a, attributeQuery: o } = r, n = { ...t.query?.modifier || {}, ...a || {} }, c = t.query?.attributeQuery || [], l = typeof s == "function" ? await s.call(this.controller, t) : s, d = l instanceof R ? l : l ? R.atom(l) : void 0, h = R.and(d, t.query?.match);
-      e = await this.system.storage.find(i, h, n, c);
+      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 = n instanceof R ? n : n ? R.atom(n) : void 0, l = R.and(c, t.query?.match);
+      e = await this.system.storage.find(i, l, a, o);
     } else
       T(!1, `unknown data type ${this.interaction.data}`);
     return e;
@@ -9222,7 +9171,7 @@ class Y {
     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 ve(o, this.controller, this);
+      const c = new Ne(o, this.controller, this);
       this.uuidToInteractionCall.set(o.uuid, c), o.name && this.interactionCallByName.set(o.name, c);
     }
     for (let o of t.gateways) {
@@ -9338,7 +9287,7 @@ class Y {
     }), await this.setActivity(t, { refs: r });
   }
 }
-class Hi extends $ {
+class Ji extends $ {
   onChange(t, e) {
     if (this.graph.isStartNode(t)) {
       if (e)
@@ -9349,25 +9298,25 @@ class Hi extends $ {
     }
   }
 }
-$.GroupStateNodeType.set("any", Hi);
-class ji extends $ {
+$.GroupStateNodeType.set("any", Ji);
+class Hi extends $ {
   onChange(t, e) {
     this.isGroupCompleted() && this.complete();
   }
 }
-$.GroupStateNodeType.set("every", ji);
-class Ui extends $ {
+$.GroupStateNodeType.set("every", Hi);
+class ji extends $ {
   onChange(t, e) {
     this.graph.isEndNode(t) && this.complete();
   }
 }
-$.GroupStateNodeType.set("race", Ui);
-class Ki extends $ {
+$.GroupStateNodeType.set("race", ji);
+class Ui extends $ {
   // 可以根据 group 上的具体配置逻辑，来动态决定。
 }
-$.GroupStateNodeType.set("program", Ki);
-const ne = new le(), $t = "_Interaction_", yt = "_Activity_", ke = I.create({
-  name: $t,
+$.GroupStateNodeType.set("program", Ui);
+const ne = new le(), Ft = "_Interaction_", gt = "_Activity_", ve = I.create({
+  name: Ft,
   properties: [
     v.create({
       name: "interactionId",
@@ -9395,8 +9344,8 @@ const ne = new le(), $t = "_Interaction_", yt = "_Activity_", ke = I.create({
       collection: !1
     })
   ]
-}), Te = I.create({
-  name: yt,
+}), ke = I.create({
+  name: gt,
   properties: [
     v.create({
       name: "name",
@@ -9419,21 +9368,21 @@ const ne = new le(), $t = "_Interaction_", yt = "_Activity_", ke = I.create({
       collection: !1
     })
   ]
-}), Gi = P.create({
+}), Ki = P.create({
   name: "activityInteraction",
-  source: Te,
+  source: ke,
   sourceProperty: "interaction",
-  target: ke,
+  target: ve,
   targetProperty: "activity",
   type: "1:n"
 });
-class Xi {
+class Gi {
   constructor(t, e, i) {
-    this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.controller.entities.push(Te, ke), this.controller.relations.push(Gi), e.forEach((r) => {
+    this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.controller.entities.push(ke, ve), this.controller.relations.push(Ki), e.forEach((r) => {
       const s = new Y(r, t);
       this.activityCalls.set(r.uuid, s), r.name && (T(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
     }), i.forEach((r) => {
-      const s = new ve(r, t);
+      const s = new Ne(r, t);
       this.interactionCalls.set(r.uuid, s), r.name && (T(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
     });
   }
@@ -9520,7 +9469,7 @@ class Xi {
     }
   }
   async createActivity(t) {
-    return this.controller.system.storage.create(yt, {
+    return this.controller.system.storage.create(gt, {
       ...t,
       state: t.state,
       refs: t.refs
@@ -9530,20 +9479,20 @@ class Xi {
     const i = {
       ...e
     };
-    return delete i.state, delete i.refs, e.state && (i.state = e.state), e.refs && (i.refs = e.refs), this.controller.system.storage.update(yt, t, i);
+    return delete i.state, delete i.refs, e.state && (i.state = e.state), e.refs && (i.refs = e.refs), this.controller.system.storage.update(gt, t, i);
   }
   async getActivity(t) {
-    return (await this.controller.system.storage.find(yt, t, void 0, ["*"])).map((e) => ({
+    return (await this.controller.system.storage.find(gt, t, void 0, ["*"])).map((e) => ({
       ...e,
       state: e.state,
       refs: e.refs
     }));
   }
   async saveEvent(t) {
-    return this.controller.system.storage.create($t, t);
+    return this.controller.system.storage.create(Ft, t);
   }
   async getEvent(t) {
-    return (await this.controller.system.storage.find($t, t, void 0, ["*"])).map((e) => ({
+    return (await this.controller.system.storage.find(Ft, t, void 0, ["*"])).map((e) => ({
       ...e
     }));
   }
@@ -9560,24 +9509,24 @@ class Xi {
     return this.interactionCallsByName.get(t);
   }
 }
-const Xt = new le();
-function zi() {
-  return Xt.getStore()?.effects;
+const zt = new le();
+function Xi() {
+  return zt.getStore()?.effects;
 }
 function ce(u) {
-  const t = Xt.getStore();
+  const t = zt.getStore();
   t?.effects && t.effects.push(...u);
 }
-const Ar = "User";
-class Ae {
+const Tr = "User";
+class Te {
   constructor(t) {
     this.name = t.name, this.record = t.record, this.content = t.content;
   }
   static create(t) {
-    return new Ae(t);
+    return new Te(t);
   }
 }
-const Ot = "_isDeleted_", Sr = {
+const Ot = "_isDeleted_", Ar = {
   create() {
     return v.create({
       name: Ot,
@@ -9585,7 +9534,7 @@ const Ot = "_isDeleted_", Sr = {
     });
   }
 };
-class Er {
+class Sr {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
       BoolExp: R,
@@ -9604,21 +9553,21 @@ class Er {
       forceThrowInteractionError: d = !1
       // 会 catch 住 error，并在 result 中返回。
     } = t;
-    this.system = e, this.ignorePermission = l, this.forceThrowInteractionError = d, this.entities = [...i], this.relations = [...r], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new Xi(this, s, a);
+    this.system = e, this.ignorePermission = l, this.forceThrowInteractionError = d, this.entities = [...i], this.relations = [...r], this.activities = [...s], this.interactions = [...a], this.dict = [...o], this.recordMutationSideEffects = [...n], this.activityManager = new Gi(this, s, a);
     const h = [
-      ...Si,
-      ...Ii,
-      ...ki,
-      ...wi,
-      ...gi,
-      ...Oi,
-      ...Vi,
-      ...Mi,
-      ...fi,
-      ..._i,
+      ...Ai,
+      ...Ei,
+      ...vi,
+      ...Ri,
+      ...yi,
+      ...$i,
+      ...Di,
+      ...xi,
+      ...pi,
+      ...Bi,
       ...c
     ];
-    this.scheduler = new Ji(this, this.entities, this.relations, this.dict, h), n.forEach((p) => {
+    this.scheduler = new Wi(this, this.entities, this.relations, this.dict, h), n.forEach((p) => {
       let y = this.recordNameToSideEffects.get(p.record.name);
       y || this.recordNameToSideEffects.set(p.record.name, y = /* @__PURE__ */ new Set()), y.add(p);
     });
@@ -9638,7 +9587,7 @@ class Er {
     }
   }
   async applyResult(t, e, i) {
-    if (!(e instanceof Rt)) {
+    if (!(e instanceof wt)) {
       if (t.type === "global")
         return this.system.storage.dict.set(t.id.name, e);
       if (t.type === "entity") {
@@ -9662,7 +9611,7 @@ class Er {
     }
   }
   async applyResultPatch(t, e, i) {
-    if (e instanceof Rt || e === void 0) return;
+    if (e instanceof wt || e === void 0) return;
     const r = Array.isArray(e) ? e : [e];
     for (const s of r) {
       if (t.type === "global")
@@ -9686,7 +9635,7 @@ class Er {
   }
   async callInteraction(t, e, i, r) {
     try {
-      const s = { effects: [] }, a = await Xt.run(s, async () => i ? await this.activityManager.callActivityInteraction(i, t, r, e) : await this.activityManager.callInteraction(t, e));
+      const s = { effects: [] }, a = await zt.run(s, async () => i ? await this.activityManager.callActivityInteraction(i, t, r, e) : await this.activityManager.callInteraction(t, e));
       if (a.effects = s.effects, a.error && this.forceThrowInteractionError)
         throw a.error;
       return await this.runRecordChangeSideEffects(a, this.system.logger), a;
@@ -9716,7 +9665,7 @@ class Er {
               result: await a.content.call(this, r)
             };
           } catch (o) {
-            const n = new Wi(
+            const n = new _i(
               `Side effect '${a.name}' failed for ${r.type} on ${r.recordName}`,
               {
                 sideEffectName: a.name,
@@ -9742,13 +9691,13 @@ class Er {
     this.callbacks.has(t) || this.callbacks.set(t, /* @__PURE__ */ new Set()), this.callbacks.get(t).add(e);
   }
 }
-function Yi(u) {
+function zi(u) {
   return encodeURI(JSON.stringify(u));
 }
-function Zi(u) {
+function Yi(u) {
   return u === void 0 ? void 0 : JSON.parse(decodeURI(u));
 }
-class tr {
+class Zi {
   constructor(t) {
     this.db = t, this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
@@ -9773,20 +9722,20 @@ class tr {
   // 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(X, r, void 0, ["value"]))?.value;
-    return s === void 0 ? i : Zi(s);
+    return s === void 0 ? i : Yi(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(X, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [X, s, { concept: t, key: e.toString(), value: Yi(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [X, { concept: t, key: e.toString(), value: encodeURI(JSON.stringify(i)) }], r);
+    return await this.queryHandle.findOne(X, s, void 0, ["value"]) ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [X, s, { concept: t, key: e.toString(), value: zi(i) }], r) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [X, { 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 oi(
+    const r = new ai(
       t,
       e,
       this.db
     );
-    i && await r.createTables(), this.queryHandle = new je(new Ue(r.map), this.db), this.map = r.map;
+    i && await r.createTables(), this.queryHandle = new He(new je(r.map), this.db), this.map = r.map;
   }
   findOne(...t) {
     return this.queryHandle.findOne(...t);
@@ -9806,7 +9755,7 @@ class tr {
   async callWithEvents(t, e, i = []) {
     const r = [], s = await t(...e, r), a = await this.dispatch(r);
     i.push(...r, ...a);
-    const o = zi();
+    const o = Xi();
     return o && r.length > 0 && ce(r), o && a.length > 0 && ce(a), s;
   }
   findRelationByName(...t) {
@@ -9845,8 +9794,8 @@ class tr {
     return this.db.close();
   }
 }
-var er = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(er || {});
-class zt {
+var tr = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(tr || {});
+class Yt {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9857,11 +9806,11 @@ class zt {
     this.level >= 0 && console.error({ type: t, name: e, sql: i, params: r, error: s });
   }
   child() {
-    return new zt(this.level);
+    return new Yt(this.level);
   }
 }
-var ir = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(ir || {});
-class Yt {
+var er = /* @__PURE__ */ ((u) => (u[u.MUTE = -1] = "MUTE", u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u[u.DEBUG = 2] = "DEBUG", u))(er || {});
+class Zt {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9875,16 +9824,16 @@ class Yt {
     this.level >= 2 && console.debug(`[DEBUG] ${t}: ${e}`, i);
   }
   child(t) {
-    return new Yt(this.level);
+    return new Zt(this.level);
   }
 }
-const Ir = new zt(), rr = new Yt();
-class Cr {
-  constructor(t, e = rr) {
-    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new tr(t);
+const Er = new Yt(), ir = new Zt();
+class Ir {
+  constructor(t, e = ir) {
+    this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new Zi(t);
   }
   setup(t, e, i, r = !1) {
-    const s = new ye(t, e), { entities: a, relations: o } = s.getAll();
+    const s = new me(t, e), { entities: a, relations: o } = s.getAll();
     return i.forEach(({ dataContext: n, state: c }) => {
       Object.entries(c).forEach(([l, d]) => {
         if (d instanceof E) {
@@ -9910,7 +9859,7 @@ class Cr {
         }
       });
     }), this.storage.setup(
-      [...a, ci, ni],
+      [...a, ni, oi],
       o,
       r
     );
@@ -9920,172 +9869,171 @@ class Cr {
   }
 }
 export {
-  yt as ACTIVITY_RECORD,
-  qe as ALL_ATTR_SYMBOL,
-  Ct as ASYNC_TASK_RECORD,
-  vt as Action,
-  Lt as Activity,
+  gt as ACTIVITY_RECORD,
+  Le as ALL_ATTR_SYMBOL,
+  xt as ASYNC_TASK_RECORD,
+  kt as Action,
+  qt as Activity,
   Y as ActivityCall,
   Z as ActivityGroup,
-  Gi as ActivityInteractionRelation,
-  Xi as ActivityManager,
-  Te as ActivityStateEntity,
+  Ki as ActivityInteractionRelation,
+  Gi as ActivityManager,
+  ke as ActivityStateEntity,
   ut as Any,
-  ki as AnyHandles,
+  vi as AnyHandles,
   _ as AttributeInfo,
   C as AttributeQuery,
   U as Attributive,
-  Nt as Attributives,
+  vt as Attributives,
   ct as Average,
-  Vi as AverageHandles,
-  dr as BaseKlass,
+  Di as AverageHandles,
+  ur as BaseKlass,
   it as BoolAtomData,
   R as BoolExp,
   rt as BoolExpressionData,
   J as ComputationDataDepError,
   V as ComputationError,
   S as ComputationResult,
-  Re as ComputationResultAsync,
-  be as ComputationResultFullRecompute,
-  we as ComputationResultResolved,
-  Rt as ComputationResultSkip,
+  be as ComputationResultAsync,
+  ge as ComputationResultFullRecompute,
+  Re as ComputationResultResolved,
+  wt as ComputationResultSkip,
   ae as ComputationStateError,
-  qt as Condition,
-  O as ConditionError,
-  Tt as Conditions,
-  Er as Controller,
+  Bt as Condition,
+  F as ConditionError,
+  At as Conditions,
+  Sr as Controller,
   ot as Count,
-  Si as CountHandles,
-  Kt as Custom,
-  _i as CustomHandles,
-  zt as DBConsoleLogger,
-  er as DBLogLevel,
-  oi as DBSetup,
-  Tr as DELETED_STATE,
+  Ai as CountHandles,
+  Gt as Custom,
+  Bi as CustomHandles,
+  Yt as DBConsoleLogger,
+  tr as DBLogLevel,
+  ai as DBSetup,
+  kr as DELETED_STATE,
   q as DICTIONARY_RECORD,
-  Bt as DataAttributive,
-  Ut as DataAttributives,
-  Vt as Dictionary,
-  ci as DictionaryEntity,
+  _t as DataAttributive,
+  Kt as DataAttributives,
+  fe as DataPolicy,
+  Qt as Dictionary,
+  ni as DictionaryEntity,
   I as Entity,
-  Li as EntityCustomHandle,
-  je as EntityQueryHandle,
-  Ue as EntityToTableMap,
-  Gt as Equation,
-  _t as Event,
+  Qi as EntityCustomHandle,
+  He as EntityQueryHandle,
+  je as EntityToTableMap,
+  Xt as Equation,
+  Wt as Event,
   lt as Every,
-  wi as EveryHandles,
+  Ri as EveryHandles,
   M as Expression,
   tt as Gateway,
-  Ve as GetAction,
-  Ni as GlobalAnyHandle,
+  De as GetAction,
+  wi as GlobalAnyHandle,
   Fi as GlobalAverageHandle,
   B as GlobalBoundState,
-  Ti as GlobalCountHandle,
-  Qi as GlobalCustomHandle,
-  bi as GlobalEveryHandle,
-  Ci as GlobalRealTimeComputation,
-  hi as GlobalStateMachineHandle,
-  Pi as GlobalSumHandle,
-  mi as GlobalWeightedSummationHandle,
+  ki as GlobalCountHandle,
+  Vi as GlobalCustomHandle,
+  gi as GlobalEveryHandle,
+  Ii as GlobalRealTimeComputation,
+  di as GlobalStateMachineHandle,
+  Mi as GlobalSumHandle,
+  fi as GlobalWeightedSummationHandle,
   Ot as HARD_DELETION_PROPERTY_NAME,
-  Sr as HardDeletionProperty,
+  Ar as HardDeletionProperty,
   ie as ID_ATTR,
-  $t as INTERACTION_RECORD,
-  wt as Inequality,
-  Qt as Interaction,
-  ve as InteractionCall,
-  ke as InteractionEventEntity,
-  Ft as KlassByName,
+  Ft as INTERACTION_RECORD,
+  Nt as Inequality,
+  Lt as Interaction,
+  Ne as InteractionCall,
+  ve as InteractionEventEntity,
+  Dt as KlassByName,
   f as LINK_SYMBOL,
-  bt as LinkInfo,
+  Rt as LinkInfo,
   m as MatchExp,
-  Le as Modifier,
-  Cr as MonoSystem,
-  kr as NON_DELETED_STATE,
-  vr as NON_EXIST_STATE,
+  Qe as Modifier,
+  Ir as MonoSystem,
+  vr as NON_DELETED_STATE,
+  Nr as NON_EXIST_STATE,
   Q as NewRecordData,
-  br as PHASE_AFTER_ALL,
-  gr as PHASE_BEFORE_ALL,
-  Et as PHASE_NORMAL,
-  Ht as Payload,
-  Jt as PayloadItem,
+  gr as PHASE_AFTER_ALL,
+  yr as PHASE_BEFORE_ALL,
+  It as PHASE_NORMAL,
+  jt as Payload,
+  Ht as PayloadItem,
   v as Property,
-  vi as PropertyAnyHandle,
-  Di as PropertyAverageHandle,
-  Ai as PropertyCountHandle,
-  Bi as PropertyCustomHandle,
-  Ri as PropertyEveryHandle,
-  xi as PropertyRealTimeComputation,
-  pi as PropertyStateMachineHandle,
-  $i as PropertySumHandle,
-  Dt as PropertyTypes,
-  yi as PropertyWeightedSummationHandle,
-  me as Query,
-  fe as QueryItem,
-  ge as ROOT_LABEL,
+  Ni as PropertyAnyHandle,
+  Oi as PropertyAverageHandle,
+  Ti as PropertyCountHandle,
+  qi as PropertyCustomHandle,
+  bi as PropertyEveryHandle,
+  Ci as PropertyRealTimeComputation,
+  hi as PropertyStateMachineHandle,
+  Pi as PropertySumHandle,
+  Vt as PropertyTypes,
+  mi as PropertyWeightedSummationHandle,
+  ye as ROOT_LABEL,
   re as ROW_ID_ATTR,
   dt as RealTime,
-  Mi as RealTimeHandles,
+  xi as RealTimeHandles,
   E as RecordBoundState,
   et as RecordInfo,
-  Ae as RecordMutationSideEffect,
+  Te as RecordMutationSideEffect,
   x as RecordQuery,
-  He as RecordQueryAgent,
+  Je as RecordQueryAgent,
   L as RecordQueryTree,
-  Ei as RecordsTransformHandle,
-  gt as RecursiveContext,
-  ye as RefContainer,
+  Si as RecordsTransformHandle,
+  bt as RecursiveContext,
+  me as RefContainer,
   P as Relation,
-  qi as RelationCustomHandle,
+  Li as RelationCustomHandle,
   X as SYSTEM_RECORD,
-  Ji as Scheduler,
-  jt as SideEffect,
+  Wi as Scheduler,
+  Ut as SideEffect,
   st as StateMachine,
-  fi as StateMachineHandles,
+  pi as StateMachineHandles,
   K as StateNode,
-  Wt as StateTransfer,
+  Jt as StateTransfer,
   nt as Summation,
-  Oi as SummationHandles,
-  Yt as SystemConsoleLogger,
-  ni as SystemEntity,
-  ir as SystemLogLevel,
+  $i as SummationHandles,
+  Zt as SystemConsoleLogger,
+  oi as SystemEntity,
+  er as SystemLogLevel,
   he as Transfer,
-  kt as Transform,
-  Ii as TransformHandles,
-  Ar as USER_ENTITY,
+  Tt as Transform,
+  Ei as TransformHandles,
+  Tr as USER_ENTITY,
   at as WeightedSummation,
-  gi as WeightedSummationHandles,
+  yi as WeightedSummationHandles,
   ce as addToCurrentEffects,
   T as assert,
-  Xt as asyncEffectsContext,
+  zt as asyncEffectsContext,
   ne as asyncInteractionContext,
-  mr as boolExpToAttributives,
-  or as clearAllInstances,
-  ur as createClass,
-  xe as createInstances,
-  lr as createInstancesFromString,
-  yr as createUserRoleAttributive,
-  Ir as dbConsoleLogger,
-  ft as deepClone,
-  Nr as everyAsync,
-  di as everyWithErrorAsync,
-  Rr as filterMap,
-  pr as findRootActivity,
+  fr as boolExpToAttributives,
+  ar as clearAllInstances,
+  lr as createClass,
+  Ce as createInstances,
+  cr as createInstancesFromString,
+  mr as createUserRoleAttributive,
+  Er as dbConsoleLogger,
+  mt as deepClone,
+  wr as everyAsync,
+  ui as everyWithErrorAsync,
+  br as filterMap,
+  hr as findRootActivity,
   pe as forEachInteraction,
   k as generateUUID,
-  zi as getCurrentEffects,
-  hr as getInteractions,
-  Ie as indexBy,
+  Xi as getCurrentEffects,
+  dr as getInteractions,
+  Ee as indexBy,
   ue as isObject,
   de as isPlainObject,
-  wr as mapObject,
-  fr as parse,
-  Ce as registerKlass,
-  nr as removeAllInstance,
-  ui as someAsync,
-  cr as stringifyAllInstances,
+  Rr as mapObject,
+  pr as parse,
+  Ie as registerKlass,
+  or as removeAllInstance,
+  li as someAsync,
+  nr as stringifyAllInstances,
   w as stringifyAttribute,
-  rr as systemConsoleLogger
+  ir as systemConsoleLogger
 };
 //# sourceMappingURL=index.js.map