interaqt 1.1.0 → 1.1.2

package/dist/index.js

@@ -32,19 +32,17 @@ function pr(...u) {
   for (const t of u)
     t.instances.length = 0;
 }
-function fr() {
-}
 const Ft = /* @__PURE__ */ new Map();
 function ue(u, t) {
   t && t.isKlass && t.displayName && Ft.set(u, t);
 }
-function mr() {
+function fr() {
   const u = [];
   return Array.from(Ft.entries()).forEach(([, t]) => {
     t.instances && Array.isArray(t.instances) && t.stringify && u.push(...t.instances.map((e) => t.stringify(e)));
   }), `[${u.join(",")}]`;
 }
-function yr(u) {
+function mr(u) {
   const t = JSON.parse(u);
   return ke(t);
 }
@@ -60,31 +58,6 @@ function ke(u) {
     t.set(r, o);
   }), t;
 }
-function gr(u) {
-  return console.warn("createClass is deprecated in refactored code"), null;
-}
-class br {
-  static {
-    this.isKlass = !0;
-  }
-  static {
-    this.instances = [];
-  }
-  // 通用的 create 方法实现
-  static createBase(t, e) {
-    if (e.find((r) => r.uuid === t.uuid))
-      throw new Error(`duplicate uuid in options ${t.uuid}, ${t._type}`);
-    return e.push(t), t;
-  }
-  // 通用的 is 方法实现
-  static isBase(t, e) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === e;
-  }
-  // 通用的 check 方法实现
-  static checkBase(t) {
-    return t !== null && typeof t == "object" && typeof t.uuid == "string";
-  }
-}
 let Se = 0;
 function T(u) {
   return u?.uuid || `id_${++Se}`;
@@ -201,9 +174,9 @@ class I {
     return this.create(e.public, e.options);
   }
 }
-var Qt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Qt || {});
+var Vt = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(Vt || {});
 const Ie = /^[a-zA-Z0-9_]+$/;
-class Vt {
+class Qt {
   constructor(t, e) {
     this._type = "Dictionary", this._options = e, this.uuid = T(e), this.name = t.name, this.type = t.type, this.collection = t.collection ?? !1, this.args = t.args, this.defaultValue = t.defaultValue, this.computation = t.computation;
   }
@@ -223,15 +196,14 @@ class Vt {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: t }) => Ie.test(t),
-          length: ({ name: t }) => t.length > 1 && t.length < 5
+          format: ({ name: t }) => Ie.test(t)
         }
       },
       type: {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(Qt))
