@sisense/mcp-server 0.2.9 → 0.3.1

package/dist/{sse-server-f7drtvty.js → sse-server-vfpbc30x.js}

@@ -1,83 +1,82 @@
 import {
-  $i,
+  $p,
   Ap,
-  Bd,
   Bi,
-  C,
-  Ci,
   Ct,
-  Dh,
+  Dn,
   E,
-  Fd,
-  Fi,
+  En,
+  Ep,
+  Fp,
+  Gd,
+  Gi,
+  Gs,
   Hd,
-  Hi,
+  Ip,
   J,
   Ke,
-  Ld,
-  Ln,
-  Lp,
-  Md,
-  Mp,
-  Nt,
+  Li,
+  Lt,
+  N,
+  Np,
   Oe,
-  Pd,
+  Op,
   Rn,
   Rp,
+  Rt,
   Se,
   Sp,
   Tp,
-  Ud,
+  Up,
+  Vd,
+  Vi,
+  Wd,
+  Wi,
+  Ws,
   X,
-  Xp,
-  Yt,
   Zt,
-  ap,
+  _p,
+  _s,
   be,
   bp,
-  cp,
   dp,
-  ed,
-  fp,
   g,
+  gm,
   gp,
-  gt,
   h1 as h,
+  hm,
   hp,
-  ip,
-  jd,
-  ji,
-  jn,
-  lp,
+  ht,
+  kd,
+  ki,
   m,
   mp,
-  op,
+  nn,
+  od,
   pp,
+  qd,
   re,
-  rp,
-  sp,
-  up,
-  vn,
-  vs,
-  wn,
-  wp,
-  xp,
+  sm,
+  vp,
+  ws,
+  xs,
   ye,
+  yp,
   zd,
   zi
-} from "./sse-server-r50cemee.js";
+} from "./sse-server-j22b9cb0.js";
 
