interaqt 0.4.5 → 0.4.7

package/dist/index.js

@@ -1029,17 +1029,25 @@ class R {
   constructor(t) {
     if (this.raw = t, !t)
       throw new Error("BoolExp raw data cannot be undefined");
+    if (t.type !== "atom" && t.type !== "expression")
+      throw new Error(`invalid bool expression type: ${JSON.stringify(t)}`);
   }
   static atom(t) {
     return new R({ type: "atom", data: t });
   }
   static and(...t) {
-    const e = t.filter((s) => !!s), [r, ...i] = e;
-    return i.reduce((s, a) => s.and(a), R.atom(r));
+    const e = t.filter((s) => !!s);
+    if (e.length === 0)
+      return;
+    const [r, ...i] = e;
+    return i.reduce((s, a) => s.and(a), r instanceof R ? r : R.atom(r));
   }
   static or(...t) {
-    const e = t.filter((s) => !!s), [r, ...i] = e;
-    return i.reduce((s, a) => s.or(a), R.atom(r));
+    const e = t.filter((s) => !!s);
+    if (e.length === 0)
+      return;
+    const [r, ...i] = e;
+    return i.reduce((s, a) => s.or(a), r instanceof R ? r : R.atom(r));
   }
   isAtom() {
     return this.raw.type === "atom";
@@ -1061,7 +1069,7 @@ class R {
     return this.raw;
   }
   static fromValue(t) {
-    return new R(t);
+    return t instanceof R ? t : new R(t);
   }
   toJSON() {
     return this.raw;
@@ -1344,7 +1352,7 @@ function Ci(u) {
     content: Ot(u)
   });
 }
-class jt {
+class Ht {
   constructor(t, e) {
     this._type = "Condition", this._options = e, this.uuid = S(e), this.content = t.content, this.name = t.name;
   }
@@ -1370,7 +1378,7 @@ class jt {
     };
   }
   static create(t, e) {
-    const r = new jt(t, e);
+    const r = new Ht(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, Condition`);
     return this.instances.push(r), r;
@@ -1404,7 +1412,7 @@ class jt {
     return r.content && typeof r.content == "string" && r.content.startsWith("func::") && (r.content = new Function("return " + r.content.substring(6))()), this.create(r, e.options);
   }
 }
-class Ht {
+class jt {
   constructor(t, e) {
     this._type = "DataAttributive", this._options = e, this.uuid = S(e), this.content = t.content, this.name = t.name;
   }
@@ -1430,7 +1438,7 @@ class Ht {
     };
   }
   static create(t, e) {
-    const r = new Ht(t, e);
+    const r = new jt(t, e);
     if (this.instances.find((s) => s.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, DataAttributive`);
     return this.instances.push(r), r;
@@ -2919,8 +2927,8 @@ const We = [
   Wt,
   Jt,
   X,
-  jt,
   Ht,
+  jt,
   Ct,
   st,
   Ut,
@@ -3768,7 +3776,7 @@ class q {
     }), this.parentLinkQueryTree && (t[f] = this.parentLinkQueryTree.getData()), t;
   }
 }
-const f = "&", je = "*";
+const f = "&", He = "*";
 class x {
   constructor(t, e, r = [], i, s, a) {
     this.recordName = t, this.map = e, this.data = r, this.parentRecord = i, this.attributeName = s, this.shouldQueryParentLinkData = a, this.relatedRecords = [], this.xToManyRecords = [], this.xToOneRecords = [], this.valueAttributes = [], this.id = Math.random();
@@ -3781,7 +3789,7 @@ class x {
         this.parentLinkRecordQuery = M.create(y.linkName, this.map, d, void 0);
         return;
       }
-      if (l === je) {
+      if (l === He) {
         o = new Set(this.map.getRecordInfo(this.recordName).valueAttributes.map((y) => y.attributeName));
         return;
       }
@@ -3911,7 +3919,7 @@ class x {
     return this.parentLinkRecordQuery ? new x(this.recordName, this.map, this.data, this.parentRecord, this.attributeName, !0) : this;
   }
 }
-function He(u) {
+function je(u) {
   const t = [];
   return u.forEach((e) => t.push(...Array.isArray(e) ? e : [e])), t;
 }
@@ -3921,7 +3929,7 @@ class L {
     const s = this.map.getRecordInfo(e);
     this.recordName = s.isFilteredEntity || s.isFilteredRelation ? s.resolvedBaseRecordName : e;
     const [a, o, n] = this.map.groupAttributes(this.recordName, r ? Object.keys(r) : []);
-    this.relatedEntitiesData = He(o.map(
+    this.relatedEntitiesData = je(o.map(
       (l) => Array.isArray(r[l.attributeName]) ? r[l.attributeName].map((d) => new L(this.map, l.recordName, d, l)) : new L(this.map, l.recordName, r[l.attributeName], l)
     )), this.valueAttributes = a, this.entityIdAttributes = n;
     const c = this.map.getRecordInfo(this.recordName);
@@ -6408,6 +6416,12 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     const i = await this.state.currentState.get(r), s = this.transitionFinder?.findNextState(i, e);
     return s ? (await this.state.currentState.set(r, s.name), s.computeValue ? await s.computeValue.call(this.controller, t, e) : s.name) : A.skip();
   }
+  // 给外部用的，因为可能在 Transform 里面设置初始值。
+  async createStateData(t) {
+    return {
+      [this.state.currentState.key]: t.name
+    };
+  }
 }
 const Di = Y.create({
   name: "nonExistent",
@@ -7807,7 +7821,7 @@ const Jr = [
   Br,
   Wr
 ];
-class H extends Error {
+class j extends Error {
   constructor(t, e = {}) {
     super(`${t}. Caused by: ${e.causedBy?.message}`), this.name = this.constructor.name, this.timestamp = /* @__PURE__ */ new Date(), this.errorId = this.generateErrorId(), this.errorType = e.errorType || this.constructor.name, this.context = e.context || {}, this.causedBy = e.causedBy, this.stackTrace = this.stack, Object.setPrototypeOf(this, new.target.prototype);
   }
@@ -7820,7 +7834,7 @@ class H extends Error {
   getErrorChain() {
     const t = [this];
     let e = this.causedBy;
-    for (; e && (t.push(e), e instanceof H); )
+    for (; e && (t.push(e), e instanceof j); )
       e = e.causedBy;
     return t;
   }
@@ -7925,7 +7939,7 @@ Stack trace:`, i.stack.split(`
   }
 }
 var V = /* @__PURE__ */ ((u) => (u.LOW = "low", u.MEDIUM = "medium", u.HIGH = "high", u.CRITICAL = "critical", u))(V || {}), Z = /* @__PURE__ */ ((u) => (u.VALIDATION = "validation", u.PERMISSION = "permission", u.COMPUTATION = "computation", u.STORAGE = "storage", u.INTERACTION = "interaction", u.ACTIVITY = "activity", u.SYSTEM = "system", u.CONFIGURATION = "configuration", u))(Z || {});
-class U extends H {
+class U extends j {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "InteractionExecutionError",
@@ -7941,7 +7955,7 @@ class U extends H {
     }), this.interactionName = e.interactionName, this.userId = e.userId, this.payload = e.payload, this.executionPhase = e.executionPhase, this.severity = e.severity || V.HIGH;
   }
 }
-class ne extends H {
+class ne extends j {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "ActivityError",
@@ -7957,7 +7971,7 @@ class ne extends H {
     }), this.activityName = e.activityName, this.activityId = e.activityId, this.activityInstanceId = e.activityInstanceId, this.currentState = e.currentState, this.severity = e.severity || V.MEDIUM;
   }
 }
-class Q extends H {
+class Q extends j {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "ComputationError",
@@ -8003,7 +8017,7 @@ class J extends Q {
     }), this.depName = e.depName, this.depType = e.depType, this.missingData = e.missingData, this.invalidData = e.invalidData;
   }
 }
-class j extends H {
+class H extends j {
   constructor(t, e = {}) {
     super(t, {
       errorType: e.context?.errorType || "SchedulerError",
@@ -8017,7 +8031,7 @@ class j extends H {
     }), this.schedulingPhase = e.schedulingPhase, this.failedComputations = e.failedComputations, this.severity = V.HIGH;
   }
 }
-class O extends H {
+class O extends j {
   constructor(t, e) {
     super(t, {
       errorType: e.context?.errorType || "ConditionError",
@@ -8090,7 +8104,7 @@ class O extends H {
     });
   }
 }
-const tt = "_System_", _ = "_Dictionary_", et = "id", ot = "_rowId", jr = C.create({
+const tt = "_System_", _ = "_Dictionary_", et = "id", ot = "_rowId", Hr = C.create({
   name: tt,
   properties: [
     T.create({
@@ -8109,7 +8123,7 @@ const tt = "_System_", _ = "_Dictionary_", et = "id", ot = "_rowId", jr = C.crea
       collection: !1
     })
   ]
-}), Hr = C.create({
+}), jr = C.create({
   name: _,
   properties: [
     T.create({
@@ -8318,19 +8332,23 @@ class Ur {
 const Dt = "_ASYNC_TASK_";
 class Gr {
   constructor(t, e, r, i, s) {
-    this.controller = t, this.computations = /* @__PURE__ */ new Set(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new Ur(this.controller, this), this.buildComputationHandleMap(s);
+    this.controller = t, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.sourceMapManager = new Ur(this.controller, this), this.buildComputationHandleMap(s);
     const a = [];
-    e.forEach((o) => {
-      o.computation && a.push({ dataContext: { type: "entity", id: o }, args: o.computation }), o.properties?.forEach((n) => {
+    i.forEach((o) => {
+      o.computation && a.push({ dataContext: { type: "global", id: o }, args: o.computation });
+    }), e.forEach((o) => {
+      o.computation && a.push({ dataContext: { type: "entity", id: o }, args: o.computation });
+    }), r.forEach((o) => {
+      const n = o;
+      n.computation && a.push({ dataContext: { type: "relation", id: o }, args: n.computation });
+    }), e.forEach((o) => {
+      o.properties?.forEach((n) => {
         n.computation && a.push({ dataContext: { type: "property", host: o, id: n }, args: n.computation });
       });
     }), r.forEach((o) => {
-      const n = o;
-      n.computation && a.push({ dataContext: { type: "relation", id: o }, args: n.computation }), n.properties && n.properties.forEach((c) => {
+      o.properties?.forEach((c) => {
         c.computation && a.push({ dataContext: { type: "property", host: o, id: c }, args: c.computation });
       });
-    }), i.forEach((o) => {
-      o.computation && a.push({ dataContext: { type: "global", id: o.name }, args: o.computation });
     });
     for (const o of a) {
       const n = o.dataContext, c = o.args, l = this.computationHandleMap.get(c.constructor);
@@ -8338,7 +8356,7 @@ class Gr {
       const d = l[n.type];
       v(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
       const h = new d(this.controller, c, n);
-      if (this.computations.add(h), this.isAsyncComputation(h)) {
+      if (this.computationsHandles.set(n.id, h), this.isAsyncComputation(h)) {
         if (h.dataContext.type === "property") {
           const p = C.create({
             name: this.getAsyncTaskRecordKey(h),
@@ -8455,11 +8473,11 @@ class Gr {
     }
   }
   getBoundStateName(t, e, r) {
-    return `_${t.type === "property" ? `${t.host.name}_${t.id.name}` : t.type === "entity" || t.type === "relation" ? t.id.name : t.id}_bound_${e}`;
+    return `_${t.type === "property" ? `${t.host.name}_${t.id.name}` : t.id.name}_bound_${e}`;
   }
   createStates() {
     const t = [];
-    for (const e of this.computations)
+    for (const e of this.computationsHandles.values())
       if (e.createState) {
         const r = e.createState();
         t.push({ dataContext: e.dataContext, state: r }), e.state = r;
@@ -8472,12 +8490,16 @@ class Gr {
             else if (e.dataContext.type === "relation")
               s.record = e.dataContext.id.name;
             else
-              throw new Error(`global data context ${e.dataContext.id} must specify record name for RecordBoundState`);
+              throw new Error(`global data context ${e.dataContext.id.name} must specify record name for RecordBoundState`);
       }
     return t;
   }
+  async createStateData(t, ...e) {
+    const r = this.computationsHandles.get(t);
+    return v(!!r, "cannot find computation handle"), r.createStateData?.(...e) ?? {};
+  }
   async setupDefaultValues() {
-    for (const t of this.computations)
+    for (const t of this.computationsHandles.values())
       if (t.getDefaultValue)
         if (t.dataContext.type === "global" || t.dataContext.type === "entity" || t.dataContext.type === "relation") {
           const e = await t.getDefaultValue();
@@ -8493,8 +8515,8 @@ class Gr {
           });
         }
   }
-  async setupStateDefaultValues() {
-    for (const t of this.computations) {
+  async setupGlobalBoundStateDefaultValues() {
+    for (const t of this.computationsHandles.values()) {
       const e = t;
       if (e.state)
         for (const r of Object.values(e.state))
@@ -8502,7 +8524,7 @@ class Gr {
     }
   }
   async setupMutationListeners() {
-    this.sourceMapManager.initialize(this.computations), this.dataSourceMapTree = this.sourceMapManager.getSourceMapTree(), this.controller.system.storage.listen(async (t) => {
+    this.sourceMapManager.initialize(new Set(this.computationsHandles.values())), this.dataSourceMapTree = this.sourceMapManager.getSourceMapTree(), this.controller.system.storage.listen(async (t) => {
       for (let e of t) {
         const r = this.sourceMapManager.findSourceMapsForMutation(e);
         if (r.length > 0)
@@ -8621,7 +8643,7 @@ class Gr {
           }
       }
     } catch (r) {
-      throw r instanceof Q ? r : new j("Unexpected error in dirty records computation", {
+      throw r instanceof Q ? r : new H("Unexpected error in dirty records computation", {
         schedulingPhase: "dirty-records-processing",
         failedComputations: [t.computation.args.constructor.displayName],
         causedBy: r instanceof Error ? r : new Error(String(r))
@@ -8632,7 +8654,7 @@ class Gr {
     if (t.dataContext.type === "property") {
       const e = t.dataContext;
       return `${Dt}_${e.host.name}_${e.id.name}`;
-    } else return t.dataContext.type === "global" ? `${Dt}_${t.dataContext.id}` : `${Dt}_${t.dataContext.type}_${t.dataContext.id?.name || t.dataContext.id}`;
+    } else return t.dataContext.type === "global" ? `${Dt}_${t.dataContext.id.name}` : `${Dt}_${t.dataContext.type}_${t.dataContext.id?.name}`;
   }
   async createAsyncTask(t, e, r, i) {
     if (t.dataContext.type === "property")
@@ -8850,15 +8872,15 @@ class Gr {
       try {
         await this.setupDefaultValues();
       } catch (t) {
-        throw new j("Failed to setup computation default values", {
+        throw new H("Failed to setup computation default values", {
           schedulingPhase: "default-values-setup",
           causedBy: t instanceof Error ? t : new Error(String(t))
         });
       }
       try {
-        await this.setupStateDefaultValues();
+        await this.setupGlobalBoundStateDefaultValues();
       } catch (t) {
-        throw new j("Failed to setup computation state default values", {
+        throw new H("Failed to setup computation state default values", {
           schedulingPhase: "state-default-values-setup",
           causedBy: t instanceof Error ? t : new Error(String(t))
         });
@@ -8866,7 +8888,7 @@ class Gr {
       try {
         await this.setupMutationListeners();
       } catch (t) {
-        throw new j("Failed to setup mutation listeners for computations", {
+        throw new H("Failed to setup mutation listeners for computations", {
           schedulingPhase: "mutation-listeners-setup",
           causedBy: t instanceof Error ? t : new Error(String(t))
         });
@@ -8874,13 +8896,13 @@ class Gr {
       try {
         await this.setupGlobalDict();
       } catch (t) {
-        throw new j("Failed to setup global dictionary", {
+        throw new H("Failed to setup global dictionary", {
           schedulingPhase: "global-dict-setup",
           causedBy: t instanceof Error ? t : new Error(String(t))
         });
       }
     } catch (t) {
-      throw t instanceof j ? t : new j("Unexpected error during scheduler setup", {
+      throw t instanceof H ? t : new H("Unexpected error during scheduler setup", {
         schedulingPhase: "top-level-setup",
         causedBy: t instanceof Error ? t : new Error(String(t))
       });
@@ -9046,14 +9068,9 @@ class Ae {
     let e;
     if (C.is(this.interaction.data) || P.is(this.interaction.data)) {
       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);
+        this.interaction.query?.items?.map((p) => [p.name, p.value]) || []
+      ), { match: s, modifier: a, attributeQuery: o } = i, n = { ...t.query?.modifier || {}, ...a || {} }, c = t.query?.attributeQuery || [], l = typeof s == "function" ? await s.call(this.controller, t) : s, d = l instanceof R ? l : l ? R.atom(l) : void 0, h = R.and(d, t.query?.match);
+      e = await this.system.storage.find(r, h, n, c);
     } else
       v(!1, `unknown data type ${this.interaction.data}`);
     return e;
@@ -9627,7 +9644,7 @@ class Li {
   }
   async retrieveLastValue(t, e) {
     if (t.type === "global")
-      return this.system.storage.dict.get(t.id);
+      return this.system.storage.dict.get(t.id.name);
     if (t.type === "entity" || t.type === "relation")
       return this.system.storage.find(t.id.name, void 0, void 0, ["*"]);
     {
@@ -9638,7 +9655,7 @@ class Li {
   async applyResult(t, e, r) {
     if (!(e instanceof kt)) {
       if (t.type === "global")
-        return this.system.storage.dict.set(t.id, e);
+        return this.system.storage.dict.set(t.id.name, e);
       if (t.type === "entity") {
         if (e == null) return;
         const i = t;
@@ -9664,7 +9681,7 @@ class Li {
     const i = Array.isArray(e) ? e : [e];
     for (const s of i) {
       if (t.type === "global")
-        return this.system.storage.dict.set(t.id, s);
+        return this.system.storage.dict.set(t.id.name, s);
       if (t.type === "entity" || t.type === "relation") {
         const a = t;
         if (s.type === "insert")
@@ -10005,7 +10022,7 @@ class _i {
         }
       });
     }), this.storage.setup(
-      [...a, Hr, jr],
+      [...a, jr, Hr],
       o,
       i
     );
@@ -10119,7 +10136,7 @@ let di = class {
     return he();
   }
 };
-class ji {
+class Hi {
   constructor(t, e = {}) {
     this.database = t, this.options = e, this.idSystem = new di(this), this.logger = this.options?.logger || Rt, this.db = new Pe(this.database);
   }
@@ -10248,7 +10265,7 @@ class hi {
     return e === void 0 ? await this.db.scheme(`INSERT INTO "_IDS_" (name, last) VALUES ('${t}', ${r})`, i) : await this.db.update('UPDATE "_IDS_" SET last = ? WHERE name = ?', [r, t], void 0, i), r;
   }
 }
-class Hi {
+class ji {
   constructor(t, e = {}) {
     this.database = t, this.options = e, this.idSystem = new hi(this), this.logger = this.options?.logger || Rt;
   }
@@ -10330,7 +10347,7 @@ class Hi {
 }
 export {
   Tt as ACTIVITY_RECORD,
-  je as ALL_ATTR_SYMBOL,
+  He as ALL_ATTR_SYMBOL,
   Dt as ASYNC_TASK_RECORD,
   Ct as Action,
   Jt as Activity,
@@ -10359,7 +10376,7 @@ export {
   ve as ComputationResultResolved,
   kt as ComputationResultSkip,
   ce as ComputationStateError,
-  jt as Condition,
+  Ht as Condition,
   O as ConditionError,
   Mt as Conditions,
   Li as Controller,
@@ -10372,10 +10389,10 @@ export {
   dr as DBSetup,
   Fi as DELETED_STATE,
   _ as DICTIONARY_RECORD,
-  Ht as DataAttributive,
+  jt as DataAttributive,
   zt as DataAttributives,
   Bt as Dictionary,
-  Hr as DictionaryEntity,
+  jr as DictionaryEntity,
   C as Entity,
   _r as EntityCustomHandle,
   Ye as EntityQueryHandle,
@@ -10411,11 +10428,11 @@ export {
   m as MatchExp,
   Je as Modifier,
   _i as MonoSystem,
-  Hi as MysqlDB,
+  ji as MysqlDB,
   Oi as NON_DELETED_STATE,
   Di as NON_EXIST_STATE,
   L as NewRecordData,
-  ji as PGLiteDB,
+  Hi as PGLiteDB,
   Xt as Payload,
   Kt as PayloadItem,
   Wi as PostgreSQLDB,
@@ -10458,7 +10475,7 @@ export {
   ht as Summation,
   Fr as SummationHandles,
   re as SystemConsoleLogger,
-  jr as SystemEntity,
+  Hr as SystemEntity,
   ci as SystemLogLevel,
   ye as Transfer,
   xt as Transform,