@dcupl/common 2.0.0-beta.6 → 2.0.0-beta.8

package/dist/esm/index.js

@@ -1,22 +1,22 @@
-import { cloneDeep as v, get as K, every as z, findIndex as C, size as W, isEqual as E, differenceBy as O, startsWith as L, endsWith as H, isEqualWith as S, isMatch as V, find as U } from "lodash-es";
-function N(n) {
-  const e = Q(n);
-  return J(e);
+import { cloneDeep as v, get as I, every as z, findIndex as E, size as L, isEqual as $, differenceBy as O, startsWith as H, endsWith as U, isEqualWith as S, isMatch as V, find as J } from "lodash-es";
+function K(n) {
+  const e = k(n);
+  return Z(e);
 }
-function Q(n) {
+function k(n) {
   if (typeof n != "object" || n === null)
     return String(n);
   if (Array.isArray(n))
-    return "[" + n.map(Q).join(",") + "]";
+    return "[" + n.map(k).join(",") + "]";
   const e = Object.keys(n).sort();
   let t = "{";
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
-    t += s + ":" + Q(n[s]), r < e.length - 1 && (t += ",");
+    t += s + ":" + k(n[s]), r < e.length - 1 && (t += ",");
   }
   return t += "}", t;
 }
-function J(n) {
+function Z(n) {
   let e = 0;
   for (let t = 0; t < n.length; t++) {
     const r = n.charCodeAt(t);
@@ -41,7 +41,7 @@ const b = {
       return performance.getEntriesByType(n);
   }
 };
-class qe {
+class Re {
   data;
   enabled = !1;
   constructor() {
@@ -69,9 +69,9 @@ class qe {
     const t = this.getKey(e.name, e.context), r = this.data.get(this.getKey(e.start, e.context)), s = this.data.get(this.getKey(e.end, e.context));
     if (!r || !s)
       return;
-    const o = s.value - r.value, i = Math.round(o * 100) / 100, a = this.data.get(t);
+    const i = s.value - r.value, o = Math.round(i * 100) / 100, a = this.data.get(t);
     if (a && e.sum) {
-      const c = a.value + i, f = {
+      const c = a.value + o, f = {
         ...a,
         value: c
       };
@@ -80,7 +80,7 @@ class qe {
     const u = {
       name: e.name,
       type: "measure",
-      value: i,
+      value: o,
       createdAt: Date.now()
     };
     return e.detail && (u.detail = e.detail), this.data.set(t, u), u;
@@ -114,11 +114,11 @@ class qe {
   getKey(e, t) {
     if (!t)
       return e;
-    const r = N(t);
+    const r = K(t);
     return e + "_" + r;
   }
 }
-let Z = class R {
+let X = class _ {
   nodes;
   edges;
   nodeKinds = /* @__PURE__ */ new Map();
@@ -198,10 +198,10 @@ let Z = class R {
       if (t.has(s))
         return !0;
       t.add(s);
-      const o = this.edges.get(s);
-      if (o) {
-        for (let i of o)
-          if (r(i))
+      const i = this.edges.get(s);
+      if (i) {
+        for (let o of i)
+          if (r(o))
             return !0;
       }
       return t.delete(s), e.add(s), !1;
@@ -217,36 +217,36 @@ let Z = class R {
    * @returns {hasCycle: boolean, path?: string[]} - hasCycle is true if a cycle exists, path contains the cycle nodes
    */
   validateNoCycles() {
-    const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), r = [], s = (o) => {
-      if (e.has(o))
+    const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), r = [], s = (i) => {
+      if (e.has(i))
         return null;
-      if (t.has(o)) {
-        const a = r.indexOf(o);
-        return r.slice(a).concat([o]);
+      if (t.has(i)) {
+        const a = r.indexOf(i);
+        return r.slice(a).concat([i]);
       }
-      t.add(o), r.push(o);
-      const i = this.edges.get(o);
-      if (i)
-        for (let a of i) {
+      t.add(i), r.push(i);
+      const o = this.edges.get(i);
+      if (o)
+        for (let a of o) {
           const u = s(a);
           if (u)
             return u;
         }
-      return r.pop(), t.delete(o), e.add(o), null;
+      return r.pop(), t.delete(i), e.add(i), null;
     };
-    for (let o of this.nodes) {
-      const i = s(o);
-      if (i)
-        return { hasCycle: !0, path: i };
+    for (let i of this.nodes) {
+      const o = s(i);
+      if (o)
+        return { hasCycle: !0, path: o };
     }
     return { hasCycle: !1 };
   }
   order(e) {
-    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = [], o = e?.allowCycles ?? !1, i = (a) => {
+    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = [], i = e?.allowCycles ?? !1, o = (a) => {
       if (t.has(a))
         return;
       if (r.has(a)) {
-        if (o)
+        if (i)
           return;
         throw new Error("Graph has a cycle.");
       }
@@ -254,11 +254,11 @@ let Z = class R {
       const u = this.edges.get(a);
       if (u)
         for (let c of u)
-          i(c);
+          o(c);
       r.delete(a), t.add(a), s.push(a);
     };
     for (let a of this.nodes)
-      t.has(a) || i(a);
+      t.has(a) || o(a);
     return s;
   }
   clear() {
@@ -326,30 +326,30 @@ let Z = class R {
    */
   plan(e) {
     const t = /* @__PURE__ */ new Map();
-    for (const i of this.nodes) t.set(i, 0);
-    for (const i of this.edges.values())
-      for (const a of i) t.set(a, (t.get(a) || 0) + 1);
+    for (const o of this.nodes) t.set(o, 0);
+    for (const o of this.edges.values())
+      for (const a of o) t.set(a, (t.get(a) || 0) + 1);
     const r = [];
-    let s = Array.from(this.nodes).filter((i) => (t.get(i) || 0) === 0);
-    const o = /* @__PURE__ */ new Set();
+    let s = Array.from(this.nodes).filter((o) => (t.get(o) || 0) === 0);
+    const i = /* @__PURE__ */ new Set();
     for (; s.length > 0; ) {
-      const i = s.slice();
-      r.push(i), s = [];
-      for (const a of i) {
-        if (o.has(a)) continue;
-        o.add(a);
+      const o = s.slice();
+      r.push(o), s = [];
+      for (const a of o) {
+        if (i.has(a)) continue;
+        i.add(a);
         const u = this.edges.get(a);
         if (u)
           for (const c of u)
             t.set(c, (t.get(c) || 0) - 1), (t.get(c) || 0) === 0 && s.push(c);
       }
     }
-    if (o.size !== this.nodes.size)
+    if (i.size !== this.nodes.size)
       throw new Error("Graph has a cycle.");
     if (e?.filterKinds && e.filterKinds.length > 0) {
-      const i = new Set(e.filterKinds);
+      const o = new Set(e.filterKinds);
       return {
-        batches: r.map((a) => a.filter((u) => i.has(this.nodeKinds.get(u))))
+        batches: r.map((a) => a.filter((u) => o.has(this.nodeKinds.get(u))))
       };
     }
     return { batches: r };
@@ -362,26 +362,26 @@ let Z = class R {
    *  - 'both': union of upstream and downstream
    */
   getImpactedNodes(e, t = "downstream", r) {
-    const s = new Set(e), o = (c) => !r || r.length === 0 || r.includes(this.nodeKinds.get(c) ?? void 0), i = () => {
+    const s = new Set(e), i = (c) => !r || r.length === 0 || r.includes(this.nodeKinds.get(c) ?? void 0), o = () => {
       const c = /* @__PURE__ */ new Set(), f = Array.from(s);
       for (; f.length; ) {
-        const d = f.shift();
-        for (const [l, h] of this.edges)
-          h.has(d) && !c.has(l) && (c.add(l), f.push(l));
+        const l = f.shift();
+        for (const [d, h] of this.edges)
+          h.has(l) && !c.has(d) && (c.add(d), f.push(d));
       }
       return c;
     }, a = () => {
       const c = /* @__PURE__ */ new Set(), f = Array.from(s);
       for (; f.length; ) {
-        const d = f.shift(), l = this.edges.get(d);
-        if (l)
-          for (const h of l)
+        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 c;
     };
     let u;
-    return t === "both" ? u = /* @__PURE__ */ new Set([...i(), ...a()]) : t === "upstream" ? u = a() : u = i(), Array.from(u).filter(o);
+    return t === "both" ? u = /* @__PURE__ */ new Set([...o(), ...a()]) : t === "upstream" ? u = a() : u = o(), Array.from(u).filter(i);
   }
   toJSON() {
     const e = Array.from(this.nodes).map((r) => ({
@@ -392,7 +392,7 @@ let Z = class R {
     return { nodes: e, edges: t };
   }
   static fromJSON(e) {
-    const t = new R();
+    const t = new _();
     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 R {
     return t;
   }
   diff(e) {
-    const t = new Set(this.getNodes()), r = new Set(e.getNodes()), s = Array.from(r).filter((d) => !t.has(d)), o = Array.from(t).filter((d) => !r.has(d)), i = new Set(this.getAllEdges().map((d) => d.join("→"))), a = new Set(e.getAllEdges().map((d) => d.join("→"))), u = Array.from(a).filter((d) => !i.has(d)).map((d) => d.split("→")), c = Array.from(i).filter((d) => !a.has(d)).map((d) => d.split("→")), f = [];
-    for (const d of /* @__PURE__ */ new Set([...t, ...r])) {
-      const l = this.nodeKinds.get(d), h = e.nodeKinds.get(d);
-      l !== h && f.push({ name: d, from: l, to: h });
+    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)), o = new Set(this.getAllEdges().map((l) => l.join("→"))), a = new Set(e.getAllEdges().map((l) => l.join("→"))), u = Array.from(a).filter((l) => !o.has(l)).map((l) => l.split("→")), c = Array.from(o).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: o, addedEdges: u, removedEdges: c, kindChanges: f };
+    return { addedNodes: s, removedNodes: i, addedEdges: u, removedEdges: c, kindChanges: f };
   }
 };
-class $e {
+class Te {
   graph;
   nodeIndex;
   constructor() {
-    this.graph = new Z(), this.nodeIndex = /* @__PURE__ */ new Map();
+    this.graph = new X(), this.nodeIndex = /* @__PURE__ */ new Map();
   }
   /**
    * Creates a unique ID for an attribute node
@@ -454,10 +454,10 @@ class $e {
    * @returns Array of all impacted attribute nodes (including the changed ones)
    */
   getImpactedAttributes(e) {
-    const t = e.map((a) => this.getNodeId(a.modelKey, a.attributeKey)), s = this.graph.getImpactedNodes(t, "downstream").map((a) => this.nodeIndex.get(a)).filter((a) => a !== void 0), o = [...e, ...s], i = /* @__PURE__ */ new Set();
-    return o.filter((a) => {
+    const t = e.map((a) => this.getNodeId(a.modelKey, a.attributeKey)), s = this.graph.getImpactedNodes(t, "downstream").map((a) => this.nodeIndex.get(a)).filter((a) => a !== void 0), i = [...e, ...s], o = /* @__PURE__ */ new Set();
+    return i.filter((a) => {
       const u = this.getNodeId(a.modelKey, a.attributeKey);
-      return i.has(u) ? !1 : (i.add(u), !0);
+      return o.has(u) ? !1 : (o.add(u), !0);
     });
   }
   /**
@@ -468,12 +468,12 @@ class $e {
    * @returns Map<modelKey, Map<processingStep, Set<attributeKeys>>>
    */
   getProcessingOrder(e) {
-    const t = /* @__PURE__ */ new Map(), r = [...e].sort((s, o) => s.processingStep - o.processingStep);
+    const t = /* @__PURE__ */ new Map(), r = [...e].sort((s, i) => s.processingStep - i.processingStep);
     for (const s of r) {
-      const { modelKey: o, attributeKey: i, processingStep: a } = s;
-      t.has(o) || t.set(o, /* @__PURE__ */ new Map());
-      const u = t.get(o);
-      u.has(a) || u.set(a, /* @__PURE__ */ new Set()), u.get(a).add(i);
+      const { modelKey: i, attributeKey: o, processingStep: a } = s;
+      t.has(i) || t.set(i, /* @__PURE__ */ new Map());
+      const u = t.get(i);
+      u.has(a) || u.set(a, /* @__PURE__ */ new Set()), u.get(a).add(o);
     }
     return t;
   }
@@ -528,14 +528,14 @@ class $e {
     const t = (r, s = /* @__PURE__ */ new Set()) => {
       if (s.has(r)) return 0;
       s.add(r);
-      const o = this.graph.getDependencies(r);
-      if (o.length === 0) return 1;
-      let i = 0;
-      for (const a of o) {
+      const i = this.graph.getDependencies(r);
+      if (i.length === 0) return 1;
+      let o = 0;
+      for (const a of i) {
         const u = t(a, new Set(s));
-        i = Math.max(i, u);
+        o = Math.max(o, u);
       }
-      return i + 1;
+      return o + 1;
     };
     for (const r of this.graph.getNodes()) {
       const s = t(r);
@@ -554,9 +554,9 @@ class $e {
   validateCompleteness(e) {
     const t = [];
     for (const [r, s] of e)
-      for (const o of s) {
-        const i = this.getNodeId(r, o);
-        this.hasNode(i) || t.push({ modelKey: r, attributeKey: o });
+      for (const i of s) {
+        const o = this.getNodeId(r, i);
+        this.hasNode(o) || t.push({ modelKey: r, attributeKey: i });
       }
     return {
       isComplete: t.length === 0,
@@ -667,19 +667,19 @@ class p {
   }
   formatMessage(e) {
     if (this.config.format === "json") {
-      const i = {
+      const o = {
         timestamp: new Date(e.timestamp).toISOString(),
         level: e.level,
         message: e.message
       };
-      return e.prefix && (i.module = e.prefix), e.context && (i.context = e.context), e.error && (i.error = {
+      return e.prefix && (o.module = e.prefix), e.context && (o.context = e.context), e.error && (o.error = {
         name: e.error.name,
         message: e.error.message,
         stack: e.error.stack
-      }), JSON.stringify(i);
+      }), JSON.stringify(o);
     }
-    const t = new Date(e.timestamp).toISOString().substring(11, 23), r = e.prefix ? `[${e.prefix}]` : "", s = this.getLevelIcon(e.level), o = e.context ? ` ${JSON.stringify(e.context)}` : "";
-    return `${t} ${s} ${r} ${e.message}${o}`.trim();
+    const t = new Date(e.timestamp).toISOString().substring(11, 23), r = e.prefix ? `[${e.prefix}]` : "", s = this.getLevelIcon(e.level), i = e.context ? ` ${JSON.stringify(e.context)}` : "";
+    return `${t} ${s} ${r} ${e.message}${i}`.trim();
   }
   getLevelIcon(e) {
     switch (e) {
@@ -698,7 +698,7 @@ class p {
   log(e, t, r, s) {
     if (!this.shouldLog(e))
       return;
-    const o = {
+    const i = {
       level: e,
       message: t,
       timestamp: Date.now(),
@@ -707,31 +707,31 @@ class p {
       error: s
     };
     if (this.config.onLog) {
-      this.config.onLog(o);
+      this.config.onLog(i);
       return;
     }
-    const i = this.formatMessage(o);
+    const o = this.formatMessage(i);
     if (typeof console < "u")
       switch (e) {
         case "error":
-          s ? console.error(i, s) : console.error(i);
+          s ? console.error(o, s) : console.error(o);
           break;
         case "warn":
-          console.warn(i);
+          console.warn(o);
           break;
         case "debug":
-          console.debug ? console.debug(i) : console.log(i);
+          console.debug ? console.debug(o) : console.log(o);
           break;
         default:
-          console.log(i);
+          console.log(o);
       }
   }
   /**
    * Log an error message
    */
   error(e, t, r) {
-    const s = t instanceof Error ? t : void 0, o = t instanceof Error ? r : t;
-    this.log("error", e, o, s);
+    const s = t instanceof Error ? t : void 0, i = t instanceof Error ? r : t;
+    this.log("error", e, i, s);
   }
   /**
    * Log and track an error (integrates with QualityController)
@@ -800,7 +800,7 @@ class p {
   }
 }
 const Y = new p();
-class Fe {
+class Ge {
   constructor(e) {
     this.enabled = e, this.cache = /* @__PURE__ */ new Map(), this.cacheDependencies = /* @__PURE__ */ new Map();
   }
@@ -818,8 +818,8 @@ class Fe {
   }
   set(e, t, r, s) {
     if (!this.enabled) return;
-    const o = this.getCacheName(e, t);
-    this.cache.set(o, r), s ? this.cacheDependencies.set(o, s) : this.log.debug(
+    const i = this.getCacheName(e, t);
+    this.cache.set(i, r), s ? this.cacheDependencies.set(i, s) : this.log.debug(
       `Cache entry '${e}' stored without dependencies. This prevents granular invalidation and may cause stale data.`
     );
   }
@@ -837,21 +837,21 @@ class Fe {
     if (!this.enabled) return;
     const t = [];
     for (const [r, s] of this.cacheDependencies) {
-      let o = !1;
-      for (const [i, a] of e) {
-        if (s.models.has(i))
-          if (s.modelAttributes.has(i)) {
-            const u = s.modelAttributes.get(i);
+      let i = !1;
+      for (const [o, a] of e) {
+        if (s.models.has(o))
+          if (s.modelAttributes.has(o)) {
+            const u = s.modelAttributes.get(o);
             for (const c of a)
               if (u.has(c)) {
-                o = !0;
+                i = !0;
                 break;
               }
           } else
-            o = !0;
-        if (o) break;
+            i = !0;
+        if (i) break;
       }
-      o && t.push(r);
+      i && t.push(r);
     }
     for (const r of t)
       this.cache.delete(r), this.cacheDependencies.delete(r);
@@ -863,9 +863,9 @@ class Fe {
   invalidateByModels(e) {
     if (!this.enabled) return;
     const t = new Set(e), r = [];
-    for (const [s, o] of this.cacheDependencies)
-      for (const i of t)
-        if (o.models.has(i)) {
+    for (const [s, i] of this.cacheDependencies)
+      for (const o of t)
+        if (i.models.has(o)) {
           r.push(s);
           break;
         }
@@ -921,7 +921,7 @@ class Fe {
     }
   }
   getCacheName(e, t) {
-    const r = N(t);
+    const r = K(t);
     return e + "_" + r;
   }
   /**
@@ -939,42 +939,42 @@ class Fe {
     };
   }
 }
-const Te = (n, e = "") => `${n}#${e}`, Ge = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, ze = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Re = (n, e) => {
+const ze = (n, e = "") => `${n}#${e}`, _e = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, je = (n) => `${n.gt}_${n.gte}_${n.lt}_${n.lte}_${n.eq}_${n.ne}`, Be = (n, e) => {
   const t = typeof e == "function" ? e : (r) => r[e];
   return [
     ...n.reduce((r, s) => {
-      const o = s == null ? s : t(s);
-      return r.has(o) || r.set(o, s), r;
+      const i = s == null ? s : t(s);
+      return r.has(i) || r.set(i, s), r;
     }, /* @__PURE__ */ new Map()).values()
   ];
-}, je = (n, e) => n.reduce(function(t, r) {
+}, Pe = (n, e) => n.reduce(function(t, r) {
   const s = typeof e == "function" ? e(r) : r[e];
   return Object.prototype.hasOwnProperty.call(t, s) || (t[s] = []), t[s].push(r), t;
 }, {});
-function X(n = 10) {
+function ee(n = 10) {
   let e = "";
   const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   for (let r = 0; r < n; r++) e += t.charAt(Math.floor(Math.random() * t.length));
   return e;
 }
-const Be = (n) => n.replace(/\/+$/, ""), ee = (n) => typeof n != "string" ? "" : n.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), _e = (n) => typeof n != "string" ? "" : n.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), Pe = (n, e) => {
+const We = (n) => n.replace(/\/+$/, ""), te = (n) => typeof n != "string" ? "" : n.replace(/[[\]{}()*+?.,\\^$|#]/g, "\\$&"), Le = (n) => typeof n != "string" ? "" : n.replace(/\\([[\]{}()*+?.,\\^$|#])/g, "$1"), He = (n, e) => {
   try {
-    return te(n, e) >= 0;
+    return re(n, e) >= 0;
   } catch {
     return !1;
   }
-}, te = (n, e) => {
-  if (!$(n) || !$(e))
+}, re = (n, e) => {
+  if (!F(n) || !F(e))
     throw new Error(`Invalid version format: v1="${n}", v2="${e}". Expected format: "x.y.z"`);
   const t = n.split(".").map(Number), r = e.split(".").map(Number);
   for (let s = 0; s < 3; s++) {
-    const o = t[s] || 0, i = r[s] || 0;
-    if (o > i) return 1;
-    if (o < i) return -1;
+    const i = t[s] || 0, o = r[s] || 0;
+    if (i > o) return 1;
+    if (i < o) return -1;
   }
   return 0;
-}, $ = (n) => /^\d+(\.\d+){0,2}$/.test(n);
-class We {
+}, F = (n) => /^\d+(\.\d+){0,2}$/.test(n);
+class Ue {
   key;
   parentCd;
   dcuplInitOptions;
@@ -1010,17 +1010,17 @@ class We {
     };
   }
 }
-const j = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n) : n, F = (n, e, t, r, s, o) => {
+const j = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n) : n, R = (n, e, t, r, s, i) => {
   try {
-    const i = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = j(o, i);
+    const o = !!e.dcuplInitOptions.performance?.clone?.enabled && !!t.cloneResult, a = j(i, o);
     if (t.scope === "list" && (t.listKey = n.cdRef?.key || n.key, t.modelKey = n.model?.key || n.modelKey), t.type === "list_created" && t.args[0].listKey.startsWith("__global_list__") || t.listKey?.startsWith("__global_list__"))
       return a;
     const u = b.now(), c = u - r, f = Math.round(c * 1e3) / 1e3;
     t.duration = f, t.start = r, t.end = u;
-    const d = {
+    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,59 +1028,59 @@ const j = (n, e) => e ? typeof structuredClone < "u" ? structuredClone(n) : v(n)
       start: `${t.type}:start`,
       end: `${t.type}:end`,
       context: s,
-      detail: d
+      detail: l
     }), a;
   } catch {
-    return o;
+    return i;
   }
-}, Le = (n) => (t, r, s) => {
-  const o = s.value;
-  return s.value = function(...i) {
+}, Ve = (n) => (t, r, s) => {
+  const i = s.value;
+  return s.value = function(...o) {
     const a = b.now(), u = this.cdRef, c = j(n, !0);
     c.key || (u.increaseCounter(), c.key = u.getCounter());
-    const f = X();
+    const f = ee();
     u.analyticsController.mark({
       name: `${c.type}:start`,
       context: f
     });
-    const d = this.model?.key;
-    !c.originCdRefKey && u.key && (c.originCdRefKey = u.key), d && (c.modelKey = d);
-    const l = o.apply(this, i);
-    return c.method = r, c.args = i, l && typeof l == "object" && "then" in l ? l.then((h) => F(this, u, c, a, f, h)) : F(this, u, c, a, f, l);
+    const l = this.model?.key;
+    !c.originCdRefKey && u.key && (c.originCdRefKey = u.key), l && (c.modelKey = l);
+    const d = i.apply(this, o);
+    return c.method = r, c.args = o, d && typeof d == "object" && "then" in d ? d.then((h) => R(this, u, c, a, f, h)) : R(this, u, c, a, f, d);
   }, s;
 };
-function He(n, e, t, r) {
+function Je(n, e, t, r) {
   t.max || (t.max = 20);
-  const s = [], o = t.transform ? r.transformValue(t.value, t.transform) : t.value;
-  for (const [i, a] of e.entries()) {
-    const u = Array.from(a).some((f) => n.has(f)), c = t.transform ? r.transformValue(i, t.transform) : i;
-    if (!(t.excludeUndefineds && typeof i > "u") && !(t.excludeNulls && i === null)) {
-      if (u && (o === "" || o === "//")) {
+  const s = [], i = t.transform ? r.transformValue(t.value, t.transform) : t.value;
+  for (const [o, a] of e.entries()) {
+    const u = Array.from(a).some((f) => n.has(f)), c = t.transform ? r.transformValue(o, t.transform) : o;
+    if (!(t.excludeUndefineds && typeof o > "u") && !(t.excludeNulls && o === null)) {
+      if (u && (i === "" || i === "//")) {
         const f = {
-          value: i,
+          value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
         s.push(f);
-      } else if (u && typeof o == "string" && o.startsWith("/") && o.endsWith("/")) {
-        if (r.queryFind(c, o, "some")) {
+      } else if (u && typeof i == "string" && i.startsWith("/") && i.endsWith("/")) {
+        if (r.queryFind(c, i, "some")) {
           const f = {
-            value: i,
+            value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
           s.push(f);
         }
-      } else if (u && typeof o == "string") {
-        const f = String(c ?? ""), d = o;
-        if (f.toLowerCase().startsWith(d.toLowerCase())) {
-          const l = {
-            value: i,
+      } else if (u && typeof i == "string") {
+        const f = String(c ?? ""), l = i;
+        if (f.toLowerCase().startsWith(l.toLowerCase())) {
+          const d = {
+            value: o,
             keys: t.calculateResultKeys ? Array.from(a) : []
           };
-          s.push(l);
+          s.push(d);
         }
-      } else if (u && r.queryFind(c, o, "some")) {
+      } else if (u && r.queryFind(c, i, "some")) {
         const f = {
-          value: i,
+          value: o,
           keys: t.calculateResultKeys ? Array.from(a) : []
         };
         s.push(f);
@@ -1091,13 +1091,13 @@ function He(n, e, t, r) {
   }
   return s;
 }
-function re(n) {
+function se(n) {
   return n instanceof Date;
 }
-function se(n) {
+function ne(n) {
   return n instanceof Date && !isNaN(n.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,28 +1112,28 @@ const ne = {
   s: { type: "second", pattern: "s", regex: "(\\d{1,2})" },
   SSS: { type: "millisecond", pattern: "SSS", regex: "(\\d{3})" }
 };
-function ie(n) {
+function oe(n) {
   let e = "^";
   const t = [];
   let r = n;
-  const s = Object.entries(ne).sort((o, i) => i[0].length - o[0].length);
+  const s = Object.entries(ie).sort((i, o) => o[0].length - i[0].length);
   for (; r.length > 0; ) {
-    let o = !1;
-    for (const [i, a] of s)
-      if (r.startsWith(i)) {
-        e += a.regex, t.push({ type: a.type, pattern: i }), r = r.slice(i.length), o = !0;
+    let i = !1;
+    for (const [o, a] of s)
+      if (r.startsWith(o)) {
+        e += a.regex, t.push({ type: a.type, pattern: o }), r = r.slice(o.length), i = !0;
         break;
       }
-    if (!o) {
-      const i = r[0];
-      if (!i)
+    if (!i) {
+      const o = r[0];
+      if (!o)
         break;
-      e += i.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), r = r.slice(1);
+      e += o.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), r = r.slice(1);
     }
   }
   return e += "$", { regex: new RegExp(e), tokenOrder: t };
 }
-function oe(n, e) {
+function ae(n, e) {
   const t = {
     year: 1970,
     month: 1,
@@ -1147,12 +1147,12 @@ function oe(n, e) {
     const s = n[r + 1];
     if (!s)
       continue;
-    const o = parseInt(s, 10), i = e[r];
-    i && (i.type === "year" && i.pattern === "yy" ? t.year = 2e3 + o : t[i.type] = o);
+    const i = parseInt(s, 10), o = e[r];
+    o && (o.type === "year" && o.pattern === "yy" ? t.year = 2e3 + i : t[o.type] = i);
   }
   return t;
 }
-function ae(n) {
+function ue(n) {
   if (n.month < 1 || n.month > 12)
     return /* @__PURE__ */ new Date(NaN);
   if (n.day < 1 || n.day > 31)
@@ -1174,9 +1174,9 @@ function ae(n) {
     n.second,
     n.millisecond
   );
-  return se(e) ? e.getFullYear() !== n.year || e.getMonth() !== n.month - 1 || e.getDate() !== n.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
+  return ne(e) ? e.getFullYear() !== n.year || e.getMonth() !== n.month - 1 || e.getDate() !== n.day ? /* @__PURE__ */ new Date(NaN) : e : /* @__PURE__ */ new Date(NaN);
 }
-function Ve(n, e, t) {
+function Ze(n, e, t) {
   if (n = n.trim(), e === "t") {
     const a = Number(n);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a * 1e3);
@@ -1185,13 +1185,13 @@ function Ve(n, e, t) {
     const a = Number(n);
     return isNaN(a) ? /* @__PURE__ */ new Date(NaN) : new Date(a);
   }
-  const { regex: r, tokenOrder: s } = ie(e), o = n.match(r);
-  if (!o)
+  const { regex: r, tokenOrder: s } = oe(e), i = n.match(r);
+  if (!i)
     return /* @__PURE__ */ new Date(NaN);
-  const i = oe(o, s);
-  return ae(i);
+  const o = ae(i, s);
+  return ue(o);
 }
-class ue {
+class ce {
   cache;
   maxSize;
   accessOrder;
@@ -1234,7 +1234,7 @@ class ue {
     };
   }
 }
-class ce {
+class fe {
   graph;
   constructor() {
     this.graph = /* @__PURE__ */ new Map();
@@ -1244,25 +1244,25 @@ class ce {
   }
   hasCycle(e) {
     if (e.length === 0) return !1;
-    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = (o) => {
-      t.add(o), r.add(o);
-      const i = this.graph.get(o);
-      if (i) {
-        for (const a of i)
+    const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = (i) => {
+      t.add(i), r.add(i);
+      const o = this.graph.get(i);
+      if (o) {
+        for (const a of o)
           if (t.has(a)) {
             if (r.has(a))
               return !0;
           } else if (s(a))
             return !0;
       }
-      return r.delete(o), !1;
+      return r.delete(i), !1;
     };
-    for (let o = 0; o < e.length - 1; o++) {
-      const i = e[o], a = e[o + 1];
-      i && a && this.addDependency(i, a);
+    for (let i = 0; i < e.length - 1; i++) {
+      const o = e[i], a = e[i + 1];
+      o && a && this.addDependency(o, a);
     }
-    for (const o of e)
-      if (!t.has(o) && s(o))
+    for (const i of e)
+      if (!t.has(i) && s(i))
         return !0;
     return !1;
   }
@@ -1270,13 +1270,13 @@ class ce {
     this.graph.clear();
   }
 }
-class fe {
+class le {
   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
@@ -1301,9 +1301,9 @@ class fe {
       return this.cacheHits++, this.parseCache.get(e);
     this.cacheMisses++;
     let t, r;
-    const s = e.includes("."), o = e.includes("["), i = s || o;
-    if (i)
-      if (r = e.split(/[.[]/)[0], o) {
+    const s = e.includes("."), i = e.includes("["), o = s || i;
+    if (o)
+      if (r = e.split(/[.[]/)[0], i) {
         const u = e.indexOf("]");
         if (u > -1) {
           const c = e.indexOf(".", u + 1);
@@ -1312,7 +1312,7 @@ class fe {
       } else s && (t = e.substring(e.indexOf(".") + 1));
     const a = {
       attribute: e,
-      isDeepQuery: i
+      isDeepQuery: o
     };
     return r && (a.reference = r), typeof t < "u" && t !== "" && (a.referenceAttribute = t), this.parseCache.set(e, a), a;
   }
@@ -1365,11 +1365,11 @@ class fe {
     if (!e || e.trim().length === 0)
       return r.push("Attribute path cannot be empty"), { valid: !1, errors: r };
     (e.startsWith(".") || e.endsWith(".")) && r.push(`Invalid path: Leading or trailing dots are not allowed: ${e}`), e.includes("..") && r.push(`Invalid path: Consecutive dots are not allowed: ${e}`);
-    const s = (e.match(/\[/g) || []).length, o = (e.match(/]/g) || []).length;
-    s !== o && r.push(`Invalid bracket notation: Mismatched brackets in ${e}`), e.includes("[]") && r.push(`Invalid bracket notation: Empty brackets not allowed: ${e}`);
-    const i = /\[([^\]]+)\]/g;
+    const s = (e.match(/\[/g) || []).length, i = (e.match(/]/g) || []).length;
+    s !== i && r.push(`Invalid bracket notation: Mismatched brackets in ${e}`), e.includes("[]") && r.push(`Invalid bracket notation: Empty brackets not allowed: ${e}`);
+    const o = /\[([^\]]+)\]/g;
     let a;
-    for (; (a = i.exec(e)) !== null; ) {
+    for (; (a = o.exec(e)) !== null; ) {
       const f = a[1];
       f && f !== "*" && !/^\d+$/.test(f) && r.push(`Invalid bracket content: Must be a number or '*', got '${f}' in ${e}`);
     }
@@ -1435,10 +1435,10 @@ class fe {
     return this.getPathSegments(e).length;
   }
 }
-const y = new fe();
+const y = new le();
 function x(n, e) {
   if (e.includes("[*]")) {
-    const o = e.indexOf("[*]"), i = e.substring(0, o), a = e.substring(o + 3), u = i ? K(n, i) : n;
+    const i = e.indexOf("[*]"), o = e.substring(0, i), a = e.substring(i + 3), u = o ? I(n, o) : n;
     if (!Array.isArray(u)) return [];
     const c = [];
     for (const f of u)
@@ -1447,30 +1447,30 @@ function x(n, e) {
   }
   const t = e.split(".");
   let r = [n];
-  for (const o of t) {
-    const i = [];
+  for (const i of t) {
+    const o = [];
     for (const a of r)
       if (a != null)
         if (Array.isArray(a))
           for (const u of a) {
             if (u == null) continue;
-            const c = u[o];
-            c !== void 0 && i.push(c);
+            const c = u[i];
+            c !== void 0 && o.push(c);
           }
         else {
-          const u = a[o];
-          u !== void 0 && i.push(u);
+          const u = a[i];
+          u !== void 0 && o.push(u);
         }
-    if (r = i, r.length === 0) return [];
+    if (r = o, r.length === 0) return [];
   }
   const s = [];
-  for (const o of r)
-    if (Array.isArray(o))
-      for (const i of o) i !== void 0 && s.push(i);
-    else o !== void 0 && s.push(o);
+  for (const i of r)
+    if (Array.isArray(i))
+      for (const o of i) o !== void 0 && s.push(o);
+    else i !== void 0 && s.push(i);
   return s;
 }
-function I(n) {
+function Q(n) {
   let e = 0;
   for (let t of n) {
     const r = t.toString().split(".")[1];
@@ -1484,42 +1484,42 @@ function T(n, e, t) {
 function de(n, e, t) {
   return n * t / (e * t);
 }
-const k = (n, e, t, r) => {
+const C = (n, e, t, r) => {
   if (!r)
     throw new Error("Attribute not found");
   const s = {
     attribute: r,
     types: n.types
   };
-  let o;
-  (s.types.includes("sum") || s.types.includes("avg")) && (o = ge(r, e));
   let i;
-  return (s.types.includes("min") || s.types.includes("max")) && (i = he(r, e)), n.types.forEach((a) => {
-    a === "sum" ? s.sum = o?.sum : a === "avg" ? s.avg = o?.average : a === "count" ? s.count = le(r, e) : a === "min" ? s.min = i && i[0] : a === "max" ? s.max = i && i[1] : a === "distinct" ? s.distinct = ye(n, e, t) : a === "group" && (s.group = pe(n, e));
+  (s.types.includes("sum") || s.types.includes("avg")) && (i = ye(r, e));
+  let o;
+  return (s.types.includes("min") || s.types.includes("max")) && (o = pe(r, e)), n.types.forEach((a) => {
+    a === "sum" ? s.sum = i?.sum : a === "avg" ? s.avg = i?.average : a === "count" ? s.count = he(r, e) : a === "min" ? s.min = o && o[0] : a === "max" ? s.max = o && o[1] : a === "distinct" ? s.distinct = me(n, e, t) : a === "group" && (s.group = ge(n, e));
   }), s;
-}, le = (n, e) => {
+}, he = (n, e) => {
   const r = y.parse(n).isDeepQuery;
   let s = 0;
-  for (const o of e.values())
-    if (o)
+  for (const i of e.values())
+    if (i)
       if (r)
-        s += x(o, n).filter((i) => i != null).length;
+        s += x(i, n).filter((o) => o != null).length;
       else {
-        const i = o[n];
-        if (i == null) continue;
-        Array.isArray(i) ? s += i.filter((a) => a != null).length : s++;
+        const o = i[n];
+        if (o == null) continue;
+        Array.isArray(o) ? s += o.filter((a) => a != null).length : s++;
       }
   return s;
-}, he = (n, e) => {
+}, pe = (n, e) => {
   let t, r;
-  const o = y.parse(n).isDeepQuery;
-  for (const i of e.values()) {
-    if (!i) continue;
+  const i = y.parse(n).isDeepQuery;
+  for (const o of e.values()) {
+    if (!o) continue;
     let a;
-    if (o)
-      a = x(i, n);
+    if (i)
+      a = x(o, n);
     else {
-      const u = i[n];
+      const u = o[n];
       u === void 0 ? a = [] : Array.isArray(u) ? a = u.filter((c) => c !== void 0) : a = [u];
     }
     for (const u of a)
@@ -1527,11 +1527,11 @@ const k = (n, e, t, r) => {
   }
   if (!(t === void 0 || r === void 0))
     return [t, r];
-}, pe = (n, e) => {
+}, ge = (n, e) => {
   const t = [];
-  n.groupOptions?.groups?.forEach((i) => {
+  n.groupOptions?.groups?.forEach((o) => {
     t.push({
-      option: i,
+      option: o,
       count: 0,
       keys: []
     });
@@ -1540,24 +1540,24 @@ const k = (n, e, t, r) => {
     option: { value: ["$dcupl_not_found"] },
     count: 0,
     keys: []
-  }, o = y.parse(n.attribute).isDeepQuery;
-  for (const i of e.values()) {
+  }, i = y.parse(n.attribute).isDeepQuery;
+  for (const o of e.values()) {
     let a;
-    o ? a = x(i, n.attribute) : a = [i[n.attribute]];
+    i ? a = x(o, n.attribute) : a = [o[n.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(i.key) || (f.count++, f.keys.push(i.key)), u = !0);
-    !u && n?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(i.key));
+        (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(o.key) || (f.count++, f.keys.push(o.key)), u = !0);
+    !u && n?.groupOptions?.calculateNotFound && (r.count++, r.keys.push(o.key));
   }
   return n?.groupOptions?.calculateNotFound && t.push(r), t;
-}, ge = (n, e) => {
+}, ye = (n, e) => {
   let t = 0, r = 0;
-  const o = y.parse(n).isDeepQuery;
+  const i = y.parse(n).isDeepQuery;
   for (const a of e.values()) {
     if (!a) continue;
     let u;
-    if (o)
+    if (i)
       u = x(a, n);
     else {
       const c = a[n];
@@ -1566,23 +1566,23 @@ const k = (n, e, t, r) => {
     for (const c of u)
       if (Array.isArray(c))
         for (const f of c)
-          typeof f == "number" && (t = T(t, f, I([t, f])), r++);
-      else typeof c == "number" && (t = T(t, c, I([t, c])), r++);
+          typeof f == "number" && (t = T(t, f, Q([t, f])), r++);
+      else typeof c == "number" && (t = T(t, c, Q([t, c])), r++);
   }
   return r === 0 ? void 0 : {
-    average: de(t, r, I([t, r])),
+    average: de(t, r, Q([t, r])),
     count: r,
     sum: t
   };
-}, ye = (n, e, t) => {
+}, me = (n, e, t) => {
   const r = [];
-  for (const [s, o] of t)
-    if (!(n.excludeUndefineds && typeof s > "u") && Array.from(o).find((i) => e.has(i))) {
-      const i = {
+  for (const [s, i] of t)
+    if (!(n.excludeUndefineds && typeof s > "u") && Array.from(i).find((o) => e.has(o))) {
+      const o = {
         value: s,
-        count: o.size
+        count: i.size
       };
-      if (n.distinctOptions?.skipKeys || (i.keys = Array.from(o)), r.push(i), n.distinctOptions?.limit && r.length >= n.distinctOptions.limit)
+      if (n.distinctOptions?.skipKeys || (o.keys = Array.from(i)), r.push(o), n.distinctOptions?.limit && r.length >= n.distinctOptions.limit)
         break;
     }
   return r;
@@ -1697,11 +1697,11 @@ class B {
       e.groupType && (r.groupType = e.groupType), t?.mode === "set" ? r.queries = e.queries : r.queries = [...r.queries, ...e.queries], this.applyOptions(e, "set");
     else if (this.isQuery(e)) {
       const s = r.queries.findIndex(
-        (o) => this.isQueryGroup(o) && o.groupKey === e.attribute
+        (i) => this.isQueryGroup(i) && i.groupKey === e.attribute
       );
       if (s > -1) {
-        const o = r.queries[s];
-        t?.mode === "set" ? o.queries = [e] : o.queries.push(e);
+        const i = r.queries[s];
+        t?.mode === "set" ? i.queries = [e] : i.queries.push(e);
       } else
         r.queries.push({
           groupKey: e.attribute,
@@ -1710,11 +1710,11 @@ class B {
         });
     } else if (this.isQueryGroup(e)) {
       const s = r.queries.findIndex(
-        (o) => this.isQueryGroup(o) && o.groupKey === e.groupKey
+        (i) => this.isQueryGroup(i) && i.groupKey === e.groupKey
       );
       if (s > -1) {
-        const o = r.queries[s];
-        e.groupType && (o.groupType = e.groupType), t?.mode === "set" ? r.queries[s] = e : o.queries = [...o.queries, ...e.queries];
+        const i = r.queries[s];
+        e.groupType && (i.groupType = e.groupType), t?.mode === "set" ? r.queries[s] = e : i.queries = [...i.queries, ...e.queries];
       } else
         r.queries.push({
           groupKey: e.groupKey,
@@ -1747,8 +1747,8 @@ class B {
         (s) => this.isQueryGroup(s) && s.groupKey === e.attribute
       );
       if (r > -1) {
-        const s = t.queries[r], o = C(s.queries, e);
-        o > -1 && s.queries.splice(o, 1), s.queries.length === 0 && t.queries.splice(r, 1);
+        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)) {
       const r = t.queries.findIndex(
@@ -1759,9 +1759,9 @@ class B {
           t.queries.splice(r, 1);
         else {
           const s = t.queries[r];
-          for (const o of e.queries) {
-            const i = C(s.queries, o);
-            i > -1 && s.queries.splice(i, 1);
+          for (const i of e.queries) {
+            const o = E(s.queries, i);
+            o > -1 && s.queries.splice(o, 1);
           }
           s.queries.length === 0 && t.queries.splice(r, 1);
         }
@@ -1773,8 +1773,8 @@ class B {
     if (this.isQuery(e))
       return e.attribute || t.push(new A("Missing attribute", e)), e.operator || t.push(new A("Missing operator", e)), typeof e.value > "u" && t.push(new A("Missing value", e)), e.operator === "find" && Array.isArray(e.value) && t.push(new A("find operator cannot have array value", e)), t.length > 0 ? { valid: !1, errors: t } : { valid: !0 };
     if (this.isQueryGroup(e)) {
-      const o = e.queries.map((i) => this.validateQuery(i)).filter((i) => !i.valid).map((i) => i.errors).flat();
-      return o.length > 0 ? { valid: !1, errors: o } : { valid: !0 };
+      const i = e.queries.map((o) => this.validateQuery(o)).filter((o) => !o.valid).map((o) => o.errors).flat();
+      return i.length > 0 ? { valid: !1, errors: i } : { valid: !0 };
     }
     return t.push(new A("Invalid query definition", e)), { valid: !1, errors: t };
   }
@@ -1786,9 +1786,9 @@ class B {
    * @returns Array of attribute names
    */
   getQueryAttributes(e) {
-    const t = [], r = /* @__PURE__ */ new Set(), s = (o) => {
-      for (const i of o)
-        this.isQuery(i) ? i.attribute && !r.has(i.attribute) && (t.push(i.attribute), r.add(i.attribute)) : this.isQueryGroup(i) && s(i.queries);
+    const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
+      for (const o of i)
+        this.isQuery(o) ? o.attribute && !r.has(o.attribute) && (t.push(o.attribute), r.add(o.attribute)) : this.isQueryGroup(o) && s(o.queries);
     };
     return s(e?.queries || this.currentQuery.queries), t;
   }
@@ -1800,14 +1800,14 @@ class B {
    * @returns Array of QueryAttributeEntry objects
    */
   extractQueryAttributes(e) {
-    const t = [], r = /* @__PURE__ */ new Set(), s = (o) => {
-      for (const i of o)
-        if (this.isQuery(i)) {
-          if (i.attribute && !r.has(i.attribute)) {
-            const a = this.getQueryAttributeForString(i.attribute);
-            t.push(a), r.add(i.attribute);
+    const t = [], r = /* @__PURE__ */ new Set(), s = (i) => {
+      for (const o of i)
+        if (this.isQuery(o)) {
+          if (o.attribute && !r.has(o.attribute)) {
+            const a = this.getQueryAttributeForString(o.attribute);
+            t.push(a), r.add(o.attribute);
           }
-        } else this.isQueryGroup(i) && s(i.queries);
+        } else this.isQueryGroup(o) && s(o.queries);
     };
     return s(e?.queries || this.currentQuery.queries), t;
   }
@@ -1848,9 +1848,9 @@ class B {
             t[r.reference] || (t[r.reference] = { $: !0 });
             const s = this.deepQueryService.parse(r.referenceAttribute);
             if (s.isDeepQuery && r.reference) {
-              const o = this.getProjectionForAttributeEntries([s]);
-              Object.keys(o).forEach((i) => {
-                i !== "$" && r.reference && (t[r.reference][i] = o[i]);
+              const i = this.getProjectionForAttributeEntries([s]);
+              Object.keys(i).forEach((o) => {
+                o !== "$" && r.reference && (t[r.reference][o] = i[o]);
               });
             } else r.reference && (t[r.reference][r.referenceAttribute] = !0);
           } else
@@ -2148,13 +2148,13 @@ class B {
     const t = (r) => {
       for (const s of r)
         if (this.isQuery(s)) {
-          let o = !0;
-          for (const i in e)
-            if (s[i] !== e[i]) {
-              o = !1;
+          let i = !0;
+          for (const o in e)
+            if (s[o] !== e[o]) {
+              i = !1;
               break;
             }
-          if (o) return !0;
+          if (i) return !0;
         } else if (this.isQueryGroup(s) && t(s.queries))
           return !0;
       return !1;
@@ -2275,24 +2275,24 @@ class B {
     return e(this.currentQuery.queries);
   }
 }
-const M = new B();
-function Ue(n, e, t, r, s, o, i) {
-  const a = M.removeQuery({ groupKey: s }, v(r)), u = i.queryData(n, a, !1, o), c = e ? [...e.keys()] : [], f = new Set(c), d = o.get(s);
+const N = new B();
+function Xe(n, e, t, r, s, i, o) {
+  const a = N.removeQuery({ groupKey: s }, v(r)), u = o.queryData(n, a, !1, i), c = e ? [...e.keys()] : [], f = new Set(c), l = i.get(s);
   if (!t.excludeUnresolved)
-    for (const h of d.keys())
+    for (const h of l.keys())
       f.add(h);
   if (t.excludeUndefineds ? f.delete(void 0) : f.add(void 0), t.sort) {
     const h = [];
     for (const m of f.values())
-      h.push(G(m, d, u, e, s, r, !0));
+      h.push(G(m, l, u, e, s, r, !0));
     const g = t.excludeZeros ? h.filter((m) => m.size > 0) : h;
-    return g.sort(me(t.sort)), t.count ? g.slice(0, t.count) : g;
+    return g.sort(ve(t.sort)), t.count ? g.slice(0, t.count) : g;
   }
-  const l = [];
+  const d = [];
   for (const h of f.values()) {
     const g = G(
       h,
-      d,
+      l,
       u,
       e,
       s,
@@ -2300,24 +2300,24 @@ function Ue(n, e, t, r, s, o, i) {
       !!t?.calculateFacets
     );
     if (!(t?.excludeZeros && g.size === 0)) {
-      if (t?.count && l.length === t?.count)
-        return l;
-      l.push(g);
+      if (t?.count && d.length === t?.count)
+        return d;
+      d.push(g);
     }
   }
-  return l;
+  return d;
 }
-function G(n, e, t, r, s, o, i) {
+function G(n, e, t, r, s, i, o) {
   const a = /* @__PURE__ */ new Map(), u = e.get(n) || /* @__PURE__ */ new Set();
   for (const c of u) {
     const f = t.get(c);
-    if (f && (a.set(c, f), !i))
+    if (f && (a.set(c, f), !o))
       break;
   }
   return {
     key: String(n),
     value: n,
-    selected: ve(s, n, o),
+    selected: we(s, n, i),
     enabled: a.size > 0,
     size: a.size,
     entry: r.get(n),
@@ -2332,10 +2332,10 @@ function D(n, e) {
   if (t !== r) return t < r ? -1 : 1;
   if (t === "number") return n - e;
   if (t === "string") return n.localeCompare(e);
-  const s = String(n), o = String(e);
-  return s < o ? -1 : s > o ? 1 : 0;
+  const s = String(n), i = String(e);
+  return s < i ? -1 : s > i ? 1 : 0;
 }
-function me(n) {
+function ve(n) {
   switch (n) {
     case "size-desc":
       return (e, t) => t.size - e.size || D(e.value, t.value);
@@ -2347,17 +2347,17 @@ function me(n) {
       return (e, t) => e.value === void 0 && t.value === void 0 ? 0 : e.value === void 0 ? 1 : t.value === void 0 ? -1 : -D(e.value, t.value);
   }
 }
-const ve = (n, e, t) => {
-  const r = t.queries.findIndex((s) => M.isQueryGroup(s) && s.groupKey === n);
-  return r > -1 ? !!t.queries[r].queries.find((o) => {
-    if (M.isQuery(o)) {
-      const i = o.value?.key || o.value;
-      return o.attribute === n && i === e;
+const we = (n, e, t) => {
+  const r = t.queries.findIndex((s) => N.isQueryGroup(s) && s.groupKey === n);
+  return r > -1 ? !!t.queries[r].queries.find((i) => {
+    if (N.isQuery(i)) {
+      const o = i.value?.key || i.value;
+      return i.attribute === n && o === e;
     }
     return !1;
   }) : !1;
 };
-class we {
+class xe {
   indexMap = /* @__PURE__ */ new Map();
   // Possible performance gain*
   dataMap = /* @__PURE__ */ new Map();
@@ -2371,33 +2371,33 @@ class we {
     let r = this.dataMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this.dataMap.set(e, r));
     for (const s of t) {
-      let o;
+      let i;
       if (typeof s == "object" && s && s.key)
-        o = s.key;
+        i = s.key;
       else if (Array.isArray(s)) {
         for (const a of s)
           this.fillDataMap(e, [a]);
         return;
-      } else s instanceof Date ? o = s.toISOString() : o = s;
-      let i = r.get(o);
-      i || (i = { key: o }, this.dataMap.get(e)?.set(o, i));
+      } else s instanceof Date ? i = s.toISOString() : i = s;
+      let o = r.get(i);
+      o || (o = { key: i }, this.dataMap.get(e)?.set(i, o));
     }
   }
   fillInverseIndex(e, t, r) {
     if (!e || !t || !r || !Array.isArray(r))
       return;
     const s = this.indexMap.get(e) || /* @__PURE__ */ new Map();
-    for (const o of r) {
-      let i;
-      if (typeof o == "object" && o && o.key)
-        i = o.key;
-      else if (Array.isArray(o)) {
-        for (const u of o)
+    for (const i of r) {
+      let o;
+      if (typeof i == "object" && i && i.key)
+        o = i.key;
+      else if (Array.isArray(i)) {
+        for (const u of i)
           this.fillInverseIndex(e, t, [u]);
         return;
-      } else o instanceof Date ? i = o.toISOString() : i = o;
-      let a = s.get(i);
-      a || (a = /* @__PURE__ */ new Set(), s.set(i, a)), a.add(t);
+      } else i instanceof Date ? o = i.toISOString() : o = i;
+      let a = s.get(o);
+      a || (a = /* @__PURE__ */ new Set(), s.set(o, a)), a.add(t);
     }
     this.indexMap.set(e, s);
   }
@@ -2411,11 +2411,11 @@ class we {
   }
   getOrCreateIndex(e, t, r) {
     const s = this.getIndexName(e, r);
-    let o = this.getIndex(s);
-    const i = this.indexMetadata.get(s);
-    if (i)
-      i.lastAccessedAt = Date.now();
-    else if (!o) {
+    let i = this.getIndex(s);
+    const o = this.indexMetadata.get(s);
+    if (o)
+      o.lastAccessedAt = Date.now();
+    else if (!i) {
       const u = y.parse(e).isDeepQuery ?? !1;
       this.indexMetadata.set(s, {
         createdAt: Date.now(),
@@ -2424,19 +2424,19 @@ class we {
         type: u ? "deep" : "shallow"
       });
     }
-    if (!o) {
+    if (!i) {
       this.reset(s), this.indexMap.set(s, /* @__PURE__ */ new Map());
       const u = y.parse(e).isDeepQuery;
       for (const c of t.values()) {
         let f;
         u ? (f = x(c, e), f.length === 0 && (f = [void 0])) : f = [c[e]], this.fillInverseIndex(s, c.key, f), this.fillDataMap(s, f);
       }
-      o = this.getIndex(s) || /* @__PURE__ */ new Map();
+      i = this.getIndex(s) || /* @__PURE__ */ new Map();
     }
-    return o;
+    return i;
   }
   getIndexName(e, t) {
-    return t ? e + "_" + N(t) : e;
+    return t ? e + "_" + K(t) : e;
   }
   // ========== PARTIAL UPDATE METHODS ==========
   /**
@@ -2448,17 +2448,17 @@ class we {
   removeFromInverseIndex(e, t, r) {
     const s = this.indexMap.get(e);
     if (s)
-      for (const o of r) {
-        let i;
-        if (typeof o == "object" && o && o.key)
-          i = o.key;
-        else if (Array.isArray(o)) {
-          for (const u of o)
+      for (const i of r) {
+        let o;
+        if (typeof i == "object" && i && i.key)
+          o = i.key;
+        else if (Array.isArray(i)) {
+          for (const u of i)
             this.removeFromInverseIndex(e, t, [u]);
           return;
-        } else o instanceof Date ? i = o.toISOString() : i = o;
-        const a = s.get(i);
-        a && (a.delete(t), a.size === 0 && s.delete(i));
+        } else i instanceof Date ? o = i.toISOString() : o = i;
+        const a = s.get(o);
+        a && (a.delete(t), a.size === 0 && s.delete(o));
       }
   }
   /**
@@ -2480,15 +2480,15 @@ class we {
     const r = this.dataMap.get(e);
     if (r)
       for (const s of t) {
-        let o;
+        let i;
         if (typeof s == "object" && s && s.key)
-          o = s.key;
+          i = s.key;
         else if (Array.isArray(s)) {
-          for (const i of s)
-            this.removeFromDataMap(e, [i]);
+          for (const o of s)
+            this.removeFromDataMap(e, [o]);
           return;
-        } else s instanceof Date ? o = s.toISOString() : o = s;
-        r.delete(o);
+        } else s instanceof Date ? i = s.toISOString() : i = s;
+        r.delete(i);
       }
   }
   /**
@@ -2580,8 +2580,8 @@ class we {
   cleanupStaleIndices(e = 300 * 1e3) {
     const t = Date.now();
     let r = 0;
-    for (const [s, o] of this.indexMetadata)
-      t - o.lastAccessedAt > e && (this.reset(s), r++);
+    for (const [s, i] of this.indexMetadata)
+      t - i.lastAccessedAt > e && (this.reset(s), r++);
     return r;
   }
   /**
@@ -2591,175 +2591,175 @@ class we {
   getStats() {
     const e = this.getIndexCount(), t = Date.now();
     let r = 0, s = 0;
-    for (const i of this.indexMetadata.values()) {
-      const a = t - i.createdAt;
+    for (const o of this.indexMetadata.values()) {
+      const a = t - o.createdAt;
       r += a, a > s && (s = a);
     }
-    const o = this.indexMetadata.size > 0 ? r / this.indexMetadata.size : 0;
+    const i = this.indexMetadata.size > 0 ? r / this.indexMetadata.size : 0;
     return {
       shallow: e.shallow,
       deep: e.deep,
       total: e.total,
       oldestAge: s,
-      avgAge: o
+      avgAge: i
     };
   }
 }
 const w = "__";
-function _(n, e, t = { key: "root" }, r = "root", s = new we(), o) {
-  const i = o || n;
+function P(n, e, t = { key: "root" }, r = "root", s = new xe(), i) {
+  const o = i || n;
   for (const a of e.columns)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, i));
+    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.rows)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, i));
+    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   for (const a of e.values)
-    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, i));
+    a.attribute && (y.parse(a.attribute), s.getOrCreateIndex(a.attribute, o));
   if (e.rows && e.rows.length > 0) {
     t.rows = t.rows || [];
-    const a = xe(n, e.rows[0], e, s, r, o);
+    const a = Ae(n, e.rows[0], e, s, r, i);
     t.rows.push(a);
   }
   if (e.columns && e.columns.length > 0) {
     t.columns = t.columns || [];
-    const a = P(n, e.columns[0], e, s, r, o);
+    const a = W(n, e.columns[0], e, s, r, i);
     t.columns.push(a);
   }
   if (t.key === "root")
     for (const a of e.values) {
       if (t.values = t.values || [], r === "root" && e.options?.calculateTotals === !1)
         continue;
-      const u = k(a, n, s.getIndex(a.attribute), a.attribute);
+      const u = C(a, n, s.getIndex(a.attribute), a.attribute);
       t.values.push(u);
     }
   return t;
 }
-function xe(n, e, t, r, s = "", o) {
-  const i = { key: e.attribute }, a = r.getIndex(e.attribute);
+function Ae(n, e, t, r, s = "", i) {
+  const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
-    return i;
+    return o;
   for (const [u, c] of a.entries()) {
     const f = {
       key: u,
       value: u
-    }, d = /* @__PURE__ */ new Map();
-    for (const l of c)
-      n.has(l) && d.set(l, n.get(l));
-    if (d.size) {
-      for (const l of t.values) {
+    }, l = /* @__PURE__ */ new Map();
+    for (const d of c)
+      n.has(d) && l.set(d, n.get(d));
+    if (l.size) {
+      for (const d of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = k(l, d, r.getIndex(l.attribute), l.attribute);
+        const h = C(d, l, r.getIndex(d.attribute), d.attribute);
         f.values.push(h);
       }
-      if (i.rows = i.rows || [], i.rows.push(f), t.rows.length > 1) {
-        const l = { ...t, rows: t.rows.slice(1) };
-        _(
-          d,
+      if (o.rows = o.rows || [], o.rows.push(f), t.rows.length > 1) {
+        const d = { ...t, rows: t.rows.slice(1) };
+        P(
           l,
+          d,
           f,
           s + w + e.attribute + w + u,
           r,
-          o
+          i
         );
       } else if (t.columns)
-        for (const l of t.columns) {
+        for (const d of t.columns) {
           f.columns = f.columns || [];
-          const h = P(
-            d,
+          const h = W(
             l,
+            d,
             t,
             r,
             s + w + e.attribute + w + u,
-            o
+            i
           );
           f.columns.push(h);
         }
     }
   }
-  return i;
+  return o;
 }
-function P(n, e, t, r, s = "", o) {
-  const i = { key: e.attribute }, a = r.getIndex(e.attribute);
+function W(n, e, t, r, s = "", i) {
+  const o = { key: e.attribute }, a = r.getIndex(e.attribute);
   if (!a)
-    return i;
+    return o;
   for (const [u, c] of a.entries()) {
     const f = {
       key: u,
       value: u
-    }, d = /* @__PURE__ */ new Map();
-    for (const l of c)
-      n.has(l) && d.set(l, n.get(l));
-    if (d.size) {
-      for (const l of t.values) {
+    }, l = /* @__PURE__ */ new Map();
+    for (const d of c)
+      n.has(d) && l.set(d, n.get(d));
+    if (l.size) {
+      for (const d of t.values) {
         if (f.values = f.values || [], s === "root" && e?.calculateTotals === !1)
           continue;
-        const h = k(l, d, r.getIndex(l.attribute), l.attribute);
+        const h = C(d, l, r.getIndex(d.attribute), d.attribute);
         f.values.push(h);
       }
-      if (i.columns = i.columns || [], i.columns.push(f), t.columns.length > 1) {
-        const l = { ...t, columns: t.columns.slice(1) };
-        _(
-          d,
+      if (o.columns = o.columns || [], o.columns.push(f), t.columns.length > 1) {
+        const d = { ...t, columns: t.columns.slice(1) };
+        P(
           l,
+          d,
           f,
           s + w + e.attribute + w + u,
           r,
-          o
+          i
         );
       }
     }
   }
-  return i;
+  return o;
 }
-const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/, be = /^-?\d+$/, Se = /^-?\d+\.\d+$/, De = /^\d{1,2}([/.-])\d{1,2}\1\d{2,4}$/, Ke = (n) => n === "true" || n === "false" ? "boolean" : be.test(n) ? "int" : Se.test(n) ? "float" : Ae.test(n) && !Number.isNaN(Date.parse(n)) ? "date" : "string", Ie = (n) => De.test(n), Qe = (n) => n == null || n === "", Me = (n) => {
+const be = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/, Se = /^-?\d+$/, De = /^-?\d+\.\d+$/, Ie = /^\d{1,2}([/.-])\d{1,2}\1\d{2,4}$/, Ke = (n) => n === "true" || n === "false" ? "boolean" : Se.test(n) ? "int" : De.test(n) ? "float" : be.test(n) && !Number.isNaN(Date.parse(n)) ? "date" : "string", Qe = (n) => Ie.test(n), Me = (n) => n == null || n === "", ke = (n) => {
   const e = [...n];
   return e.length <= 1 ? { type: e[0] ?? "any", conflict: !1 } : e.every((t) => t === "int" || t === "float") ? { type: "float", conflict: !1 } : { type: "any", conflict: !0 };
 }, Ne = (n, e = {}) => {
-  const r = e.deep ?? (e.sampleSize !== void 0 && e.sampleSize > 1) ? e.sampleSize ?? 1 / 0 : 1, s = e.coerceStrings ?? !0, o = /* @__PURE__ */ new Map(), i = [], a = Math.min(n.length, r);
+  const r = e.deep ?? (e.sampleSize !== void 0 && e.sampleSize > 1) ? e.sampleSize ?? 1 / 0 : 1, s = e.coerceStrings ?? !0, i = /* @__PURE__ */ new Map(), o = [], a = Math.min(n.length, r);
   for (let f = 0; f < a; f++) {
-    const d = n[f];
-    if (d)
-      for (const [l, h] of Object.entries(d)) {
-        let g = o.get(l);
-        if (g || (g = { observed: /* @__PURE__ */ new Set(), empty: 0, scanned: 0 }, o.set(l, g), i.push(l)), g.scanned++, Qe(h)) {
+    const l = n[f];
+    if (l)
+      for (const [d, h] of Object.entries(l)) {
+        let g = i.get(d);
+        if (g || (g = { observed: /* @__PURE__ */ new Set(), empty: 0, scanned: 0 }, i.set(d, g), o.push(d)), g.scanned++, Me(h)) {
           g.empty++;
           continue;
         }
         let m;
-        typeof h == "string" && s ? (m = Ke(h), m === "string" && !g.hint && Ie(h) && (g.hint = "column looks date-like (non-ISO) — review manually")) : m = Ee(h), g.observed.add(m);
+        typeof h == "string" && s ? (m = Ke(h), m === "string" && !g.hint && Qe(h) && (g.hint = "column looks date-like (non-ISO) — review manually")) : m = $e(h), g.observed.add(m);
       }
   }
   const u = [], c = [];
-  for (const f of i) {
-    const d = o.get(f), { type: l, conflict: h } = Me(d.observed.size ? d.observed : /* @__PURE__ */ new Set(["string"]));
-    u.push({ key: f, type: l }), c.push({
+  for (const f of o) {
+    const l = i.get(f), { type: d, conflict: h } = ke(l.observed.size ? l.observed : /* @__PURE__ */ new Set(["string"]));
+    u.push({ key: f, type: d }), c.push({
       column: f,
-      inferredType: l,
-      observedTypes: [...d.observed].sort(),
-      emptyRate: d.scanned === 0 ? 0 : d.empty / d.scanned,
+      inferredType: d,
+      observedTypes: [...l.observed].sort(),
+      emptyRate: l.scanned === 0 ? 0 : l.empty / l.scanned,
       conflict: h,
-      hint: d.hint
+      hint: l.hint
     });
   }
   return { properties: u, diagnostics: c };
-}, Je = (n, e = !1) => Ne(n, typeof e == "boolean" ? { deep: e } : e).properties, ke = (n) => Number(n) === n && n % 1 === 0, Ce = (n) => Number(n) === n && n % 1 !== 0, Ee = (n) => {
+}, Ye = (n, e = !1) => Ne(n, typeof e == "boolean" ? { deep: e } : e).properties, Ce = (n) => Number(n) === n && n % 1 === 0, Ee = (n) => Number(n) === n && n % 1 !== 0, $e = (n) => {
   switch (typeof n) {
     case "string":
       return "string";
     case "number":
-      return ke(n) ? "int" : Ce(n) ? "float" : "any";
+      return Ce(n) ? "int" : Ee(n) ? "float" : "any";
     case "boolean":
       return "boolean";
     case "object":
-      return re(n) ? "date" : "json";
+      return se(n) ? "date" : "json";
     default:
       return "any";
   }
-}, Ze = (n, e) => {
-  const t = ee(n.text || ""), r = e?.attributeKey || n.filterKey;
+}, et = (n, e) => {
+  const t = te(n.text || ""), r = e?.attributeKey || n.filterKey;
   let s;
-  const o = e?.comparisonType || "containsIgnoreCase";
-  return o === "containsIgnoreCase" ? s = {
+  const i = e?.comparisonType || "containsIgnoreCase";
+  return i === "containsIgnoreCase" ? s = {
     groupKey: n.filterKey,
     queries: [
       {
@@ -2772,7 +2772,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         }
       }
     ]
-  } : o === "containsIgnoreCaseAndWhitespace" ? s = {
+  } : i === "containsIgnoreCaseAndWhitespace" ? s = {
     groupKey: n.filterKey,
     queries: [
       {
@@ -2785,7 +2785,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         }
       }
     ]
-  } : o === "contains" ? s = {
+  } : i === "contains" ? s = {
     groupKey: n.filterKey,
     queries: [
       {
@@ -2795,7 +2795,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         operator: "find"
       }
     ]
-  } : o === "equal" ? s = {
+  } : i === "equal" ? s = {
     groupKey: n.filterKey,
     queries: [
       {
@@ -2805,7 +2805,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
         operator: "eq"
       }
     ]
-  } : o === "equalIgnoreCase" && (s = {
+  } : i === "equalIgnoreCase" && (s = {
     groupKey: n.filterKey,
     queries: [
       {
@@ -2819,7 +2819,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       }
     ]
   }), s;
-}, Ye = (n, e) => {
+}, tt = (n, e) => {
   const t = e?.attributeKey || n.filterKey;
   return {
     groupKey: n.filterKey,
@@ -2832,7 +2832,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       }
     ]
   };
-}, Xe = (n, e) => {
+}, rt = (n, e) => {
   const t = e?.attributeKey || n.filterKey, r = {
     groupKey: n.filterKey,
     queries: []
@@ -2847,7 +2847,7 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
     operator: "eq",
     options: { invert: !0 }
   })), typeof n.gt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.gt, operator: "gt" })), typeof n.lt < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.lt, operator: "lt" })), typeof n.gte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.gte, operator: "gte" })), typeof n.lte < "u" && (r.groupType = "and", r.queries.push({ attribute: t, value: n.lte, operator: "lte" })), r;
-}, et = (n, e) => {
+}, st = (n, e) => {
   const t = e?.attributeKey || n.filterKey, r = {
     groupKey: n.filterKey,
     queries: []
@@ -2860,8 +2860,8 @@ const Ae = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?
       operator: "eq"
     });
   }), r;
-}, tt = (n) => !(typeof n.modelKey != "string" || !Array.isArray(n.queries));
-class rt {
+}, nt = (n) => !(typeof n.modelKey != "string" || !Array.isArray(n.queries));
+class it {
   constructor(e, t, r) {
     this.scriptController = e, this.globalItemService = t, this.modelParser = r;
   }
@@ -2881,62 +2881,62 @@ class rt {
   }
   evaluateQuery(e, t) {
     let r, s = e.value;
-    const o = 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 = K(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))
+    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 = I(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 ? !$(r, s) : $(r, s);
       case "find":
-        return e.options?.invert ? !this.queryFind(r, s, o) : this.queryFind(r, s, o);
+        return e.options?.invert ? !this.queryFind(r, s, i) : this.queryFind(r, s, i);
       case "lt":
-        return Array.isArray(r) ? o === "some" ? r.some((i) => i < s) : r.every((i) => i < s) : r < s;
+        return Array.isArray(r) ? i === "some" ? r.some((o) => o < s) : r.every((o) => o < s) : r < s;
       case "gt":
-        return Array.isArray(r) ? o === "some" ? r.some((i) => i > s) : r.every((i) => i > s) : r > s;
+        return Array.isArray(r) ? i === "some" ? r.some((o) => o > s) : r.every((o) => o > s) : r > s;
       case "lte":
-        return Array.isArray(r) ? o === "some" ? r.some((i) => i <= s) : r.every((i) => i <= s) : r <= s;
+        return Array.isArray(r) ? i === "some" ? r.some((o) => o <= s) : r.every((o) => o <= s) : r <= s;
       case "gte":
-        return Array.isArray(r) ? o === "some" ? r.some((i) => i >= s) : r.every((i) => i >= s) : r >= s;
+        return Array.isArray(r) ? i === "some" ? r.some((o) => o >= s) : r.every((o) => o >= s) : r >= s;
       case "typeof":
-        return e.options?.invert ? typeof r !== s : Array.isArray(r) ? o === "some" ? r.some((i) => typeof i === s) : r.every((i) => typeof i === s) : typeof r === s;
+        return e.options?.invert ? typeof r !== s : Array.isArray(r) ? i === "some" ? r.some((o) => typeof o === s) : r.every((o) => typeof o === s) : typeof r === s;
       case "isTruthy":
-        return s === !0 ? Array.isArray(r) ? o === "some" ? r.some((i) => typeof !!i) : r.every((i) => typeof !!i) : !!r : !r;
+        return s === !0 ? Array.isArray(r) ? i === "some" ? r.some((o) => typeof !!o) : r.every((o) => typeof !!o) : !!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 });
         if (this.registeredCustomOperator.has(e.operator)) {
-          const i = this.registeredCustomOperator.get(e.operator);
-          if (typeof i == "function")
-            return i(e, t);
+          const o = this.registeredCustomOperator.get(e.operator);
+          if (typeof o == "function")
+            return o(e, t);
         }
     }
     return !1;
   }
   evaluateEqOperator(e, t, r, s) {
-    const o = /* @__PURE__ */ new Map(), i = s.get(t.attribute);
-    if (i) {
+    const i = /* @__PURE__ */ new Map(), o = s.get(t.attribute);
+    if (o) {
       let a;
       if (typeof t.value == "string" ? a = t.value : t.value?.key && Object.keys(t.value).length === 1 && (a = t.value.key), typeof a < "u") {
-        const u = i.get(a);
+        const u = o.get(a);
         if (u)
           if (u.forEach((c) => {
-            r.has(c) && o.set(c, r.get(c));
+            r.has(c) && i.set(c, r.get(c));
           }), t.options?.invert) {
-            const c = O(Array.from(r.values()), Array.from(o.values()), "key"), f = /* @__PURE__ */ new Map();
-            return c.forEach((d) => {
-              f.set(d.key, d);
+            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 o;
+            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)
+          c.filter((l) => l.isDeepQuery)
         );
         u = this.globalItemService.getProjectedData(
           f,
@@ -2944,12 +2944,12 @@ class rt {
           u
         );
       }
-      this.evaluateQuery(t, u) && o.set(a, u);
+      this.evaluateQuery(t, u) && i.set(a, u);
     }
-    return o;
+    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 {
@@ -2958,7 +2958,7 @@ class rt {
     else return Array.isArray(e) ? !!e.find((r) => S(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) => S(s, t, this.equalRegexFn)) : e.every((s) => S(s, t, this.equalRegexFn)) : !!U(e, t) : S(e, t, this.equalRegexFn);
+    return Array.isArray(e) ? typeof t == "string" || typeof t == "number" || typeof t == "boolean" ? r === "some" ? e.some((s) => S(s, t, this.equalRegexFn)) : e.every((s) => S(s, t, this.equalRegexFn)) : !!J(e, t) : S(e, t, this.equalRegexFn);
   }
   validateQuery(e) {
     if (this.queryBuilder.isQuery(e)) {
@@ -2974,39 +2974,39 @@ class rt {
     }
   }
   getEvaluatedQueryDataset(e, t, r, s) {
-    const o = /* @__PURE__ */ new Map();
+    const i = /* @__PURE__ */ new Map();
     if (t.attribute.includes("[*]")) {
-      const i = t.options?.invert === !0, a = /* @__PURE__ */ new Set();
+      const o = 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(
+        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 f = this.handleArrayStarQuery(t, u);
-        let d = !1;
-        for (const l of f.queries) {
-          const h = { ...l, options: { ...l.options, invert: !1 } };
+        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), i || o.set(u.key, u));
+        l && (a.add(u.key), o || i.set(u.key, u));
       }
-      if (i)
+      if (o)
         for (const [u, c] of r)
-          a.has(u) || o.set(u, c);
+          a.has(u) || i.set(u, c);
     } else {
       if (t.operator === "eq")
         return this.evaluateEqOperator(e, t, r, s);
-      for (let [i, a] of r) {
+      for (let [o, a] of r) {
         const u = this.queryBuilder.extractQueryAttributes({ queries: [t] });
         if (u.some((c) => c.isDeepQuery)) {
           const c = this.queryBuilder.getProjectionForAttributeEntries(
@@ -3018,10 +3018,10 @@ class rt {
             a
           );
         }
-        this.evaluateQuery(t, a) && o.set(i, a);
+        this.evaluateQuery(t, a) && i.set(o, a);
       }
     }
-    return o;
+    return i;
   }
   handleArrayStarQuery(e, t) {
     const r = e.attribute.indexOf("[*]"), s = {
@@ -3030,9 +3030,9 @@ class rt {
       queries: []
     };
     if (r !== -1) {
-      const o = e.attribute.substring(0, r), i = o.includes(".") ? K(t, o) : t[o];
-      if (Array.isArray(i))
-        for (let a = 0; a < i.length; a++) {
+      const i = e.attribute.substring(0, r), o = i.includes(".") ? I(t, i) : t[i];
+      if (Array.isArray(o))
+        for (let a = 0; a < o.length; a++) {
           const u = e.attribute.replace("[*]", `[${a}]`);
           s.queries.push({
             attribute: u,
@@ -3044,28 +3044,28 @@ class rt {
     }
     return s;
   }
-  evaluateQueryGroup(e, t, r, s, o) {
-    let i = /* @__PURE__ */ new Map(), a = r;
+  evaluateQueryGroup(e, t, r, s, i) {
+    let o = /* @__PURE__ */ new Map(), a = r;
     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, o) : c = this.evaluateQueryGroup(e, u, a, s, o), i.size === 0 && (i = c), t.groupType === "or")
+      if (this.queryBuilder.isQuery(u) ? c = this.getEvaluatedQueryDataset(e, u, a, i) : c = this.evaluateQueryGroup(e, u, a, s, i), o.size === 0 && (o = c), t.groupType === "or")
         c.forEach((f) => {
-          i.set(f.key, f);
+          o.set(f.key, f);
         });
       else {
-        const f = O(Array.from(i.values()), Array.from(c.values()), "key");
-        for (const d of f)
-          i.delete(d.key);
+        const f = O(Array.from(o.values()), Array.from(c.values()), "key");
+        for (const l of f)
+          o.delete(l.key);
       }
-      t.groupType === "and" ? a = i : a = r;
+      t.groupType === "and" ? a = o : a = r;
     }
-    return i;
+    return o;
   }
   queryData(e, t, r, s) {
-    const o = new Map(e);
-    return t.queries.length === 0 ? e : (t.groupKey || (t.groupKey = "root"), t.groupType || (t.groupType = "and"), t.queries || (t.queries = []), this.validateQuery(t), this.evaluateQueryGroup(t, t, o, r, s));
+    const i = new Map(e);
+    return t.queries.length === 0 ? e : (t.groupKey || (t.groupKey = "root"), t.groupType || (t.groupType = "and"), t.queries || (t.queries = []), this.validateQuery(t), this.evaluateQueryGroup(t, t, i, r, s));
   }
   // public getRelevantQueryData(data: any, options: DcuplGlobalQueryOptions<any>, model: DcuplModel<ListItem>) {
   //   // detect if any of the query attributes are a deep query.
@@ -3101,7 +3101,29 @@ class rt {
   //   }
   // }
 }
-class st {
+const Oe = "k:", qe = "h:";
+function M(n, e = 0) {
+  if (n.key)
+    return `${Oe}${n.key}`;
+  const t = K({
+    type: n.type,
+    url: n.rawUrl ?? n.url,
+    model: n.model ?? "",
+    occurrence: e
+  });
+  return `${qe}${t}`;
+}
+function ot(n) {
+  const e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set();
+  return n.map((r) => {
+    const s = `${r.key ?? ""}|${r.type}|${r.rawUrl ?? r.url}|${r.model ?? ""}`;
+    let i = e.get(s) ?? 0, o = M(r, i);
+    for (; t.has(o); )
+      i += 1, o = r.key ? `${M(r)}#${i}` : M(r, i);
+    return e.set(s, i + 1), t.add(o), o;
+  });
+}
+class at {
   scripts = /* @__PURE__ */ new Map();
   scriptFunctions = /* @__PURE__ */ new Map();
   constructor() {
@@ -3127,8 +3149,8 @@ class st {
     const r = this.getScript(e);
     if (!r)
       throw new Error(`Script ${e} not found`);
-    const s = this.getWrapperScript(r), o = new Function("script_type", ...t, s);
-    return this.scriptFunctions.set(e, o), o;
+    const s = this.getWrapperScript(r), i = new Function("script_type", ...t, s);
+    return this.scriptFunctions.set(e, i), i;
   }
   getWrapperScript(e) {
     return `
@@ -3140,14 +3162,14 @@ class st {
     if (!this.getScript(e))
       throw new Error(`Script ${e} not found`);
     r.context || (r.context = r.options || {});
-    const o = Object.keys(r), i = Object.values(r);
-    return this.getScriptAsFn(e, o)(t, ...i);
+    const i = Object.keys(r), o = Object.values(r);
+    return this.getScriptAsFn(e, i)(t, ...o);
   }
 }
-const nt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => K(e, r.trim(), ""))) : "", it = (n) => {
+const ut = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => I(e, r.trim(), ""))) : "", ct = (n) => {
   const e = /* @__PURE__ */ new Set();
   return n.replace(/\$\{(.*?)\}/g, (r, s) => (e.add(s.trim()), "")), { variables: Array.from(e).map((r) => ({ name: r })) };
-}, ot = [
+}, ft = [
   "any",
   "Array<date>",
   "Array<float>",
@@ -3159,7 +3181,7 @@ const nt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => K(e
   "int",
   "json",
   "string"
-], at = ["int", "float", "Array<int>", "Array<float>"], ut = ["date", "Array<date>"], ct = [
+], lt = ["int", "float", "Array<int>", "Array<float>"], dt = ["date", "Array<date>"], ht = [
   "eq",
   "find",
   "gt",
@@ -3171,60 +3193,64 @@ const nt = (n, e) => n ? (e || (e = {}), n.replace(/\$\{(.*?)\}/g, (t, r) => K(e
   "size"
 ];
 export {
-  qe as AnalyticsController,
-  $e as AttributeDependencyGraph,
-  Fe as CacheController,
-  We as ChangeDetector,
-  ut as DatePropertyTypes,
+  Oe as AUTHORED_RESOURCE_ID_PREFIX,
+  Re as AnalyticsController,
+  Te as AttributeDependencyGraph,
+  Ge as CacheController,
+  Ue as ChangeDetector,
+  qe as DERIVED_RESOURCE_ID_PREFIX,
+  dt as DatePropertyTypes,
   B as DcuplQueryBuilder,
-  ct as DcuplQueryOperatorsAsArray,
-  fe as DeepQueryService,
-  Z as DependencyGraph,
-  we as IndicesController,
+  ht as DcuplQueryOperatorsAsArray,
+  le as DeepQueryService,
+  X as DependencyGraph,
+  xe as IndicesController,
   p as Logger,
-  at as NumberPropertyTypes,
-  ot as PropertyTypesAsArray,
-  rt as QueryManager,
-  st as ScriptController,
+  lt as NumberPropertyTypes,
+  ft as PropertyTypesAsArray,
+  it as QueryManager,
+  at as ScriptController,
   j as clone,
   Ke as coerceStringType,
-  te as compareVersions,
-  He as computeSuggestions,
+  re as compareVersions,
+  Je as computeSuggestions,
   y as deepQueryService,
-  ee as escapeRegExp,
-  nt as evaluateTemplate,
-  Ye as generateBooleanQuery,
-  X as generateKey,
-  Xe as generateNumberAndDateQuery,
-  et as generateReferenceQuery,
-  Ze as generateTextQuery,
-  k as getAggregation,
-  ze as getDateConstraintUid,
-  Ee as getDcuplPropertyTypeForNativeType,
+  te as escapeRegExp,
+  ut as evaluateTemplate,
+  tt as generateBooleanQuery,
+  ee as generateKey,
+  rt as generateNumberAndDateQuery,
+  st as generateReferenceQuery,
+  et as generateTextQuery,
+  C as getAggregation,
+  je as getDateConstraintUid,
+  $e as getDcuplPropertyTypeForNativeType,
   x as getDeepPathValues,
-  ye as getDistinct,
-  Ue as getFacets,
-  Te as getFilterEntryId,
-  Ge as getNumberConstraintUid,
-  Je as getPropertiesForData,
-  je as groupBy,
-  Pe as hasMinimumVersion,
+  me as getDistinct,
+  Xe as getFacets,
+  ze as getFilterEntryId,
+  _e as getNumberConstraintUid,
+  Ye as getPropertiesForData,
+  Pe as groupBy,
+  He as hasMinimumVersion,
   Ne as inferModel,
-  re as isDateInstance,
-  Ce as isFloat,
-  ke as isInt,
-  se as isValidDate,
-  tt as isValidQueryStatement,
-  $ as isValidVersion,
+  se as isDateInstance,
+  Ee as isFloat,
+  Ce as isInt,
+  ne as isValidDate,
+  nt as isValidQueryStatement,
+  F as isValidVersion,
   Y as logger,
-  Ie as looksDateLike,
-  Ve as parseDate,
-  it as parseTemplate,
+  Qe as looksDateLike,
+  Ze as parseDate,
+  ct as parseTemplate,
   b as perf,
-  _ as pivot,
-  Be as removeTrailingSlash,
-  Le as trigger,
-  _e as unescapeRegExp,
-  Re as uniqBy
+  P as pivot,
+  We as removeTrailingSlash,
+  M as resolveResourceId,
+  ot as resolveResourceIds,
+  Ve as trigger,
+  Le as unescapeRegExp,
+  Be as uniqBy
 };
 //# sourceMappingURL=index.js.map