interaqt 0.7.3 → 0.7.4

package/dist/index.js

@@ -17,15 +17,15 @@ 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;
 }
@@ -35,13 +35,13 @@ function or(...u) {
 }
 function nr() {
 }
-const Ft = /* @__PURE__ */ new Map();
+const Dt = /* @__PURE__ */ new Map();
 function Ce(u, t) {
-  t && t.isKlass && t.displayName && Ft.set(u, t);
+  t && t.isKlass && t.displayName && Dt.set(u, t);
 }
 function cr() {
   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(",")}]`;
 }
@@ -52,7 +52,7 @@ function lr(u) {
 function xe(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;
@@ -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 || {});
+var Vt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Vt || {});
 const $e = /^[a-zA-Z0-9_]+$/;
-class Vt {
+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;
   }
@@ -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;
@@ -314,7 +314,7 @@ class v {
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(Dt)
+        options: () => Object.values(Vt)
       },
       collection: {
         type: "boolean",
@@ -553,7 +553,7 @@ 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;
   }
@@ -614,7 +614,7 @@ class Qt {
     };
   }
   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;
@@ -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;
@@ -1179,13 +1179,13 @@ const Fe = {
 function De(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 });
   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)
+  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;
@@ -1585,7 +1585,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 +1607,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 +1639,7 @@ class vt {
     return this.create(e.public, e.options);
   }
 }
-const Ve = vt.create({ name: "get" });
+const Ve = 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 +1694,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 +1716,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 +1811,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 +1849,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 +2442,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 +2475,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 +2585,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 +2636,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 +2675,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 +2699,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 +2731,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 +2759,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 +2793,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 +2804,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 +2831,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 +2862,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 +2885,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;
@@ -2920,16 +2920,16 @@ const Qe = [
   I,
   P,
   v,
-  Qt,
   Lt,
-  U,
   qt,
+  U,
   Bt,
-  vt,
-  tt,
   _t,
-  K,
+  kt,
+  tt,
   Wt,
+  K,
+  Jt,
   st,
   at,
   ot,
@@ -2937,21 +2937,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);
 });
-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 +3014,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;
@@ -3282,7 +3282,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();
@@ -4243,18 +4243,18 @@ class We {
   }
 }
 const ge = ":root";
-class gt {
+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 {
@@ -4327,80 +4327,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)) {
+  async findRecords(t, e = "", i, r = new bt(ge)) {
     if (i || (i = new Je(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 +4422,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 +4463,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 +4473,7 @@ ${b}
               D,
               b,
               s,
-              Zt
+              ft
             )
           );
         }
@@ -5276,7 +5278,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 +5366,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())
@@ -5403,10 +5405,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;
@@ -6255,7 +6257,7 @@ const X = "_System_", q = "_Dictionary_", ie = "id", re = "_rowId", ni = I.creat
       collection: !1
     })
   ]
-}), gr = 0, Et = 1, br = 2;
+}), gr = 0, It = 1, br = 2;
 class li {
   constructor(t, e) {
     this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
@@ -6270,18 +6272,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,7 +6485,7 @@ class li {
 }
 class S {
   static {
-    this.skip = () => new Rt();
+    this.skip = () => new wt();
   }
   static {
     this.resolved = (t, e) => new we(t, e);
@@ -6495,7 +6497,7 @@ class S {
     this.fullRecompute = (t) => new be(t);
   }
 }
-class Rt extends S {
+class wt extends S {
 }
 class be extends S {
   constructor(t) {
@@ -6538,14 +6540,14 @@ 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;
 }
@@ -6562,13 +6564,13 @@ 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) {
@@ -7218,7 +7220,7 @@ class Ei {
     });
   }
   static {
-    this.computationType = kt;
+    this.computationType = Tt;
   }
   static {
     this.contextType = ["entity", "relation"];
@@ -7413,13 +7415,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 +7518,7 @@ class M {
     }
   }
 }
-class wt {
+class Nt {
   constructor(t, e, i) {
     this.left = t, this.operator = e, this.right = i;
   }
@@ -7551,7 +7553,7 @@ class wt {
     }
   }
 }
-class Gt {
+class Xt {
   constructor(t, e) {
     this.left = t, this.right = e;
   }
@@ -7611,7 +7613,7 @@ 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");
@@ -7649,7 +7651,7 @@ 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");
@@ -7966,7 +7968,7 @@ class Di {
   }
 }
 const Vi = [Fi, Di];
-class At {
+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 +8012,7 @@ class At {
     }));
   }
   static {
-    this.computationType = Kt;
+    this.computationType = Gt;
   }
   createState() {
     if (this.createStateCallback) {
@@ -8037,22 +8039,22 @@ class At {
     return S.skip();
   }
 }
-class Qi extends At {
+class Qi extends St {
   static {
     this.contextType = "global";
   }
 }
-class Li extends At {
+class Li extends St {
   static {
     this.contextType = "entity";
   }
 }
-class qi extends At {
+class qi extends St {
   static {
     this.contextType = "relation";
   }
 }
-class Bi extends At {
+class Bi extends St {
   static {
     this.contextType = "property";
   }
@@ -8269,7 +8271,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",
@@ -8372,7 +8374,7 @@ class O extends W {
     });
   }
 }
-const Ct = "_ASYNC_TASK_";
+const xt = "_ASYNC_TASK_";
 class Ji {
   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);
@@ -8689,7 +8691,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 +8701,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")
@@ -8819,7 +8821,7 @@ class Ji {
           causedBy: o instanceof Error ? o : new Error(String(o))
         });
       }
-      if (s instanceof Rt)
+      if (s instanceof wt)
         return;
       if (s instanceof Re)
         try {
@@ -8917,7 +8919,7 @@ 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))
       });
@@ -8952,7 +8954,7 @@ 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
@@ -9040,7 +9042,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;
@@ -9366,8 +9368,8 @@ class Ki extends $ {
   // 可以根据 group 上的具体配置逻辑，来动态决定。
 }
 $.GroupStateNodeType.set("program", Ki);
-const ne = new le(), $t = "_Interaction_", yt = "_Activity_", ke = I.create({
-  name: $t,
+const ne = new le(), Ot = "_Interaction_", gt = "_Activity_", ke = I.create({
+  name: Ot,
   properties: [
     v.create({
       name: "interactionId",
@@ -9396,7 +9398,7 @@ const ne = new le(), $t = "_Interaction_", yt = "_Activity_", ke = I.create({
     })
   ]
 }), Te = I.create({
-  name: yt,
+  name: gt,
   properties: [
     v.create({
       name: "name",
@@ -9520,7 +9522,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 +9532,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(Ot, t);
   }
   async getEvent(t) {
-    return (await this.controller.system.storage.find($t, t, void 0, ["*"])).map((e) => ({
+    return (await this.controller.system.storage.find(Ot, t, void 0, ["*"])).map((e) => ({
       ...e
     }));
   }
@@ -9560,12 +9562,12 @@ class Xi {
     return this.interactionCallsByName.get(t);
   }
 }
-const Xt = new le();
+const zt = new le();
 function zi() {
-  return Xt.getStore()?.effects;
+  return zt.getStore()?.effects;
 }
 function ce(u) {
-  const t = Xt.getStore();
+  const t = zt.getStore();
   t?.effects && t.effects.push(...u);
 }
 const Ar = "User";
@@ -9577,10 +9579,10 @@ class Ae {
     return new Ae(t);
   }
 }
-const Ot = "_isDeleted_", Sr = {
+const Ft = "_isDeleted_", Sr = {
   create() {
     return v.create({
-      name: Ot,
+      name: Ft,
       type: "boolean"
     });
   }
@@ -9638,7 +9640,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") {
@@ -9657,12 +9659,12 @@ class Er {
           await this.system.storage.create(r.id.name, a);
       } else {
         const r = t;
-        r.id.name === Ot && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
+        r.id.name === Ft && e ? await this.system.storage.delete(r.host.name, R.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: e });
       }
     }
   }
   async applyResultPatch(t, e, i) {
-    if (e instanceof 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")
@@ -9680,13 +9682,13 @@ class Er {
         }
       } else {
         const a = t;
-        a.id.name === Ot && s.data ? (T(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
+        a.id.name === Ft && s.data ? (T(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
       }
     }
   }
   async callInteraction(t, e, 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;
@@ -9846,7 +9848,7 @@ class tr {
   }
 }
 var er = /* @__PURE__ */ ((u) => (u[u.ERROR = 0] = "ERROR", u[u.INFO = 1] = "INFO", u))(er || {});
-class zt {
+class Yt {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9857,11 +9859,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 {
+class Zt {
   constructor(t = 0) {
     this.level = t;
   }
@@ -9875,10 +9877,10 @@ 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();
+const Ir = new Yt(), rr = new Zt();
 class Cr {
   constructor(t, e = rr) {
     this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new tr(t);
@@ -9920,11 +9922,11 @@ class Cr {
   }
 }
 export {
-  yt as ACTIVITY_RECORD,
+  gt as ACTIVITY_RECORD,
   qe as ALL_ATTR_SYMBOL,
-  Ct as ASYNC_TASK_RECORD,
-  vt as Action,
-  Lt as Activity,
+  xt as ASYNC_TASK_RECORD,
+  kt as Action,
+  qt as Activity,
   Y as ActivityCall,
   Z as ActivityGroup,
   Gi as ActivityInteractionRelation,
@@ -9935,7 +9937,7 @@ export {
   _ as AttributeInfo,
   C as AttributeQuery,
   U as Attributive,
-  Nt as Attributives,
+  vt as Attributives,
   ct as Average,
   Vi as AverageHandles,
   dr as BaseKlass,
@@ -9948,31 +9950,31 @@ export {
   Re as ComputationResultAsync,
   be as ComputationResultFullRecompute,
   we as ComputationResultResolved,
-  Rt as ComputationResultSkip,
+  wt as ComputationResultSkip,
   ae as ComputationStateError,
-  qt as Condition,
+  Bt as Condition,
   O as ConditionError,
-  Tt as Conditions,
+  At as Conditions,
   Er as Controller,
   ot as Count,
   Si as CountHandles,
-  Kt as Custom,
+  Gt as Custom,
   _i as CustomHandles,
-  zt as DBConsoleLogger,
+  Yt as DBConsoleLogger,
   er as DBLogLevel,
   oi as DBSetup,
   Tr as DELETED_STATE,
   q as DICTIONARY_RECORD,
-  Bt as DataAttributive,
-  Ut as DataAttributives,
-  Vt as Dictionary,
+  _t as DataAttributive,
+  Kt as DataAttributives,
+  Qt as Dictionary,
   ci as DictionaryEntity,
   I as Entity,
   Li as EntityCustomHandle,
   je as EntityQueryHandle,
   Ue as EntityToTableMap,
-  Gt as Equation,
-  _t as Event,
+  Xt as Equation,
+  Wt as Event,
   lt as Every,
   wi as EveryHandles,
   M as Expression,
@@ -9988,17 +9990,17 @@ export {
   hi as GlobalStateMachineHandle,
   Pi as GlobalSumHandle,
   mi as GlobalWeightedSummationHandle,
-  Ot as HARD_DELETION_PROPERTY_NAME,
+  Ft as HARD_DELETION_PROPERTY_NAME,
   Sr as HardDeletionProperty,
   ie as ID_ATTR,
-  $t as INTERACTION_RECORD,
-  wt as Inequality,
-  Qt as Interaction,
+  Ot as INTERACTION_RECORD,
+  Nt as Inequality,
+  Lt as Interaction,
   ve as InteractionCall,
   ke as InteractionEventEntity,
-  Ft as KlassByName,
+  Dt as KlassByName,
   f as LINK_SYMBOL,
-  bt as LinkInfo,
+  Rt as LinkInfo,
   m as MatchExp,
   Le as Modifier,
   Cr as MonoSystem,
@@ -10007,9 +10009,9 @@ export {
   Q as NewRecordData,
   br as PHASE_AFTER_ALL,
   gr as PHASE_BEFORE_ALL,
-  Et as PHASE_NORMAL,
-  Ht as Payload,
-  Jt as PayloadItem,
+  It as PHASE_NORMAL,
+  jt as Payload,
+  Ht as PayloadItem,
   v as Property,
   vi as PropertyAnyHandle,
   Di as PropertyAverageHandle,
@@ -10019,7 +10021,7 @@ export {
   xi as PropertyRealTimeComputation,
   pi as PropertyStateMachineHandle,
   $i as PropertySumHandle,
-  Dt as PropertyTypes,
+  Vt as PropertyTypes,
   yi as PropertyWeightedSummationHandle,
   me as Query,
   fe as QueryItem,
@@ -10034,31 +10036,31 @@ export {
   He as RecordQueryAgent,
   L as RecordQueryTree,
   Ei as RecordsTransformHandle,
-  gt as RecursiveContext,
+  bt as RecursiveContext,
   ye as RefContainer,
   P as Relation,
   qi as RelationCustomHandle,
   X as SYSTEM_RECORD,
   Ji as Scheduler,
-  jt as SideEffect,
+  Ut as SideEffect,
   st as StateMachine,
   fi as StateMachineHandles,
   K as StateNode,
-  Wt as StateTransfer,
+  Jt as StateTransfer,
   nt as Summation,
   Oi as SummationHandles,
-  Yt as SystemConsoleLogger,
+  Zt as SystemConsoleLogger,
   ni as SystemEntity,
   ir as SystemLogLevel,
   he as Transfer,
-  kt as Transform,
+  Tt as Transform,
   Ii as TransformHandles,
   Ar as USER_ENTITY,
   at as WeightedSummation,
   gi as WeightedSummationHandles,
   ce as addToCurrentEffects,
   T as assert,
-  Xt as asyncEffectsContext,
+  zt as asyncEffectsContext,
   ne as asyncInteractionContext,
   mr as boolExpToAttributives,
   or as clearAllInstances,
@@ -10067,7 +10069,7 @@ export {
   lr as createInstancesFromString,
   yr as createUserRoleAttributive,
   Ir as dbConsoleLogger,
-  ft as deepClone,
+  mt as deepClone,
   Nr as everyAsync,
   di as everyWithErrorAsync,
   Rr as filterMap,