+        options: Array.from(Object.values(Vt))
       },
       collection: {
         type: "boolean",
@@ -257,7 +229,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;
@@ -316,14 +288,13 @@ class N {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: t }) => xe.test(t),
-          length: ({ name: t }) => t.length > 1 && t.length < 5
+          format: ({ name: t }) => xe.test(t)
         }
       },
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(Qt)
+        options: () => Object.values(Vt)
       },
       collection: {
         type: "boolean",
@@ -379,11 +350,11 @@ class N {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.defaultValue && typeof i.defaultValue == "string" && i.defaultValue.startsWith("func::") && (i.defaultValue = new Function("return " + i.defaultValue.substring(6))()), i.computed && typeof i.computed == "string" && i.computed.startsWith("func::") && (i.computed = new Function("return " + i.computed.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.defaultValue == "string" && r.defaultValue.startsWith("func::") && (i.defaultValue = new Function("return " + r.defaultValue.substring(6))()), typeof r.computed == "string" && r.computed.startsWith("func::") && (i.computed = new Function("return " + r.computed.substring(6))()), this.create(i, e.options);
   }
 }
-class C {
+class M {
   constructor(t, e) {
     if (this._type = "Relation", this._options = e, this.uuid = T(e), t.inputRelations) {
       if (!t.inputRelations || t.inputRelations.length === 0)
@@ -415,7 +386,7 @@ class C {
   // for Merged Relation
   // Getter for name that returns computed name if _name is undefined
   get name() {
-    return this._name !== void 0 ? this._name : C.public.name.computed ? C.public.name.computed(this) : void 0;
+    return this._name !== void 0 ? this._name : M.public.name.computed ? M.public.name.computed(this) : void 0;
   }
   // Setter for name
   set name(t) {
@@ -515,7 +486,7 @@ class C {
     };
   }
   static create(t, e) {
-    const i = new C(t, e);
+    const i = new M(t, e);
     if (this.instances.find((s) => s.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Relation`);
     return this.instances.push(i), i;
@@ -529,7 +500,7 @@ class C {
       properties: t.properties
     };
     t.inputRelations || (e.source = t.source, e.target = t.target);
-    const i = t._name ?? t.name;
+    const i = (t instanceof M, t.name);
     i !== void 0 && (e.name = i), t.computation !== void 0 && (e.computation = t.computation), t.baseRelation !== void 0 && (e.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (e.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (e.inputRelations = t.inputRelations);
     const r = {
       type: "Relation",
@@ -548,8 +519,8 @@ class C {
       properties: t.properties?.map((s) => N.clone(s, e))
     };
     t.inputRelations || (i.source = t.source, i.target = t.target);
-    const r = t._name ?? t.name;
-    return r !== void 0 && (i.name = r), t.computation !== void 0 && (i.computation = t.computation), t.baseRelation !== void 0 && (i.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (i.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (i.inputRelations = t.inputRelations), new C(i, t._options);
+    const r = (t instanceof M, t.name);
+    return r !== void 0 && (i.name = r), t.computation !== void 0 && (i.computation = t.computation), t.baseRelation !== void 0 && (i.baseRelation = t.baseRelation), t.matchExpression !== void 0 && (i.matchExpression = t.matchExpression), t.inputRelations !== void 0 && (i.inputRelations = t.inputRelations), new M(i, t._options);
   }
   static is(t) {
     return t !== null && typeof t == "object" && "_type" in t && t._type === "Relation";
@@ -857,8 +828,8 @@ class nt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class ct {
@@ -926,7 +897,7 @@ class ct {
   }
   static clone(t, e) {
     let i = t.record;
-    return e && (I.is(t.record) ? i = I.clone(t.record, e) : C.is(t.record) && (i = C.clone(t.record, e))), this.create({
+    return e && (I.is(t.record) ? i = I.clone(t.record, e) : M.is(t.record) && (i = M.clone(t.record, e))), this.create({
       record: i,
       direction: t.direction,
       callback: t.callback,
@@ -941,8 +912,8 @@ class ct {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class lt {
@@ -1162,8 +1133,8 @@ class dt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class ht {
@@ -1252,8 +1223,8 @@ class ht {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.callback && typeof i.callback == "string" && i.callback.startsWith("func::") && (i.callback = new Function("return " + i.callback.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.callback == "string" && r.callback.startsWith("func::") && (i.callback = new Function("return " + r.callback.substring(6))()), this.create(i, e.options);
   }
 }
 class Tt {
@@ -1389,7 +1360,7 @@ class pt {
     return t.attributeQuery !== void 0 && (i.attributeQuery = t.attributeQuery), t.dataDeps !== void 0 && (i.dataDeps = t.dataDeps), t.nextRecomputeTime !== void 0 && (i.nextRecomputeTime = t.nextRecomputeTime), this.create(i);
   }
   static is(t) {
-    return t !== null && typeof t == "object" && "_type" in t && t._type === "RealTime";
+    return t !== null && typeof t == "object" && "_type" in t && t._type === "RealTimeValue";
   }
   static check(t) {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
@@ -1457,8 +1428,8 @@ class qt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.handle && typeof i.handle == "string" && i.handle.startsWith("func::") && (i.handle = new Function("return " + i.handle.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.handle == "string" && r.handle.startsWith("func::") && (i.handle = new Function("return " + r.handle.substring(6))()), this.create(i, e.options);
   }
 }
 class ft {
@@ -1640,8 +1611,11 @@ class R {
   isExpression() {
     return this.raw.type === "expression";
   }
+  static isExpressionData(t) {
+    return t !== null && typeof t == "object" && "type" in t && (t.type === "atom" || t.type === "expression");
+  }
   static standardizeData(t) {
-    return t instanceof R ? t.raw : t && typeof t == "object" && t.type === "atom" || t.type === "expression" ? t : { type: "atom", data: t };
+    return t instanceof R ? t.raw : R.isExpressionData(t) ? t : { type: "atom", data: t };
   }
   and(t) {
     return new R({
@@ -1743,7 +1717,7 @@ class R {
 }
 const Me = [
   I,
-  C,
+  M,
   N,
   K,
   Lt,
@@ -1757,7 +1731,7 @@ const Me = [
   Tt,
   pt,
   qt,
-  Vt,
+  Qt,
   ft,
   mt
 ];
@@ -1777,7 +1751,7 @@ class de {
       this.clonedEntities.set(t, e), this.reverseEntityMap.set(e, t);
     }
     for (const t of this.originalRelations) {
-      const e = C.clone(t, !1);
+      const e = M.clone(t, !1);
       this.clonedRelations.set(t, e), this.reverseRelationMap.set(e, t);
     }
     this.updateAllReferences();
@@ -1801,7 +1775,7 @@ class de {
       if (i === t || i.uuid === t.uuid)
         throw new Error(`Relation already exists in container: ${t.name}`);
     this.originalRelations.push(t);
-    const e = C.clone(t, !1);
+    const e = M.clone(t, !1);
     return this.clonedRelations.set(t, e), this.reverseRelationMap.set(e, t), this.updateReferencesInObject(e), e;
   }
   /**
@@ -2280,7 +2254,7 @@ class m {
   constructor(t, e, i, r, s) {
     this.map = e, this.contextRootEntity = r, this.fromRelation = s, b(!i || i instanceof R, `match data is not a BoolExpression instance, you passed: ${this.data}`);
     const a = this.map.getRecordInfo(t);
-    this.entityName = a.resolvedBaseRecordName, this.xToOneQueryTree = new V(this.entityName, this.map);
+    this.entityName = a.resolvedBaseRecordName, this.xToOneQueryTree = new Q(this.entityName, this.map);
     let o = i;
     a.resolvedMatchExpression && (o = i ? a.resolvedMatchExpression.and(i) : a.resolvedMatchExpression), o && (this.data = this.convertFilteredRelation(o), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
@@ -2523,7 +2497,7 @@ class Pe {
    * 用于确保 ORDER BY 中引用的关联字段会触发相应的 JOIN
    */
   get xToOneQueryTree() {
-    const t = new V(this.recordName, this.map);
+    const t = new Q(this.recordName, this.map);
     return Object.keys(this.data?.orderBy || {}).forEach((e) => {
       const i = e.split(".");
       if (i.length === 1) {
@@ -2534,7 +2508,7 @@ class Pe {
     }), t;
   }
 }
-class M {
+class P {
   constructor(t, e, i, r, s, a, o, n, c, l = !1, d, h, p, y) {
     this.recordName = t, this.map = e, this.matchExpression = i, this.attributeQuery = r, this.modifier = s, this.contextRootEntity = a, this.parentRecord = o, this.attributeName = n, this.onlyRelationData = c, this.allowNull = l, this.label = d, this.goto = h, this.exit = p, this.alias = y;
   }
@@ -2544,7 +2518,7 @@ class M {
       key: "id",
       value: ["not", null]
     }), y = p;
-    return l.resolvedMatchExpression && (y = p.and(new m(d, e, l.resolvedMatchExpression))), new M(
+    return l.resolvedMatchExpression && (y = p.and(new m(d, e, l.resolvedMatchExpression))), new P(
       d,
       e,
       y,
@@ -2571,7 +2545,7 @@ class M {
   // CAUTION 特别注意这里的参数，不能让用取用原本的 matchExpression, attributeQuery, modifier 里面的 data 传进来。
   //   因为  data 不能代表一切配置，例如 attributeQuery 里面 还有个 shouldQueryParentLinkData 就是保存在 this 上的。
   derive({ matchExpression: t, attributeQuery: e, modifier: i }) {
-    return new M(
+    return new P(
       this.recordName,
       this.map,
       t || this.matchExpression,
@@ -2588,7 +2562,7 @@ class M {
     );
   }
 }
-class V {
+class Q {
   // 父节点和自己这个几点 link 上的 query
   constructor(t, e, i, r, s, a, o) {
     this.recordName = t, this.map = e, this.parentRecord = i, this.attributeName = r, this.data = s, this.parent = a, this.parentLinkQueryTree = o, this.fields = [], b(!!t, "recordName cannot be empty"), this.fields = s?.fields || [], this.records = s?.records || {}, i && (this.info = this.map.getInfo(this.parentRecord, this.attributeName));
@@ -2598,26 +2572,26 @@ class V {
     if (t.length === 1)
       this.fields.push(e);
     else if (e === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new V(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(i);
     else {
       const r = this.map.getInfo(this.recordName, e);
-      this.records[e] || (this.records[e] = new V(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
+      this.records[e] || (this.records[e] = new Q(r.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(i);
     }
   }
   addRecord(t, e) {
     const [i, ...r] = t;
     if (t.length === 1)
       if (i === f)
-        this.parentLinkQueryTree || (this.parentLinkQueryTree = new V(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
+        this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), e && (this.parentLinkQueryTree = this.parentLinkQueryTree.merge(e));
       else {
-        const s = this.map.getInfo(this.recordName, i), a = e || new V(s.recordName, this.map, this.recordName, i, void 0, this);
+        const s = this.map.getInfo(this.recordName, i), a = e || new Q(s.recordName, this.map, this.recordName, i, void 0, this);
         this.records[i] = this.records[i] ? this.records[i].merge(a) : a;
       }
     else if (i === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new V(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new Q(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(r, e);
     else {
       const s = this.map.getInfo(this.recordName, i);
-      this.records[i] = new V(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
+      this.records[i] = new Q(s.recordName, this.map, this.recordName, i, void 0, this), this.records[i].addRecord(r, e);
     }
   }
   forEachRecords(t) {
@@ -2632,7 +2606,7 @@ class V {
       this.records[a] && t.records[a] ? r[a] = this.records[a].merge(t.records[a]) : this.records[a] ? r[a] = this.records[a] : r[a] = t.records[a];
     });
     let s;
-    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new V(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
+    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new Q(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: r }, this.parent, s);
   }
   getData() {
     const t = {
@@ -2653,7 +2627,7 @@ class x {
       if (l === f) {
         b(!!(this.parentRecord && this.attributeName), `parent record and attribute name cannot be empty when query link data, you passed ${this.parentRecord} ${this.attributeName}`);
         const y = this.map.getInfo(this.parentRecord, this.attributeName);
-        this.parentLinkRecordQuery = M.create(y.linkName, this.map, d, void 0);
+        this.parentLinkRecordQuery = P.create(y.linkName, this.map, d, void 0);
         return;
       }
       if (l === Ce) {
@@ -2671,7 +2645,7 @@ class x {
             matchExpression: Ae.data
           };
         }
-        const g = M.create(p.recordName, this.map, v, void 0, this.recordName, y, h, !1, l);
+        const g = P.create(p.recordName, this.map, v, void 0, this.recordName, y, h, !1, l);
         this.relatedRecords.push(g), p.isXToMany ? this.xToManyRecords.push(g) : p.isXToOne && this.xToOneRecords.push(g);
       } else
         o.add(l);
@@ -2765,7 +2739,7 @@ class x {
     return this.buildXToOneQueryTree();
   }
   buildXToOneQueryTree() {
-    const t = new V(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new Q(this.recordName, this.map, this.parentRecord, this.attributeName);
     if (this.data.forEach((e) => {
       Array.isArray(e) || t.addField([e]);
     }), this.xToOneRecords.forEach((e) => {
@@ -2777,7 +2751,7 @@ class x {
     return t;
   }
   buildFullQueryTree() {
-    const t = new V(this.recordName, this.map, this.parentRecord, this.attributeName);
+    const t = new Q(this.recordName, this.map, this.parentRecord, this.attributeName);
     return this.relatedRecords.forEach((e) => {
       t.addRecord([e.attributeName], e.attributeQuery.fullQueryTree);
     }), t;
@@ -2790,14 +2764,14 @@ function $e(u) {
   const t = [];
   return u.forEach((e) => t.push(...Array.isArray(e) ? e : [e])), t;
 }
-class Q {
+class V {
   constructor(t, e, i, r) {
     this.map = t, this.originalRecordName = e, this.rawData = i, this.info = r, this.mergedLinkTargetNewRecords = [], this.mergedLinkTargetRecordIdRefs = [], this.mergedLinkTargetNullRecords = [], this.combinedNewRecords = [], this.combinedRecordIdRefs = [], this.combinedNullRecords = [], this.differentTableMergedLinkNewRecords = [], this.differentTableMergedLinkRecordIdRefs = [], this.differentTableMergedLinkNullRecords = [], this.isolatedNewRecords = [], this.isolatedRecordIdRefs = [], this.isolatedNullRecords = [], this.entityIdAttributes = [], this.relatedEntitiesData = [], this.valueAttributes = [], this.sameRowEntityIdRefs = [], this.defaultValues = {};
     const s = this.map.getRecordInfo(e);
     this.recordName = s.resolvedBaseRecordName;
     const [a, o, n] = this.map.groupAttributes(this.recordName, i ? Object.keys(i) : []);
     this.relatedEntitiesData = $e(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)
+      (l) => Array.isArray(i[l.attributeName]) ? i[l.attributeName].map((d) => new V(this.map, l.recordName, d, l)) : new V(this.map, l.recordName, i[l.attributeName], l)
     )), this.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
     this.defaultValues = c.valueAttributes.reduce((l, d) => {
@@ -2805,10 +2779,10 @@ class Q {
       return !this.rawData?.hasOwnProperty(d.attributeName) && h.defaultValue && typeof h.defaultValue == "function" && (l[d.attributeName] = h.defaultValue(i, this.originalRecordName)), l;
     }, {}), this.relatedEntitiesData.forEach((l) => {
       l.info.isMergedWithParent() ? l.isNull() ? this.combinedNullRecords.push(l) : l.isRef() ? this.combinedRecordIdRefs.push(l) : this.combinedNewRecords.push(l) : l.info.isLinkMergedWithParent() ? l.isNull() ? this.mergedLinkTargetNullRecords.push(l) : l.isRef() ? this.mergedLinkTargetRecordIdRefs.push(l) : this.mergedLinkTargetNewRecords.push(l) : l.info.isLinkMergedWithAttribute() ? l.isNull() ? this.differentTableMergedLinkNullRecords.push(l) : l.isRef() ? this.differentTableMergedLinkRecordIdRefs.push(l) : this.differentTableMergedLinkNewRecords.push(l) : l.isNull() ? this.isolatedNullRecords.push(l) : l.isRef() ? this.isolatedRecordIdRefs.push(l) : this.isolatedNewRecords.push(l);
-    }), this.rawData?.[f] && (this.linkRecordData = new Q(this.map, r?.linkName, this.rawData[f]));
+    }), this.rawData?.[f] && (this.linkRecordData = new V(this.map, r?.linkName, this.rawData[f]));
   }
   merge(t) {
-    const e = new Q(this.map, this.originalRecordName, { ...this.rawData, ...t }, this.info);
+    const e = new V(this.map, this.originalRecordName, { ...this.rawData, ...t }, this.info);
     return this.recordName !== this.originalRecordName && (e.recordName = this.recordName), e;
   }
   getRef() {
@@ -2996,7 +2970,7 @@ class Oe {
       }), n = {
         [a.attributeName]: i,
         [f]: s.getData()[f]
-      }, [c] = await this.helper.updateRecord(a.parentEntityName, o, new Q(this.map, a.parentEntityName, n), e);
+      }, [c] = await this.helper.updateRecord(a.parentEntityName, o, new V(this.map, a.parentEntityName, n), e);
       s.info.isXToMany ? (r[s.info.attributeName] || (r[s.info.attributeName] = []), r[s.info.attributeName].push({
         ...c,
         [f]: c[a.attributeName][f]
@@ -3011,7 +2985,7 @@ class Oe {
         source: s.info.isRecordSource() ? i : a,
         target: s.info.isRecordSource() ? a : i
       });
-      const n = new Q(this.map, s.info.linkName, o), c = await this.createRecord(n, `create isolated related link record ${t.recordName}.${s.info?.attributeName}`, e);
+      const n = new V(this.map, s.info.linkName, o), c = await this.createRecord(n, `create isolated related link record ${t.recordName}.${s.info?.attributeName}`, e);
       s.info.isXToMany ? (r[s.info.attributeName] || (r[s.info.attributeName] = []), r[s.info.attributeName].push({
         ...a,
         [f]: c
@@ -3034,7 +3008,7 @@ class Oe {
         source: a.info.isRecordSource() ? i : a.getRef(),
         target: a.info.isRecordSource() ? a.getRef() : i
       });
-      const n = new Q(this.map, a.info.linkName, o), c = await this.createRecord(n, `create isolated related link record of old related ${t.recordName}.${a.info?.attributeName}`, e);
+      const n = new V(this.map, a.info.linkName, o), c = await this.createRecord(n, `create isolated related link record of old related ${t.recordName}.${a.info?.attributeName}`, e);
       a.info.isXToMany ? (r[a.info.attributeName] || (r[a.info.attributeName] = []), r[a.info.attributeName][s] = {
         ...a.getData(),
         [f]: c
@@ -3056,7 +3030,7 @@ class Oe {
    * 添加链接
    */
   async addLink(t, e, i, r = {}, s = !1, a) {
-    const o = (await this.queryExecutor.findRecords(M.create(t, this.map, {
+    const o = (await this.queryExecutor.findRecords(P.create(t, this.map, {
       matchExpression: m.atom({ key: "source.id", value: ["=", e] }).and({
         key: "target.id",
         value: ["=", i]
@@ -3074,7 +3048,7 @@ class Oe {
       });
       await this.helper.unlink(t, h, !1, "unlink combined record for add new link", a);
     }
-    const c = new Q(this.map, n.name, {
+    const c = new V(this.map, n.name, {
       source: { id: e },
       target: { id: i },
       ...r
@@ -3168,7 +3142,7 @@ class De {
     const o = s.path.concat("id").join("."), n = m.atom({
       key: o,
       value: ["=", i]
-    }), c = M.create(t.baseEntityName, this.map, {
+    }), c = P.create(t.baseEntityName, this.map, {
       matchExpression: n,
       attributeQuery: ["id"]
     });
@@ -3180,7 +3154,7 @@ class De {
   async checkRecordMatchesFilter(t, e, i) {
     if (!this.queryAgent)
       throw new Error("QueryAgent not set in FilteredEntityManager");
-    const r = M.create(e, this.map, {
+    const r = P.create(e, this.map, {
       matchExpression: i.and({
         key: "id",
         value: ["=", t]
@@ -3275,7 +3249,7 @@ class De {
    */
   async updateSingleFilteredEntityFlag(t, e, i) {
     const r = this.map.getRecordInfo(t.baseEntityName), s = await this.queryAgent.findRecords(
-      M.create(t.baseEntityName, this.map, {
+      P.create(t.baseEntityName, this.map, {
         matchExpression: m.atom({ key: "id", value: ["=", e] }),
         attributeQuery: r.isRelation ? ["*", ["target", { attributeQuery: ["*"] }], ["source", { attributeQuery: ["*"] }]] : ["*"]
       }),
@@ -3335,7 +3309,7 @@ class Fe {
     return this.aliasToPath.get(t);
   }
 }
-class Qe {
+class Ve {
   constructor(t, e) {
     this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?");
   }
@@ -3520,7 +3494,7 @@ ${A}
       if (!s.data.isFunctionMatch) return { ...s.data };
       if (s.data.value[0].toLowerCase() !== "exist")
         throw new Error(`we only support Exist function match on entity for now. yours: ${s.data.key} ${s.data.value[0]} ${s.data.value[1]}`);
-      const o = this.map.getInfoByPath(s.data.namePath), { alias: n } = this.map.getTableAndAliasStack(s.data.namePath).at(-1), c = this.map.getReverseAttribute(o.parentEntityName, o.attributeName), l = s.data.namePath.slice(1, -1), d = M.create(
+      const o = this.map.getInfoByPath(s.data.namePath), { alias: n } = this.map.getTableAndAliasStack(s.data.namePath).at(-1), c = this.map.getReverseAttribute(o.parentEntityName, o.attributeName), l = s.data.namePath.slice(1, -1), d = P.create(
         o.recordName,
         this.map,
         {
@@ -3622,15 +3596,9 @@ class it {
   constructor(t, e, i = []) {
     this.label = t, this.parent = e, this.stack = i;
   }
-  /**
-   * 添加一个值到栈中，返回新的上下文
-   */
   concat(t) {
     return new it(this.label, this.parent, [...this.stack, t]);
   }
-  /**
-   * 获取栈数据
-   */
   getStack(t) {
     return [...this.stack];
   }
@@ -3641,7 +3609,7 @@ class it {
     return new it(t, this);
   }
 }
-class Ve {
+class Qe {
   constructor(t) {
     this.recordQuery = t, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(_t, t), this.recursiveSaveLabelledRecordQuery(t);
   }
@@ -3682,7 +3650,7 @@ class Le {
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
   async findRecords(t, e = "", i, r = new it(_t)) {
-    if (i || (i = new Ve(t)), t.goto) {
+    if (i || (i = new Qe(t)), t.goto) {
       if (t.exit && await t.exit(r))
         return [];
       const d = i.get(t.goto);
@@ -3853,7 +3821,7 @@ class Le {
         return p = [...g.stack], !0;
     };
     h.push([o, { goto: d, exit: y }]);
-    const v = (await this.findRecords(M.create(t, this.map, {
+    const v = (await this.findRecords(P.create(t, this.map, {
       matchExpression: c,
       attributeQuery: l
     }), `find records for path ${t}.${e}`))[0];
@@ -3868,7 +3836,7 @@ class qe {
    * 删除记录（主入口）
    */
   async deleteRecord(t, e, i, r = !1) {
-    const s = M.create(t, this.map, {
+    const s = P.create(t, this.map, {
       matchExpression: e,
       attributeQuery: x.getAttributeQueryDataForRecord(
         t,
@@ -3898,7 +3866,7 @@ class qe {
     const s = this.map.getRecordInfo(t);
     for (let a of e) {
       if (!r) {
-        const o = M.create(
+        const o = P.create(
           t,
           this.map,
           {
@@ -4040,7 +4008,7 @@ class Be {
    * 更新记录（主入口）
    */
   async updateRecord(t, e, i, r) {
-    const s = M.create(t, this.map, {
+    const s = P.create(t, this.map, {
       matchExpression: e,
       attributeQuery: x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0)
     }), a = await this.helper.findRecords(s, `find record for updating ${t}`), o = [];
@@ -4138,7 +4106,7 @@ class Be {
 }
 class _e {
   constructor(t, e) {
-    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new De(t, this), this.sqlBuilder = new Qe(t, e), this.queryExecutor = new Le(t, e, this.sqlBuilder), this.creationExecutor = new Oe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.deletionExecutor = new qe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.updateExecutor = new Be(t, e, this.filteredEntityManager, this.sqlBuilder, this), this.initializeFilteredEntityDependencies();
+    this.map = t, this.database = e, this.getPlaceholder = e.getPlaceholder || (() => (i) => "?"), this.filteredEntityManager = new De(t, this), this.sqlBuilder = new Ve(t, e), this.queryExecutor = new Le(t, e, this.sqlBuilder), this.creationExecutor = new Oe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.deletionExecutor = new qe(t, e, this.queryExecutor, this.filteredEntityManager, this.sqlBuilder, this), this.updateExecutor = new Be(t, e, this.filteredEntityManager, this.sqlBuilder, this), this.initializeFilteredEntityDependencies();
   }
   /**
    * 初始化所有 filtered entity 的依赖关系
@@ -4230,7 +4198,7 @@ class _e {
       };
       s ? s = s.or(l) : s = m.atom(l);
     }
-    const o = M.create(t.recordName, this.map, {
+    const o = P.create(t.recordName, this.map, {
       matchExpression: s,
       attributeQuery: a
     }, void 0, void 0, void 0, !1, !0), n = await this.queryExecutor.findRecords(o, i, void 0);
@@ -4256,13 +4224,13 @@ class _e {
    * 用于 unlink 场景中处理合并记录的数据迁移
    */
   async relocateCombinedRecordDataForLink(t, e, i = !1, r) {
-    const s = x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0), a = i ? "source" : "target", o = await this.queryExecutor.findRecords(M.create(t, this.map, {
+    const s = x.getAttributeQueryDataForRecord(t, this.map, !0, !0, !0, !0), a = i ? "source" : "target", o = await this.queryExecutor.findRecords(P.create(t, this.map, {
       matchExpression: e,
       attributeQuery: s
     }), `finding combined records for relocate ${t}.${a}`, void 0), n = this.map.getLinkInfoByName(t)[i ? "sourceRecordInfo" : "targetRecordInfo"];
     await this.deleteRecordSameRowData(n.name, o.map((c) => c[a]));
     for (let c of o) {
-      const l = new Q(this.map, n.name, c[a]);
+      const l = new V(this.map, n.name, c[a]);
       await this.creationExecutor.insertSameRowData(l, void 0), r?.push({
         type: "delete",
         recordName: t,
@@ -4319,7 +4287,7 @@ class We {
   }
   async find(t, e, i, r = []) {
     b(this.map.getRecord(t), `cannot find entity ${t}`);
-    const s = M.create(
+    const s = P.create(
       t,
       this.map,
       {
@@ -4331,12 +4299,12 @@ class We {
     return this.agent.findRecords(s, `finding ${t} from handle`);
   }
   async create(t, e, i) {
-    const r = new Q(this.map, t, e);
+    const r = new V(this.map, t, e);
     return this.agent.createRecord(r, `create record ${t} from handle`, i);
   }
   // CAUTION 不能递归更新 relate entity 的 value，如果传入了 related entity 的值，说明是建立新的联系。
   async update(t, e, i, r) {
-    const s = new Q(this.map, t, i);
+    const s = new V(this.map, t, i);
     return this.agent.updateRecord(t, e, s, r);
   }
   async delete(t, e, i) {
@@ -4349,7 +4317,7 @@ class We {
     return this.agent.addLinkFromRecord(t, e, i, r, s, a);
   }
   async updateRelationByName(t, e, i, r) {
-    return b(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.agent.updateRecord(t, e, new Q(this.map, t, i), r);
+    return b(!i.source && !i.target, "Relation can only update attributes. Use addRelation/removeRelation to update source/target."), this.agent.updateRecord(t, e, new V(this.map, t, i), r);
   }
   async removeRelationByName(t, e, i) {
     return this.agent.unlink(t, e, !1, `remove relation ${t}`, i);
@@ -4941,7 +4909,7 @@ function Ze(u, t, e, i) {
       }))
     )) : o.properties = s, [o, n || o];
   } else {
-    const a = i.getRelationByName(u.name), o = C.create({
+    const a = i.getRelationByName(u.name), o = M.create({
       name: a.name,
       source: a.source,
       sourceProperty: a.sourceProperty,
@@ -4953,7 +4921,7 @@ function Ze(u, t, e, i) {
     let n;
     if (a.inputRelations?.some((c) => c.baseRelation)) {
       const c = a.name || `${a.source.name}_${a.sourceProperty}_${a.targetProperty}_${a.target.name}`;
-      n = C.create({
+      n = M.create({
         name: `__${c}_base`,
         source: a.source,
         sourceProperty: `__${a.sourceProperty}_base`,
@@ -4990,7 +4958,7 @@ function ti(u, t, e) {
     }), [a, s];
   } else {
     const i = u, r = t, s = X(i);
-    return i.baseRelation ? [i, ei(i)] : [C.create({
+    return i.baseRelation ? [i, ei(i)] : [M.create({
       name: s,
       baseRelation: r,
       sourceProperty: i.sourceProperty,
@@ -5684,7 +5652,7 @@ const Z = "_System_", L = "_Dictionary_", re = "id", se = "_rowId", ai = I.creat
       collection: !1
     })
   ]
-}), Rr = 0, It = 1, wr = 2;
+}), yr = 0, It = 1, gr = 2;
 class ni {
   constructor(t, e) {
     this.controller = t, this.scheduler = e, this.sourceMaps = [], this.sourceMapTree = {};
@@ -5949,8 +5917,8 @@ class E {
     return await this.controller.system.storage.update(this.record, m.atom({ key: "id", value: ["=", t.id] }), { [this.key]: e }), e;
   }
   async get(t) {
-    if (t[this.key] === void 0) {
-      const i = (await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]))?.[this.key];
+    if (!t || t[this.key] === void 0) {
+      const i = (t ? await this.controller.system.storage.findOne(this.record, m.atom({ key: "id", value: ["=", t.id] }), void 0, [this.key]) : void 0)?.[this.key];
       return i !== void 0 ? i : this.defaultValue;
     }
     return t[this.key];
@@ -5973,8 +5941,9 @@ function Ct(u, t) {
     return u === t;
   if (typeof u != "object" || u === null)
     return !1;
-  for (const e in t)
-    if (!(e in u) || !Ct(u[e], t[e]))
+  const e = u, i = t;
+  for (const r in i)
+    if (!(r in e) || !Ct(e[r], i[r]))
       return !1;
   return !0;
 }
@@ -6004,23 +5973,23 @@ function k(u, t) {
   if (!u)
     throw new Error(t);
 }
-function Nr(u, t) {
+function br(u, t) {
   return new Map(Array.from(u.entries()).map(([e, i]) => [e, t(e, i)]));
 }
-function vr(u, t) {
+function Rr(u, t) {
   return Object.fromEntries(Object.entries(u).map(([e, i]) => [e, t(e, i)]));
 }
-async function Tr(u, t) {
+async function wr(u, t) {
   for (let e of u)
     if (!await t(e)) return !1;
   return !0;
 }
-async function Ar(u, t) {
+async function Nr(u, t) {
   for (let e of u)
     if (await t(e)) return !0;
   return !1;
 }
-async function kr(u, t) {
+async function vr(u, t) {
   for (let e of u) {
     const i = await t(e);
     if (i !== !0) return i;
@@ -6104,13 +6073,13 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     };
   }
 }
-const Sr = K.create({
+const Tr = K.create({
   name: "nonExistent",
   computeValue: () => null
-}), Er = K.create({
+}), Ar = K.create({
   name: "nonDeleted",
   computeValue: () => !1
-}), Ir = K.create({
+}), kr = K.create({
   name: "deleted",
   computeValue: () => !0
 }), ui = [ci, li];
@@ -6746,19 +6715,19 @@ class Ti {
   }
 }
 const Ai = [Ti];
-class P {
+class C {
   constructor(t) {
     this.node = t;
   }
   static number(t) {
-    return new P({ type: "number", value: t });
+    return new C({ type: "number", value: t });
   }
   static variable(t) {
-    return new P({ type: "variable", variable: { id: t } });
+    return new C({ type: "variable", variable: { id: t } });
   }
   add(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "+",
       left: this.node,
@@ -6767,7 +6736,7 @@ class P {
   }
   subtract(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "-",
       left: this.node,
@@ -6776,7 +6745,7 @@ class P {
   }
   multiply(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "*",
       left: this.node,
@@ -6785,7 +6754,7 @@ class P {
   }
   divide(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "/",
       left: this.node,
@@ -6794,7 +6763,7 @@ class P {
   }
   power(t) {
     const e = typeof t == "number" ? { type: "number", value: t } : t.node;
-    return new P({
+    return new C({
       type: "operation",
       operation: "^",
       left: this.node,
@@ -6802,7 +6771,7 @@ class P {
     });
   }
   sqrt() {
-    return new P({
+    return new C({
       type: "operation",
       operation: "sqrt",
       left: this.node
@@ -6860,7 +6829,7 @@ class P {
     t.type === "variable" ? e.add(t.variable.id) : t.type === "operation" && (t.left && this.collectVariables(t.left, e), t.right && this.collectVariables(t.right, e));
   }
   clone() {
-    return new P(this.cloneNode(this.node));
+    return new C(this.cloneNode(this.node));
   }
   cloneNode(t) {
     const e = { type: t.type };
@@ -6956,7 +6925,7 @@ class vt {
     return this.operator === ">" ? e > i : e < i;
   }
   solve() {
-    const t = typeof this.right == "number" ? P.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
+    const t = typeof this.right == "number" ? C.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
     if (r.length !== 1)
       throw new Error("Can only solve inequalities with exactly one variable");
     const s = r[0];
@@ -6991,7 +6960,7 @@ class Wt {
     return Math.abs(e - i) < 1e-10;
   }
   solve() {
-    const t = typeof this.right == "number" ? P.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
+    const t = typeof this.right == "number" ? C.number(this.right) : this.right, e = this.left.getVariables(), i = t.getVariables(), r = [.../* @__PURE__ */ new Set([...e, ...i])];
     if (r.length !== 1)
       throw new Error("Can only solve equations with exactly one variable");
     const s = r[0];
@@ -7038,9 +7007,9 @@ class ki {
   }
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(t) {
-    const e = await this.args.callback(P.variable("now"), t), i = Date.now();
+    const e = await this.args.callback(C.variable("now"), t), i = Date.now();
     let r, s;
-    if (e instanceof P)
+    if (e instanceof C)
       r = e.evaluate({ now: i }), s = i + this.nextRecomputeTime(i, t);
     else if (e instanceof vt || e instanceof Wt)
       r = e.evaluate({ now: i }), s = e.solve();
@@ -7076,9 +7045,9 @@ class Si {
   }
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(t, e) {
-    const i = await this.args.callback(P.variable("now"), t), r = Date.now();
+    const i = await this.args.callback(C.variable("now"), t), r = Date.now();
     let s, a;
-    if (i instanceof P)
+    if (i instanceof C)
       s = i.evaluate({ now: r }), a = r + this.nextRecomputeTime(r, t);
     else if (i instanceof vt || i instanceof Wt)
       s = i.evaluate({ now: r }), a = i.solve();
@@ -7484,7 +7453,7 @@ class Fi extends At {
     this.contextType = "relation";
   }
 }
-class Qi extends At {
+class Vi extends At {
   static {
     this.contextType = "property";
   }
@@ -7499,11 +7468,11 @@ If you want to use aggregated data from all records in the entity/relation, you
     super(t, e, i);
   }
 }
-const Vi = [
+const Qi = [
   Oi,
   Di,
   Fi,
-  Qi
+  Vi
 ];
 class W extends Error {
   constructor(t, e = {}) {
@@ -7817,7 +7786,7 @@ class qi {
                 type: "json"
               })
             ]
-          }), y = C.create({
+          }), y = M.create({
             name: `${p.name}_${h.dataContext.host.name}_${h.dataContext.id.name}`,
             source: p,
             target: h.dataContext.host,
@@ -8332,7 +8301,7 @@ function oe(u) {
   const t = Jt.getStore();
   t?.effects && t.effects.push(...u);
 }
-const xr = "User";
+const Sr = "User";
 class ge {
   constructor(t) {
     this.name = t.name, this.record = t.record, this.content = t.content;
@@ -8341,7 +8310,7 @@ class ge {
     return new ge(t);
   }
 }
-const $t = "_isDeleted_", Mr = {
+const $t = "_isDeleted_", Er = {
   create() {
     return N.create({
       name: $t,
@@ -8349,7 +8318,7 @@ const $t = "_isDeleted_", Mr = {
     });
   }
 };
-class Pr {
+class Ir {
   constructor(t) {
     this.recordNameToSideEffects = /* @__PURE__ */ new Map(), this.globals = {
       BoolExp: R,
@@ -8382,7 +8351,7 @@ class Pr {
       ...$i,
       ...Ei,
       ...ui,
-      ...Vi,
+      ...Qi,
       ...n
     ];
     this.scheduler = new qi(this, this.entities, this.relations, this.dict, h), o.forEach((p) => {
@@ -8431,10 +8400,10 @@ class Pr {
   async applyResultPatch(t, e, i) {
     if (e instanceof Nt || e === void 0) return;
     const r = Array.isArray(e) ? e : [e];
-    for (const s of r) {
+    for (const s of r)
       if (t.type === "global")
-        return this.system.storage.dict.set(t.id.name, s);
-      if (t.type === "entity" || t.type === "relation") {
+        await this.system.storage.dict.set(t.id.name, s);
+      else if (t.type === "entity" || t.type === "relation") {
         const a = t;
         if (s.type === "insert")
           await this.system.storage.create(a.id.name, s.data);
@@ -8449,7 +8418,6 @@ class Pr {
         const a = t;
         a.id.name === $t && s.data ? (k(s.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(a.host.name, R.atom({ key: "id", value: ["=", i.id] }))) : s.type === "insert" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "update" ? await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: s.data }) : s.type === "delete" && await this.system.storage.update(a.host.name, R.atom({ key: "id", value: ["=", i.id] }), { [a.id.name]: null });
       }
-    }
   }
   /**
    * Unified dispatch API for all event source types.
@@ -8518,6 +8486,7 @@ class Pr {
   addEventListener(t, e) {
     this.callbacks.has(t) || this.callbacks.set(t, /* @__PURE__ */ new Set()), this.callbacks.get(t).add(e);
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   findEventSourceByName(t) {
     return this.eventSourcesByName.get(t);
   }
@@ -8537,18 +8506,18 @@ class Ji {
       },
       set: async (e, i) => {
         const r = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(L, r, void 0, ["value"]);
-        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [L, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [L, { key: e, value: { raw: i } }], []);
+        s ? await this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [L, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: i } }], []) : await this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [L, { key: e, value: { raw: i } }], []);
       }
     };
   }
-  beginTransaction(t = "") {
-    return this.db.beginTransaction ? this.db.beginTransaction(t) : this.db.scheme("BEGIN", t);
+  async beginTransaction(t = "") {
+    await (this.db.beginTransaction ? this.db.beginTransaction(t) : this.db.scheme("BEGIN", t));
   }
-  commitTransaction(t = "") {
-    return this.db.commitTransaction ? this.db.commitTransaction(t) : this.db.scheme("COMMIT", t);
+  async commitTransaction(t = "") {
+    await (this.db.commitTransaction ? this.db.commitTransaction(t) : this.db.scheme("COMMIT", t));
   }
-  rollbackTransaction(t = "") {
-    return this.db.rollbackTransaction ? this.db.rollbackTransaction(t) : this.db.scheme("ROLLBACK", t);
+  async rollbackTransaction(t = "") {
+    await (this.db.rollbackTransaction ? this.db.rollbackTransaction(t) : this.db.scheme("ROLLBACK", t));
   }
   // CAUTION kv 结构数据的实现也用 er。这是系统约定，因为也需要  Record 事件！
   async get(t, e, i) {
@@ -8658,14 +8627,14 @@ class jt {
     return new jt(this.level);
   }
 }
-const Cr = new Ht(), Ui = new jt();
-class $r {
+const xr = new Ht(), Ui = new jt();
+class Mr {
   constructor(t, e = Ui) {
     this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new Ji(t);
   }
-  setup(t, e, i, r = !1) {
+  async setup(t, e, i, r = !1) {
     const s = new de(t, e), { entities: a, relations: o } = s.getAll();
-    return i.forEach(({ dataContext: n, state: c }) => {
+    i.forEach(({ dataContext: n, state: c }) => {
       Object.entries(c).forEach(([l, d]) => {
         if (d instanceof E) {
           if (!d.record)
@@ -8689,17 +8658,17 @@ class $r {
           }
         }
       });
-    }), this.storage.setup(
+    }), await this.storage.setup(
       [...a, oi, ai],
       o,
       r
     );
   }
-  destroy() {
-    this.storage.destroy();
+  async destroy() {
+    await this.storage.destroy();
   }
 }
-const Or = new ne();
+const Pr = new ne();
 class kt {
   constructor(t, e) {
     this._type = "Action", this._options = e, this.uuid = T(e), this.name = t.name;
@@ -8888,8 +8857,8 @@ class z {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
 class bt {
@@ -8961,7 +8930,7 @@ function Dt(u) {
     right: Dt(u.right)
   });
 }
-function Dr(u) {
+function Cr(u) {
   return bt.create({
     content: Dt(u)
   });
@@ -9200,12 +9169,12 @@ async function tt(u, t) {
   if (t.for) {
     for (const e of t.for)
       if (await tt(u, e) === !0) return !0;
-    return { name: t.name, type: "conceptAlias", error: "no match" };
+    return { name: t.name || "", type: "conceptAlias", error: "no match" };
   }
   return z.is(t) ? !0 : I.is(t) ? u && typeof u == "object" ? !0 : { name: t.name || "", type: "conceptCheck", error: "invalid entity data" } : !0;
 }
 async function er(u, t, e) {
-  if (I.is(t.data) || C.is(t.data)) {
+  if (I.is(t.data) || M.is(t.data)) {
     const i = t.data.name, r = t.dataPolicy?.match, s = t.dataPolicy?.modifier, a = { ...e.query?.modifier || {}, ...s || {} }, o = e.query?.attributeQuery || [], n = typeof r == "function" ? await r.call(u, e) : r, c = R.and(n, e.query?.match);
     return u.system.storage.find(i, c, a, o);
   }
@@ -9433,11 +9402,11 @@ function Ne(u, t, e) {
     i.activities?.forEach((r) => Ne(r, t, i));
   });
 }
-function Fr(u) {
+function $r(u) {
   const t = [];
   return Ne(u, (e) => t.push(e)), t;
 }
-function Qr(u) {
+function Or(u) {
   return null;
 }
 class Xt {
@@ -9496,8 +9465,8 @@ class Xt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
 class zt {
@@ -9556,8 +9525,8 @@ class zt {
     return t !== null && typeof t == "object" && typeof t.uuid == "string";
   }
   static parse(t) {
-    const e = JSON.parse(t), i = e.public;
-    return i.content && typeof i.content == "string" && i.content.startsWith("func::") && (i.content = new Function("return " + i.content.substring(6))()), this.create(i, e.options);
+    const e = JSON.parse(t), i = e.public, r = i;
+    return typeof r.content == "string" && r.content.startsWith("func::") && (i.content = new Function("return " + r.content.substring(6))()), this.create(i, e.options);
   }
 }
 class ve {
@@ -9949,7 +9918,7 @@ const ir = [
 ir.forEach((u) => {
   u && u.displayName && ue(u.displayName, u);
 });
-function Vr({ name: u, isRef: t = !1 }, e) {
+function Dr({ name: u, isRef: t = !1 }, e) {
   return z.create({
     name: u,
     content: u ? new Function("user", `return user.roles.includes('${u}')`) : function() {
@@ -10226,7 +10195,7 @@ const cr = "_Activity_", Te = I.create({
       collection: !1
     })
   ]
-}), lr = C.create({
+}), lr = M.create({
   name: "activityInteraction",
   source: Te,
   sourceProperty: "interaction",
@@ -10234,7 +10203,7 @@ const cr = "_Activity_", Te = I.create({
   targetProperty: "activity",
   type: "1:n"
 });
-class Lr {
+class Fr {
   constructor(t) {
     this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.activityEventSources = [], this.requiredEntities = [], this.requiredRelations = [], t.length > 0 && (this.requiredEntities.push(Te, Ut), this.requiredRelations.push(lr)), t.forEach((e) => {
       const i = new et(e);
@@ -10311,7 +10280,7 @@ class Lr {
     return this.activityCallsByName.get(t);
   }
 }
-class qr extends W {
+class Vr extends W {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "InteractionExecutionError",
@@ -10343,7 +10312,7 @@ class ur extends W {
     }), this.activityName = e.activityName, this.activityId = e.activityId, this.activityInstanceId = e.activityInstanceId, this.currentState = e.currentState, this.severity = e.severity || $.MEDIUM;
   }
 }
-class Br extends ur {
+class Qr extends ur {
   constructor(t, e = {}) {
     super(t, {
       ...e,
@@ -10367,9 +10336,9 @@ export {
   ur as ActivityError,
   st as ActivityGroup,
   lr as ActivityInteractionRelation,
-  Lr as ActivityManager,
+  Fr as ActivityManager,
   Te as ActivityStateEntity,
-  Br as ActivityStateError,
+  Qr as ActivityStateError,
   ri as AliasManager,
   ht as Any,
   Ri as AnyHandles,
@@ -10379,7 +10348,6 @@ export {
   bt as Attributives,
   ut as Average,
   $i as AverageHandles,
-  br as BaseKlass,
   ft as BoolAtomData,
   R as BoolExp,
   mt as BoolExpressionData,
@@ -10394,21 +10362,21 @@ export {
   Xt as Condition,
   U as ConditionError,
   St as Conditions,
-  Pr as Controller,
+  Ir as Controller,
   ct as Count,
   vi as CountHandles,
   Oe as CreationExecutor,
   Bt as Custom,
-  Vi as CustomHandles,
+  Qi as CustomHandles,
   Ht as DBConsoleLogger,
   Hi as DBLogLevel,
   si as DBSetup,
-  Ir as DELETED_STATE,
+  kr as DELETED_STATE,
   L as DICTIONARY_RECORD,
   zt as DataAttributive,
   ee as DataAttributives,
   ve as DataPolicy,
-  Vt as Dictionary,
+  Qt as Dictionary,
   oi as DictionaryEntity,
   I as Entity,
   Di as EntityCustomHandle,
@@ -10421,7 +10389,7 @@ export {
   he as EventSource,
   dt as Every,
   yi as EveryHandles,
-  P as Expression,
+  C as Expression,
   W as FrameworkError,
   at as Gateway,
   Gi as GetAction,
@@ -10436,25 +10404,25 @@ export {
   Ii as GlobalSumHandle,
   di as GlobalWeightedSummationHandle,
   $t as HARD_DELETION_PROPERTY_NAME,
-  Mr as HardDeletionProperty,
+  Er as HardDeletionProperty,
   re as ID_ATTR,
   Ki as INTERACTION_RECORD,
   vt as Inequality,
   Gt as Interaction,
   Ut as InteractionEventEntity,
-  qr as InteractionExecutionError,
+  Vr as InteractionExecutionError,
   q as InteractionGuardError,
   Ft as KlassByName,
   f as LINK_SYMBOL,
   wt as LinkInfo,
   m as MatchExp,
   Pe as Modifier,
-  $r as MonoSystem,
-  Er as NON_DELETED_STATE,
-  Sr as NON_EXIST_STATE,
-  Q as NewRecordData,
-  wr as PHASE_AFTER_ALL,
-  Rr as PHASE_BEFORE_ALL,
+  Mr as MonoSystem,
+  Ar as NON_DELETED_STATE,
+  Tr as NON_EXIST_STATE,
+  V as NewRecordData,
+  gr as PHASE_AFTER_ALL,
+  yr as PHASE_BEFORE_ALL,
   It as PHASE_NORMAL,
   te as Payload,
   Zt as PayloadItem,
@@ -10462,12 +10430,12 @@ export {
   bi as PropertyAnyHandle,
   Ci as PropertyAverageHandle,
   Ni as PropertyCountHandle,
-  Qi as PropertyCustomHandle,
+  Vi as PropertyCustomHandle,
   mi as PropertyEveryHandle,
   Si as PropertyRealTimeComputation,
   li as PropertyStateMachineHandle,
   xi as PropertySumHandle,
-  Qt as PropertyTypes,
+  Vt as PropertyTypes,
   hi as PropertyWeightedSummationHandle,
   Le as QueryExecutor,
   _t as ROOT_LABEL,
@@ -10477,16 +10445,16 @@ export {
   E as RecordBoundState,
   rt as RecordInfo,
   ge as RecordMutationSideEffect,
-  M as RecordQuery,
+  P as RecordQuery,
   _e as RecordQueryAgent,
-  Ve as RecordQueryRef,
-  V as RecordQueryTree,
+  Qe as RecordQueryRef,
+  Q as RecordQueryTree,
   Ti as RecordsTransformHandle,
   it as RecursiveContext,
   de as RefContainer,
-  C as Relation,
+  M as Relation,
   Fi as RelationCustomHandle,
-  Qe as SQLBuilder,
+  Ve as SQLBuilder,
   Z as SYSTEM_RECORD,
   qi as Scheduler,
   qt as SideEffect,
@@ -10502,39 +10470,37 @@ export {
   we as Transfer,
   Tt as Transform,
   Ai as TransformHandles,
-  xr as USER_ENTITY,
+  Sr as USER_ENTITY,
   nt as WeightedSummation,
   pi as WeightedSummationHandles,
   oe as addToCurrentEffects,
   k as assert,
   Jt as asyncEffectsContext,
-  Or as asyncInteractionContext,
-  Dr as boolExpToAttributives,
+  Pr as asyncInteractionContext,
+  Cr as boolExpToAttributives,
   be as checkCondition,
   Re as checkPayload,
   pr as clearAllInstances,
-  gr as createClass,
   ke as createInstances,
-  yr as createInstancesFromString,
-  Vr as createUserRoleAttributive,
-  Cr as dbConsoleLogger,
+  mr as createInstancesFromString,
+  Dr as createUserRoleAttributive,
+  xr as dbConsoleLogger,
   Rt as deepClone,
-  Tr as everyAsync,
-  kr as everyWithErrorAsync,
-  Nr as filterMap,
-  Qr as findRootActivity,
+  wr as everyAsync,
+  vr as everyWithErrorAsync,
+  br as filterMap,
+  Or as findRootActivity,
   Ne as forEachInteraction,
   T as generateUUID,
   Bi as getCurrentEffects,
-  Fr as getInteractions,
+  $r as getInteractions,
   hr as indexBy,
   ce as isObject,
   le as isPlainObject,
-  vr as mapObject,
+  Rr as mapObject,
   ue as registerKlass,
-  fr as removeAllInstance,
-  Ar as someAsync,
-  mr as stringifyAllInstances,
+  Nr as someAsync,
+  fr as stringifyAllInstances,
   w as stringifyAttribute,
   Ui as systemConsoleLogger
 };