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

package/dist/esm/index.js

@@ -1,22 +1,22 @@
-import { cloneDeep as y, get as v, every as B, findIndex as C, size as W, isEqual as E, differenceBy as q, startsWith as L, endsWith as H, isEqualWith as b, isMatch as U, find as V } from "lodash-es";
-function I(o) {
-  const e = K(o);
-  return J(e);
+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);
+  return Z(e);
 }
-function K(o) {
+function S(o) {
   if (typeof o != "object" || o === null)
     return String(o);
   if (Array.isArray(o))
-    return "[" + o.map(K).join(",") + "]";
+    return "[" + o.map(S).join(",") + "]";
   const e = Object.keys(o).sort();
   let t = "{";
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
-    t += s + ":" + K(o[s]), r < e.length - 1 && (t += ",");
+    t += s + ":" + S(o[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
-function J(o) {
+function Z(o) {
   let e = 0;
   for (let t = 0; t < o.length; t++) {
     const r = o.charCodeAt(t);
@@ -41,7 +41,7 @@ const x = {
       return performance.getEntriesByType(o);
   }
 };
-class De {
+class Ke {
   data;
   enabled = !1;
   constructor() {
@@ -71,11 +71,11 @@ class De {
       return;
     const i = s.value - r.value, n = Math.round(i * 100) / 100, a = this.data.get(t);
     if (a && e.sum) {
-      const c = a.value + n, f = {
+      const f = a.value + n, c = {
         ...a,
-        value: c
+        value: f
       };
-      return this.data.set(t, f), f;
+      return this.data.set(t, c), c;
     }
     const u = {
       name: e.name,
@@ -114,11 +114,11 @@ class De {
   getKey(e, t) {
     if (!t)
       return e;
-    const r = I(t);
+    const r = Q(t);
     return e + "_" + r;
   }
 }
-let Z = class T {
+let Y = class j {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -253,8 +253,8 @@ let Z = class T {
       r.add(a);
       const u = this.edges.get(a);
       if (u)
-        for (let c of u)
-          n(c);
+        for (let f of u)
+          n(f);
       r.delete(a), t.add(a), s.push(a);
     };
     for (let a of this.nodes)
@@ -340,8 +340,8 @@ let Z = class T {
         i.add(a);
         const u = this.edges.get(a);
         if (u)
-          for (const c of u)
-            t.set(c, (t.get(c) || 0) - 1), (t.get(c) || 0) === 0 && s.push(c);
+          for (const f of u)
+            t.set(f, (t.get(f) || 0) - 1), (t.get(f) || 0) === 0 && s.push(f);
       }
     }
     if (i.size !== this.nodes.size)
@@ -362,23 +362,23 @@ let Z = class T {
    *  - 'both': union of upstream and downstream
    */
   getImpactedNodes(e, t = "downstream", r) {
-    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 d = f.shift();
+    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) && !c.has(l) && (c.add(l), f.push(l));
+          h.has(d) && !f.has(l) && (f.add(l), c.push(l));
       }
-      return c;
+      return f;
     }, a = () => {
-      const c = /* @__PURE__ */ new Set(), f = Array.from(s);
-      for (; f.length; ) {
-        const d = f.shift(), l = this.edges.get(d);
+      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)
-            c.has(h) || (c.add(h), f.push(h));
+            f.has(h) || (f.add(h), c.push(h));
       }
-      return c;
+      return f;
     };
     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 Z = class T {
     return { nodes: e, edges: t };
   }
   static fromJSON(e) {
-    const t = new T();
+    const t = new j();
     for (const r of e.nodes)
       t.addNode(r.name, { kind: r.kind, meta: r.meta });
     for (const r of e.edges)
@@ -400,19 +400,19 @@ let Z = class T {
     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("→")), c = Array.from(n).filter((d) => !a.has(d)).map((d) => d.split("→")), f = [];
+    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((d) => !t.has(d)), 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 && f.push({ name: d, from: l, to: h });
+      l !== h && c.push({ name: d, from: l, to: h });
     }
-    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: c, kindChanges: f };
+    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: f, kindChanges: c };
   }
 };
-class Ke {
+class Se {
   graph;
   nodeIndex;
   constructor() {
-    this.graph = new Z(), this.nodeIndex = /* @__PURE__ */ new Map();
+    this.graph = new Y(), this.nodeIndex = /* @__PURE__ */ new Map();
   }
   /**
    * Creates a unique ID for an attribute node
@@ -600,7 +600,7 @@ class Ke {
     };
   }
 }
-const O = {
+const $ = {
   silent: 0,
   error: 1,
   warn: 2,
@@ -663,7 +663,7 @@ class p {
   }
   shouldLog(e) {
     const t = this.getEffectiveLevel();
-    return O[e] <= O[t];
+    return $[e] <= $[t];
   }
   formatMessage(e) {
     if (this.config.format === "json") {
@@ -799,8 +799,8 @@ class p {
     Object.assign(this.config, e);
   }
 }
-const Y = new p();
-class Se {
+const X = new p();
+class Ie {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
@@ -810,7 +810,7 @@ class Se {
   // Track cache hits and misses for statistics
   hitCount = 0;
   missCount = 0;
-  log = Y.child({ prefix: "CacheController" });
+  log = X.child({ prefix: "CacheController" });
   get(e, t) {
     if (!this.enabled) return;
     const r = this.getCacheName(e, t);
@@ -842,8 +842,8 @@ class Se {
         if (s.models.has(n))
           if (s.modelAttributes.has(n)) {
             const u = s.modelAttributes.get(n);
-            for (const c of a)
-              if (u.has(c)) {
+            for (const f of a)
+              if (u.has(f)) {
                 i = !0;
                 break;
               }
@@ -915,13 +915,13 @@ class Se {
   }
   generateContext(e) {
     try {
-      return y(e);
+      return m(e);
     } catch (t) {
       return this.log.error("Error in cache generateContext", t), e;
     }
   }
   getCacheName(e, t) {
-    const r = I(t);
+    const r = Q(t);
     return e + "_" + r;
   }
   /**
@@ -939,7 +939,7 @@ class Se {
     };
   }
 }
-const Ie = (o, e = "") => `${o}#${e}`, Qe = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Me = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Ne = (o, e) => {
+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 t = typeof e == "function" ? e : (r) => r[e];
   return [
     ...o.reduce((r, s) => {
@@ -947,24 +947,24 @@ const Ie = (o, e = "") => `${o}#${e}`, Qe = (o) => `${o.gt}_${o.gte}_${o.lt}_${o
       return r.has(i) || r.set(i, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, ke = (o, e) => o.reduce(function(t, r) {
+}, Ce = (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;
 }, {});
-function X(o = 10) {
+function ee(o = 10) {
   let e = "";
   const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   for (let r = 0; r < o; r++) e += t.charAt(Math.floor(Math.random() * t.length));
   return e;
 }
-const Ce = (o) => o.replace(/\/+$/, ""), ee = (o) => typeof o != "string" ? "" : o.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), Ee = (o) => typeof o != "string" ? "" : o.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), qe = (o, 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) => {
   try {
-    return te(o, e) >= 0;
+    return re(o, e) >= 0;
   } catch {
     return !1;
   }
-}, te = (o, e) => {
-  if (!$(o) || !$(e))
+}, 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);
   for (let s = 0; s < 3; s++) {
@@ -973,8 +973,8 @@ const Ce = (o) => o.replace(/\/+$/, ""), ee = (o) => typeof o != "string" ? "" :
     if (i < n) return -1;
   }
   return 0;
-}, $ = (o) => /^\d+(\.\d+){0,2}$/.test(o);
-class Oe {
+}, F = (o) => /^\d+(\.\d+){0,2}$/.test(o);
+class $e {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1010,13 +1010,13 @@ class Oe {
     };
   }
 }
-const j = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : y(o) : o, F = (o, e, t, r, s, i) => {
+const P = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : m(o) : o, G = (o, e, t, r, s, i) => {
   try {
-    const n = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = j(i, n);
+    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(), c = u - r, f = Math.round(c * 1e3) / 1e3;
-    t.duration = f, t.start = r, t.end = u;
+    const u = x.now(), f = u - r, c = Math.round(f * 1e3) / 1e3;
+    t.duration = c, t.start = r, t.end = u;
     const d = {
       duration: t.duration
     };
@@ -1033,57 +1033,57 @@ const j = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : y(o)
   } catch {
     return i;
   }
-}, $e = (o) => (t, r, s) => {
+}, Fe = (o) => (t, r, s) => {
   const i = s.value;
   return s.value = function(...n) {
-    const a = x.now(), u = this.cdRef, c = j(o, !0);
-    c.key || (u.increaseCounter(), c.key = u.getCounter());
-    const f = X();
+    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: `${c.type}:start`,
-      context: f
+      name: `${f.type}:start`,
+      context: c
     });
     const d = this.model?.key;
-    !c.originCdRefKey && u.key && (c.originCdRefKey = u.key), d && (c.modelKey = d);
+    !f.originCdRefKey && u.key && (f.originCdRefKey = u.key), d && (f.modelKey = d);
     const l = i.apply(this, n);
-    return c.method = r, c.args = n, l && typeof l == "object" && "then" in l ? l.then((h) => F(this, u, c, a, f, h)) : F(this, u, c, a, f, l);
+    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);
   }, s;
 };
-function Fe(o, e, t, r) {
+function Ge(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((f) => o.has(f)), c = t.transform ? r.transformValue(n, t.transform) : n;
+    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 f = {
+        const c = {
           value: n,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(f);
+        s.push(c);
       } else if (u && typeof i == "string" && i.startsWith("/") && i.endsWith("/")) {
-        if (r.queryFind(c, i, "some")) {
-          const f = {
+        if (r.queryFind(f, i, "some")) {
+          const c = {
             value: n,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
-          s.push(f);
+          s.push(c);
         }
       } else if (u && typeof i == "string") {
-        const f = String(c ?? ""), d = i;
-        if (f.toLowerCase().startsWith(d.toLowerCase())) {
+        const c = String(f ?? ""), d = i;
+        if (c.toLowerCase().startsWith(d.toLowerCase())) {
           const l = {
             value: n,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
           s.push(l);
         }
-      } else if (u && r.queryFind(c, i, "some")) {
-        const f = {
+      } else if (u && r.queryFind(f, i, "some")) {
+        const c = {
           value: n,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
-        s.push(f);
+        s.push(c);
       }
       if (s.length === t.max)
         break;
@@ -1091,13 +1091,13 @@ function Fe(o, e, t, r) {
   }
   return s;
 }
-function re(o) {
+function se(o) {
   return o instanceof Date;
 }
-function se(o) {
+function ne(o) {
   return o instanceof Date && !isNaN(o.getTime());
 }
-const ne = {
+const ie = {
   yyyy: { type: "year", pattern: "yyyy", regex: "(\\d{4})" },
   yy: { type: "year", pattern: "yy", regex: "(\\d{2})" },
   MM: { type: "month", pattern: "MM", regex: "(\\d{2})" },
@@ -1112,11 +1112,11 @@ const ne = {
   s: { type: "second", pattern: "s", regex: "(\\d{1,2})" },
   SSS: { type: "millisecond", pattern: "SSS", regex: "(\\d{3})" }
 };
-function ie(o) {
+function oe(o) {
   let e = "^";
   const t = [];
   let r = o;
-  const s = Object.entries(ne).sort((i, n) => n[0].length - i[0].length);
+  const s = Object.entries(ie).sort((i, n) => n[0].length - i[0].length);
   for (; r.length > 0; ) {
     let i = !1;
     for (const [n, a] of s)
@@ -1133,7 +1133,7 @@ function ie(o) {
   }
   return e += "$", { regex: new RegExp(e), tokenOrder: t };
 }
-function oe(o, e) {
+function ae(o, e) {
   const t = {
     year: 1970,
     month: 1,
@@ -1152,7 +1152,7 @@ function oe(o, e) {
   }
   return t;
 }
-function ae(o) {
+function ue(o) {
   if (o.month < 1 || o.month > 12)
     return /* @__PURE__ */ new Date(NaN);
   if (o.day < 1 || o.day > 31)
@@ -1174,9 +1174,9 @@ function ae(o) {
     o.second,
     o.millisecond
   );
-  return se(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() !== o.year || e.getMonth() !== o.month - 1 || e.getDate() !== o.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
 }
-function Ge(o, e, t) {
+function Be(o, e, t) {
   if (o = o.trim(), e === "t") {
     const a = Number(o);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a * 1e3);
@@ -1185,13 +1185,13 @@ function Ge(o, e, t) {
     const a = Number(o);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a);
   }
-  const { regex: r, tokenOrder: s } = ie(e), i = o.match(r);
+  const { regex: r, tokenOrder: s } = oe(e), i = o.match(r);
   if (!i)
     return /* @__PURE__ */ new Date(NaN);
-  const n = oe(i, s);
-  return ae(n);
+  const n = ae(i, s);
+  return ue(n);
 }
-class ue {
+class ce {
   cache;
   maxSize;
   accessOrder;
@@ -1234,7 +1234,7 @@ class ue {
     };
   }
 }
-class ce {
+class fe {
   graph;
   constructor() {
     this.graph = /* @__PURE__ */ new Map();
@@ -1270,13 +1270,13 @@ class ce {
     this.graph.clear();
   }
 }
-class fe {
+class de {
   parseCache;
   circularRefDetector;
   cacheHits = 0;
   cacheMisses = 0;
   constructor(e = 1e3) {
-    this.parseCache = new ue(e), this.circularRefDetector = new ce();
+    this.parseCache = new ce(e), this.circularRefDetector = new fe();
   }
   /**
    * Parse an attribute string into its components
@@ -1306,8 +1306,8 @@ class fe {
       if (r = e.split(/[.[]/)[0], i) {
         const u = e.indexOf("]");
         if (u > -1) {
-          const c = e.indexOf(".", u + 1);
-          c > -1 ? t = e.substring(c + 1) : t = void 0;
+          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 a = {
@@ -1370,13 +1370,13 @@ class fe {
     const n = /\[([^\]]+)\]/g;
     let a;
     for (; (a = n.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 c = a[1];
+      c && c !== "*" && !/^\d+$/.test(c) && r.push(`Invalid bracket content: Must be a number or '*', got '${c}' 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 c = e.match(/[^a-zA-Z0-9._[\]*-]/g);
-    return c && r.push(`Invalid characters in path: ${c.join(", ")} in ${e}`), {
+    const f = e.match(/[^a-zA-Z0-9._[\]*-]/g);
+    return f && r.push(`Invalid characters in path: ${f.join(", ")} in ${e}`), {
       valid: r.length === 0,
       errors: r.length > 0 ? r : void 0
     };
@@ -1435,8 +1435,20 @@ class fe {
     return this.getPathSegments(e).length;
   }
 }
-const g = new fe();
-function D(o) {
+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;
+}
+function K(o) {
   let e = 0;
   for (let t of o) {
     const r = t.toString().split(".")[1];
@@ -1444,13 +1456,13 @@ function D(o) {
   }
   return Math.pow(10, e);
 }
-function G(o, e, t) {
+function B(o, e, t) {
   return (o * t + e * t) / t;
 }
-function de(o, e, t) {
+function le(o, e, t) {
   return o * t / (e * t);
 }
-const Q = (o, e, t, r) => {
+const M = (o, e, t, r) => {
   if (!r)
     throw new Error("Attribute not found");
   const s = {
@@ -1458,22 +1470,30 @@ const Q = (o, e, t, r) => {
     types: o.types
   };
   let i;
-  (s.types.includes("sum") || s.types.includes("avg") || s.types.includes("count")) && (i = pe(r, e));
+  (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 = le(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 = ge(o, e, t) : a === "group" && (s.group = he(o, e));
+  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;
-}, le = (o, e) => {
+}, he = (o, e) => {
   let t, r;
   const i = g.parse(o).isDeepQuery;
   for (const n of e.values())
     if (n) {
-      const a = i ? v(n, o) : n[o];
-      (t === void 0 || a < t) && (t = a), (r === void 0 || a > r) && (r = a);
+      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);
     }
   if (!(t === void 0 || r === void 0))
     return [t, r];
-}, he = (o, e) => {
+}, pe = (o, e) => {
   const t = [];
   o.groupOptions?.groups?.forEach((n) => {
     t.push({
@@ -1488,28 +1508,46 @@ const Q = (o, e, t, r) => {
     keys: []
   }, i = g.parse(o.attribute).isDeepQuery;
   for (const n of e.values()) {
-    const a = i ? v(n, o.attribute) : n[o.attribute];
-    for (const u of t)
-      typeof u.option.value < "u" && u.option.value.includes(a) || typeof u.option.from < "u" && u.option.from < a && typeof u.option.to < "u" && u.option.to > a ? (u.count++, u.keys.push(n.key)) : o?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(n.key));
+    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;
-}, pe = (o, e) => {
+}, ge = (o, e) => {
   let t = 0, r = 0;
   const i = g.parse(o).isDeepQuery;
   for (const u of e.values()) {
     if (!u) continue;
-    const c = i ? v(u, o) : u[o];
-    if (Array.isArray(c))
-      for (const f of c)
-        typeof f == "number" && (t = G(t, f, D([t, f])), r++);
-    else typeof c == "number" && (t = G(t, c, D([t, c])), r++);
-  }
-  return r === 0 || r === 0 ? void 0 : {
-    average: de(t, r, D([t, r])),
+    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++);
+  }
+  return r === 0 ? void 0 : {
+    average: le(t, r, K([t, r])),
     count: e.size,
     sum: t
   };
-}, ge = (o, e, t) => {
+}, ye = (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))) {
@@ -1529,7 +1567,7 @@ class w extends Error {
     super(r), this.query = t, this.name = "DcuplQueryError";
   }
 }
-class P {
+class R {
   _defaultQueryOptions = {
     modelKey: "",
     groupKey: "root",
@@ -1537,7 +1575,7 @@ class P {
     queries: []
   };
   _initOptions;
-  currentQuery = y(this._defaultQueryOptions);
+  currentQuery = m(this._defaultQueryOptions);
   deepQueryService;
   constructor(e) {
     this.deepQueryService = e || g;
@@ -1566,7 +1604,7 @@ class P {
    * });
    */
   init(e) {
-    this._initOptions = y(e), this.currentQuery = y(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 = y(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 = 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));
   }
   reset() {
     return this.init(this._initOptions), this.getQuery();
@@ -1584,7 +1622,7 @@ class P {
     return this.currentQuery.queries.find((t) => this.isQueryGroup(t) && t.groupKey === e);
   }
   getQuery() {
-    return y(this.currentQuery);
+    return m(this.currentQuery);
   }
   hasQueryGroup(e) {
     return this.currentQuery.queries.some((t) => this.isQueryGroup(t) && t.groupKey === e);
@@ -1600,7 +1638,7 @@ class P {
   }
   validate(e) {
     const t = e.queries.map((s) => this.validateQuery(s));
-    return { valid: B(t, (s) => s.valid), errors: t.map((s) => s.errors).flat() };
+    return { valid: T(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();
@@ -1682,7 +1720,7 @@ class P {
         (s) => this.isQueryGroup(s) && s.groupKey === e.attribute
       );
       if (r > -1) {
-        const s = t.queries[r], i = C(s.queries, e);
+        const s = t.queries[r], i = E(s.queries, e);
         i > -1 && s.queries.splice(i, 1), s.queries.length === 0 && t.queries.splice(r, 1);
       }
     } else if (this.isQueryGroup(e)) {
@@ -1695,7 +1733,7 @@ class P {
         else {
           const s = t.queries[r];
           for (const i of e.queries) {
-            const n = C(s.queries, i);
+            const n = E(s.queries, i);
             n > -1 && s.queries.splice(n, 1);
           }
           s.queries.length === 0 && t.queries.splice(r, 1);
@@ -2210,48 +2248,48 @@ class P {
     return e(this.currentQuery.queries);
   }
 }
-const S = new P();
-function Be(o, e, t, r, s, i, n) {
-  const a = [], u = S.removeQuery({ groupKey: s }, y(r)), c = n.queryData(o, u, !1, i), f = e ? [...e.keys()] : [], d = new Set(f), l = i.get(s);
+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);
   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 A = /* @__PURE__ */ new Map(), _ = l.get(h) || /* @__PURE__ */ new Set();
-    for (const N of _) {
-      const k = c.get(N);
-      if (k && (A.set(N, k), !t?.calculateFacets))
+    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 M = {
+    const N = {
       key: String(h),
       value: h,
-      selected: ye(s, h, r),
-      enabled: A.size > 0,
-      size: A.size,
+      selected: me(s, h, r),
+      enabled: b.size > 0,
+      size: b.size,
       entry: e.get(h),
-      resultKeys: Array.from(A.keys())
+      resultKeys: Array.from(b.keys())
     };
-    if (!(t?.excludeZeros && M.size === 0)) {
+    if (!(t?.excludeZeros && N.size === 0)) {
       if (t?.count && a.length === t?.count)
         return a;
-      a.push(M);
+      a.push(N);
     }
   }
   return a;
 }
-const ye = (o, e, t) => {
-  const r = t.queries.findIndex((s) => S.isQueryGroup(s) && s.groupKey === o);
+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 (S.isQuery(i)) {
+    if (I.isQuery(i)) {
       const n = i.value?.key || i.value;
       return i.attribute === o && n === e;
     }
     return !1;
   }) : !1;
 };
-class me {
+class ve {
   indexMap = /* @__PURE__ */ new Map();
   // Possible performance gain*
   dataMap = /* @__PURE__ */ new Map();
@@ -2321,16 +2359,16 @@ class me {
     if (!i) {
       this.reset(s), this.indexMap.set(s, /* @__PURE__ */ new Map());
       const u = g.parse(e).isDeepQuery;
-      for (const c of t.values()) {
-        const f = u ? v(c, e) : c[e];
-        this.fillInverseIndex(s, c.key, [f]), this.fillDataMap(s, [f]);
+      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);
       }
       i = this.getIndex(s) || /* @__PURE__ */ new Map();
     }
     return i;
   }
   getIndexName(e, t) {
-    return t ? e + "_" + I(t) : e;
+    return t ? e + "_" + Q(t) : e;
   }
   // ========== PARTIAL UPDATE METHODS ==========
   /**
@@ -2499,8 +2537,8 @@ class me {
     };
   }
 }
-const m = "__";
-function R(o, e, t = { key: "root" }, r = "root", s = new me(), i) {
+const v = "__";
+function z(o, e, t = { key: "root" }, r = "root", s = new ve(), i) {
   const n = i || o;
   for (const a of e.columns)
     a.attribute && (g.parse(a.attribute), s.getOrCreateIndex(a.attribute, n));
@@ -2510,93 +2548,93 @@ function R(o, e, t = { key: "root" }, r = "root", s = new me(), 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 = ve(o, e.rows[0], e, s, r, i);
+    const a = we(o, e.rows[0], e, s, r, i);
     t.rows.push(a);
   }
   if (e.columns && e.columns.length > 0) {
     t.columns = t.columns || [];
-    const a = z(o, e.columns[0], e, s, r, i);
+    const a = _(o, 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 = Q(a, o, s.getIndex(a.attribute), a.attribute);
+      const u = M(a, o, s.getIndex(a.attribute), a.attribute);
       t.values.push(u);
     }
   return t;
 }
-function ve(o, e, t, r, s = "", i) {
+function we(o, e, t, r, s = "", i) {
   const n = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return n;
-  for (const [u, c] of a.entries()) {
-    const f = {
+  for (const [u, f] of a.entries()) {
+    const c = {
       key: u,
       value: u
     }, d = /* @__PURE__ */ new Map();
-    for (const l of c)
+    for (const l of f)
       o.has(l) && d.set(l, o.get(l));
     if (d.size) {
       for (const l of t.values) {
-        if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
+        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = Q(l, d, r.getIndex(l.attribute), l.attribute);
-        f.values.push(h);
+        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
+        c.values.push(h);
       }
-      if (n.rows = n.rows || [], n.rows.push(f), t.rows.length > 1) {
+      if (n.rows = n.rows || [], n.rows.push(c), t.rows.length > 1) {
         const l = { ...t, rows: t.rows.slice(1) };
-        R(
+        z(
           d,
           l,
-          f,
-          s + m + e.attribute + m + u,
+          c,
+          s + v + e.attribute + v + u,
           r,
           i
         );
       } else if (t.columns)
         for (const l of t.columns) {
-          f.columns = f.columns || [];
-          const h = z(
+          c.columns = c.columns || [];
+          const h = _(
             d,
             l,
             t,
             r,
-            s + m + e.attribute + m + u,
+            s + v + e.attribute + v + u,
             i
           );
-          f.columns.push(h);
+          c.columns.push(h);
         }
     }
   }
   return n;
 }
-function z(o, e, t, r, s = "", i) {
+function _(o, e, t, r, s = "", i) {
   const n = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return n;
-  for (const [u, c] of a.entries()) {
-    const f = {
+  for (const [u, f] of a.entries()) {
+    const c = {
       key: u,
       value: u
     }, d = /* @__PURE__ */ new Map();
-    for (const l of c)
+    for (const l of f)
       o.has(l) && d.set(l, o.get(l));
     if (d.size) {
       for (const l of t.values) {
-        if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
+        if (c.values = c.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = Q(l, d, r.getIndex(l.attribute), l.attribute);
-        f.values.push(h);
+        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
+        c.values.push(h);
       }
-      if (n.columns = n.columns || [], n.columns.push(f), t.columns.length > 1) {
+      if (n.columns = n.columns || [], n.columns.push(c), t.columns.length > 1) {
         const l = { ...t, columns: t.columns.slice(1) };
-        R(
+        z(
           d,
           l,
-          f,
-          s + m + e.attribute + m + u,
+          c,
+          s + v + e.attribute + v + u,
           r,
           i
         );
@@ -2605,11 +2643,11 @@ function z(o, e, t, r, s = "", i) {
   }
   return n;
 }
-const Te = (o, e) => {
+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 = Ae(i);
+      const n = t.find((u) => u.key === s), a = be(i);
       if (n)
         n.type !== a && (n.type = "any");
       else {
@@ -2624,21 +2662,21 @@ const Te = (o, e) => {
       break;
   }
   return t;
-}, we = (o) => Number(o) === o && o % 1 === 0, xe = (o) => Number(o) === o && o % 1 !== 0, Ae = (o) => {
+}, xe = (o) => Number(o) === o && o % 1 === 0, Ae = (o) => Number(o) === o && o % 1 !== 0, be = (o) => {
   switch (typeof o) {
     case "string":
       return "string";
     case "number":
-      return we(o) ? "int" : xe(o) ? "float" : "any";
+      return xe(o) ? "int" : Ae(o) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
-      return re(o) ? "date" : "json";
+      return se(o) ? "date" : "json";
     default:
       return "any";
   }
-}, je = (o, e) => {
-  const t = ee(o.text || ""), r = e?.attributeKey || o.filterKey;
+}, Pe = (o, e) => {
+  const t = te(o.text || ""), r = e?.attributeKey || o.filterKey;
   let s;
   const i = e?.comparisonType || "containsIgnoreCase";
   return i === "containsIgnoreCase" ? s = {
@@ -2701,7 +2739,7 @@ const Te = (o, e) => {
       }
     ]
   }), s;
-}, Pe = (o, e) => {
+}, Re = (o, e) => {
   const t = e?.attributeKey || o.filterKey;
   return {
     groupKey: o.filterKey,
@@ -2714,7 +2752,7 @@ const Te = (o, e) => {
       }
     ]
   };
-}, Re = (o, e) => {
+}, ze = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2729,7 +2767,7 @@ const Te = (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;
-}, ze = (o, e) => {
+}, _e = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2742,13 +2780,13 @@ const Te = (o, e) => {
       operator: "eq"
     });
   }), r;
-}, _e = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
-class We {
+}, We = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
+class Le {
   constructor(e, t, r) {
     this.scriptController = e, this.globalItemService = t, this.modelParser = r;
   }
   registeredCustomOperator = /* @__PURE__ */ new Map();
-  queryBuilder = new P();
+  queryBuilder = new R();
   registerCustomOperator(e, t) {
     this.registeredCustomOperator.set(e, t);
   }
@@ -2764,11 +2802,11 @@ class We {
   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 = v(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 = 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))
       return !1;
     switch (e.operator) {
       case "eq":
-        return e.options?.invert ? !E(r, s) : E(r, s);
+        return e.options?.invert ? !O(r, s) : O(r, s);
       case "find":
         return e.options?.invert ? !this.queryFind(r, s, i) : this.queryFind(r, s, i);
       case "lt":
@@ -2784,7 +2822,7 @@ class We {
       case "isTruthy":
         return s === !0 ? Array.isArray(r) ? i === "some" ? r.some((n) => typeof !!n) : r.every((n) => typeof !!n) : !!r : !r;
       case "size":
-        return typeof r == "string" ? r.length === s : W(r) === s;
+        return typeof r == "string" ? r.length === s : L(r) === s;
       default:
         if (this.scriptController.hasScript(e.operator))
           return this.scriptController.executeScript(e.operator, "operator", { query: e, item: t });
@@ -2803,25 +2841,25 @@ class We {
       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((c) => {
-            r.has(c) && i.set(c, r.get(c));
+          if (u.forEach((f) => {
+            r.has(f) && i.set(f, r.get(f));
           }), t.options?.invert) {
-            const c = q(Array.from(r.values()), Array.from(i.values()), "key"), f = /* @__PURE__ */ new Map();
-            return c.forEach((d) => {
-              f.set(d.key, d);
-            }), f;
+            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;
           } else
             return i;
       }
     }
     for (let [a, u] of r) {
-      const c = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-      if (c.some((f) => f.isDeepQuery)) {
-        const f = this.queryBuilder.getProjectionForAttributeEntries(
-          c.filter((d) => d.isDeepQuery)
+      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(
-          f,
+          c,
           this.modelParser.models.get(e.modelKey),
           u
         );
@@ -2831,16 +2869,16 @@ class We {
     return i;
   }
   equalRegexFn(e, t) {
-    if (typeof t == "string" && L(t, "/") && H(t, "/"))
+    if (typeof t == "string" && H(t, "/") && U(t, "/"))
       try {
         return new RegExp(t.slice(1, -1)).test(e);
       } catch {
         return !1;
       }
-    else return Array.isArray(e) ? !!e.find((r) => b(r, t, this.equalRegexFn)) : typeof t == "object" ? U(e, t) : e === t;
+    else return Array.isArray(e) ? !!e.find((r) => D(r, t, this.equalRegexFn)) : typeof t == "object" ? V(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) => b(s, t, this.equalRegexFn)) : e.every((s) => b(s, t, this.equalRegexFn)) : !!V(e, t) : b(e, t, this.equalRegexFn);
+    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);
   }
   validateQuery(e) {
     if (this.queryBuilder.isQuery(e)) {
@@ -2851,40 +2889,51 @@ class We {
       return !0;
     } else {
       if (this.queryBuilder.isQueryGroup(e))
-        return B(e.queries, (t) => this.validateQuery(t));
+        return T(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("[*]"))
-      for (let n of r.values()) {
-        const a = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-        if (a.some((c) => c.isDeepQuery)) {
-          const c = this.queryBuilder.getProjectionForAttributeEntries(
-            a.filter((f) => f.isDeepQuery)
+    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)
           );
-          n = this.globalItemService.getProjectedData(
-            c,
+          u = this.globalItemService.getProjectedData(
+            l,
             this.modelParser.models.get(e.modelKey),
-            n
+            u
           );
         }
-        const u = this.handleArrayStarQuery(t, n);
-        for (const c of u.queries)
-          this.evaluateQuery(c, n) && i.set(n.key, n);
+        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));
       }
-    else {
+      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 u = this.queryBuilder.extractQueryAttributes({ queries: [t] });
-        if (u.some((c) => c.isDeepQuery)) {
-          const c = this.queryBuilder.getProjectionForAttributeEntries(
-            u.filter((f) => f.isDeepQuery)
+        if (u.some((f) => f.isDeepQuery)) {
+          const f = this.queryBuilder.getProjectionForAttributeEntries(
+            u.filter((c) => c.isDeepQuery)
           );
           a = this.globalItemService.getProjectedData(
-            c,
+            f,
             this.modelParser.models.get(e.modelKey),
             a
           );
@@ -2901,14 +2950,15 @@ class We {
       queries: []
     };
     if (r !== -1) {
-      const i = e.attribute.substring(0, r), n = t[i];
+      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}]`);
           s.queries.push({
             attribute: u,
             operator: e.operator,
-            value: e.value
+            value: e.value,
+            options: e.options
           });
         }
     }
@@ -2919,14 +2969,14 @@ class We {
     if (!t.queries || t.queries?.length === 0)
       return a;
     for (const u of t.queries) {
-      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);
+      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);
         });
       else {
-        const f = q(Array.from(n.values()), Array.from(c.values()), "key");
-        for (const d of f)
+        const c = q(Array.from(n.values()), Array.from(f.values()), "key");
+        for (const d of c)
           n.delete(d.key);
       }
       t.groupType === "and" ? a = n : a = r;
@@ -2971,7 +3021,7 @@ class We {
   //   }
   // }
 }
-class Le {
+class He {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3014,10 +3064,10 @@ class Le {
     return this.getScriptAsFn(e, i)(t, ...n);
   }
 }
-const He = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => v(e, r.trim(), ""))) : "", Ue = (o) => {
+const Ue = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => y(e, r.trim(), ""))) : "", Ve = (o) => {
   const e = /* @__PURE__ */ new Set();
   return o.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
-}, Ve = [
+}, Je = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3029,7 +3079,7 @@ const He = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => v(e
   "int",
   "json",
   "string"
-], Je = ["int", "float", "Array<int>", "Array<float>"], Ze = ["date", "Array<date>"], Ye = [
+], Ze = ["int", "float", "Array<int>", "Array<float>"], Ye = ["date", "Array<date>"], Xe = [
   "eq",
   "find",
   "gt",
@@ -3041,56 +3091,57 @@ const He = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => v(e
   "size"
 ];
 export {
-  De as AnalyticsController,
-  Ke as AttributeDependencyGraph,
-  Se as CacheController,
-  Oe as ChangeDetector,
-  Ze as DatePropertyTypes,
-  P as DcuplQueryBuilder,
-  Ye as DcuplQueryOperatorsAsArray,
-  fe as DeepQueryService,
-  Z as DependencyGraph,
-  me as IndicesController,
+  Ke as AnalyticsController,
+  Se as AttributeDependencyGraph,
+  Ie as CacheController,
+  $e as ChangeDetector,
+  Ye as DatePropertyTypes,
+  R as DcuplQueryBuilder,
+  Xe as DcuplQueryOperatorsAsArray,
+  de as DeepQueryService,
+  Y as DependencyGraph,
+  ve as IndicesController,
   p as Logger,
-  Je as NumberPropertyTypes,
-  Ve as PropertyTypesAsArray,
-  We as QueryManager,
-  Le as ScriptController,
-  j as clone,
-  te as compareVersions,
-  Fe as computeSuggestions,
+  Ze as NumberPropertyTypes,
+  Je as PropertyTypesAsArray,
+  Le as QueryManager,
+  He as ScriptController,
+  P as clone,
+  re as compareVersions,
+  Ge as computeSuggestions,
   g as deepQueryService,
-  ee as escapeRegExp,
-  He as evaluateTemplate,
-  Pe as generateBooleanQuery,
-  X as generateKey,
-  Re as generateNumberAndDateQuery,
-  ze as generateReferenceQuery,
-  je as generateTextQuery,
-  Q as getAggregation,
-  Me as getDateConstraintUid,
-  Ae as getDcuplPropertyTypeForNativeType,
-  ge as getDistinct,
-  Be as getFacets,
-  Ie as getFilterEntryId,
-  Qe as getNumberConstraintUid,
-  Te as getPropertiesForData,
-  ke as groupBy,
+  te as escapeRegExp,
+  Ue as evaluateTemplate,
+  Re 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,
-  re as isDateInstance,
-  xe as isFloat,
-  we as isInt,
-  se as isValidDate,
-  _e as isValidQueryStatement,
-  $ as isValidVersion,
-  Y as logger,
-  Ge as parseDate,
-  Ue as parseTemplate,
+  se as isDateInstance,
+  Ae as isFloat,
+  xe as isInt,
+  ne as isValidDate,
+  We as isValidQueryStatement,
+  F as isValidVersion,
+  X as logger,
+  Be as parseDate,
+  Ve as parseTemplate,
   x as perf,
-  R as pivot,
-  Ce as removeTrailingSlash,
-  $e as trigger,
-  Ee as unescapeRegExp,
-  Ne as uniqBy
+  z as pivot,
+  Ee as removeTrailingSlash,
+  Fe as trigger,
+  Oe as unescapeRegExp,
+  ke as uniqBy
 };
 //# sourceMappingURL=index.js.map