interaqt 0.4.3 → 0.4.5

package/dist/index.js

@@ -40,13 +40,13 @@ function wi(...u) {
 }
 function Ni() {
 }
-const _t = /* @__PURE__ */ new Map();
+const qt = /* @__PURE__ */ new Map();
 function Oe(u, t) {
-  t && t.isKlass && t.displayName && _t.set(u, t);
+  t && t.isKlass && t.displayName && qt.set(u, t);
 }
 function Ti() {
   const u = [];
-  return Array.from(_t.entries()).forEach(([, t]) => {
+  return Array.from(qt.entries()).forEach(([, t]) => {
     t.instances && Array.isArray(t.instances) && t.stringify && u.push(...t.instances.map((e) => t.stringify(e)));
   }), `[${u.join(",")}]`;
 }
@@ -57,7 +57,7 @@ function Si(u) {
 function Fe(u) {
   const t = /* @__PURE__ */ new Map();
   return u.forEach(({ type: e, options: r = {}, uuid: i, public: s }) => {
-    const a = _t.get(e);
+    const a = qt.get(e);
     if (!a) {
       console.warn(`Class ${e} not found in KlassByName`);
       return;
@@ -196,7 +196,7 @@ class C {
     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 _t = /* @__PURE__ */ ((u) => (u.String = "string", u.Number = "number", u.Boolean = "boolean", u.Timestamp = "timestamp", u))(_t || {});
 const Ve = /^[a-zA-Z0-9_]+$/;
 class Bt {
   constructor(t, e) {
@@ -226,7 +226,7 @@ class Bt {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(qt))
+        options: Array.from(Object.values(_t))
       },
       collection: {
         type: "boolean",
@@ -318,7 +318,7 @@ class T {
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(qt)
+        options: () => Object.values(_t)
       },
       collection: {
         type: "boolean",
@@ -1063,6 +1063,12 @@ class R {
   static fromValue(t) {
     return new R(t);
   }
+  toJSON() {
+    return this.raw;
+  }
+  static fromJSON(t) {
+    return new R(t);
+  }
   isExpression() {
     return this.raw.type === "expression";
   }
@@ -1161,19 +1167,19 @@ class R {
     throw new Error(`invalid bool expression type: ${JSON.stringify(this.raw)}`);
   }
 }
-const _e = {
+const qe = {
   "&&": "and",
   "||": "or",
   "!": "not"
 };
-function qe(u) {
+function _e(u) {
   return { key: u };
 }
 function Nt(u, t, e) {
   if (u.type === "LogicalExpression")
     return {
       type: "expression",
-      operator: _e[u.operator],
+      operator: qe[u.operator],
       left: Nt(u.left, t, e),
       right: Nt(u.right, t, e)
     };
@@ -1190,7 +1196,7 @@ function Nt(u, t, e) {
     };
   throw new Error("unknown ast node type");
 }
-function Ii(u, t = [], e = qe) {
+function Ii(u, t = [], e = _e) {
   const r = De(t, "name"), i = xe(u, { ecmaVersion: 2020 });
   return new R(
     Nt(i.body[0].expression, r, e)
@@ -3416,7 +3422,7 @@ class m {
     const a = this.map.getRecordInfo(t);
     this.entityName = a.isFilteredEntity || a.isFilteredRelation ? a.baseRecordName : t;
     const o = a.isFilteredEntity || a.isFilteredRelation;
-    this.xToOneQueryTree = new _(this.entityName, this.map);
+    this.xToOneQueryTree = new q(this.entityName, this.map);
     let n = r;
     o && (n = r ? a.matchExpression.and(r) : a.matchExpression), n && (this.data = this.convertFilteredRelation(n), this.buildQueryTree(this.data, this.xToOneQueryTree));
   }
@@ -3603,6 +3609,34 @@ class m {
     }, a = this.data ? s(this.data) : void 0;
     return new m(r, this.map, a, this.contextRootEntity, this.fromRelation);
   }
+  /**
+   * 将 MatchExp 实例序列化为 JSON 格式
+   * @returns JSON 可序列化的对象
+   */
+  toJSON() {
+    return {
+      entityName: this.entityName,
+      data: this.data ? this.data.raw : void 0,
+      contextRootEntity: this.contextRootEntity,
+      fromRelation: this.fromRelation
+    };
+  }
+  /**
+   * 从 JSON 对象创建 MatchExp 实例
+   * @param json JSON 对象
+   * @param map EntityToTableMap 实例
+   * @returns MatchExp 实例
+   */
+  static fromJSON(t, e) {
+    const r = t.data ? R.fromValue(t.data) : void 0;
+    return new m(
+      t.entityName,
+      e,
+      r,
+      t.contextRootEntity,
+      t.fromRelation
+    );
+  }
 }
 class Je {
   constructor(t, e, r, i) {
@@ -3679,7 +3713,7 @@ class M {
     );
   }
 }
-class _ {
+class q {
   // 父节点和自己这个几点 link 上的 query
   constructor(t, e, r, i, s, a, o) {
     this.recordName = t, this.map = e, this.parentRecord = r, this.attributeName = i, this.data = s, this.parent = a, this.parentLinkQueryTree = o, this.fields = [], g(!!t, "recordName cannot be empty"), this.fields = s?.fields || [], this.records = s?.records || {}, r && (this.info = this.map.getInfo(this.parentRecord, this.attributeName));
@@ -3689,26 +3723,26 @@ class _ {
     if (t.length === 1)
       this.fields.push(e);
     else if (e === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(r);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), this.parentLinkQueryTree.addField(r);
     else {
       const i = this.map.getInfo(this.recordName, e);
-      this.records[e] || (this.records[e] = new _(i.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(r);
+      this.records[e] || (this.records[e] = new q(i.recordName, this.map, this.recordName, e, void 0, this)), this.records[e].addField(r);
     }
   }
   addRecord(t, e) {
     const [r, ...i] = t;
     if (t.length === 1)
       if (r === f)
-        this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(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, r), a = e || new _(s.recordName, this.map, this.recordName, r, void 0, this);
+        const s = this.map.getInfo(this.recordName, r), a = e || new q(s.recordName, this.map, this.recordName, r, void 0, this);
         this.records[r] = this.records[r] ? this.records[r].merge(a) : a;
       }
     else if (r === f)
-      this.parentLinkQueryTree || (this.parentLinkQueryTree = new _(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(i, e);
+      this.parentLinkQueryTree || (this.parentLinkQueryTree = new q(this.info.linkName, this.map)), this.parentLinkQueryTree.addRecord(i, e);
     else {
       const s = this.map.getInfo(this.recordName, r);
-      this.records[r] = new _(s.recordName, this.map, this.recordName, r, void 0, this), this.records[r].addRecord(i, e);
+      this.records[r] = new q(s.recordName, this.map, this.recordName, r, void 0, this), this.records[r].addRecord(i, e);
     }
   }
   forEachRecords(t) {
@@ -3723,7 +3757,7 @@ class _ {
       this.records[a] && t.records[a] ? i[a] = this.records[a].merge(t.records[a]) : this.records[a] ? i[a] = this.records[a] : i[a] = t.records[a];
     });
     let s;
-    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new _(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: i }, this.parent, s);
+    return this.parentLinkQueryTree && t.parentLinkQueryTree ? s = this.parentLinkQueryTree.merge(t.parentLinkQueryTree) : s = this.parentLinkQueryTree || t.parentLinkQueryTree, new q(this.recordName, this.map, this.parentRecord, this.attributeName, { fields: e, records: i }, this.parent, s);
   }
   getData() {
     const t = {
@@ -3856,7 +3890,7 @@ class x {
     return this.buildXToOneQueryTree();
   }
   buildXToOneQueryTree() {
-    const t = new _(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) => {
@@ -3868,7 +3902,7 @@ class x {
     return t;
   }
   buildFullQueryTree() {
-    const t = new _(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;
@@ -7737,12 +7771,12 @@ class $t {
     return A.skip();
   }
 }
-class _r extends $t {
+class qr extends $t {
   static {
     this.contextType = "global";
   }
 }
-class qr extends $t {
+class _r extends $t {
   static {
     this.contextType = "entity";
   }
@@ -7768,8 +7802,8 @@ If you want to use aggregated data from all records in the entity/relation, you
   }
 }
 const Jr = [
-  _r,
   qr,
+  _r,
   Br,
   Wr
 ];
@@ -8056,7 +8090,7 @@ class O extends H {
     });
   }
 }
-const tt = "_System_", q = "_Dictionary_", et = "id", ot = "_rowId", jr = C.create({
+const tt = "_System_", _ = "_Dictionary_", et = "id", ot = "_rowId", jr = C.create({
   name: tt,
   properties: [
     T.create({
@@ -8076,7 +8110,7 @@ const tt = "_System_", q = "_Dictionary_", et = "id", ot = "_rowId", jr = C.crea
     })
   ]
 }), Hr = C.create({
-  name: q,
+  name: _,
   properties: [
     T.create({
       name: "key",
@@ -8151,7 +8185,7 @@ class Ur {
    * @returns 是否需要触发计算
    */
   shouldTriggerUpdateComputation(t, e) {
-    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === q ? e.record?.key === t.dataDep.source.name : !t.attributes.filter((i) => i !== "id").every(
+    return t.type !== "update" || !("dataDep" in t) ? !0 : t.dataDep.type === "global" && e.recordName === _ ? e.record?.key === t.dataDep.source.name : !t.attributes.filter((i) => i !== "id").every(
       (i) => !e.record.hasOwnProperty(i) || e.record[i] === e.oldRecord[i]
     );
   }
@@ -8178,15 +8212,15 @@ class Ur {
     } else e.type === "global" && ((!i || i === "update") && a.push({
       dataDep: e,
       type: "update",
-      recordName: q,
-      sourceRecordName: q,
+      recordName: _,
+      sourceRecordName: _,
       attributes: ["value"],
       computation: r
     }), (!i || i === "create") && a.push({
       dataDep: e,
       type: "create",
-      recordName: q,
-      sourceRecordName: q,
+      recordName: _,
+      sourceRecordName: _,
       computation: r
     }));
     return a;
@@ -8515,7 +8549,7 @@ class Gr {
   }
   async computeDataBasedDirtyRecordsAndEvents(t, e) {
     let r = [];
-    if (t.dataDep.type === "global" && e.recordName === q)
+    if (t.dataDep.type === "global" && e.recordName === _)
       if (t.computation.dataContext.type === "property") {
         const i = t.computation.dataContext;
         r = (await this.controller.system.storage.find(i.host.name, m.atom({ key: "id", value: ["not", null] }), {}, ["*"])).map((a) => [a, {
@@ -9011,10 +9045,15 @@ class Ae {
   async retrieveData(t) {
     let e;
     if (C.is(this.interaction.data) || P.is(this.interaction.data)) {
-      const r = this.interaction.data.name, { modifier: i, attributeQuery: s } = Object.fromEntries(
-        this.interaction.query?.items?.map((n) => [n.name, n.value]) || []
-      ), a = { ...t.query?.modifier || {}, ...i || {} }, o = t.query?.attributeQuery || [];
-      e = await this.system.storage.find(r, t.query?.match, a, o);
+      const r = this.interaction.data.name, i = Object.fromEntries(
+        this.interaction.query?.items?.map((d) => [d.name, d.value]) || []
+      ), s = i.modifier;
+      i.attributeQuery;
+      let a = i.match, o;
+      a && typeof a == "object" && "raw" in a ? o = a : a && (o = R.fromValue(a));
+      const n = { ...t.query?.modifier || {}, ...s || {} }, c = t.query?.attributeQuery || [];
+      let l = t.query?.match;
+      o && l ? l = o.and(l) : o && (l = o), e = await this.system.storage.find(r, l, n, c);
     } else
       v(!1, `unknown data type ${this.interaction.data}`);
     return e;
@@ -9809,11 +9848,11 @@ class oi {
     this.db = t, this.callbacks = /* @__PURE__ */ new Set(), this.dict = {
       get: async (e) => {
         const r = m.atom({ key: "key", value: ["=", e] });
-        return (await this.queryHandle.findOne(q, r, void 0, ["value"]))?.value?.raw;
+        return (await this.queryHandle.findOne(_, r, void 0, ["value"]))?.value?.raw;
       },
       set: async (e, r) => {
-        const i = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(q, i, void 0, ["value"]);
-        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [q, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: r } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [q, { key: e, value: { raw: r } }], []);
+        const i = m.atom({ key: "key", value: ["=", e] }), s = await this.queryHandle.findOne(_, i, void 0, ["value"]);
+        return s ? this.callWithEvents(this.queryHandle.update.bind(this.queryHandle), [_, m.atom({ key: "id", value: ["=", s.id] }), { key: e, value: { raw: r } }], []) : this.callWithEvents(this.queryHandle.create.bind(this.queryHandle), [_, { key: e, value: { raw: r } }], []);
       }
     };
   }
@@ -9935,7 +9974,7 @@ class re {
   }
 }
 const Rt = new ee(), li = new re();
-class qi {
+class _i {
   constructor(t = new ii(void 0, { logger: Rt }), e = li) {
     this.logger = e, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new oi(t);
   }
@@ -10332,13 +10371,13 @@ export {
   ni as DBLogLevel,
   dr as DBSetup,
   Fi as DELETED_STATE,
-  q as DICTIONARY_RECORD,
+  _ as DICTIONARY_RECORD,
   Ht as DataAttributive,
   zt as DataAttributives,
   Bt as Dictionary,
   Hr as DictionaryEntity,
   C as Entity,
-  qr as EntityCustomHandle,
+  _r as EntityCustomHandle,
   Ye as EntityQueryHandle,
   ze as EntityToTableMap,
   te as Equation,
@@ -10352,7 +10391,7 @@ export {
   Qr as GlobalAverageHandle,
   B as GlobalBoundState,
   Ar as GlobalCountHandle,
-  _r as GlobalCustomHandle,
+  qr as GlobalCustomHandle,
   wr as GlobalEveryHandle,
   Mr as GlobalRealTimeComputation,
   fr as GlobalStateMachineHandle,
@@ -10366,12 +10405,12 @@ export {
   Wt as Interaction,
   Ae as InteractionCall,
   Ee as InteractionEventEntity,
-  _t as KlassByName,
+  qt as KlassByName,
   f as LINK_SYMBOL,
   vt as LinkInfo,
   m as MatchExp,
   Je as Modifier,
-  qi as MonoSystem,
+  _i as MonoSystem,
   Hi as MysqlDB,
   Oi as NON_DELETED_STATE,
   Di as NON_EXIST_STATE,
@@ -10389,7 +10428,7 @@ export {
   $r as PropertyRealTimeComputation,
   mr as PropertyStateMachineHandle,
   Or as PropertySumHandle,
-  qt as PropertyTypes,
+  _t as PropertyTypes,
   br as PropertyWeightedSummationHandle,
   Re as Query,
   be as QueryItem,
@@ -10402,7 +10441,7 @@ export {
   K as RecordMutationSideEffect,
   M as RecordQuery,
   Xe as RecordQueryAgent,
-  _ as RecordQueryTree,
+  q as RecordQueryTree,
   Cr as RecordsTransformHandle,
   St as RecursiveContext,
   we as RefContainer,