@dcupl/common 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/esm/index.js

@@ -1,47 +1,47 @@
-import { cloneDeep as m, get as y, every as T, findIndex as E, size as L, isEqual as O, differenceBy as q, startsWith as H, endsWith as U, isEqualWith as D, isMatch as V, find as J } from "lodash-es";
-function Q(o) {
-  const e = S(o);
+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 S(o) {
-  if (typeof o != "object" || o === null)
-    return String(o);
-  if (Array.isArray(o))
-    return "[" + o.map(S).join(",") + "]";
-  const e = Object.keys(o).sort();
+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();
   let t = "{";
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
-    t += s + ":" + S(o[s]), r < e.length - 1 && (t += ",");
+    t += s + ":" + N(n[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
-function Z(o) {
+function Z(n) {
   let e = 0;
-  for (let t = 0; t < o.length; t++) {
-    const r = o.charCodeAt(t);
+  for (let t = 0; t < n.length; t++) {
+    const r = n.charCodeAt(t);
     e = (e << 5) - e + r, e |= 0;
   }
   return e.toString(16);
 }
-const x = {
+const b = {
   now: () => typeof performance < "u" && performance.now ? performance.now() : (/* @__PURE__ */ new Date()).getTime(),
-  mark: (o) => {
-    typeof performance < "u" && performance.mark && performance.mark(o);
+  mark: (n) => {
+    typeof performance < "u" && performance.mark && performance.mark(n);
   },
-  measure: (o, e, t) => {
-    typeof performance < "u" && performance.measure && performance.measure(o, e, t);
+  measure: (n, e, t) => {
+    typeof performance < "u" && performance.measure && performance.measure(n, e, t);
   },
-  getEntriesByName(o) {
+  getEntriesByName(n) {
     if (typeof performance < "u" && performance.getEntriesByName)
-      return performance.getEntriesByName(o);
+      return performance.getEntriesByName(n);
   },
-  getEntriesByType(o) {
+  getEntriesByType(n) {
     if (typeof performance < "u" && performance.getEntriesByType)
-      return performance.getEntriesByType(o);
+      return performance.getEntriesByType(n);
   }
 };
-class Ke {
+class Fe {
   data;
   enabled = !1;
   constructor() {
@@ -59,7 +59,7 @@ class Ke {
     const t = this.getKey(e.name, e.context), r = {
       name: e.name,
       type: "mark",
-      value: x.now(),
+      value: b.now(),
       createdAt: Date.now()
     };
     return this.data.set(t, r), r;
@@ -69,21 +69,21 @@ class Ke {
     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, n = Math.round(i * 100) / 100, a = this.data.get(t);
+    const i = s.value - r.value, o = Math.round(i * 100) / 100, a = this.data.get(t);
     if (a && e.sum) {
-      const f = a.value + n, c = {
+      const u = a.value + o, f = {
         ...a,
-        value: f
+        value: u
       };
-      return this.data.set(t, c), c;
+      return this.data.set(t, f), f;
     }
-    const u = {
+    const c = {
       name: e.name,
       type: "measure",
-      value: n,
+      value: o,
       createdAt: Date.now()
     };
-    return e.detail && (u.detail = e.detail), this.data.set(t, u), u;
+    return e.detail && (c.detail = e.detail), this.data.set(t, c), c;
   }
   update(e) {
     if (!this.enabled) return e.value;
@@ -96,7 +96,7 @@ class Ke {
     return this.data.get(t);
   }
   getResourceInfosFromPerformanceAPI() {
-    return typeof performance > "u" ? [] : x.getEntriesByType("resource");
+    return typeof performance > "u" ? [] : b.getEntriesByType("resource");
   }
   get(e) {
     const t = this.getKey(e.name, e.context);
@@ -114,11 +114,11 @@ class Ke {
   getKey(e, t) {
     if (!t)
       return e;
-    const r = Q(t);
+    const r = D(t);
     return e + "_" + r;
   }
 }
-let Y = class j {
+let X = class j {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -200,8 +200,8 @@ let Y = class j {
       t.add(s);
       const i = this.edges.get(s);
       if (i) {
-        for (let n of i)
-          if (r(n))
+        for (let o of i)
+          if (r(o))
             return !0;
       }
       return t.delete(s), e.add(s), !1;
@@ -225,24 +225,24 @@ let Y = class j {
         return r.slice(a).concat([i]);
       }
       t.add(i), r.push(i);
-      const n = this.edges.get(i);
-      if (n)
-        for (let a of n) {
-          const u = s(a);
-          if (u)
-            return u;
+      const o = this.edges.get(i);
+      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;
     };
     for (let i of this.nodes) {
-      const n = s(i);
-      if (n)
-        return { hasCycle: !0, path: n };
+      const o = s(i);
+      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, n = (a) => {
+    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = [], i = e?.allowCycles ?? !1, o = (a) => {
       if (t.has(a))
         return;
       if (r.has(a)) {
@@ -251,14 +251,14 @@ let Y = class j {
         throw new Error("Graph has a cycle.");
       }
       r.add(a);
-      const u = this.edges.get(a);
-      if (u)
-        for (let f of u)
-          n(f);
+      const c = this.edges.get(a);
+      if (c)
+        for (let u of c)
+          o(u);
       r.delete(a), t.add(a), s.push(a);
     };
     for (let a of this.nodes)
-      t.has(a) || n(a);
+      t.has(a) || o(a);
     return s;
   }
   clear() {
@@ -326,30 +326,30 @@ let Y = class j {
    */
   plan(e) {
     const t = /* @__PURE__ */ new Map();
-    for (const n of this.nodes) t.set(n, 0);
-    for (const n of this.edges.values())
-      for (const a of n) t.set(a, (t.get(a) || 0) + 1);
+    for (const o of this.nodes) t.set(o, 0);
+    for (const o of this.edges.values())
+      for (const a of o) t.set(a, (t.get(a) || 0) + 1);
     const r = [];
-    let s = Array.from(this.nodes).filter((n) => (t.get(n) || 0) === 0);
+    let s = Array.from(this.nodes).filter((o) => (t.get(o) || 0) === 0);
     const i = /* @__PURE__ */ new Set();
     for (; s.length > 0; ) {
-      const n = s.slice();
-      r.push(n), s = [];
-      for (const a of n) {
+      const o = s.slice();
+      r.push(o), s = [];
+      for (const a of o) {
         if (i.has(a)) continue;
         i.add(a);
-        const u = this.edges.get(a);
-        if (u)
-          for (const f of u)
-            t.set(f, (t.get(f) || 0) - 1), (t.get(f) || 0) === 0 && s.push(f);
+        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)
       throw new Error("Graph has a cycle.");
     if (e?.filterKinds && e.filterKinds.length > 0) {
-      const n = new Set(e.filterKinds);
+      const o = new Set(e.filterKinds);
       return {
-        batches: r.map((a) => a.filter((u) => n.has(this.nodeKinds.get(u))))
+        batches: r.map((a) => a.filter((c) => o.has(this.nodeKinds.get(c))))
       };
     }
     return { batches: r };
@@ -362,26 +362,26 @@ let Y = class j {
    *  - 'both': union of upstream and downstream
    */
   getImpactedNodes(e, t = "downstream", r) {
-    const s = new Set(e), i = (f) => !r || r.length === 0 || r.includes(this.nodeKinds.get(f) ?? void 0), n = () => {
-      const f = /* @__PURE__ */ new Set(), c = Array.from(s);
-      for (; c.length; ) {
-        const d = c.shift();
+    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 d = f.shift();
         for (const [l, h] of this.edges)
-          h.has(d) && !f.has(l) && (f.add(l), c.push(l));
+          h.has(d) && !u.has(l) && (u.add(l), f.push(l));
       }
-      return f;
+      return u;
     }, a = () => {
-      const f = /* @__PURE__ */ new Set(), c = Array.from(s);
-      for (; c.length; ) {
-        const d = c.shift(), l = this.edges.get(d);
+      const u = /* @__PURE__ */ new Set(), f = Array.from(s);
+      for (; f.length; ) {
+        const d = f.shift(), l = this.edges.get(d);
         if (l)
           for (const h of l)
-            f.has(h) || (f.add(h), c.push(h));
+            u.has(h) || (u.add(h), f.push(h));
       }
-      return f;
+      return u;
     };
-    let u;
-    return t === "both" ? u = /* @__PURE__ */ new Set([...n(), ...a()]) : t === "upstream" ? u = a() : u = n(), Array.from(u).filter(i);
+    let c;
+    return t === "both" ? c = /* @__PURE__ */ new Set([...o(), ...a()]) : t === "upstream" ? c = a() : c = o(), Array.from(c).filter(i);
   }
   toJSON() {
     const e = Array.from(this.nodes).map((r) => ({
@@ -400,19 +400,19 @@ let Y = 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)), n = new Set(this.getAllEdges().map((d) => d.join("→"))), a = new Set(e.getAllEdges().map((d) => d.join("→"))), u = Array.from(a).filter((d) => !n.has(d)).map((d) => d.split("→")), f = Array.from(n).filter((d) => !a.has(d)).map((d) => d.split("→")), c = [];
+    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 && c.push({ name: d, from: l, to: h });
+      l !== h && f.push({ name: d, from: l, to: h });
     }
-    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: f, kindChanges: c };
+    return { addedNodes: s, removedNodes: i, addedEdges: c, removedEdges: u, kindChanges: f };
   }
 };
-class Se {
+class Ge {
   graph;
   nodeIndex;
   constructor() {
-    this.graph = new Y(), this.nodeIndex = /* @__PURE__ */ new Map();
+    this.graph = new X(), this.nodeIndex = /* @__PURE__ */ new Map();
   }
   /**
    * Creates a unique ID for an attribute node
@@ -454,10 +454,10 @@ class Se {
    * @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], n = /* @__PURE__ */ new Set();
+    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 u = this.getNodeId(a.modelKey, a.attributeKey);
-      return n.has(u) ? !1 : (n.add(u), !0);
+      const c = this.getNodeId(a.modelKey, a.attributeKey);
+      return o.has(c) ? !1 : (o.add(c), !0);
     });
   }
   /**
@@ -470,10 +470,10 @@ class Se {
   getProcessingOrder(e) {
     const t = /* @__PURE__ */ new Map(), r = [...e].sort((s, i) => s.processingStep - i.processingStep);
     for (const s of r) {
-      const { modelKey: i, attributeKey: n, processingStep: a } = s;
+      const { modelKey: i, attributeKey: o, processingStep: a } = s;
       t.has(i) || t.set(i, /* @__PURE__ */ new Map());
-      const u = t.get(i);
-      u.has(a) || u.set(a, /* @__PURE__ */ new Set()), u.get(a).add(n);
+      const c = t.get(i);
+      c.has(a) || c.set(a, /* @__PURE__ */ new Set()), c.get(a).add(o);
     }
     return t;
   }
@@ -530,12 +530,12 @@ class Se {
       s.add(r);
       const i = this.graph.getDependencies(r);
       if (i.length === 0) return 1;
-      let n = 0;
+      let o = 0;
       for (const a of i) {
-        const u = t(a, new Set(s));
-        n = Math.max(n, u);
+        const c = t(a, new Set(s));
+        o = Math.max(o, c);
       }
-      return n + 1;
+      return o + 1;
     };
     for (const r of this.graph.getNodes()) {
       const s = t(r);
@@ -555,8 +555,8 @@ class Se {
     const t = [];
     for (const [r, s] of e)
       for (const i of s) {
-        const n = this.getNodeId(r, i);
-        this.hasNode(n) || t.push({ modelKey: r, attributeKey: i });
+        const o = this.getNodeId(r, i);
+        this.hasNode(o) || t.push({ modelKey: r, attributeKey: i });
       }
     return {
       isComplete: t.length === 0,
@@ -600,36 +600,36 @@ class Se {
     };
   }
 }
-const $ = {
+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,20 +663,20 @@ class p {
   }
   shouldLog(e) {
     const t = this.getEffectiveLevel();
-    return $[e] <= $[t];
+    return R[e] <= R[t];
   }
   formatMessage(e) {
     if (this.config.format === "json") {
-      const n = {
+      const o = {
         timestamp: new Date(e.timestamp).toISOString(),
         level: e.level,
         message: e.message
       };
-      return e.prefix && (n.module = e.prefix), e.context && (n.context = e.context), e.error && (n.error = {
+      return e.prefix && (o.module = e.prefix), e.context && (o.context = e.context), e.error && (o.error = {
         name: e.error.name,
         message: e.error.message,
         stack: e.error.stack
-      }), JSON.stringify(n);
+      }), 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();
@@ -710,20 +710,20 @@ class p {
       this.config.onLog(i);
       return;
     }
-    const n = this.formatMessage(i);
+    const o = this.formatMessage(i);
     if (typeof console < "u")
       switch (e) {
         case "error":
-          s ? console.error(n, s) : console.error(n);
+          s ? console.error(o, s) : console.error(o);
           break;
         case "warn":
-          console.warn(n);
+          console.warn(o);
           break;
         case "debug":
-          console.debug ? console.debug(n) : console.log(n);
+          console.debug ? console.debug(o) : console.log(o);
           break;
         default:
-          console.log(n);
+          console.log(o);
       }
   }
   /**
@@ -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,18 +799,19 @@ class p {
     Object.assign(this.config, e);
   }
 }
-const X = new p();
-class Ie {
+const Y = new g();
+class _e {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
+  enabled;
   cache;
   // Track which models and attributes each cache entry depends on
   cacheDependencies;
   // Track cache hits and misses for statistics
   hitCount = 0;
   missCount = 0;
-  log = X.child({ prefix: "CacheController" });
+  log = Y.child({ prefix: "CacheController" });
   get(e, t) {
     if (!this.enabled) return;
     const r = this.getCacheName(e, t);
@@ -838,12 +839,12 @@ class Ie {
     const t = [];
     for (const [r, s] of this.cacheDependencies) {
       let i = !1;
-      for (const [n, a] of e) {
-        if (s.models.has(n))
-          if (s.modelAttributes.has(n)) {
-            const u = s.modelAttributes.get(n);
-            for (const f of a)
-              if (u.has(f)) {
+      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;
                 break;
               }
@@ -864,8 +865,8 @@ class Ie {
     if (!this.enabled) return;
     const t = new Set(e), r = [];
     for (const [s, i] of this.cacheDependencies)
-      for (const n of t)
-        if (i.models.has(n)) {
+      for (const o of t)
+        if (i.models.has(o)) {
           r.push(s);
           break;
         }
@@ -915,13 +916,13 @@ class Ie {
   }
   generateContext(e) {
     try {
-      return m(e);
+      return v(e);
     } catch (t) {
       return this.log.error("Error in cache generateContext", t), e;
     }
   }
   getCacheName(e, t) {
-    const r = Q(t);
+    const r = D(t);
     return e + "_" + r;
   }
   /**
@@ -939,42 +940,45 @@ class Ie {
     };
   }
 }
-const Qe = (o, e = "") => `${o}#${e}`, Me = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Ne = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, ke = (o, 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 [
-    ...o.reduce((r, s) => {
+    ...n.reduce((r, s) => {
       const i = s == null ? s : t(s);
       return r.has(i) || r.set(i, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, Ce = (o, e) => o.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;
 }, {});
-function ee(o = 10) {
+function ee(n = 10) {
   let e = "";
   const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  for (let r = 0; r < o; r++) e += t.charAt(Math.floor(Math.random() * t.length));
+  for (let r = 0; r < n; r++) e += t.charAt(Math.floor(Math.random() * t.length));
   return e;
 }
-const Ee = (o) => o.replace(/\/+$/, ""), te = (o) => typeof o != "string" ? "" : o.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), Oe = (o) => typeof o != "string" ? "" : o.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), qe = (o, 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(o, e) >= 0;
+    return re(n, e) >= 0;
   } catch {
     return !1;
   }
-}, re = (o, e) => {
-  if (!F(o) || !F(e))
-    throw new Error(`Invalid version format: v1="${o}", v2="${e}". Expected format: "x.y.z"`);
-  const t = o.split(".").map(Number), r = e.split(".").map(Number);
+}, 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);
   for (let s = 0; s < 3; s++) {
-    const i = t[s] || 0, n = r[s] || 0;
-    if (i > n) return 1;
-    if (i < n) return -1;
+    const i = t[s] || 0, o = r[s] || 0;
+    if (i > o) return 1;
+    if (i < o) return -1;
   }
   return 0;
-}, F = (o) => /^\d+(\.\d+){0,2}$/.test(o);
-class $e {
+}, T = (n) => /^\d+(\.\d+){0,2}$/.test(n);
+class He {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1000,7 +1004,7 @@ class $e {
     this.off && this.off();
   }
   trigger(e) {
-    e.originCdRefKey || (e.originCdRefKey = this.key), e.key || (this.increaseCounter(), e.key = this.getCounter()), e.end || (e.end = x.now(), e.duration = e.start - e.end), this.updateListener.forEach((t) => {
+    e.originCdRefKey || (e.originCdRefKey = this.key), e.key || (this.increaseCounter(), e.key = this.getCounter()), e.end || (e.end = b.now(), e.duration = e.start - e.end), this.updateListener.forEach((t) => {
       t(e);
     });
   }
@@ -1010,13 +1014,13 @@ class $e {
     };
   }
 }
-const P = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : m(o) : o, G = (o, 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 n = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = P(i, n);
-    if (t.scope === "list" && (t.listKey = o.cdRef?.key || o.key, t.modelKey = o.model?.key || o.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(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 u = x.now(), f = u - r, c = Math.round(f * 1e3) / 1e3;
-    t.duration = c, t.start = r, t.end = u;
+    const c = b.now(), u = c - r, f = Math.round(u * 1e3) / 1e3;
+    t.duration = f, t.start = r, t.end = c;
     const d = {
       duration: t.duration
     };
@@ -1033,57 +1037,57 @@ const P = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : m(o)
   } catch {
     return i;
   }
-}, Fe = (o) => (t, r, s) => {
+}, Je = (n) => (t, r, s) => {
   const i = s.value;
-  return s.value = function(...n) {
-    const a = x.now(), u = this.cdRef, f = P(o, !0);
-    f.key || (u.increaseCounter(), f.key = u.getCounter());
-    const c = ee();
-    u.analyticsController.mark({
-      name: `${f.type}:start`,
-      context: c
+  return s.value = function(...o) {
+    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 d = this.model?.key;
-    !f.originCdRefKey && u.key && (f.originCdRefKey = u.key), d && (f.modelKey = d);
-    const l = i.apply(this, n);
-    return f.method = r, f.args = n, l && typeof l == "object" && "then" in l ? l.then((h) => G(this, u, f, a, c, h)) : G(this, u, f, a, c, l);
+    !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 Ge(o, 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 [n, a] of e.entries()) {
-    const u = Array.from(a).some((c) => o.has(c)), f = t.transform ? r.transformValue(n, t.transform) : n;
-    if (!(t.excludeUndefineds && typeof n > "u") && !(t.excludeNulls && n === null)) {
-      if (u && (i === "" || i === "//")) {
-        const c = {
-          value: n,
+  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;
+    if (!(t.excludeUndefineds && typeof o > "u") && !(t.excludeNulls && o === null)) {
+      if (c && (i === "" || i === "//")) {
+        const f = {
+          value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(c);
-      } else if (u && typeof i == "string" && i.startsWith("/") && i.endsWith("/")) {
-        if (r.queryFind(f, i, "some")) {
-          const c = {
-            value: n,
+        s.push(f);
+      } else if (c && P(i)) {
+        if (r.queryFind(u, i, "some", t.regexFlags)) {
+          const f = {
+            value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
-          s.push(c);
+          s.push(f);
         }
-      } else if (u && typeof i == "string") {
-        const c = String(f ?? ""), d = i;
-        if (c.toLowerCase().startsWith(d.toLowerCase())) {
+      } else if (c && typeof i == "string") {
+        const f = String(u ?? ""), d = i;
+        if (f.toLowerCase().startsWith(d.toLowerCase())) {
           const l = {
-            value: n,
+            value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
           s.push(l);
         }
-      } else if (u && r.queryFind(f, i, "some")) {
-        const c = {
-          value: n,
+      } else if (c && r.queryFind(u, i, "some")) {
+        const f = {
+          value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(c);
+        s.push(f);
       }
       if (s.length === t.max)
         break;
@@ -1091,11 +1095,11 @@ function Ge(o, e, t, r) {
   }
   return s;
 }
-function se(o) {
-  return o instanceof Date;
+function se(n) {
+  return n instanceof Date;
 }
-function ne(o) {
-  return o instanceof Date && !isNaN(o.getTime());
+function ne(n) {
+  return n instanceof Date && !isNaN(n.getTime());
 }
 const ie = {
   yyyy: { type: "year", pattern: "yyyy", regex: "(\\d{4})" },
@@ -1112,28 +1116,28 @@ const ie = {
   s: { type: "second", pattern: "s", regex: "(\\d{1,2})" },
   SSS: { type: "millisecond", pattern: "SSS", regex: "(\\d{3})" }
 };
-function oe(o) {
+function oe(n) {
   let e = "^";
   const t = [];
-  let r = o;
-  const s = Object.entries(ie).sort((i, n) => n[0].length - i[0].length);
+  let r = n;
+  const s = Object.entries(ie).sort((i, o) => o[0].length - i[0].length);
   for (; r.length > 0; ) {
     let i = !1;
-    for (const [n, a] of s)
-      if (r.startsWith(n)) {
-        e += a.regex, t.push({ type: a.type, pattern: n }), r = r.slice(n.length), i = !0;
+    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;
         break;
       }
     if (!i) {
-      const n = r[0];
-      if (!n)
+      const o = r[0];
+      if (!o)
         break;
-      e += n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), r = r.slice(1);
+      e += o.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), r = r.slice(1);
     }
   }
   return e += "$", { regex: new RegExp(e), tokenOrder: t };
 }
-function ae(o, e) {
+function ae(n, e) {
   const t = {
     year: 1970,
     month: 1,
@@ -1144,54 +1148,54 @@ function ae(o, e) {
     millisecond: 0
   };
   for (let r = 0; r < e.length; r++) {
-    const s = o[r + 1];
+    const s = n[r + 1];
     if (!s)
       continue;
-    const i = parseInt(s, 10), n = e[r];
-    n && (n.type === "year" && n.pattern === "yy" ? t.year = 2e3 + i : t[n.type] = i);
+    const i = parseInt(s, 10), o = e[r];
+    o && (o.type === "year" && o.pattern === "yy" ? t.year = 2e3 + i : t[o.type] = i);
   }
   return t;
 }
-function ue(o) {
-  if (o.month < 1 || o.month > 12)
+function ce(n) {
+  if (n.month < 1 || n.month > 12)
     return /* @__PURE__ */ new Date(NaN);
-  if (o.day < 1 || o.day > 31)
+  if (n.day < 1 || n.day > 31)
     return /* @__PURE__ */ new Date(NaN);
-  if (o.hour < 0 || o.hour > 23)
+  if (n.hour < 0 || n.hour > 23)
     return /* @__PURE__ */ new Date(NaN);
-  if (o.minute < 0 || o.minute > 59)
+  if (n.minute < 0 || n.minute > 59)
     return /* @__PURE__ */ new Date(NaN);
-  if (o.second < 0 || o.second > 59)
+  if (n.second < 0 || n.second > 59)
     return /* @__PURE__ */ new Date(NaN);
-  if (o.millisecond < 0 || o.millisecond > 999)
+  if (n.millisecond < 0 || n.millisecond > 999)
     return /* @__PURE__ */ new Date(NaN);
   const e = new Date(
-    o.year,
-    o.month - 1,
-    o.day,
-    o.hour,
-    o.minute,
-    o.second,
-    o.millisecond
+    n.year,
+    n.month - 1,
+    n.day,
+    n.hour,
+    n.minute,
+    n.second,
+    n.millisecond
   );
-  return ne(e) ? e.getFullYear() !== o.year || e.getMonth() !== o.month - 1 || e.getDate() !== o.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
+  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 Be(o, e, t) {
-  if (o = o.trim(), e === "t") {
-    const a = Number(o);
+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);
   }
   if (e === "T") {
-    const a = Number(o);
+    const a = Number(n);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a);
   }
-  const { regex: r, tokenOrder: s } = oe(e), i = o.match(r);
+  const { regex: r, tokenOrder: s } = oe(e), i = n.match(r);
   if (!i)
     return /* @__PURE__ */ new Date(NaN);
-  const n = ae(i, s);
-  return ue(n);
+  const o = ae(i, s);
+  return ce(o);
 }
-class ce {
+class ue {
   cache;
   maxSize;
   accessOrder;
@@ -1246,9 +1250,9 @@ class fe {
     if (e.length === 0) return !1;
     const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = (i) => {
       t.add(i), r.add(i);
-      const n = this.graph.get(i);
-      if (n) {
-        for (const a of n)
+      const o = this.graph.get(i);
+      if (o) {
+        for (const a of o)
           if (t.has(a)) {
             if (r.has(a))
               return !0;
@@ -1258,8 +1262,8 @@ class fe {
       return r.delete(i), !1;
     };
     for (let i = 0; i < e.length - 1; i++) {
-      const n = e[i], a = e[i + 1];
-      n && a && this.addDependency(n, a);
+      const o = e[i], a = e[i + 1];
+      o && a && this.addDependency(o, a);
     }
     for (const i of e)
       if (!t.has(i) && s(i))
@@ -1276,7 +1280,7 @@ class de {
   cacheHits = 0;
   cacheMisses = 0;
   constructor(e = 1e3) {
-    this.parseCache = new ce(e), this.circularRefDetector = new fe();
+    this.parseCache = new ue(e), this.circularRefDetector = new fe();
   }
   /**
    * Parse an attribute string into its components
@@ -1301,18 +1305,21 @@ class de {
       return this.cacheHits++, this.parseCache.get(e);
     this.cacheMisses++;
     let t, r;
-    const s = e.includes("."), i = e.includes("["), n = s || i;
-    if (n)
-      if (r = e.split(/[.[]/)[0], i) {
-        const u = e.indexOf("]");
-        if (u > -1) {
-          const f = e.indexOf(".", u + 1);
-          f > -1 ? t = e.substring(f + 1) : t = void 0;
-        } else s && (t = e.substring(e.indexOf(".") + 1));
-      } else s && (t = e.substring(e.indexOf(".") + 1));
+    const s = e.includes("."), i = e.includes("["), o = s || i;
+    if (o) {
+      r = e.split(/[.[]/)[0];
+      const c = e.indexOf("."), u = e.indexOf("[");
+      if (i && (c === -1 || u < c)) {
+        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));
+    }
     const a = {
       attribute: e,
-      isDeepQuery: n
+      isDeepQuery: o
     };
     return r && (a.reference = r), typeof t < "u" && t !== "" && (a.referenceAttribute = t), this.parseCache.set(e, a), a;
   }
@@ -1367,16 +1374,16 @@ class de {
     (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 n = /\[([^\]]+)\]/g;
+    const o = /\[([^\]]+)\]/g;
     let a;
-    for (; (a = n.exec(e)) !== null; ) {
-      const c = a[1];
-      c && c !== "*" && !/^\d+$/.test(c) && r.push(`Invalid bracket content: Must be a number or '*', got '${c}' in ${e}`);
+    for (; (a = o.exec(e)) !== null; ) {
+      const f = a[1];
+      f && f !== "*" && !/^\d+$/.test(f) && r.push(`Invalid bracket content: Must be a number or '*', got '${f}' in ${e}`);
     }
-    const u = (e.match(/\./g) || []).length + 1;
-    u > t && r.push(`Path too deep: Maximum depth is ${t}, got ${u} in ${e}`);
-    const f = e.match(/[^a-zA-Z0-9._[\]*-]/g);
-    return f && r.push(`Invalid characters in path: ${f.join(", ")} in ${e}`), {
+    const c = (e.match(/\./g) || []).length + 1;
+    c > t && r.push(`Path too deep: Maximum depth is ${t}, got ${c} in ${e}`);
+    const u = e.match(/[^a-zA-Z0-9._[\]*-]/g);
+    return u && r.push(`Invalid characters in path: ${u.join(", ")} in ${e}`), {
       valid: r.length === 0,
       errors: r.length > 0 ? r : void 0
     };
@@ -1435,69 +1442,103 @@ class de {
     return this.getPathSegments(e).length;
   }
 }
-const g = new de();
-function A(o, e) {
-  if (!e.includes("[*]")) {
-    const a = y(o, e);
-    return a !== void 0 ? [a] : [];
-  }
-  const t = e.indexOf("[*]"), r = e.substring(0, t), s = e.substring(t + 3), i = r ? y(o, r) : o;
-  if (!Array.isArray(i)) return [];
-  const n = [];
-  for (const a of i)
-    !s || s === "" ? a !== void 0 && n.push(a) : s.startsWith(".") && n.push(...A(a, s.slice(1)));
-  return n;
+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(...w(f, a.slice(1)));
+    return u;
+  }
+  const t = e.split(".");
+  let r = [n];
+  for (const i 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];
+            u !== void 0 && o.push(u);
+          }
+        else {
+          const c = a[i];
+          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);
+  return s;
 }
-function K(o) {
+function M(n) {
   let e = 0;
-  for (let t of o) {
+  for (let t of n) {
     const r = t.toString().split(".")[1];
     r && (e = Math.max(e, r.length));
   }
   return Math.pow(10, e);
 }
-function B(o, e, t) {
-  return (o * t + e * t) / t;
+function G(n, e, t) {
+  return (n * t + e * t) / t;
 }
-function le(o, e, t) {
-  return o * t / (e * t);
+function le(n, e, t) {
+  return n * t / (e * t);
 }
-const M = (o, e, t, r) => {
+const C = (n, e, t, r) => {
   if (!r)
     throw new Error("Attribute not found");
   const s = {
     attribute: r,
-    types: o.types
+    types: n.types
   };
   let i;
-  (s.types.includes("sum") || s.types.includes("avg") || s.types.includes("count")) && (i = ge(r, e));
-  let n;
-  return (s.types.includes("min") || s.types.includes("max")) && (n = he(r, e)), o.types.forEach((a) => {
-    a === "sum" ? s.sum = i?.sum : a === "avg" ? s.avg = i?.average : a === "count" ? s.count = i?.count : a === "min" ? s.min = n && n[0] : a === "max" ? s.max = n && n[1] : a === "distinct" ? s.distinct = ye(o, e, t) : a === "group" && (s.group = pe(o, e));
+  (s.types.includes("sum") || s.types.includes("avg")) && (i = 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));
   }), s;
-}, he = (o, e) => {
+}, he = (n, e) => {
+  const r = m.parse(n).isDeepQuery;
+  let s = 0;
+  for (const i of e.values())
+    if (i)
+      if (r)
+        s += w(i, n).filter((o) => o != null).length;
+      else {
+        const o = i[n];
+        if (o == null) continue;
+        Array.isArray(o) ? s += o.filter((a) => a != null).length : s++;
+      }
+  return s;
+}, pe = (n, e) => {
   let t, r;
-  const i = g.parse(o).isDeepQuery;
-  for (const n of e.values())
-    if (n) {
-      let a;
-      if (i && o.includes("[*]"))
-        a = A(n, o);
-      else if (i) {
-        const u = y(n, o);
-        a = u !== void 0 ? [u] : [];
-      } else
-        a = n[o] !== void 0 ? [n[o]] : [];
-      for (const u of a)
-        (t === void 0 || u < t) && (t = u), (r === void 0 || u > r) && (r = u);
+  const i = m.parse(n).isDeepQuery;
+  for (const o of e.values()) {
+    if (!o) continue;
+    let a;
+    if (i)
+      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];
     }
+    for (const c of a)
+      c == null || typeof c == "object" || ((t === void 0 || c < t) && (t = c), (r === void 0 || c > r) && (r = c));
+  }
   if (!(t === void 0 || r === void 0))
     return [t, r];
-}, pe = (o, e) => {
+}, ge = (n, e) => {
   const t = [];
-  o.groupOptions?.groups?.forEach((n) => {
+  n.groupOptions?.groups?.forEach((o) => {
     t.push({
-      option: n,
+      option: o,
       count: 0,
       keys: []
     });
@@ -1506,68 +1547,61 @@ const M = (o, e, t, r) => {
     option: { value: ["$dcupl_not_found"] },
     count: 0,
     keys: []
-  }, i = g.parse(o.attribute).isDeepQuery;
-  for (const n of e.values()) {
+  }, i = m.parse(n.attribute).isDeepQuery;
+  for (const o of e.values()) {
     let a;
-    if (i && o.attribute.includes("[*]"))
-      a = A(n, o.attribute);
-    else if (i) {
-      const f = y(n, o.attribute);
-      a = f !== void 0 ? [f] : [];
-    } else
-      a = [n[o.attribute]];
-    let u = !1;
-    for (const f of a)
-      for (const c of t)
-        (typeof c.option.value < "u" && c.option.value.includes(f) || typeof c.option.from < "u" && c.option.from < f && typeof c.option.to < "u" && c.option.to > f) && (c.keys.includes(n.key) || (c.count++, c.keys.push(n.key)), u = !0);
-    !u && o?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(n.key));
-  }
-  return o?.groupOptions?.calculateNotFound && t.push(r), t;
-}, ge = (o, e) => {
+    i ? a = w(o, n.attribute) : a = [o[n.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));
+  }
+  return n?.groupOptions?.calculateNotFound && t.push(r), t;
+}, ye = (n, e) => {
   let t = 0, r = 0;
-  const i = g.parse(o).isDeepQuery;
-  for (const u of e.values()) {
-    if (!u) continue;
-    let f;
-    if (i && o.includes("[*]"))
-      f = A(u, o);
-    else if (i) {
-      const c = y(u, o);
-      f = c !== void 0 ? [c] : [];
-    } else
-      f = u[o] !== void 0 ? [u[o]] : [];
-    for (const c of f)
-      if (Array.isArray(c))
-        for (const d of c)
-          typeof d == "number" && (t = B(t, d, K([t, d])), r++);
-      else typeof c == "number" && (t = B(t, c, K([t, c])), r++);
+  const i = m.parse(n).isDeepQuery;
+  for (const a of e.values()) {
+    if (!a) continue;
+    let c;
+    if (i)
+      c = w(a, n);
+    else {
+      const u = a[n];
+      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++);
   }
   return r === 0 ? void 0 : {
-    average: le(t, r, K([t, r])),
-    count: e.size,
+    average: le(t, r, M([t, r])),
+    count: r,
     sum: t
   };
-}, ye = (o, e, t) => {
+}, me = (n, e, t) => {
   const r = [];
   for (const [s, i] of t)
-    if (!(o.excludeUndefineds && typeof s > "u") && Array.from(i).find((n) => e.has(n))) {
-      const n = {
+    if (!(n.excludeUndefineds && typeof s > "u") && Array.from(i).find((o) => e.has(o))) {
+      const o = {
         value: s,
         count: i.size
       };
-      if (o.distinctOptions?.skipKeys || (n.keys = Array.from(i)), r.push(n), o.distinctOptions?.limit && r.length >= o.distinctOptions.limit)
+      if (n.distinctOptions?.skipKeys || (o.keys = Array.from(i)), r.push(o), n.distinctOptions?.limit && r.length >= n.distinctOptions.limit)
         break;
     }
   return r;
 };
-class w 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 R {
+class L {
   _defaultQueryOptions = {
     modelKey: "",
     groupKey: "root",
@@ -1575,10 +1609,10 @@ class R {
     queries: []
   };
   _initOptions;
-  currentQuery = m(this._defaultQueryOptions);
+  currentQuery = v(this._defaultQueryOptions);
   deepQueryService;
   constructor(e) {
-    this.deepQueryService = e || g;
+    this.deepQueryService = e || m;
   }
   /**
    * Initialize the query builder.
@@ -1604,7 +1638,7 @@ class R {
    * });
    */
   init(e) {
-    this._initOptions = m(e), this.currentQuery = m(this._defaultQueryOptions), this.currentQuery.modelKey = e.modelKey, "queries" in e && Array.isArray(e.queries) && (e.groupType && (this.currentQuery.groupType = e.groupType), e.queries && (this.currentQuery.queries = m(e.queries)), e.count !== void 0 && (this.currentQuery.count = e.count), e.start !== void 0 && (this.currentQuery.start = e.start), e.sort && (this.currentQuery.sort = e.sort), e.projection && (this.currentQuery.projection = e.projection));
+    this._initOptions = v(e), this.currentQuery = v(this._defaultQueryOptions), this.currentQuery.modelKey = e.modelKey, "queries" in e && Array.isArray(e.queries) && (e.groupType && (this.currentQuery.groupType = e.groupType), e.queries && (this.currentQuery.queries = v(e.queries)), e.count !== void 0 && (this.currentQuery.count = e.count), e.start !== void 0 && (this.currentQuery.start = e.start), e.sort && (this.currentQuery.sort = e.sort), e.projection && (this.currentQuery.projection = e.projection));
   }
   reset() {
     return this.init(this._initOptions), this.getQuery();
@@ -1613,7 +1647,7 @@ class R {
     return "attribute" in e;
   }
   isQueryGroup(e) {
-    return "groupKey" in e;
+    return "queries" in e || "groupKey" in e;
   }
   isRootQueryGroup(e) {
     return this.isQueryGroup(e) && e.groupKey === "root";
@@ -1622,7 +1656,7 @@ class R {
     return this.currentQuery.queries.find((t) => this.isQueryGroup(t) && t.groupKey === e);
   }
   getQuery() {
-    return m(this.currentQuery);
+    return v(this.currentQuery);
   }
   hasQueryGroup(e) {
     return this.currentQuery.queries.some((t) => this.isQueryGroup(t) && t.groupKey === e);
@@ -1638,7 +1672,7 @@ class R {
   }
   validate(e) {
     const t = e.queries.map((s) => this.validateQuery(s));
-    return { valid: T(t, (s) => s.valid), errors: t.map((s) => s.errors).flat() };
+    return { valid: z(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();
@@ -1658,7 +1692,8 @@ class R {
    * - {@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
    */
@@ -1682,12 +1717,12 @@ class R {
           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,
@@ -1720,7 +1755,7 @@ class R {
         (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)) {
@@ -1733,8 +1768,8 @@ class R {
         else {
           const s = t.queries[r];
           for (const i of e.queries) {
-            const n = E(s.queries, i);
-            n > -1 && s.queries.splice(n, 1);
+            const o = $(s.queries, i);
+            o > -1 && s.queries.splice(o, 1);
           }
           s.queries.length === 0 && t.queries.splice(r, 1);
         }
@@ -1744,12 +1779,12 @@ class R {
   validateQuery(e) {
     const t = [];
     if (this.isQuery(e))
-      return e.attribute || t.push(new w("Missing attribute", e)), e.operator || t.push(new w("Missing operator", e)), typeof e.value > "u" && t.push(new w("Missing value", e)), e.operator === "find" && Array.isArray(e.value) && t.push(new w("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((n) => this.validateQuery(n)).filter((n) => !n.valid).map((n) => n.errors).flat();
+      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 w("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.
@@ -1760,8 +1795,8 @@ class R {
    */
   getQueryAttributes(e) {
     const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
-      for (const n of i)
-        this.isQuery(n) ? n.attribute && !r.has(n.attribute) && (t.push(n.attribute), r.add(n.attribute)) : this.isQueryGroup(n) && s(n.queries);
+      for (const o of i)
+        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;
   }
@@ -1774,13 +1809,13 @@ class R {
    */
   extractQueryAttributes(e) {
     const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
-      for (const n of i)
-        if (this.isQuery(n)) {
-          if (n.attribute && !r.has(n.attribute)) {
-            const a = this.getQueryAttributeForString(n.attribute);
-            t.push(a), r.add(n.attribute);
+      for (const o of i)
+        if (this.isQuery(o)) {
+          if (o.attribute && !r.has(o.attribute)) {
+            const a = this.getQueryAttributeForString(o.attribute);
+            t.push(a), r.add(o.attribute);
           }
-        } else this.isQueryGroup(n) && s(n.queries);
+        } else this.isQueryGroup(o) && s(o.queries);
     };
     return s(e?.queries || this.currentQuery.queries), t;
   }
@@ -1822,8 +1857,8 @@ class R {
             const s = this.deepQueryService.parse(r.referenceAttribute);
             if (s.isDeepQuery && r.reference) {
               const i = this.getProjectionForAttributeEntries([s]);
-              Object.keys(i).forEach((n) => {
-                n !== "$" && r.reference && (t[r.reference][n] = i[n]);
+              Object.keys(i).forEach((o) => {
+                o !== "$" && r.reference && (t[r.reference][o] = i[o]);
               });
             } else r.reference && (t[r.reference][r.referenceAttribute] = !0);
           } else
@@ -1907,7 +1942,10 @@ class R {
   /**
    * 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' })`.
    *
@@ -1931,7 +1969,13 @@ class R {
   }
   /**
    * 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
@@ -2122,8 +2166,8 @@ class R {
       for (const s of r)
         if (this.isQuery(s)) {
           let i = !0;
-          for (const n in e)
-            if (s[n] !== e[n]) {
+          for (const o in e)
+            if (s[o] !== e[o]) {
               i = !1;
               break;
             }
@@ -2248,48 +2292,95 @@ class R {
     return e(this.currentQuery.queries);
   }
 }
-const I = new R();
-function Te(o, e, t, r, s, i, n) {
-  const a = [], u = I.removeQuery({ groupKey: s }, m(r)), f = n.queryData(o, u, !1, i), c = e ? [...e.keys()] : [], d = new Set(c), l = i.get(s);
+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())
-      d.add(h);
-  t.excludeUndefineds ? d.delete(void 0) : d.add(void 0);
-  for (const h of d.values()) {
-    const b = /* @__PURE__ */ new Map(), W = l.get(h) || /* @__PURE__ */ new Set();
-    for (const k of W) {
-      const C = f.get(k);
-      if (C && (b.set(k, C), !t?.calculateFacets))
-        break;
-    }
-    const N = {
-      key: String(h),
-      value: h,
-      selected: me(s, h, r),
-      enabled: b.size > 0,
-      size: b.size,
-      entry: e.get(h),
-      resultKeys: Array.from(b.keys())
-    };
-    if (!(t?.excludeZeros && N.size === 0)) {
-      if (t?.count && a.length === t?.count)
-        return a;
-      a.push(N);
+    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 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 h = [];
+  for (const p of d.values()) {
+    const y = _(
+      p,
+      l,
+      u,
+      e,
+      s,
+      a,
+      r,
+      !!t?.calculateFacets
+    );
+    if (!(t?.excludeZeros && y.size === 0)) {
+      if (t?.count && h.length === t?.count)
+        return h;
+      h.push(y);
     }
   }
-  return a;
+  return h;
 }
-const me = (o, e, t) => {
-  const r = t.queries.findIndex((s) => I.isQueryGroup(s) && s.groupKey === o);
-  return r > -1 ? !!t.queries[r].queries.find((i) => {
-    if (I.isQuery(i)) {
-      const n = i.value?.key || i.value;
-      return i.attribute === o && n === e;
-    }
-    return !1;
-  }) : !1;
+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(i, s, n, o),
+    enabled: c.size > 0,
+    size: c.size,
+    entry: r?.get(n),
+    resultKeys: Array.from(c.keys())
+  };
+}
+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;
+  const t = typeof n, 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;
+}
+function ve(n) {
+  switch (n) {
+    case "size-desc":
+      return (e, t) => t.size - e.size || S(e.value, t.value);
+    case "size-asc":
+      return (e, t) => e.size - t.size || S(e.value, t.value);
+    case "value-asc":
+      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 : -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;
 };
-class ve {
+class xe {
   indexMap = /* @__PURE__ */ new Map();
   // Possible performance gain*
   dataMap = /* @__PURE__ */ new Map();
@@ -2299,6 +2390,15 @@ class ve {
   reset(e) {
     e ? (this.indexMap.delete(e), this.dataMap.delete(e), this.indexMetadata.delete(e)) : (this.indexMap.clear(), this.dataMap.clear(), this.indexMetadata.clear());
   }
+  /**
+   * Removes every index the predicate selects. Used to drop indices that
+   * were built from now-stale data; the next read lazily rebuilds them via
+   * {@link getOrCreateIndex}.
+   */
+  resetIndicesWhere(e) {
+    for (const t of Array.from(this.indexMap.keys()))
+      e(t) && this.reset(t);
+  }
   fillDataMap(e, t) {
     let r = this.dataMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this.dataMap.set(e, r));
@@ -2311,8 +2411,8 @@ class ve {
           this.fillDataMap(e, [a]);
         return;
       } else s instanceof Date ? i = s.toISOString() : i = s;
-      let n = r.get(i);
-      n || (n = { key: i }, this.dataMap.get(e)?.set(i, n));
+      let o = r.get(i);
+      o || (o = { key: i }, this.dataMap.get(e)?.set(i, o));
     }
   }
   fillInverseIndex(e, t, r) {
@@ -2320,16 +2420,16 @@ class ve {
       return;
     const s = this.indexMap.get(e) || /* @__PURE__ */ new Map();
     for (const i of r) {
-      let n;
+      let o;
       if (typeof i == "object" && i && i.key)
-        n = i.key;
+        o = i.key;
       else if (Array.isArray(i)) {
-        for (const u of i)
-          this.fillInverseIndex(e, t, [u]);
+        for (const c of i)
+          this.fillInverseIndex(e, t, [c]);
         return;
-      } else i instanceof Date ? n = i.toISOString() : n = i;
-      let a = s.get(n);
-      a || (a = /* @__PURE__ */ new Set(), s.set(n, a)), a.add(t);
+      } else i instanceof Date ? o = i.toISOString() : o = i;
+      let a = s.get(o);
+      a || (a = /* @__PURE__ */ new Set(), s.set(o, a)), a.add(t);
     }
     this.indexMap.set(e, s);
   }
@@ -2344,31 +2444,31 @@ class ve {
   getOrCreateIndex(e, t, r) {
     const s = this.getIndexName(e, r);
     let i = this.getIndex(s);
-    const n = this.indexMetadata.get(s);
-    if (n)
-      n.lastAccessedAt = Date.now();
+    const o = this.indexMetadata.get(s);
+    if (o)
+      o.lastAccessedAt = Date.now();
     else if (!i) {
-      const u = g.parse(e).isDeepQuery ?? !1;
+      const c = m.parse(e).isDeepQuery ?? !1;
       this.indexMetadata.set(s, {
         createdAt: Date.now(),
         lastAccessedAt: Date.now(),
         context: r,
-        type: u ? "deep" : "shallow"
+        type: c ? "deep" : "shallow"
       });
     }
     if (!i) {
       this.reset(s), this.indexMap.set(s, /* @__PURE__ */ new Map());
-      const u = g.parse(e).isDeepQuery;
-      for (const f of t.values()) {
-        let c;
-        u && e.includes("[*]") ? (c = A(f, e), c.length === 0 && (c = [void 0])) : u ? c = [y(f, e)] : c = [f[e]], this.fillInverseIndex(s, f.key, c), this.fillDataMap(s, c);
+      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();
     }
     return i;
   }
   getIndexName(e, t) {
-    return t ? e + "_" + Q(t) : e;
+    return t ? e + "_" + D(t) : e;
   }
   // ========== PARTIAL UPDATE METHODS ==========
   /**
@@ -2381,16 +2481,16 @@ class ve {
     const s = this.indexMap.get(e);
     if (s)
       for (const i of r) {
-        let n;
+        let o;
         if (typeof i == "object" && i && i.key)
-          n = i.key;
+          o = i.key;
         else if (Array.isArray(i)) {
-          for (const u of i)
-            this.removeFromInverseIndex(e, t, [u]);
+          for (const c of i)
+            this.removeFromInverseIndex(e, t, [c]);
           return;
-        } else i instanceof Date ? n = i.toISOString() : n = i;
-        const a = s.get(n);
-        a && (a.delete(t), a.size === 0 && s.delete(n));
+        } else i instanceof Date ? o = i.toISOString() : o = i;
+        const a = s.get(o);
+        a && (a.delete(t), a.size === 0 && s.delete(o));
       }
   }
   /**
@@ -2416,8 +2516,8 @@ class ve {
         if (typeof s == "object" && s && s.key)
           i = s.key;
         else if (Array.isArray(s)) {
-          for (const n of s)
-            this.removeFromDataMap(e, [n]);
+          for (const o of s)
+            this.removeFromDataMap(e, [o]);
           return;
         } else s instanceof Date ? i = s.toISOString() : i = s;
         r.delete(i);
@@ -2462,7 +2562,7 @@ class ve {
   isDeepQueryIndex(e) {
     const t = e.includes("_") ? e.split("_")[0] : e;
     try {
-      return g.parse(t).isDeepQuery ?? !1;
+      return m.parse(t).isDeepQuery ?? !1;
     } catch {
       return !1;
     }
@@ -2523,8 +2623,8 @@ class ve {
   getStats() {
     const e = this.getIndexCount(), t = Date.now();
     let r = 0, s = 0;
-    for (const n of this.indexMetadata.values()) {
-      const a = t - n.createdAt;
+    for (const o of this.indexMetadata.values()) {
+      const a = t - o.createdAt;
       r += a, a > s && (s = a);
     }
     const i = this.indexMetadata.size > 0 ? r / this.indexMetadata.size : 0;
@@ -2537,153 +2637,165 @@ class ve {
     };
   }
 }
-const v = "__";
-function z(o, e, t = { key: "root" }, r = "root", s = new ve(), i) {
-  const n = i || o;
+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 && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.rows)
-    a.attribute && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.values)
-    a.attribute && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
+    a.attribute && (m.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   if (e.rows && e.rows.length > 0) {
     t.rows = t.rows || [];
-    const a = we(o, e.rows[0], e, s, r, i);
+    const a = Ae(n, e.rows[0], e, s, r, i);
     t.rows.push(a);
   }
   if (e.columns && e.columns.length > 0) {
     t.columns = t.columns || [];
-    const a = _(o, 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")
     for (const a of e.values) {
       if (t.values = t.values || [], r === "root" && e.options?.calculateTotals === !1)
         continue;
-      const u = M(a, o, s.getIndex(a.attribute), a.attribute);
-      t.values.push(u);
+      const c = C(a, n, s.getIndex(a.attribute), a.attribute);
+      t.values.push(c);
     }
   return t;
 }
-function we(o, e, t, r, s = "", i) {
-  const n = { key: e.attribute }, a = r.getIndex(e.attribute);
+function Ae(n, e, t, r, s = "", i) {
+  const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
-    return n;
-  for (const [u, f] of a.entries()) {
-    const c = {
-      key: u,
-      value: u
+    return o;
+  for (const [c, u] of a.entries()) {
+    const f = {
+      key: c,
+      value: c
     }, d = /* @__PURE__ */ new Map();
-    for (const l of f)
-      o.has(l) && d.set(l, o.get(l));
+    for (const l of u)
+      n.has(l) && d.set(l, n.get(l));
     if (d.size) {
       for (const l of t.values) {
-        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
+        if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
-        c.values.push(h);
+        const h = C(l, d, r.getIndex(l.attribute), l.attribute);
+        f.values.push(h);
       }
-      if (n.rows = n.rows || [], n.rows.push(c), t.rows.length > 1) {
+      if (o.rows = o.rows || [], o.rows.push(f), t.rows.length > 1) {
         const l = { ...t, rows: t.rows.slice(1) };
-        z(
+        U(
           d,
           l,
-          c,
-          s + v + e.attribute + v + u,
+          f,
+          s + A + e.attribute + A + c,
           r,
           i
         );
       } else if (t.columns)
         for (const l of t.columns) {
-          c.columns = c.columns || [];
-          const h = _(
+          f.columns = f.columns || [];
+          const h = W(
             d,
             l,
             t,
             r,
-            s + v + e.attribute + v + u,
+            s + A + e.attribute + A + c,
             i
           );
-          c.columns.push(h);
+          f.columns.push(h);
         }
     }
   }
-  return n;
+  return o;
 }
-function _(o, e, t, r, s = "", i) {
-  const n = { key: e.attribute }, a = r.getIndex(e.attribute);
+function W(n, e, t, r, s = "", i) {
+  const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
-    return n;
-  for (const [u, f] of a.entries()) {
-    const c = {
-      key: u,
-      value: u
+    return o;
+  for (const [c, u] of a.entries()) {
+    const f = {
+      key: c,
+      value: c
     }, d = /* @__PURE__ */ new Map();
-    for (const l of f)
-      o.has(l) && d.set(l, o.get(l));
+    for (const l of u)
+      n.has(l) && d.set(l, n.get(l));
     if (d.size) {
       for (const l of t.values) {
-        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
+        if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
-        c.values.push(h);
+        const h = C(l, d, r.getIndex(l.attribute), l.attribute);
+        f.values.push(h);
       }
-      if (n.columns = n.columns || [], n.columns.push(c), t.columns.length > 1) {
+      if (o.columns = o.columns || [], o.columns.push(f), t.columns.length > 1) {
         const l = { ...t, columns: t.columns.slice(1) };
-        z(
+        U(
           d,
           l,
-          c,
-          s + v + e.attribute + v + u,
+          f,
+          s + A + e.attribute + A + c,
           r,
           i
         );
       }
     }
   }
-  return n;
+  return o;
 }
-const je = (o, e) => {
-  const t = [];
-  for (const r of o) {
-    for (const [s, i] of Object.entries(r)) {
-      const n = t.find((u) => u.key === s), a = be(i);
-      if (n)
-        n.type !== a && (n.type = "any");
-      else {
-        const u = {
-          key: s,
-          type: a
-        };
-        t.push(u);
+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 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 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);
       }
-    }
-    if (!e)
-      break;
   }
-  return t;
-}, xe = (o) => Number(o) === o && o % 1 === 0, Ae = (o) => Number(o) === o && o % 1 !== 0, be = (o) => {
-  switch (typeof o) {
+  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"]));
+    c.push({ key: f, type: l }), u.push({
+      column: f,
+      inferredType: l,
+      observedTypes: [...d.observed].sort(),
+      emptyRate: d.scanned === 0 ? 0 : d.empty / d.scanned,
+      conflict: h,
+      hint: d.hint
+    });
+  }
+  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) {
     case "string":
       return "string";
     case "number":
-      return xe(o) ? "int" : Ae(o) ? "float" : "any";
+      return Ee(n) ? "int" : Ce(n) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
-      return se(o) ? "date" : "json";
+      return se(n) ? "date" : "json";
     default:
       return "any";
   }
-}, Pe = (o, e) => {
-  const t = te(o.text || ""), r = e?.attributeKey || o.filterKey;
+}, tt = (n, e) => {
+  const t = te(n.text || ""), r = e?.attributeKey || n.filterKey;
   let s;
   const i = e?.comparisonType || "containsIgnoreCase";
   return i === "containsIgnoreCase" ? s = {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.text,
+        queryKey: n.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find",
@@ -2693,10 +2805,10 @@ const je = (o, e) => {
       }
     ]
   } : i === "containsIgnoreCaseAndWhitespace" ? s = {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.text,
+        queryKey: n.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find",
@@ -2706,32 +2818,32 @@ const je = (o, e) => {
       }
     ]
   } : i === "contains" ? s = {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.text,
+        queryKey: n.text,
         attribute: r,
         value: `/${t}/`,
         operator: "find"
       }
     ]
   } : i === "equal" ? s = {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.text,
+        queryKey: n.text,
         attribute: r,
-        value: o.text,
+        value: n.text,
         operator: "eq"
       }
     ]
   } : i === "equalIgnoreCase" && (s = {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.text,
+        queryKey: n.text,
         attribute: r,
-        value: o.text,
+        value: n.text,
         operator: "eq",
         options: {
           transform: ["lowercase"]
@@ -2739,40 +2851,40 @@ const je = (o, e) => {
       }
     ]
   }), s;
-}, Re = (o, e) => {
-  const t = e?.attributeKey || o.filterKey;
+}, rt = (n, e) => {
+  const t = e?.attributeKey || n.filterKey;
   return {
-    groupKey: o.filterKey,
+    groupKey: n.filterKey,
     queries: [
       {
-        queryKey: o.value,
+        queryKey: n.value,
         attribute: t,
-        value: o.value,
+        value: n.value,
         operator: "eq"
       }
     ]
   };
-}, ze = (o, e) => {
-  const t = e?.attributeKey || o.filterKey, r = {
-    groupKey: o.filterKey,
+}, st = (n, e) => {
+  const t = e?.attributeKey || n.filterKey, r = {
+    groupKey: n.filterKey,
     queries: []
   };
-  return typeof o.eq < "u" && (r.groupType = "or", Array.isArray(o.eq) ? o.eq.forEach((s) => {
+  return typeof n.eq < "u" && (r.groupType = "or", Array.isArray(n.eq) ? n.eq.forEach((s) => {
     r.queries.push({ attribute: t, value: s, operator: "eq" });
-  }) : r.queries.push({ attribute: t, value: o.eq, operator: "eq" })), typeof o.ne < "u" && (r.groupType = "and", Array.isArray(o.ne) ? o.ne.forEach((s) => {
+  }) : 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: s, operator: "eq", options: { invert: !0 } });
   }) : r.queries.push({
     attribute: t,
-    value: o.ne,
+    value: n.ne,
     operator: "eq",
     options: { invert: !0 }
-  })), typeof o.gt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: o.gt, operator: "gt" })), typeof o.lt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: o.lt, operator: "lt" })), typeof o.gte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: o.gte, operator: "gte" })), typeof o.lte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: o.lte, operator: "lte" })), r;
-}, _e = (o, e) => {
-  const t = e?.attributeKey || o.filterKey, r = {
-    groupKey: o.filterKey,
+  })), 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,
     queries: []
   };
-  return o.itemKeys.forEach((s) => {
+  return n.itemKeys.forEach((s) => {
     r.queries.push({
       queryKey: s,
       attribute: t,
@@ -2780,13 +2892,16 @@ const je = (o, e) => {
       operator: "eq"
     });
   }), r;
-}, We = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
-class Le {
+}, 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;
   }
+  scriptController;
+  globalItemService;
+  modelParser;
   registeredCustomOperator = /* @__PURE__ */ new Map();
-  queryBuilder = new R();
+  queryBuilder = new L();
   registerCustomOperator(e, t) {
     this.registeredCustomOperator.set(e, t);
   }
@@ -2800,85 +2915,235 @@ class Le {
     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 = y(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 ? !O(r, s) : O(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((n) => n < s) : r.every((n) => n < s) : r < s;
       case "gt":
-        return Array.isArray(r) ? i === "some" ? r.some((n) => n > s) : r.every((n) => n > s) : r > s;
       case "lte":
-        return Array.isArray(r) ? i === "some" ? r.some((n) => n <= s) : r.every((n) => n <= s) : r <= s;
-      case "gte":
-        return Array.isArray(r) ? i === "some" ? r.some((n) => n >= s) : r.every((n) => n >= 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((n) => typeof n === s) : r.every((n) => typeof n === s) : typeof r === s;
-      case "isTruthy":
-        return s === !0 ? Array.isArray(r) ? i === "some" ? r.some((n) => typeof !!n) : r.every((n) => typeof !!n) : !!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 : L(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 n = this.registeredCustomOperator.get(e.operator);
-          if (typeof n == "function")
-            return n(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(), n = s.get(t.attribute);
-    if (n) {
-      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 u = n.get(a);
-        if (u)
-          if (u.forEach((f) => {
-            r.has(f) && i.set(f, r.get(f));
+    const i = /* @__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));
           }), t.options?.invert) {
-            const f = q(Array.from(r.values()), Array.from(i.values()), "key"), c = /* @__PURE__ */ new Map();
-            return f.forEach((d) => {
-              c.set(d.key, d);
-            }), c;
+            const u = O(Array.from(r.values()), Array.from(i.values()), "key"), f = /* @__PURE__ */ new Map();
+            return u.forEach((d) => {
+              f.set(d.key, d);
+            }), f;
           } else
             return i;
       }
     }
-    for (let [a, u] of r) {
-      const f = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-      if (f.some((c) => c.isDeepQuery)) {
-        const c = this.queryBuilder.getProjectionForAttributeEntries(
-          f.filter((d) => d.isDeepQuery)
-        );
-        u = this.globalItemService.getProjectedData(
-          c,
-          this.modelParser.models.get(e.modelKey),
-          u
-        );
+    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, u) && i.set(a, u);
+      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) => D(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) => D(s, t, this.equalRegexFn)) : e.every((s) => D(s, t, this.equalRegexFn)) : !!J(e, t) : D(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)) {
@@ -2886,61 +3151,45 @@ class Le {
         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))
-        return T(e.queries, (t) => this.validateQuery(t));
+        return z(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();
     if (t.attribute.includes("[*]")) {
-      const n = t.options?.invert === !0, a = /* @__PURE__ */ new Set();
-      for (let u of r.values()) {
-        const f = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-        if (f.some((l) => l.isDeepQuery)) {
-          const l = this.queryBuilder.getProjectionForAttributeEntries(
-            f.filter((h) => h.isDeepQuery)
-          );
-          u = this.globalItemService.getProjectedData(
-            l,
-            this.modelParser.models.get(e.modelKey),
-            u
-          );
-        }
-        const c = this.handleArrayStarQuery(t, u);
-        let d = !1;
-        for (const l of c.queries) {
-          const h = { ...l, options: { ...l.options, invert: !1 } };
-          if (this.evaluateQuery(h, u)) {
-            d = !0;
-            break;
-          }
-        }
-        d && (a.add(u.key), n || i.set(u.key, u));
-      }
-      if (n)
-        for (const [u, f] of r)
-          a.has(u) || i.set(u, f);
-    } else {
-      if (t.operator === "eq")
-        return this.evaluateEqOperator(e, t, r, s);
-      for (let [n, a] of r) {
+      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((f) => f.isDeepQuery)) {
-          const f = this.queryBuilder.getProjectionForAttributeEntries(
-            u.filter((c) => c.isDeepQuery)
+        if (u.some((h) => h.isDeepQuery)) {
+          const h = this.queryBuilder.getProjectionForAttributeEntries(
+            u.filter((p) => p.isDeepQuery)
           );
-          a = this.globalItemService.getProjectedData(
-            f,
+          c = this.globalItemService.getProjectedData(
+            h,
             this.modelParser.models.get(e.modelKey),
-            a
+            c
           );
         }
-        this.evaluateQuery(t, a) && i.set(n, a);
+        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 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) {
@@ -2950,12 +3199,12 @@ class Le {
       queries: []
     };
     if (r !== -1) {
-      const i = e.attribute.substring(0, r), n = i.includes(".") ? y(t, i) : t[i];
-      if (Array.isArray(n))
-        for (let a = 0; a < n.length; a++) {
-          const u = e.attribute.replace("[*]", `[${a}]`);
+      const i = e.attribute.substring(0, r), o = i.includes(".") ? I(t, i) : t[i];
+      if (Array.isArray(o))
+        for (let a = 0; a < o.length; a++) {
+          const c = e.attribute.replace("[*]", `[${a}]`);
           s.queries.push({
-            attribute: u,
+            attribute: c,
             operator: e.operator,
             value: e.value,
             options: e.options
@@ -2965,27 +3214,29 @@ class Le {
     return s;
   }
   evaluateQueryGroup(e, t, r, s, i) {
-    let n = /* @__PURE__ */ new Map(), a = r;
+    let o = /* @__PURE__ */ new Map(), a = r;
     if (!t.queries || t.queries?.length === 0)
       return a;
-    for (const u of t.queries) {
-      let f = /* @__PURE__ */ new Map();
-      if (this.queryBuilder.isQuery(u) ? f = this.getEvaluatedQueryDataset(e, u, a, i) : f = this.evaluateQueryGroup(e, u, a, s, i), n.size === 0 && (n = f), t.groupType === "or")
-        f.forEach((c) => {
-          n.set(c.key, c);
+    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);
         });
       else {
-        const c = q(Array.from(n.values()), Array.from(f.values()), "key");
-        for (const d of c)
-          n.delete(d.key);
+        const f = O(Array.from(o.values()), Array.from(u.values()), "key");
+        for (const d of f)
+          o.delete(d.key);
       }
-      t.groupType === "and" ? a = n : a = r;
+      t.groupType === "and" ? a = o : a = r;
     }
-    return n;
+    return o;
   }
   queryData(e, t, r, s) {
+    if (t.queries.length === 0)
+      return e;
     const i = new Map(e);
-    return t.queries.length === 0 ? e : (t.groupKey || (t.groupKey = "root"), t.groupType || (t.groupType = "and"), t.queries || (t.queries = []), this.validateQuery(t), this.evaluateQueryGroup(t, t, i, r, s));
+    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);
   }
   // public getRelevantQueryData(data: any, options: DcuplGlobalQueryOptions<any>, model: DcuplModel<ListItem>) {
   //   // detect if any of the query attributes are a deep query.
@@ -3021,7 +3272,59 @@ class Le {
   //   }
   // }
 }
-class He {
+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 `${qe}${n.key}`;
+  const t = D({
+    type: n.type,
+    url: n.rawUrl ?? n.url,
+    model: n.model ?? "",
+    occurrence: e
+  });
+  return `${Re}${t}`;
+}
+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 ?? ""}`;
+    let i = e.get(s) ?? 0, o = Q(r, i);
+    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;
+  });
+}
+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();
+    t.port1.onmessage = () => {
+      t.port1.close(), e();
+    }, t.port2.postMessage(null);
+  }) : new Promise((e) => setTimeout(e, 0));
+}
+class ft {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3060,14 +3363,14 @@ class He {
     if (!this.getScript(e))
       throw new Error(`Script ${e} not found`);
     r.context || (r.context = r.options || {});
-    const i = Object.keys(r), n = Object.values(r);
-    return this.getScriptAsFn(e, i)(t, ...n);
+    const i = Object.keys(r), o = Object.values(r);
+    return this.getScriptAsFn(e, i)(t, ...o);
   }
 }
-const Ue = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => y(e, r.trim(), ""))) : "", Ve = (o) => {
+const dt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", lt = (n) => {
   const e = /* @__PURE__ */ new Set();
-  return o.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
-}, Je = [
+  return n.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
+}, ht = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3079,8 +3382,9 @@ const Ue = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => y(e
   "int",
   "json",
   "string"
-], Ze = ["int", "float", "Array<int>", "Array<float>"], Ye = ["date", "Array<date>"], Xe = [
+], pt = ["int", "float", "Array<int>", "Array<float>"], gt = ["date", "Array<date>"], yt = [
   "eq",
+  "in",
   "find",
   "gt",
   "gte",
@@ -3091,57 +3395,67 @@ const Ue = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => y(e
   "size"
 ];
 export {
-  Ke as AnalyticsController,
-  Se as AttributeDependencyGraph,
-  Ie as CacheController,
-  $e as ChangeDetector,
-  Ye as DatePropertyTypes,
-  R as DcuplQueryBuilder,
-  Xe as DcuplQueryOperatorsAsArray,
+  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,
-  Y as DependencyGraph,
-  ve as IndicesController,
-  p as Logger,
-  Ze as NumberPropertyTypes,
-  Je as PropertyTypesAsArray,
-  Le as QueryManager,
-  He as ScriptController,
-  P as clone,
+  X as DependencyGraph,
+  xe as IndicesController,
+  g as Logger,
+  pt as NumberPropertyTypes,
+  ht as PropertyTypesAsArray,
+  ot as QueryManager,
+  ft as ScriptController,
+  B as clone,
+  Ke as coerceStringType,
   re as compareVersions,
-  Ge as computeSuggestions,
-  g as deepQueryService,
+  Ze as computeSuggestions,
+  m as deepQueryService,
   te as escapeRegExp,
-  Ue as evaluateTemplate,
-  Re as generateBooleanQuery,
+  dt as evaluateTemplate,
+  rt as generateBooleanQuery,
   ee as generateKey,
-  ze as generateNumberAndDateQuery,
-  _e as generateReferenceQuery,
-  Pe as generateTextQuery,
-  M as getAggregation,
-  Ne as getDateConstraintUid,
-  be as getDcuplPropertyTypeForNativeType,
-  A as getDeepPathValues,
-  ye as getDistinct,
-  Te as getFacets,
-  Qe as getFilterEntryId,
-  Me as getNumberConstraintUid,
-  je as getPropertiesForData,
-  Ce as groupBy,
-  qe as hasMinimumVersion,
+  st as generateNumberAndDateQuery,
+  nt as generateReferenceQuery,
+  tt as generateTextQuery,
+  C as getAggregation,
+  Pe as getDateConstraintUid,
+  $e as getDcuplPropertyTypeForNativeType,
+  w as getDeepPathValues,
+  me as getDistinct,
+  Ye as getFacets,
+  ze as getFilterEntryId,
+  je as getNumberConstraintUid,
+  et as getPropertiesForData,
+  Le as groupBy,
+  Ve as hasMinimumVersion,
+  Ne as inferModel,
   se as isDateInstance,
-  Ae as isFloat,
-  xe as isInt,
+  Ce as isFloat,
+  Ee as isInt,
   ne as isValidDate,
-  We as isValidQueryStatement,
-  F as isValidVersion,
-  X as logger,
-  Be as parseDate,
-  Ve as parseTemplate,
-  x as perf,
-  z as pivot,
-  Ee as removeTrailingSlash,
-  Fe as trigger,
-  Oe as unescapeRegExp,
-  ke as uniqBy
+  it as isValidQueryStatement,
+  T as isValidVersion,
+  Y as logger,
+  ke as looksDateLike,
+  Xe as parseDate,
+  P as parseRegexLiteral,
+  lt as parseTemplate,
+  b as perf,
+  U as pivot,
+  at as redactUrl,
+  Ue as removeTrailingSlash,
+  Q as resolveResourceId,
+  ct as resolveResourceIds,
+  Je as trigger,
+  We as unescapeRegExp,
+  Be as uniqBy,
+  ut as yieldToEventLoop
 };
 //# sourceMappingURL=index.js.map