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

package/dist/esm/index.js

@@ -1,47 +1,47 @@
-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);
+import { cloneDeep as v, get as I, every as _, findIndex as $, size as V, isEqual as H, differenceBy as O, isEqualWith as k, isMatch as G, find as J } from "lodash-es";
+function D(i) {
+  const e = E(i);
   return Z(e);
 }
-function N(n) {
-  if (typeof n != "object" || n === null)
-    return String(n);
-  if (Array.isArray(n))
-    return "[" + n.map(N).join(",") + "]";
-  const e = Object.keys(n).sort();
+function E(i) {
+  if (typeof i != "object" || i === null)
+    return String(i);
+  if (Array.isArray(i))
+    return "[" + i.map(E).join(",") + "]";
+  const e = Object.keys(i).sort();
   let t = "{";
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
-    t += s + ":" + N(n[s]), r < e.length - 1 && (t += ",");
+    t += s + ":" + E(i[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
-function Z(n) {
+function Z(i) {
   let e = 0;
-  for (let t = 0; t < n.length; t++) {
-    const r = n.charCodeAt(t);
+  for (let t = 0; t < i.length; t++) {
+    const r = i.charCodeAt(t);
     e = (e << 5) - e + r, e |= 0;
   }
   return e.toString(16);
 }
 const b = {
   now: () => typeof performance < "u" && performance.now ? performance.now() : (/* @__PURE__ */ new Date()).getTime(),
-  mark: (n) => {
-    typeof performance < "u" && performance.mark && performance.mark(n);
+  mark: (i) => {
+    typeof performance < "u" && performance.mark && performance.mark(i);
   },
-  measure: (n, e, t) => {
-    typeof performance < "u" && performance.measure && performance.measure(n, e, t);
+  measure: (i, e, t) => {
+    typeof performance < "u" && performance.measure && performance.measure(i, e, t);
   },
-  getEntriesByName(n) {
+  getEntriesByName(i) {
     if (typeof performance < "u" && performance.getEntriesByName)
-      return performance.getEntriesByName(n);
+      return performance.getEntriesByName(i);
   },
-  getEntriesByType(n) {
+  getEntriesByType(i) {
     if (typeof performance < "u" && performance.getEntriesByType)
-      return performance.getEntriesByType(n);
+      return performance.getEntriesByType(i);
   }
 };
-class Fe {
+class qe {
   data;
   enabled = !1;
   constructor() {
@@ -69,7 +69,7 @@ class Fe {
     const t = this.getKey(e.name, e.context), r = this.data.get(this.getKey(e.start, e.context)), s = this.data.get(this.getKey(e.end, e.context));
     if (!r || !s)
       return;
-    const i = s.value - r.value, o = Math.round(i * 100) / 100, a = this.data.get(t);
+    const n = s.value - r.value, o = Math.round(n * 100) / 100, a = this.data.get(t);
     if (a && e.sum) {
       const u = a.value + o, f = {
         ...a,
@@ -118,7 +118,7 @@ class Fe {
     return e + "_" + r;
   }
 }
-let X = class j {
+let X = class z {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -198,9 +198,9 @@ let X = class j {
       if (t.has(s))
         return !0;
       t.add(s);
-      const i = this.edges.get(s);
-      if (i) {
-        for (let o of i)
+      const n = this.edges.get(s);
+      if (n) {
+        for (let o of n)
           if (r(o))
             return !0;
       }
@@ -217,36 +217,36 @@ let X = class j {
    * @returns {hasCycle: boolean, path?: string[]} - hasCycle is true if a cycle exists, path contains the cycle nodes
    */
   validateNoCycles() {
-    const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), r = [], s = (i) => {
-      if (e.has(i))
+    const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), r = [], s = (n) => {
+      if (e.has(n))
         return null;
-      if (t.has(i)) {
-        const a = r.indexOf(i);
-        return r.slice(a).concat([i]);
+      if (t.has(n)) {
+        const a = r.indexOf(n);
+        return r.slice(a).concat([n]);
       }
-      t.add(i), r.push(i);
-      const o = this.edges.get(i);
+      t.add(n), r.push(n);
+      const o = this.edges.get(n);
       if (o)
         for (let a of o) {
           const c = s(a);
           if (c)
             return c;
         }
-      return r.pop(), t.delete(i), e.add(i), null;
+      return r.pop(), t.delete(n), e.add(n), null;
     };
-    for (let i of this.nodes) {
-      const o = s(i);
+    for (let n of this.nodes) {
+      const o = s(n);
       if (o)
         return { hasCycle: !0, path: o };
     }
     return { hasCycle: !1 };
   }
   order(e) {
-    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = [], i = e?.allowCycles ?? !1, o = (a) => {
+    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = [], n = e?.allowCycles ?? !1, o = (a) => {
       if (t.has(a))
         return;
       if (r.has(a)) {
-        if (i)
+        if (n)
           return;
         throw new Error("Graph has a cycle.");
       }
@@ -331,20 +331,20 @@ let X = class j {
       for (const a of o) t.set(a, (t.get(a) || 0) + 1);
     const r = [];
     let s = Array.from(this.nodes).filter((o) => (t.get(o) || 0) === 0);
-    const i = /* @__PURE__ */ new Set();
+    const n = /* @__PURE__ */ new Set();
     for (; s.length > 0; ) {
       const o = s.slice();
       r.push(o), s = [];
       for (const a of o) {
-        if (i.has(a)) continue;
-        i.add(a);
+        if (n.has(a)) continue;
+        n.add(a);
         const c = this.edges.get(a);
         if (c)
           for (const u of c)
             t.set(u, (t.get(u) || 0) - 1), (t.get(u) || 0) === 0 && s.push(u);
       }
     }
-    if (i.size !== this.nodes.size)
+    if (n.size !== this.nodes.size)
       throw new Error("Graph has a cycle.");
     if (e?.filterKinds && e.filterKinds.length > 0) {
       const o = new Set(e.filterKinds);
@@ -362,7 +362,7 @@ let X = class j {
    *  - 'both': union of upstream and downstream
    */
   getImpactedNodes(e, t = "downstream", r) {
-    const s = new Set(e), i = (u) => !r || r.length === 0 || r.includes(this.nodeKinds.get(u) ?? void 0), o = () => {
+    const s = new Set(e), n = (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 d = f.shift();
@@ -381,7 +381,7 @@ let X = class j {
       return u;
     };
     let c;
-    return t === "both" ? c = /* @__PURE__ */ new Set([...o(), ...a()]) : t === "upstream" ? c = a() : c = o(), Array.from(c).filter(i);
+    return t === "both" ? c = /* @__PURE__ */ new Set([...o(), ...a()]) : t === "upstream" ? c = a() : c = o(), Array.from(c).filter(n);
   }
   toJSON() {
     const e = Array.from(this.nodes).map((r) => ({
@@ -392,7 +392,7 @@ let X = class j {
     return { nodes: e, edges: t };
   }
   static fromJSON(e) {
-    const t = new j();
+    const t = new z();
     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 j {
     return t;
   }
   diff(e) {
-    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 = [];
+    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((d) => !t.has(d)), n = 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 };
+    return { addedNodes: s, removedNodes: n, addedEdges: c, removedEdges: u, kindChanges: f };
   }
 };
-class Ge {
+class Fe {
   graph;
   nodeIndex;
   constructor() {
@@ -454,8 +454,8 @@ class Ge {
    * @returns Array of all impacted attribute nodes (including the changed ones)
    */
   getImpactedAttributes(e) {
-    const t = e.map((a) => this.getNodeId(a.modelKey, a.attributeKey)), s = this.graph.getImpactedNodes(t, "downstream").map((a) => this.nodeIndex.get(a)).filter((a) => a !== void 0), i = [...e, ...s], o = /* @__PURE__ */ new Set();
-    return i.filter((a) => {
+    const t = e.map((a) => this.getNodeId(a.modelKey, a.attributeKey)), s = this.graph.getImpactedNodes(t, "downstream").map((a) => this.nodeIndex.get(a)).filter((a) => a !== void 0), n = [...e, ...s], o = /* @__PURE__ */ new Set();
+    return n.filter((a) => {
       const c = this.getNodeId(a.modelKey, a.attributeKey);
       return o.has(c) ? !1 : (o.add(c), !0);
     });
@@ -468,11 +468,11 @@ class Ge {
    * @returns Map<modelKey, Map<processingStep, Set<attributeKeys>>>
    */
   getProcessingOrder(e) {
-    const t = /* @__PURE__ */ new Map(), r = [...e].sort((s, i) => s.processingStep - i.processingStep);
+    const t = /* @__PURE__ */ new Map(), r = [...e].sort((s, n) => s.processingStep - n.processingStep);
     for (const s of r) {
-      const { modelKey: i, attributeKey: o, processingStep: a } = s;
-      t.has(i) || t.set(i, /* @__PURE__ */ new Map());
-      const c = t.get(i);
+      const { modelKey: n, attributeKey: o, processingStep: a } = s;
+      t.has(n) || t.set(n, /* @__PURE__ */ new Map());
+      const c = t.get(n);
       c.has(a) || c.set(a, /* @__PURE__ */ new Set()), c.get(a).add(o);
     }
     return t;
@@ -528,10 +528,10 @@ class Ge {
     const t = (r, s = /* @__PURE__ */ new Set()) => {
       if (s.has(r)) return 0;
       s.add(r);
-      const i = this.graph.getDependencies(r);
-      if (i.length === 0) return 1;
+      const n = this.graph.getDependencies(r);
+      if (n.length === 0) return 1;
       let o = 0;
-      for (const a of i) {
+      for (const a of n) {
         const c = t(a, new Set(s));
         o = Math.max(o, c);
       }
@@ -554,9 +554,9 @@ class Ge {
   validateCompleteness(e) {
     const t = [];
     for (const [r, s] of e)
-      for (const i of s) {
-        const o = this.getNodeId(r, i);
-        this.hasNode(o) || t.push({ modelKey: r, attributeKey: i });
+      for (const n of s) {
+        const o = this.getNodeId(r, n);
+        this.hasNode(o) || t.push({ modelKey: r, attributeKey: n });
       }
     return {
       isComplete: t.length === 0,
@@ -678,8 +678,8 @@ class g {
         stack: e.error.stack
       }), JSON.stringify(o);
     }
-    const t = new Date(e.timestamp).toISOString().substring(11, 23), r = e.prefix ? `[${e.prefix}]` : "", s = this.getLevelIcon(e.level), i = e.context ? ` ${JSON.stringify(e.context)}` : "";
-    return `${t} ${s} ${r} ${e.message}${i}`.trim();
+    const t = new Date(e.timestamp).toISOString().substring(11, 23), r = e.prefix ? `[${e.prefix}]` : "", s = this.getLevelIcon(e.level), n = e.context ? ` ${JSON.stringify(e.context)}` : "";
+    return `${t} ${s} ${r} ${e.message}${n}`.trim();
   }
   getLevelIcon(e) {
     switch (e) {
@@ -698,7 +698,7 @@ class g {
   log(e, t, r, s) {
     if (!this.shouldLog(e))
       return;
-    const i = {
+    const n = {
       level: e,
       message: t,
       timestamp: Date.now(),
@@ -707,10 +707,10 @@ class g {
       error: s
     };
     if (this.config.onLog) {
-      this.config.onLog(i);
+      this.config.onLog(n);
       return;
     }
-    const o = this.formatMessage(i);
+    const o = this.formatMessage(n);
     if (typeof console < "u")
       switch (e) {
         case "error":
@@ -730,8 +730,8 @@ class g {
    * Log an error message
    */
   error(e, t, r) {
-    const s = t instanceof Error ? t : void 0, i = t instanceof Error ? r : t;
-    this.log("error", e, i, s);
+    const s = t instanceof Error ? t : void 0, n = t instanceof Error ? r : t;
+    this.log("error", e, n, s);
   }
   /**
    * Log and track an error (integrates with QualityController)
@@ -800,7 +800,7 @@ class g {
   }
 }
 const Y = new g();
-class _e {
+class Pe {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
@@ -819,8 +819,8 @@ class _e {
   }
   set(e, t, r, s) {
     if (!this.enabled) return;
-    const i = this.getCacheName(e, t);
-    this.cache.set(i, r), s ? this.cacheDependencies.set(i, s) : this.log.debug(
+    const n = this.getCacheName(e, t);
+    this.cache.set(n, r), s ? this.cacheDependencies.set(n, s) : this.log.debug(
       `Cache entry '${e}' stored without dependencies. This prevents granular invalidation and may cause stale data.`
     );
   }
@@ -838,21 +838,21 @@ class _e {
     if (!this.enabled) return;
     const t = [];
     for (const [r, s] of this.cacheDependencies) {
-      let i = !1;
+      let n = !1;
       for (const [o, a] of e) {
         if (s.models.has(o))
           if (s.modelAttributes.has(o)) {
             const c = s.modelAttributes.get(o);
             for (const u of a)
               if (c.has(u)) {
-                i = !0;
+                n = !0;
                 break;
               }
           } else
-            i = !0;
-        if (i) break;
+            n = !0;
+        if (n) break;
       }
-      i && t.push(r);
+      n && t.push(r);
     }
     for (const r of t)
       this.cache.delete(r), this.cacheDependencies.delete(r);
@@ -864,9 +864,9 @@ class _e {
   invalidateByModels(e) {
     if (!this.enabled) return;
     const t = new Set(e), r = [];
-    for (const [s, i] of this.cacheDependencies)
+    for (const [s, n] of this.cacheDependencies)
       for (const o of t)
-        if (i.models.has(o)) {
+        if (n.models.has(o)) {
           r.push(s);
           break;
         }
@@ -940,44 +940,44 @@ class _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 j = (i, e = "") => {
+  if (!(typeof i != "string" || !i.startsWith("/") || !i.endsWith("/")))
+    return { pattern: i.slice(1, -1), flags: e };
+}, _e = (i, e = "") => `${i}#${e}`, ze = (i) => `${i.gt}_${i.gte}_${i.lt}_${i.lte}_${i.eq}_${i.ne}`, je = (i) => `${i.gt}_${i.gte}_${i.lt}_${i.lte}_${i.eq}_${i.ne}`, Be = (i, e) => {
   const t = typeof e == "function" ? e : (r) => r[e];
   return [
-    ...n.reduce((r, s) => {
-      const i = s == null ? s : t(s);
-      return r.has(i) || r.set(i, s), r;
+    ...i.reduce((r, s) => {
+      const n = s == null ? s : t(s);
+      return r.has(n) || r.set(n, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, Le = (n, e) => n.reduce(function(t, r) {
+}, Le = (i, e) => i.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;
 }, {});
-function ee(n = 10) {
+function ee(i = 10) {
   let e = "";
   const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  for (let r = 0; r < n; r++) e += t.charAt(Math.floor(Math.random() * t.length));
+  for (let r = 0; r < i; r++) e += t.charAt(Math.floor(Math.random() * t.length));
   return 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) => {
+const Ue = (i) => i.replace(/\/+$/, ""), te = (i) => typeof i != "string" ? "" : i.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), We = (i) => typeof i != "string" ? "" : i.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), Ve = (i, e) => {
   try {
-    return re(n, e) >= 0;
+    return re(i, e) >= 0;
   } catch {
     return !1;
   }
-}, re = (n, 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);
+}, re = (i, e) => {
+  if (!T(i) || !T(e))
+    throw new Error(`Invalid version format: v1="${i}", v2="${e}". Expected format: "x.y.z"`);
+  const t = i.split(".").map(Number), r = e.split(".").map(Number);
   for (let s = 0; s < 3; s++) {
-    const i = t[s] || 0, o = r[s] || 0;
-    if (i > o) return 1;
-    if (i < o) return -1;
+    const n = t[s] || 0, o = r[s] || 0;
+    if (n > o) return 1;
+    if (n < o) return -1;
   }
   return 0;
-}, T = (n) => /^\d+(\.\d+){0,2}$/.test(n);
+}, T = (i) => /^\d+(\.\d+){0,2}$/.test(i);
 class He {
   key;
   parentCd;
@@ -1014,10 +1014,10 @@ class He {
     };
   }
 }
-const B = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n) : n, F = (n, e, t, r, s, i) => {
+const B = (i, e) => e ? typeof structuredClone < "u" ? structuredClone(i) : v(i) : i, q = (i, e, t, r, s, n) => {
   try {
-    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__"))
+    const o = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = B(n, o);
+    if (t.scope === "list" && (t.listKey = i.cdRef?.key || i.key, t.modelKey = i.model?.key || i.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;
@@ -1035,12 +1035,12 @@ const B = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n)
       detail: d
     }), a;
   } catch {
-    return i;
+    return n;
   }
-}, Je = (n) => (t, r, s) => {
-  const i = s.value;
+}, Je = (i) => (t, r, s) => {
+  const n = s.value;
   return s.value = function(...o) {
-    const a = b.now(), c = this.cdRef, u = B(n, !0);
+    const a = b.now(), c = this.cdRef, u = B(i, !0);
     u.key || (c.increaseCounter(), u.key = c.getCounter());
     const f = ee();
     c.analyticsController.mark({
@@ -1049,32 +1049,32 @@ const B = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n)
     });
     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);
+    const l = n.apply(this, o);
+    return u.method = r, u.args = o, l && typeof l == "object" && "then" in l ? l.then((h) => q(this, c, u, a, f, h)) : q(this, c, u, a, f, l);
   }, s;
 };
-function Ze(n, e, t, r) {
+function Ze(i, e, t, r) {
   t.max || (t.max = 20);
-  const s = [], i = t.transform ? r.transformValue(t.value, t.transform) : t.value;
+  const s = [], n = t.transform ? r.transformValue(t.value, t.transform) : t.value;
   for (const [o, a] of e.entries()) {
-    const c = Array.from(a).some((f) => n.has(f)), u = t.transform ? r.transformValue(o, t.transform) : o;
+    const c = Array.from(a).some((f) => i.has(f)), u = t.transform ? r.transformValue(o, t.transform) : o;
     if (!(t.excludeUndefineds && typeof o > "u") && !(t.excludeNulls && o === null)) {
-      if (c && (i === "" || i === "//")) {
+      if (c && (n === "" || n === "//")) {
         const f = {
           value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
         s.push(f);
-      } else if (c && P(i)) {
-        if (r.queryFind(u, i, "some", t.regexFlags)) {
+      } else if (c && j(n)) {
+        if (r.queryFind(u, n, "some", t.regexFlags)) {
           const f = {
             value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
           s.push(f);
         }
-      } else if (c && typeof i == "string") {
-        const f = String(u ?? ""), d = i;
+      } else if (c && typeof n == "string") {
+        const f = String(u ?? ""), d = n;
         if (f.toLowerCase().startsWith(d.toLowerCase())) {
           const l = {
             value: o,
@@ -1082,7 +1082,7 @@ function Ze(n, e, t, r) {
           };
           s.push(l);
         }
-      } else if (c && r.queryFind(u, i, "some")) {
+      } else if (c && r.queryFind(u, n, "some")) {
         const f = {
           value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
@@ -1095,11 +1095,11 @@ function Ze(n, e, t, r) {
   }
   return s;
 }
-function se(n) {
-  return n instanceof Date;
+function se(i) {
+  return i instanceof Date;
 }
-function ne(n) {
-  return n instanceof Date && !isNaN(n.getTime());
+function ne(i) {
+  return i instanceof Date && !isNaN(i.getTime());
 }
 const ie = {
   yyyy: { type: "year", pattern: "yyyy", regex: "(\\d{4})" },
@@ -1116,19 +1116,19 @@ const ie = {
   s: { type: "second", pattern: "s", regex: "(\\d{1,2})" },
   SSS: { type: "millisecond", pattern: "SSS", regex: "(\\d{3})" }
 };
-function oe(n) {
+function oe(i) {
   let e = "^";
   const t = [];
-  let r = n;
-  const s = Object.entries(ie).sort((i, o) => o[0].length - i[0].length);
+  let r = i;
+  const s = Object.entries(ie).sort((n, o) => o[0].length - n[0].length);
   for (; r.length > 0; ) {
-    let i = !1;
+    let n = !1;
     for (const [o, a] of s)
       if (r.startsWith(o)) {
-        e += a.regex, t.push({ type: a.type, pattern: o }), r = r.slice(o.length), i = !0;
+        e += a.regex, t.push({ type: a.type, pattern: o }), r = r.slice(o.length), n = !0;
         break;
       }
-    if (!i) {
+    if (!n) {
       const o = r[0];
       if (!o)
         break;
@@ -1137,7 +1137,7 @@ function oe(n) {
   }
   return e += "$", { regex: new RegExp(e), tokenOrder: t };
 }
-function ae(n, e) {
+function ae(i, e) {
   const t = {
     year: 1970,
     month: 1,
@@ -1148,51 +1148,51 @@ function ae(n, e) {
     millisecond: 0
   };
   for (let r = 0; r < e.length; r++) {
-    const s = n[r + 1];
+    const s = i[r + 1];
     if (!s)
       continue;
-    const i = parseInt(s, 10), o = e[r];
-    o && (o.type === "year" && o.pattern === "yy" ? t.year = 2e3 + i : t[o.type] = i);
+    const n = parseInt(s, 10), o = e[r];
+    o && (o.type === "year" && o.pattern === "yy" ? t.year = 2e3 + n : t[o.type] = n);
   }
   return t;
 }
-function ce(n) {
-  if (n.month < 1 || n.month > 12)
+function ce(i) {
+  if (i.month < 1 || i.month > 12)
     return /* @__PURE__ */ new Date(NaN);
-  if (n.day < 1 || n.day > 31)
+  if (i.day < 1 || i.day > 31)
     return /* @__PURE__ */ new Date(NaN);
-  if (n.hour < 0 || n.hour > 23)
+  if (i.hour < 0 || i.hour > 23)
     return /* @__PURE__ */ new Date(NaN);
-  if (n.minute < 0 || n.minute > 59)
+  if (i.minute < 0 || i.minute > 59)
     return /* @__PURE__ */ new Date(NaN);
-  if (n.second < 0 || n.second > 59)
+  if (i.second < 0 || i.second > 59)
     return /* @__PURE__ */ new Date(NaN);
-  if (n.millisecond < 0 || n.millisecond > 999)
+  if (i.millisecond < 0 || i.millisecond > 999)
     return /* @__PURE__ */ new Date(NaN);
   const e = new Date(
-    n.year,
-    n.month - 1,
-    n.day,
-    n.hour,
-    n.minute,
-    n.second,
-    n.millisecond
+    i.year,
+    i.month - 1,
+    i.day,
+    i.hour,
+    i.minute,
+    i.second,
+    i.millisecond
   );
-  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);
+  return ne(e) ? e.getFullYear() !== i.year || e.getMonth() !== i.month - 1 || e.getDate() !== i.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
 }
-function Xe(n, e, t) {
-  if (n = n.trim(), e === "t") {
-    const a = Number(n);
+function Xe(i, e, t) {
+  if (i = i.trim(), e === "t") {
+    const a = Number(i);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a * 1e3);
   }
   if (e === "T") {
-    const a = Number(n);
+    const a = Number(i);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a);
   }
-  const { regex: r, tokenOrder: s } = oe(e), i = n.match(r);
-  if (!i)
+  const { regex: r, tokenOrder: s } = oe(e), n = i.match(r);
+  if (!n)
     return /* @__PURE__ */ new Date(NaN);
-  const o = ae(i, s);
+  const o = ae(n, s);
   return ce(o);
 }
 class ue {
@@ -1248,9 +1248,9 @@ class fe {
   }
   hasCycle(e) {
     if (e.length === 0) return !1;
-    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = (i) => {
-      t.add(i), r.add(i);
-      const o = this.graph.get(i);
+    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = (n) => {
+      t.add(n), r.add(n);
+      const o = this.graph.get(n);
       if (o) {
         for (const a of o)
           if (t.has(a)) {
@@ -1259,14 +1259,14 @@ class fe {
           } else if (s(a))
             return !0;
       }
-      return r.delete(i), !1;
+      return r.delete(n), !1;
     };
-    for (let i = 0; i < e.length - 1; i++) {
-      const o = e[i], a = e[i + 1];
+    for (let n = 0; n < e.length - 1; n++) {
+      const o = e[n], a = e[n + 1];
       o && a && this.addDependency(o, a);
     }
-    for (const i of e)
-      if (!t.has(i) && s(i))
+    for (const n of e)
+      if (!t.has(n) && s(n))
         return !0;
     return !1;
   }
@@ -1305,11 +1305,11 @@ class de {
       return this.cacheHits++, this.parseCache.get(e);
     this.cacheMisses++;
     let t, r;
-    const s = e.includes("."), i = e.includes("["), o = s || i;
+    const s = e.includes("."), n = e.includes("["), o = s || n;
     if (o) {
       r = e.split(/[.[]/)[0];
       const c = e.indexOf("."), u = e.indexOf("[");
-      if (i && (c === -1 || u < c)) {
+      if (n && (c === -1 || u < c)) {
         const d = e.indexOf("]");
         if (d > -1) {
           const l = e.indexOf(".", d + 1);
@@ -1372,8 +1372,8 @@ class de {
     if (!e || e.trim().length === 0)
       return r.push("Attribute path cannot be empty"), { valid: !1, errors: r };
     (e.startsWith(".") || e.endsWith(".")) && r.push(`Invalid path: Leading or trailing dots are not allowed: ${e}`), e.includes("..") && r.push(`Invalid path: Consecutive dots are not allowed: ${e}`);
-    const s = (e.match(/\[/g) || []).length, i = (e.match(/]/g) || []).length;
-    s !== i && r.push(`Invalid bracket notation: Mismatched brackets in ${e}`), e.includes("[]") && r.push(`Invalid bracket notation: Empty brackets not allowed: ${e}`);
+    const s = (e.match(/\[/g) || []).length, n = (e.match(/]/g) || []).length;
+    s !== n && r.push(`Invalid bracket notation: Mismatched brackets in ${e}`), e.includes("[]") && r.push(`Invalid bracket notation: Empty brackets not allowed: ${e}`);
     const o = /\[([^\]]+)\]/g;
     let a;
     for (; (a = o.exec(e)) !== null; ) {
@@ -1443,9 +1443,9 @@ class de {
   }
 }
 const m = new de();
-function w(n, e) {
+function w(i, e) {
   if (e.includes("[*]")) {
-    const i = e.indexOf("[*]"), o = e.substring(0, i), a = e.substring(i + 3), c = o ? I(n, o) : n;
+    const n = e.indexOf("[*]"), o = e.substring(0, n), a = e.substring(n + 3), c = o ? I(i, o) : i;
     if (!Array.isArray(c)) return [];
     const u = [];
     for (const f of c)
@@ -1453,80 +1453,80 @@ function w(n, e) {
     return u;
   }
   const t = e.split(".");
-  let r = [n];
-  for (const i of t) {
+  let r = [i];
+  for (const n of t) {
     const o = [];
     for (const a of r)
       if (a != null)
         if (Array.isArray(a))
           for (const c of a) {
             if (c == null) continue;
-            const u = c[i];
+            const u = c[n];
             u !== void 0 && o.push(u);
           }
         else {
-          const c = a[i];
+          const c = a[n];
           c !== void 0 && o.push(c);
         }
     if (r = o, r.length === 0) return [];
   }
   const s = [];
-  for (const i of r)
-    if (Array.isArray(i))
-      for (const o of i) o !== void 0 && s.push(o);
-    else i !== void 0 && s.push(i);
+  for (const n of r)
+    if (Array.isArray(n))
+      for (const o of n) o !== void 0 && s.push(o);
+    else n !== void 0 && s.push(n);
   return s;
 }
-function M(n) {
+function Q(i) {
   let e = 0;
-  for (let t of n) {
+  for (let t of i) {
     const r = t.toString().split(".")[1];
     r && (e = Math.max(e, r.length));
   }
   return Math.pow(10, e);
 }
-function G(n, e, t) {
-  return (n * t + e * t) / t;
+function F(i, e, t) {
+  return (i * t + e * t) / t;
 }
-function le(n, e, t) {
-  return n * t / (e * t);
+function le(i, e, t) {
+  return i * t / (e * t);
 }
-const C = (n, e, t, r) => {
+const C = (i, e, t, r) => {
   if (!r)
     throw new Error("Attribute not found");
   const s = {
     attribute: r,
-    types: n.types
+    types: i.types
   };
-  let i;
-  (s.types.includes("sum") || s.types.includes("avg")) && (i = ye(r, e));
+  let n;
+  (s.types.includes("sum") || s.types.includes("avg")) && (n = ye(r, e));
   let o;
-  return (s.types.includes("min") || s.types.includes("max")) && (o = pe(r, e)), n.types.forEach((a) => {
-    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));
+  return (s.types.includes("min") || s.types.includes("max")) && (o = pe(r, e)), i.types.forEach((a) => {
+    a === "sum" ? s.sum = n?.sum : a === "avg" ? s.avg = n?.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(i, e, t) : a === "group" && (s.group = ge(i, e));
   }), s;
-}, he = (n, e) => {
-  const r = m.parse(n).isDeepQuery;
+}, he = (i, e) => {
+  const r = m.parse(i).isDeepQuery;
   let s = 0;
-  for (const i of e.values())
-    if (i)
+  for (const n of e.values())
+    if (n)
       if (r)
-        s += w(i, n).filter((o) => o != null).length;
+        s += w(n, i).filter((o) => o != null).length;
       else {
-        const o = i[n];
+        const o = n[i];
         if (o == null) continue;
         Array.isArray(o) ? s += o.filter((a) => a != null).length : s++;
       }
   return s;
-}, pe = (n, e) => {
+}, pe = (i, e) => {
   let t, r;
-  const i = m.parse(n).isDeepQuery;
+  const n = m.parse(i).isDeepQuery;
   for (const o of e.values()) {
     if (!o) continue;
     let a;
-    if (i)
-      a = w(o, n);
+    if (n)
+      a = w(o, i);
     else {
-      const c = o[n];
+      const c = o[i];
       c === void 0 ? a = [] : Array.isArray(c) ? a = c.filter((u) => u !== void 0) : a = [c];
     }
     for (const c of a)
@@ -1534,9 +1534,9 @@ const C = (n, e, t, r) => {
   }
   if (!(t === void 0 || r === void 0))
     return [t, r];
-}, ge = (n, e) => {
+}, ge = (i, e) => {
   const t = [];
-  n.groupOptions?.groups?.forEach((o) => {
+  i.groupOptions?.groups?.forEach((o) => {
     t.push({
       option: o,
       count: 0,
@@ -1547,49 +1547,49 @@ const C = (n, e, t, r) => {
     option: { value: ["$dcupl_not_found"] },
     count: 0,
     keys: []
-  }, i = m.parse(n.attribute).isDeepQuery;
+  }, n = m.parse(i.attribute).isDeepQuery;
   for (const o of e.values()) {
     let a;
-    i ? a = w(o, n.attribute) : a = [o[n.attribute]];
+    n ? a = w(o, i.attribute) : a = [o[i.attribute]];
     let c = !1;
     for (const u of a)
       for (const f of t)
         (typeof f.option.value < "u" && f.option.value.includes(u) || typeof f.option.from < "u" && f.option.from < u && typeof f.option.to < "u" && f.option.to > u) && (f.keys.includes(o.key) || (f.count++, f.keys.push(o.key)), c = !0);
-    !c && n?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(o.key));
+    !c && i?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(o.key));
   }
-  return n?.groupOptions?.calculateNotFound && t.push(r), t;
-}, ye = (n, e) => {
+  return i?.groupOptions?.calculateNotFound && t.push(r), t;
+}, ye = (i, e) => {
   let t = 0, r = 0;
-  const i = m.parse(n).isDeepQuery;
+  const n = m.parse(i).isDeepQuery;
   for (const a of e.values()) {
     if (!a) continue;
     let c;
-    if (i)
-      c = w(a, n);
+    if (n)
+      c = w(a, i);
     else {
-      const u = a[n];
+      const u = a[i];
       u === void 0 ? c = [] : Array.isArray(u) ? c = u : c = [u];
     }
     for (const u of c)
       if (Array.isArray(u))
         for (const f of u)
-          typeof f == "number" && (t = G(t, f, M([t, f])), r++);
-      else typeof u == "number" && (t = G(t, u, M([t, u])), r++);
+          typeof f == "number" && (t = F(t, f, Q([t, f])), r++);
+      else typeof u == "number" && (t = F(t, u, Q([t, u])), r++);
   }
   return r === 0 ? void 0 : {
-    average: le(t, r, M([t, r])),
+    average: le(t, r, Q([t, r])),
     count: r,
     sum: t
   };
-}, me = (n, e, t) => {
+}, me = (i, e, t) => {
   const r = [];
-  for (const [s, i] of t)
-    if (!(n.excludeUndefineds && typeof s > "u") && Array.from(i).find((o) => e.has(o))) {
+  for (const [s, n] of t)
+    if (!(i.excludeUndefineds && typeof s > "u") && Array.from(n).find((o) => e.has(o))) {
       const o = {
         value: s,
-        count: i.size
+        count: n.size
       };
-      if (n.distinctOptions?.skipKeys || (o.keys = Array.from(i)), r.push(o), n.distinctOptions?.limit && r.length >= n.distinctOptions.limit)
+      if (i.distinctOptions?.skipKeys || (o.keys = Array.from(n)), r.push(o), i.distinctOptions?.limit && r.length >= i.distinctOptions.limit)
         break;
     }
   return r;
@@ -1655,6 +1655,57 @@ class L {
   getQueryGroup(e) {
     return this.currentQuery.queries.find((t) => this.isQueryGroup(t) && t.groupKey === e);
   }
+  /**
+   * Find the group with the given `groupKey` at any nesting depth (#294).
+   *
+   * Unlike {@link getQueryGroup}, which only looks at the top level, this also finds a
+   * keyed group that sits inside a keyless wrapper group — the shape
+   * `apply({ groupType: 'and', queries: [{ groupKey: 'plan', ... }] }, { mode: 'set' })`
+   * produces. Groups on one level are checked before their children, so a top-level
+   * match wins over a nested one; otherwise the first match in query order wins
+   * (groupKeys are expected to be unique).
+   *
+   * @param groupKey - Key of the group to find
+   * @param relevantQuery - Query to search (defaults to the current query)
+   * @returns The matching group, or undefined
+   */
+  findQueryGroup(e, t) {
+    const r = this.locateQueryGroup(e, (t ?? this.currentQuery).queries);
+    return r ? this.groupAtPath(r) : void 0;
+  }
+  /**
+   * Path from the root `queries` array down to a group: each step names the array that
+   * holds a node and the node's index in it; the last step is the group itself.
+   */
+  locateQueryGroup(e, t) {
+    const r = t.findIndex((s) => this.isQueryGroup(s) && s.groupKey === e);
+    if (r > -1)
+      return [{ queries: t, idx: r }];
+    for (const [s, n] of t.entries())
+      if (this.isQueryGroup(n)) {
+        const o = this.locateQueryGroup(e, n.queries);
+        if (o)
+          return [{ queries: t, idx: s }, ...o];
+      }
+  }
+  groupAtPath(e) {
+    const t = e[e.length - 1];
+    return t.queries[t.idx];
+  }
+  /**
+   * Walk a path upwards from its last group and splice every group that has no
+   * queries left, stopping at the first non-empty one. Mirrors the existing
+   * "remove the group when its queries are empty" behaviour for nested wrappers, so
+   * removing the only group inside a keyless wrapper also removes the wrapper.
+   */
+  pruneEmptyGroups(e) {
+    for (let t = e.length - 1; t >= 0; t--) {
+      const { queries: r, idx: s } = e[t];
+      if (r[s].queries.length > 0)
+        break;
+      r.splice(s, 1);
+    }
+  }
   getQuery() {
     return v(this.currentQuery);
   }
@@ -1672,7 +1723,7 @@ class L {
   }
   validate(e) {
     const t = e.queries.map((s) => this.validateQuery(s));
-    return { valid: z(t, (s) => s.valid), errors: t.map((s) => s.errors).flat() };
+    return { valid: _(t, (s) => s.valid), errors: t.map((s) => s.errors).flat() };
   }
   applyOptions(e, t = "update") {
     return t === "set" ? (this.currentQuery.count = e.count, this.currentQuery.start = e.start, this.currentQuery.sort = e.sort, this.currentQuery.projection = e.projection) : (typeof e?.sort < "u" && (this.currentQuery.sort = e.sort), typeof e?.count < "u" && (this.currentQuery.count = e.count), typeof e?.start < "u" && (this.currentQuery.start = e?.start), typeof e?.projection < "u" && (this.currentQuery.projection = e?.projection)), this.getQuery();
@@ -1692,8 +1743,20 @@ class L {
    * - {@link replaceQuery} - Replace complete query
    *
    * @param queryToApply - Query, condition, or array to apply
-   * @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 options - Mode: 'add' (default) or 'set'. `set` works per group, not per query:
+   * - Root group (`groupKey: 'root'`): replaces the whole query — all groups plus
+   *   `count`/`start`/`sort`/`projection` (the only input that does).
+   * - Keyed group, or an array of groups: each group replaces the group with the same
+   *   `groupKey`; every other group is kept. Same as {@link setGroup}.
+   * - Condition: replaces the conditions of the group keyed by its attribute.
+   *
+   * A group without `groupKey` is not the root, even if it carries a `queries` array:
+   * `apply({ groupType: 'and', queries: [...] }, { mode: 'set' })` stores it as a keyless
+   * wrapper group that replaces the first keyless top-level group, and the keyed groups
+   * inside it stay nested there. {@link removeQuery} and `fn.facets` still find them by
+   * `groupKey` at any depth (#294). To replace the whole query, pass `groupKey: 'root'`
+   * or use {@link replaceQuery}. 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
    */
@@ -1705,11 +1768,11 @@ class L {
       e.groupType && (r.groupType = e.groupType), t?.mode === "set" ? r.queries = e.queries : r.queries = [...r.queries, ...e.queries], this.applyOptions(e, "set");
     else if (this.isQuery(e)) {
       const s = r.queries.findIndex(
-        (i) => this.isQueryGroup(i) && i.groupKey === e.attribute
+        (n) => this.isQueryGroup(n) && n.groupKey === e.attribute
       );
       if (s > -1) {
-        const i = r.queries[s];
-        t?.mode === "set" ? i.queries = [e] : i.queries.push(e);
+        const n = r.queries[s];
+        t?.mode === "set" ? n.queries = [e] : n.queries.push(e);
       } else
         r.queries.push({
           groupKey: e.attribute,
@@ -1717,12 +1780,12 @@ class L {
           queries: [e]
         });
     } else if (this.isQueryGroup(e)) {
-      const i = e.groupKey === void 0 && t?.mode !== "set" ? -1 : r.queries.findIndex(
+      const n = e.groupKey === void 0 && t?.mode !== "set" ? -1 : r.queries.findIndex(
         (o) => this.isQueryGroup(o) && o.groupKey === e.groupKey
       );
-      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];
+      if (n > -1) {
+        const o = r.queries[n];
+        e.groupType && (o.groupType = e.groupType), t?.mode === "set" ? r.queries[n] = e : o.queries = [...o.queries, ...e.queries];
       } else
         r.queries.push({
           groupKey: e.groupKey,
@@ -1745,33 +1808,39 @@ class L {
   /**
    * Remove a specific query or query group.
    *
+   * - A condition (`attribute` set) is removed from the group keyed by its attribute.
+   * - A group with `groupKey` but no `queries` is removed entirely.
+   * - A group with `groupKey` and `queries` has those conditions removed from it.
+   *
+   * The target group is looked up by `groupKey` at any nesting depth (see
+   * {@link findQueryGroup}), so a keyed group inside a keyless wrapper group is found
+   * too (#294). A group left without queries is removed, and so is every wrapper
+   * group that becomes empty as a result.
+   *
    * @param queryToRemove - Query or group to remove (partial match)
    * @param relevantQuery - Target query (defaults to current)
    * @returns Updated query
    */
   removeQuery(e, t) {
     if (t || (t = this.currentQuery), this.isQuery(e)) {
-      const r = t.queries.findIndex(
-        (s) => this.isQueryGroup(s) && s.groupKey === e.attribute
-      );
-      if (r > -1) {
-        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);
+      const r = this.locateQueryGroup(e.attribute, t.queries);
+      if (r) {
+        const s = this.groupAtPath(r), n = $(s.queries, e);
+        n > -1 && s.queries.splice(n, 1), this.pruneEmptyGroups(r);
       }
     } else if (this.isQueryGroup(e)) {
-      const r = t.queries.findIndex(
-        (s) => this.isQueryGroup(s) && s.groupKey === e.groupKey
-      );
-      if (r > -1)
-        if (!e.queries)
-          t.queries.splice(r, 1);
-        else {
-          const s = t.queries[r];
-          for (const i of e.queries) {
-            const o = $(s.queries, i);
+      const r = this.locateQueryGroup(e.groupKey, t.queries);
+      if (r)
+        if (e.queries) {
+          const s = this.groupAtPath(r);
+          for (const n of e.queries) {
+            const o = $(s.queries, n);
             o > -1 && s.queries.splice(o, 1);
           }
-          s.queries.length === 0 && t.queries.splice(r, 1);
+          this.pruneEmptyGroups(r);
+        } else {
+          const s = r[r.length - 1];
+          s.queries.splice(s.idx, 1), this.pruneEmptyGroups(r.slice(0, -1));
         }
     }
     return t;
@@ -1781,8 +1850,8 @@ class L {
     if (this.isQuery(e))
       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 };
+      const n = e.queries.map((o) => this.validateQuery(o)).filter((o) => !o.valid).map((o) => o.errors).flat();
+      return n.length > 0 ? { valid: !1, errors: n } : { valid: !0 };
     }
     return t.push(new x("Invalid query definition", e)), { valid: !1, errors: t };
   }
@@ -1794,8 +1863,8 @@ class L {
    * @returns Array of attribute names
    */
   getQueryAttributes(e) {
-    const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
-      for (const o of i)
+    const t = [], r = /* @__PURE__ */ new Set(), s = (n) => {
+      for (const o of n)
         this.isQuery(o) ? o.attribute && !r.has(o.attribute) && (t.push(o.attribute), r.add(o.attribute)) : this.isQueryGroup(o) && s(o.queries);
     };
     return s(e?.queries || this.currentQuery.queries), t;
@@ -1808,8 +1877,8 @@ class L {
    * @returns Array of QueryAttributeEntry objects
    */
   extractQueryAttributes(e) {
-    const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
-      for (const o of i)
+    const t = [], r = /* @__PURE__ */ new Set(), s = (n) => {
+      for (const o of n)
         if (this.isQuery(o)) {
           if (o.attribute && !r.has(o.attribute)) {
             const a = this.getQueryAttributeForString(o.attribute);
@@ -1856,9 +1925,9 @@ class L {
             t[r.reference] || (t[r.reference] = { $: !0 });
             const s = this.deepQueryService.parse(r.referenceAttribute);
             if (s.isDeepQuery && r.reference) {
-              const i = this.getProjectionForAttributeEntries([s]);
-              Object.keys(i).forEach((o) => {
-                o !== "$" && r.reference && (t[r.reference][o] = i[o]);
+              const n = this.getProjectionForAttributeEntries([s]);
+              Object.keys(n).forEach((o) => {
+                o !== "$" && r.reference && (t[r.reference][o] = n[o]);
               });
             } else r.reference && (t[r.reference][r.referenceAttribute] = !0);
           } else
@@ -1996,9 +2065,11 @@ class L {
     return this.applyQuery(e, { mode: "add" });
   }
   /**
-   * Replace query with new condition(s).
+   * Replace the conditions of an attribute group with new condition(s).
    * Accepts single condition or array of conditions.
-   * Each condition replaces all existing conditions for its attribute.
+   * Each condition replaces all existing conditions of the group keyed by its attribute
+   * (created if missing); groups for other attributes and the query options are kept.
+   * This does not replace the whole query — see {@link replaceQuery} for that.
    *
    * Clearer alternative to `applyQuery(condition, { mode: 'set' })`.
    *
@@ -2021,8 +2092,16 @@ class L {
     return this.applyQuery(e, { mode: "set" });
   }
   /**
-   * Replace a query group with new definition.
-   * If group exists, replaces it; otherwise creates new group.
+   * Replace one query group by key (per-group `set`).
+   * The group with the same `groupKey` is replaced by the given definition; if none exists
+   * the group is appended. All other groups and the query options (`count`, `start`,
+   * `sort`, `projection`) are kept. An unkeyed group replaces the first unkeyed top-level
+   * group. Only a group with `groupKey: 'root'` replaces the whole query — equivalent to
+   * `applyQuery(rootGroup, { mode: 'set' })` / {@link replaceQuery}.
+   *
+   * A group without `groupKey` whose `queries` hold keyed groups is stored as a keyless
+   * wrapper; the keyed groups inside it stay nested and are still found by `groupKey`
+   * via {@link findQueryGroup}, {@link removeQuery} and `fn.facets` (#294).
    *
    * @param group - Query group to set
    * @returns Updated query
@@ -2069,7 +2148,10 @@ class L {
   }
   /**
    * Replace the entire current query with a new query.
-   * Completely replaces all conditions, groups, and options.
+   * Replaces all conditions and groups, and the root `groupType` when given. The query
+   * options (`count`, `start`, `sort`, `projection`) are kept — use {@link applyOptions}
+   * or `applyQuery({ groupKey: 'root', ... }, { mode: 'set' })` to replace those too.
+   * To replace a single group by key, use {@link setGroup}.
    *
    * @param query - Complete query to replace with
    * @returns Updated query
@@ -2165,13 +2247,13 @@ class L {
     const t = (r) => {
       for (const s of r)
         if (this.isQuery(s)) {
-          let i = !0;
+          let n = !0;
           for (const o in e)
             if (s[o] !== e[o]) {
-              i = !1;
+              n = !1;
               break;
             }
-          if (i) return !0;
+          if (n) return !0;
         } else if (this.isQueryGroup(s) && t(s.queries))
           return !0;
       return !1;
@@ -2292,9 +2374,9 @@ class L {
     return e(this.currentQuery.queries);
   }
 }
-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();
+const N = new L();
+function Ye(i, e, t, r, s, n, o) {
+  const a = t.excludeGroup ?? s, c = N.removeQuery({ groupKey: a }, v(r)), u = o.queryData(i, c, !1, n), f = e ? [...e.keys()] : [], d = new Set(f), l = n.get(s) ?? /* @__PURE__ */ new Map();
   if (!t.excludeUnresolved)
     for (const p of l.keys())
       d.add(p);
@@ -2302,7 +2384,7 @@ function Ye(n, e, t, r, s, i, o) {
     const p = [];
     for (const K of d.values())
       p.push(
-        _(
+        P(
           K,
           l,
           u,
@@ -2318,7 +2400,7 @@ function Ye(n, e, t, r, s, i, o) {
   }
   const h = [];
   for (const p of d.values()) {
-    const y = _(
+    const y = P(
       p,
       l,
       u,
@@ -2336,36 +2418,36 @@ function Ye(n, e, t, r, s, i, o) {
   }
   return h;
 }
-function _(n, e, t, r, s, i, o, a) {
-  const c = /* @__PURE__ */ new Map(), u = e.get(n) || /* @__PURE__ */ new Set();
+function P(i, e, t, r, s, n, o, a) {
+  const c = /* @__PURE__ */ new Map(), u = e.get(i) || /* @__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(i, s, n, o),
+    key: String(i),
+    value: i,
+    selected: we(n, s, i, o),
     enabled: c.size > 0,
     size: c.size,
-    entry: r?.get(n),
+    entry: r?.get(i),
     resultKeys: Array.from(c.keys())
   };
 }
-function S(n, e) {
-  if (n === void 0 && e === void 0) return 0;
-  if (n === void 0) return 1;
+function S(i, e) {
+  if (i === void 0 && e === void 0) return 0;
+  if (i === void 0) return 1;
   if (e === void 0) return -1;
-  const t = typeof n, r = typeof e;
+  const t = typeof i, r = typeof e;
   if (t !== r) return t < r ? -1 : 1;
-  if (t === "number") return n - e;
-  if (t === "string") return n.localeCompare(e);
-  const s = String(n), i = String(e);
-  return s < i ? -1 : s > i ? 1 : 0;
+  if (t === "number") return i - e;
+  if (t === "string") return i.localeCompare(e);
+  const s = String(i), n = String(e);
+  return s < n ? -1 : s > n ? 1 : 0;
 }
-function ve(n) {
-  switch (n) {
+function ve(i) {
+  switch (i) {
     case "size-desc":
       return (e, t) => t.size - e.size || S(e.value, t.value);
     case "size-asc":
@@ -2376,9 +2458,9 @@ function ve(n) {
       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, 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;
+const we = (i, e, t, r) => {
+  const s = N.findQueryGroup(i, r);
+  return s ? !!s.queries.find((n) => N.isQuery(n) ? n.attribute !== e ? !1 : (n.operator === "in" && Array.isArray(n.value) ? n.value : [n.value]).some((a) => (a?.key || a) === t) : !1) : !1;
 };
 class xe {
   indexMap = /* @__PURE__ */ new Map();
@@ -2403,31 +2485,31 @@ class xe {
     let r = this.dataMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this.dataMap.set(e, r));
     for (const s of t) {
-      let i;
+      let n;
       if (typeof s == "object" && s && s.key)
-        i = s.key;
+        n = s.key;
       else if (Array.isArray(s)) {
         for (const a of s)
           this.fillDataMap(e, [a]);
         return;
-      } else s instanceof Date ? i = s.toISOString() : i = s;
-      let o = r.get(i);
-      o || (o = { key: i }, this.dataMap.get(e)?.set(i, o));
+      } else s instanceof Date ? n = s.toISOString() : n = s;
+      let o = r.get(n);
+      o || (o = { key: n }, this.dataMap.get(e)?.set(n, o));
     }
   }
   fillInverseIndex(e, t, r) {
     if (!e || !t || !r || !Array.isArray(r))
       return;
     const s = this.indexMap.get(e) || /* @__PURE__ */ new Map();
-    for (const i of r) {
+    for (const n of r) {
       let o;
-      if (typeof i == "object" && i && i.key)
-        o = i.key;
-      else if (Array.isArray(i)) {
-        for (const c of i)
+      if (typeof n == "object" && n && n.key)
+        o = n.key;
+      else if (Array.isArray(n)) {
+        for (const c of n)
           this.fillInverseIndex(e, t, [c]);
         return;
-      } else i instanceof Date ? o = i.toISOString() : o = i;
+      } else n instanceof Date ? o = n.toISOString() : o = n;
       let a = s.get(o);
       a || (a = /* @__PURE__ */ new Set(), s.set(o, a)), a.add(t);
     }
@@ -2443,11 +2525,11 @@ class xe {
   }
   getOrCreateIndex(e, t, r) {
     const s = this.getIndexName(e, r);
-    let i = this.getIndex(s);
+    let n = this.getIndex(s);
     const o = this.indexMetadata.get(s);
     if (o)
       o.lastAccessedAt = Date.now();
-    else if (!i) {
+    else if (!n) {
       const c = m.parse(e).isDeepQuery ?? !1;
       this.indexMetadata.set(s, {
         createdAt: Date.now(),
@@ -2456,16 +2538,16 @@ class xe {
         type: c ? "deep" : "shallow"
       });
     }
-    if (!i) {
+    if (!n) {
       this.reset(s), this.indexMap.set(s, /* @__PURE__ */ new Map());
       const c = m.parse(e).isDeepQuery;
       for (const u of t.values()) {
         let 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();
+      n = this.getIndex(s) || /* @__PURE__ */ new Map();
     }
-    return i;
+    return n;
   }
   getIndexName(e, t) {
     return t ? e + "_" + D(t) : e;
@@ -2480,15 +2562,15 @@ class xe {
   removeFromInverseIndex(e, t, r) {
     const s = this.indexMap.get(e);
     if (s)
-      for (const i of r) {
+      for (const n of r) {
         let o;
-        if (typeof i == "object" && i && i.key)
-          o = i.key;
-        else if (Array.isArray(i)) {
-          for (const c of i)
+        if (typeof n == "object" && n && n.key)
+          o = n.key;
+        else if (Array.isArray(n)) {
+          for (const c of n)
             this.removeFromInverseIndex(e, t, [c]);
           return;
-        } else i instanceof Date ? o = i.toISOString() : o = i;
+        } else n instanceof Date ? o = n.toISOString() : o = n;
         const a = s.get(o);
         a && (a.delete(t), a.size === 0 && s.delete(o));
       }
@@ -2512,15 +2594,15 @@ class xe {
     const r = this.dataMap.get(e);
     if (r)
       for (const s of t) {
-        let i;
+        let n;
         if (typeof s == "object" && s && s.key)
-          i = s.key;
+          n = s.key;
         else if (Array.isArray(s)) {
           for (const o of s)
             this.removeFromDataMap(e, [o]);
           return;
-        } else s instanceof Date ? i = s.toISOString() : i = s;
-        r.delete(i);
+        } else s instanceof Date ? n = s.toISOString() : n = s;
+        r.delete(n);
       }
   }
   /**
@@ -2612,8 +2694,8 @@ class xe {
   cleanupStaleIndices(e = 300 * 1e3) {
     const t = Date.now();
     let r = 0;
-    for (const [s, i] of this.indexMetadata)
-      t - i.lastAccessedAt > e && (this.reset(s), r++);
+    for (const [s, n] of this.indexMetadata)
+      t - n.lastAccessedAt > e && (this.reset(s), r++);
     return r;
   }
   /**
@@ -2627,19 +2709,19 @@ class xe {
       const a = t - o.createdAt;
       r += a, a > s && (s = a);
     }
-    const i = this.indexMetadata.size > 0 ? r / this.indexMetadata.size : 0;
+    const n = this.indexMetadata.size > 0 ? r / this.indexMetadata.size : 0;
     return {
       shallow: e.shallow,
       deep: e.deep,
       total: e.total,
       oldestAge: s,
-      avgAge: i
+      avgAge: n
     };
   }
 }
 const A = "__";
-function U(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
-  const o = i || n;
+function U(i, e, t = { key: "root" }, r = "root", s = new xe(), n) {
+  const o = n || i;
   for (const a of e.columns)
     a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.rows)
@@ -2648,24 +2730,24 @@ function U(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
     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);
+    const a = Ae(i, e.rows[0], e, s, r, n);
     t.rows.push(a);
   }
   if (e.columns && e.columns.length > 0) {
     t.columns = t.columns || [];
-    const a = W(n, e.columns[0], e, s, r, i);
+    const a = W(i, e.columns[0], e, s, r, n);
     t.columns.push(a);
   }
   if (t.key === "root")
     for (const a of e.values) {
       if (t.values = t.values || [], r === "root" && e.options?.calculateTotals === !1)
         continue;
-      const c = C(a, n, s.getIndex(a.attribute), a.attribute);
+      const c = C(a, i, s.getIndex(a.attribute), a.attribute);
       t.values.push(c);
     }
   return t;
 }
-function Ae(n, e, t, r, s = "", i) {
+function Ae(i, e, t, r, s = "", n) {
   const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return o;
@@ -2675,7 +2757,7 @@ function Ae(n, e, t, r, s = "", i) {
       value: c
     }, d = /* @__PURE__ */ new Map();
     for (const l of u)
-      n.has(l) && d.set(l, n.get(l));
+      i.has(l) && d.set(l, i.get(l));
     if (d.size) {
       for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
@@ -2691,7 +2773,7 @@ function Ae(n, e, t, r, s = "", i) {
           f,
           s + A + e.attribute + A + c,
           r,
-          i
+          n
         );
       } else if (t.columns)
         for (const l of t.columns) {
@@ -2702,7 +2784,7 @@ function Ae(n, e, t, r, s = "", i) {
             t,
             r,
             s + A + e.attribute + A + c,
-            i
+            n
           );
           f.columns.push(h);
         }
@@ -2710,7 +2792,7 @@ function Ae(n, e, t, r, s = "", i) {
   }
   return o;
 }
-function W(n, e, t, r, s = "", i) {
+function W(i, e, t, r, s = "", n) {
   const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return o;
@@ -2720,7 +2802,7 @@ function W(n, e, t, r, s = "", i) {
       value: c
     }, d = /* @__PURE__ */ new Map();
     for (const l of u)
-      n.has(l) && d.set(l, n.get(l));
+      i.has(l) && d.set(l, i.get(l));
     if (d.size) {
       for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
@@ -2736,24 +2818,24 @@ function W(n, e, t, r, s = "", i) {
           f,
           s + A + e.attribute + A + c,
           r,
-          i
+          n
         );
       }
     }
   }
   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+$/, 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];
+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 = (i) => i === "true" || i === "false" ? "boolean" : Se.test(i) ? "int" : Ie.test(i) ? "float" : be.test(i) && !Number.isNaN(Date.parse(i)) ? "date" : "string", ke = (i) => De.test(i), Qe = (i) => i == null || i === "", Me = (i) => {
+  const e = [...i];
   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);
+}, Ee = (i, e = {}) => {
+  const r = e.deep ?? (e.sampleSize !== void 0 && e.sampleSize > 1) ? e.sampleSize ?? 1 / 0 : 1, s = e.coerceStrings ?? !0, n = /* @__PURE__ */ new Map(), o = [], a = Math.min(i.length, r);
   for (let f = 0; f < a; f++) {
-    const d = n[f];
+    const d = i[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)) {
+        let p = n.get(l);
+        if (p || (p = { observed: /* @__PURE__ */ new Set(), empty: 0, scanned: 0 }, n.set(l, p), o.push(l)), p.scanned++, Qe(h)) {
           p.empty++;
           continue;
         }
@@ -2763,7 +2845,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
   }
   const c = [], u = [];
   for (const f of o) {
-    const d = i.get(f), { type: l, conflict: h } = Qe(d.observed.size ? d.observed : /* @__PURE__ */ new Set(["string"]));
+    const d = n.get(f), { type: l, conflict: h } = Me(d.observed.size ? d.observed : /* @__PURE__ */ new Set(["string"]));
     c.push({ key: f, type: l }), u.push({
       column: f,
       inferredType: l,
@@ -2774,28 +2856,28 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
     });
   }
   return { properties: c, diagnostics: u };
-}, 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) {
+}, et = (i, e = !1) => Ee(i, typeof e == "boolean" ? { deep: e } : e).properties, Ne = (i) => Number(i) === i && i % 1 === 0, Ce = (i) => Number(i) === i && i % 1 !== 0, $e = (i) => {
+  switch (typeof i) {
     case "string":
       return "string";
     case "number":
-      return Ee(n) ? "int" : Ce(n) ? "float" : "any";
+      return Ne(i) ? "int" : Ce(i) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
-      return se(n) ? "date" : "json";
+      return se(i) ? "date" : "json";
     default:
       return "any";
   }
-}, tt = (n, e) => {
-  const t = te(n.text || ""), r = e?.attributeKey || n.filterKey;
+}, tt = (i, e) => {
+  const t = te(i.text || ""), r = e?.attributeKey || i.filterKey;
   let s;
-  const i = e?.comparisonType || "containsIgnoreCase";
-  return i === "containsIgnoreCase" ? s = {
-    groupKey: n.filterKey,
+  const n = e?.comparisonType || "containsIgnoreCase";
+  return n === "containsIgnoreCase" ? s = {
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.text,
+        queryKey: i.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find",
@@ -2804,11 +2886,11 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         }
       }
     ]
-  } : i === "containsIgnoreCaseAndWhitespace" ? s = {
-    groupKey: n.filterKey,
+  } : n === "containsIgnoreCaseAndWhitespace" ? s = {
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.text,
+        queryKey: i.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find",
@@ -2817,33 +2899,33 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         }
       }
     ]
-  } : i === "contains" ? s = {
-    groupKey: n.filterKey,
+  } : n === "contains" ? s = {
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.text,
+        queryKey: i.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find"
       }
     ]
-  } : i === "equal" ? s = {
-    groupKey: n.filterKey,
+  } : n === "equal" ? s = {
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.text,
+        queryKey: i.text,
         attribute: r,
-        value: n.text,
+        value: i.text,
         operator: "eq"
       }
     ]
-  } : i === "equalIgnoreCase" && (s = {
-    groupKey: n.filterKey,
+  } : n === "equalIgnoreCase" && (s = {
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.text,
+        queryKey: i.text,
         attribute: r,
-        value: n.text,
+        value: i.text,
         operator: "eq",
         options: {
           transform: ["lowercase"]
@@ -2851,40 +2933,40 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       }
     ]
   }), s;
-}, rt = (n, e) => {
-  const t = e?.attributeKey || n.filterKey;
+}, rt = (i, e) => {
+  const t = e?.attributeKey || i.filterKey;
   return {
-    groupKey: n.filterKey,
+    groupKey: i.filterKey,
     queries: [
       {
-        queryKey: n.value,
+        queryKey: i.value,
         attribute: t,
-        value: n.value,
+        value: i.value,
         operator: "eq"
       }
     ]
   };
-}, st = (n, e) => {
-  const t = e?.attributeKey || n.filterKey, r = {
-    groupKey: n.filterKey,
+}, st = (i, e) => {
+  const t = e?.attributeKey || i.filterKey, r = {
+    groupKey: i.filterKey,
     queries: []
   };
-  return typeof n.eq < "u" && (r.groupType = "or", Array.isArray(n.eq) ? n.eq.forEach((s) => {
+  return typeof i.eq < "u" && (r.groupType = "or", Array.isArray(i.eq) ? i.eq.forEach((s) => {
     r.queries.push({ attribute: t, value: s, operator: "eq" });
-  }) : r.queries.push({ attribute: t, value: n.eq, operator: "eq" })), typeof n.ne < "u" && (r.groupType = "and", Array.isArray(n.ne) ? n.ne.forEach((s) => {
+  }) : r.queries.push({ attribute: t, value: i.eq, operator: "eq" })), typeof i.ne < "u" && (r.groupType = "and", Array.isArray(i.ne) ? i.ne.forEach((s) => {
     r.queries.push({ attribute: t, value: s, operator: "eq", options: { invert: !0 } });
   }) : r.queries.push({
     attribute: t,
-    value: n.ne,
+    value: i.ne,
     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;
-}, nt = (n, e) => {
-  const t = e?.attributeKey || n.filterKey, r = {
-    groupKey: n.filterKey,
+  })), typeof i.gt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: i.gt, operator: "gt" })), typeof i.lt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: i.lt, operator: "lt" })), typeof i.gte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: i.gte, operator: "gte" })), typeof i.lte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: i.lte, operator: "lte" })), r;
+}, nt = (i, e) => {
+  const t = e?.attributeKey || i.filterKey, r = {
+    groupKey: i.filterKey,
     queries: []
   };
-  return n.itemKeys.forEach((s) => {
+  return i.itemKeys.forEach((s) => {
     r.queries.push({
       queryKey: s,
       attribute: t,
@@ -2892,7 +2974,7 @@ const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       operator: "eq"
     });
   }), r;
-}, it = (n) => !(typeof n.modelKey != "string" || !Array.isArray(n.queries));
+}, it = (i) => !(typeof i.modelKey != "string" || !Array.isArray(i.queries));
 class ot {
   constructor(e, t, r) {
     this.scriptController = e, this.globalItemService = t, this.modelParser = r;
@@ -2918,19 +3000,19 @@ class ot {
     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))
+    let n = this.getAttributeValue(t, e.attribute);
+    if (Array.isArray(e.options?.transform) && e.options.transform.length > 0 && (n = this.transformValue(n, e.options.transform)), (typeof n > "u" || n === null) && !["typeof", "isTruthy", "eq", "in"].includes(e.operator))
       return !1;
     let o;
     switch (e.operator) {
       case "eq":
-        o = this.queryEq(i, r, s);
+        o = this.queryEq(n, r, s);
         break;
       case "in":
-        o = this.queryIn(i, r, s);
+        o = this.queryIn(n, r, s);
         break;
       case "find":
-        o = this.queryFind(i, r, s, e.options?.regexFlags);
+        o = this.queryFind(n, r, s, e.options?.regexFlags);
         break;
       case "lt":
       case "gt":
@@ -2938,22 +3020,22 @@ class ot {
       case "gte": {
         const a = e.operator;
         o = this.matchValues(
-          i,
+          n,
           s,
           (c) => this.compareValue(a, c, r)
         );
         break;
       }
       case "typeof":
-        o = this.matchValues(i, s, (a) => typeof a === r);
+        o = this.matchValues(n, s, (a) => typeof a === r);
         break;
       case "isTruthy": {
         const a = r === !0;
-        o = this.matchValues(i, s, (c) => !!c === a);
+        o = this.matchValues(n, s, (c) => !!c === a);
         break;
       }
       case "size":
-        typeof i == "string" ? o = i.length === r : o = V(i) === r;
+        typeof n == "string" ? o = n.length === r : o = V(n) === r;
         break;
       default:
         if (this.scriptController.hasScript(e.operator))
@@ -2996,12 +3078,12 @@ class ot {
       return I(e, t);
     const r = t.split(".");
     let s = e;
-    for (let i = 0; i < r.length; i++) {
-      const o = r[i];
+    for (let n = 0; n < r.length; n++) {
+      const o = r[n];
       if (s == null)
         return;
       if (Array.isArray(s) && o !== "length" && !/^\d+$/.test(o))
-        return w(s, r.slice(i).join("."));
+        return w(s, r.slice(n).join("."));
       s = s[o];
     }
     return s;
@@ -3029,7 +3111,7 @@ class ot {
     return !Array.isArray(t) || t.length === 0 ? !1 : this.matchValues(
       e,
       r,
-      (s) => t.some((i) => this.equalsQueryValue(s, i))
+      (s) => t.some((n) => this.equalsQueryValue(s, n))
     );
   }
   /**
@@ -3058,21 +3140,21 @@ class ot {
     return e.options?.arrayValueHandling !== "every" && !e.options?.transform?.length;
   }
   evaluateEqOperator(e, t, r, s) {
-    const i = /* @__PURE__ */ new Map(), o = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
+    const n = /* @__PURE__ */ new Map(), o = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
     if (o) {
       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));
+            r.has(u) && n.set(u, r.get(u));
           }), t.options?.invert) {
-            const u = O(Array.from(r.values()), Array.from(i.values()), "key"), f = /* @__PURE__ */ new Map();
+            const u = O(Array.from(r.values()), Array.from(n.values()), "key"), f = /* @__PURE__ */ new Map();
             return u.forEach((d) => {
               f.set(d.key, d);
             }), f;
           } else
-            return i;
+            return n;
       }
     }
     return this.scanDataset(e, t, r);
@@ -3084,12 +3166,12 @@ class ot {
    * the result equals the scan's.
    */
   evaluateInOperator(e, t, r, s) {
-    const i = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
-    if (!i)
+    const n = this.canUseIndex(t) ? s.get(t.attribute) : void 0;
+    if (!n)
       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;
+      const f = this.getIndexKey(u), d = typeof f < "u" ? n.get(f) : void 0;
       if (!d) {
         a.push(u);
         continue;
@@ -3120,7 +3202,7 @@ class ot {
   }
   /** 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;
+    const s = /* @__PURE__ */ new Map(), n = this.queryBuilder.extractQueryAttributes({ queries: [t] }).filter((a) => a.isDeepQuery), o = n.length > 0 ? this.queryBuilder.getProjectionForAttributeEntries(n) : void 0;
     for (let [a, c] of r)
       o && (c = this.globalItemService.getProjectedData(
         o,
@@ -3130,7 +3212,7 @@ class ot {
     return s;
   }
   equalRegexFn(e, t, r) {
-    const s = P(t, r);
+    const s = j(t, r);
     if (s)
       try {
         return new RegExp(s.pattern, s.flags).test(e);
@@ -3138,12 +3220,12 @@ class ot {
         return !1;
       }
     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;
+      (n) => k(n, t, (o, a) => this.equalRegexFn(o, a, r))
+    ) : typeof t == "object" ? G(e, t) : e === t;
   }
   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);
+    const n = (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, n)) : t !== null && typeof t == "object" ? this.matchValues(e, r, (o) => G(o, t)) : !!J(e, t) : k(e, t, n);
   }
   validateQuery(e) {
     if (this.queryBuilder.isQuery(e)) {
@@ -3156,12 +3238,12 @@ class ot {
       return !0;
     } else {
       if (this.queryBuilder.isQueryGroup(e))
-        return z(e.queries, (t) => this.validateQuery(t));
+        return _(e.queries, (t) => this.validateQuery(t));
       throw new Error("invalid query - missing query or attribute");
     }
   }
   getEvaluatedQueryDataset(e, t, r, s) {
-    const i = /* @__PURE__ */ new Map();
+    const n = /* @__PURE__ */ new Map();
     if (t.attribute.includes("[*]")) {
       const o = t.options?.invert === !0, a = /* @__PURE__ */ new Set();
       for (let c of r.values()) {
@@ -3184,13 +3266,13 @@ class ot {
           d,
           t.options?.arrayValueHandling || "some",
           (h) => this.evaluateQuery(h, c)
-        ) && (a.add(c.key), o || i.set(c.key, c));
+        ) && (a.add(c.key), o || n.set(c.key, c));
       }
       if (o)
         for (const [c, u] of r)
-          a.has(c) || i.set(c, u);
+          a.has(c) || n.set(c, u);
     } 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;
+    return n;
   }
   handleArrayStarQuery(e, t) {
     const r = e.attribute.indexOf("[*]"), s = {
@@ -3199,7 +3281,7 @@ class ot {
       queries: []
     };
     if (r !== -1) {
-      const i = e.attribute.substring(0, r), o = i.includes(".") ? I(t, i) : t[i];
+      const n = e.attribute.substring(0, r), o = n.includes(".") ? I(t, n) : t[n];
       if (Array.isArray(o))
         for (let a = 0; a < o.length; a++) {
           const c = e.attribute.replace("[*]", `[${a}]`);
@@ -3213,30 +3295,31 @@ class ot {
     }
     return s;
   }
-  evaluateQueryGroup(e, t, r, s, i) {
+  evaluateQueryGroup(e, t, r, s, n) {
     let o = /* @__PURE__ */ new Map(), a = r;
     if (!t.queries || t.queries?.length === 0)
       return a;
-    for (const c of t.queries) {
-      let u = /* @__PURE__ */ new Map();
-      if (this.queryBuilder.isQuery(c) ? u = this.getEvaluatedQueryDataset(e, c, a, i) : u = this.evaluateQueryGroup(e, c, a, s, i), o.size === 0 && (o = u), t.groupType === "or")
-        u.forEach((f) => {
-          o.set(f.key, f);
-        });
+    const c = t.groupType === "or";
+    for (const u of t.queries) {
+      let f = /* @__PURE__ */ new Map();
+      if (this.queryBuilder.isQuery(u) ? f = this.getEvaluatedQueryDataset(e, u, a, n) : f = this.evaluateQueryGroup(e, u, a, s, n), o.size === 0 && (o = f), c)
+        f.forEach((d) => {
+          o.set(d.key, d);
+        }), a = r;
       else {
-        const f = O(Array.from(o.values()), Array.from(u.values()), "key");
-        for (const d of f)
-          o.delete(d.key);
+        const d = O(Array.from(o.values()), Array.from(f.values()), "key");
+        for (const l of d)
+          o.delete(l.key);
+        a = o;
       }
-      t.groupType === "and" ? a = o : a = r;
     }
     return o;
   }
   queryData(e, t, r, s) {
     if (t.queries.length === 0)
       return e;
-    const i = new Map(e);
-    return t.groupKey || (t.groupKey = "root"), t.groupType || (t.groupType = "and"), t.queries || (t.queries = []), this.validateQuery(t), this.evaluateQueryGroup(t, t, i, r, s);
+    const n = new Map(e);
+    return t.groupKey || (t.groupKey = "root"), t.groupType || (t.groupType = "and"), t.queries || (t.queries = []), this.validateQuery(t), this.evaluateQueryGroup(t, t, n, r, s);
   }
   // public getRelevantQueryData(data: any, options: DcuplGlobalQueryOptions<any>, model: DcuplModel<ListItem>) {
   //   // detect if any of the query attributes are a deep query.
@@ -3282,43 +3365,43 @@ const Oe = /* @__PURE__ */ new Set([
   "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) => {
+function at(i) {
+  const e = i.indexOf("?");
+  if (e < 0) return i;
+  const t = i.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;
+    const n = r.slice(0, s);
+    return Oe.has(n.toLowerCase()) ? `${n}=<redacted>` : r;
   }).join("&");
-  return `${n.slice(0, e)}?${t}`;
+  return `${i.slice(0, e)}?${t}`;
 }
-const qe = "k:", Re = "h:";
-function Q(n, e = 0) {
-  if (n.key)
-    return `${qe}${n.key}`;
+const Ge = "k:", Re = "h:";
+function M(i, e = 0) {
+  if (i.key)
+    return `${Ge}${i.key}`;
   const t = D({
-    type: n.type,
-    url: n.rawUrl ?? n.url,
-    model: n.model ?? "",
+    type: i.type,
+    url: i.rawUrl ?? i.url,
+    model: i.model ?? "",
     occurrence: e
   });
   return `${Re}${t}`;
 }
-function ct(n) {
+function ct(i) {
   const e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set();
-  return n.map((r) => {
+  return i.map((r) => {
     const s = `${r.key ?? ""}|${r.type}|${r.rawUrl ?? r.url}|${r.model ?? ""}`;
-    let i = e.get(s) ?? 0, o = Q(r, i);
+    let n = e.get(s) ?? 0, o = M(r, n);
     for (; t.has(o); )
-      i += 1, o = r.key ? `${Q(r)}#${i}` : Q(r, i);
-    return e.set(s, i + 1), t.add(o), o;
+      n += 1, o = r.key ? `${M(r)}#${n}` : M(r, n);
+    return e.set(s, n + 1), t.add(o), o;
   });
 }
 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();
+  const i = globalThis;
+  return typeof i.scheduler?.yield == "function" ? i.scheduler.yield() : typeof i.setImmediate == "function" ? new Promise((e) => i.setImmediate(() => e())) : typeof i.MessageChannel == "function" ? new Promise((e) => {
+    const t = new i.MessageChannel();
     t.port1.onmessage = () => {
       t.port1.close(), e();
     }, t.port2.postMessage(null);
@@ -3350,8 +3433,8 @@ class ft {
     const r = this.getScript(e);
     if (!r)
       throw new Error(`Script ${e} not found`);
-    const s = this.getWrapperScript(r), i = new Function("script_type", ...t, s);
-    return this.scriptFunctions.set(e, i), i;
+    const s = this.getWrapperScript(r), n = new Function("script_type", ...t, s);
+    return this.scriptFunctions.set(e, n), n;
   }
   getWrapperScript(e) {
     return `
@@ -3363,13 +3446,13 @@ class ft {
     if (!this.getScript(e))
       throw new Error(`Script ${e} not found`);
     r.context || (r.context = r.options || {});
-    const i = Object.keys(r), o = Object.values(r);
-    return this.getScriptAsFn(e, i)(t, ...o);
+    const n = Object.keys(r), o = Object.values(r);
+    return this.getScriptAsFn(e, n)(t, ...o);
   }
 }
-const dt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", lt = (n) => {
+const dt = (i, e) => i ? (e || (e = {}), i.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", lt = (i) => {
   const e = /* @__PURE__ */ new Set();
-  return n.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
+  return i.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
 }, ht = [
   "any",
   "Array<date>",
@@ -3395,10 +3478,10 @@ const dt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e
   "size"
 ];
 export {
-  qe as AUTHORED_RESOURCE_ID_PREFIX,
-  Fe as AnalyticsController,
-  Ge as AttributeDependencyGraph,
-  _e as CacheController,
+  Ge as AUTHORED_RESOURCE_ID_PREFIX,
+  qe as AnalyticsController,
+  Fe as AttributeDependencyGraph,
+  Pe as CacheController,
   He as ChangeDetector,
   Re as DERIVED_RESOURCE_ID_PREFIX,
   gt as DatePropertyTypes,
@@ -3425,33 +3508,33 @@ export {
   nt as generateReferenceQuery,
   tt as generateTextQuery,
   C as getAggregation,
-  Pe as getDateConstraintUid,
+  je as getDateConstraintUid,
   $e as getDcuplPropertyTypeForNativeType,
   w as getDeepPathValues,
   me as getDistinct,
   Ye as getFacets,
-  ze as getFilterEntryId,
-  je as getNumberConstraintUid,
+  _e as getFilterEntryId,
+  ze as getNumberConstraintUid,
   et as getPropertiesForData,
   Le as groupBy,
   Ve as hasMinimumVersion,
-  Ne as inferModel,
+  Ee as inferModel,
   se as isDateInstance,
   Ce as isFloat,
-  Ee as isInt,
+  Ne as isInt,
   ne as isValidDate,
   it as isValidQueryStatement,
   T as isValidVersion,
   Y as logger,
   ke as looksDateLike,
   Xe as parseDate,
-  P as parseRegexLiteral,
+  j as parseRegexLiteral,
   lt as parseTemplate,
   b as perf,
   U as pivot,
   at as redactUrl,
   Ue as removeTrailingSlash,
-  Q as resolveResourceId,
+  M as resolveResourceId,
   ct as resolveResourceIds,
   Je as trigger,
   We as unescapeRegExp,