interaqt 0.8.10 → 0.8.12

package/dist/index.js

@@ -1154,7 +1154,10 @@ class R {
     const r = e.concat(this.raw);
     if (this.isAtom()) {
       const s = this.raw.data, a = await t(s);
-      return a && !i || !a && i ? !0 : { data: s, inverse: i, stack: e, error: "atom evaluate error" };
+      if (typeof a == "string")
+        return { data: s, inverse: i, stack: e, error: a };
+      const o = a;
+      return o && !i || !o && i ? !0 : { data: s, inverse: i, stack: e, error: "atom evaluate error" };
     }
     if (this.isOr())
       return await this.left.evaluateAsync(t, r) === !0 ? !0 : this.right.evaluateAsync(t, r);
@@ -3380,8 +3383,8 @@ class m {
         const n = [...a.resolvedPath, o], c = this.map.getInfoByPath(n), l = a.resolvedPath.concat(c?.isLinkFiltered() ? c.getBaseAttributeInfo().attributeName : o);
         let d = a.matchExpression;
         if (c?.isLinkFiltered()) {
-          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), g = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], A = p.rebase(g.join("."));
-          d = d ? d.and(A) : A;
+          const h = c.getLinkInfo(), p = new m(h.getResolvedBaseRecordName(), this.map, h.getResolvedMatchExpression()), y = this.map.getReversePath(l), g = [c.isRecordSource() ? "source" : "target", ...y.slice(2)], k = p.rebase(g.join("."));
+          d = d ? d.and(k) : k;
         }
         return {
           path: [...a.path, o],
@@ -3570,6 +3573,21 @@ class $e {
       order: e
     }));
   }
