@dcupl/common 2.0.0-beta.1 → 2.0.0-beta.3

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 y, get as D, every as B, findIndex as E, size as L, isEqual as O, differenceBy as q, startsWith as H, endsWith as U, isEqualWith as b, 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 Se {
   data;
   enabled = !1;
   constructor() {
@@ -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 T {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -408,11 +408,11 @@ let Z = class T {
     return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: c, kindChanges: f };
   }
 };
-class Ke {
+class Ie {
   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 Qe {
   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);
@@ -921,7 +921,7 @@ class Se {
     }
   }
   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 Me = (o, e = "") => `${o}#${e}`, Ne = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, ke = (o) => `${o.gt}_${o.gte}_${o.lt}_${o.lte}_${o.eq}_${o.ne}`, Ce = (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) {
+}, Ee = (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 Oe = (o) => o.replace(/\/+$/, ""), te = (o) => typeof o != "string" ? "" : o.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), qe = (o) => typeof o != "string" ? "" : o.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), $e = (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 Fe {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1010,9 +1010,9 @@ 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) : y(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;
@@ -1033,12 +1033,12 @@ const j = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : y(o)
   } catch {
     return i;
   }
-}, $e = (o) => (t, r, s) => {
+}, Ge = (o) => (t, r, s) => {
   const i = s.value;
   return s.value = function(...n) {
-    const a = x.now(), u = this.cdRef, c = j(o, !0);
+    const a = x.now(), u = this.cdRef, c = P(o, !0);
     c.key || (u.increaseCounter(), c.key = u.getCounter());
-    const f = X();
+    const f = ee();
     u.analyticsController.mark({
       name: `${c.type}:start`,
       context: f
@@ -1046,10 +1046,10 @@ const j = (o, e) => e ? typeof structuredClone < "u" ? structuredClone(o) : y(o)
     const d = this.model?.key;
     !c.originCdRefKey && u.key && (c.originCdRefKey = u.key), d && (c.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 c.method = r, c.args = n, l && typeof l == "object" && "then" in l ? l.then((h) => G(this, u, c, a, f, h)) : G(this, u, c, a, f, l);
   }, s;
 };
-function Fe(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()) {
@@ -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
@@ -1435,8 +1435,42 @@ class fe {
     return this.getPathSegments(e).length;
   }
 }
-const g = new fe();
-function D(o) {
+const g = new de();
+function v(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(...v(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) {
   let e = 0;
   for (let t of o) {
     const r = t.toString().split(".")[1];
@@ -1444,13 +1478,13 @@ function D(o) {
   }
   return Math.pow(10, e);
 }
-function G(o, e, t) {
+function j(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 +1492,42 @@ 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")) && (i = ye(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 = 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;
-}, le = (o, e) => {
+}, he = (o, e) => {
+  const r = g.parse(o).isDeepQuery;
+  let s = 0;
+  for (const i of e.values())
+    if (i)
+      if (r)
+        s += v(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) {
-      const a = i ? v(n, o) : n[o];
-      (t === void 0 || a < t) && (t = a), (r === void 0 || a > r) && (r = a);
+  for (const n of e.values()) {
+    if (!n) continue;
+    let a;
+    if (i)
+      a = v(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];
-}, he = (o, e) => {
+}, ge = (o, e) => {
   const t = [];
   o.groupOptions?.groups?.forEach((n) => {
     t.push({
@@ -1488,28 +1542,39 @@ 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;
+    i ? a = v(n, o.attribute) : a = [n[o.attribute]];
+    let u = !1;
+    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;
-}, pe = (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;
-    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])),
-    count: e.size,
+  for (const a of e.values()) {
+    if (!a) continue;
+    let u;
+    if (i)
+      u = v(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 f of c)
+          typeof f == "number" && (t = j(t, f, K([t, f])), r++);
+      else typeof c == "number" && (t = j(t, c, K([t, c])), r++);
+  }
+  return r === 0 ? void 0 : {
+    average: le(t, r, K([t, r])),
+    count: r,
     sum: t
   };
-}, ge = (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))) {
@@ -1529,7 +1594,7 @@ class w extends Error {
     super(r), this.query = t, this.name = "DcuplQueryError";
   }
 }
-class P {
+class R {
   _defaultQueryOptions = {
     modelKey: "",
     groupKey: "root",
@@ -1682,7 +1747,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 +1760,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 +2275,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 }, y(r)), c = n.queryData(o, u, !1, i), f = e ? [...e.keys()] : [], d = new Set(f), 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 A = /* @__PURE__ */ new Map(), W = l.get(h) || /* @__PURE__ */ new Set();
+    for (const k of W) {
+      const C = c.get(k);
+      if (C && (A.set(k, C), !t?.calculateFacets))
         break;
     }
-    const M = {
+    const N = {
       key: String(h),
       value: h,
-      selected: ye(s, h, r),
+      selected: ve(s, h, r),
       enabled: A.size > 0,
       size: A.size,
       entry: e.get(h),
       resultKeys: Array.from(A.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 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 (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 we {
   indexMap = /* @__PURE__ */ new Map();
   // Possible performance gain*
   dataMap = /* @__PURE__ */ new Map();
@@ -2322,15 +2387,15 @@ class me {
       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]);
+        let f;
+        u ? (f = v(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();
     }
     return i;
   }
   getIndexName(e, t) {
-    return t ? e + "_" + I(t) : e;
+    return t ? e + "_" + Q(t) : e;
   }
   // ========== PARTIAL UPDATE METHODS ==========
   /**
@@ -2500,7 +2565,7 @@ class me {
   }
 }
 const m = "__";
-function R(o, e, t = { key: "root" }, r = "root", s = new me(), i) {
+function z(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));
@@ -2510,24 +2575,24 @@ 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 = xe(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 xe(o, e, t, r, s = "", i) {
   const n = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
     return n;
@@ -2542,12 +2607,12 @@ function ve(o, e, t, r, s = "", i) {
       for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = Q(l, d, r.getIndex(l.attribute), l.attribute);
+        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
         f.values.push(h);
       }
       if (n.rows = n.rows || [], n.rows.push(f), t.rows.length > 1) {
         const l = { ...t, rows: t.rows.slice(1) };
-        R(
+        z(
           d,
           l,
           f,
@@ -2558,7 +2623,7 @@ function ve(o, e, t, r, s = "", i) {
       } else if (t.columns)
         for (const l of t.columns) {
           f.columns = f.columns || [];
-          const h = z(
+          const h = _(
             d,
             l,
             t,
@@ -2572,7 +2637,7 @@ function ve(o, e, t, r, s = "", i) {
   }
   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;
@@ -2587,12 +2652,12 @@ function z(o, e, t, r, s = "", i) {
       for (const l of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = Q(l, d, r.getIndex(l.attribute), l.attribute);
+        const h = M(l, d, r.getIndex(l.attribute), l.attribute);
         f.values.push(h);
       }
       if (n.columns = n.columns || [], n.columns.push(f), t.columns.length > 1) {
         const l = { ...t, columns: t.columns.slice(1) };
-        R(
+        z(
           d,
           l,
           f,
@@ -2605,11 +2670,11 @@ function z(o, e, t, r, s = "", i) {
   }
   return n;
 }
-const Te = (o, e) => {
+const Pe = (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 = De(i);
       if (n)
         n.type !== a && (n.type = "any");
       else {
@@ -2624,21 +2689,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) => {
+}, Ae = (o) => Number(o) === o && o % 1 === 0, be = (o) => Number(o) === o && o % 1 !== 0, De = (o) => {
   switch (typeof o) {
     case "string":
       return "string";
     case "number":
-      return we(o) ? "int" : xe(o) ? "float" : "any";
+      return Ae(o) ? "int" : be(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;
+}, Re = (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 +2766,7 @@ const Te = (o, e) => {
       }
     ]
   }), s;
-}, Pe = (o, e) => {
+}, ze = (o, e) => {
   const t = e?.attributeKey || o.filterKey;
   return {
     groupKey: o.filterKey,
@@ -2714,7 +2779,7 @@ const Te = (o, e) => {
       }
     ]
   };
-}, Re = (o, e) => {
+}, _e = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2729,7 +2794,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) => {
+}, We = (o, e) => {
   const t = e?.attributeKey || o.filterKey, r = {
     groupKey: o.filterKey,
     queries: []
@@ -2742,13 +2807,13 @@ const Te = (o, e) => {
       operator: "eq"
     });
   }), r;
-}, _e = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
-class We {
+}, Le = (o) => !(typeof o.modelKey != "string" || !Array.isArray(o.queries));
+class He {
   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 +2829,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 = 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 ? !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 +2849,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 });
@@ -2831,16 +2896,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) => b(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) => 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)) {
@@ -2857,24 +2922,35 @@ class We {
   }
   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 c = this.queryBuilder.extractQueryAttributes({ queries: [t] });
+        if (c.some((l) => l.isDeepQuery)) {
+          const l = this.queryBuilder.getProjectionForAttributeEntries(
+            c.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 f = this.handleArrayStarQuery(t, u);
+        let d = !1;
+        for (const l of f.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, 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) {
@@ -2901,14 +2977,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(".") ? D(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
           });
         }
     }
@@ -2971,7 +3048,7 @@ class We {
   //   }
   // }
 }
-class Le {
+class Ue {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3014,10 +3091,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 Ve = (o, e) => o ? (e || (e = {}), o.replace(/\$\{(.*?)\}/g, (t, r) => D(e, r.trim(), ""))) : "", Je = (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 = [
+}, Ze = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3029,7 +3106,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 = [
+], Ye = ["int", "float", "Array<int>", "Array<float>"], Xe = ["date", "Array<date>"], et = [
   "eq",
   "find",
   "gt",
@@ -3041,56 +3118,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,
+  Se as AnalyticsController,
+  Ie as AttributeDependencyGraph,
+  Qe as CacheController,
+  Fe as ChangeDetector,
+  Xe as DatePropertyTypes,
+  R as DcuplQueryBuilder,
+  et as DcuplQueryOperatorsAsArray,
+  de as DeepQueryService,
+  Y as DependencyGraph,
+  we 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,
+  Ye as NumberPropertyTypes,
+  Ze as PropertyTypesAsArray,
+  He as QueryManager,
+  Ue as ScriptController,
+  P as clone,
+  re as compareVersions,
+  je 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,
-  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,
+  te as escapeRegExp,
+  Ve as evaluateTemplate,
+  ze as generateBooleanQuery,
+  ee as generateKey,
+  _e as generateNumberAndDateQuery,
+  We as generateReferenceQuery,
+  Re as generateTextQuery,
+  M as getAggregation,
+  ke as getDateConstraintUid,
+  De as getDcuplPropertyTypeForNativeType,
+  v as getDeepPathValues,
+  me as getDistinct,
+  Te as getFacets,
+  Me as getFilterEntryId,
+  Ne as getNumberConstraintUid,
+  Pe as getPropertiesForData,
+  Ee as groupBy,
+  $e as hasMinimumVersion,
+  se as isDateInstance,
+  be as isFloat,
+  Ae as isInt,
+  ne as isValidDate,
+  Le as isValidQueryStatement,
+  F as isValidVersion,
+  X as logger,
+  Be as parseDate,
+  Je as parseTemplate,
   x as perf,
-  R as pivot,
-  Ce as removeTrailingSlash,
-  $e as trigger,
-  Ee as unescapeRegExp,
-  Ne as uniqBy
+  z as pivot,
+  Oe as removeTrailingSlash,
+  Ge as trigger,
+  qe as unescapeRegExp,
+  Ce as uniqBy
 };
 //# sourceMappingURL=index.js.map