interaqt 0.4.4 → 0.4.6

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;
@@ -9045,10 +9053,10 @@ 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((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;