@dcupl/common 2.0.0-beta.20 → 2.0.0-beta.22

package/dist/esm/index.js

@@ -1,18 +1,18 @@
-import { cloneDeep as v, get as I, every as z, findIndex as E, size as W, isEqual as $, differenceBy as O, startsWith as H, endsWith as U, isEqualWith as S, isMatch as V, find as J } from "lodash-es";
-function K(n) {
-  const e = k(n);
+import { cloneDeep as v, get as I, every as z, findIndex as $, size as V, isEqual as H, differenceBy as O, isEqualWith as k, isMatch as q, find as J } from "lodash-es";
+function D(n) {
+  const e = N(n);
   return Z(e);
 }
-function k(n) {
+function N(n) {
   if (typeof n != "object" || n === null)
     return String(n);
   if (Array.isArray(n))
-    return "[" + n.map(k).join(",") + "]";
+    return "[" + n.map(N).join(",") + "]";
   const e = Object.keys(n).sort();
   let t = "{";
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
-    t += s + ":" + k(n[s]), r < e.length - 1 && (t += ",");
+    t += s + ":" + N(n[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
@@ -41,7 +41,7 @@ const b = {
       return performance.getEntriesByType(n);
   }
 };
-class Te {
+class Fe {
   data;
   enabled = !1;
   constructor() {
@@ -114,11 +114,11 @@ class Te {
   getKey(e, t) {
     if (!t)
       return e;
-    const r = K(t);
+    const r = D(t);
     return e + "_" + r;
   }
 }
-let X = class _ {
+let X = class j {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -365,17 +365,17 @@ let X = class _ {
     const s = new Set(e), i = (u) => !r || r.length === 0 || r.includes(this.nodeKinds.get(u) ?? void 0), o = () => {
       const u = /* @__PURE__ */ new Set(), f = Array.from(s);
       for (; f.length; ) {
-        const l = f.shift();
-        for (const [d, h] of this.edges)
-          h.has(l) && !u.has(d) && (u.add(d), f.push(d));
+        const d = f.shift();
+        for (const [l, h] of this.edges)
+          h.has(d) && !u.has(l) && (u.add(l), f.push(l));
       }
       return u;
     }, a = () => {
       const u = /* @__PURE__ */ new Set(), f = Array.from(s);
       for (; f.length; ) {
-        const l = f.shift(), d = this.edges.get(l);
-        if (d)
-          for (const h of d)
+        const d = f.shift(), l = this.edges.get(d);
+        if (l)
+          for (const h of l)
             u.has(h) || (u.add(h), f.push(h));
       }
       return u;
@@ -392,7 +392,7 @@ let X = class _ {
     return { nodes: e, edges: t };
   }
   static fromJSON(e) {
-    const t = new _();
+    const t = new j();
     for (const r of e.nodes)
       t.addNode(r.name, { kind: r.kind, meta: r.meta });
     for (const r of e.edges)
@@ -400,15 +400,15 @@ let X = class _ {
     return t;
   }
   diff(e) {
-    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((l) => !t.has(l)), i = Array.from(t).filter((l) => !r.has(l)), o = new Set(this.getAllEdges().map((l) => l.join("→"))), a = new Set(e.getAllEdges().map((l) => l.join("→"))), c = Array.from(a).filter((l) => !o.has(l)).map((l) => l.split("→")), u = Array.from(o).filter((l) => !a.has(l)).map((l) => l.split("→")), f = [];
-    for (const l of /* @__PURE__ */ new Set([...t, ...r])) {
-      const d = this.nodeKinds.get(l), h = e.nodeKinds.get(l);
-      d !== h && f.push({ name: l, from: d, to: h });
+    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((d) => !t.has(d)), i = Array.from(t).filter((d) => !r.has(d)), o = new Set(this.getAllEdges().map((d) => d.join("→"))), a = new Set(e.getAllEdges().map((d) => d.join("→"))), c = Array.from(a).filter((d) => !o.has(d)).map((d) => d.split("→")), u = Array.from(o).filter((d) => !a.has(d)).map((d) => d.split("→")), f = [];
+    for (const d of /* @__PURE__ */ new Set([...t, ...r])) {
+      const l = this.nodeKinds.get(d), h = e.nodeKinds.get(d);
+      l !== h && f.push({ name: d, from: l, to: h });
     }
     return { addedNodes: s, removedNodes: i, addedEdges: c, removedEdges: u, kindChanges: f };
   }
 };
-class Re {
+class Ge {
   graph;
   nodeIndex;
   constructor() {
@@ -600,36 +600,36 @@ class Re {
     };
   }
 }
-const q = {
+const R = {
   silent: 0,
   error: 1,
   warn: 2,
   info: 3,
   debug: 4
 };
-class p {
+class g {
   config;
   static globalConfig = {};
   constructor(e = {}) {
     this.config = {
-      level: e.level ?? p.globalConfig.level ?? this.getDefaultLevel(),
-      format: e.format ?? p.globalConfig.format ?? this.getDefaultFormat(),
+      level: e.level ?? g.globalConfig.level ?? this.getDefaultLevel(),
+      format: e.format ?? g.globalConfig.format ?? this.getDefaultFormat(),
       prefix: e.prefix,
-      onLog: e.onLog ?? p.globalConfig.onLog,
-      onTrackError: e.onTrackError ?? p.globalConfig.onTrackError
+      onLog: e.onLog ?? g.globalConfig.onLog,
+      onTrackError: e.onTrackError ?? g.globalConfig.onTrackError
     };
   }
   /**
    * Set global logger configuration (affects all logger instances)
    */
   static setGlobalConfig(e) {
-    p.globalConfig = { ...p.globalConfig, ...e };
+    g.globalConfig = { ...g.globalConfig, ...e };
   }
   /**
    * Get the global logger configuration
    */
   static getGlobalConfig() {
-    return { ...p.globalConfig };
+    return { ...g.globalConfig };
   }
   /**
    * Configure module-specific log levels
@@ -638,14 +638,14 @@ class p {
    * logger.setModuleLevel('Catalog', 'warn');
    */
   static setModuleLevel(e, t) {
-    p.globalConfig.onLog || (p.globalConfig.onLog = void 0), p._moduleOverrides || (p._moduleOverrides = /* @__PURE__ */ new Map()), p._moduleOverrides.set(e, t);
+    g.globalConfig.onLog || (g.globalConfig.onLog = void 0), g._moduleOverrides || (g._moduleOverrides = /* @__PURE__ */ new Map()), g._moduleOverrides.set(e, t);
   }
   /**
    * Get module-specific log level
    */
   static getModuleLevel(e) {
-    if (!(!e || !p._moduleOverrides))
-      return p._moduleOverrides.get(e);
+    if (!(!e || !g._moduleOverrides))
+      return g._moduleOverrides.get(e);
   }
   getDefaultLevel() {
     return "info";
@@ -655,7 +655,7 @@ class p {
   }
   getEffectiveLevel() {
     if (this.config.prefix) {
-      const e = p.getModuleLevel(this.config.prefix);
+      const e = g.getModuleLevel(this.config.prefix);
       if (e)
         return e;
     }
@@ -663,7 +663,7 @@ class p {
   }
   shouldLog(e) {
     const t = this.getEffectiveLevel();
-    return q[e] <= q[t];
+    return R[e] <= R[t];
   }
   formatMessage(e) {
     if (this.config.format === "json") {
@@ -790,7 +790,7 @@ class p {
       // Handle prefix concatenation for nested children
       prefix: e.prefix ? this.config.prefix ? `${this.config.prefix}:${e.prefix}` : e.prefix : this.config.prefix
     };
-    return new p(t);
+    return new g(t);
   }
   /**
    * Update this logger's configuration
@@ -799,8 +799,8 @@ class p {
     Object.assign(this.config, e);
   }
 }
-const Y = new p();
-class Ge {
+const Y = new g();
+class _e {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
@@ -922,7 +922,7 @@ class Ge {
     }
   }
   getCacheName(e, t) {
-    const r = K(t);
+    const r = D(t);
     return e + "_" + r;
   }
   /**
@@ -940,7 +940,10 @@ class Ge {
     };
   }
 }
-const ze = (n, e = "") => `${n}#${e}`, _e = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Pe = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Be = (n, e) => {
+const P = (n, e = "") => {
+  if (!(typeof n != "string" || !n.startsWith("/") || !n.endsWith("/")))
+    return { pattern: n.slice(1, -1), flags: e };
+}, ze = (n, e = "") => `${n}#${e}`, je = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Pe = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Be = (n, e) => {
   const t = typeof e == "function" ? e : (r) => r[e];
   return [
     ...n.reduce((r, s) => {
@@ -948,7 +951,7 @@ const ze = (n, e = "") => `${n}#${e}`, _e = (n) => `${n.gt}_${n.gte}_${n.lt}_${n
       return r.has(i) || r.set(i, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, je = (n, e) => n.reduce(function(t, r) {
+}, Le = (n, e) => n.reduce(function(t, r) {
   const s = typeof e == "function" ? e(r) : r[e];
   return Object.prototype.hasOwnProperty.call(t, s) || (t[s] = []), t[s].push(r), t;
 }, {});
@@ -958,14 +961,14 @@ function ee(n = 10) {
   for (let r = 0; r < n; r++) e += t.charAt(Math.floor(Math.random() * t.length));
   return e;
 }
-const Le = (n) => n.replace(/\/+$/, ""), te = (n) => typeof n != "string" ? "" : n.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), We = (n) => typeof n != "string" ? "" : n.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), He = (n, e) => {
+const Ue = (n) => n.replace(/\/+$/, ""), te = (n) => typeof n != "string" ? "" : n.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), We = (n) => typeof n != "string" ? "" : n.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), Ve = (n, e) => {
   try {
     return re(n, e) >= 0;
   } catch {
     return !1;
   }
 }, re = (n, e) => {
-  if (!F(n) || !F(e))
+  if (!T(n) || !T(e))
     throw new Error(`Invalid version format: v1="${n}", v2="${e}". Expected format: "x.y.z"`);
   const t = n.split(".").map(Number), r = e.split(".").map(Number);
   for (let s = 0; s < 3; s++) {
@@ -974,8 +977,8 @@ const Le = (n) => n.replace(/\/+$/, ""), te = (n) => typeof n != "string" ? "" :
     if (i < o) return -1;
   }
   return 0;
-}, F = (n) => /^\d+(\.\d+){0,2}$/.test(n);
-class Ue {
+}, T = (n) => /^\d+(\.\d+){0,2}$/.test(n);
+class He {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1011,17 +1014,17 @@ class Ue {
     };
   }
 }
-const P = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n) : n, T = (n, e, t, r, s, i) => {
+const B = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n) : n, F = (n, e, t, r, s, i) => {
   try {
-    const o = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = P(i, o);
+    const o = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = B(i, o);
     if (t.scope === "list" && (t.listKey = n.cdRef?.key || n.key, t.modelKey = n.model?.key || n.modelKey), t.type === "list_created" && t.args[0].listKey.startsWith("__global_list__") || t.listKey?.startsWith("__global_list__"))
       return a;
     const c = b.now(), u = c - r, f = Math.round(u * 1e3) / 1e3;
     t.duration = f, t.start = r, t.end = c;
-    const l = {
+    const d = {
       duration: t.duration
     };
-    return t.modelKey && (l.model = t.modelKey), t.connectMessageResult && (t.result = a), t.args && (l.args = t.args), e?.trigger(t), e.analyticsController.mark({
+    return t.modelKey && (d.model = t.modelKey), t.connectMessageResult && (t.result = a), t.args && (d.args = t.args), e?.trigger(t), e.analyticsController.mark({
       name: `${t.type}:end`,
       context: s
     }), e.analyticsController.measure({
@@ -1029,28 +1032,28 @@ const P = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n)
       start: `${t.type}:start`,
       end: `${t.type}:end`,
       context: s,
-      detail: l
+      detail: d
     }), a;
   } catch {
     return i;
   }
-}, Ve = (n) => (t, r, s) => {
+}, Je = (n) => (t, r, s) => {
   const i = s.value;
   return s.value = function(...o) {
-    const a = b.now(), c = this.cdRef, u = P(n, !0);
+    const a = b.now(), c = this.cdRef, u = B(n, !0);
     u.key || (c.increaseCounter(), u.key = c.getCounter());
     const f = ee();
     c.analyticsController.mark({
       name: `${u.type}:start`,
       context: f
     });
-    const l = this.model?.key;
-    !u.originCdRefKey && c.key && (u.originCdRefKey = c.key), l && (u.modelKey = l);
-    const d = i.apply(this, o);
-    return u.method = r, u.args = o, d && typeof d == "object" && "then" in d ? d.then((h) => T(this, c, u, a, f, h)) : T(this, c, u, a, f, d);
+    const d = this.model?.key;
+    !u.originCdRefKey && c.key && (u.originCdRefKey = c.key), d && (u.modelKey = d);
+    const l = i.apply(this, o);
+    return u.method = r, u.args = o, l && typeof l == "object" && "then" in l ? l.then((h) => F(this, c, u, a, f, h)) : F(this, c, u, a, f, l);
   }, s;
 };
-function Je(n, e, t, r) {
+function Ze(n, e, t, r) {
   t.max || (t.max = 20);
   const s = [], i = t.transform ? r.transformValue(t.value, t.transform) : t.value;
   for (const [o, a] of e.entries()) {
@@ -1062,8 +1065,8 @@ function Je(n, e, t, r) {
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
         s.push(f);
-      } else if (c && typeof i == "string" && i.startsWith("/") && i.endsWith("/")) {
-        if (r.queryFind(u, i, "some")) {
+      } else if (c && P(i)) {
+        if (r.queryFind(u, i, "some", t.regexFlags)) {
           const f = {
             value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
@@ -1071,13 +1074,13 @@ function Je(n, e, t, r) {
           s.push(f);
         }
       } else if (c && typeof i == "string") {
-        const f = String(u ?? ""), l = i;
-        if (f.toLowerCase().startsWith(l.toLowerCase())) {
-          const d = {
+        const f = String(u ?? ""), d = i;
+        if (f.toLowerCase().startsWith(d.toLowerCase())) {
+          const l = {
             value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
-          s.push(d);
+          s.push(l);
         }
       } else if (c && r.queryFind(u, i, "some")) {
         const f = {
@@ -1177,7 +1180,7 @@ function ce(n) {
   );
   return ne(e) ? e.getFullYear() !== n.year || e.getMonth() !== n.month - 1 || e.getDate() !== n.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
 }
-function Ze(n, e, t) {
+function Xe(n, e, t) {
   if (n = n.trim(), e === "t") {
     const a = Number(n);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a * 1e3);
@@ -1271,7 +1274,7 @@ class fe {
     this.graph.clear();
   }
 }
-class le {
+class de {
   parseCache;
   circularRefDetector;
   cacheHits = 0;
@@ -1307,10 +1310,10 @@ class le {
       r = e.split(/[.[]/)[0];
       const c = e.indexOf("."), u = e.indexOf("[");
       if (i && (c === -1 || u < c)) {
-        const l = e.indexOf("]");
-        if (l > -1) {
-          const d = e.indexOf(".", l + 1);
-          d > -1 ? t = e.substring(d + 1) : t = void 0;
+        const d = e.indexOf("]");
+        if (d > -1) {
+          const l = e.indexOf(".", d + 1);
+          l > -1 ? t = e.substring(l + 1) : t = void 0;
         } else s && (t = e.substring(c + 1));
       } else s && (t = e.substring(c + 1));
     }
@@ -1439,14 +1442,14 @@ class le {
     return this.getPathSegments(e).length;
   }
 }
-const y = new le();
-function x(n, e) {
+const m = new de();
+function w(n, e) {
   if (e.includes("[*]")) {
     const i = e.indexOf("[*]"), o = e.substring(0, i), a = e.substring(i + 3), c = o ? I(n, o) : n;
     if (!Array.isArray(c)) return [];
     const u = [];
     for (const f of c)
-      !a || a === "" ? f !== void 0 && u.push(f) : a.startsWith(".") && u.push(...x(f, a.slice(1)));
+      !a || a === "" ? f !== void 0 && u.push(f) : a.startsWith(".") && u.push(...w(f, a.slice(1)));
     return u;
   }
   const t = e.split(".");
@@ -1482,10 +1485,10 @@ function M(n) {
   }
   return Math.pow(10, e);
 }
-function R(n, e, t) {
+function G(n, e, t) {
   return (n * t + e * t) / t;
 }
-function de(n, e, t) {
+function le(n, e, t) {
   return n * t / (e * t);
 }
 const C = (n, e, t, r) => {
@@ -1502,12 +1505,12 @@ const C = (n, e, t, r) => {
     a === "sum" ? s.sum = i?.sum : a === "avg" ? s.avg = i?.average : a === "count" ? s.count = he(r, e) : a === "min" ? s.min = o && o[0] : a === "max" ? s.max = o && o[1] : a === "distinct" ? s.distinct = me(n, e, t) : a === "group" && (s.group = ge(n, e));
   }), s;
 }, he = (n, e) => {
-  const r = y.parse(n).isDeepQuery;
+  const r = m.parse(n).isDeepQuery;
   let s = 0;
   for (const i of e.values())
     if (i)
       if (r)
-        s += x(i, n).filter((o) => o != null).length;
+        s += w(i, n).filter((o) => o != null).length;
       else {
         const o = i[n];
         if (o == null) continue;
@@ -1516,12 +1519,12 @@ const C = (n, e, t, r) => {
   return s;
 }, pe = (n, e) => {
   let t, r;
-  const i = y.parse(n).isDeepQuery;
+  const i = m.parse(n).isDeepQuery;
   for (const o of e.values()) {
     if (!o) continue;
     let a;
     if (i)
-      a = x(o, n);
+      a = w(o, n);
     else {
       const c = o[n];
       c === void 0 ? a = [] : Array.isArray(c) ? a = c.filter((u) => u !== void 0) : a = [c];
@@ -1544,10 +1547,10 @@ const C = (n, e, t, r) => {
     option: { value: ["$dcupl_not_found"] },
     count: 0,
     keys: []
-  }, i = y.parse(n.attribute).isDeepQuery;
+  }, i = m.parse(n.attribute).isDeepQuery;
   for (const o of e.values()) {
     let a;
-    i ? a = x(o, n.attribute) : a = [o[n.attribute]];
+    i ? a = w(o, n.attribute) : a = [o[n.attribute]];
     let c = !1;
     for (const u of a)
       for (const f of t)
@@ -1557,12 +1560,12 @@ const C = (n, e, t, r) => {
   return n?.groupOptions?.calculateNotFound && t.push(r), t;
 }, ye = (n, e) => {
   let t = 0, r = 0;
-  const i = y.parse(n).isDeepQuery;
+  const i = m.parse(n).isDeepQuery;
   for (const a of e.values()) {
     if (!a) continue;
     let c;
     if (i)
-      c = x(a, n);
+      c = w(a, n);
     else {
       const u = a[n];
       u === void 0 ? c = [] : Array.isArray(u) ? c = u : c = [u];
@@ -1570,11 +1573,11 @@ const C = (n, e, t, r) => {
     for (const u of c)
       if (Array.isArray(u))
         for (const f of u)
-          typeof f == "number" && (t = R(t, f, M([t, f])), r++);
-      else typeof u == "number" && (t = R(t, u, M([t, u])), r++);
+          typeof f == "number" && (t = G(t, f, M([t, f])), r++);
+      else typeof u == "number" && (t = G(t, u, M([t, u])), r++);
   }
   return r === 0 ? void 0 : {
-    average: de(t, r, M([t, r])),
+    average: le(t, r, M([t, r])),
     count: r,
     sum: t
   };
@@ -1591,14 +1594,14 @@ const C = (n, e, t, r) => {
     }
   return r;
 };
-class A extends Error {
+class x extends Error {
   query;
   constructor(e, t) {
     const r = `Query Error: ${e} in ${JSON.stringify(t, null, 2)}`;
     super(r), this.query = t, this.name = "DcuplQueryError";
   }
 }
-class B {
+class L {
   _defaultQueryOptions = {
     modelKey: "",
     groupKey: "root",
@@ -1609,7 +1612,7 @@ class B {
   currentQuery = v(this._defaultQueryOptions);
   deepQueryService;
   constructor(e) {
-    this.deepQueryService = e || y;
+    this.deepQueryService = e || m;
   }
   /**
    * Initialize the query builder.
@@ -1689,7 +1692,8 @@ class B {
    * - {@link replaceQuery} - Replace complete query
    *
    * @param queryToApply - Query, condition, or array to apply
-   * @param options - Mode: 'add' (default) or 'set' (replace)
+   * @param options - Mode: 'add' (default) or 'set' (replace). In 'add' mode a group
+   * without `groupKey` is always appended as a new group, never merged into another.
    * @param relevantQuery - Target query (defaults to current)
    * @returns Updated query
    */
@@ -1713,12 +1717,12 @@ class B {
           queries: [e]
         });
     } else if (this.isQueryGroup(e)) {
-      const s = r.queries.findIndex(
-        (i) => this.isQueryGroup(i) && i.groupKey === e.groupKey
+      const i = e.groupKey === void 0 && t?.mode !== "set" ? -1 : r.queries.findIndex(
+        (o) => this.isQueryGroup(o) && o.groupKey === e.groupKey
       );
-      if (s > -1) {
-        const i = r.queries[s];
-        e.groupType && (i.groupType = e.groupType), t?.mode === "set" ? r.queries[s] = e : i.queries = [...i.queries, ...e.queries];
+      if (i > -1) {
+        const o = r.queries[i];
+        e.groupType && (o.groupType = e.groupType), t?.mode === "set" ? r.queries[i] = e : o.queries = [...o.queries, ...e.queries];
       } else
         r.queries.push({
           groupKey: e.groupKey,
@@ -1751,7 +1755,7 @@ class B {
         (s) => this.isQueryGroup(s) && s.groupKey === e.attribute
       );
       if (r > -1) {
-        const s = t.queries[r], i = E(s.queries, e);
+        const s = t.queries[r], i = $(s.queries, e);
         i > -1 && s.queries.splice(i, 1), s.queries.length === 0 && t.queries.splice(r, 1);
       }
     } else if (this.isQueryGroup(e)) {
@@ -1764,7 +1768,7 @@ class B {
         else {
           const s = t.queries[r];
           for (const i of e.queries) {
-            const o = E(s.queries, i);
+            const o = $(s.queries, i);
             o > -1 && s.queries.splice(o, 1);
           }
           s.queries.length === 0 && t.queries.splice(r, 1);
@@ -1775,12 +1779,12 @@ class B {
   validateQuery(e) {
     const t = [];
     if (this.isQuery(e))
-      return e.attribute || t.push(new A("Missing attribute", e)), e.operator || t.push(new A("Missing operator", e)), typeof e.value > "u" && t.push(new A("Missing value", e)), e.operator === "find" && Array.isArray(e.value) && t.push(new A("find operator cannot have array value", e)), t.length > 0 ? { valid: !1, errors: t } : { valid: !0 };
+      return e.attribute || t.push(new x("Missing attribute", e)), e.operator || t.push(new x("Missing operator", e)), typeof e.value > "u" && t.push(new x("Missing value", e)), e.operator === "find" && Array.isArray(e.value) && t.push(new x("find operator cannot have array value", e)), e.operator === "in" && typeof e.value < "u" && !Array.isArray(e.value) && t.push(new x("in operator needs an array value", e)), t.length > 0 ? { valid: !1, errors: t } : { valid: !0 };
     if (this.isQueryGroup(e)) {
       const i = e.queries.map((o) => this.validateQuery(o)).filter((o) => !o.valid).map((o) => o.errors).flat();
       return i.length > 0 ? { valid: !1, errors: i } : { valid: !0 };
     }
-    return t.push(new A("Invalid query definition", e)), { valid: !1, errors: t };
+    return t.push(new x("Invalid query definition", e)), { valid: !1, errors: t };
   }
   /**
    * Get all attribute names used in the query.
@@ -1938,7 +1942,10 @@ class B {
   /**
    * Add query condition(s) to the current query.
    * Accepts single condition or array of conditions.
-   * Each condition is added to its respective attribute group.
+   * Each condition is added to its respective attribute group (the group whose
+   * groupKey equals the condition's attribute; created as an `'or'` group if missing).
+   * To combine conditions in an unkeyed group, use {@link addGroup} — unkeyed groups
+   * are always appended as new groups and never merged.
    *
    * Clearer alternative to `applyQuery(condition, { mode: 'add' })`.
    *
@@ -1962,7 +1969,13 @@ class B {
   }
   /**
    * Add a query group to the current query.
-   * If a group with the same groupKey exists, extends it; otherwise creates new group.
+   * - Keyed group (`groupKey` set): if a group with the same groupKey exists, its queries
+   *   are extended and its groupType is replaced by the given one (if set); otherwise a new
+   *   group is created.
+   * - Unkeyed group (no `groupKey`): always appended as a new group; it is never merged
+   *   into another group, so each unkeyed group keeps its own groupType.
+   *
+   * A newly created group without `groupType` is stored as `'or'`.
    *
    * @param group - Query group to add
    * @returns Updated query
@@ -2279,58 +2292,68 @@ class B {
     return e(this.currentQuery.queries);
   }
 }
-const N = new B();
-function Xe(n, e, t, r, s, i, o) {
-  const a = N.removeQuery({ groupKey: s }, v(r)), c = o.queryData(n, a, !1, i), u = e ? [...e.keys()] : [], f = new Set(u), l = i.get(s) ?? /* @__PURE__ */ new Map();
+const E = new L();
+function Ye(n, e, t, r, s, i, o) {
+  const a = t.excludeGroup ?? s, c = E.removeQuery({ groupKey: a }, v(r)), u = o.queryData(n, c, !1, i), f = e ? [...e.keys()] : [], d = new Set(f), l = i.get(s) ?? /* @__PURE__ */ new Map();
   if (!t.excludeUnresolved)
-    for (const h of l.keys())
-      f.add(h);
-  if (t.excludeUndefineds ? f.delete(void 0) : f.add(void 0), t.sort) {
-    const h = [];
-    for (const m of f.values())
-      h.push(
-        G(m, l, c, e, s, r, !0)
+    for (const p of l.keys())
+      d.add(p);
+  if (t.excludeUndefineds ? d.delete(void 0) : d.add(void 0), t.sort) {
+    const p = [];
+    for (const K of d.values())
+      p.push(
+        _(
+          K,
+          l,
+          u,
+          e,
+          s,
+          a,
+          r,
+          !0
+        )
       );
-    const g = t.excludeZeros ? h.filter((m) => m.size > 0) : h;
-    return g.sort(ve(t.sort)), t.count ? g.slice(0, t.count) : g;
+    const y = t.excludeZeros ? p.filter((K) => K.size > 0) : p;
+    return y.sort(ve(t.sort)), t.count ? y.slice(0, t.count) : y;
   }
-  const d = [];
-  for (const h of f.values()) {
-    const g = G(
-      h,
+  const h = [];
+  for (const p of d.values()) {
+    const y = _(
+      p,
       l,
-      c,
+      u,
       e,
       s,
+      a,
       r,
       !!t?.calculateFacets
     );
-    if (!(t?.excludeZeros && g.size === 0)) {
-      if (t?.count && d.length === t?.count)
-        return d;
-      d.push(g);
+    if (!(t?.excludeZeros && y.size === 0)) {
+      if (t?.count && h.length === t?.count)
+        return h;
+      h.push(y);
     }
   }
-  return d;
+  return h;
 }
-function G(n, e, t, r, s, i, o) {
-  const a = /* @__PURE__ */ new Map(), c = e.get(n) || /* @__PURE__ */ new Set();
-  for (const u of c) {
-    const f = t.get(u);
-    if (f && (a.set(u, f), !o))
+function _(n, e, t, r, s, i, o, a) {
+  const c = /* @__PURE__ */ new Map(), u = e.get(n) || /* @__PURE__ */ new Set();
+  for (const f of u) {
+    const d = t.get(f);
+    if (d && (c.set(f, d), !a))
       break;
   }
   return {
     key: String(n),
     value: n,
-    selected: we(s, n, i),
-    enabled: a.size > 0,
-    size: a.size,
+    selected: we(i, s, n, o),
+    enabled: c.size > 0,
+    size: c.size,
     entry: r?.get(n),
-    resultKeys: Array.from(a.keys())
+    resultKeys: Array.from(c.keys())
   };
 }
-function D(n, e) {
+function S(n, e) {
   if (n === void 0 && e === void 0) return 0;
   if (n === void 0) return 1;
   if (e === void 0) return -1;
@@ -2344,24 +2367,18 @@ function D(n, e) {
 function ve(n) {
   switch (n) {
     case "size-desc":
-      return (e, t) => t.size - e.size || D(e.value, t.value);
+      return (e, t) => t.size - e.size || S(e.value, t.value);
     case "size-asc":
-      return (e, t) => e.size - t.size || D(e.value, t.value);
+      return (e, t) => e.size - t.size || S(e.value, t.value);
     case "value-asc":
-      return (e, t) => D(e.value, t.value);
+      return (e, t) => S(e.value, t.value);
     case "value-desc":
-      return (e, t) => e.value === void 0 && t.value === void 0 ? 0 : e.value === void 0 ? 1 : t.value === void 0 ? -1 : -D(e.value, t.value);
+      return (e, t) => e.value === void 0 && t.value === void 0 ? 0 : e.value === void 0 ? 1 : t.value === void 0 ? -1 : -S(e.value, t.value);
   }
 }
-const we = (n, e, t) => {
-  const r = t.queries.findIndex((s) => N.isQueryGroup(s) && s.groupKey === n);
-  return r > -1 ? !!t.queries[r].queries.find((i) => {
-    if (N.isQuery(i)) {
-      const o = i.value?.key || i.value;
-      return i.attribute === n && o === e;
-    }
-    return !1;
-  }) : !1;
+const we = (n, e, t, r) => {
+  const s = r.queries.findIndex((i) => E.isQueryGroup(i) && i.groupKey === n);
+  return s > -1 ? !!r.queries[s].queries.find((o) => E.isQuery(o) ? o.attribute !== e ? !1 : (o.operator === "in" && Array.isArray(o.value) ? o.value : [o.value]).some((c) => (c?.key || c) === t) : !1) : !1;
 };
 class xe {
   indexMap = /* @__PURE__ */ new Map();
@@ -2431,7 +2448,7 @@ class xe {
     if (o)
       o.lastAccessedAt = Date.now();
     else if (!i) {
-      const c = y.parse(e).isDeepQuery ?? !1;
+      const c = m.parse(e).isDeepQuery ?? !1;
       this.indexMetadata.set(s, {
         createdAt: Date.now(),
         lastAccessedAt: Date.now(),
@@ -2441,17 +2458,17 @@ class xe {
     }
     if (!i) {
       this.reset(s), this.indexMap.set(s, /* @__PURE__ */ new Map());
-      const c = y.parse(e).isDeepQuery;
+      const c = m.parse(e).isDeepQuery;
       for (const u of t.values()) {
         let f;
-        c ? (f = x(u, e), f.length === 0 && (f = [void 0])) : f = [u[e]], this.fillInverseIndex(s, u.key, f), this.fillDataMap(s, f);
+        c ? (f = w(u, e), f.length === 0 && (f = [void 0])) : f = [u[e]], this.fillInverseIndex(s, u.key, f), this.fillDataMap(s, f);
       }
       i = this.getIndex(s) || /* @__PURE__ */ new Map();
     }
     return i;
   }
   getIndexName(e, t) {
-    return t ? e + "_" + K(t) : e;
+    return t ? e + "_" + D(t) : e;
   }
   // ========== PARTIAL UPDATE METHODS ==========
   /**
@@ -2545,7 +2562,7 @@ class xe {
   isDeepQueryIndex(e) {
     const t = e.includes("_") ? e.split("_")[0] : e;
     try {
-      return y.parse(t).isDeepQuery ?? !1;
+      return m.parse(t).isDeepQuery ?? !1;
     } catch {
       return !1;
     }
@@ -2620,15 +2637,15 @@ class xe {
     };
   }
 }
-const w = "__";
-function j(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
+const A = "__";
+function U(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
   const o = i || n;
   for (const a of e.columns)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.rows)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.values)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   if (e.rows && e.rows.length > 0) {
     t.rows = t.rows || [];
     const a = Ae(n, e.rows[0], e, s, r, i);
@@ -2636,7 +2653,7 @@ function j(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
   }
   if (e.columns && e.columns.length > 0) {
     t.columns = t.columns || [];
-    const a = L(n, e.columns[0], e, s, r, i);
+    const a = W(n, e.columns[0], e, s, r, i);
     t.columns.push(a);
   }
   if (t.key === "root")
@@ -2656,35 +2673,35 @@ function Ae(n, e, t, r, s = "", i) {
     const f = {
       key: c,
       value: c
-    }, l = /* @__PURE__ */ new Map();
-    for (const d of u)
-      n.has(d) && l.set(d, n.get(d));
-    if (l.size) {
-      for (const d of t.values) {
+    }, d = /* @__PURE__ */ new Map();
+    for (const l of u)
+      n.has(l) && d.set(l, n.get(l));
+    if (d.size) {
+      for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = C(d, l, r.getIndex(d.attribute), d.attribute);
+        const h = C(l, d, r.getIndex(l.attribute), l.attribute);
         f.values.push(h);
       }
       if (o.rows = o.rows || [], o.rows.push(f), t.rows.length > 1) {
-        const d = { ...t, rows: t.rows.slice(1) };
-        j(
-          l,
+        const l = { ...t, rows: t.rows.slice(1) };
+        U(
           d,
+          l,
           f,
-          s + w + e.attribute + w + c,
+          s + A + e.attribute + A + c,
           r,
           i
         );
       } else if (t.columns)
-        for (const d of t.columns) {
+        for (const l of t.columns) {
           f.columns = f.columns || [];
-          const h = L(
-            l,
+          const h = W(
             d,
+            l,
             t,
             r,
-            s + w + e.attribute + w + c,
+            s + A + e.attribute + A + c,
             i
           );
           f.columns.push(h);
@@ -2693,7 +2710,7 @@ function Ae(n, e, t, r, s = "", i) {
   }
   return o;
 }
-function L(n, e, t, r, s = "", i) {
+function W(n, e, t, r, s = "", i) {
   const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return o;
@@ -2701,23 +2718,23 @@ function L(n, e, t, r, s = "", i) {
     const f = {
       key: c,
       value: c
-    }, l = /* @__PURE__ */ new Map();
-    for (const d of u)
-      n.has(d) && l.set(d, n.get(d));
-    if (l.size) {
-      for (const d of t.values) {
+    }, d = /* @__PURE__ */ new Map();
+    for (const l of u)
+      n.has(l) && d.set(l, n.get(l));
+    if (d.size) {
+      for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = C(d, l, r.getIndex(d.attribute), d.attribute);
+        const h = C(l, d, r.getIndex(l.attribute), l.attribute);
         f.values.push(h);
       }
       if (o.columns = o.columns || [], o.columns.push(f), t.columns.length > 1) {
-        const d = { ...t, columns: t.columns.slice(1) };
-        j(
-          l,
+        const l = { ...t, columns: t.columns.slice(1) };
+        U(
           d,
+          l,
           f,
-          s + w + e.attribute + w + c,
+          s + A + e.attribute + A + c,
           r,
           i
         );
@@ -2726,43 +2743,43 @@ function L(n, e, t, r, s = "", i) {
   }
   return o;
 }
-const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/, Se = /^-?\d+$/, De = /^-?\d+\.\d+$/, Ie = /^\d{1,2}([/.-])\d{1,2}\1\d{2,4}$/, Ke = (n) => n === "true" || n === "false" ? "boolean" : Se.test(n) ? "int" : De.test(n) ? "float" : be.test(n) && !Number.isNaN(Date.parse(n)) ? "date" : "string", Me = (n) => Ie.test(n), Qe = (n) => n == null || n === "", ke = (n) => {
+const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/, Se = /^-?\d+$/, Ie = /^-?\d+\.\d+$/, De = /^\d{1,2}([/.-])\d{1,2}\1\d{2,4}$/, Ke = (n) => n === "true" || n === "false" ? "boolean" : Se.test(n) ? "int" : Ie.test(n) ? "float" : be.test(n) && !Number.isNaN(Date.parse(n)) ? "date" : "string", ke = (n) => De.test(n), Me = (n) => n == null || n === "", Qe = (n) => {
   const e = [...n];
   return e.length <= 1 ? { type: e[0] ?? "any", conflict: !1 } : e.every((t) => t === "int" || t === "float") ? { type: "float", conflict: !1 } : { type: "any", conflict: !0 };
 }, Ne = (n, e = {}) => {
   const r = e.deep ?? (e.sampleSize !== void 0 && e.sampleSize > 1) ? e.sampleSize ?? 1 / 0 : 1, s = e.coerceStrings ?? !0, i = /* @__PURE__ */ new Map(), o = [], a = Math.min(n.length, r);
   for (let f = 0; f < a; f++) {
-    const l = n[f];
-    if (l)
-      for (const [d, h] of Object.entries(l)) {
-        let g = i.get(d);
-        if (g || (g = { observed: /* @__PURE__ */ new Set(), empty: 0, scanned: 0 }, i.set(d, g), o.push(d)), g.scanned++, Qe(h)) {
-          g.empty++;
+    const d = n[f];
+    if (d)
+      for (const [l, h] of Object.entries(d)) {
+        let p = i.get(l);
+        if (p || (p = { observed: /* @__PURE__ */ new Set(), empty: 0, scanned: 0 }, i.set(l, p), o.push(l)), p.scanned++, Me(h)) {
+          p.empty++;
           continue;
         }
-        let m;
-        typeof h == "string" && s ? (m = Ke(h), m === "string" && !g.hint && Me(h) && (g.hint = "column looks date-like (non-ISO) — review manually")) : m = $e(h), g.observed.add(m);
+        let y;
+        typeof h == "string" && s ? (y = Ke(h), y === "string" && !p.hint && ke(h) && (p.hint = "column looks date-like (non-ISO) — review manually")) : y = $e(h), p.observed.add(y);
       }
   }
   const c = [], u = [];
   for (const f of o) {
-    const l = i.get(f), { type: d, conflict: h } = ke(l.observed.size ? l.observed : /* @__PURE__ */ new Set(["string"]));
-    c.push({ key: f, type: d }), u.push({
+    const d = i.get(f), { type: l, conflict: h } = Qe(d.observed.size ? d.observed : /* @__PURE__ */ new Set(["string"]));
+    c.push({ key: f, type: l }), u.push({
       column: f,
-      inferredType: d,
-      observedTypes: [...l.observed].sort(),
-      emptyRate: l.scanned === 0 ? 0 : l.empty / l.scanned,
+      inferredType: l,
+      observedTypes: [...d.observed].sort(),
+      emptyRate: d.scanned === 0 ? 0 : d.empty / d.scanned,
       conflict: h,
-      hint: l.hint
+      hint: d.hint
     });
   }
   return { properties: c, diagnostics: u };
-}, Ye = (n, e = !1) => Ne(n, typeof e == "boolean" ? { deep: e } : e).properties, Ce = (n) => Number(n) === n && n % 1 === 0, Ee = (n) => Number(n) === n && n % 1 !== 0, $e = (n) => {
+}, et = (n, e = !1) => Ne(n, typeof e == "boolean" ? { deep: e } : e).properties, Ee = (n) => Number(n) === n && n % 1 === 0, Ce = (n) => Number(n) === n && n % 1 !== 0, $e = (n) => {
   switch (typeof n) {
     case "string":
       return "string";
     case "number":
-      return Ce(n) ? "int" : Ee(n) ? "float" : "any";
+      return Ee(n) ? "int" : Ce(n) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
@@ -2770,7 +2787,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
     default:
       return "any";
   }
-}, et = (n, e) => {
+}, tt = (n, e) => {
   const t = te(n.text || ""), r = e?.attributeKey || n.filterKey;
   let s;
   const i = e?.comparisonType || "containsIgnoreCase";
@@ -2834,7 +2851,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       }
     ]
   }), s;
-}, tt = (n, e) => {
+}, rt = (n, e) => {
   const t = e?.attributeKey || n.filterKey;
   return {
     groupKey: n.filterKey,
@@ -2847,7 +2864,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       }
     ]
   };
-}, rt = (n, e) => {
+}, st = (n, e) => {
   const t = e?.attributeKey || n.filterKey, r = {
     groupKey: n.filterKey,
     queries: []
@@ -2862,7 +2879,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
     operator: "eq",
     options: { invert: !0 }
   })), typeof n.gt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.gt, operator: "gt" })), typeof n.lt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.lt, operator: "lt" })), typeof n.gte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.gte, operator: "gte" })), typeof n.lte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.lte, operator: "lte" })), r;
-}, st = (n, e) => {
+}, nt = (n, e) => {
   const t = e?.attributeKey || n.filterKey, r = {
     groupKey: n.filterKey,
     queries: []
@@ -2875,8 +2892,8 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       operator: "eq"
     });
   }), r;
-}, nt = (n) => !(typeof n.modelKey != "string" || !Array.isArray(n.queries));
-class it {
+}, it = (n) => !(typeof n.modelKey != "string" || !Array.isArray(n.queries));
+class ot {
   constructor(e, t, r) {
     this.scriptController = e, this.globalItemService = t, this.modelParser = r;
   }
@@ -2884,7 +2901,7 @@ class it {
   globalItemService;
   modelParser;
   registeredCustomOperator = /* @__PURE__ */ new Map();
-  queryBuilder = new B();
+  queryBuilder = new L();
   registerCustomOperator(e, t) {
     this.registeredCustomOperator.set(e, t);
   }
@@ -2898,85 +2915,235 @@ class it {
     return e;
   }
   evaluateQuery(e, t) {
-    let r, s = e.value;
-    const i = e.options?.arrayValueHandling || "some";
-    if (Array.isArray(e.options?.transform) && e.options.transform.length > 0 && (s = this.transformValue(s, e.options.transform)), e.attribute.includes(".") || e.attribute.includes("[") ? r = I(t, e.attribute) : r = t[e.attribute], Array.isArray(e.options?.transform) && e.options.transform.length > 0 && (r = this.transformValue(r, e.options.transform)), (typeof r > "u" || r === null) && !["typeof", "isTruthy", "eq"].includes(e.operator))
+    let r = e.value;
+    const s = e.options?.arrayValueHandling || "some";
+    Array.isArray(e.options?.transform) && e.options.transform.length > 0 && (r = this.transformValue(r, e.options.transform));
+    let i = this.getAttributeValue(t, e.attribute);
+    if (Array.isArray(e.options?.transform) && e.options.transform.length > 0 && (i = this.transformValue(i, e.options.transform)), (typeof i > "u" || i === null) && !["typeof", "isTruthy", "eq", "in"].includes(e.operator))
       return !1;
+    let o;
     switch (e.operator) {
       case "eq":
-        return e.options?.invert ? !$(r, s) : $(r, s);
+        o = this.queryEq(i, r, s);
+        break;
+      case "in":
+        o = this.queryIn(i, r, s);
+        break;
       case "find":
-        return e.options?.invert ? !this.queryFind(r, s, i) : this.queryFind(r, s, i);
+        o = this.queryFind(i, r, s, e.options?.regexFlags);
+        break;
       case "lt":
-        return Array.isArray(r) ? i === "some" ? r.some((o) => o < s) : r.every((o) => o < s) : r < s;
       case "gt":
-        return Array.isArray(r) ? i === "some" ? r.some((o) => o > s) : r.every((o) => o > s) : r > s;
       case "lte":
-        return Array.isArray(r) ? i === "some" ? r.some((o) => o <= s) : r.every((o) => o <= s) : r <= s;
-      case "gte":
-        return Array.isArray(r) ? i === "some" ? r.some((o) => o >= s) : r.every((o) => o >= s) : r >= s;
+      case "gte": {
+        const a = e.operator;
+        o = this.matchValues(
+          i,
+          s,
+          (c) => this.compareValue(a, c, r)
+        );
+        break;
+      }
       case "typeof":
-        return e.options?.invert ? typeof r !== s : Array.isArray(r) ? i === "some" ? r.some((o) => typeof o === s) : r.every((o) => typeof o === s) : typeof r === s;
-      case "isTruthy":
-        return s === !0 ? Array.isArray(r) ? i === "some" ? r.some((o) => typeof !!o) : r.every((o) => typeof !!o) : !!r : !r;
+        o = this.matchValues(i, s, (a) => typeof a === r);
+        break;
+      case "isTruthy": {
+        const a = r === !0;
+        o = this.matchValues(i, s, (c) => !!c === a);
+        break;
+      }
       case "size":
-        return typeof r == "string" ? r.length === s : W(r) === s;
+        typeof i == "string" ? o = i.length === r : o = V(i) === r;
+        break;
       default:
         if (this.scriptController.hasScript(e.operator))
           return this.scriptController.executeScript(e.operator, "operator", { query: e, item: t });
         if (this.registeredCustomOperator.has(e.operator)) {
-          const o = this.registeredCustomOperator.get(e.operator);
-          if (typeof o == "function")
-            return o(e, t);
+          const a = this.registeredCustomOperator.get(e.operator);
+          if (typeof a == "function")
+            return a(e, t);
         }
+        return !1;
     }
-    return !1;
+    return e.options?.invert ? !o : o;
+  }
+  /** A missing value never compares — in JS `null >= 0` is true. */
+  compareValue(e, t, r) {
+    if (t == null)
+      return !1;
+    switch (e) {
+      case "lt":
+        return t < r;
+      case "gt":
+        return t > r;
+      case "lte":
+        return t <= r;
+      case "gte":
+        return t >= r;
+    }
+  }
+  /**
+   * The value a condition compares against. A dotted path that runs through a
+   * list (a multi-valued reference, e.g. `memberships.role`) fans out into the
+   * list of leaf values, the same values the attribute's inverse index holds —
+   * `lodash.get` cannot step into an array and would answer `undefined`. An
+   * index (`tags.0`) or `length` still reads the list itself, as with `get`.
+   */
+  getAttributeValue(e, t) {
+    if (t in e || !(t.includes(".") || t.includes("[")))
+      return e[t];
+    if (t.includes("["))
+      return I(e, t);
+    const r = t.split(".");
+    let s = e;
+    for (let i = 0; i < r.length; i++) {
+      const o = r[i];
+      if (s == null)
+        return;
+      if (Array.isArray(s) && o !== "length" && !/^\d+$/.test(o))
+        return w(s, r.slice(i).join("."));
+      s = s[o];
+    }
+    return s;
+  }
+  /**
+   * Applies `predicate` to a single value, or to each value of a list per
+   * `arrayValueHandling`. `every` needs at least one value: an empty list
+   * matches nothing (and so matches under `invert`).
+   */
+  matchValues(e, t, r) {
+    return Array.isArray(e) ? t === "every" ? e.length > 0 && e.every(r) : e.some(r) : r(e);
+  }
+  /**
+   * `eq` against a list compares each value, as the inverse index does; a
+   * query value that is itself a list still compares the whole list.
+   */
+  queryEq(e, t, r) {
+    return Array.isArray(e) && !Array.isArray(t) ? this.matchValues(e, r, (s) => this.equalsQueryValue(s, t)) : this.equalsQueryValue(e, t);
+  }
+  /**
+   * `in`: a value matches if it equals (as `eq` compares) any listed value; a
+   * list of values matches per `arrayValueHandling`. An empty list matches nothing.
+   */
+  queryIn(e, t, r) {
+    return !Array.isArray(t) || t.length === 0 ? !1 : this.matchValues(
+      e,
+      r,
+      (s) => t.some((i) => this.equalsQueryValue(s, i))
+    );
+  }
+  /**
+   * The inverse-index key a query value looks up: a string, or the key of a
+   * `{ key }` object. Anything else has no key and is compared by a scan.
+   */
+  getIndexKey(e) {
+    if (typeof e == "string")
+      return e;
+    if (e?.key && Object.keys(e).length === 1)
+      return e.key;
+  }
+  /**
+   * Equality the way the inverse index keys values: a string (or `{ key }`)
+   * query value matches a reference by its key and a date by its ISO string.
+   */
+  equalsQueryValue(e, t) {
+    const r = this.getIndexKey(t);
+    return typeof r > "u" ? H(e, t) : e instanceof Date ? !isNaN(e.getTime()) && e.toISOString() === r : typeof e == "object" && e?.key ? e.key === r : e === r;
+  }
+  /**
+   * An inverse index answers `eq` as "some value equals", untransformed — only
+   * use it when that is the question.
+   */
+  canUseIndex(e) {
+    return e.options?.arrayValueHandling !== "every" && !e.options?.transform?.length;
   }
   evaluateEqOperator(e, t, r, s) {
-    const i = /* @__PURE__ */ new Map(), o = s.get(t.attribute);
+    const i = /* @__PURE__ */ new Map(), o = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
     if (o) {
-      let a;
-      if (typeof t.value == "string" ? a = t.value : t.value?.key && Object.keys(t.value).length === 1 && (a = t.value.key), typeof a < "u") {
+      const a = this.getIndexKey(t.value);
+      if (typeof a < "u") {
         const c = o.get(a);
         if (c)
           if (c.forEach((u) => {
             r.has(u) && i.set(u, r.get(u));
           }), t.options?.invert) {
             const u = O(Array.from(r.values()), Array.from(i.values()), "key"), f = /* @__PURE__ */ new Map();
-            return u.forEach((l) => {
-              f.set(l.key, l);
+            return u.forEach((d) => {
+              f.set(d.key, d);
             }), f;
           } else
             return i;
       }
     }
-    for (let [a, c] of r) {
-      const u = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-      if (u.some((f) => f.isDeepQuery)) {
-        const f = this.queryBuilder.getProjectionForAttributeEntries(
-          u.filter((l) => l.isDeepQuery)
-        );
-        c = this.globalItemService.getProjectedData(
-          f,
-          this.modelParser.models.get(e.modelKey),
-          c
-        );
+    return this.scanDataset(e, t, r);
+  }
+  /**
+   * `in` from the inverse index when it can answer: the union of the index
+   * sets of the listed values. A value the index cannot look up (not a string
+   * or `{ key }`, or not in the index) is answered by a scan of the rest, so
+   * the result equals the scan's.
+   */
+  evaluateInOperator(e, t, r, s) {
+    const i = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
+    if (!i)
+      return this.scanDataset(e, t, r);
+    const o = /* @__PURE__ */ new Map(), a = [];
+    for (const u of t.value) {
+      const f = this.getIndexKey(u), d = typeof f < "u" ? i.get(f) : void 0;
+      if (!d) {
+        a.push(u);
+        continue;
       }
-      this.evaluateQuery(t, c) && i.set(a, c);
+      d.forEach((l) => {
+        const h = r.get(l);
+        h && o.set(l, h);
+      });
     }
-    return i;
+    if (a.length > 0) {
+      const u = /* @__PURE__ */ new Map();
+      r.forEach((d, l) => {
+        o.has(l) || u.set(l, d);
+      });
+      const f = {
+        ...t,
+        value: a,
+        options: { ...t.options, invert: !1 }
+      };
+      this.scanDataset(e, f, u).forEach((d, l) => o.set(l, d));
+    }
+    if (!t.options?.invert)
+      return o;
+    const c = /* @__PURE__ */ new Map();
+    return r.forEach((u, f) => {
+      o.has(f) || c.set(f, u);
+    }), c;
+  }
+  /** Evaluates `query` on each item, resolving a deep path's references first. */
+  scanDataset(e, t, r) {
+    const s = /* @__PURE__ */ new Map(), i = this.queryBuilder.extractQueryAttributes({ queries: [t] }).filter((a) => a.isDeepQuery), o = i.length > 0 ? this.queryBuilder.getProjectionForAttributeEntries(i) : void 0;
+    for (let [a, c] of r)
+      o && (c = this.globalItemService.getProjectedData(
+        o,
+        this.modelParser.models.get(e.modelKey),
+        c
+      )), this.evaluateQuery(t, c) && s.set(a, c);
+    return s;
   }
-  equalRegexFn(e, t) {
-    if (typeof t == "string" && H(t, "/") && U(t, "/"))
+  equalRegexFn(e, t, r) {
+    const s = P(t, r);
+    if (s)
       try {
-        return new RegExp(t.slice(1, -1)).test(e);
+        return new RegExp(s.pattern, s.flags).test(e);
       } catch {
         return !1;
       }
-    else return Array.isArray(e) ? !!e.find((r) => S(r, t, this.equalRegexFn)) : typeof t == "object" ? V(e, t) : e === t;
+    else return Array.isArray(e) ? !!e.find(
+      (i) => k(i, t, (o, a) => this.equalRegexFn(o, a, r))
+    ) : typeof t == "object" ? q(e, t) : e === t;
   }
-  queryFind(e, t, r) {
-    return Array.isArray(e) ? typeof t == "string" || typeof t == "number" || typeof t == "boolean" ? r === "some" ? e.some((s) => S(s, t, this.equalRegexFn)) : e.every((s) => S(s, t, this.equalRegexFn)) : !!J(e, t) : S(e, t, this.equalRegexFn);
+  queryFind(e, t, r, s) {
+    const i = (o, a) => this.equalRegexFn(o, a, s);
+    return Array.isArray(e) ? typeof t == "string" || typeof t == "number" || typeof t == "boolean" ? this.matchValues(e, r, (o) => k(o, t, i)) : t !== null && typeof t == "object" ? this.matchValues(e, r, (o) => q(o, t)) : !!J(e, t) : k(e, t, i);
   }
   validateQuery(e) {
     if (this.queryBuilder.isQuery(e)) {
@@ -2984,6 +3151,8 @@ class it {
         throw new Error("invalid query - missing attribute or operator");
       if (e.operator === "find" && Array.isArray(e.value))
         throw new Error("invalid query - find operator cannot have array value");
+      if (e.operator === "in" && !Array.isArray(e.value))
+        throw new Error("invalid query - in operator needs an array value");
       return !0;
     } else {
       if (this.queryBuilder.isQueryGroup(e))
@@ -2997,48 +3166,30 @@ class it {
       const o = t.options?.invert === !0, a = /* @__PURE__ */ new Set();
       for (let c of r.values()) {
         const u = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-        if (u.some((d) => d.isDeepQuery)) {
-          const d = this.queryBuilder.getProjectionForAttributeEntries(
-            u.filter((h) => h.isDeepQuery)
+        if (u.some((h) => h.isDeepQuery)) {
+          const h = this.queryBuilder.getProjectionForAttributeEntries(
+            u.filter((p) => p.isDeepQuery)
           );
           c = this.globalItemService.getProjectedData(
-            d,
+            h,
             this.modelParser.models.get(e.modelKey),
             c
           );
         }
-        const f = this.handleArrayStarQuery(t, c);
-        let l = !1;
-        for (const d of f.queries) {
-          const h = { ...d, options: { ...d.options, invert: !1 } };
-          if (this.evaluateQuery(h, c)) {
-            l = !0;
-            break;
-          }
-        }
-        l && (a.add(c.key), o || i.set(c.key, c));
+        const d = this.handleArrayStarQuery(t, c).queries.map((h) => ({
+          ...h,
+          options: { ...h.options, invert: !1 }
+        }));
+        this.matchValues(
+          d,
+          t.options?.arrayValueHandling || "some",
+          (h) => this.evaluateQuery(h, c)
+        ) && (a.add(c.key), o || i.set(c.key, c));
       }
       if (o)
         for (const [c, u] of r)
           a.has(c) || i.set(c, u);
-    } else {
-      if (t.operator === "eq")
-        return this.evaluateEqOperator(e, t, r, s);
-      for (let [o, a] of r) {
-        const c = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-        if (c.some((u) => u.isDeepQuery)) {
-          const u = this.queryBuilder.getProjectionForAttributeEntries(
-            c.filter((f) => f.isDeepQuery)
-          );
-          a = this.globalItemService.getProjectedData(
-            u,
-            this.modelParser.models.get(e.modelKey),
-            a
-          );
-        }
-        this.evaluateQuery(t, a) && i.set(o, a);
-      }
-    }
+    } else return t.operator === "eq" ? this.evaluateEqOperator(e, t, r, s) : t.operator === "in" ? this.evaluateInOperator(e, t, r, s) : this.scanDataset(e, t, r);
     return i;
   }
   handleArrayStarQuery(e, t) {
@@ -3074,8 +3225,8 @@ class it {
         });
       else {
         const f = O(Array.from(o.values()), Array.from(u.values()), "key");
-        for (const l of f)
-          o.delete(l.key);
+        for (const d of f)
+          o.delete(d.key);
       }
       t.groupType === "and" ? a = o : a = r;
     }
@@ -3121,19 +3272,40 @@ class it {
   //   }
   // }
 }
-const Oe = "k:", qe = "h:";
+const Oe = /* @__PURE__ */ new Set([
+  "apikey",
+  "api-key",
+  "managerkey",
+  "token",
+  "proxy-key",
+  "proxykey",
+  "manager-key",
+  "sdk-key"
+]);
+function at(n) {
+  const e = n.indexOf("?");
+  if (e < 0) return n;
+  const t = n.slice(e + 1).split("&").map((r) => {
+    const s = r.indexOf("=");
+    if (s < 0) return r;
+    const i = r.slice(0, s);
+    return Oe.has(i.toLowerCase()) ? `${i}=<redacted>` : r;
+  }).join("&");
+  return `${n.slice(0, e)}?${t}`;
+}
+const qe = "k:", Re = "h:";
 function Q(n, e = 0) {
   if (n.key)
-    return `${Oe}${n.key}`;
-  const t = K({
+    return `${qe}${n.key}`;
+  const t = D({
     type: n.type,
     url: n.rawUrl ?? n.url,
     model: n.model ?? "",
     occurrence: e
   });
-  return `${qe}${t}`;
+  return `${Re}${t}`;
 }
-function ot(n) {
+function ct(n) {
   const e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set();
   return n.map((r) => {
     const s = `${r.key ?? ""}|${r.type}|${r.rawUrl ?? r.url}|${r.model ?? ""}`;
@@ -3143,7 +3315,7 @@ function ot(n) {
     return e.set(s, i + 1), t.add(o), o;
   });
 }
-function at() {
+function ut() {
   const n = globalThis;
   return typeof n.scheduler?.yield == "function" ? n.scheduler.yield() : typeof n.setImmediate == "function" ? new Promise((e) => n.setImmediate(() => e())) : typeof n.MessageChannel == "function" ? new Promise((e) => {
     const t = new n.MessageChannel();
@@ -3152,7 +3324,7 @@ function at() {
     }, t.port2.postMessage(null);
   }) : new Promise((e) => setTimeout(e, 0));
 }
-class ct {
+class ft {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3195,10 +3367,10 @@ class ct {
     return this.getScriptAsFn(e, i)(t, ...o);
   }
 }
-const ut = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", ft = (n) => {
+const dt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", lt = (n) => {
   const e = /* @__PURE__ */ new Set();
   return n.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
-}, lt = [
+}, ht = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3210,8 +3382,9 @@ const ut = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e
   "int",
   "json",
   "string"
-], dt = ["int", "float", "Array<int>", "Array<float>"], ht = ["date", "Array<date>"], pt = [
+], pt = ["int", "float", "Array<int>", "Array<float>"], gt = ["date", "Array<date>"], yt = [
   "eq",
+  "in",
   "find",
   "gt",
   "gte",
@@ -3222,65 +3395,67 @@ const ut = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e
   "size"
 ];
 export {
-  Oe as AUTHORED_RESOURCE_ID_PREFIX,
-  Te as AnalyticsController,
-  Re as AttributeDependencyGraph,
-  Ge as CacheController,
-  Ue as ChangeDetector,
-  qe as DERIVED_RESOURCE_ID_PREFIX,
-  ht as DatePropertyTypes,
-  B as DcuplQueryBuilder,
-  pt as DcuplQueryOperatorsAsArray,
-  le as DeepQueryService,
+  qe as AUTHORED_RESOURCE_ID_PREFIX,
+  Fe as AnalyticsController,
+  Ge as AttributeDependencyGraph,
+  _e as CacheController,
+  He as ChangeDetector,
+  Re as DERIVED_RESOURCE_ID_PREFIX,
+  gt as DatePropertyTypes,
+  L as DcuplQueryBuilder,
+  yt as DcuplQueryOperatorsAsArray,
+  de as DeepQueryService,
   X as DependencyGraph,
   xe as IndicesController,
-  p as Logger,
-  dt as NumberPropertyTypes,
-  lt as PropertyTypesAsArray,
-  it as QueryManager,
-  ct as ScriptController,
-  P as clone,
+  g as Logger,
+  pt as NumberPropertyTypes,
+  ht as PropertyTypesAsArray,
+  ot as QueryManager,
+  ft as ScriptController,
+  B as clone,
   Ke as coerceStringType,
   re as compareVersions,
-  Je as computeSuggestions,
-  y as deepQueryService,
+  Ze as computeSuggestions,
+  m as deepQueryService,
   te as escapeRegExp,
-  ut as evaluateTemplate,
-  tt as generateBooleanQuery,
+  dt as evaluateTemplate,
+  rt as generateBooleanQuery,
   ee as generateKey,
-  rt as generateNumberAndDateQuery,
-  st as generateReferenceQuery,
-  et as generateTextQuery,
+  st as generateNumberAndDateQuery,
+  nt as generateReferenceQuery,
+  tt as generateTextQuery,
   C as getAggregation,
   Pe as getDateConstraintUid,
   $e as getDcuplPropertyTypeForNativeType,
-  x as getDeepPathValues,
+  w as getDeepPathValues,
   me as getDistinct,
-  Xe as getFacets,
+  Ye as getFacets,
   ze as getFilterEntryId,
-  _e as getNumberConstraintUid,
-  Ye as getPropertiesForData,
-  je as groupBy,
-  He as hasMinimumVersion,
+  je as getNumberConstraintUid,
+  et as getPropertiesForData,
+  Le as groupBy,
+  Ve as hasMinimumVersion,
   Ne as inferModel,
   se as isDateInstance,
-  Ee as isFloat,
-  Ce as isInt,
+  Ce as isFloat,
+  Ee as isInt,
   ne as isValidDate,
-  nt as isValidQueryStatement,
-  F as isValidVersion,
+  it as isValidQueryStatement,
+  T as isValidVersion,
   Y as logger,
-  Me as looksDateLike,
-  Ze as parseDate,
-  ft as parseTemplate,
+  ke as looksDateLike,
+  Xe as parseDate,
+  P as parseRegexLiteral,
+  lt as parseTemplate,
   b as perf,
-  j as pivot,
-  Le as removeTrailingSlash,
+  U as pivot,
+  at as redactUrl,
+  Ue as removeTrailingSlash,
   Q as resolveResourceId,
-  ot as resolveResourceIds,
-  Ve as trigger,
+  ct as resolveResourceIds,
+  Je as trigger,
   We as unescapeRegExp,
   Be as uniqBy,
-  at as yieldToEventLoop
+  ut as yieldToEventLoop
 };
 //# sourceMappingURL=index.js.map