+  /**
+   * 构建 xToOne 查询树
+   * 用于确保 ORDER BY 中引用的关联字段会触发相应的 JOIN
+   */
+  get xToOneQueryTree() {
+    const t = new L(this.recordName, this.map);
+    return Object.keys(this.data?.orderBy || {}).forEach((e) => {
+      const i = e.split(".");
+      if (i.length === 1) {
+        t.addField([e]);
+        return;
+      }
+      i.slice(0, -1), t.addField(i);
+    }), t;
+  }
 }
 class C {
   constructor(t, e, i, r, s, a, o, n, c, l = !1, d, h, p, y) {
@@ -3702,7 +3720,7 @@ class x {
         let y = l, v = d;
         if (p.isLinkFiltered()) {
           y = p.getBaseAttributeInfo().attributeName;
-          const A = d.matchExpression, D = p.getLinkInfo().getBaseLinkInfo(), z = new m(D.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), ke = A ? z.and(A.data) : z;
+          const k = d.matchExpression, D = p.getLinkInfo().getBaseLinkInfo(), z = new m(D.name, this.map, p.getMatchExpression()).rebase(p.isRecordSource() ? "target" : "source"), ke = k ? z.and(k.data) : z;
           v = {
             ...d,
             matchExpression: ke.data
@@ -4379,28 +4397,28 @@ class Le {
    * @returns [SQL字符串, 参数数组, 字段别名映射]
    */
   buildXToOneFindQuery(t, e = "", i) {
-    const r = t.attributeQuery.xToOneQueryTree, s = t.matchExpression.xToOneQueryTree, a = r.merge(s), o = this.getJoinTables(a, [t.recordName]), n = i || this.getPlaceholder(), c = t.matchExpression.buildFieldMatchExpression(n, this.database), [l, d] = this.buildWhereClause(
-      this.parseMatchExpressionValue(t.recordName, c, t.contextRootEntity, n),
+    const r = t.attributeQuery.xToOneQueryTree, s = t.matchExpression.xToOneQueryTree, a = t.modifier.xToOneQueryTree, o = r.merge(s).merge(a), n = this.getJoinTables(o, [t.recordName]), c = i || this.getPlaceholder(), l = t.matchExpression.buildFieldMatchExpression(c, this.database), [d, h] = this.buildWhereClause(
+      this.parseMatchExpressionValue(t.recordName, l, t.contextRootEntity, c),
       e,
-      n
-    ), [h, p] = this.buildSelectClause(
+      c
+    ), [p, y] = this.buildSelectClause(
       t.attributeQuery.getValueAndXToOneRecordFields(),
       e
-    ), y = this.buildFromClause(t.recordName, e), v = this.buildJoinClause(o, e), g = this.buildModifierClause(t.modifier, e, p);
+    ), v = this.buildFromClause(t.recordName, e), g = this.buildJoinClause(n, e), k = this.buildModifierClause(t.modifier, e, y);
     return [
       `
 SELECT
-${h}
+${p}
 FROM
-${y}
 ${v}
+${g}
 WHERE
-${l}
+${d}
 
-${g}
+${k}
 `,
-      d,
-      p
+      h,
+      y
     ];
   }
   /**
@@ -4461,11 +4479,14 @@ ${g}
   buildModifierClause(t, e = "", i) {
     const { limit: r, offset: s, orderBy: a } = t, o = [];
     return a.length && o.push(`ORDER BY ${a.map(({ attribute: n, recordName: c, order: l }) => {
-      const d = [
-        `${this.withPrefix(e)}${c}`,
-        n
-      ];
-      return `"${i.getAlias(d) || d.join(".")}" ${l}`;
+      const d = n.split(".");
+      let h, p;
+      d.length === 1 ? (h = [c], p = n) : (h = [c, ...d.slice(0, -1)], p = d[d.length - 1]);
+      const [y, v] = this.map.getTableAliasAndFieldName(
+        h,
+        p
+      );
+      return `"${`${this.withPrefix(e)}${y}`}"."${v}" ${l}`;
     }).join(",")}`), r && o.push(`LIMIT ${r}`), s && o.push(`OFFSET ${s}`), o.join(`
 `);
   }
@@ -4511,22 +4532,22 @@ ${g}
             joinTarget: [d, h]
           });
         } else {
-          const g = c.getLinkInfo(), A = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : g.isRelationSource(c.parentEntityName, c.attributeName);
+          const g = c.getLinkInfo(), k = c.isLinkManyToManySymmetric() ? c.symmetricDirection === "source" : g.isRelationSource(c.parentEntityName, c.attributeName);
           r.push({
             for: l,
             joinSource: a,
-            joinIdField: [s, A ? g.record.attributes.source.field : g.record.attributes.target.field],
+            joinIdField: [s, k ? g.record.attributes.source.field : g.record.attributes.target.field],
             joinTarget: [p, y]
           }), o.onlyIdField() || r.push({
             for: l,
             joinSource: [p, y],
-            joinIdField: [A ? g.record.attributes.target.field : g.record.attributes.source.field, v],
+            joinIdField: [k ? g.record.attributes.target.field : g.record.attributes.source.field, v],
             joinTarget: [d, h]
           });
         }
       if (r.push(...this.getJoinTables(o, l, [v, d, h])), o.parentLinkQueryTree && !o.parentLinkQueryTree.onlyIdField()) {
-        const g = l.concat(f), [, A] = this.map.getTableAliasAndFieldName(g, "id", !0), D = [
-          A,
+        const g = l.concat(f), [, k] = this.map.getTableAliasAndFieldName(g, "id", !0), D = [
+          k,
           // link 的 idField
           p,
           // link 的 tableName
@@ -4732,8 +4753,8 @@ class Be {
             value: ["=", y.id]
           }), g = d.derive({
             matchExpression: v
-          }), A = t.label ? l.concat(y) : l;
-          y[d.alias || d.attributeName] = await this.findRecords(g, e, i, A);
+          }), k = t.label ? l.concat(y) : l;
+          y[d.alias || d.attributeName] = await this.findRecords(g, e, i, k);
         }
       }
     for (let d of t.attributeQuery.xToOneRecords) {
@@ -4742,10 +4763,10 @@ class Be {
         for (let p of h.attributeQuery.xToManyRecords) {
           const v = this.map.getInfo(p.parentRecord, p.attributeName).getReverseInfo()?.attributeName;
           for (let g of c) {
-            const A = g[d.attributeName][f].id, D = p.derive({
+            const k = g[d.attributeName][f].id, D = p.derive({
               matchExpression: p.matchExpression.and({
                 key: `${v}.id`,
-                value: ["=", A]
+                value: ["=", k]
               })
             }), J = t.label ? l.concat(g) : l;
             Et(
@@ -4831,21 +4852,21 @@ class Be {
       matchExpression: c,
       attributeQuery: l
     }), h = await this.findRecords(d, `finding related record: ${r.parentRecord}.${r.attributeName}`, s, a), p = r.attributeQuery.parentLinkRecordQuery ? h.map((g) => {
-      let A;
-      return o.isLinkManyToManySymmetric() ? (A = {
+      let k;
+      return o.isLinkManyToManySymmetric() ? (k = {
         ...g,
         [f]: g[`${n}:source`]?.[f]?.id ? g[`${n}:source`]?.[f] : g[`${n}:target`]?.[f]
-      }, delete A[`${n}:source`], delete A[`${n}:target`]) : (A = {
+      }, delete k[`${n}:source`], delete k[`${n}:target`]) : (k = {
         ...g,
         [f]: g[n][f]
-      }, delete A[n]), A;
+      }, delete k[n]), k;
     }) : h, y = d.label && d.label !== a.label ? a.spawn(d.label) : a, v = r.attributeQuery.parentLinkRecordQuery;
     if (v)
       for (let g of v.attributeQuery.xToManyRecords)
-        for (let A of p) {
-          const D = A[f].id, J = d.label ? y.concat(A) : y;
+        for (let k of p) {
+          const D = k[f].id, J = d.label ? y.concat(k) : y;
           Et(
-            A,
+            k,
             [f, g.attributeName],
             await this.findXToManyRelatedRecords(
               g.parentRecord,
@@ -5654,13 +5675,13 @@ class je {
     for (let h = 0; h < i.length; h++) {
       const [p, y] = this.getAttributeAndSymmetricDirection(i[h]), v = [e, ...i.slice(0, h + 1)];
       if (p === f) {
-        const { linkTable: g, linkAlias: A, path: D } = d.pop();
-        b(!c, `last attribute in path is a link, cannot read link of a link ${D.join(".")}`), s = g, a = A, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
+        const { linkTable: g, linkAlias: k, path: D } = d.pop();
+        b(!c, `last attribute in path is a link, cannot read link of a link ${D.join(".")}`), s = g, a = k, r = this.data.records[l.linkName], c = !0, o = "", n = "", l = void 0;
       } else {
         l = this.getInfoByPath(v);
         const g = r.attributes[p];
         b(l.isRecord, `${i.slice(0, h + 1).join(".")} is not a entity attribute`);
-        const A = this.data.records[g.recordName], D = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`, J = this.aliasManager?.getTableAlias(D) || D;
+        const k = this.data.records[g.recordName], D = `${a}_${p}${y ? `_${y.toUpperCase()}` : ""}`, J = this.aliasManager?.getTableAlias(D) || D;
         if (l.isMergedWithParent() || l.isLinkMergedWithParent())
           n = a;
         else if (l.isLinkIsolated()) {
@@ -5668,7 +5689,7 @@ class je {
           n = this.aliasManager?.getTableAlias(z) || z;
         } else
           n = J;
-        l.isMergedWithParent() || (a = J), s = l.table, r = A, o = l.getLinkInfo()?.table, c = !1;
+        l.isMergedWithParent() || (a = J), s = l.table, r = k, o = l.getLinkInfo()?.table, c = !1;
       }
       d.push({
         table: s,
@@ -6538,9 +6559,9 @@ class oi {
           p[0] === "1" && p[1] === "1" && y !== v,
           `only 1:1 can merge: ${s}.${a.slice(0, n + 1).join(".")}`
         );
-        const g = y === o ? v : y, A = this.combineRecordTable(o, g, d);
-        if (A)
-          throw new Error(`conflict found when join ${d}, ${A.join(",")} already merged with ${o}`);
+        const g = y === o ? v : y, k = this.combineRecordTable(o, g, d);
+        if (k)
+          throw new Error(`conflict found when join ${d}, ${k.join(",")} already merged with ${o}`);
         h.mergedTo = "combined", i.push(h), o = l.recordName, delete t[d], delete e[d];
       }
     }), Object.values(t).forEach((r) => {
@@ -7022,7 +7043,7 @@ class Re {
     return this.data.transfers.filter((e) => $t(t, e.trigger));
   }
 }
-function k(u, t) {
+function A(u, t) {
   if (!u)
     throw new Error(t);
 }
@@ -7103,7 +7124,7 @@ class pi {
   }
   async getInitialValue(t) {
     const e = t[this.dataContext.id.name];
-    return k(
+    return A(
       !(e !== void 0 && !this.initialState.computeValue),
       `${this.dataContext.host.name}.${this.dataContext.id.name} have been set when ${this.dataContext.host.name} created, 
 if you want to save the use the initial value, you need to define computeValue in initialState to save it.
@@ -7191,7 +7212,7 @@ class mi {
 }
 class yi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), k(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.matchRecordToWeight = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), A(this.relation, "weighted summation computation must specify property"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "weighted summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -7321,7 +7342,7 @@ class bi {
 }
 class Ri {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "every computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((a) => a[0] !== f) || [];
     const s = (r.find((a) => a[0] === f) || [])[1]?.attributeQuery;
@@ -7449,12 +7470,12 @@ class Ni {
 }
 class vi {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), k(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback.bind(this.controller), this.relation = this.controller.relations.find((n) => n.source === i.host && n.sourceProperty === this.args.property || n.target === i.host && n.targetProperty === this.args.property), A(this.relation, `cannot find relation for property ${this.args.property} in "Any" computation`), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "any computation relation direction error");
     let r = this.relation.baseRelation || this.relation;
     for (; r.baseRelation; )
       r = r.baseRelation;
     const s = r.type.split(":");
-    k(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    A(s[this.isSource ? 1 : 0] === "n", `property-level Any computation argument must be an x:n relation. ${this.dataContext.host.name}.${this.args.property}" is a ${this.isSource ? s.join(":") : s.slice().reverse().join(":")} relation`), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const a = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((n) => n[0] !== f) || [];
     const o = (a.find((n) => n[0] === f) || [])[1]?.attributeQuery;
@@ -7576,7 +7597,7 @@ class ki {
 }
 class Ai {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.callback = this.args.callback?.bind(this.controller), this.args.property ? this.relation = this.controller.relations.find((a) => a.source === i.host && a.sourceProperty === this.args.property || a.target === i.host && a.targetProperty === this.args.property) : this.relation = this.args.record, this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "count computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((a) => a && a[0] !== f) || [];
     const s = (r.find((a) => a && a[0] === f) || [])[1]?.attributeQuery;
@@ -7659,7 +7680,7 @@ class Ai {
 const Si = [ki, Ai];
 class Ei {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, k(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), k(!(this.args.dataDeps && this.args.eventDeps), "Transform must have either dataDeps or eventDeps"), this.transformCallback = this.args.callback.bind(this.controller), this.args.eventDeps ? this.eventDeps = this.args.eventDeps : (k(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, A(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), A(!(this.args.dataDeps && this.args.eventDeps), "Transform must have either dataDeps or eventDeps"), this.transformCallback = this.args.callback.bind(this.controller), this.args.eventDeps ? this.eventDeps = this.args.eventDeps : (A(this.args.dataDeps?._source === void 0, "dataDep name `_source` is reserved for Transform"), this.dataDeps = {
       ...this.args.dataDeps || {},
       _source: {
         type: "records",
@@ -7684,7 +7705,7 @@ class Ei {
     return [];
   }
   async compute({ _source: t }) {
-    k(!this.eventDeps, "Transform compute should not be called with eventDeps");
+    A(!this.eventDeps, "Transform compute should not be called with eventDeps");
     const e = [];
     for (const i of t) {
       const r = await this.transformCallback.call(this.controller, i);
@@ -7699,7 +7720,7 @@ class Ei {
     return e;
   }
   async computeDirtyRecords(t) {
-    return k(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
+    return A(this.eventDeps, "computeDirtyRecords should be called with eventDeps"), [{}];
   }
   async incrementalPatchCompute(t, e) {
     return this.eventDeps ? this.eventBasedIncrementalPatchCompute(t, e) : this.dataBasedIncrementalPatchCompute(t, e);
@@ -8171,7 +8192,7 @@ class Pi {
 }
 class $i {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), k(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), A(this.relation, "summation computation must specify either property or record"), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "summation computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = this.args.attributeQuery?.filter((o) => o[0] !== f) || [];
     const s = (r.find((o) => o[0] === f) || [])[1]?.attributeQuery;
@@ -8334,7 +8355,7 @@ class Oi {
 }
 class Di {
   constructor(t, e, i) {
-    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, k(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
+    this.controller = t, this.args = e, this.dataContext = i, this.useLastValue = !0, this.dataDeps = {}, this.relation = this.controller.relations.find((o) => o.source === i.host && o.sourceProperty === this.args.property || o.target === i.host && o.targetProperty === this.args.property), this.isSource = this.args.direction ? this.args.direction === "source" : this.relation.source.name === i.host.name, A(this.isSource ? this.relation.source === i.host : this.relation.target === i.host, "average computation relation direction error"), this.relationAttr = this.isSource ? this.relation.sourceProperty : this.relation.targetProperty, this.relatedRecordName = this.isSource ? this.relation.target.name : this.relation.source.name, this.property = this.args.property || this.relationAttr, this.reverseProperty = this.isSource ? this.relation.targetProperty : this.relation.sourceProperty;
     const r = this.args.attributeQuery || [];
     this.relatedAttributeQuery = r.filter((o) => o && o[0] !== f) || [];
     const s = (r.find((o) => o && o[0] === f) || [])[1]?.attributeQuery;
@@ -8510,7 +8531,7 @@ class Bi extends St {
   constructor(t, e, i) {
     if (e.dataDeps) {
       const r = Object.keys(e.dataDeps).filter((s) => e.dataDeps[s].type === "records");
-      k(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
+      A(r.length === 0, `property-level custom computation dataDeps should not contain "records” type dataDeps, but got ${r.join(", ")}
 If you want to use related entity/relation as dataDeps, please use "property" type dataDeps with args: { type: "property", attributeQuery: [attributeQuery] }
 If you want to use aggregated data from all records in the entity/relation, you should define a different dict value to store the aggregated data, and then use the dict value as dataDeps.
 `);
@@ -8846,9 +8867,9 @@ class Ji {
     });
     for (const o of a) {
       const n = o.dataContext, c = o.args, l = this.computationHandleMap.get(c.constructor);
-      k(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
+      A(!!l, `cannot find Computation handle map for ${c.constructor.displayName || c.constructor.name}`);
       const d = l[n.type];
-      k(!!d, `cannot find Computation handle for ${c.constructor.displayName || c.constructor.name} with context type ${n.type}`);
+      A(!!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.computationsHandles.set(n.id, h), this.isAsyncComputation(h)) {
         if (h.dataContext.type === "property") {
@@ -8960,7 +8981,7 @@ class Ji {
         const r = this.computationHandleMap.get(i.computationType);
         if (Array.isArray(i.contextType))
           for (const s of i.contextType)
-            k(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
+            A(!r[s], `${s} for ${i.computationType.name} is already registered.`), r[s] = e;
         else
           r[i.contextType] = e;
       }
@@ -8990,13 +9011,13 @@ class Ji {
   }
   async createStateData(t, ...e) {
     const i = this.computationsHandles.get(t);
-    return k(!!i, "cannot find computation handle"), i.createStateData?.(...e) ?? {};
+    return A(!!i, "cannot find computation handle"), i.createStateData?.(...e) ?? {};
   }
   addMutationPropertyComputationDefaultValueListeners() {
     for (const t of this.computationsHandles.values())
       if (t.getInitialValue && t.dataContext.type === "property") {
         const e = t.dataContext;
-        k(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
+        A(!e.id.defaultValue, `${e.host.name}.${e.id.name} property shuold not has a defaultValue, because it will be overridden by computation`), this.controller.system.storage.listen(async (i) => {
           for (let r of i)
             if (r.type === "create" && r.recordName === e.host.name) {
               const s = await t.getInitialValue?.(r.record);
@@ -9035,11 +9056,11 @@ class Ji {
       return [e.oldRecord ?? e.record];
     let i = [];
     if (!t.isRelation)
-      k(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
+      A(t.type === "update", "only support update event for entity"), i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat("id").join("."),
         value: ["=", e.oldRecord.id]
       }), void 0);
-    else if (k(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
+    else if (A(t.type === "create" || t.type === "delete", "only support create/delete event for relation"), t.dataDep, t.type === "create")
       i = await this.controller.system.storage.find(t.sourceRecordName, m.atom({
         key: t.targetPath.concat(["&", "id"]).join("."),
         value: ["=", e.record.id]
@@ -9499,7 +9520,9 @@ class we {
           try {
             o = await a.call(this.controller, t);
           } catch (n) {
-            console.warn("check function throw", n), o = !1;
+            console.warn("check function throw", n);
+            const c = n instanceof Error ? n.message : String(n);
+            return `Condition '${s.name}' threw exception: ${c}`;
           }
           return o === void 0 ? (console.warn(`condition ${s.name} returned undefined, maybe not implemented, we will return true for now`), !0) : o;
         } else
@@ -9522,7 +9545,7 @@ class we {
       return [o.name, { result: n, error: c }];
     })()), a = await Promise.all(s);
     for (let [o, { result: n, error: c }] of a)
-      k(!i.sideEffects[o], `sideEffect ${o} already exists`), i.sideEffects[o] = { result: n, error: c };
+      A(!i.sideEffects[o], `sideEffect ${o} already exists`), i.sideEffects[o] = { result: n, error: c };
   }
   isGetInteraction() {
     return this.interaction.action === Me;
@@ -9538,7 +9561,7 @@ class we {
       const a = { ...t.query?.modifier || {}, ...s || {} }, o = t.query?.attributeQuery || [], n = typeof r == "function" ? await r.call(this.controller, t) : r, c = R.and(n, t.query?.match);
       e = await this.system.storage.find(i, c, a, o);
     } else
-      k(!1, `unknown data type ${this.interaction.data}`);
+      A(!1, `unknown data type ${this.interaction.data}`);
     return e;
   }
   async check(t, e, i, r) {
@@ -9657,7 +9680,7 @@ class oe {
 }
 class tt {
   constructor(t, e) {
-    this.activity = t, this.controller = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.uuidToInteractionCall = /* @__PURE__ */ new Map(), this.interactionCallByName = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (i, r, s) => (k(i.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[i.name] === r.id), this.system = e.system, this.graph = this.buildGraph(t);
+    this.activity = t, this.controller = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.uuidToInteractionCall = /* @__PURE__ */ new Map(), this.interactionCallByName = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.checkUserRef = async (i, r, s) => (A(i.isRef, "attributive must be ref"), ((await this.getActivity(s))?.refs)[i.name] === r.id), this.system = e.system, this.graph = this.buildGraph(t);
   }
   static {
     this.cache = /* @__PURE__ */ new Map();
@@ -9693,7 +9716,7 @@ class tt {
     const s = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]), a = /* @__PURE__ */ new Set([...Object.values(t.interactions), ...Object.values(t.groups)]);
     if (t.transfers?.forEach((o) => {
       const n = this.rawToNode.get(o.source) || i.get(o.source), c = this.rawToNode.get(o.target) || i.get(o.target);
-      k(!!n, `cannot find source ${o.source.name}`), k(!!c, `cannot find target ${o.source.name}`), it.is(n) ? n.next.push(c) : n.next = c, it.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
+      A(!!n, `cannot find source ${o.source.name}`), A(!!c, `cannot find target ${o.source.name}`), it.is(n) ? n.next.push(c) : n.next = c, it.is(c) ? c.prev.push(n) : c.prev = n, a.delete(o.source), s.delete(o.target);
     }), s.size !== 1) throw new Error(`start node must one, current: ${s.size}`);
     if (a.size !== 1) throw new Error(`end node must be one, current: ${a.size}`);
     return Object.assign(r, {
@@ -9768,7 +9791,7 @@ class tt {
       return o;
     await this.saveUserRefs(s, r, i);
     const n = a.completeInteraction(e);
-    k(n, "change activity state failed");
+    A(n, "change activity state failed");
     const c = a.toJSON();
     return await this.setActivity(s, { state: c }), {
       ...o,
@@ -9882,10 +9905,10 @@ class Xi {
   constructor(t, e, i) {
     this.controller = t, this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.interactionCallsByName = /* @__PURE__ */ new Map(), this.interactionCalls = /* @__PURE__ */ new Map(), this.controller.entities.push(ve, Ne), this.controller.relations.push(Gi), e.forEach((r) => {
       const s = new tt(r, t);
-      this.activityCalls.set(r.uuid, s), r.name && (k(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
+      this.activityCalls.set(r.uuid, s), r.name && (A(!this.activityCallsByName.has(r.name), `activity name ${r.name} is duplicated`), this.activityCallsByName.set(r.name, s));
     }), i.forEach((r) => {
       const s = new we(r, t);
-      this.interactionCalls.set(r.uuid, s), r.name && (k(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
+      this.interactionCalls.set(r.uuid, s), r.name && (A(!this.interactionCallsByName.has(r.name), `interaction name ${r.name} is duplicated`), this.interactionCallsByName.set(r.name, s));
     });
   }
   async callInteraction(t, e) {
@@ -10131,7 +10154,7 @@ class Sr {
         }
       } else {
         const a = t;
-        a.id.name === Ot && 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 });
+        a.id.name === Ot && s.data ? (A(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 });
       }
     }
   }
@@ -10512,7 +10535,7 @@ export {
   ct as WeightedSummation,
   gi as WeightedSummationHandles,
   ce as addToCurrentEffects,
-  k as assert,
+  A as assert,
   Yt as asyncEffectsContext,
   ne as asyncInteractionContext,
   fr as boolExpToAttributives,