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

package/dist/esm/index.js

@@ -1,18 +1,18 @@
-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";
+import { cloneDeep as m, get as D, every as j, findIndex as E, size as L, isEqual as q, differenceBy as O, startsWith as H, endsWith as V, isEqualWith as b, isMatch as U, find as J } from "lodash-es";
 function Q(o) {
-  const e = S(o);
+  const e = K(o);
   return Z(e);
 }
-function S(o) {
+function K(o) {
   if (typeof o != "object" || o === null)
     return String(o);
   if (Array.isArray(o))
-    return "[" + o.map(S).join(",") + "]";
+    return "[" + o.map(K).join(",") + "]";
   const e = Object.keys(o).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 + ":" + K(o[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
@@ -24,7 +24,7 @@ function Z(o) {
   }
   return e.toString(16);
 }
-const x = {
+const A = {
   now: () => typeof performance < "u" && performance.now ? performance.now() : (/* @__PURE__ */ new Date()).getTime(),
   mark: (o) => {
     typeof performance < "u" && performance.mark && performance.mark(o);
@@ -41,7 +41,7 @@ const x = {
       return performance.getEntriesByType(o);
   }
 };
-class Ke {
+class Ie {
   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: A.now(),
       createdAt: Date.now()
     };
     return this.data.set(t, r), r;
@@ -71,11 +71,11 @@ class Ke {
       return;
     const i = s.value - r.value, n = Math.round(i * 100) / 100, a = this.data.get(t);
     if (a && e.sum) {
-      const f = a.value + n, c = {
+      const c = a.value + n, f = {
         ...a,
-        value: f
+        value: c
       };
-      return this.data.set(t, c), c;
+      return this.data.set(t, f), f;
     }
     const u = {
       name: e.name,
@@ -96,7 +96,7 @@ class Ke {
     return this.data.get(t);
   }
   getResourceInfosFromPerformanceAPI() {
-    return typeof performance > "u" ? [] : x.getEntriesByType("resource");
+    return typeof performance > "u" ? [] : A.getEntriesByType("resource");
   }
   get(e) {
     const t = this.getKey(e.name, e.context);
@@ -118,7 +118,7 @@ class Ke {
     return e + "_" + r;
   }
 }
-let Y = class j {
+let Y = class B {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -253,8 +253,8 @@ let Y = class j {
       r.add(a);
       const u = this.edges.get(a);
       if (u)
-        for (let f of u)
-          n(f);
+        for (let c of u)
+          n(c);
       r.delete(a), t.add(a), s.push(a);
     };
     for (let a of this.nodes)
@@ -340,8 +340,8 @@ let Y = class j {
         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);
+          for (const c of u)
+            t.set(c, (t.get(c) || 0) - 1), (t.get(c) || 0) === 0 && s.push(c);
       }
     }
     if (i.size !== this.nodes.size)
@@ -362,23 +362,23 @@ 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();
-        for (const [l, h] of this.edges)
-          h.has(d) && !f.has(l) && (f.add(l), c.push(l));
+    const s = new Set(e), i = (c) => !r || r.length === 0 || r.includes(this.nodeKinds.get(c) ?? void 0), n = () => {
+      const c = /* @__PURE__ */ new Set(), f = Array.from(s);
+      for (; f.length; ) {
+        const l = f.shift();
+        for (const [d, h] of this.edges)
+          h.has(l) && !c.has(d) && (c.add(d), f.push(d));
       }
-      return f;
+      return c;
     }, a = () => {
-      const f = /* @__PURE__ */ new Set(), c = Array.from(s);
-      for (; c.length; ) {
-        const d = c.shift(), l = this.edges.get(d);
-        if (l)
-          for (const h of l)
-            f.has(h) || (f.add(h), c.push(h));
+      const c = /* @__PURE__ */ new Set(), f = Array.from(s);
+      for (; f.length; ) {
+        const l = f.shift(), d = this.edges.get(l);
+        if (d)
+          for (const h of d)
+            c.has(h) || (c.add(h), f.push(h));
       }
-      return f;
+      return c;
     };
     let u;
     return t === "both" ? u = /* @__PURE__ */ new Set([...n(), ...a()]) : t === "upstream" ? u = a() : u = n(), Array.from(u).filter(i);
@@ -392,7 +392,7 @@ let Y = class j {
     return { nodes: e, edges: t };
   }
   static fromJSON(e) {
-    const t = new j();
+    const t = new B();
     for (const r of e.nodes)
       t.addNode(r.name, { kind: r.kind, meta: r.meta });
     for (const r of e.edges)
@@ -400,15 +400,15 @@ let 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 = [];
-    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 });
+    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((l) => !t.has(l)), i = Array.from(t).filter((l) => !r.has(l)), n = new Set(this.getAllEdges().map((l) => l.join("→"))), a = new Set(e.getAllEdges().map((l) => l.join("→"))), u = Array.from(a).filter((l) => !n.has(l)).map((l) => l.split("→")), c = Array.from(n).filter((l) => !a.has(l)).map((l) => l.split("→")), f = [];
+    for (const l of /* @__PURE__ */ new Set([...t, ...r])) {
+      const d = this.nodeKinds.get(l), h = e.nodeKinds.get(l);
+      d !== h && f.push({ name: l, from: d, to: h });
     }
-    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: f, kindChanges: c };
+    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: c, kindChanges: f };
   }
 };
-class Se {
+class Qe {
   graph;
   nodeIndex;
   constructor() {
@@ -800,7 +800,7 @@ class p {
   }
 }
 const X = new p();
-class Ie {
+class Me {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
@@ -842,8 +842,8 @@ class Ie {
         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 c of a)
+              if (u.has(c)) {
                 i = !0;
                 break;
               }
@@ -939,7 +939,7 @@ 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 Ne = (o, e = "") => `${o}#${e}`, ke = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Ce = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Ee = (o, e) => {
   const t = typeof e == "function" ? e : (r) => r[e];
   return [
     ...o.reduce((r, s) => {
@@ -947,7 +947,7 @@ const Qe = (o, e = "") => `${o}#${e}`, Me = (o) => `${o.gt}_${o.gte}_${o.lt}_${o
       return r.has(i) || r.set(i, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, Ce = (o, e) => o.reduce(function(t, r) {
+}, qe = (o, e) => o.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;
 }, {});
@@ -957,7 +957,7 @@ function ee(o = 10) {
   for (let r = 0; r < o; 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 Oe = (o) => o.replace(/\/+$/, ""), te = (o) => typeof o != "string" ? "" : o.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), $e = (o) => typeof o != "string" ? "" : o.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), Fe = (o, e) => {
   try {
     return re(o, e) >= 0;
   } catch {
@@ -974,7 +974,7 @@ const Ee = (o) => o.replace(/\/+$/, ""), te = (o) => typeof o != "string" ? "" :
   }
   return 0;
 }, F = (o) => /^\d+(\.\d+){0,2}$/.test(o);
-class $e {
+class Ge {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1000,7 +1000,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 = A.now(), e.duration = e.start - e.end), this.updateListener.forEach((t) => {
       t(e);
     });
   }
@@ -1015,12 +1015,12 @@ const P = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : m(o)
     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__"))
       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 d = {
+    const u = A.now(), c = u - r, f = Math.round(c * 1e3) / 1e3;
+    t.duration = f, t.start = r, t.end = u;
+    const l = {
       duration: t.duration
     };
-    return t.modelKey && (d.model = t.modelKey), t.connectMessageResult && (t.result = a), t.args && (d.args = t.args), e?.trigger(t), e.analyticsController.mark({
+    return t.modelKey && (l.model = t.modelKey), t.connectMessageResult && (t.result = a), t.args && (l.args = t.args), e?.trigger(t), e.analyticsController.mark({
       name: `${t.type}:end`,
       context: s
     }), e.analyticsController.measure({
@@ -1028,62 +1028,62 @@ const P = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : m(o)
       start: `${t.type}:start`,
       end: `${t.type}:end`,
       context: s,
-      detail: d
+      detail: l
     }), a;
   } catch {
     return i;
   }
-}, Fe = (o) => (t, r, s) => {
+}, Te = (o) => (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();
+    const a = A.now(), u = this.cdRef, c = P(o, !0);
+    c.key || (u.increaseCounter(), c.key = u.getCounter());
+    const f = ee();
     u.analyticsController.mark({
-      name: `${f.type}:start`,
-      context: c
+      name: `${c.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);
+    const l = this.model?.key;
+    !c.originCdRefKey && u.key && (c.originCdRefKey = u.key), l && (c.modelKey = l);
+    const d = i.apply(this, n);
+    return c.method = r, c.args = n, d && typeof d == "object" && "then" in d ? d.then((h) => G(this, u, c, a, f, h)) : G(this, u, c, a, f, d);
   }, s;
 };
-function Ge(o, e, t, r) {
+function je(o, 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;
+    const u = Array.from(a).some((f) => o.has(f)), c = t.transform ? r.transformValue(n, t.transform) : n;
     if (!(t.excludeUndefineds && typeof n > "u") && !(t.excludeNulls && n === null)) {
       if (u && (i === "" || i === "//")) {
-        const c = {
+        const f = {
           value: n,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(c);
+        s.push(f);
       } else if (u && typeof i == "string" && i.startsWith("/") && i.endsWith("/")) {
-        if (r.queryFind(f, i, "some")) {
-          const c = {
+        if (r.queryFind(c, i, "some")) {
+          const f = {
             value: n,
             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())) {
-          const l = {
+        const f = String(c ?? ""), l = i;
+        if (f.toLowerCase().startsWith(l.toLowerCase())) {
+          const d = {
             value: n,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
-          s.push(l);
+          s.push(d);
         }
-      } else if (u && r.queryFind(f, i, "some")) {
-        const c = {
+      } else if (u && r.queryFind(c, i, "some")) {
+        const f = {
           value: n,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(c);
+        s.push(f);
       }
       if (s.length === t.max)
         break;
@@ -1270,7 +1270,7 @@ class fe {
     this.graph.clear();
   }
 }
-class de {
+class le {
   parseCache;
   circularRefDetector;
   cacheHits = 0;
@@ -1306,8 +1306,8 @@ class de {
       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;
+          const c = e.indexOf(".", u + 1);
+          c > -1 ? t = e.substring(c + 1) : t = void 0;
         } else s && (t = e.substring(e.indexOf(".") + 1));
       } else s && (t = e.substring(e.indexOf(".") + 1));
     const a = {
@@ -1370,13 +1370,13 @@ class de {
     const n = /\[([^\]]+)\]/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}`);
+      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(/[^a-zA-Z0-9._[\]*-]/g);
+    return c && r.push(`Invalid characters in path: ${c.join(", ")} in ${e}`), {
       valid: r.length === 0,
       errors: r.length > 0 ? r : void 0
     };
@@ -1435,20 +1435,42 @@ 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 g = new le();
+function w(o, e) {
+  if (e.includes("[*]")) {
+    const i = e.indexOf("[*]"), n = e.substring(0, i), a = e.substring(i + 3), u = n ? D(o, n) : o;
+    if (!Array.isArray(u)) return [];
+    const c = [];
+    for (const f of u)
+      !a || a === "" ? f !== void 0 && c.push(f) : a.startsWith(".") && c.push(...w(f, a.slice(1)));
+    return c;
+  }
+  const t = e.split(".");
+  let r = [o];
+  for (const i of t) {
+    const n = [];
+    for (const a of r)
+      if (a != null)
+        if (Array.isArray(a))
+          for (const u of a) {
+            if (u == null) continue;
+            const c = u[i];
+            c !== void 0 && n.push(c);
+          }
+        else {
+          const u = a[i];
+          u !== void 0 && n.push(u);
+        }
+    if (r = n, r.length === 0) return [];
+  }
+  const s = [];
+  for (const i of r)
+    if (Array.isArray(i))
+      for (const n of i) n !== void 0 && s.push(n);
+    else i !== void 0 && s.push(i);
+  return s;
 }
-function K(o) {
+function S(o) {
   let e = 0;
   for (let t of o) {
     const r = t.toString().split(".")[1];
@@ -1456,10 +1478,10 @@ function K(o) {
   }
   return Math.pow(10, e);
 }
-function B(o, e, t) {
+function T(o, e, t) {
   return (o * t + e * t) / t;
 }
-function le(o, e, t) {
+function de(o, e, t) {
   return o * t / (e * t);
 }
 const M = (o, e, t, r) => {
@@ -1470,30 +1492,42 @@ const M = (o, e, t, r) => {
     types: o.types
   };
   let i;
-  (s.types.includes("sum") || s.types.includes("avg") || s.types.includes("count")) && (i = ge(r, e));
+  (s.types.includes("sum") || s.types.includes("avg")) && (i = ye(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));
+  return (s.types.includes("min") || s.types.includes("max")) && (n = pe(r, e)), o.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 = n && n[0] : a === "max" ? s.max = n && n[1] : a === "distinct" ? s.distinct = me(o, e, t) : a === "group" && (s.group = ge(o, e));
   }), s;
 }, he = (o, e) => {
+  const r = g.parse(o).isDeepQuery;
+  let s = 0;
+  for (const i of e.values())
+    if (i)
+      if (r)
+        s += w(i, o).filter((n) => n != null).length;
+      else {
+        const n = i[o];
+        if (n == null) continue;
+        Array.isArray(n) ? s += n.filter((a) => a != null).length : s++;
+      }
+  return s;
+}, pe = (o, 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);
+  for (const n of e.values()) {
+    if (!n) continue;
+    let a;
+    if (i)
+      a = w(n, o);
+    else {
+      const u = n[o];
+      u === void 0 ? a = [] : Array.isArray(u) ? a = u.filter((c) => c !== void 0) : a = [u];
     }
+    for (const u of a)
+      u == null || typeof u == "object" || ((t === void 0 || u < t) && (t = u), (r === void 0 || u > r) && (r = u));
+  }
   if (!(t === void 0 || r === void 0))
     return [t, r];
-}, pe = (o, e) => {
+}, ge = (o, e) => {
   const t = [];
   o.groupOptions?.groups?.forEach((n) => {
     t.push({
@@ -1509,45 +1543,38 @@ const M = (o, e, t, r) => {
   }, i = g.parse(o.attribute).isDeepQuery;
   for (const n 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]];
+    i ? a = w(n, o.attribute) : 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);
+    for (const c of a)
+      for (const f of t)
+        (typeof f.option.value < "u" && f.option.value.includes(c) || typeof f.option.from < "u" && f.option.from < c && typeof f.option.to < "u" && f.option.to > c) && (f.keys.includes(n.key) || (f.count++, f.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) => {
+}, ye = (o, 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)
+  for (const a of e.values()) {
+    if (!a) continue;
+    let u;
+    if (i)
+      u = w(a, o);
+    else {
+      const c = a[o];
+      c === void 0 ? u = [] : Array.isArray(c) ? u = c : u = [c];
+    }
+    for (const c of u)
       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++);
+        for (const f of c)
+          typeof f == "number" && (t = T(t, f, S([t, f])), r++);
+      else typeof c == "number" && (t = T(t, c, S([t, c])), r++);
   }
   return r === 0 ? void 0 : {
-    average: le(t, r, K([t, r])),
-    count: e.size,
+    average: de(t, r, S([t, r])),
+    count: r,
     sum: t
   };
-}, ye = (o, e, t) => {
+}, me = (o, e, t) => {
   const r = [];
   for (const [s, i] of t)
     if (!(o.excludeUndefineds && typeof s > "u") && Array.from(i).find((n) => e.has(n))) {
@@ -1560,14 +1587,14 @@ const M = (o, e, t, r) => {
     }
   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 z {
   _defaultQueryOptions = {
     modelKey: "",
     groupKey: "root",
@@ -1638,7 +1665,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: j(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();
@@ -1744,12 +1771,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)), 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();
       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.
@@ -2248,28 +2275,28 @@ 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 I = new z();
+function Pe(o, e, t, r, s, i, n) {
+  const a = [], u = I.removeQuery({ groupKey: s }, m(r)), c = n.queryData(o, u, !1, i), f = e ? [...e.keys()] : [], l = new Set(f), d = i.get(s);
   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 h of d.keys())
+      l.add(h);
+  t.excludeUndefineds ? l.delete(void 0) : l.add(void 0);
+  for (const h of l.values()) {
+    const y = /* @__PURE__ */ new Map(), W = d.get(h) || /* @__PURE__ */ new Set();
     for (const k of W) {
-      const C = f.get(k);
-      if (C && (b.set(k, C), !t?.calculateFacets))
+      const C = c.get(k);
+      if (C && (y.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,
+      selected: ve(s, h, r),
+      enabled: y.size > 0,
+      size: y.size,
       entry: e.get(h),
-      resultKeys: Array.from(b.keys())
+      resultKeys: Array.from(y.keys())
     };
     if (!(t?.excludeZeros && N.size === 0)) {
       if (t?.count && a.length === t?.count)
@@ -2279,7 +2306,7 @@ function Te(o, e, t, r, s, i, n) {
   }
   return a;
 }
-const me = (o, e, t) => {
+const ve = (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)) {
@@ -2289,7 +2316,7 @@ const me = (o, e, t) => {
     return !1;
   }) : !1;
 };
-class ve {
+class we {
   indexMap = /* @__PURE__ */ new Map();
   // Possible performance gain*
   dataMap = /* @__PURE__ */ new Map();
@@ -2359,9 +2386,9 @@ class ve {
     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);
+      for (const c of t.values()) {
+        let f;
+        u ? (f = w(c, e), f.length === 0 && (f = [void 0])) : f = [c[e]], this.fillInverseIndex(s, c.key, f), this.fillDataMap(s, f);
       }
       i = this.getIndex(s) || /* @__PURE__ */ new Map();
     }
@@ -2538,7 +2565,7 @@ class ve {
   }
 }
 const v = "__";
-function z(o, e, t = { key: "root" }, r = "root", s = new ve(), i) {
+function R(o, e, t = { key: "root" }, r = "root", s = new we(), i) {
   const n = i || o;
   for (const a of e.columns)
     a.attribute && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
@@ -2548,7 +2575,7 @@ function z(o, e, t = { key: "root" }, r = "root", s = new ve(), i) {
     a.attribute && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
   if (e.rows && e.rows.length > 0) {
     t.rows = t.rows || [];
-    const a = we(o, e.rows[0], e, s, r, i);
+    const a = xe(o, e.rows[0], e, s, r, i);
     t.rows.push(a);
   }
   if (e.columns && e.columns.length > 0) {
@@ -2565,46 +2592,46 @@ function z(o, e, t = { key: "root" }, r = "root", s = new ve(), i) {
     }
   return t;
 }
-function we(o, e, t, r, s = "", i) {
+function xe(o, e, t, r, s = "", i) {
   const n = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return n;
-  for (const [u, f] of a.entries()) {
-    const c = {
+  for (const [u, c] of a.entries()) {
+    const f = {
       key: u,
       value: u
-    }, d = /* @__PURE__ */ new Map();
-    for (const l of f)
-      o.has(l) && d.set(l, o.get(l));
-    if (d.size) {
-      for (const l of t.values) {
-        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
+    }, l = /* @__PURE__ */ new Map();
+    for (const d of c)
+      o.has(d) && l.set(d, o.get(d));
+    if (l.size) {
+      for (const d of t.values) {
+        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 = M(d, l, r.getIndex(d.attribute), d.attribute);
+        f.values.push(h);
       }
-      if (n.rows = n.rows || [], n.rows.push(c), t.rows.length > 1) {
-        const l = { ...t, rows: t.rows.slice(1) };
-        z(
-          d,
+      if (n.rows = n.rows || [], n.rows.push(f), t.rows.length > 1) {
+        const d = { ...t, rows: t.rows.slice(1) };
+        R(
           l,
-          c,
+          d,
+          f,
           s + v + e.attribute + v + u,
           r,
           i
         );
       } else if (t.columns)
-        for (const l of t.columns) {
-          c.columns = c.columns || [];
+        for (const d of t.columns) {
+          f.columns = f.columns || [];
           const h = _(
-            d,
             l,
+            d,
             t,
             r,
             s + v + e.attribute + v + u,
             i
           );
-          c.columns.push(h);
+          f.columns.push(h);
         }
     }
   }
@@ -2614,26 +2641,26 @@ function _(o, e, t, r, s = "", i) {
   const n = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return n;
-  for (const [u, f] of a.entries()) {
-    const c = {
+  for (const [u, c] of a.entries()) {
+    const f = {
       key: u,
       value: u
-    }, d = /* @__PURE__ */ new Map();
-    for (const l of f)
-      o.has(l) && d.set(l, o.get(l));
-    if (d.size) {
-      for (const l of t.values) {
-        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
+    }, l = /* @__PURE__ */ new Map();
+    for (const d of c)
+      o.has(d) && l.set(d, o.get(d));
+    if (l.size) {
+      for (const d of t.values) {
+        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 = M(d, l, r.getIndex(d.attribute), d.attribute);
+        f.values.push(h);
       }
-      if (n.columns = n.columns || [], n.columns.push(c), t.columns.length > 1) {
-        const l = { ...t, columns: t.columns.slice(1) };
-        z(
-          d,
+      if (n.columns = n.columns || [], n.columns.push(f), t.columns.length > 1) {
+        const d = { ...t, columns: t.columns.slice(1) };
+        R(
           l,
-          c,
+          d,
+          f,
           s + v + e.attribute + v + u,
           r,
           i
@@ -2643,31 +2670,32 @@ function _(o, e, t, r, s = "", i) {
   }
   return n;
 }
-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 Ae = (o) => o == null || o === "", ze = (o, e = !1) => {
+  const t = typeof e == "boolean" ? { deep: e } : e, s = t.deep ?? (t.sampleSize !== void 0 && t.sampleSize > 1) ? t.sampleSize ?? 1 / 0 : 1, i = t.ignoreEmpty ?? s > 1, n = [], a = Math.min(o.length, s);
+  for (let u = 0; u < a; u++) {
+    const c = o[u];
+    if (c)
+      for (const [f, l] of Object.entries(c)) {
+        if (i && Ae(l)) continue;
+        const d = Se(l), h = n.find((y) => y.key === f);
+        if (h)
+          h.type !== d && (h.type = "any");
+        else {
+          const y = {
+            key: f,
+            type: d
+          };
+          n.push(y);
+        }
       }
-    }
-    if (!e)
-      break;
   }
-  return t;
-}, xe = (o) => Number(o) === o && o % 1 === 0, Ae = (o) => Number(o) === o && o % 1 !== 0, be = (o) => {
+  return n;
+}, be = (o) => Number(o) === o && o % 1 === 0, De = (o) => Number(o) === o && o % 1 !== 0, Se = (o) => {
   switch (typeof o) {
     case "string":
       return "string";
     case "number":
-      return xe(o) ? "int" : Ae(o) ? "float" : "any";
+      return be(o) ? "int" : De(o) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
@@ -2675,7 +2703,7 @@ const je = (o, e) => {
     default:
       return "any";
   }
-}, Pe = (o, e) => {
+}, Re = (o, e) => {
   const t = te(o.text || ""), r = e?.attributeKey || o.filterKey;
   let s;
   const i = e?.comparisonType || "containsIgnoreCase";
@@ -2739,7 +2767,7 @@ const je = (o, e) => {
       }
     ]
   }), s;
-}, Re = (o, e) => {
+}, _e = (o, e) => {
   const t = e?.attributeKey || o.filterKey;
   return {
     groupKey: o.filterKey,
@@ -2752,7 +2780,7 @@ const je = (o, e) => {
       }
     ]
   };
-}, ze = (o, e) => {
+}, We = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2767,7 +2795,7 @@ const je = (o, e) => {
     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) => {
+}, Le = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2780,13 +2808,13 @@ const je = (o, e) => {
       operator: "eq"
     });
   }), r;
-}, We = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
-class Le {
+}, He = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
+class Ve {
   constructor(e, t, r) {
     this.scriptController = e, this.globalItemService = t, this.modelParser = r;
   }
   registeredCustomOperator = /* @__PURE__ */ new Map();
-  queryBuilder = new R();
+  queryBuilder = new z();
   registerCustomOperator(e, t) {
     this.registeredCustomOperator.set(e, t);
   }
@@ -2802,11 +2830,11 @@ class Le {
   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))
+    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 = D(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))
       return !1;
     switch (e.operator) {
       case "eq":
-        return e.options?.invert ? !O(r, s) : O(r, s);
+        return e.options?.invert ? !q(r, s) : q(r, s);
       case "find":
         return e.options?.invert ? !this.queryFind(r, s, i) : this.queryFind(r, s, i);
       case "lt":
@@ -2841,25 +2869,25 @@ class Le {
       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));
+          if (u.forEach((c) => {
+            r.has(c) && i.set(c, r.get(c));
           }), 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 c = O(Array.from(r.values()), Array.from(i.values()), "key"), f = /* @__PURE__ */ new Map();
+            return c.forEach((l) => {
+              f.set(l.key, l);
+            }), 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)
+      const c = this.queryBuilder.extractQueryAttributes({ queries: [t] });
+      if (c.some((f) => f.isDeepQuery)) {
+        const f = this.queryBuilder.getProjectionForAttributeEntries(
+          c.filter((l) => l.isDeepQuery)
         );
         u = this.globalItemService.getProjectedData(
-          c,
+          f,
           this.modelParser.models.get(e.modelKey),
           u
         );
@@ -2869,16 +2897,16 @@ class Le {
     return i;
   }
   equalRegexFn(e, t) {
-    if (typeof t == "string" && H(t, "/") && U(t, "/"))
+    if (typeof t == "string" && H(t, "/") && V(t, "/"))
       try {
         return new RegExp(t.slice(1, -1)).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((r) => b(r, t, this.equalRegexFn)) : typeof t == "object" ? U(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);
+    return Array.isArray(e) ? typeof t == "string" || typeof t == "number" || typeof t == "boolean" ? r === "some" ? e.some((s) => b(s, t, this.equalRegexFn)) : e.every((s) => b(s, t, this.equalRegexFn)) : !!J(e, t) : b(e, t, this.equalRegexFn);
   }
   validateQuery(e) {
     if (this.queryBuilder.isQuery(e)) {
@@ -2889,7 +2917,7 @@ class Le {
       return !0;
     } else {
       if (this.queryBuilder.isQueryGroup(e))
-        return T(e.queries, (t) => this.validateQuery(t));
+        return j(e.queries, (t) => this.validateQuery(t));
       throw new Error("invalid query - missing query or attribute");
     }
   }
@@ -2898,42 +2926,42 @@ class Le {
     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)
+        const c = this.queryBuilder.extractQueryAttributes({ queries: [t] });
+        if (c.some((d) => d.isDeepQuery)) {
+          const d = this.queryBuilder.getProjectionForAttributeEntries(
+            c.filter((h) => h.isDeepQuery)
           );
           u = this.globalItemService.getProjectedData(
-            l,
+            d,
             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 } };
+        const f = this.handleArrayStarQuery(t, u);
+        let l = !1;
+        for (const d of f.queries) {
+          const h = { ...d, options: { ...d.options, invert: !1 } };
           if (this.evaluateQuery(h, u)) {
-            d = !0;
+            l = !0;
             break;
           }
         }
-        d && (a.add(u.key), n || i.set(u.key, u));
+        l && (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);
+        for (const [u, c] of r)
+          a.has(u) || i.set(u, c);
     } else {
       if (t.operator === "eq")
         return this.evaluateEqOperator(e, t, r, s);
       for (let [n, a] of r) {
         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((c) => c.isDeepQuery)) {
+          const c = this.queryBuilder.getProjectionForAttributeEntries(
+            u.filter((f) => f.isDeepQuery)
           );
           a = this.globalItemService.getProjectedData(
-            f,
+            c,
             this.modelParser.models.get(e.modelKey),
             a
           );
@@ -2950,7 +2978,7 @@ class Le {
       queries: []
     };
     if (r !== -1) {
-      const i = e.attribute.substring(0, r), n = i.includes(".") ? y(t, i) : t[i];
+      const i = e.attribute.substring(0, r), n = i.includes(".") ? D(t, i) : t[i];
       if (Array.isArray(n))
         for (let a = 0; a < n.length; a++) {
           const u = e.attribute.replace("[*]", `[${a}]`);
@@ -2969,15 +2997,15 @@ class Le {
     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);
+      let c = /* @__PURE__ */ new Map();
+      if (this.queryBuilder.isQuery(u) ? c = this.getEvaluatedQueryDataset(e, u, a, i) : c = this.evaluateQueryGroup(e, u, a, s, i), n.size === 0 && (n = c), t.groupType === "or")
+        c.forEach((f) => {
+          n.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(n.values()), Array.from(c.values()), "key");
+        for (const l of f)
+          n.delete(l.key);
       }
       t.groupType === "and" ? a = n : a = r;
     }
@@ -3021,7 +3049,7 @@ class Le {
   //   }
   // }
 }
-class He {
+class Ue {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3064,10 +3092,10 @@ class He {
     return this.getScriptAsFn(e, i)(t, ...n);
   }
 }
-const Ue = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => y(e, r.trim(), ""))) : "", Ve = (o) => {
+const Je = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => D(e, r.trim(), ""))) : "", Ze = (o) => {
   const e = /* @__PURE__ */ new Set();
   return o.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
-}, Je = [
+}, Ye = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3079,7 +3107,7 @@ 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 = [
+], Xe = ["int", "float", "Array<int>", "Array<float>"], et = ["date", "Array<date>"], tt = [
   "eq",
   "find",
   "gt",
@@ -3091,57 +3119,57 @@ 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,
-  de as DeepQueryService,
+  Ie as AnalyticsController,
+  Qe as AttributeDependencyGraph,
+  Me as CacheController,
+  Ge as ChangeDetector,
+  et as DatePropertyTypes,
+  z as DcuplQueryBuilder,
+  tt as DcuplQueryOperatorsAsArray,
+  le as DeepQueryService,
   Y as DependencyGraph,
-  ve as IndicesController,
+  we as IndicesController,
   p as Logger,
-  Ze as NumberPropertyTypes,
-  Je as PropertyTypesAsArray,
-  Le as QueryManager,
-  He as ScriptController,
+  Xe as NumberPropertyTypes,
+  Ye as PropertyTypesAsArray,
+  Ve as QueryManager,
+  Ue as ScriptController,
   P as clone,
   re as compareVersions,
-  Ge as computeSuggestions,
+  je as computeSuggestions,
   g as deepQueryService,
   te as escapeRegExp,
-  Ue as evaluateTemplate,
-  Re as generateBooleanQuery,
+  Je as evaluateTemplate,
+  _e as generateBooleanQuery,
   ee as generateKey,
-  ze as generateNumberAndDateQuery,
-  _e as generateReferenceQuery,
-  Pe as generateTextQuery,
+  We as generateNumberAndDateQuery,
+  Le as generateReferenceQuery,
+  Re 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,
+  Ce as getDateConstraintUid,
+  Se as getDcuplPropertyTypeForNativeType,
+  w as getDeepPathValues,
+  me as getDistinct,
+  Pe as getFacets,
+  Ne as getFilterEntryId,
+  ke as getNumberConstraintUid,
+  ze as getPropertiesForData,
+  qe as groupBy,
+  Fe as hasMinimumVersion,
   se as isDateInstance,
-  Ae as isFloat,
-  xe as isInt,
+  De as isFloat,
+  be as isInt,
   ne as isValidDate,
-  We as isValidQueryStatement,
+  He 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
+  Ze as parseTemplate,
+  A as perf,
+  R as pivot,
+  Oe as removeTrailingSlash,
+  Te as trigger,
+  $e as unescapeRegExp,
+  Ee as uniqBy
 };
 //# sourceMappingURL=index.js.map