-// node_modules/@sisense/sdk-ui/dist/dimensions-C1R5YRt-.js
-class y extends vn {
-  constructor(t, e, r, o, d, m2, l, c, a, g2) {
-    if (super(t, d || E.Dimension, m2, c, a), this.__serializable = "DimensionalDimension", this._dimensions = [], this._attributes = [], this._sort = C.None, !a && e) {
-      const { table: D, column: s } = Oe(e);
-      this.composeCode = `${Ci}.${gt(D)}.${gt(s)}`;
+// node_modules/@sisense/sdk-ui/dist/parse-compose-code-DfZskSng.js
+class g2 extends En {
+  constructor(i, e, n, s, r, a, h2, c, d, f) {
+    if (super(i, r || E.Dimension, a, c, d), this.__serializable = "DimensionalDimension", this._dimensions = [], this._attributes = [], this._sort = N.None, !d && e) {
+      const { table: p, column: o } = Oe(e);
+      this.composeCode = `${Li}.${ht(p)}.${ht(o)}`;
     }
-    this._sort = l || C.None, this._expression = e, this.setDimensions(o || []), this.setAttributes(r), g2 && (this.defaultAttribute = g2);
+    this._sort = h2 || N.None, this._expression = e, this.setDimensions(s || []), this.setAttributes(n), f && (this.defaultAttribute = f);
   }
-  static parseType(t) {
-    switch (t) {
+  static parseType(i) {
+    switch (i) {
       case "datetime":
       case E.DateDimension:
         return E.DateDimension;
@@ -90,23 +89,23 @@ class y extends vn {
     }
     return E.TextDimension;
   }
-  getAttachedName(t, e) {
-    let r = t;
-    const o = be(t);
-    return (o === "id" || o === "name" || Object.getOwnPropertyDescriptor(this, o) !== undefined || this[o] !== undefined) && (r = e), r;
+  getAttachedName(i, e) {
+    let n = i;
+    const s = be(i);
+    return (s === "id" || s === "name" || Object.getOwnPropertyDescriptor(this, s) !== undefined || this[s] !== undefined) && (n = e), n;
   }
-  setDimensions(t) {
-    this._dimensions = t;
-    for (let e = 0;e < t.length; e++) {
-      const r = this.getAttachedName(t[e].name, t[e].attributes[0].expression);
-      this[be(r)] = t[e], r != t[e].name && (t[e].name = r);
+  setDimensions(i) {
+    this._dimensions = i;
+    for (let e = 0;e < i.length; e++) {
+      const n = this.getAttachedName(i[e].name, i[e].attributes[0].expression);
+      this[be(n)] = i[e], n != i[e].name && (i[e].name = n);
     }
   }
-  setAttributes(t) {
-    this._attributes = t || [];
-    for (let e = 0;e < t.length; e++) {
-      const r = this.getAttachedName(t[e].name, t[e].expression);
-      this[be(r)] = t[e], t[e].name != r && (t[e].name = r);
+  setAttributes(i) {
+    this._attributes = i || [];
+    for (let e = 0;e < i.length; e++) {
+      const n = this.getAttachedName(i[e].name, i[e].expression);
+      this[be(n)] = i[e], i[e].name != n && (i[e].name = n);
     }
   }
   get id() {
@@ -124,35 +123,35 @@ class y extends vn {
   getSort() {
     return this._sort;
   }
-  sort(t) {
-    return new y(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, t, this.dataSource, this.composeCode, this.defaultAttribute);
+  sort(i) {
+    return new g2(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, i, this.dataSource, this.composeCode, this.defaultAttribute);
   }
   serialize() {
-    const t = super.serialize();
-    return t.expression = this.expression, this.getSort() !== undefined && (t.sort = this.getSort()), t.attributes = this._attributes.map((e) => e.serialize()), t.dimensions = this._dimensions.map((e) => e.serialize()), this.defaultAttribute && (t.defaultAttribute = this.defaultAttribute.serialize()), t;
+    const i = super.serialize();
+    return i.expression = this.expression, this.getSort() !== undefined && (i.sort = this.getSort()), i.attributes = this._attributes.map((e) => e.serialize()), i.dimensions = this._dimensions.map((e) => e.serialize()), this.defaultAttribute && (i.defaultAttribute = this.defaultAttribute.serialize()), i;
   }
-  jaql(t) {
+  jaql(i) {
     if (this.defaultAttribute)
-      return this.defaultAttribute.jaql(t);
+      return this.defaultAttribute.jaql(i);
     if (this.dimensions.length > 0)
-      return this.dimensions[0].jaql(t);
+      return this.dimensions[0].jaql(i);
     const e = {
       jaql: {
         title: this.name,
         dim: this.expression,
-        datatype: vs(this.type)
+        datatype: xs(this.type)
       }
     };
-    return this._sort != C.None && (e.jaql.sort = this._sort == C.Ascending ? "asc" : "desc"), t === true ? e.jaql : e;
+    return this._sort != N.None && (e.jaql.sort = this._sort == N.Ascending ? "asc" : "desc"), i === true ? e.jaql : e;
   }
 }
-var z = (i) => i && i.__serializable === "DimensionalDimension";
+var L = (t) => t && t.__serializable === "DimensionalDimension";
 
-class p extends y {
-  constructor(t, e, r, o, d, m2, l, c) {
-    super(t, e, [], [], E.DateDimension, r, o, d, m2), this.__serializable = "DimensionalDateDimension";
-    const a = [r, o, d, undefined, undefined, l, c];
-    this.defaultLevel = g.Years, this.Years = new J(g.Years, e, g.Years, "yyyy", ...a), this.Quarters = new J(g.Quarters, e, g.Quarters, "Q yyyy", ...a), this.Months = new J(g.Months, e, g.Months, "yyyy-MM", ...a), this.Weeks = new J(g.Weeks, e, g.Weeks, "ww yyyy", ...a), this.Days = new J(g.Days, e, g.Days, "yyyy-MM-dd", ...a), this.Hours = new J(g.Hours, e, g.Hours, "yyyy-MM-dd HH:mm", ...a), this.MinutesRoundTo30 = new J(g.MinutesRoundTo30, e, g.MinutesRoundTo30, "yyyy-MM-dd HH:mm", r, o, d), this.MinutesRoundTo15 = new J(g.MinutesRoundTo15, e, g.MinutesRoundTo15, "yyyy-MM-dd HH:mm", ...a), this.Minutes = new J(g.Minutes, e, g.Minutes, "yyyy-MM-dd HH:mm", ...a), this.Seconds = new J(g.Seconds, e, g.Seconds, "yyyy-MM-dd HH:mm:ss", r, o, d), this.AggHours = new J(g.AggHours, e, g.AggHours, "HH:mm", ...a), this.AggMinutesRoundTo30 = new J(g.AggMinutesRoundTo30, e, g.AggMinutesRoundTo30, "HH:mm", r, o, d), this.AggMinutesRoundTo15 = new J(g.AggMinutesRoundTo15, e, g.AggMinutesRoundTo15, "HH:mm", ...a), this.AggMinutesRoundTo1 = new J(g.AggMinutesRoundTo1, e, g.AggMinutesRoundTo1, "HH:mm", ...a), this.setAttributes([
+class D extends g2 {
+  constructor(i, e, n, s, r, a, h2, c) {
+    super(i, e, [], [], E.DateDimension, n, s, r, a), this.__serializable = "DimensionalDateDimension";
+    const d = [n, s, r, undefined, undefined, h2, c];
+    this.defaultLevel = g.Years, this.Years = new J(g.Years, e, g.Years, "yyyy", ...d), this.Quarters = new J(g.Quarters, e, g.Quarters, "Q yyyy", ...d), this.Months = new J(g.Months, e, g.Months, "yyyy-MM", ...d), this.Weeks = new J(g.Weeks, e, g.Weeks, "ww yyyy", ...d), this.Days = new J(g.Days, e, g.Days, "yyyy-MM-dd", ...d), this.Hours = new J(g.Hours, e, g.Hours, "yyyy-MM-dd HH:mm", ...d), this.MinutesRoundTo30 = new J(g.MinutesRoundTo30, e, g.MinutesRoundTo30, "yyyy-MM-dd HH:mm", n, s, r), this.MinutesRoundTo15 = new J(g.MinutesRoundTo15, e, g.MinutesRoundTo15, "yyyy-MM-dd HH:mm", ...d), this.Minutes = new J(g.Minutes, e, g.Minutes, "yyyy-MM-dd HH:mm", ...d), this.Seconds = new J(g.Seconds, e, g.Seconds, "yyyy-MM-dd HH:mm:ss", n, s, r), this.AggHours = new J(g.AggHours, e, g.AggHours, "HH:mm", ...d), this.AggMinutesRoundTo30 = new J(g.AggMinutesRoundTo30, e, g.AggMinutesRoundTo30, "HH:mm", n, s, r), this.AggMinutesRoundTo15 = new J(g.AggMinutesRoundTo15, e, g.AggMinutesRoundTo15, "HH:mm", ...d), this.AggMinutesRoundTo1 = new J(g.AggMinutesRoundTo1, e, g.AggMinutesRoundTo1, "HH:mm", ...d), this.setAttributes([
       this.Years,
       this.Quarters,
       this.Months,
@@ -173,74 +172,219 @@ class p extends y {
     return this.expression;
   }
   setDimensions() {}
-  setAttributes(t) {
-    this._attributes = t;
+  setAttributes(i) {
+    this._attributes = i;
   }
   getSort() {
     return this._sort;
   }
-  sort(t) {
-    return new p(this.name, this.expression, this.description, t, this.dataSource, this.composeCode, this.indexed, this.merged);
+  sort(i) {
+    return new D(this.name, this.expression, this.description, i, this.dataSource, this.composeCode, this.indexed, this.merged);
   }
   serialize() {
     return super.serialize();
   }
-  jaql(t) {
+  jaql(i) {
     const e = this[this.defaultLevel].jaql();
-    return e.jaql.title = this.name, t ? e.jaql : e;
-  }
-}
-var S = (i) => i && i.__serializable === "DimensionalDateDimension";
-function N(i) {
-  const t = i.name || i.title, e = i.desc || i.description, r = i.expression || i.dim, o = y.parseType(i.dimtype || i.type), d = i.sort, m2 = i.dataSource, l = i.indexed, c = i.merged;
-  if (o == E.DateDimension)
-    return new p(t, r, e, d, m2, undefined, l, c);
-  const a = Object.getOwnPropertyNames(i).map((s) => i[s]).filter((s) => E.isAttribute(s == null ? undefined : s.type));
-  if (a.length == 0)
-    if (i.attributes) {
-      let s;
-      for (let M = 0;M < i.attributes.length; M++)
-        s = i.attributes[M], a.push(new Ke(s.name, s.expression, s.type, s.description, s.sort, s.dataSource, undefined, undefined, s.indexed, s.merged));
+    return e.jaql.title = this.name, i ? e.jaql : e;
+  }
+}
+var I = (t) => t && t.__serializable === "DimensionalDateDimension";
+function z(t) {
+  const i = t.name || t.title, e = t.desc || t.description, n = t.expression || t.dim, s = g2.parseType(t.dimtype || t.type), r = t.sort, a = t.dataSource, h2 = t.indexed, c = t.merged;
+  if (s == E.DateDimension)
+    return new D(i, n, e, r, a, undefined, h2, c);
+  const d = Object.getOwnPropertyNames(t).map((o) => t[o]).filter((o) => E.isAttribute(o == null ? undefined : o.type));
+  if (d.length == 0)
+    if (t.attributes) {
+      let o;
+      for (let M = 0;M < t.attributes.length; M++)
+        o = t.attributes[M], d.push(new Ke(o.name, o.expression, o.type, o.description, o.sort, o.dataSource, undefined, undefined, o.indexed, o.merged));
     } else
-      r && a.push(new Ke(t, r, o, e, d, m2, undefined, undefined, l, c));
-  const g2 = Object.getOwnPropertyNames(i).map((s) => i[s]).filter((s) => E.isDimension(s == null ? undefined : s.type));
-  if (g2.length == 0 && i.dimensions)
-    for (let s = 0;s < i.dimensions.length; s++)
-      g2.push(N(i.dimensions[s]));
-  const D = new y(t, r, a, g2, o, e, d, m2);
-  return i.defaultAttribute && (D.defaultAttribute = a.find((s) => s.name === i.defaultAttribute)), D;
-}
-function q(i) {
-  const t = i.name || i.title, e = i.expression || i.dim, r = i.desc || i.description, o = i.sort, d = i.dataSource;
-  return new p(t, e, r, o, d, undefined, i.indexed, i.merged);
+      n && d.push(new Ke(i, n, s, e, r, a, undefined, undefined, h2, c));
+  const f = Object.getOwnPropertyNames(t).map((o) => t[o]).filter((o) => E.isDimension(o == null ? undefined : o.type));
+  if (f.length == 0 && t.dimensions)
+    for (let o = 0;o < t.dimensions.length; o++)
+      f.push(z(t.dimensions[o]));
+  const p = new g2(i, n, d, f, s, e, r, a);
+  return t.defaultAttribute && (p.defaultAttribute = d.find((o) => o.name === t.defaultAttribute)), p;
+}
+function Q(t) {
+  const i = t.name || t.title, e = t.expression || t.dim, n = t.desc || t.description, s = t.sort, r = t.dataSource;
+  return new D(i, e, n, s, r, undefined, t.indexed, t.merged);
+}
+function T(t, i) {
+  const e = [];
+  let n = "", s = 0, r = false, a = null;
+  for (let h2 = 0;h2 < t.length; h2++) {
+    const c = t[h2], d = t[h2 + 1];
+    if (r) {
+      if (c !== a) {
+        n += c;
+        continue;
+      }
+      if (d === a) {
+        n += c + d, h2++;
+        continue;
+      }
+      r = false, a = null, n += c;
+      continue;
+    } else {
+      if (c === "'" || c === '"') {
+        r = true, a = c, n += c;
+        continue;
+      }
+      if ("([{".includes(c) && s++, ")]}".includes(c) && s--, c === i && s === 0) {
+        e.push(n.trim()), n = "";
+        continue;
+      }
+    }
+    n += c;
+  }
+  return n.trim() && e.push(n.trim()), e;
+}
+function N2(t, i) {
+  let e = 0, n = false, s = null;
+  for (let r = 0;r < t.length; r++) {
+    const a = t[r], h2 = t[r + 1];
+    if (n) {
+      if (a !== s)
+        continue;
+      if (h2 === s) {
+        r++;
+        continue;
+      }
+      n = false, s = null;
+    } else {
+      if (a === "'" || a === '"') {
+        n = true, s = a;
+        continue;
+      }
+      if ("([{".includes(a) && e++, ")]}".includes(a) && e--, a === i && e === 0)
+        return r;
+    }
+  }
+  return -1;
+}
+function Y(t, i) {
+  if (t[i] !== "(")
+    return -1;
+  let e = 1, n = i + 1, s = false, r = null;
+  for (;n < t.length; ) {
+    const a = t[n], h2 = t[n + 1];
+    if (s) {
+      if (a !== r) {
+        n++;
+        continue;
+      }
+      if (h2 === r) {
+        n += 2;
+        continue;
+      }
+      s = false, r = null, n++;
+    } else {
+      if (a === "'" || a === '"') {
+        s = true, r = a, n++;
+        continue;
+      }
+      if ("([{".includes(a) && e++, ")]}".includes(a) && --e === 0)
+        return n;
+      n++;
+    }
+  }
+  return -1;
+}
+function C(t) {
+  return t.startsWith("'") && t.endsWith("'") || t.startsWith('"') && t.endsWith('"') ? t.slice(1, -1) : t;
+}
+function q(t) {
+  if (!t || typeof t != "string")
+    throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof t}`);
+  const i = t.trim();
+  if (!i)
+    throw new Error("Invalid composeCode: empty string");
+  const e = i.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
+  if (!e)
+    throw new Error(`Invalid composeCode format: expected function call, got '${i}'`);
+  const n = e[1], s = e[2], r = _(s);
+  return {
+    function: n,
+    args: r
+  };
+}
+function _(t) {
+  return t.trim() ? T(t, ",").map(H) : [];
+}
+function H(t) {
+  if (!t)
+    throw new Error("Cannot parse empty argument value");
+  if (t === "null")
+    return null;
+  if (t === "undefined")
+    return;
+  if (t === "true")
+    return true;
+  if (t === "false")
+    return false;
+  if (t.match(/^-?\d+(\.\d+)?$/))
+    return parseFloat(t);
+  if (t.startsWith("'") && t.endsWith("'") || t.startsWith('"') && t.endsWith('"')) {
+    const e = t[0];
+    return t.slice(1, -1).replace(new RegExp(`${e}${e}`, "g"), e);
+  }
+  if (t.startsWith("[") && t.endsWith("]")) {
+    const e = t.slice(1, -1).trim();
+    if (!e)
+      return [];
+    const n = _(e);
+    return n.every((s) => typeof s == "string"), n;
+  }
+  if (t.startsWith("{") && t.endsWith("}")) {
+    const e = t.slice(1, -1).trim();
+    return e ? $(e) : {};
+  }
+  return t.includes("(") && t.includes(")") ? q(t) : (t.startsWith("DM."), t);
+}
+function E2(t) {
+  const i = N2(t, ":");
+  if (i === -1)
+    throw new Error(`Invalid object property: expected 'key: value', got '${t}'`);
+  const e = C(t.slice(0, i).trim()), n = H(t.slice(i + 1).trim());
+  return [e, n];
+}
+function $(t) {
+  if (!t.trim())
+    return {};
+  const i = T(t, ",").map(E2).filter(([, e]) => e !== null);
+  return Object.fromEntries(i);
 }
 
 // node_modules/@sisense/sdk-ui/dist/analytics-composer/node.js
-var Vt = Object.defineProperty;
-var Wt = Object.defineProperties;
-var jt = Object.getOwnPropertyDescriptors;
-var Ue = Object.getOwnPropertySymbols;
-var Kt = Object.prototype.hasOwnProperty;
-var Gt = Object.prototype.propertyIsEnumerable;
-var _e = (e, t, r) => (t in e) ? Vt(e, t, { enumerable: true, configurable: true, writable: true, value: r }) : e[t] = r;
-var y2 = (e, t) => {
+var Lt2 = Object.defineProperty;
+var Ut = Object.defineProperties;
+var _t = Object.getOwnPropertyDescriptors;
+var Pe = Object.getOwnPropertySymbols;
+var Vt = Object.prototype.hasOwnProperty;
+var jt = Object.prototype.propertyIsEnumerable;
+var ke = (e, t, r) => (t in e) ? Lt2(e, t, { enumerable: true, configurable: true, writable: true, value: r }) : e[t] = r;
+var y = (e, t) => {
   for (var r in t || (t = {}))
-    Kt.call(t, r) && _e(e, r, t[r]);
-  if (Ue)
-    for (var r of Ue(t))
-      Gt.call(t, r) && _e(e, r, t[r]);
+    Vt.call(t, r) && ke(e, r, t[r]);
+  if (Pe)
+    for (var r of Pe(t))
+      jt.call(t, r) && ke(e, r, t[r]);
   return e;
 };
-var F = (e, t) => Wt(e, jt(t));
-function Yr(e, t) {
-  const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, o) => Array.from({ length: s + 1 }, (a, u) => o === 0 ? u : u === 0 ? o : 0));
+var A = (e, t) => Ut(e, _t(t));
+function Gr(e, t) {
+  const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, a) => Array.from({ length: s + 1 }, (o, u) => a === 0 ? u : u === 0 ? a : 0));
   for (let i = 1;i <= r; i++)
-    for (let o = 1;o <= s; o++)
-      n[i][o] = Math.min(n[i - 1][o] + 1, n[i][o - 1] + 1, n[i - 1][o - 1] + (e[i - 1] === t[o - 1] ? 0 : 1));
+    for (let a = 1;a <= s; a++)
+      n[i][a] = Math.min(n[i - 1][a] + 1, n[i][a - 1] + 1, n[i - 1][a - 1] + (e[i - 1] === t[a - 1] ? 0 : 1));
   return n[r][s];
 }
 
-class Jr {
+class Yr {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map, this.valueToKey = /* @__PURE__ */ new Map;
   }
@@ -258,9 +402,9 @@ class Jr {
   }
 }
 
-class ot {
+class it {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new Jr;
+    this.generateIdentifier = t, this.kv = new Yr;
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -276,7 +420,7 @@ class ot {
   }
 }
 
-class Hr extends ot {
+class Jr extends it {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map;
   }
@@ -287,7 +431,7 @@ class Hr extends ot {
     return this.classToAllowedProps.get(t);
   }
 }
-function Qr(e) {
+function Hr(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -295,8 +439,8 @@ function Qr(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function Xr(e, t) {
-  const r = Qr(e);
+function Qr(e, t) {
+  const r = Hr(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -312,7 +456,7 @@ function V(e, t) {
 function ee(e, t) {
   return e.indexOf(t) !== -1;
 }
-function We(e, t) {
+function ze(e, t) {
   for (let r = 0;r < e.length; r++) {
     const s = e[r];
     if (t(s))
@@ -320,7 +464,7 @@ function We(e, t) {
   }
 }
 
-class Zr {
+class Xr {
   constructor() {
     this.transfomers = {};
   }
@@ -328,36 +472,36 @@ class Zr {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return Xr(this.transfomers, (r) => r.isApplicable(t));
+    return Qr(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-var es = (e) => Object.prototype.toString.call(e).slice(8, -1);
+var Zr = (e) => Object.prototype.toString.call(e).slice(8, -1);
 var at = (e) => typeof e == "undefined";
-var ts = (e) => e === null;
+var es = (e) => e === null;
 var G = (e) => typeof e != "object" || e === null || e === Object.prototype ? false : Object.getPrototypeOf(e) === null ? true : Object.getPrototypeOf(e) === Object.prototype;
-var pe = (e) => G(e) && Object.keys(e).length === 0;
-var I = (e) => Array.isArray(e);
-var rs = (e) => typeof e == "string";
-var ss = (e) => typeof e == "number" && !isNaN(e);
-var ns = (e) => typeof e == "boolean";
-var is = (e) => e instanceof RegExp;
-var Y = (e) => e instanceof Map;
+var de = (e) => G(e) && Object.keys(e).length === 0;
+var I2 = (e) => Array.isArray(e);
+var ts = (e) => typeof e == "string";
+var rs = (e) => typeof e == "number" && !isNaN(e);
+var ss = (e) => typeof e == "boolean";
+var ns = (e) => e instanceof RegExp;
+var Y2 = (e) => e instanceof Map;
 var J2 = (e) => e instanceof Set;
-var ut = (e) => es(e) === "Symbol";
-var os = (e) => e instanceof Date && !isNaN(e.valueOf());
+var ot = (e) => Zr(e) === "Symbol";
+var is = (e) => e instanceof Date && !isNaN(e.valueOf());
 var as = (e) => e instanceof Error;
-var je = (e) => typeof e == "number" && isNaN(e);
-var us = (e) => ns(e) || ts(e) || at(e) || ss(e) || rs(e) || ut(e);
-var cs = (e) => typeof e == "bigint";
+var Le = (e) => typeof e == "number" && isNaN(e);
+var os = (e) => ss(e) || es(e) || at(e) || rs(e) || ts(e) || ot(e);
+var us = (e) => typeof e == "bigint";
 var ls = (e) => e === 1 / 0 || e === -1 / 0;
-var fs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
-var ds = (e) => e instanceof URL;
-var ct = (e) => e.replace(/\./g, "\\.");
-var ce = (e) => e.map(String).map(ct).join(".");
-var K = (e) => {
+var cs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
+var fs = (e) => e instanceof URL;
+var ut = (e) => e.replace(/\./g, "\\.");
+var oe = (e) => e.map(String).map(ut).join(".");
+var W = (e) => {
   const t = [];
   let r = "";
   for (let n = 0;n < e.length; n++) {
@@ -375,7 +519,7 @@ var K = (e) => {
   const s = r;
   return t.push(s), t;
 };
-function v(e, t, r, s) {
+function R(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -384,10 +528,10 @@ function v(e, t, r, s) {
   };
 }
 var lt = [
-  v(at, "undefined", () => null, () => {}),
-  v(cs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  v(os, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  v(as, "Error", (e, t) => {
+  R(at, "undefined", () => null, () => {}),
+  R(us, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  R(is, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  R(as, "Error", (e, t) => {
     const r = {
       name: e.name,
       message: e.message
@@ -401,17 +545,17 @@ var lt = [
       r[s] = e[s];
     }), r;
   }),
-  v(is, "regexp", (e) => "" + e, (e) => {
+  R(ns, "regexp", (e) => "" + e, (e) => {
     const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(t, r);
   }),
-  v(J2, "set", (e) => [...e.values()], (e) => new Set(e)),
-  v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  v((e) => je(e) || ls(e), "number", (e) => je(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
-  v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  v(ds, "URL", (e) => e.toString(), (e) => new URL(e))
+  R(J2, "set", (e) => [...e.values()], (e) => new Set(e)),
+  R(Y2, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  R((e) => Le(e) || ls(e), "number", (e) => Le(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  R((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  R(fs, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function ie(e, t, r, s) {
+function se(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -419,13 +563,13 @@ function ie(e, t, r, s) {
     untransform: s
   };
 }
-var ft = ie((e, t) => ut(e) ? !!t.symbolRegistry.getIdentifier(e) : false, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+var ct = se((e, t) => ot(e) ? !!t.symbolRegistry.getIdentifier(e) : false, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
   const s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
 });
-var ms = [
+var ds = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -436,19 +580,19 @@ var ms = [
   Float64Array,
   Uint8ClampedArray
 ].reduce((e, t) => (e[t.name] = t, e), {});
-var dt = ie(fs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = ms[t[1]];
+var ft = se(cs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
+  const r = ds[t[1]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function mt(e, t) {
+function dt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : false;
 }
-var pt = ie(mt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+var mt = se(dt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
-    return y2({}, e);
+    return y({}, e);
   const s = {};
   return r.forEach((n) => {
     s[n] = e[n];
@@ -459,53 +603,53 @@ var pt = ie(mt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)
     throw new Error(`Trying to deserialize unknown class '${t[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
   return Object.assign(Object.create(s.prototype), e);
 });
-var gt2 = ie((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
+var pt = se((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
   const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
 });
-var ps = [pt, ft, gt2, dt];
-var Ke2 = (e, t) => {
-  const r = We(ps, (n) => n.isApplicable(e, t));
+var ms = [mt, ct, pt, ft];
+var Ue = (e, t) => {
+  const r = ze(ms, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = We(lt, (n) => n.isApplicable(e, t));
+  const s = ze(lt, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
 };
-var yt = {};
+var gt = {};
 lt.forEach((e) => {
-  yt[e.annotation] = e;
+  gt[e.annotation] = e;
 });
-var gs = (e, t, r) => {
-  if (I(t))
+var ps = (e, t, r) => {
+  if (I2(t))
     switch (t[0]) {
       case "symbol":
-        return ft.untransform(e, t, r);
+        return ct.untransform(e, t, r);
       case "class":
-        return pt.untransform(e, t, r);
+        return mt.untransform(e, t, r);
       case "custom":
-        return gt2.untransform(e, t, r);
+        return pt.untransform(e, t, r);
       case "typed-array":
-        return dt.untransform(e, t, r);
+        return ft.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = yt[t];
+    const s = gt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
   }
 };
-var L = (e, t) => {
+var L2 = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -513,7 +657,7 @@ var L = (e, t) => {
     r.next(), t--;
   return r.next().value;
 };
-function ht(e) {
+function yt(e) {
   if (ee(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
   if (ee(e, "prototype"))
@@ -521,20 +665,20 @@ function ht(e) {
   if (ee(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-var ys = (e, t) => {
-  ht(t);
+var gs = (e, t) => {
+  yt(t);
   for (let r = 0;r < t.length; r++) {
     const s = t[r];
     if (J2(e))
-      e = L(e, +s);
-    else if (Y(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = L(e, n);
+      e = L2(e, +s);
+    else if (Y2(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = L2(e, n);
       switch (i) {
         case "key":
-          e = o;
+          e = a;
           break;
         case "value":
-          e = e.get(o);
+          e = e.get(a);
           break;
       }
     } else
@@ -542,159 +686,159 @@ var ys = (e, t) => {
   }
   return e;
 };
-var ge = (e, t, r) => {
-  if (ht(t), t.length === 0)
+var me = (e, t, r) => {
+  if (yt(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0;i < t.length - 1; i++) {
-    const o = t[i];
-    if (I(s)) {
-      const a = +o;
-      s = s[a];
-    } else if (G(s))
+    const a = t[i];
+    if (I2(s)) {
+      const o = +a;
       s = s[o];
+    } else if (G(s))
+      s = s[a];
     else if (J2(s)) {
-      const a = +o;
-      s = L(s, a);
-    } else if (Y(s)) {
+      const o = +a;
+      s = L2(s, o);
+    } else if (Y2(s)) {
       if (i === t.length - 2)
         break;
-      const u = +o, c = +t[++i] == 0 ? "key" : "value", p2 = L(s, u);
-      switch (c) {
+      const u = +a, l = +t[++i] == 0 ? "key" : "value", p = L2(s, u);
+      switch (l) {
         case "key":
-          s = p2;
+          s = p;
           break;
         case "value":
-          s = s.get(p2);
+          s = s.get(p);
           break;
       }
     }
   }
   const n = t[t.length - 1];
-  if (I(s) ? s[+n] = r(s[+n]) : G(s) && (s[n] = r(s[n])), J2(s)) {
-    const i = L(s, +n), o = r(i);
-    i !== o && (s.delete(i), s.add(o));
+  if (I2(s) ? s[+n] = r(s[+n]) : G(s) && (s[n] = r(s[n])), J2(s)) {
+    const i = L2(s, +n), a = r(i);
+    i !== a && (s.delete(i), s.add(a));
   }
-  if (Y(s)) {
-    const i = +t[t.length - 2], o = L(s, i);
+  if (Y2(s)) {
+    const i = +t[t.length - 2], a = L2(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
-        const u = r(o);
-        s.set(u, s.get(o)), u !== o && s.delete(o);
+        const u = r(a);
+        s.set(u, s.get(a)), u !== a && s.delete(a);
         break;
       }
       case "value": {
-        s.set(o, r(s.get(o)));
+        s.set(a, r(s.get(a)));
         break;
       }
     }
   }
   return e;
 };
-function ye2(e, t, r = []) {
+function pe(e, t, r = []) {
   if (!e)
     return;
-  if (!I(e)) {
-    V(e, (i, o) => ye2(i, t, [...r, ...K(o)]));
+  if (!I2(e)) {
+    V(e, (i, a) => pe(i, t, [...r, ...W(a)]));
     return;
   }
   const [s, n] = e;
-  n && V(n, (i, o) => {
-    ye2(i, t, [...r, ...K(o)]);
+  n && V(n, (i, a) => {
+    pe(i, t, [...r, ...W(a)]);
   }), t(s, r);
 }
-function hs(e, t, r) {
-  return ye2(t, (s, n) => {
-    e = ge(e, n, (i) => gs(i, s, r));
+function ys(e, t, r) {
+  return pe(t, (s, n) => {
+    e = me(e, n, (i) => ps(i, s, r));
   }), e;
 }
-function bs(e, t) {
+function hs(e, t) {
   function r(s, n) {
-    const i = ys(e, K(n));
-    s.map(K).forEach((o) => {
-      e = ge(e, o, () => i);
+    const i = gs(e, W(n));
+    s.map(W).forEach((a) => {
+      e = me(e, a, () => i);
     });
   }
-  if (I(t)) {
+  if (I2(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = ge(e, K(i), () => e);
+      e = me(e, W(i), () => e);
     }), n && V(n, r);
   } else
     V(t, r);
   return e;
 }
-var As = (e, t) => G(e) || I(e) || Y(e) || J2(e) || mt(e, t);
+var bs = (e, t) => G(e) || I2(e) || Y2(e) || J2(e) || dt(e, t);
 function Fs(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function ws(e, t) {
+function As(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
     if (n.length <= 1)
       return;
-    t || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
-    const [i, ...o] = n;
-    i.length === 0 ? s = o.map(ce) : r[ce(i)] = o.map(ce);
-  }), s ? pe(r) ? [s] : [s, r] : pe(r) ? undefined : r;
+    t || (n = n.map((o) => o.map(String)).sort((o, u) => o.length - u.length));
+    const [i, ...a] = n;
+    i.length === 0 ? s = a.map(oe) : r[oe(i)] = a.map(oe);
+  }), s ? de(r) ? [s] : [s, r] : de(r) ? undefined : r;
 }
-var bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map) => {
+var ht2 = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map) => {
   var b2;
-  const a = us(e);
-  if (!a) {
+  const o = os(e);
+  if (!o) {
     Fs(e, n, t);
-    const g2 = o.get(e);
-    if (g2)
+    const g3 = a.get(e);
+    if (g3)
       return s ? {
         transformedValue: null
-      } : g2;
+      } : g3;
   }
-  if (!As(e, r)) {
-    const g2 = Ke2(e, r), m2 = g2 ? {
-      transformedValue: g2.value,
-      annotations: [g2.type]
+  if (!bs(e, r)) {
+    const g3 = Ue(e, r), m2 = g3 ? {
+      transformedValue: g3.value,
+      annotations: [g3.type]
     } : {
       transformedValue: e
     };
-    return a || o.set(e, m2), m2;
+    return o || a.set(e, m2), m2;
   }
   if (ee(i, e))
     return {
       transformedValue: null
     };
-  const u = Ke2(e, r), c = (b2 = u == null ? undefined : u.value) != null ? b2 : e, p2 = I(c) ? [] : {}, l = {};
-  V(c, (g2, m2) => {
+  const u = Ue(e, r), l = (b2 = u == null ? undefined : u.value) != null ? b2 : e, p = I2(l) ? [] : {}, c = {};
+  V(l, (g3, m2) => {
     if (m2 === "__proto__" || m2 === "constructor" || m2 === "prototype")
       throw new Error(`Detected property ${m2}. This is a prototype pollution risk, please remove it from your object.`);
-    const A = bt(g2, t, r, s, [...n, m2], [...i, e], o);
-    p2[m2] = A.transformedValue, I(A.annotations) ? l[m2] = A.annotations : G(A.annotations) && V(A.annotations, (C2, N2) => {
-      l[ct(m2) + "." + N2] = C2;
+    const F = ht2(g3, t, r, s, [...n, m2], [...i, e], a);
+    p[m2] = F.transformedValue, I2(F.annotations) ? c[m2] = F.annotations : G(F.annotations) && V(F.annotations, (C2, N3) => {
+      c[ut(m2) + "." + N3] = C2;
     });
   });
-  const d = pe(l) ? {
-    transformedValue: p2,
+  const d = de(c) ? {
+    transformedValue: p,
     annotations: u ? [u.type] : undefined
   } : {
-    transformedValue: p2,
-    annotations: u ? [u.type, l] : l
+    transformedValue: p,
+    annotations: u ? [u.type, c] : c
   };
-  return a || o.set(e, d), d;
+  return o || a.set(e, d), d;
 };
-function At(e) {
+function bt(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Ge(e) {
-  return At(e) === "Array";
+function _e(e) {
+  return bt(e) === "Array";
 }
-function Es(e) {
-  if (At(e) !== "Object")
+function ws2(e) {
+  if (bt(e) !== "Object")
     return false;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function Cs(e, t, r, s, n) {
+function Es(e, t, r, s, n) {
   const i = {}.propertyIsEnumerable.call(s, t) ? "enumerable" : "nonenumerable";
   i === "enumerable" && (e[t] = r), n && i === "nonenumerable" && Object.defineProperty(e, t, {
     value: r,
@@ -703,43 +847,43 @@ function Cs(e, t, r, s, n) {
     configurable: true
   });
 }
-function he(e, t = {}) {
-  if (Ge(e))
-    return e.map((n) => he(n, t));
-  if (!Es(e))
+function ge(e, t = {}) {
+  if (_e(e))
+    return e.map((n) => ge(n, t));
+  if (!ws2(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Ge(t.props) && !t.props.includes(i))
+    if (_e(t.props) && !t.props.includes(i))
       return n;
-    const o = e[i], a = he(o, t);
-    return Cs(n, i, a, e, t.nonenumerable), n;
+    const a = e[i], o = ge(a, t);
+    return Es(n, i, o, e, t.nonenumerable), n;
   }, {});
 }
 
 class h2 {
   constructor({ dedupe: t = false } = {}) {
-    this.classRegistry = new Hr, this.symbolRegistry = new ot((r) => {
+    this.classRegistry = new Jr, this.symbolRegistry = new it((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new Zr, this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new Xr, this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map, s = bt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map, s = ht2(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = F(y2({}, n.meta), {
+    s.annotations && (n.meta = A(y({}, n.meta), {
       values: s.annotations
     }));
-    const i = ws(r, this.dedupe);
-    return i && (n.meta = F(y2({}, n.meta), {
+    const i = As(r, this.dedupe);
+    return i && (n.meta = A(y({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
-    let n = he(r);
-    return s != null && s.values && (n = hs(n, s.values, this)), s != null && s.referentialEqualities && (n = bs(n, s.referentialEqualities)), n;
+    let n = ge(r);
+    return s != null && s.values && (n = ys(n, s.values, this)), s != null && s.referentialEqualities && (n = hs(n, s.referentialEqualities)), n;
   }
   stringify(t) {
     return JSON.stringify(this.serialize(t));
@@ -754,7 +898,7 @@ class h2 {
     this.symbolRegistry.register(t, r);
   }
   registerCustom(t, r) {
-    this.customTransformerRegistry.register(y2({
+    this.customTransformerRegistry.register(y({
       name: r
     }, t));
   }
@@ -771,45 +915,45 @@ h2.registerClass = h2.defaultInstance.registerClass.bind(h2.defaultInstance);
 h2.registerSymbol = h2.defaultInstance.registerSymbol.bind(h2.defaultInstance);
 h2.registerCustom = h2.defaultInstance.registerCustom.bind(h2.defaultInstance);
 h2.allowErrorProps = h2.defaultInstance.allowErrorProps.bind(h2.defaultInstance);
-var z2 = (e) => e === undefined ? C.None : e;
-var Ts = (e) => new m(e.metadataItem, e.type);
-var Ee = (e) => new Ke(e.name, e.expression, e.type, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var Ce = (e) => new J(e.name, e.expression, e.granularity, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var z2 = (e) => e === undefined ? N.None : e;
+var Cs = (e) => new m(e.metadataItem, e.type);
+var Ae = (e) => new Ke(e.name, e.expression, e.type, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var we = (e) => new J(e.name, e.expression, e.granularity, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
 var O = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return Ee(e);
+      return Ae(e);
     case "DimensionalLevelAttribute":
-      return Ce(e);
+      return we(e);
     default:
       return e;
   }
 };
-var Ft = (e) => new y(e.name, e.expression, e.attributes.map(O), e.dimensions.map(qs), e.type, e.description, z2(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? O(e.defaultAttribute) : undefined);
-var wt = (e) => new p(e.name, e.expression, e.description, z2(e.sort), e.dataSource, e.composeCode, e.indexed, e.merged);
-var qs = (e) => {
+var Ft = (e) => new g2(e.name, e.expression, e.attributes.map(O), e.dimensions.map(Ts), e.type, e.description, z2(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? O(e.defaultAttribute) : undefined);
+var At = (e) => new D(e.name, e.expression, e.description, z2(e.sort), e.dataSource, e.composeCode, e.indexed, e.merged);
+var Ts = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
       return Ft(e);
     case "DimensionalDateDimension":
-      return wt(e);
+      return At(e);
     default:
       return e;
   }
 };
-var Te = (e) => new ye(e.name, O(e.attribute), e.aggregation, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var qe = (e) => {
+var Ee = (e) => new ye(e.name, O(e.attribute), e.aggregation, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var Ce = (e) => {
   const t = Object.fromEntries(Object.entries(e.context).map(([r, s]) => {
     if (s && typeof s == "object" && "__serializable" in s)
       switch (s.__serializable) {
         case "DimensionalAttribute":
-          return [r, Ee(s)];
+          return [r, Ae(s)];
         case "DimensionalLevelAttribute":
-          return [r, Ce(s)];
+          return [r, we(s)];
         case "DimensionalBaseMeasure":
-          return [r, Te(s)];
+          return [r, Ee(s)];
         case "DimensionalCalculatedMeasure":
-          return [r, qe(s)];
+          return [r, Ce(s)];
         default:
           return [r, s];
       }
@@ -817,47 +961,47 @@ var qe = (e) => {
   }));
   return new X(e.name, e.expression, t, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
 };
-var Et = (e) => new Yt(e.name, O(e.attribute), e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var le = (e) => {
+var wt = (e) => new Zt(e.name, O(e.attribute), e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var ue = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Te(e);
+      return Ee(e);
     case "DimensionalCalculatedMeasure":
-      return qe(e);
+      return Ce(e);
     case "DimensionalMeasureTemplate":
-      return Et(e);
+      return wt(e);
     default:
       return e;
   }
 };
-var T2 = (e) => {
+var T3 = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new jd(O(e.attribute), e.members, e.config.backgroundFilter ? F(y2({}, e.config), { backgroundFilter: T2(e.config.backgroundFilter) }) : e.config, e.composeCode);
+      return new zd(O(e.attribute), e.members, e.config.backgroundFilter ? A(y({}, e.config), { backgroundFilter: T3(e.config.backgroundFilter) }) : e.config, e.composeCode);
     case "LogicalAttributeFilter":
-      return new Bi(e.filters.map((r) => T2(r)), e.operator, e.config, e.composeCode);
+      return new Wi(e.filters.map((r) => T3(r)), e.operator, e.config, e.composeCode);
     case "CascadingFilter":
-      return new Pd(e._filters.map((r) => T2(r)), e.config, e.composeCode);
+      return new Hd(e._filters.map((r) => T3(r)), e.config, e.composeCode);
     case "ExcludeFilter":
-      return new Fd(T2(e.filter), e.input ? T2(e.input) : undefined, e.config, e.composeCode);
+      return new kd(T3(e.filter), e.input ? T3(e.input) : undefined, e.config, e.composeCode);
     case "MeasureFilter":
-      return new Ud(O(e.attribute), le(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new qd(O(e.attribute), ue(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "RankingFilter":
-      return new zi(O(e.attribute), le(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Gi(O(e.attribute), ue(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "MeasureRankingFilter":
-      return new Hi(le(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Vi(ue(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "NumericFilter":
-      return new Bd(O(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new Wd(O(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "TextFilter":
       return new re(O(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new zd(O(e.attribute), r, s, e.config, e.composeCode);
+      return new Gd(O(e.attribute), r, s, e.config, e.composeCode);
     }
     case "RelativeDateFilter":
-      return new wn(O(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
+      return new Rn(O(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
     case "CustomFilter":
-      return new Hd(O(e.attribute), e.jaqlExpression, e.config, e.composeCode);
+      return new Vd(O(e.attribute), e.jaqlExpression, e.config, e.composeCode);
     default:
       return e;
   }
@@ -865,157 +1009,157 @@ var T2 = (e) => {
 h2.registerCustom({
   isApplicable: h,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ts(e)
+  deserialize: (e) => Cs(e)
 }, "JaqlElement");
 h2.registerCustom({
-  isApplicable: xp,
+  isApplicable: Ip,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ee(e)
+  deserialize: (e) => Ae(e)
 }, "DimensionalAttribute");
 h2.registerCustom({
-  isApplicable: wp,
+  isApplicable: $p,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ce(e)
+  deserialize: (e) => we(e)
 }, "DimensionalLevelAttribute");
 h2.registerCustom({
-  isApplicable: z,
+  isApplicable: L,
   serialize: (e) => e.serialize(),
   deserialize: (e) => Ft(e)
 }, "DimensionalDimension");
 h2.registerCustom({
-  isApplicable: S,
+  isApplicable: I,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => wt(e)
+  deserialize: (e) => At(e)
 }, "DimensionalDateDimension");
 h2.registerCustom({
-  isApplicable: $i,
+  isApplicable: Bi,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Te(e)
+  deserialize: (e) => Ee(e)
 }, "DimensionalBaseMeasure");
 h2.registerCustom({
-  isApplicable: ji,
+  isApplicable: zi,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => qe(e)
+  deserialize: (e) => Ce(e)
 }, "DimensionalCalculatedMeasure");
 h2.registerCustom({
-  isApplicable: ip,
+  isApplicable: gp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Et(e)
+  deserialize: (e) => wt(e)
 }, "DimensionalMeasureTemplate");
 h2.registerCustom({
-  isApplicable: ap,
+  isApplicable: pp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "MembersFilter");
 h2.registerCustom({
-  isApplicable: dp,
+  isApplicable: Ap,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "LogicalAttributeFilter");
 h2.registerCustom({
-  isApplicable: Nt,
+  isApplicable: Ct,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "CascadingFilter");
 h2.registerCustom({
-  isApplicable: fp,
+  isApplicable: vp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "ExcludeFilter");
 h2.registerCustom({
-  isApplicable: lp,
+  isApplicable: Sp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "MeasureFilter");
 h2.registerCustom({
-  isApplicable: up,
+  isApplicable: bp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "RankingFilter");
 h2.registerCustom({
-  isApplicable: cp,
+  isApplicable: yp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "MeasureRankingFilter");
 h2.registerCustom({
-  isApplicable: op,
+  isApplicable: mp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "NumericFilter");
 h2.registerCustom({
-  isApplicable: hp,
+  isApplicable: Ep,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "TextFilter");
 h2.registerCustom({
-  isApplicable: pp,
+  isApplicable: _p,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "DateRangeFilter");
 h2.registerCustom({
-  isApplicable: gp,
+  isApplicable: Tp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "RelativeDateFilter");
 h2.registerCustom({
-  isApplicable: sp,
+  isApplicable: hp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => T2(e)
+  deserialize: (e) => T3(e)
 }, "CustomFilter");
-var ni = h2;
-var E3 = "DM.";
-function S2(e) {
+var Yn = h2;
+var E4 = "DM.";
+function S(e) {
   return typeof e == "object" && e !== null;
 }
 function q3(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Ct2(e) {
+function Et(e) {
   return e.every(q3);
 }
-function oe(e) {
+function ne(e) {
   return "attribute" in e && "config" in e;
 }
 function Z(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function xe(e) {
-  return !oe(e) && !Z(e);
+function Te(e) {
+  return !ne(e) && !Z(e);
 }
-function xs(e) {
-  return S2(e) && "column" in e && typeof e.column == "string" && !(("function" in e) && ("args" in e));
+function qs(e) {
+  return S(e) && "column" in e && typeof e.column == "string" && !(("function" in e) && ("args" in e));
 }
-function $s(e) {
-  return !S2(e) || !("column" in e) ? false : q3(e.column);
+function xs2(e) {
+  return !S(e) || !("column" in e) ? false : q3(e.column);
 }
 var x = 3;
-function R(e, t, r) {
+function v(e, t, r) {
   if (t.length === 0)
     return;
   let s = Number.MAX_SAFE_INTEGER, n;
   for (const i of t) {
-    const o = r(i), a = Yr(e, o);
-    a < s && (s = a, n = i);
+    const a = r(i), o = Gr(e, a);
+    o < s && (s = o, n = i);
   }
   return n !== undefined ? { best: n, distance: s } : undefined;
 }
-var Tt = "en";
-function fe(e, t) {
-  return e.localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+var Ct2 = "en";
+function le(e, t) {
+  return e.localeCompare(t, Ct2, { sensitivity: "accent" }) === 0;
 }
-function Ye(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+function Ve(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Ct2, { sensitivity: "accent" }) === 0;
 }
-function $e(e) {
-  const t = [...e].sort((i, o) => o.name.length - i.name.length), r = /* @__PURE__ */ new Map, s = /* @__PURE__ */ new Map, n = /* @__PURE__ */ new Map;
+function qe(e) {
+  const t = [...e].sort((i, a) => a.name.length - i.name.length), r = /* @__PURE__ */ new Map, s = /* @__PURE__ */ new Map, n = /* @__PURE__ */ new Map;
   for (const i of e) {
     r.set(i.name, i);
-    const o = [...i.columns].sort((u, c) => c.name.length - u.name.length);
-    n.set(i.name, o);
-    const a = /* @__PURE__ */ new Map;
+    const a = [...i.columns].sort((u, l) => l.name.length - u.name.length);
+    n.set(i.name, a);
+    const o = /* @__PURE__ */ new Map;
     for (const u of i.columns)
-      a.set(u.name, u);
-    s.set(i.name, a);
+      o.set(u.name, u);
+    s.set(i.name, o);
   }
   return {
     sortedTables: t,
@@ -1024,138 +1168,138 @@ function $e(e) {
     columnMap: s
   };
 }
-function Se2(e, t) {
-  if (!e.startsWith(E3))
-    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
-  const r = e.slice(E3.length);
+function xe(e, t) {
+  if (!e.startsWith(E4))
+    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E4}TableName.ColumnName[.Level]'`);
+  const r = e.slice(E4.length);
   if (!r)
-    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
+    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E4}TableName.ColumnName[.Level]'`);
   let s, n;
   for (const m2 of t.sortedTables)
-    if (Ye(r, m2.name + ".")) {
-      const A = r.slice(m2.name.length + 1);
-      if (!A)
-        throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
-      s = m2, n = A;
+    if (Ve(r, m2.name + ".")) {
+      const F = r.slice(m2.name.length + 1);
+      if (!F)
+        throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E4}TableName.ColumnName[.Level]'`);
+      s = m2, n = F;
       break;
     }
   if (!s) {
     const m2 = r.indexOf(".");
     if (m2 === -1)
-      throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
-    const A = r.slice(0, m2), C2 = R(A, t.sortedTables, (ue) => ue.name), N2 = C2 && C2.distance <= x ? ` Did you mean '${C2.best.name}'?` : "";
-    throw new Error(`Table '${A}' not found in the data model.${N2}`);
+      throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E4}TableName.ColumnName[.Level]'`);
+    const F = r.slice(0, m2), C2 = v(F, t.sortedTables, (ae) => ae.name), N3 = C2 && C2.distance <= x ? ` Did you mean '${C2.best.name}'?` : "";
+    throw new Error(`Table '${F}' not found in the data model.${N3}`);
   }
   const i = t.tableColumnMap.get(s.name);
   if (!i)
     throw new Error(`Table '${s.name}' found but has no columns`);
-  let o, a;
+  let a, o;
   const u = g.all;
   for (const m2 of i) {
-    if (fe(n, m2.name))
+    if (le(n, m2.name))
       return { table: s, column: m2 };
-    if (!Ye(n, m2.name + "."))
+    if (!Ve(n, m2.name + "."))
       continue;
-    const A = n.slice(m2.name.length + 1);
-    if (!A)
+    const F = n.slice(m2.name.length + 1);
+    if (!F)
       continue;
-    const C2 = u.includes(A), N2 = Rn(m2.dataType);
+    const C2 = u.includes(F), N3 = Lt(m2.dataType);
     if (C2) {
-      if (N2)
-        return { table: s, column: m2, level: A };
-      o || (o = m2, a = A);
+      if (N3)
+        return { table: s, column: m2, level: F };
+      a || (a = m2, o = F);
       continue;
     }
-    N2 && !o && (o = m2, a = A);
+    N3 && !a && (a = m2, o = F);
   }
-  if (o && a) {
-    if (u.includes(a))
-      throw new Error(`Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`);
-    const m2 = R(a, u, (C2) => C2), A = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
-    throw new Error(`Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(", ")}.${A}`);
+  if (a && o) {
+    if (u.includes(o))
+      throw new Error(`Invalid date level '${o}' in dimensional element '${e}'. Column '${s.name}.${a.name}' is not a datetime column`);
+    const m2 = v(o, u, (C2) => C2), F = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
+    throw new Error(`Invalid date level '${o}' in dimensional element '${e}'. Valid levels are: ${u.join(", ")}.${F}`);
   }
-  const c = n.indexOf("."), p2 = c === -1 ? n : n.slice(0, c), l = R(n, i, (m2) => m2.name), d = l && l.distance <= x && !fe(l.best.name, p2), b2 = d ? ` Did you mean '${l.best.name}'?` : "", g2 = !d && n.endsWith(".") && l !== undefined && fe(l.best.name, p2) ? ` Use '${p2}' without a trailing dot.` : "";
-  throw new Error(`Column '${p2}' not found in table '${s.name}'.${b2}${g2}`);
+  const l = n.indexOf("."), p = l === -1 ? n : n.slice(0, l), c = v(n, i, (m2) => m2.name), d = c && c.distance <= x && !le(c.best.name, p), b2 = d ? ` Did you mean '${c.best.name}'?` : "", g3 = !d && n.endsWith(".") && c !== undefined && le(c.best.name, p) ? ` Use '${p}' without a trailing dot.` : "";
+  throw new Error(`Column '${p}' not found in table '${s.name}'.${b2}${g3}`);
 }
-function Ss(e, t) {
-  const { table: r, column: s, level: n } = Se2(e, t);
+function $s(e, t) {
+  const { table: r, column: s, level: n } = xe(e, t);
   if (n) {
-    if (!Rn(s.dataType))
+    if (!Lt(s.dataType))
       throw new Error(`Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`);
     const i = g.all;
     if (!i.includes(n))
       throw new Error(`Invalid date level '${n}' in dimensional element '${e}'. Valid levels are: ${i.join(", ")}`);
-    const o = g.dateOnly;
-    if (s.dataType === "date" && !o.includes(n))
+    const a = g.dateOnly;
+    if (s.dataType === "date" && !a.includes(n))
       throw new Error(`Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a date column, not a datetime column`);
-    const a = g.timeOnly;
-    if (s.dataType === "time" && !a.includes(n))
+    const o = g.timeOnly;
+    if (s.dataType === "time" && !o.includes(n))
       throw new Error(`Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a time column, not a date column`);
   }
   return { table: r, column: s, level: n };
 }
-function H(e, t, r, s) {
-  const { table: n, column: i, level: o } = Ss(e, r);
-  let a = o;
-  if (Rn(i.dataType) && a === undefined && (s != null && s.inferredDateLevel)) {
-    const u = s.inferredDateLevel, c = g.all;
-    if (!c.includes(u))
-      throw new Error(`Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`);
-    const p2 = `${e}.${u}`, l = g.dateOnly;
-    if (i.dataType === "date" && !l.includes(u))
-      throw new Error(`Invalid level '${u}' in dimensional element '${p2}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`);
+function H2(e, t, r, s) {
+  const { table: n, column: i, level: a } = $s(e, r);
+  let o = a;
+  if (Lt(i.dataType) && o === undefined && (s != null && s.inferredDateLevel)) {
+    const u = s.inferredDateLevel, l = g.all;
+    if (!l.includes(u))
+      throw new Error(`Invalid inferred date level '${u}'. Valid levels are: ${l.join(", ")}`);
+    const p = `${e}.${u}`, c = g.dateOnly;
+    if (i.dataType === "date" && !c.includes(u))
+      throw new Error(`Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`);
     const d = g.timeOnly;
     if (i.dataType === "time" && !d.includes(u))
-      throw new Error(`Invalid level '${u}' in dimensional element '${p2}'. Column '${n.name}.${i.name}' is only a time column, not a date column`);
-    a = u;
+      throw new Error(`Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a time column, not a date column`);
+    o = u;
   }
-  return Ln({
+  return Dn({
     expression: i.expression,
     dataType: i.dataType,
-    granularity: a,
+    granularity: o,
     format: undefined,
     sort: undefined,
     dataSource: t
   });
 }
-function Os(e, t, r) {
-  const { column: s, level: n } = Se2(e, r);
+function Ss(e, t, r) {
+  const { column: s, level: n } = xe(e, r);
   if (n)
-    throw new Error(`Invalid DateDimension name format: '${e}'. Expected format: '${E3}TableName.ColumnName'`);
-  if (!Rn(s.dataType))
+    throw new Error(`Invalid DateDimension name format: '${e}'. Expected format: '${E4}TableName.ColumnName'`);
+  if (!Lt(s.dataType))
     throw new Error(`Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`);
-  return q({
+  return Q({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-var Ds = (e, t) => {
+var Os = (e, t) => {
   if (!e)
     return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!Lp(r))
-    return F(y2({}, t), {
+  if (!ws(r))
+    return A(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
 };
-var Ms = (e, t, r, s) => {
-  const n = Ds(e.sortType, s);
+var Ds = (e, t, r, s) => {
+  const n = Os(e.sortType, s);
   if (n)
     return {
-      attribute: H(e.column, t, r),
+      attribute: H2(e.column, t, r),
       style: {},
       error: n
     };
-  const i = H(e.column, t, r), o = ed(e, "column");
-  return { attribute: i, style: o };
+  const i = H2(e.column, t, r), a = od(e, "column");
+  return { attribute: i, style: a };
 };
-var Ns = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : xs(e) ? Ms(e, t, r, s) : {
-  error: F(y2({}, s), {
+var Ms = (e, t, r, s) => typeof e == "string" ? { attribute: H2(e, t, r) } : qs(e) ? Ds(e, t, r, s) : {
+  error: A(y({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
 };
-var qt = (e) => {
+var Tt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: true, data: [] };
@@ -1172,61 +1316,61 @@ var qt = (e) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
       category: "dimensions",
-      index: a,
-      input: o
+      index: o,
+      input: a
     };
     try {
-      const c = Ns(o, r, s, u);
-      if (c.error) {
-        i.push(c.error);
+      const l = Ms(a, r, s, u);
+      if (l.error) {
+        i.push(l.error);
         return;
       }
-      c.attribute && n.push(c.style !== undefined ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute });
-    } catch (c) {
-      const p2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y2({}, u), { message: p2 }));
+      l.attribute && n.push(l.style !== undefined ? { attribute: l.attribute, style: l.style } : { attribute: l.attribute });
+    } catch (l) {
+      const p = l instanceof Error ? l.message : "Unknown error";
+      i.push(A(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
-function Oe2(e, t) {
+function $e(e, t) {
   const r = Reflect.get(e, t);
   if (typeof r != "function")
     throw new Error(`Function '${t}' not found or is not a function`);
   return r;
 }
-function Rs(e, t) {
-  const r = e.replace("measureFactory.", ""), n = Oe2(rp, r)(...t);
-  if (!xe(n))
+function Ns(e, t) {
+  const r = e.replace("measureFactory.", ""), n = $e(dp, r)(...t);
+  if (!Te(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function vs2(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = Oe2(Se, r)(...t);
+function vs(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = $e(Se, r)(...t);
   if (!Z(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Is(e, t) {
+function Rs(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return vs2(e, t);
-  const r = e.replace("filterFactory.", ""), n = Oe2(mp, r)(...t);
-  if (!oe(n) && !Z(n))
+    return vs(e, t);
+  const r = e.replace("filterFactory.", ""), n = $e(Op, r)(...t);
+  if (!ne(n) && !Z(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Ps(e, t) {
+function Is(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Rs(e, t);
+    return Ns(e, t);
   if (s === "filterFactory")
-    return Is(e, t);
+    return Rs(e, t);
   throw new Error(`Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`);
 }
-var f2 = (e, t, r, s) => y2({ category: e, minArgs: t, maxArgs: r }, s);
-var ks = /* @__PURE__ */ new Set([
+var f2 = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s);
+var Ps = /* @__PURE__ */ new Set([
   "CORREL",
   "COVARP",
   "COVAR",
@@ -1353,164 +1497,19 @@ var te = {
   SQRT: f2("scalar", 1, 1),
   TAN: f2("scalar", 1, 1)
 };
-var Bs = Object.keys(te).filter((e) => te[e].category === "xdiff");
-function xt() {
-  return Bs;
+var ks = Object.keys(te).filter((e) => te[e].category === "xdiff");
+function qt() {
+  return ks;
 }
-function $t(e) {
+function xt(e) {
   const t = te[e.toUpperCase()];
   return t == null ? undefined : t.requiredDateLevel;
 }
-function zs(e, t) {
+function Bs(e, t) {
   return e === t ? e === 1 ? "1 parameter" : `${e} parameters` : t === Number.POSITIVE_INFINITY ? e <= 1 ? "any number of parameters" : `at least ${e} parameters` : `${e} or ${t} parameters`;
 }
-function De(e, t) {
-  const r = [];
-  let s = "", n = 0, i = false, o = null;
-  for (let a = 0;a < e.length; a++) {
-    const u = e[a], c = e[a + 1];
-    if (i) {
-      if (u !== o) {
-        s += u;
-        continue;
-      }
-      if (c === o) {
-        s += u + c, a++;
-        continue;
-      }
-      i = false, o = null, s += u;
-      continue;
-    } else {
-      if (u === "'" || u === '"') {
-        i = true, o = u, s += u;
-        continue;
-      }
-      if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === t && n === 0) {
-        r.push(s.trim()), s = "";
-        continue;
-      }
-    }
-    s += u;
-  }
-  return s.trim() && r.push(s.trim()), r;
-}
-function Ls(e, t) {
-  let r = 0, s = false, n = null;
-  for (let i = 0;i < e.length; i++) {
-    const o = e[i], a = e[i + 1];
-    if (s) {
-      if (o !== n)
-        continue;
-      if (a === n) {
-        i++;
-        continue;
-      }
-      s = false, n = null;
-    } else {
-      if (o === "'" || o === '"') {
-        s = true, n = o;
-        continue;
-      }
-      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0)
-        return i;
-    }
-  }
-  return -1;
-}
-function Us(e, t) {
-  if (e[t] !== "(")
-    return -1;
-  let r = 1, s = t + 1, n = false, i = null;
-  for (;s < e.length; ) {
-    const o = e[s], a = e[s + 1];
-    if (n) {
-      if (o !== i) {
-        s++;
-        continue;
-      }
-      if (a === i) {
-        s += 2;
-        continue;
-      }
-      n = false, i = null, s++;
-    } else {
-      if (o === "'" || o === '"') {
-        n = true, i = o, s++;
-        continue;
-      }
-      if ("([{".includes(o) && r++, ")]}".includes(o) && --r === 0)
-        return s;
-      s++;
-    }
-  }
-  return -1;
-}
-function _s(e) {
-  return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
-}
-function W(e) {
-  if (!e || typeof e != "string")
-    throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
-  const t = e.trim();
-  if (!t)
-    throw new Error("Invalid composeCode: empty string");
-  const r = t.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
-  if (!r)
-    throw new Error(`Invalid composeCode format: expected function call, got '${t}'`);
-  const s = r[1], n = r[2], i = St(n);
-  return {
-    function: s,
-    args: i
-  };
-}
-function St(e) {
-  return e.trim() ? De(e, ",").map(Ot) : [];
-}
-function Ot(e) {
-  if (!e)
-    throw new Error("Cannot parse empty argument value");
-  if (e === "null")
-    return null;
-  if (e === "undefined")
-    return;
-  if (e === "true")
-    return true;
-  if (e === "false")
-    return false;
-  if (e.match(/^-?\d+(\.\d+)?$/))
-    return parseFloat(e);
-  if (e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"')) {
-    const r = e[0];
-    return e.slice(1, -1).replace(new RegExp(`${r}${r}`, "g"), r);
-  }
-  if (e.startsWith("[") && e.endsWith("]")) {
-    const r = e.slice(1, -1).trim();
-    if (!r)
-      return [];
-    const s = St(r);
-    return s.every((n) => typeof n == "string"), s;
-  }
-  if (e.startsWith("{") && e.endsWith("}")) {
-    const r = e.slice(1, -1).trim();
-    return r ? Ws(r) : {};
-  }
-  return e.includes("(") && e.includes(")") ? W(e) : (e.startsWith("DM."), e);
-}
-function Vs(e) {
-  const t = Ls(e, ":");
-  if (t === -1)
-    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = _s(e.slice(0, t).trim()), s = Ot(e.slice(t + 1).trim());
-  return [r, s];
-}
-function Ws(e) {
-  if (!e.trim())
-    return {};
-  const t = De(e, ",").map(Vs).filter(([, r]) => r !== null);
-  return Object.fromEntries(t);
-}
-var js = /\[(\w[\w.-]*)\]/g;
-var Dt = /* @__PURE__ */ new Set([
+var zs = /\[(\w[\w.-]*)\]/g;
+var $t = /* @__PURE__ */ new Set([
   "AVG",
   "COUNT",
   "DUPCOUNT",
@@ -1528,28 +1527,28 @@ var Dt = /* @__PURE__ */ new Set([
   "YTDAVG",
   "YTDSUM"
 ]);
-var Ks = new RegExp(`\\b(${Array.from(Dt).join("|")})\\s*\\(`, "i");
-function Mt(e) {
-  return q3(e) ? true : typeof e == "string" && e.startsWith(E3) ? false : S2(e) && ("kind" in e) ? e.kind === "measure" : true;
+var Ls = new RegExp(`\\b(${Array.from($t).join("|")})\\s*\\(`, "i");
+function St(e) {
+  return q3(e) ? true : typeof e == "string" && e.startsWith(E4) ? false : S(e) && ("kind" in e) ? e.kind === "measure" : true;
 }
-function Gs(e) {
+function Us(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set;
   let s;
   for (;(s = t.exec(e)) !== null; ) {
     const n = s[1];
-    Dt.has(n.toUpperCase()) || r.add(n);
+    $t.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function Ys(e) {
+function _s2(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function Js(e) {
+function Vs(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
 var j2 = (e) => e.startsWith("[") ? e : `[${e}]`;
-var Nt2 = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function Rt(e, t) {
+var Ot = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function Dt(e, t) {
   if (t.length === 0)
     return [];
   const r = t.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), s = new RegExp(`\\b(${r})\\s*\\(\\s*\\[([^\\]]+)\\]\\s*,\\s*\\[([^\\]]+)\\]\\s*\\)`, "gi");
@@ -1559,16 +1558,16 @@ function Rt(e, t) {
     ref2: n[3].trim()
   }));
 }
-function Hs(e, t, r) {
-  var o, a, u;
-  const s = Object.keys(t), n = ((o = r.errorPrefix) != null ? o : "customFormula validation").trim(), i = n === "" ? "" : n.endsWith(" ") ? n : `${n} `;
+function js(e, t, r) {
+  var a, o, u;
+  const s = Object.keys(t), n = ((a = r.errorPrefix) != null ? a : "customFormula validation").trim(), i = n === "" ? "" : n.endsWith(" ") ? n : `${n} `;
   return {
     formula: e,
     context: t,
     contextKeys: s,
     canonicalContextKeys: new Set(s.map(j2)),
     errorPrefix: i,
-    warnUnusedContext: (a = r.warnUnusedContext) != null ? a : true,
+    warnUnusedContext: (o = r.warnUnusedContext) != null ? o : true,
     errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : true,
     schemaIndex: r.schemaIndex,
     result: { isValid: true, errors: [], warnings: [], references: [], unusedContextKeys: [] }
@@ -1577,12 +1576,12 @@ function Hs(e, t, r) {
 function M(e, t) {
   e.result.errors.push(t), e.result.isValid = false;
 }
-var Qs = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function Xs(e) {
-  const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find((s) => !Qs.has(s[1].toUpperCase()));
+var Ws2 = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function Ks(e) {
+  const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find((s) => !Ws2.has(s[1].toUpperCase()));
   r && M(e, `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`);
 }
-function Zs(e, t) {
+function Gs2(e, t) {
   const r = e[t];
   let s = t + 1;
   for (;s < e.length; ) {
@@ -1599,27 +1598,27 @@ function Zs(e, t) {
   }
   return e.length;
 }
-function en(e) {
-  return De(e, ",").filter((t) => t.trim().length > 0).length;
+function Ys(e) {
+  return T(e, ",").filter((t) => t.trim().length > 0).length;
 }
-function tn(e, t, r, s) {
+function Js(e, t, r, s) {
   for (;t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = Us(e, n);
+  const n = t, i = Y(e, n);
   if (i === -1)
     return n + 1;
-  const o = e.slice(n + 1, i);
-  return s.push({ name: r.toUpperCase(), argCount: en(o) }), s.push(...vt(o)), i + 1;
+  const a = e.slice(n + 1, i);
+  return s.push({ name: r.toUpperCase(), argCount: Ys(a) }), s.push(...Mt(a)), i + 1;
 }
-function vt(e) {
+function Mt(e) {
   const t = [];
   let r = 0;
   for (;r < e.length; ) {
     const s = e[r];
     if (s === "'" || s === '"') {
-      r = Zs(e, r);
+      r = Gs2(e, r);
       continue;
     }
     if (/[A-Za-z_]/.test(s)) {
@@ -1627,203 +1626,203 @@ function vt(e) {
       for (r++;r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
         r++;
       const i = e.slice(n, r);
-      r = tn(e, r, i, t);
+      r = Js(e, r, i, t);
       continue;
     }
     r++;
   }
   return t;
 }
-function rn(e) {
-  const t = vt(e.formula), r = /* @__PURE__ */ new Set, s = /* @__PURE__ */ new Set;
+function Hs(e) {
+  const t = Mt(e.formula), r = /* @__PURE__ */ new Set, s = /* @__PURE__ */ new Set;
   for (const { name: n, argCount: i } of t) {
-    if (ks.has(n)) {
+    if (Ps.has(n)) {
       r.has(n) || (r.add(n), M(e, `${e.errorPrefix}args[1]: Function ${n} is not supported in custom formulas`));
       continue;
     }
-    const o = te[n];
-    if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
+    const a = te[n];
+    if (a && (i < a.minArgs || i > a.maxArgs) && !s.has(n)) {
       s.add(n);
-      const a = zs(o.minArgs, o.maxArgs);
-      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
+      const o = Bs(a.minArgs, a.maxArgs);
+      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${o}`);
     }
   }
 }
-function sn(e) {
+function Qs(e) {
   return [
-    ...new Set([...e.matchAll(new RegExp(js.source, "g"))].map((t) => t[1]))
+    ...new Set([...e.matchAll(new RegExp(zs.source, "g"))].map((t) => t[1]))
   ];
 }
-function nn(e) {
+function Xs(e) {
   const t = e.result.references.filter((n) => !e.canonicalContextKeys.has(j2(n)));
   if (t.length === 0)
     return;
-  const r = e.contextKeys.map((n) => `[${Nt2(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
+  const r = e.contextKeys.map((n) => `[${Ot(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
   M(e, `${e.errorPrefix}args[1]: ${s} not found in context. Available keys: ${r}`);
 }
-function on(e) {
-  if (Ks.test(e.formula))
+function Zs(e) {
+  if (Ls.test(e.formula))
     return;
   const t = e.result.references.filter((r) => {
     var n;
     const s = (n = e.context[j2(r)]) != null ? n : e.context[r];
-    return s !== undefined && !Mt(s);
+    return s !== undefined && !St(s);
   });
-  t.length !== 0 && M(e, `${e.errorPrefix}args[1]: ${Js(Gs(e.formula))}Bracket reference(s) ${Ys(t)} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`);
+  t.length !== 0 && M(e, `${e.errorPrefix}args[1]: ${Vs(Us(e.formula))}Bracket reference(s) ${_s2(t)} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`);
 }
-function an(e) {
+function en(e) {
   if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0)
     return;
   const t = new Set(e.result.references.map(j2)), r = e.contextKeys.filter((i) => !t.has(j2(i)));
   if (e.result.unusedContextKeys = r, r.length === 0)
     return;
-  const s = r.map((i) => `[${Nt2(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
+  const s = r.map((i) => `[${Ot(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
   e.errorOnUnusedContext ? M(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
 }
-function Je(e, t, r, s) {
-  var o;
-  const n = (o = s.context[j2(e)]) != null ? o : s.context[e];
+function je(e, t, r, s) {
+  var a;
+  const n = (a = s.context[j2(e)]) != null ? a : s.context[e];
   if (n === undefined)
     return;
-  if (!(typeof n == "string" && n.startsWith(E3))) {
-    Mt(n) && M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${E3}Table.Column.Level).`);
+  if (!(typeof n == "string" && n.startsWith(E4))) {
+    St(n) && M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${E4}Table.Column.Level).`);
     return;
   }
   if (s.schemaIndex)
     try {
-      const a = Se2(n, s.schemaIndex);
-      Rn(a.column.dataType) ? r && a.level && a.level !== r && M(s, `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`) : M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`);
-    } catch (a) {
-      const u = a instanceof Error ? a.message : "Unknown error";
+      const o = xe(n, s.schemaIndex);
+      Lt(o.column.dataType) ? r && o.level && o.level !== r && M(s, `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${o.level}'.`) : M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${o.column.name}'.`);
+    } catch (o) {
+      const u = o instanceof Error ? o.message : "Unknown error";
       M(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function un(e) {
-  const t = xt(), r = Rt(e.formula, t);
+function tn(e) {
+  const t = qt(), r = Dt(e.formula, t);
   for (const s of r) {
-    const n = $t(s.functionName);
-    Je(s.ref1, s, n, e), Je(s.ref2, s, n, e);
+    const n = xt(s.functionName);
+    je(s.ref1, s, n, e), je(s.ref2, s, n, e);
   }
 }
-function cn(e, t, r = {}) {
+function rn(e, t, r = {}) {
   var n;
-  const s = Hs(e, t, r);
-  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || M(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Xs(s), rn(s), s.result.references = sn(e), s.result.references.length === 0 ? (s.result.warnings.push(`${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`), s.result) : s.contextKeys.length === 0 ? (M(s, `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`), s.result) : (nn(s), on(s), an(s), un(s), s.result));
+  const s = js(e, t, r);
+  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || M(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Ks(s), Hs(s), s.result.references = Qs(e), s.result.references.length === 0 ? (s.result.warnings.push(`${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`), s.result) : s.contextKeys.length === 0 ? (M(s, `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`), s.result) : (Xs(s), Zs(s), en(s), tn(s), s.result));
 }
-function ln(e, t, r = {}) {
-  const s = cn(e, t, r);
+function sn(e, t, r = {}) {
+  const s = rn(e, t, r);
   if (!s.isValid)
     throw new Error(s.errors.join("; "));
   s.warnings.length > 0 && console.warn("Formula validation warnings:", s.warnings.join("; "));
 }
-function fn(e, t) {
+function nn2(e, t) {
   if (e.length < 3 || e.length > 5)
     throw new Error(`${t.pathPrefix}Expected 3, 4, or 5 arguments for customFormula (title, formula, context, format?, description?)`);
   const r = e[1];
   if (typeof r != "string")
     throw new Error(`${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`);
   const s = r, n = e[2];
-  if (!S2(n))
+  if (!S(n))
     throw new Error(`${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`);
   const i = n;
-  ln(s, i, {
+  sn(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: true,
     allowEmptyFormula: false,
     schemaIndex: t.schemaIndex
   });
-  const o = dn(s), a = {};
-  for (const [u, c] of Object.entries(i)) {
-    const p2 = `args[2].${u}`;
-    if (q3(c))
-      a[`${u}`] = D({
-        data: c,
+  const a = an(s), o = {};
+  for (const [u, l] of Object.entries(i)) {
+    const p = `args[2].${u}`;
+    if (q3(l))
+      o[`${u}`] = D2({
+        data: l,
         context: {
           dataSource: t.dataSource,
           schemaIndex: t.schemaIndex,
-          pathPrefix: p2
+          pathPrefix: p
         }
       });
-    else if (typeof c == "string" && c.startsWith(E3)) {
-      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = o[l];
+    else if (typeof l == "string" && l.startsWith(E4)) {
+      const c = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = a[c];
       try {
-        a[`${u}`] = H(c, t.dataSource, t.schemaIndex, d !== undefined ? { inferredDateLevel: d } : undefined);
+        o[`${u}`] = H2(l, t.dataSource, t.schemaIndex, d !== undefined ? { inferredDateLevel: d } : undefined);
       } catch (b2) {
-        const g2 = b2 instanceof Error ? b2.message : "Unknown error";
-        throw new Error(`${p2}: ${g2}`);
+        const g3 = b2 instanceof Error ? b2.message : "Unknown error";
+        throw new Error(`${p}: ${g3}`);
       }
-    } else if (c && typeof c == "object" && "kind" in c)
-      a[`${u}`] = c;
+    } else if (l && typeof l == "object" && "kind" in l)
+      o[`${u}`] = l;
     else
-      throw new Error(`${p2}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E3}...), but got: ${typeof c}`);
+      throw new Error(`${p}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E4}...), but got: ${typeof l}`);
   }
-  e[2] = a;
+  e[2] = o;
 }
-function dn(e) {
-  const t = xt(), r = Rt(e, t), s = {};
+function an(e) {
+  const t = qt(), r = Dt(e, t), s = {};
   for (const n of r) {
-    const i = $t(n.functionName);
+    const i = xt(n.functionName);
     if (i !== undefined)
-      for (const o of [n.ref1, n.ref2]) {
-        const a = s[o];
-        if (a !== undefined && a !== i)
-          throw new Error(`Reference [${o}] is used in xdiff functions with conflicting date levels ('${a}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`);
-        s[o] = i;
+      for (const a of [n.ref1, n.ref2]) {
+        const o = s[a];
+        if (o !== undefined && o !== i)
+          throw new Error(`Reference [${a}] is used in xdiff functions with conflicting date levels ('${o}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`);
+        s[a] = i;
       }
   }
   return s;
 }
-function It(e) {
+function Nt(e) {
   return e.type === E.TextAttribute;
 }
-function Pt(e) {
+function vt(e) {
   return e.type === E.NumericAttribute;
 }
-function mn(e) {
+function on(e) {
   return e.type === E.DateLevel;
 }
-function pn(e) {
-  return It(e) || Pt(e);
+function un(e) {
+  return Nt(e) || vt(e);
 }
-function ae(e) {
+function ie(e) {
   return e.type === E.TextAttribute ? "text" : e.type === E.NumericAttribute ? "numeric" : e.type === E.DateLevel ? "date/datetime" : "unknown";
 }
-function Me(e, t) {
+function Se2(e, t) {
   const r = e[0];
   if (!r || typeof r != "object" || !("type" in r))
     throw new Error(`${t.pathPrefix}args[0]: Expected attribute as first argument`);
   return r;
 }
-function He(e, t) {
-  const r = Me(e, t);
-  if (!pn(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ae(r)} attribute`);
+function We(e, t) {
+  const r = Se2(e, t);
+  if (!un(r))
+    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(r)} attribute`);
 }
 function P(e, t) {
-  const r = Me(e, t);
-  if (!Pt(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ae(r)} attribute`);
+  const r = Se2(e, t);
+  if (!vt(r))
+    throw new Error(`${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(r)} attribute`);
 }
 function k(e, t) {
-  const r = Me(e, t);
-  if (!It(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string type, got ${ae(r)} attribute`);
+  const r = Se2(e, t);
+  if (!Nt(r))
+    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(r)} attribute`);
 }
-function gn(e, t) {
+function ln(e, t) {
   const r = e[0];
   if (!r || typeof r != "object" || !("attribute" in r))
     throw new Error(`${t.pathPrefix}args[0]: Expected filter as first argument`);
   return r;
 }
-function yn(e, t) {
-  const r = gn(e, t);
-  if (!ap(r))
+function cn(e, t) {
+  const r = ln(e, t);
+  if (!pp(r))
     throw new Error(`${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`);
 }
-var hn = {
-  "measureFactory.customFormula": fn,
-  "filterFactory.equals": He,
-  "filterFactory.doesntEqual": He,
+var fn = {
+  "measureFactory.customFormula": nn2,
+  "filterFactory.equals": We,
+  "filterFactory.doesntEqual": We,
   "filterFactory.greaterThan": P,
   "filterFactory.greaterThanOrEqual": P,
   "filterFactory.lessThan": P,
@@ -1838,12 +1837,12 @@ var hn = {
   "filterFactory.endsWith": k,
   "filterFactory.doesntEndWith": k,
   "filterFactory.like": k,
-  "filterFactory.exclude": yn
+  "filterFactory.exclude": cn
 };
-function bn(e) {
-  return hn[`${e}`];
+function dn(e) {
+  return fn[`${e}`];
 }
-var kt = {
+var Rt2 = {
   "measureFactory.sum": [
     { type: "Attribute", required: true },
     { type: "string", required: false },
@@ -2262,18 +2261,18 @@ var kt = {
     { type: "FilterRelationsNode", required: true }
   ]
 };
-function Ne(e) {
-  return kt[`${e}`];
+function Oe2(e) {
+  return Rt2[`${e}`];
 }
-function An(e) {
-  const t = Ne(e);
+function mn(e) {
+  const t = Oe2(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function Fn(e) {
-  const t = Ne(e);
+function pn(e) {
+  const t = Oe2(e);
   return t ? t.length : 0;
 }
-function wn2(e) {
+function gn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return false;
   const r = Date.parse(e);
@@ -2282,185 +2281,185 @@ function wn2(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function de(e, t, r, s) {
-  if (e.startsWith(E3))
+function ce(e, t, r, s) {
+  if (e.startsWith(E4))
     try {
-      return H(e, t, r);
+      return H2(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
     }
-  throw new Error(`${s}: Invalid attribute '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
+  throw new Error(`${s}: Invalid attribute '${e}'. Expected format: '${E4}TableName.ColumnName[.Level]'`);
 }
-function En(e, t, r, s) {
-  if (e.startsWith(E3))
+function yn(e, t, r, s) {
+  if (e.startsWith(E4))
     try {
-      return Os(e, t, r);
+      return Ss(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
     }
-  throw new Error(`${s}: Invalid date dimension string '${e}'. Expected format: '${E3}TableName.ColumnName'`);
+  throw new Error(`${s}: Invalid date dimension string '${e}'. Expected format: '${E4}TableName.ColumnName'`);
 }
-function Cn(e) {
-  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, o = i;
+function hn(e) {
+  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, a = i;
   if (t === undefined) {
     if (r.required)
-      throw new Error(`${o}: Required argument is missing (expected ${r.type})`);
+      throw new Error(`${a}: Required argument is missing (expected ${r.type})`);
     return;
   }
   if (!(t === null && !r.required))
     switch (r.type) {
       case "string":
         if (typeof t != "string")
-          throw new Error(`${o}: Expected string, got ${typeof t}`);
+          throw new Error(`${a}: Expected string, got ${typeof t}`);
         return t;
       case "number":
         if (typeof t != "number")
-          throw new Error(`${o}: Expected number, got ${typeof t}`);
+          throw new Error(`${a}: Expected number, got ${typeof t}`);
         return t;
       case "boolean":
         if (typeof t != "boolean")
-          throw new Error(`${o}: Expected boolean, got ${typeof t}`);
+          throw new Error(`${a}: Expected boolean, got ${typeof t}`);
         return t;
       case "string[]":
         if (!Array.isArray(t))
-          throw new Error(`${o}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`);
-        if (!t.every((a) => typeof a == "string"))
-          throw new Error(`${o}: Expected array of strings, but contains non-string values`);
+          throw new Error(`${a}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`);
+        if (!t.every((o) => typeof o == "string"))
+          throw new Error(`${a}: Expected array of strings, but contains non-string values`);
         return t;
       case "number[]":
         if (!Array.isArray(t))
-          throw new Error(`${o}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`);
-        if (!t.every((a) => typeof a == "number"))
-          throw new Error(`${o}: Expected array of numbers, but contains non-number values`);
+          throw new Error(`${a}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`);
+        if (!t.every((o) => typeof o == "number"))
+          throw new Error(`${a}: Expected array of numbers, but contains non-number values`);
         return t;
       case "Attribute":
         if (typeof t != "string")
-          throw new Error(`${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`);
-        return de(t, s, n, o);
+          throw new Error(`${a}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`);
+        return ce(t, s, n, a);
       case "Attribute[]":
         if (!Array.isArray(t))
-          throw new Error(`${o}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`);
-        return t.map((a, u) => {
-          if (typeof a != "string")
-            throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
-          return de(a, s, n, `${o}[${u}]`);
+          throw new Error(`${a}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`);
+        return t.map((o, u) => {
+          if (typeof o != "string")
+            throw new Error(`${a}[${u}]: Expected attribute string, got ${typeof o}`);
+          return ce(o, s, n, `${a}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
         if (!q3(t))
-          throw new Error(`${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`);
-        return D({
+          throw new Error(`${a}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`);
+        return D2({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
         });
       case "Measure[]":
         if (!Array.isArray(t))
-          throw new Error(`${o}: Expected array of measure function calls, got ${typeof t}`);
-        return t.map((a, u) => {
-          if (!q3(a))
-            throw new Error(`${o}[${u}]: Expected measure function call, got ${typeof a}`);
-          return D({
-            data: a,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+          throw new Error(`${a}: Expected array of measure function calls, got ${typeof t}`);
+        return t.map((o, u) => {
+          if (!q3(o))
+            throw new Error(`${a}[${u}]: Expected measure function call, got ${typeof o}`);
+          return D2({
+            data: o,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
           });
         });
       case "Filter":
         if (!q3(t))
-          throw new Error(`${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`);
-        return D({
+          throw new Error(`${a}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`);
+        return D2({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
         });
       case "Filter[]":
         if (!Array.isArray(t))
-          throw new Error(`${o}: Expected array of filter function calls, got ${typeof t}`);
-        return t.map((a, u) => {
-          if (!q3(a))
-            throw new Error(`${o}[${u}]: Expected filter function call, got ${typeof a}`);
-          return D({
-            data: a,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+          throw new Error(`${a}: Expected array of filter function calls, got ${typeof t}`);
+        return t.map((o, u) => {
+          if (!q3(o))
+            throw new Error(`${a}[${u}]: Expected filter function call, got ${typeof o}`);
+          return D2({
+            data: o,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
           });
         });
       case "FilterRelationsNode":
         if (Array.isArray(t))
-          return t.map((a, u) => {
-            if (!q3(a))
-              throw new Error(`${o}[${u}]: Expected filter function call, got ${typeof a}`);
-            return D({
-              data: a,
-              context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+          return t.map((o, u) => {
+            if (!q3(o))
+              throw new Error(`${a}[${u}]: Expected filter function call, got ${typeof o}`);
+            return D2({
+              data: o,
+              context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
             });
           });
         if (q3(t))
-          return D({
+          return D2({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
           });
-        throw new Error(`${o}: Expected filter function call or array of filters, got ${typeof t}`);
+        throw new Error(`${a}: Expected filter function call or array of filters, got ${typeof t}`);
       case "DateDimension":
         if (typeof t != "string")
-          throw new Error(`${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`);
-        return En(t, s, n, o);
+          throw new Error(`${a}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`);
+        return yn(t, s, n, a);
       case "LevelAttribute": {
         if (typeof t != "string")
-          throw new Error(`${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`);
-        const a = de(t, s, n, o);
-        if (!mn(a))
-          throw new Error(`${o}: Attribute must be date/datetime type, got ${ae(a)} attribute`);
-        return a;
+          throw new Error(`${a}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`);
+        const o = ce(t, s, n, a);
+        if (!on(o))
+          throw new Error(`${a}: Attribute must be date/datetime type, got ${ie(o)} attribute`);
+        return o;
       }
       case "Measure | number":
         if (typeof t == "number")
           return t;
         if (q3(t))
-          return D({
+          return D2({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
           });
-        throw new Error(`${o}: Expected measure function call or number, got ${typeof t}`);
+        throw new Error(`${a}: Expected measure function call or number, got ${typeof t}`);
       case "Date | string":
         if (typeof t == "string") {
-          if (wn2(t))
+          if (gn(t))
             return t;
-          throw new Error(`${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`);
+          throw new Error(`${a}: Expected valid ISO date string or Date object, got invalid date string '${t}'`);
         } else {
           if (t instanceof Date)
             return t;
-          throw new Error(`${o}: Expected date string or Date object, got ${typeof t}`);
+          throw new Error(`${a}: Expected date string or Date object, got ${typeof t}`);
         }
       case "string | number":
         if (typeof t == "string" || typeof t == "number")
           return t;
-        throw new Error(`${o}: Expected string or number, got ${typeof t}`);
+        throw new Error(`${a}: Expected string or number, got ${typeof t}`);
       case "BaseFilterConfig":
       case "MembersFilterConfig":
       case "CustomFormulaContext":
       case "any":
         if (t == null && r.required)
-          throw new Error(`${o}: Required argument is null/undefined`);
+          throw new Error(`${a}: Required argument is null/undefined`);
         return t;
       default:
         return t;
     }
 }
-function D(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = Ne(i);
+function D2(e) {
+  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: a } = t, o = n ? `${n}.` : "", u = Oe2(i);
   if (!u) {
-    const g2 = Object.keys(kt), m2 = R(i, g2, (C2) => C2), A = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
-    throw new Error(`${a}function: Unknown function '${i}'.${A}`);
-  }
-  const c = An(i), p2 = Fn(i);
-  if (o.length < c)
-    throw new Error(`${a}function: Expected at least ${c} arguments, got ${o.length}`);
-  if (o.length > p2)
-    throw new Error(`${a}function: Expected at most ${p2} arguments, got ${o.length}`);
-  const l = [], d = [];
-  for (let g2 = 0;g2 < Math.max(o.length, u.length); g2++) {
-    const m2 = u[`${g2}`], A = o[`${g2}`], C2 = a ? `${a}args[${g2}]` : `args[${g2}]`;
-    if (A === undefined) {
+    const g3 = Object.keys(Rt2), m2 = v(i, g3, (C2) => C2), F = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
+    throw new Error(`${o}function: Unknown function '${i}'.${F}`);
+  }
+  const l = mn(i), p = pn(i);
+  if (a.length < l)
+    throw new Error(`${o}function: Expected at least ${l} arguments, got ${a.length}`);
+  if (a.length > p)
+    throw new Error(`${o}function: Expected at most ${p} arguments, got ${a.length}`);
+  const c = [], d = [];
+  for (let g3 = 0;g3 < Math.max(a.length, u.length); g3++) {
+    const m2 = u[`${g3}`], F = a[`${g3}`], C2 = o ? `${o}args[${g3}]` : `args[${g3}]`;
+    if (F === undefined) {
       m2 != null && m2.required && d.push(`${C2}: Missing required argument (expected ${m2.type})`);
       continue;
     }
@@ -2469,8 +2468,8 @@ function D(e) {
       continue;
     }
     try {
-      const N2 = Cn({
-        data: A,
+      const N3 = hn({
+        data: F,
         context: {
           dataSource: r,
           schemaIndex: s,
@@ -2478,67 +2477,67 @@ function D(e) {
           argSchema: m2
         }
       });
-      l.push(N2);
-    } catch (N2) {
-      const ue = N2 instanceof Error ? N2.message : "Unknown error";
-      d.push(ue);
+      c.push(N3);
+    } catch (N3) {
+      const ae = N3 instanceof Error ? N3.message : "Unknown error";
+      d.push(ae);
     }
   }
   if (d.length > 0) {
-    const g2 = d.join("; ");
-    throw new Error(g2);
+    const g3 = d.join("; ");
+    throw new Error(g3);
   }
-  const b2 = bn(i);
+  const b2 = dn(i);
   if (b2)
     try {
-      b2(l, {
+      b2(c, {
         dataSource: r,
         schemaIndex: s,
-        pathPrefix: a
+        pathPrefix: o
       });
-    } catch (g2) {
-      const m2 = g2 instanceof Error ? g2.message : "Unknown validation error";
+    } catch (g3) {
+      const m2 = g3 instanceof Error ? g3.message : "Unknown validation error";
       throw new Error(m2);
     }
-  return Ps(i, l);
+  return Is(i, c);
 }
-function Bt(e) {
+function It(e) {
   const { attribute: t, config: r } = e;
-  if (ap(e) && Rp(t)) {
-    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = Fi(r), o = Object.keys(i).length === 0 ? undefined : i;
-    return Ct(t, n, o);
+  if (pp(e) && Fp(t)) {
+    const { granularity: s } = t, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), i = ki(r), a = Object.keys(i).length === 0 ? undefined : i;
+    return Rt(t, n, a);
   }
   return e;
 }
-function Tn(e) {
+function bn(e) {
   let t = [];
   for (const r of e)
-    Z(r) ? t = Mp(r, t) : t = Mp([Bt(r)], t);
+    Z(r) ? t = Up(r, t) : t = Up([It(r)], t);
   return t != null ? t : [];
 }
-var qn = (e) => {
+var Fn2 = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
       category: "filters",
-      index: a,
-      input: o
+      index: o,
+      input: a
     };
     try {
-      const c = D({
-        data: o,
+      const l = D2({
+        data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !Z(c) && !oe(c) ? i.push(F(y2({}, u), { message: "Invalid filter JSON" })) : n.push(c);
-    } catch (c) {
-      const p2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y2({}, u), { message: p2 }));
+      !Z(l) && !ne(l) ? i.push(A(y({}, u), { message: "Invalid filter JSON" })) : n.push(l);
+    } catch (l) {
+      const p = l instanceof Error ? l.message : "Unknown error";
+      i.push(A(y({}, u), { message: p }));
     }
-  }), i.length > 0 ? { success: false, errors: i } : { success: true, data: Tn(n) };
+  }), i.length > 0 ? { success: false, errors: i } : { success: true, data: bn(n) };
 };
-var Re = (e) => {
+var De = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ct2(t) ? qn({
+  return t ? Et(t) ? Fn2({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2553,29 +2552,29 @@ var Re = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var xn = (e) => {
+var An = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
       category: "highlights",
-      index: a,
-      input: o
+      index: o,
+      input: a
     };
     try {
-      const c = D({
-        data: o,
+      const l = D2({
+        data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      oe(c) ? n.push(Bt(c)) : i.push(F(y2({}, u), { message: "Invalid filter JSON" }));
-    } catch (c) {
-      const p2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y2({}, u), { message: p2 }));
+      ne(l) ? n.push(It(l)) : i.push(A(y({}, u), { message: "Invalid filter JSON" }));
+    } catch (l) {
+      const p = l instanceof Error ? l.message : "Unknown error";
+      i.push(A(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
-var ve = (e) => {
+var Me = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ct2(t) ? xn({
+  return t ? Et(t) ? An({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2590,63 +2589,63 @@ var ve = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var $n = (e, t) => {
-  if (e && !Lp(e))
-    return F(y2({}, t), {
+var wn = (e, t) => {
+  if (e && !ws(e))
+    return A(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
 };
-var Sn = (e, t, r) => {
+var En2 = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
-    const i = D({
+    const i = D2({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return xe(i) ? { success: true, data: i } : {
+    return Te(i) ? { success: true, data: i } : {
       success: false,
-      errors: [F(y2({}, r), { message: "Invalid measure JSON" })]
+      errors: [A(y({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
-    const o = i instanceof Error ? i.message : "Unknown error";
+    const a = i instanceof Error ? i.message : "Unknown error";
     return {
       success: false,
-      errors: [F(y2({}, r), { message: o })]
+      errors: [A(y({}, r), { message: a })]
     };
   }
 };
-var On = (e, t, r, s) => {
-  const n = D({
+var Cn = (e, t, r, s) => {
+  const n = D2({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  if (!xe(n))
+  if (!Te(n))
     return {
       style: {},
-      error: F(y2({}, s), { message: "Invalid measure JSON" })
+      error: A(y({}, s), { message: "Invalid measure JSON" })
     };
-  const i = $n(e.sortType, s);
+  const i = wn(e.sortType, s);
   if (i) {
-    const a = ed(e, "column");
-    return { measure: n, style: a, error: i };
+    const o = od(e, "column");
+    return { measure: n, style: o, error: i };
   }
-  const o = ed(e, "column");
-  return { measure: n, style: o };
+  const a = od(e, "column");
+  return { measure: n, style: a };
 };
-var Dn = (e, t, r, s) => {
-  if ($s(e))
-    return On(e, t, r, s);
+var Tn = (e, t, r, s) => {
+  if (xs2(e))
+    return Cn(e, t, r, s);
   if (q3(e)) {
-    const n = Sn(e, { dataSource: t, schemaIndex: r }, s);
+    const n = En2(e, { dataSource: t, schemaIndex: r }, s);
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: F(y2({}, s), {
+    error: A(y({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
 };
-var zt = (e) => {
+var Pt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: true, data: [] };
@@ -2663,27 +2662,27 @@ var zt = (e) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
       category: "measures",
-      index: a,
-      input: o
+      index: o,
+      input: a
     };
     try {
-      const c = Dn(o, r, s, u);
-      if (c.error) {
-        i.push(c.error);
+      const l = Tn(a, r, s, u);
+      if (l.error) {
+        i.push(l.error);
         return;
       }
-      c.measure && n.push(c.style !== undefined ? { measure: c.measure, style: c.style } : { measure: c.measure });
-    } catch (c) {
-      const p2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y2({}, u), { message: p2 }));
+      l.measure && n.push(l.style !== undefined ? { measure: l.measure, style: l.style } : { measure: l.measure });
+    } catch (l) {
+      const p = l instanceof Error ? l.message : "Unknown error";
+      i.push(A(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
-function Q(e) {
-  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(Q) : e !== null && typeof e == "object" ? Object.fromEntries(Object.entries(e).map(([t, r]) => [t, Q(r)])) : e;
+function Q2(e) {
+  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(Q2) : e !== null && typeof e == "object" ? Object.fromEntries(Object.entries(e).map(([t, r]) => [t, Q2(r)])) : e;
 }
 function w(e, t, r) {
   const s = e();
@@ -2693,47 +2692,19 @@ function w(e, t, r) {
   }
   return s.data;
 }
-var Ie = "$trend";
-var Pe = "$forecast";
-function Mn(e) {
-  return e.map(({ attribute: t, style: r }) => {
-    const s = r == null ? undefined : r.sortType;
-    if (!s)
-      return t;
-    const n = typeof s == "object" ? s.direction : s;
-    return Lp(n) ? t.sort(Ap(n)) : t;
-  });
-}
-function Nn(e) {
-  var t, r;
-  return (r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false;
-}
-function Rn2(e) {
-  var t, r;
-  return (r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false;
-}
-function vn2(e) {
-  var r, s;
-  const t = [];
-  for (const { measure: n, style: i } of e) {
-    const o = i == null ? undefined : i.sortType, a = o && Lp(o) ? n.sort(Ap(o)) : n;
-    t.push(a), i != null && i.trend && !Nn(n) && t.push(Ld(n, `${Ie}_${(r = n.name) != null ? r : "Measure"}`, i.trend)), i != null && i.forecast && !Rn2(n) && t.push(Md(n, `${Pe}_${(s = n.name) != null ? s : "Measure"}`, i.forecast));
-  }
-  return t;
-}
-var ii = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = $e(s), i = [], o = w(() => qt({
+var Jn = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = qe(s), i = [], a = w(() => Tt({
     data: t.dimensions || [],
     context: { dataSource: r, schemaIndex: n }
-  }), i), a = w(() => zt({
+  }), i), o = w(() => Pt({
     data: t.measures || [],
     context: { dataSource: r, schemaIndex: n }
-  }), i), u = w(() => Re({
+  }), i), u = w(() => De({
     data: t.filters || [],
     context: { dataSource: r, schemaIndex: n }
   }), i);
-  let c = null;
-  return t.highlights && (c = w(() => ve({
+  let l = null;
+  return t.highlights && (l = w(() => Me({
     data: t.highlights || [],
     context: { dataSource: r, schemaIndex: n }
   }), i)), i.length > 0 ? {
@@ -2741,56 +2712,56 @@ var ii = (e) => {
     errors: i
   } : {
     success: true,
-    data: y2({
-      dataSource: Sp(r),
-      dimensions: o ? Mn(o) : [],
-      measures: a ? vn2(a) : [],
+    data: y({
+      dataSource: Np(r),
+      dimensions: a ? gm(a) : [],
+      measures: o ? hm(o) : [],
       filters: u || []
-    }, c && { highlights: c })
+    }, l && { highlights: l })
   };
 };
-function Qe(e) {
+function Ke2(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== undefined;
 }
-function ke(e) {
+function Ne(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var l, d, b2;
-    const i = Qe(s) ? s.column : s, o = Qe(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var c, d, b2;
+    const i = Ke2(s) ? s.column : s, a = Ke2(s) ? s : undefined, o = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "dimensions",
         index: n,
-        input: a(),
+        input: o(),
         message: `Dimension at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
-    if (!i.composeCode.startsWith(E3)) {
+    if (!i.composeCode.startsWith(E4)) {
       r.push({
         category: "dimensions",
         index: n,
-        input: a(),
-        message: `Expected composeCode to start with '${E3}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
+        input: o(),
+        message: `Expected composeCode to start with '${E4}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (b2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? b2 : ((l = i.getSort) == null ? undefined : l.call(i)) !== undefined && ((d = i.getSort) == null ? undefined : d.call(i)) !== C.None ? i.getSort() : undefined, c = o ? ed(o, "column") : {};
-    if (u !== undefined && u !== C.None || o && Object.keys(c).length > 0) {
-      const g2 = y2(y2({
+    const u = (b2 = a != null && a.sortType ? _s(a.sortType) : undefined) != null ? b2 : ((c = i.getSort) == null ? undefined : c.call(i)) !== undefined && ((d = i.getSort) == null ? undefined : d.call(i)) !== N.None ? i.getSort() : undefined, l = a ? od(a, "column") : {};
+    if (u !== undefined && u !== N.None || a && Object.keys(l).length > 0) {
+      const g3 = y(y({
         column: i.composeCode
-      }, u !== undefined && u !== C.None && { sortType: Tp(u) }), c);
-      t.push(g2);
+      }, u !== undefined && u !== N.None && { sortType: Rp(u) }), l);
+      t.push(g3);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-var be2 = "Unknown error";
-function Be(e) {
+var ye2 = "Unknown error";
+function ve(e) {
   if (!e)
     return { success: true, data: [] };
   const t = [];
-  if (Zt(e)) {
+  if (nn(e)) {
     if (!e.composeCode)
       return {
         success: false,
@@ -2804,9 +2775,9 @@ function Be(e) {
         ]
       };
     try {
-      return { success: true, data: [W(e.composeCode)] };
+      return { success: true, data: [q(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : be2;
+      const n = s instanceof Error ? s.message : ye2;
       return {
         success: false,
         errors: [
@@ -2833,20 +2804,20 @@ function Be(e) {
       return;
     }
     try {
-      const o = W(s.composeCode);
-      r.push(o);
-    } catch (o) {
-      const a = o instanceof Error ? o.message : be2;
+      const a = q(s.composeCode);
+      r.push(a);
+    } catch (a) {
+      const o = a instanceof Error ? a.message : ye2;
       t.push({
         category: "filters",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), t.length > 0 ? { success: false, errors: t } : { success: true, data: r };
 }
-function ze(e) {
+function Re(e) {
   if (!e)
     return { success: true, data: [] };
   const t = [], r = [];
@@ -2862,135 +2833,120 @@ function ze(e) {
       return;
     }
     try {
-      const o = W(s.composeCode);
-      t.push(o);
-    } catch (o) {
-      const a = o instanceof Error ? o.message : be2;
+      const a = q(s.composeCode);
+      t.push(a);
+    } catch (a) {
+      const o = a instanceof Error ? a.message : ye2;
       r.push({
         category: "highlights",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for highlight filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for highlight filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-function Xe(e) {
+function Ge(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== undefined;
 }
-function Le(e) {
+function Ie(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var u, c, p2;
-    const i = Xe(s) ? s.column : s, o = Xe(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var u, l, p;
+    const i = Ge(s) ? s.column : s, a = Ge(s) ? s : undefined, o = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "measures",
         index: n,
-        input: a(),
+        input: o(),
         message: `Measure at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const l = W(i.composeCode), d = (p2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? p2 : ((u = i.getSort) == null ? undefined : u.call(i)) !== undefined && ((c = i.getSort) == null ? undefined : c.call(i)) !== C.None ? i.getSort() : undefined;
-      if (d !== undefined && d !== C.None || o && Object.keys(ed(o, "column")).length > 0) {
-        const g2 = o ? ed(o, "column") : {}, m2 = y2(y2({
-          column: l
-        }, d !== undefined && d !== C.None && { sortType: Tp(d) }), g2);
+      const c = q(i.composeCode), d = (p = a != null && a.sortType ? _s(a.sortType) : undefined) != null ? p : ((u = i.getSort) == null ? undefined : u.call(i)) !== undefined && ((l = i.getSort) == null ? undefined : l.call(i)) !== N.None ? i.getSort() : undefined;
+      if (d !== undefined && d !== N.None || a && Object.keys(od(a, "column")).length > 0) {
+        const g3 = a ? od(a, "column") : {}, m2 = y(y({
+          column: c
+        }, d !== undefined && d !== N.None && { sortType: Rp(d) }), g3);
         t.push(m2);
       } else
-        t.push(l);
-    } catch (l) {
-      const d = l instanceof Error ? l.message : "Unknown error";
+        t.push(c);
+    } catch (c) {
+      const d = c instanceof Error ? c.message : "Unknown error";
       r.push({
         category: "measures",
         index: n,
-        input: a(),
+        input: o(),
         message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${d}. ComposeCode: '${i.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-function Ze(e) {
+function Ye(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Ie)) != null ? n : false);
+  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Ws)) != null ? n : false);
 }
-function et(e) {
+function Je(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Pe)) != null ? n : false);
+  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Gs)) != null ? n : false);
 }
-function tt(e) {
+function He(e) {
   try {
-    const t = W(e.trim());
+    const t = q(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : undefined;
   } catch (t) {
     return;
   }
 }
-function In(e) {
+function qn(e) {
   var s, n, i;
   if (!(e != null && e.length))
     return [];
   const t = /* @__PURE__ */ new Set, r = [];
-  for (let o = 0;o < e.length; o++) {
-    if (t.has(o))
+  for (let a = 0;a < e.length; a++) {
+    if (t.has(a))
       continue;
-    const a = e[o];
-    if (Ze(a) || et(a)) {
-      r.push(a);
+    const o = e[a];
+    if (Ye(o) || Je(o)) {
+      r.push(o);
       continue;
     }
-    const u = (s = a.name) != null ? s : "Measure", c = `${Ie}_${u}`, p2 = `${Pe}_${u}`;
-    let l, d, b2 = o + 1;
-    if (b2 < e.length && !t.has(b2) && Ze(e[b2]) && e[b2].name === c) {
-      const g2 = (n = e[b2].composeCode) == null ? undefined : n.trim();
-      g2 && (l = tt(g2), t.add(b2), b2++);
+    const u = (s = o.name) != null ? s : "Measure", l = `${Ws}_${u}`, p = `${Gs}_${u}`;
+    let c, d, b2 = a + 1;
+    if (b2 < e.length && !t.has(b2) && Ye(e[b2]) && e[b2].name === l) {
+      const g3 = (n = e[b2].composeCode) == null ? undefined : n.trim();
+      g3 && (c = He(g3), t.add(b2), b2++);
     }
-    if (b2 < e.length && !t.has(b2) && et(e[b2]) && e[b2].name === p2) {
-      const g2 = (i = e[b2].composeCode) == null ? undefined : i.trim();
-      g2 && (d = tt(g2), t.add(b2));
+    if (b2 < e.length && !t.has(b2) && Je(e[b2]) && e[b2].name === p) {
+      const g3 = (i = e[b2].composeCode) == null ? undefined : i.trim();
+      g3 && (d = He(g3), t.add(b2));
     }
-    l !== undefined || d !== undefined ? r.push(y2(y2({
-      column: a
-    }, l && Object.keys(l).length > 0 && { trend: l }), d && Object.keys(d).length > 0 && { forecast: d })) : r.push(a);
+    c !== undefined || d !== undefined ? r.push(y(y({
+      column: o
+    }, c && Object.keys(c).length > 0 && { trend: c }), d && Object.keys(d).length > 0 && { forecast: d })) : r.push(o);
   }
   return r;
 }
-function oi(e) {
-  const t = [], r = w(() => ke(e.dimensions || []), t), s = In(e.measures || []), n = w(() => Le(s), t), i = w(() => Be(e.filters), t);
-  let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = w(() => ze(e.highlights), t)), t.length > 0)
+function Hn(e) {
+  const t = [], r = w(() => Ne(e.dimensions || []), t), s = qn(e.measures || []), n = w(() => Ie(s), t), i = w(() => ve(e.filters), t);
+  let a = null;
+  if (e.highlights && e.highlights.length > 0 && (a = w(() => Re(e.highlights), t)), t.length > 0)
     return {
       success: false,
       errors: t
     };
-  const a = y2({
+  const o = y({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
-  }, o && { highlights: o });
+  }, a && { highlights: a });
   return {
     success: true,
-    data: Q(a)
+    data: Q2(o)
   };
 }
-var Lt = new Set(Xp.filter((e) => e !== "image"));
-var rt = Object.freeze([...Lt]);
-function Zn(e) {
-  const { filters: t, relations: r } = bp(e.filters || []);
-  return {
-    dataSource: e.dataSource,
-    dimensions: e.dimensions,
-    measures: e.measures,
-    filters: t,
-    filterRelations: r,
-    highlights: e.highlights
-  };
-}
-function fi(e, t, r = false) {
-  const s = Zn(e), n = jn(s, t);
-  return Dh(n, r);
-}
+var kt = new Set(sm.filter((e) => e !== "image"));
+var Qe = Object.freeze([...kt]);
 
-export { y, N, q, ni, ii, oi, fi };
+export { g2 as g, z, Q, q, Yn, Jn, Hn };