@sisense/sdk-ui 2.25.0 → 2.26.0

package/dist/analytics-composer/node.js

@@ -1,27 +1,172 @@
-var Lt = Object.defineProperty, Ut = Object.defineProperties;
-var _t = Object.getOwnPropertyDescriptors;
-var Pe = Object.getOwnPropertySymbols;
-var Vt = Object.prototype.hasOwnProperty, jt = Object.prototype.propertyIsEnumerable;
-var ke = (e, t, r) => t in e ? Lt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
+var Vt = Object.defineProperty, Wt = Object.defineProperties;
+var jt = Object.getOwnPropertyDescriptors;
+var ke = Object.getOwnPropertySymbols;
+var Kt = Object.prototype.hasOwnProperty, Gt = Object.prototype.propertyIsEnumerable;
+var Be = (e, t, r) => t in e ? Vt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
   for (var r in t || (t = {}))
-    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]);
+    Kt.call(t, r) && Be(e, r, t[r]);
+  if (ke)
+    for (var r of ke(t))
+      Gt.call(t, r) && Be(e, r, t[r]);
   return e;
-}, A = (e, t) => Ut(e, _t(t));
-import { f as Wt, J as Kt } from "../types-BBp2sp_s.js";
-import { b as ni, E as ii, a as ai, i as oi, e as ui, d as li } from "../types-BBp2sp_s.js";
-import { cg as Gt, bJ as Yt, ch as Jt, ci as Ht, cj as Qt, aw as be, ck as Xt, av as Zt, cl as er, bb as tr, ax as rr, cm as sr, be as nr, bc as ir, aO as ar, ba as or, bd as ur, d as lr, c as cr, k as fr, cn as dr, co as mr, cp as pr, cq as gr, cr as yr, cs as hr, ct as br, cu as Fr, cv as Ar, cw as wr, cx as Er, au as Cr, cy as Tr, cz as qr, S as B, t as X, h as xr, b as $, al as _, aj as et, cA as $r, cB as Sr, cC as Or, M as U, cD as Dr, cE as Mr, aK as Nr, an as Be, am as Fe, cd as vr, ce as Rr, bP as tt, cF as rt, ad as Ir, cG as st, cH as nt, A as Pr, cI as kr, bF as Br, aD as zr } from "../apply-styled-options-to-query-BsBTwL6W.js";
-import { i as Lr, b as Ur, D as _r, d as Vr, a as jr, s as Wr, f as Kr, p as K } from "../parse-compose-code-DfZskSng.js";
-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));
+}, w = (e, t) => Wt(e, jt(t));
+import { f as Yt, J as Jt } from "../types-D6jCGncV.js";
+import { b as li, E as fi, a as di, i as mi, e as pi, d as gi } from "../types-D6jCGncV.js";
+import { cg as Ht, bs as Qt, ch as Xt, ci as Zt, cj as er, aw as be, ck as tr, av as rr, cl as sr, bb as nr, ax as ir, cm as or, be as ar, bc as ur, aO as cr, ba as lr, bd as fr, d as dr, c as mr, k as pr, cn as gr, co as yr, cp as hr, cq as br, cr as Ar, cs as wr, ct as Fr, cu as Er, cv as Cr, cw as qr, cx as Tr, au as xr, cy as $r, cz as Sr, S as B, t as X, h as Or, b as $, al as _, ak as tt, cA as Dr, cB as Mr, cC as Nr, M as U, cD as Rr, cE as vr, aK as Ir, an as ze, am as Ae, cd as Pr, ce as kr, bP as rt, cF as st, ad as Br, cG as nt, cH as it, A as zr, cI as Lr, bG as Ur, aD as _r } from "../apply-styled-options-to-query-Bzt2GrgO.js";
+import { i as Vr, b as Wr, D as jr, d as Kr, a as Gr } from "../dimensions-Ce2zWFrs.js";
+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));
   for (let i = 1; i <= r; i++)
-    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));
+    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));
   return n[r][s];
 }
-class Yr {
+function we(e, t) {
+  const r = [];
+  let s = "", n = 0, i = !1, 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 = !1, o = null, s += u;
+      continue;
+    } else {
+      if (u === "'" || u === '"') {
+        i = !0, 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 Jr(e, t) {
+  let r = 0, s = !1, 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 = !1, n = null;
+    } else {
+      if (o === "'" || o === '"') {
+        s = !0, n = o;
+        continue;
+      }
+      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0)
+        return i;
+    }
+  }
+  return -1;
+}
+function Hr(e, t) {
+  if (e[t] !== "(")
+    return -1;
+  let r = 1, s = t + 1, n = !1, 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 = !1, i = null, s++;
+    } else {
+      if (o === "'" || o === '"') {
+        n = !0, i = o, s++;
+        continue;
+      }
+      if ("([{".includes(o) && r++, ")]}".includes(o) && --r === 0)
+        return s;
+      s++;
+    }
+  }
+  return -1;
+}
+function Qr(e) {
+  return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
+}
+function V(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 = ot(n);
+  return {
+    function: s,
+    args: i
+  };
+}
+function ot(e) {
+  return e.trim() ? we(e, ",").map(at) : [];
+}
+function at(e) {
+  if (!e)
+    throw new Error("Cannot parse empty argument value");
+  if (e === "null")
+    return null;
+  if (e === "undefined")
+    return;
+  if (e === "true")
+    return !0;
+  if (e === "false")
+    return !1;
+  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 = ot(r);
+    return s.every((n) => typeof n == "string"), s;
+  }
+  if (e.startsWith("{") && e.endsWith("}")) {
+    const r = e.slice(1, -1).trim();
+    return r ? Zr(r) : {};
+  }
+  return e.includes("(") && e.includes(")") ? V(e) : (e.startsWith("DM."), e);
+}
+function Xr(e) {
+  const t = Jr(e, ":");
+  if (t === -1)
+    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
+  const r = Qr(e.slice(0, t).trim()), s = at(e.slice(t + 1).trim());
+  return [r, s];
+}
+function Zr(e) {
+  if (!e.trim())
+    return {};
+  const t = we(e, ",").map(Xr).filter(([, r]) => r !== null);
+  return Object.fromEntries(t);
+}
+class es {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -38,9 +183,9 @@ class Yr {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class it {
+class ut {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new Yr();
+    this.generateIdentifier = t, this.kv = new es();
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -55,7 +200,7 @@ class it {
     return this.kv.getByKey(t);
   }
 }
-class Jr extends it {
+class ts extends ut {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -66,7 +211,7 @@ class Jr extends it {
     return this.classToAllowedProps.get(t);
   }
 }
-function Hr(e) {
+function rs(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -74,8 +219,8 @@ function Hr(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function Qr(e, t) {
-  const r = Hr(e);
+function ss(e, t) {
+  const r = rs(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -85,20 +230,20 @@ function Qr(e, t) {
       return i;
   }
 }
-function V(e, t) {
+function W(e, t) {
   Object.entries(e).forEach(([r, s]) => t(s, r));
 }
 function ee(e, t) {
   return e.indexOf(t) !== -1;
 }
-function ze(e, t) {
+function Le(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class Xr {
+class ns {
   constructor() {
     this.transfomers = {};
   }
@@ -106,13 +251,13 @@ class Xr {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return Qr(this.transfomers, (r) => r.isApplicable(t));
+    return ss(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const Zr = (e) => Object.prototype.toString.call(e).slice(8, -1), at = (e) => typeof e == "undefined", es = (e) => e === null, G = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, de = (e) => G(e) && Object.keys(e).length === 0, I = (e) => Array.isArray(e), ts = (e) => typeof e == "string", rs = (e) => typeof e == "number" && !isNaN(e), ss = (e) => typeof e == "boolean", ns = (e) => e instanceof RegExp, Y = (e) => e instanceof Map, J = (e) => e instanceof Set, ot = (e) => Zr(e) === "Symbol", is = (e) => e instanceof Date && !isNaN(e.valueOf()), as = (e) => e instanceof Error, Le = (e) => typeof e == "number" && isNaN(e), os = (e) => ss(e) || es(e) || at(e) || rs(e) || ts(e) || ot(e), us = (e) => typeof e == "bigint", ls = (e) => e === 1 / 0 || e === -1 / 0, cs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), fs = (e) => e instanceof URL, ut = (e) => e.replace(/\./g, "\\."), oe = (e) => e.map(String).map(ut).join("."), W = (e) => {
+const is = (e) => Object.prototype.toString.call(e).slice(8, -1), ct = (e) => typeof e == "undefined", os = (e) => e === null, G = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, de = (e) => G(e) && Object.keys(e).length === 0, I = (e) => Array.isArray(e), as = (e) => typeof e == "string", us = (e) => typeof e == "number" && !isNaN(e), cs = (e) => typeof e == "boolean", ls = (e) => e instanceof RegExp, Y = (e) => e instanceof Map, J = (e) => e instanceof Set, lt = (e) => is(e) === "Symbol", fs = (e) => e instanceof Date && !isNaN(e.valueOf()), ds = (e) => e instanceof Error, Ue = (e) => typeof e == "number" && isNaN(e), ms = (e) => cs(e) || os(e) || ct(e) || us(e) || as(e) || lt(e), ps = (e) => typeof e == "bigint", gs = (e) => e === 1 / 0 || e === -1 / 0, ys = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), hs = (e) => e instanceof URL, ft = (e) => e.replace(/\./g, "\\."), ae = (e) => e.map(String).map(ft).join("."), K = (e) => {
   const t = [];
   let r = "";
   for (let n = 0; n < e.length; n++) {
@@ -130,7 +275,7 @@ const Zr = (e) => Object.prototype.toString.call(e).slice(8, -1), at = (e) => ty
   const s = r;
   return t.push(s), t;
 };
-function R(e, t, r, s) {
+function v(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -138,12 +283,12 @@ function R(e, t, r, s) {
     untransform: s
   };
 }
-const lt = [
-  R(at, "undefined", () => null, () => {
+const dt = [
+  v(ct, "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) => {
+  v(ps, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  v(fs, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  v(ds, "Error", (e, t) => {
     const r = {
       name: e.name,
       message: e.message
@@ -157,11 +302,11 @@ const lt = [
       r[s] = e[s];
     }), r;
   }),
-  R(ns, "regexp", (e) => "" + e, (e) => {
+  v(ls, "regexp", (e) => "" + e, (e) => {
     const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(t, r);
   }),
-  R(
+  v(
     J,
     "set",
     // (sets only exist in es6+)
@@ -169,10 +314,10 @@ const lt = [
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  R(Y, "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))
+  v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  v((e) => Ue(e) || gs(e), "number", (e) => Ue(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  v(hs, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
 function se(e, t, r, s) {
   return {
@@ -182,12 +327,12 @@ function se(e, t, r, s) {
     untransform: s
   };
 }
-const ct = se((e, t) => ot(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+const mt = se((e, t) => lt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (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;
-}), ds = [
+}), bs = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -197,16 +342,16 @@ const ct = se((e, t) => ot(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), ft = se(cs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = ds[t[1]];
+].reduce((e, t) => (e[t.name] = t, e), {}), pt = se(ys, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
+  const r = bs[t[1]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function dt(e, t) {
+function gt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const mt = se(dt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+const yt = se(gt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
     return y({}, e);
@@ -219,44 +364,44 @@ const mt = se(dt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructo
   if (!s)
     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);
-}), 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) => {
+}), ht = 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);
-}), ms = [mt, ct, pt, ft], Ue = (e, t) => {
-  const r = ze(ms, (n) => n.isApplicable(e, t));
+}), As = [yt, mt, ht, pt], _e = (e, t) => {
+  const r = Le(As, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = ze(lt, (n) => n.isApplicable(e, t));
+  const s = Le(dt, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
-}, gt = {};
-lt.forEach((e) => {
-  gt[e.annotation] = e;
+}, bt = {};
+dt.forEach((e) => {
+  bt[e.annotation] = e;
 });
-const ps = (e, t, r) => {
+const ws = (e, t, r) => {
   if (I(t))
     switch (t[0]) {
       case "symbol":
-        return ct.untransform(e, t, r);
-      case "class":
         return mt.untransform(e, t, r);
+      case "class":
+        return yt.untransform(e, t, r);
       case "custom":
-        return pt.untransform(e, t, r);
+        return ht.untransform(e, t, r);
       case "typed-array":
-        return ft.untransform(e, t, r);
+        return pt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = gt[t];
+    const s = bt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
@@ -269,7 +414,7 @@ const ps = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function yt(e) {
+function At(e) {
   if (ee(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
   if (ee(e, "prototype"))
@@ -277,20 +422,20 @@ function yt(e) {
   if (ee(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const gs = (e, t) => {
-  yt(t);
+const Fs = (e, t) => {
+  At(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
     if (J(e))
       e = L(e, +s);
     else if (Y(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = L(e, n);
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = L(e, n);
       switch (i) {
         case "key":
-          e = a;
+          e = o;
           break;
         case "value":
-          e = e.get(a);
+          e = e.get(o);
           break;
       }
     } else
@@ -298,24 +443,24 @@ const gs = (e, t) => {
   }
   return e;
 }, me = (e, t, r) => {
-  if (yt(t), t.length === 0)
+  if (At(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
-    const a = t[i];
+    const o = t[i];
     if (I(s)) {
-      const o = +a;
-      s = s[o];
-    } else if (G(s))
+      const a = +o;
       s = s[a];
+    } else if (G(s))
+      s = s[o];
     else if (J(s)) {
-      const o = +a;
-      s = L(s, o);
+      const a = +o;
+      s = L(s, a);
     } else if (Y(s)) {
       if (i === t.length - 2)
         break;
-      const u = +a, l = +t[++i] == 0 ? "key" : "value", p = L(s, u);
-      switch (l) {
+      const u = +o, c = +t[++i] == 0 ? "key" : "value", p = L(s, u);
+      switch (c) {
         case "key":
           s = p;
           break;
@@ -327,19 +472,19 @@ const gs = (e, t) => {
   }
   const n = t[t.length - 1];
   if (I(s) ? s[+n] = r(s[+n]) : G(s) && (s[n] = r(s[n])), J(s)) {
-    const i = L(s, +n), a = r(i);
-    i !== a && (s.delete(i), s.add(a));
+    const i = L(s, +n), o = r(i);
+    i !== o && (s.delete(i), s.add(o));
   }
   if (Y(s)) {
-    const i = +t[t.length - 2], a = L(s, i);
+    const i = +t[t.length - 2], o = L(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
-        const u = r(a);
-        s.set(u, s.get(a)), u !== a && s.delete(a);
+        const u = r(o);
+        s.set(u, s.get(o)), u !== o && s.delete(o);
         break;
       }
       case "value": {
-        s.set(a, r(s.get(a)));
+        s.set(o, r(s.get(o)));
         break;
       }
     }
@@ -350,106 +495,106 @@ function pe(e, t, r = []) {
   if (!e)
     return;
   if (!I(e)) {
-    V(e, (i, a) => pe(i, t, [...r, ...W(a)]));
+    W(e, (i, o) => pe(i, t, [...r, ...K(o)]));
     return;
   }
   const [s, n] = e;
-  n && V(n, (i, a) => {
-    pe(i, t, [...r, ...W(a)]);
+  n && W(n, (i, o) => {
+    pe(i, t, [...r, ...K(o)]);
   }), t(s, r);
 }
-function ys(e, t, r) {
+function Es(e, t, r) {
   return pe(t, (s, n) => {
-    e = me(e, n, (i) => ps(i, s, r));
+    e = me(e, n, (i) => ws(i, s, r));
   }), e;
 }
-function hs(e, t) {
+function Cs(e, t) {
   function r(s, n) {
-    const i = gs(e, W(n));
-    s.map(W).forEach((a) => {
-      e = me(e, a, () => i);
+    const i = Fs(e, K(n));
+    s.map(K).forEach((o) => {
+      e = me(e, o, () => i);
     });
   }
   if (I(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = me(e, W(i), () => e);
-    }), n && V(n, r);
+      e = me(e, K(i), () => e);
+    }), n && W(n, r);
   } else
-    V(t, r);
+    W(t, r);
   return e;
 }
-const bs = (e, t) => G(e) || I(e) || Y(e) || J(e) || dt(e, t);
-function Fs(e, t, r) {
+const qs = (e, t) => G(e) || I(e) || Y(e) || J(e) || gt(e, t);
+function Ts(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function As(e, t) {
+function xs(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
     if (n.length <= 1)
       return;
-    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);
+    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(ae) : r[ae(i)] = o.map(ae);
   }), s ? de(r) ? [s] : [s, r] : de(r) ? void 0 : r;
 }
-const ht = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
+const wt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
   var b;
-  const o = os(e);
-  if (!o) {
-    Fs(e, n, t);
-    const g = a.get(e);
+  const a = ms(e);
+  if (!a) {
+    Ts(e, n, t);
+    const g = o.get(e);
     if (g)
       return s ? {
         transformedValue: null
       } : g;
   }
-  if (!bs(e, r)) {
-    const g = Ue(e, r), m = g ? {
+  if (!qs(e, r)) {
+    const g = _e(e, r), m = g ? {
       transformedValue: g.value,
       annotations: [g.type]
     } : {
       transformedValue: e
     };
-    return o || a.set(e, m), m;
+    return a || o.set(e, m), m;
   }
   if (ee(i, e))
     return {
       transformedValue: null
     };
-  const u = Ue(e, r), l = (b = u == null ? void 0 : u.value) != null ? b : e, p = I(l) ? [] : {}, c = {};
-  V(l, (g, m) => {
+  const u = _e(e, r), c = (b = u == null ? void 0 : u.value) != null ? b : e, p = I(c) ? [] : {}, l = {};
+  W(c, (g, m) => {
     if (m === "__proto__" || m === "constructor" || m === "prototype")
       throw new Error(`Detected property ${m}. This is a prototype pollution risk, please remove it from your object.`);
-    const F = ht(g, t, r, s, [...n, m], [...i, e], a);
-    p[m] = F.transformedValue, I(F.annotations) ? c[m] = F.annotations : G(F.annotations) && V(F.annotations, (C, N) => {
-      c[ut(m) + "." + N] = C;
+    const A = wt(g, t, r, s, [...n, m], [...i, e], o);
+    p[m] = A.transformedValue, I(A.annotations) ? l[m] = A.annotations : G(A.annotations) && W(A.annotations, (C, N) => {
+      l[ft(m) + "." + N] = C;
     });
   });
-  const d = de(c) ? {
+  const d = de(l) ? {
     transformedValue: p,
     annotations: u ? [u.type] : void 0
   } : {
     transformedValue: p,
-    annotations: u ? [u.type, c] : c
+    annotations: u ? [u.type, l] : l
   };
-  return o || a.set(e, d), d;
+  return a || o.set(e, d), d;
 };
-function bt(e) {
+function Ft(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function _e(e) {
-  return bt(e) === "Array";
+function Ve(e) {
+  return Ft(e) === "Array";
 }
-function ws(e) {
-  if (bt(e) !== "Object")
+function $s(e) {
+  if (Ft(e) !== "Object")
     return !1;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function Es(e, t, r, s, n) {
+function Ss(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,
@@ -459,16 +604,16 @@ function Es(e, t, r, s, n) {
   });
 }
 function ge(e, t = {}) {
-  if (_e(e))
+  if (Ve(e))
     return e.map((n) => ge(n, t));
-  if (!ws(e))
+  if (!$s(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (_e(t.props) && !t.props.includes(i))
+    if (Ve(t.props) && !t.props.includes(i))
       return n;
-    const a = e[i], o = ge(a, t);
-    return Es(n, i, o, e, t.nonenumerable), n;
+    const o = e[i], a = ge(o, t);
+    return Ss(n, i, a, e, t.nonenumerable), n;
   }, {});
 }
 class h {
@@ -476,27 +621,27 @@ class h {
    * @param dedupeReferentialEqualities  If true, SuperJSON will make sure only one instance of referentially equal objects are serialized and the rest are replaced with `null`.
    */
   constructor({ dedupe: t = !1 } = {}) {
-    this.classRegistry = new Jr(), this.symbolRegistry = new it((r) => {
+    this.classRegistry = new ts(), this.symbolRegistry = new ut((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new Xr(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new ns(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = ht(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = wt(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = A(y({}, n.meta), {
+    s.annotations && (n.meta = w(y({}, n.meta), {
       values: s.annotations
     }));
-    const i = As(r, this.dedupe);
-    return i && (n.meta = A(y({}, n.meta), {
+    const i = xs(r, this.dedupe);
+    return i && (n.meta = w(y({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
     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;
+    return s != null && s.values && (n = Es(n, s.values, this)), s != null && s.referentialEqualities && (n = Cs(n, s.referentialEqualities)), n;
   }
   stringify(t) {
     return JSON.stringify(this.serialize(t));
@@ -528,7 +673,7 @@ h.registerClass = h.defaultInstance.registerClass.bind(h.defaultInstance);
 h.registerSymbol = h.defaultInstance.registerSymbol.bind(h.defaultInstance);
 h.registerCustom = h.defaultInstance.registerCustom.bind(h.defaultInstance);
 h.allowErrorProps = h.defaultInstance.allowErrorProps.bind(h.defaultInstance);
-const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e.type), Ae = (e) => new lr(
+const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e.type), Fe = (e) => new dr(
   e.name,
   e.expression,
   e.type,
@@ -536,7 +681,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), we = (e) => new cr(
+), Ee = (e) => new mr(
   e.name,
   e.expression,
   e.granularity,
@@ -548,24 +693,24 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
 ), O = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return Ae(e);
+      return Fe(e);
     case "DimensionalLevelAttribute":
-      return we(e);
+      return Ee(e);
     default:
       return e;
   }
-}, Ft = (e) => new _r(
+}, Et = (e) => new jr(
   e.name,
   e.expression,
   e.attributes.map(O),
-  e.dimensions.map(Ts),
+  e.dimensions.map(Ds),
   e.type,
   e.description,
   z(e.sort),
   e.dataSource,
   e.composeCode,
   e.defaultAttribute ? O(e.defaultAttribute) : void 0
-), At = (e) => new Vr(
+), Ct = (e) => new Kr(
   e.name,
   e.expression,
   e.description,
@@ -574,16 +719,16 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
   e.composeCode,
   e.indexed,
   e.merged
-), Ts = (e) => {
+), Ds = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Ft(e);
+      return Et(e);
     case "DimensionalDateDimension":
-      return At(e);
+      return Ct(e);
     default:
       return e;
   }
-}, Ee = (e) => new fr(
+}, Ce = (e) => new pr(
   e.name,
   O(e.attribute),
   e.aggregation,
@@ -592,26 +737,26 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), Ce = (e) => {
+), qe = (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, Ae(s)];
+            return [r, Fe(s)];
           case "DimensionalLevelAttribute":
-            return [r, we(s)];
-          case "DimensionalBaseMeasure":
             return [r, Ee(s)];
-          case "DimensionalCalculatedMeasure":
+          case "DimensionalBaseMeasure":
             return [r, Ce(s)];
+          case "DimensionalCalculatedMeasure":
+            return [r, qe(s)];
           default:
             return [r, s];
         }
       return [r, s];
     })
   );
-  return new dr(
+  return new gr(
     e.name,
     e.expression,
     t,
@@ -621,7 +766,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
     e.dataSource,
     e.composeCode
   );
-}, wt = (e) => new mr(
+}, qt = (e) => new yr(
   e.name,
   O(e.attribute),
   e.format,
@@ -632,45 +777,45 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
 ), ue = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Ee(e);
-    case "DimensionalCalculatedMeasure":
       return Ce(e);
+    case "DimensionalCalculatedMeasure":
+      return qe(e);
     case "DimensionalMeasureTemplate":
-      return wt(e);
+      return qt(e);
     default:
       return e;
   }
-}, T = (e) => {
+}, q = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new qr(
+      return new Sr(
         O(e.attribute),
         e.members,
-        e.config.backgroundFilter ? A(y({}, e.config), { backgroundFilter: T(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? w(y({}, e.config), { backgroundFilter: q(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Tr(
-        e.filters.map((r) => T(r)),
+      return new $r(
+        e.filters.map((r) => q(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new Cr(
-        e._filters.map((r) => T(r)),
+      return new xr(
+        e._filters.map((r) => q(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Er(
-        T(e.filter),
-        e.input ? T(e.input) : void 0,
+      return new Tr(
+        q(e.filter),
+        e.input ? q(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new wr(
+      return new qr(
         O(e.attribute),
         ue(e.measure),
         e.operatorA,
@@ -681,7 +826,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
         e.composeCode
       );
     case "RankingFilter":
-      return new Ar(
+      return new Cr(
         O(e.attribute),
         ue(e.measure),
         e.operator,
@@ -690,7 +835,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Fr(
+      return new Er(
         ue(e.measure),
         e.operator,
         e.count,
@@ -698,7 +843,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
         e.composeCode
       );
     case "NumericFilter":
-      return new br(
+      return new Fr(
         O(e.attribute),
         e.operatorA,
         e.valueA,
@@ -708,7 +853,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new hr(
+      return new wr(
         O(e.attribute),
         e.operatorA,
         e.valueA,
@@ -717,7 +862,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
       );
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new yr(
+      return new Ar(
         O(e.attribute),
         r,
         s,
@@ -726,7 +871,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
       );
     }
     case "RelativeDateFilter":
-      return new gr(
+      return new br(
         O(e.attribute),
         e.offset,
         e.count,
@@ -736,7 +881,7 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
         e.composeCode
       );
     case "CustomFilter":
-      return new pr(
+      return new hr(
         O(e.attribute),
         e.jaqlExpression,
         e.config,
@@ -748,65 +893,65 @@ const z = (e) => e === void 0 ? B.None : e, Cs = (e) => new Kt(e.metadataItem, e
 };
 h.registerCustom(
   {
-    isApplicable: Wt,
+    isApplicable: Yt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Cs(e)
+    deserialize: (e) => Os(e)
   },
   "JaqlElement"
 );
 h.registerCustom(
   {
-    isApplicable: Gt,
+    isApplicable: Ht,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ae(e)
+    deserialize: (e) => Fe(e)
   },
   "DimensionalAttribute"
 );
 h.registerCustom(
   {
-    isApplicable: Yt,
+    isApplicable: Qt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => we(e)
+    deserialize: (e) => Ee(e)
   },
   "DimensionalLevelAttribute"
 );
 h.registerCustom(
   {
-    isApplicable: Lr,
+    isApplicable: Vr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ft(e)
+    deserialize: (e) => Et(e)
   },
   "DimensionalDimension"
 );
 h.registerCustom(
   {
-    isApplicable: Ur,
+    isApplicable: Wr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => At(e)
+    deserialize: (e) => Ct(e)
   },
   "DimensionalDateDimension"
 );
 h.registerCustom(
   {
-    isApplicable: Jt,
+    isApplicable: Xt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ee(e)
+    deserialize: (e) => Ce(e)
   },
   "DimensionalBaseMeasure"
 );
 h.registerCustom(
   {
-    isApplicable: Ht,
+    isApplicable: Zt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ce(e)
+    deserialize: (e) => qe(e)
   },
   "DimensionalCalculatedMeasure"
 );
 h.registerCustom(
   {
-    isApplicable: Qt,
+    isApplicable: er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => wt(e)
+    deserialize: (e) => qt(e)
   },
   "DimensionalMeasureTemplate"
 );
@@ -814,107 +959,107 @@ h.registerCustom(
   {
     isApplicable: be,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MembersFilter"
 );
 h.registerCustom(
   {
-    isApplicable: Xt,
+    isApplicable: tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "LogicalAttributeFilter"
 );
 h.registerCustom(
   {
-    isApplicable: Zt,
+    isApplicable: rr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "CascadingFilter"
 );
 h.registerCustom(
   {
-    isApplicable: er,
+    isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "ExcludeFilter"
 );
 h.registerCustom(
   {
-    isApplicable: tr,
+    isApplicable: nr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MeasureFilter"
 );
 h.registerCustom(
   {
-    isApplicable: rr,
+    isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "RankingFilter"
 );
 h.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MeasureRankingFilter"
 );
 h.registerCustom(
   {
-    isApplicable: nr,
+    isApplicable: ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "NumericFilter"
 );
 h.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "TextFilter"
 );
 h.registerCustom(
   {
-    isApplicable: ar,
+    isApplicable: cr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "DateRangeFilter"
 );
 h.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: lr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "RelativeDateFilter"
 );
 h.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "CustomFilter"
 );
-const Yn = h, E = "DM.";
+const ei = h, E = "DM.";
 function S(e) {
   return typeof e == "object" && e !== null;
 }
-function q(e) {
+function T(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Et(e) {
-  return e.every(q);
+function Tt(e) {
+  return e.every(T);
 }
 function ne(e) {
   return "attribute" in e && "config" in e;
@@ -925,39 +1070,39 @@ function Z(e) {
 function Te(e) {
   return !ne(e) && !Z(e);
 }
-function qs(e) {
+function Ms(e) {
   return S(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function xs(e) {
-  return !S(e) || !("column" in e) ? !1 : q(e.column);
+function Ns(e) {
+  return !S(e) || !("column" in e) ? !1 : T(e.column);
 }
 const x = 3;
-function v(e, t, r) {
+function R(e, t, r) {
   if (t.length === 0) return;
   let s = Number.MAX_SAFE_INTEGER, n;
   for (const i of t) {
-    const a = r(i), o = Gr(e, a);
-    o < s && (s = o, n = i);
+    const o = r(i), a = Yr(e, o);
+    a < s && (s = a, n = i);
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-const Ct = "en";
-function le(e, t) {
-  return e.localeCompare(t, Ct, { sensitivity: "accent" }) === 0;
+const xt = "en";
+function ce(e, t) {
+  return e.localeCompare(t, xt, { sensitivity: "accent" }) === 0;
 }
-function Ve(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Ct, { sensitivity: "accent" }) === 0;
+function We(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, xt, { sensitivity: "accent" }) === 0;
 }
-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();
+function xe(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();
   for (const i of e) {
     r.set(i.name, i);
-    const a = [...i.columns].sort((u, l) => l.name.length - u.name.length);
-    n.set(i.name, a);
-    const o = /* @__PURE__ */ new Map();
+    const o = [...i.columns].sort((u, c) => c.name.length - u.name.length);
+    n.set(i.name, o);
+    const a = /* @__PURE__ */ new Map();
     for (const u of i.columns)
-      o.set(u.name, u);
-    s.set(i.name, o);
+      a.set(u.name, u);
+    s.set(i.name, a);
   }
   return {
     sortedTables: t,
@@ -966,7 +1111,7 @@ function qe(e) {
     columnMap: s
   };
 }
-function xe(e, t) {
+function $e(e, t) {
   if (!e.startsWith(E))
     throw new Error(
       `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
@@ -978,13 +1123,13 @@ function xe(e, t) {
     );
   let s, n;
   for (const m of t.sortedTables)
-    if (Ve(r, m.name + ".")) {
-      const F = r.slice(m.name.length + 1);
-      if (!F)
+    if (We(r, m.name + ".")) {
+      const A = r.slice(m.name.length + 1);
+      if (!A)
         throw new Error(
           `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
         );
-      s = m, n = F;
+      s = m, n = A;
       break;
     }
   if (!s) {
@@ -993,50 +1138,50 @@ function xe(e, t) {
       throw new Error(
         `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
       );
-    const F = r.slice(0, m), C = v(F, t.sortedTables, (ae) => ae.name), N = C && C.distance <= x ? ` Did you mean '${C.best.name}'?` : "";
-    throw new Error(`Table '${F}' not found in the data model.${N}`);
+    const A = r.slice(0, m), C = R(A, t.sortedTables, (oe) => oe.name), N = C && C.distance <= x ? ` Did you mean '${C.best.name}'?` : "";
+    throw new Error(`Table '${A}' not found in the data model.${N}`);
   }
   const i = t.tableColumnMap.get(s.name);
   if (!i)
     throw new Error(`Table '${s.name}' found but has no columns`);
-  let a, o;
+  let o, a;
   const u = $.all;
   for (const m of i) {
-    if (le(n, m.name))
+    if (ce(n, m.name))
       return { table: s, column: m };
-    if (!Ve(n, m.name + "."))
+    if (!We(n, m.name + "."))
       continue;
-    const F = n.slice(m.name.length + 1);
-    if (!F)
+    const A = n.slice(m.name.length + 1);
+    if (!A)
       continue;
-    const C = u.includes(F), N = X(m.dataType);
+    const C = u.includes(A), N = X(m.dataType);
     if (C) {
       if (N)
-        return { table: s, column: m, level: F };
-      a || (a = m, o = F);
+        return { table: s, column: m, level: A };
+      o || (o = m, a = A);
       continue;
     }
-    N && !a && (a = m, o = F);
+    N && !o && (o = m, a = A);
   }
-  if (a && o) {
-    if (u.includes(o))
+  if (o && a) {
+    if (u.includes(a))
       throw new Error(
-        `Invalid date level '${o}' in dimensional element '${e}'. Column '${s.name}.${a.name}' is not a datetime column`
+        `Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`
       );
-    const m = v(o, u, (C) => C), F = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
+    const m = R(a, u, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
     throw new Error(
-      `Invalid date level '${o}' in dimensional element '${e}'. Valid levels are: ${u.join(
+      `Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(
         ", "
-      )}.${F}`
+      )}.${A}`
     );
   }
-  const l = n.indexOf("."), p = l === -1 ? n : n.slice(0, l), c = v(n, i, (m) => m.name), d = c && c.distance <= x && !le(c.best.name, p), b = d ? ` Did you mean '${c.best.name}'?` : "", g = !d && n.endsWith(".") && c !== void 0 && le(c.best.name, p) ? ` Use '${p}' without a trailing dot.` : "";
+  const c = n.indexOf("."), p = c === -1 ? n : n.slice(0, c), l = R(n, i, (m) => m.name), d = l && l.distance <= x && !ce(l.best.name, p), b = d ? ` Did you mean '${l.best.name}'?` : "", g = !d && n.endsWith(".") && l !== void 0 && ce(l.best.name, p) ? ` Use '${p}' without a trailing dot.` : "";
   throw new Error(
     `Column '${p}' not found in table '${s.name}'.${b}${g}`
   );
 }
-function $s(e, t) {
-  const { table: r, column: s, level: n } = xe(e, t);
+function Rs(e, t) {
+  const { table: r, column: s, level: n } = $e(e, t);
   if (n) {
     if (!X(s.dataType))
       throw new Error(
@@ -1049,13 +1194,13 @@ function $s(e, t) {
           ", "
         )}`
       );
-    const a = $.dateOnly;
-    if (s.dataType === "date" && !a.includes(n))
+    const o = $.dateOnly;
+    if (s.dataType === "date" && !o.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 o = $.timeOnly;
-    if (s.dataType === "time" && !o.includes(n))
+    const a = $.timeOnly;
+    if (s.dataType === "time" && !a.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`
       );
@@ -1063,16 +1208,16 @@ function $s(e, t) {
   return { table: r, column: s, level: n };
 }
 function H(e, t, r, s) {
-  const { table: n, column: i, level: a } = $s(e, r);
-  let o = a;
-  if (X(i.dataType) && o === void 0 && (s != null && s.inferredDateLevel)) {
-    const u = s.inferredDateLevel, l = $.all;
-    if (!l.includes(u))
+  const { table: n, column: i, level: o } = Rs(e, r);
+  let a = o;
+  if (X(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
+    const u = s.inferredDateLevel, c = $.all;
+    if (!c.includes(u))
       throw new Error(
-        `Invalid inferred date level '${u}'. Valid levels are: ${l.join(", ")}`
+        `Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`
       );
-    const p = `${e}.${u}`, c = $.dateOnly;
-    if (i.dataType === "date" && !c.includes(u))
+    const p = `${e}.${u}`, l = $.dateOnly;
+    if (i.dataType === "date" && !l.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`
       );
@@ -1081,19 +1226,19 @@ function H(e, t, r, s) {
       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;
+    a = u;
   }
-  return xr({
+  return Or({
     expression: i.expression,
     dataType: i.dataType,
-    granularity: o,
+    granularity: a,
     format: void 0,
     sort: void 0,
     dataSource: t
   });
 }
-function Ss(e, t, r) {
-  const { column: s, level: n } = xe(e, r);
+function vs(e, t, r) {
+  const { column: s, level: n } = $e(e, r);
   if (n)
     throw new Error(
       `Invalid DateDimension name format: '${e}'. Expected format: '${E}TableName.ColumnName'`
@@ -1102,34 +1247,34 @@ function Ss(e, t, r) {
     throw new Error(
       `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return jr({
+  return Gr({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-const Os = (e, t) => {
+const Is = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!et(r))
-    return A(y({}, t), {
+  if (!tt(r))
+    return w(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, Ds = (e, t, r, s) => {
-  const n = Os(e.sortType, s);
+}, Ps = (e, t, r, s) => {
+  const n = Is(e.sortType, s);
   if (n)
     return {
       attribute: H(e.column, t, r),
       style: {},
       error: n
     };
-  const i = H(e.column, t, r), a = _(e, "column");
-  return { attribute: i, style: a };
-}, Ms = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : qs(e) ? Ds(e, t, r, s) : {
-  error: A(y({}, s), {
+  const i = H(e.column, t, r), o = _(e, "column");
+  return { attribute: i, style: o };
+}, ks = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : Ms(e) ? Ps(e, t, r, s) : {
+  error: w(y({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, Tt = (e) => {
+}, $t = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1146,64 +1291,64 @@ const Os = (e, t) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((a, o) => {
+  return t.forEach((o, a) => {
     const u = {
       category: "dimensions",
-      index: o,
-      input: a
+      index: a,
+      input: o
     };
     try {
-      const l = Ms(a, r, s, u);
-      if (l.error) {
-        i.push(l.error);
+      const c = ks(o, r, s, u);
+      if (c.error) {
+        i.push(c.error);
         return;
       }
-      l.attribute && n.push(
-        l.style !== void 0 ? { attribute: l.attribute, style: l.style } : { attribute: l.attribute }
+      c.attribute && n.push(
+        c.style !== void 0 ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute }
       );
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      i.push(A(y({}, u), { message: p }));
+    } catch (c) {
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function $e(e, t) {
+function Se(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 Ns(e, t) {
-  const r = e.replace("measureFactory.", ""), n = $e($r, r)(...t);
+function Bs(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Se(Dr, r)(...t);
   if (!Te(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function vs(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = $e(Sr, r)(...t);
+function zs(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Se(Mr, r)(...t);
   if (!Z(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Rs(e, t) {
+function Ls(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return vs(e, t);
-  const r = e.replace("filterFactory.", ""), n = $e(Or, r)(...t);
+    return zs(e, t);
+  const r = e.replace("filterFactory.", ""), n = Se(Nr, r)(...t);
   if (!ne(n) && !Z(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Is(e, t) {
+function Us(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Ns(e, t);
+    return Bs(e, t);
   if (s === "filterFactory")
-    return Rs(e, t);
+    return Ls(e, t);
   throw new Error(
     `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), Ps = /* @__PURE__ */ new Set([
+const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), _s = /* @__PURE__ */ new Set([
   "CORREL",
   "COVARP",
   "COVAR",
@@ -1333,20 +1478,20 @@ const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), Ps = /*
   SIN: f("scalar", 1, 1),
   SQRT: f("scalar", 1, 1),
   TAN: f("scalar", 1, 1)
-}, ks = Object.keys(te).filter(
+}, Vs = Object.keys(te).filter(
   (e) => te[e].category === "xdiff"
 );
-function qt() {
-  return ks;
+function St() {
+  return Vs;
 }
-function xt(e) {
+function Ot(e) {
   const t = te[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-function Bs(e, t) {
+function Ws(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`;
 }
-const zs = /\[(\w[\w.-]*)\]/g, $t = /* @__PURE__ */ new Set([
+const js = /\[(\w[\w.-]*)\]/g, Dt = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
   "COUNT",
@@ -1367,30 +1512,30 @@ const zs = /\[(\w[\w.-]*)\]/g, $t = /* @__PURE__ */ new Set([
   "YTDSUM"
   // RAVG, RSUM are non-aggregative per Sisense doc (Other Functions, not (A))
   // CORREL, COVAR*, SKEW*, SLOPE, LARGEST are unsupported in custom formulas (see UNSUPPORTED_FORMULA_FUNCTIONS).
-]), Ls = new RegExp(
-  `\\b(${Array.from($t).join("|")})\\s*\\(`,
+]), Ks = new RegExp(
+  `\\b(${Array.from(Dt).join("|")})\\s*\\(`,
   "i"
 );
-function St(e) {
-  return q(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
+function Mt(e) {
+  return T(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function Us(e) {
+function Gs(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
   let s;
   for (; (s = t.exec(e)) !== null; ) {
     const n = s[1];
-    $t.has(n.toUpperCase()) || r.add(n);
+    Dt.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function _s(e) {
+function Ys(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function Vs(e) {
+function Js(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
-const j = (e) => e.startsWith("[") ? e : `[${e}]`, Ot = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function Dt(e, t) {
+const j = (e) => e.startsWith("[") ? e : `[${e}]`, Nt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function Rt(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*\\)`,
@@ -1402,16 +1547,16 @@ function Dt(e, t) {
     ref2: n[3].trim()
   }));
 }
-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} `;
+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} `;
   return {
     formula: e,
     context: t,
     contextKeys: s,
     canonicalContextKeys: new Set(s.map(j)),
     errorPrefix: i,
-    warnUnusedContext: (o = r.warnUnusedContext) != null ? o : !0,
+    warnUnusedContext: (a = r.warnUnusedContext) != null ? a : !0,
     errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : !0,
     schemaIndex: r.schemaIndex,
     result: { isValid: !0, errors: [], warnings: [], references: [], unusedContextKeys: [] }
@@ -1420,17 +1565,17 @@ function js(e, t, r) {
 function M(e, t) {
   e.result.errors.push(t), e.result.isValid = !1;
 }
-const Ws = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function Ks(e) {
+const 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) => !Ws.has(s[1].toUpperCase())
+    (s) => !Qs.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 Gs(e, t) {
+function Zs(e, t) {
   const r = e[t];
   let s = t + 1;
   for (; s < e.length; ) {
@@ -1447,27 +1592,27 @@ function Gs(e, t) {
   }
   return e.length;
 }
-function Ys(e) {
-  return Wr(e, ",").filter((t) => t.trim().length > 0).length;
+function en(e) {
+  return we(e, ",").filter((t) => t.trim().length > 0).length;
 }
-function Js(e, t, r, s) {
+function tn(e, t, r, s) {
   for (; t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = Kr(e, n);
+  const n = t, i = Hr(e, n);
   if (i === -1)
     return n + 1;
-  const a = e.slice(n + 1, i);
-  return s.push({ name: r.toUpperCase(), argCount: Ys(a) }), s.push(...Mt(a)), i + 1;
+  const o = e.slice(n + 1, i);
+  return s.push({ name: r.toUpperCase(), argCount: en(o) }), s.push(...vt(o)), i + 1;
 }
-function Mt(e) {
+function vt(e) {
   const t = [];
   let r = 0;
   for (; r < e.length; ) {
     const s = e[r];
     if (s === "'" || s === '"') {
-      r = Gs(e, r);
+      r = Zs(e, r);
       continue;
     }
     if (/[A-Za-z_]/.test(s)) {
@@ -1475,78 +1620,78 @@ function Mt(e) {
       for (r++; r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
         r++;
       const i = e.slice(n, r);
-      r = Js(e, r, i, t);
+      r = tn(e, r, i, t);
       continue;
     }
     r++;
   }
   return t;
 }
-function Hs(e) {
-  const t = Mt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
+function rn(e) {
+  const t = vt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   for (const { name: n, argCount: i } of t) {
-    if (Ps.has(n)) {
+    if (_s.has(n)) {
       r.has(n) || (r.add(n), M(
         e,
         `${e.errorPrefix}args[1]: Function ${n} is not supported in custom formulas`
       ));
       continue;
     }
-    const a = te[n];
-    if (a && (i < a.minArgs || i > a.maxArgs) && !s.has(n)) {
+    const o = te[n];
+    if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
       s.add(n);
-      const o = Bs(a.minArgs, a.maxArgs);
-      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${o}`);
+      const a = Ws(o.minArgs, o.maxArgs);
+      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
     }
   }
 }
-function Qs(e) {
+function sn(e) {
   return [
     ...new Set(
-      [...e.matchAll(new RegExp(zs.source, "g"))].map((t) => t[1])
+      [...e.matchAll(new RegExp(js.source, "g"))].map((t) => t[1])
     )
   ];
 }
-function Xs(e) {
+function nn(e) {
   const t = e.result.references.filter(
     (n) => !e.canonicalContextKeys.has(j(n))
   );
   if (t.length === 0) return;
-  const r = e.contextKeys.map((n) => `[${Ot(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
+  const r = e.contextKeys.map((n) => `[${Nt(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 Zs(e) {
-  if (Ls.test(e.formula)) return;
+function on(e) {
+  if (Ks.test(e.formula)) return;
   const t = e.result.references.filter((r) => {
     var n;
     const s = (n = e.context[j(r)]) != null ? n : e.context[r];
-    return s !== void 0 && !St(s);
+    return s !== void 0 && !Mt(s);
   });
   t.length !== 0 && M(
     e,
-    `${e.errorPrefix}args[1]: ${Vs(
-      Us(e.formula)
-    )}Bracket reference(s) ${_s(
+    `${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)`
   );
 }
-function en(e) {
+function an(e) {
   if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0) return;
   const t = new Set(e.result.references.map(j)), r = e.contextKeys.filter((i) => !t.has(j(i)));
   if (e.result.unusedContextKeys = r, r.length === 0) return;
-  const s = r.map((i) => `[${Ot(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
+  const s = r.map((i) => `[${Nt(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 a;
-  const n = (a = s.context[j(e)]) != null ? a : s.context[e];
+  var o;
+  const n = (o = s.context[j(e)]) != null ? o : s.context[e];
   if (n === void 0) return;
   if (!(typeof n == "string" && n.startsWith(E))) {
-    St(n) && M(
+    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. ${E}Table.Column.Level).`
     );
@@ -1554,43 +1699,43 @@ function je(e, t, r, s) {
   }
   if (s.schemaIndex)
     try {
-      const o = xe(n, s.schemaIndex);
-      X(o.column.dataType) ? r && o.level && o.level !== r && M(
+      const a = $e(n, s.schemaIndex);
+      X(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 '${o.level}'.`
+        `${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 '${o.column.name}'.`
+        `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`
       );
-    } catch (o) {
-      const u = o instanceof Error ? o.message : "Unknown error";
+    } catch (a) {
+      const u = a instanceof Error ? a.message : "Unknown error";
       M(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function tn(e) {
-  const t = qt(), r = Dt(e.formula, t);
+function un(e) {
+  const t = St(), r = Rt(e.formula, t);
   for (const s of r) {
-    const n = xt(s.functionName);
+    const n = Ot(s.functionName);
     je(s.ref1, s, n, e), je(s.ref2, s, n, e);
   }
 }
-function rn(e, t, r = {}) {
+function cn(e, t, r = {}) {
   var n;
-  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(
+  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) : (Xs(s), Zs(s), en(s), tn(s), s.result));
+  ), s.result) : (nn(s), on(s), an(s), un(s), s.result));
 }
-function sn(e, t, r = {}) {
-  const s = rn(e, t, r);
+function ln(e, t, r = {}) {
+  const s = cn(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 nn(e, t) {
+function fn(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?)`
@@ -1606,7 +1751,7 @@ function nn(e, t) {
       `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
     );
   const i = n;
-  sn(s, i, {
+  ln(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1614,23 +1759,23 @@ function nn(e, t) {
     // Custom formulas must have content
     schemaIndex: t.schemaIndex
   });
-  const a = an(s), o = {};
-  for (const [u, l] of Object.entries(i)) {
+  const o = dn(s), a = {};
+  for (const [u, c] of Object.entries(i)) {
     const p = `args[2].${u}`;
-    if (q(l))
-      o[`${u}`] = D({
-        data: l,
+    if (T(c))
+      a[`${u}`] = D({
+        data: c,
         context: {
           dataSource: t.dataSource,
           schemaIndex: t.schemaIndex,
           pathPrefix: p
         }
       });
-    else if (typeof l == "string" && l.startsWith(E)) {
-      const c = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = a[c];
+    else if (typeof c == "string" && c.startsWith(E)) {
+      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = o[l];
       try {
-        o[`${u}`] = H(
-          l,
+        a[`${u}`] = H(
+          c,
           t.dataSource,
           t.schemaIndex,
           d !== void 0 ? { inferredDateLevel: d } : void 0
@@ -1639,55 +1784,55 @@ function nn(e, t) {
         const g = b instanceof Error ? b.message : "Unknown error";
         throw new Error(`${p}: ${g}`);
       }
-    } else if (l && typeof l == "object" && "kind" in l)
-      o[`${u}`] = l;
+    } else if (c && typeof c == "object" && "kind" in c)
+      a[`${u}`] = c;
     else
       throw new Error(
-        `${p}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E}...), but got: ${typeof l}`
+        `${p}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E}...), but got: ${typeof c}`
       );
   }
-  e[2] = o;
+  e[2] = a;
 }
-function an(e) {
-  const t = qt(), r = Dt(e, t), s = {};
+function dn(e) {
+  const t = St(), r = Rt(e, t), s = {};
   for (const n of r) {
-    const i = xt(n.functionName);
+    const i = Ot(n.functionName);
     if (i !== void 0)
-      for (const a of [n.ref1, n.ref2]) {
-        const o = s[a];
-        if (o !== void 0 && o !== i)
+      for (const o of [n.ref1, n.ref2]) {
+        const a = s[o];
+        if (a !== void 0 && a !== 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}).`
+            `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[a] = i;
+        s[o] = i;
       }
   }
   return s;
 }
-function Nt(e) {
+function It(e) {
   return e.type === U.TextAttribute;
 }
-function vt(e) {
+function Pt(e) {
   return e.type === U.NumericAttribute;
 }
-function on(e) {
+function mn(e) {
   return e.type === U.DateLevel;
 }
-function un(e) {
-  return Nt(e) || vt(e);
+function pn(e) {
+  return It(e) || Pt(e);
 }
 function ie(e) {
   return e.type === U.TextAttribute ? "text" : e.type === U.NumericAttribute ? "numeric" : e.type === U.DateLevel ? "date/datetime" : "unknown";
 }
-function Se(e, t) {
+function Oe(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 We(e, t) {
-  const r = Se(e, t);
-  if (!un(r))
+function Ke(e, t) {
+  const r = Oe(e, t);
+  if (!pn(r))
     throw new Error(
       `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(
         r
@@ -1695,8 +1840,8 @@ function We(e, t) {
     );
 }
 function P(e, t) {
-  const r = Se(e, t);
-  if (!vt(r))
+  const r = Oe(e, t);
+  if (!Pt(r))
     throw new Error(
       `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(
         r
@@ -1704,32 +1849,32 @@ function P(e, t) {
     );
 }
 function k(e, t) {
-  const r = Se(e, t);
-  if (!Nt(r))
+  const r = Oe(e, t);
+  if (!It(r))
     throw new Error(
       `${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(
         r
       )} attribute`
     );
 }
-function ln(e, t) {
+function gn(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 cn(e, t) {
-  const r = ln(e, t);
+function yn(e, t) {
+  const r = gn(e, t);
   if (!be(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
 }
-const fn = {
-  "measureFactory.customFormula": nn,
+const hn = {
+  "measureFactory.customFormula": fn,
   // String | Number filters
-  "filterFactory.equals": We,
-  "filterFactory.doesntEqual": We,
+  "filterFactory.equals": Ke,
+  "filterFactory.doesntEqual": Ke,
   // Numeric filters
   "filterFactory.greaterThan": P,
   "filterFactory.greaterThanOrEqual": P,
@@ -1747,12 +1892,12 @@ const fn = {
   "filterFactory.doesntEndWith": k,
   "filterFactory.like": k,
   // Exclude filter
-  "filterFactory.exclude": cn
+  "filterFactory.exclude": yn
 };
-function dn(e) {
-  return fn[`${e}`];
+function bn(e) {
+  return hn[`${e}`];
 }
-const Rt = {
+const kt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -2279,18 +2424,18 @@ const Rt = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function Oe(e) {
-  return Rt[`${e}`];
+function De(e) {
+  return kt[`${e}`];
 }
-function mn(e) {
-  const t = Oe(e);
+function An(e) {
+  const t = De(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function pn(e) {
-  const t = Oe(e);
+function wn(e) {
+  const t = De(e);
   return t ? t.length : 0;
 }
-function gn(e) {
+function Fn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2299,7 +2444,7 @@ function gn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function ce(e, t, r, s) {
+function le(e, t, r, s) {
   if (e.startsWith(E))
     try {
       return H(e, t, r);
@@ -2311,10 +2456,10 @@ function ce(e, t, r, s) {
     `${s}: Invalid attribute '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
   );
 }
-function yn(e, t, r, s) {
+function En(e, t, r, s) {
   if (e.startsWith(E))
     try {
-      return Ss(e, t, r);
+      return vs(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
@@ -2323,218 +2468,218 @@ function yn(e, t, r, s) {
     `${s}: Invalid date dimension string '${e}'. Expected format: '${E}TableName.ColumnName'`
   );
 }
-function hn(e) {
-  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, a = i;
+function Cn(e) {
+  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, o = i;
   if (t === void 0) {
     if (r.required)
-      throw new Error(`${a}: Required argument is missing (expected ${r.type})`);
+      throw new Error(`${o}: 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(`${a}: Expected string, got ${typeof t}`);
+          throw new Error(`${o}: Expected string, got ${typeof t}`);
         return t;
       case "number":
         if (typeof t != "number")
-          throw new Error(`${a}: Expected number, got ${typeof t}`);
+          throw new Error(`${o}: Expected number, got ${typeof t}`);
         return t;
       case "boolean":
         if (typeof t != "boolean")
-          throw new Error(`${a}: Expected boolean, got ${typeof t}`);
+          throw new Error(`${o}: Expected boolean, got ${typeof t}`);
         return t;
       case "string[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${a}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`
+            `${o}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`
           );
-        if (!t.every((o) => typeof o == "string"))
+        if (!t.every((a) => typeof a == "string"))
           throw new Error(
-            `${a}: Expected array of strings, but contains non-string values`
+            `${o}: Expected array of strings, but contains non-string values`
           );
         return t;
       case "number[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${a}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`
+            `${o}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`
           );
-        if (!t.every((o) => typeof o == "number"))
+        if (!t.every((a) => typeof a == "number"))
           throw new Error(
-            `${a}: Expected array of numbers, but contains non-number values`
+            `${o}: Expected array of numbers, but contains non-number values`
           );
         return t;
       case "Attribute":
         if (typeof t != "string")
           throw new Error(
-            `${a}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
+            `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return ce(t, s, n, a);
+        return le(t, s, n, o);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${a}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`
+            `${o}: 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}]`);
+        return t.map((a, u) => {
+          if (typeof a != "string")
+            throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
+          return le(a, s, n, `${o}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!q(t))
+        if (!T(t))
           throw new Error(
-            `${a}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
+            `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
         return D({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
       case "Measure[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${a}: Expected array of measure function calls, got ${typeof t}`
+            `${o}: Expected array of measure function calls, got ${typeof t}`
           );
-        return t.map((o, u) => {
-          if (!q(o))
+        return t.map((a, u) => {
+          if (!T(a))
             throw new Error(
-              `${a}[${u}]: Expected measure function call, got ${typeof o}`
+              `${o}[${u}]: Expected measure function call, got ${typeof a}`
             );
           return D({
-            data: o,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
+            data: a,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
       case "Filter":
-        if (!q(t))
+        if (!T(t))
           throw new Error(
-            `${a}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
+            `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
           );
         return D({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
       case "Filter[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${a}: Expected array of filter function calls, got ${typeof t}`
+            `${o}: Expected array of filter function calls, got ${typeof t}`
           );
-        return t.map((o, u) => {
-          if (!q(o))
+        return t.map((a, u) => {
+          if (!T(a))
             throw new Error(
-              `${a}[${u}]: Expected filter function call, got ${typeof o}`
+              `${o}[${u}]: Expected filter function call, got ${typeof a}`
             );
           return D({
-            data: o,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
+            data: a,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
       case "FilterRelationsNode":
         if (Array.isArray(t))
-          return t.map((o, u) => {
-            if (!q(o))
+          return t.map((a, u) => {
+            if (!T(a))
               throw new Error(
-                `${a}[${u}]: Expected filter function call, got ${typeof o}`
+                `${o}[${u}]: Expected filter function call, got ${typeof a}`
               );
             return D({
-              data: o,
-              context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
+              data: a,
+              context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
             });
           });
-        if (q(t))
+        if (T(t))
           return D({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
         throw new Error(
-          `${a}: Expected filter function call or array of filters, got ${typeof t}`
+          `${o}: Expected filter function call or array of filters, got ${typeof t}`
         );
       case "DateDimension":
         if (typeof t != "string")
           throw new Error(
-            `${a}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
+            `${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
           );
-        return yn(t, s, n, a);
+        return En(t, s, n, o);
       case "LevelAttribute": {
         if (typeof t != "string")
           throw new Error(
-            `${a}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
+            `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const o = ce(
+        const a = le(
           t,
           s,
           n,
-          a
+          o
         );
-        if (!on(o))
+        if (!mn(a))
           throw new Error(
-            `${a}: Attribute must be date/datetime type, got ${ie(
-              o
+            `${o}: Attribute must be date/datetime type, got ${ie(
+              a
             )} attribute`
           );
-        return o;
+        return a;
       }
       case "Measure | number":
         if (typeof t == "number")
           return t;
-        if (q(t))
+        if (T(t))
           return D({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
         throw new Error(
-          `${a}: Expected measure function call or number, got ${typeof t}`
+          `${o}: Expected measure function call or number, got ${typeof t}`
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (gn(t))
+          if (Fn(t))
             return t;
           throw new Error(
-            `${a}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
+            `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
           );
         } else {
           if (t instanceof Date)
             return t;
           throw new Error(
-            `${a}: Expected date string or Date object, got ${typeof t}`
+            `${o}: Expected date string or Date object, got ${typeof t}`
           );
         }
       case "string | number":
         if (typeof t == "string" || typeof t == "number")
           return t;
-        throw new Error(`${a}: Expected string or number, got ${typeof t}`);
+        throw new Error(`${o}: Expected string or number, got ${typeof t}`);
       case "BaseFilterConfig":
       case "MembersFilterConfig":
       case "CustomFormulaContext":
       case "any":
         if (t == null && r.required)
-          throw new Error(`${a}: Required argument is null/undefined`);
+          throw new Error(`${o}: 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: a } = t, o = n ? `${n}.` : "", u = Oe(i);
+  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = De(i);
   if (!u) {
-    const g = Object.keys(Rt), m = v(i, g, (C) => C), F = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
+    const g = Object.keys(kt), m = R(i, g, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
     throw new Error(
-      `${o}function: Unknown function '${i}'.${F}`
+      `${a}function: Unknown function '${i}'.${A}`
     );
   }
-  const l = mn(i), p = pn(i);
-  if (a.length < l)
+  const c = An(i), p = wn(i);
+  if (o.length < c)
     throw new Error(
-      `${o}function: Expected at least ${l} arguments, got ${a.length}`
+      `${a}function: Expected at least ${c} arguments, got ${o.length}`
     );
-  if (a.length > p)
+  if (o.length > p)
     throw new Error(
-      `${o}function: Expected at most ${p} arguments, got ${a.length}`
+      `${a}function: Expected at most ${p} arguments, got ${o.length}`
     );
-  const c = [], d = [];
-  for (let g = 0; g < Math.max(a.length, u.length); g++) {
-    const m = u[`${g}`], F = a[`${g}`], C = o ? `${o}args[${g}]` : `args[${g}]`;
-    if (F === void 0) {
+  const l = [], d = [];
+  for (let g = 0; g < Math.max(o.length, u.length); g++) {
+    const m = u[`${g}`], A = o[`${g}`], C = a ? `${a}args[${g}]` : `args[${g}]`;
+    if (A === void 0) {
       m != null && m.required && d.push(`${C}: Missing required argument (expected ${m.type})`);
       continue;
     }
@@ -2543,8 +2688,8 @@ function D(e) {
       continue;
     }
     try {
-      const N = hn({
-        data: F,
+      const N = Cn({
+        data: A,
         context: {
           dataSource: r,
           schemaIndex: s,
@@ -2552,66 +2697,66 @@ function D(e) {
           argSchema: m
         }
       });
-      c.push(N);
+      l.push(N);
     } catch (N) {
-      const ae = N instanceof Error ? N.message : "Unknown error";
-      d.push(ae);
+      const oe = N instanceof Error ? N.message : "Unknown error";
+      d.push(oe);
     }
   }
   if (d.length > 0) {
     const g = d.join("; ");
     throw new Error(g);
   }
-  const b = dn(i);
+  const b = bn(i);
   if (b)
     try {
-      b(c, {
+      b(l, {
         dataSource: r,
         schemaIndex: s,
-        pathPrefix: o
+        pathPrefix: a
       });
     } catch (g) {
       const m = g instanceof Error ? g.message : "Unknown validation error";
       throw new Error(m);
     }
-  return Is(i, c);
+  return Us(i, l);
 }
-function It(e) {
+function Bt(e) {
   const { attribute: t, config: r } = e;
-  if (be(e) && Dr(t)) {
-    const { granularity: s } = t, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), i = Mr(r), a = Object.keys(i).length === 0 ? void 0 : i;
-    return Nr(t, n, a);
+  if (be(e) && Rr(t)) {
+    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = vr(r), o = Object.keys(i).length === 0 ? void 0 : i;
+    return Ir(t, n, o);
   }
   return e;
 }
-function bn(e) {
+function qn(e) {
   let t = [];
   for (const r of e)
-    Z(r) ? t = Be(r, t) : t = Be([It(r)], t);
+    Z(r) ? t = ze(r, t) : t = ze([Bt(r)], t);
   return t != null ? t : [];
 }
-const Fn = (e) => {
+const Tn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((a, o) => {
+  return t.forEach((o, a) => {
     const u = {
       category: "filters",
-      index: o,
-      input: a
+      index: a,
+      input: o
     };
     try {
-      const l = D({
-        data: a,
+      const c = D({
+        data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !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 }));
+      !Z(c) && !ne(c) ? i.push(w(y({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+    } catch (c) {
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(w(y({}, u), { message: p }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: bn(n) };
-}, De = (e) => {
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: qn(n) };
+}, Me = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Et(t) ? Fn({
+  return t ? Tt(t) ? Tn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2625,28 +2770,28 @@ const Fn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, An = (e) => {
+}, xn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((a, o) => {
+  return t.forEach((o, a) => {
     const u = {
       category: "highlights",
-      index: o,
-      input: a
+      index: a,
+      input: o
     };
     try {
-      const l = D({
-        data: a,
+      const c = D({
+        data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      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 }));
+      ne(c) ? n.push(Bt(c)) : i.push(w(y({}, u), { message: "Invalid filter JSON" }));
+    } catch (c) {
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, Me = (e) => {
+}, Ne = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Et(t) ? An({
+  return t ? Tt(t) ? xn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2660,12 +2805,12 @@ const Fn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, wn = (e, t) => {
-  if (e && !et(e))
-    return A(y({}, t), {
+}, $n = (e, t) => {
+  if (e && !tt(e))
+    return w(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
-}, En = (e, t, r) => {
+}, Sn = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
     const i = D({
@@ -2674,16 +2819,16 @@ const Fn = (e) => {
     });
     return Te(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [A(y({}, r), { message: "Invalid measure JSON" })]
+      errors: [w(y({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
-    const a = i instanceof Error ? i.message : "Unknown error";
+    const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [A(y({}, r), { message: a })]
+      errors: [w(y({}, r), { message: o })]
     };
   }
-}, Cn = (e, t, r, s) => {
+}, On = (e, t, r, s) => {
   const n = D({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
@@ -2691,20 +2836,20 @@ const Fn = (e) => {
   if (!Te(n))
     return {
       style: {},
-      error: A(y({}, s), { message: "Invalid measure JSON" })
+      error: w(y({}, s), { message: "Invalid measure JSON" })
     };
-  const i = wn(e.sortType, s);
+  const i = $n(e.sortType, s);
   if (i) {
-    const o = _(e, "column");
-    return { measure: n, style: o, error: i };
-  }
-  const a = _(e, "column");
-  return { measure: n, style: a };
-}, Tn = (e, t, r, s) => {
-  if (xs(e))
-    return Cn(e, t, r, s);
-  if (q(e)) {
-    const n = En(
+    const a = _(e, "column");
+    return { measure: n, style: a, error: i };
+  }
+  const o = _(e, "column");
+  return { measure: n, style: o };
+}, Dn = (e, t, r, s) => {
+  if (Ns(e))
+    return On(e, t, r, s);
+  if (T(e)) {
+    const n = Sn(
       e,
       { dataSource: t, schemaIndex: r },
       s
@@ -2712,11 +2857,11 @@ const Fn = (e) => {
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: A(y({}, s), {
+    error: w(y({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, Pt = (e) => {
+}, zt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -2733,24 +2878,24 @@ const Fn = (e) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((a, o) => {
+  return t.forEach((o, a) => {
     const u = {
       category: "measures",
-      index: o,
-      input: a
+      index: a,
+      input: o
     };
     try {
-      const l = Tn(a, r, s, u);
-      if (l.error) {
-        i.push(l.error);
+      const c = Dn(o, r, s, u);
+      if (c.error) {
+        i.push(c.error);
         return;
       }
-      l.measure && n.push(
-        l.style !== void 0 ? { measure: l.measure, style: l.style } : { measure: l.measure }
+      c.measure && n.push(
+        c.style !== void 0 ? { measure: c.measure, style: c.style } : { measure: c.measure }
       );
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      i.push(A(y({}, u), { message: p }));
+    } catch (c) {
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
@@ -2759,7 +2904,7 @@ function Q(e) {
     Object.entries(e).map(([t, r]) => [t, Q(r)])
   ) : e;
 }
-function w(e, t, r) {
+function F(e, t, r) {
   const s = e();
   if (!s.success) {
     const n = r ? s.errors.map(r) : s.errors;
@@ -2767,29 +2912,29 @@ function w(e, t, r) {
   }
   return s.data;
 }
-const Jn = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = qe(s), i = [], a = w(
-    () => Tt({
+const ti = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = xe(s), i = [], o = F(
+    () => $t({
       data: t.dimensions || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), o = w(
-    () => Pt({
+  ), a = F(
+    () => zt({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), u = w(
-    () => De({
+  ), u = F(
+    () => Me({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   );
-  let l = null;
-  return t.highlights && (l = w(
-    () => Me({
+  let c = null;
+  return t.highlights && (c = F(
+    () => Ne({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2800,26 +2945,26 @@ const Jn = (e) => {
   } : {
     success: !0,
     data: y({
-      dataSource: Fe(r),
-      dimensions: a ? vr(a) : [],
-      measures: o ? Rr(o) : [],
+      dataSource: Ae(r),
+      dimensions: o ? Pr(o) : [],
+      measures: a ? kr(a) : [],
       filters: u || []
-    }, l && { highlights: l })
+    }, c && { highlights: c })
   };
 };
-function Ke(e) {
+function Ge(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Ne(e) {
+function Re(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var c, d, b;
-    const i = Ke(s) ? s.column : s, a = Ke(s) ? s : void 0, o = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var l, d, b;
+    const i = Ge(s) ? s.column : s, o = Ge(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "dimensions",
         index: n,
-        input: o(),
+        input: a(),
         message: `Dimension at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
@@ -2828,16 +2973,16 @@ function Ne(e) {
       r.push({
         category: "dimensions",
         index: n,
-        input: o(),
+        input: a(),
         message: `Expected composeCode to start with '${E}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (b = a != null && a.sortType ? tt(a.sortType) : void 0) != null ? b : ((c = i.getSort) == null ? void 0 : c.call(i)) !== void 0 && ((d = i.getSort) == null ? void 0 : d.call(i)) !== B.None ? i.getSort() : void 0, l = a ? _(a, "column") : {};
-    if (u !== void 0 && u !== B.None || a && Object.keys(l).length > 0) {
+    const u = (b = o != null && o.sortType ? rt(o.sortType) : void 0) != null ? b : ((l = i.getSort) == null ? void 0 : l.call(i)) !== void 0 && ((d = i.getSort) == null ? void 0 : d.call(i)) !== B.None ? i.getSort() : void 0, c = o ? _(o, "column") : {};
+    if (u !== void 0 && u !== B.None || o && Object.keys(c).length > 0) {
       const g = y(y({
         column: i.composeCode
-      }, u !== void 0 && u !== B.None && { sortType: rt(u) }), l);
+      }, u !== void 0 && u !== B.None && { sortType: st(u) }), c);
       t.push(g);
     } else
       t.push(i.composeCode);
@@ -2848,7 +2993,7 @@ function ve(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
-  if (Ir(e)) {
+  if (Br(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -2862,7 +3007,7 @@ function ve(e) {
         ]
       };
     try {
-      return { success: !0, data: [K(e.composeCode)] };
+      return { success: !0, data: [V(e.composeCode)] };
     } catch (s) {
       const n = s instanceof Error ? s.message : ye;
       return {
@@ -2891,20 +3036,20 @@ function ve(e) {
       return;
     }
     try {
-      const a = K(s.composeCode);
-      r.push(a);
-    } catch (a) {
-      const o = a instanceof Error ? a.message : ye;
+      const o = V(s.composeCode);
+      r.push(o);
+    } catch (o) {
+      const a = o instanceof Error ? o.message : ye;
       t.push({
         category: "filters",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function Re(e) {
+function Ie(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -2920,133 +3065,133 @@ function Re(e) {
       return;
     }
     try {
-      const a = K(s.composeCode);
-      t.push(a);
-    } catch (a) {
-      const o = a instanceof Error ? a.message : ye;
+      const o = V(s.composeCode);
+      t.push(o);
+    } catch (o) {
+      const a = o instanceof Error ? o.message : ye;
       r.push({
         category: "highlights",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for highlight filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for highlight filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Ge(e) {
+function Ye(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Ie(e) {
+function Pe(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var u, l, p;
-    const i = Ge(s) ? s.column : s, a = Ge(s) ? s : void 0, o = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var u, c, p;
+    const i = Ye(s) ? s.column : s, o = Ye(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "measures",
         index: n,
-        input: o(),
+        input: a(),
         message: `Measure at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const c = K(i.composeCode), d = (p = a != null && a.sortType ? tt(a.sortType) : void 0) != null ? p : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((l = i.getSort) == null ? void 0 : l.call(i)) !== B.None ? i.getSort() : void 0;
-      if (d !== void 0 && d !== B.None || a && Object.keys(_(a, "column")).length > 0) {
-        const g = a ? _(a, "column") : {}, m = y(y({
-          column: c
-        }, d !== void 0 && d !== B.None && { sortType: rt(d) }), g);
+      const l = V(i.composeCode), d = (p = o != null && o.sortType ? rt(o.sortType) : void 0) != null ? p : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== B.None ? i.getSort() : void 0;
+      if (d !== void 0 && d !== B.None || o && Object.keys(_(o, "column")).length > 0) {
+        const g = o ? _(o, "column") : {}, m = y(y({
+          column: l
+        }, d !== void 0 && d !== B.None && { sortType: st(d) }), g);
         t.push(m);
       } else
-        t.push(c);
-    } catch (c) {
-      const d = c instanceof Error ? c.message : "Unknown error";
+        t.push(l);
+    } catch (l) {
+      const d = l instanceof Error ? l.message : "Unknown error";
       r.push({
         category: "measures",
         index: n,
-        input: o(),
+        input: a(),
         message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${d}. ComposeCode: '${i.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Ye(e) {
-  var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(st)) != null ? n : !1);
-}
 function Je(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(nt)) != null ? n : !1);
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(nt)) != null ? n : !1);
 }
 function He(e) {
+  var t, r, s, n;
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(it)) != null ? n : !1);
+}
+function Qe(e) {
   try {
-    const t = K(e.trim());
+    const t = V(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
   } catch (t) {
     return;
   }
 }
-function qn(e) {
+function Mn(e) {
   var s, n, i;
   if (!(e != null && e.length)) return [];
   const t = /* @__PURE__ */ new Set(), r = [];
-  for (let a = 0; a < e.length; a++) {
-    if (t.has(a)) continue;
-    const o = e[a];
-    if (Ye(o) || Je(o)) {
-      r.push(o);
+  for (let o = 0; o < e.length; o++) {
+    if (t.has(o)) continue;
+    const a = e[o];
+    if (Je(a) || He(a)) {
+      r.push(a);
       continue;
     }
-    const u = (s = o.name) != null ? s : "Measure", l = `${st}_${u}`, p = `${nt}_${u}`;
-    let c, d, b = a + 1;
-    if (b < e.length && !t.has(b) && Ye(e[b]) && e[b].name === l) {
+    const u = (s = a.name) != null ? s : "Measure", c = `${nt}_${u}`, p = `${it}_${u}`;
+    let l, d, b = o + 1;
+    if (b < e.length && !t.has(b) && Je(e[b]) && e[b].name === c) {
       const g = (n = e[b].composeCode) == null ? void 0 : n.trim();
-      g && (c = He(g), t.add(b), b++);
+      g && (l = Qe(g), t.add(b), b++);
     }
-    if (b < e.length && !t.has(b) && Je(e[b]) && e[b].name === p) {
+    if (b < e.length && !t.has(b) && He(e[b]) && e[b].name === p) {
       const g = (i = e[b].composeCode) == null ? void 0 : i.trim();
-      g && (d = He(g), t.add(b));
+      g && (d = Qe(g), t.add(b));
     }
-    c !== void 0 || d !== void 0 ? 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);
+    l !== void 0 || d !== void 0 ? r.push(y(y({
+      column: a
+    }, l && Object.keys(l).length > 0 && { trend: l }), d && Object.keys(d).length > 0 && { forecast: d })) : r.push(a);
   }
   return r;
 }
-function Hn(e) {
-  const t = [], r = w(
-    () => Ne(e.dimensions || []),
+function ri(e) {
+  const t = [], r = F(
+    () => Re(e.dimensions || []),
     t
-  ), s = qn(e.measures || []), n = w(
-    () => Ie(s),
+  ), s = Mn(e.measures || []), n = F(
+    () => Pe(s),
     t
-  ), i = w(
+  ), i = F(
     () => ve(e.filters),
     t
   );
-  let a = null;
-  if (e.highlights && e.highlights.length > 0 && (a = w(
-    () => Re(e.highlights),
+  let o = null;
+  if (e.highlights && e.highlights.length > 0 && (o = F(
+    () => Ie(e.highlights),
     t
   )), t.length > 0)
     return {
       success: !1,
       errors: t
     };
-  const o = y({
+  const a = y({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
-  }, a && { highlights: a });
+  }, o && { highlights: o });
   return {
     success: !0,
     // Strip [[delimiters]] from all strings to preserve original names with spaces
-    data: Q(o)
+    data: Q(a)
   };
 }
-const kt = new Set(
-  Pr.filter((e) => e !== "image")
-), Qe = Object.freeze([...kt]), fe = /* @__PURE__ */ new Set([
+const Lt = new Set(
+  zr.filter((e) => e !== "image")
+), Xe = Object.freeze([...Lt]), fe = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3069,7 +3214,7 @@ const kt = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), xn = {
+]), Nn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3142,7 +3287,7 @@ const kt = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, $n = /* @__PURE__ */ new Set([
+}, Rn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3150,7 +3295,7 @@ const kt = new Set(
   "geo",
   "details",
   "date"
-]), Sn = /* @__PURE__ */ new Set([
+]), vn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3162,29 +3307,29 @@ const kt = new Set(
   "max",
   "color"
 ]);
-function On(e) {
-  const t = xn[e];
+function In(e) {
+  const t = Nn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
       requiredAxes: Object.freeze([...t.requiredAxes])
     };
 }
-function Bt(e) {
-  return typeof e == "string" && kt.has(e);
+function Ut(e) {
+  return typeof e == "string" && Lt.has(e);
 }
-function Dn(e, t, r) {
-  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || $n.has(e))
+function Pn(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Rn.has(e))
     return !0;
-  if (Sn.has(e))
+  if (vn.has(e))
     return !1;
   const s = Array.isArray(t) ? t[0] : t;
   if (!s)
     return !0;
   let n;
-  return S(s) && "column" in s && (n = s.column), !(q(s) || n !== void 0 && q(n));
+  return S(s) && "column" in s && (n = s.column), !(T(s) || n !== void 0 && T(n));
 }
-function Mn(e) {
+function kn(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
@@ -3198,124 +3343,124 @@ function Mn(e) {
     }), { normalized: r, errors: t };
   const s = e.chartType;
   if (s === void 0) {
-    const i = Object.keys(e), a = v("chartType", i, (l) => l), o = a && a.distance <= x ? ` Did you mean 'chartType'? (You may have typed '${a.best}')` : "", u = a && a.distance <= x ? { [a.best]: e[a.best] } : e;
+    const i = Object.keys(e), o = R("chartType", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'chartType'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
     t.push({
       category: "chartType",
       index: -1,
       input: u,
-      message: `chartType is required.${o}`
+      message: `chartType is required.${a}`
     });
-  } else if (Bt(s))
+  } else if (Ut(s))
     r.chartType = s;
   else {
-    const i = v(String(s), Qe, (u) => u), a = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", o = Qe.slice(0, 8).join(", ");
+    const i = R(String(s), Xe, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = Xe.slice(0, 8).join(", ");
     t.push({
       category: "chartType",
       index: -1,
       input: s,
-      message: `Invalid chartType '${s}'. Valid types: ${o}, ...${a}`
+      message: `Invalid chartType '${s}'. Valid types: ${a}, ...${o}`
     });
   }
   const n = e.dataOptions;
   if (n === void 0) {
-    const i = Object.keys(e), a = v("dataOptions", i, (l) => l), o = a && a.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${a.best}')` : "", u = a && a.distance <= x ? { [a.best]: e[a.best] } : e;
+    const i = Object.keys(e), o = R("dataOptions", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
     t.push({
       category: "dataOptions",
       index: -1,
       input: u,
-      message: `dataOptions is required.${o}`
+      message: `dataOptions is required.${a}`
     });
   } else n !== null && typeof n == "object" && (r.dataOptions = n);
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
 }
-function Nn(e) {
+function Bn(e) {
   return e.map(
     ({ attribute: t, style: r }) => r ? y({ column: t }, r) : t
   );
 }
-function vn(e) {
+function zn(e) {
   return e.map(
     ({ measure: t, style: r }) => r ? y({ column: t }, r) : t
   );
 }
-function zt(e) {
+function _t(e) {
   return Array.isArray(e) ? e : [e];
 }
 function he(e) {
-  return (t) => A(y({}, t), {
+  return (t) => w(y({}, t), {
     category: "dataOptions",
     index: e
   });
 }
 function re(e, t, r, s, n) {
-  const i = t ? zt(
+  const i = t ? _t(
     t
   ) : [];
   if (i.length === 0)
     return [];
   if (r === "dimension") {
-    const o = w(
-      () => Tt({
+    const a = F(
+      () => $t({
         data: i,
         context: s
       }),
       n,
       he(e)
     );
-    return o !== null ? Nn(o) : null;
+    return a !== null ? Bn(a) : null;
   }
-  const a = w(
-    () => Pt({
+  const o = F(
+    () => zt({
       data: i,
       context: s
     }),
     n,
     he(e)
   );
-  return a !== null ? vn(a) : null;
+  return o !== null ? zn(o) : null;
 }
-function Xe(e, t, r) {
+function Ze(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = Ne(
+    const i = Re(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((a) => A(y({}, a), {
+      errors: i.errors.map((o) => w(y({}, o), {
         category: "dataOptions",
         index: e
       }))
     };
   }
-  const n = Ie(s);
+  const n = Pe(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => A(y({}, i), {
+    errors: n.errors.map((i) => w(y({}, i), {
       category: "dataOptions",
       index: e
     }))
   };
 }
-function Rn(e, t) {
+function Ln(e, t) {
   let r;
   S(e) && "column" in e && (r = e.column);
-  const n = !(q(e) || r !== void 0 && q(r)) ? "dimension" : "measure", i = [], a = re("columns", [e], n, t, i);
-  return a !== null ? { success: !0, data: a } : { success: !1, errors: i };
+  const n = !(T(e) || r !== void 0 && T(r)) ? "dimension" : "measure", i = [], o = re("columns", [e], n, t, i);
+  return o !== null ? { success: !0, data: o } : { success: !1, errors: i };
 }
-function In(e, t, r, s) {
+function Un(e, t, r, s) {
   const n = [];
   for (const i of e) {
-    const a = w(
-      () => Rn(i, t),
+    const o = F(
+      () => Ln(i, t),
       r,
       s
     );
-    a && n.push(...a);
+    o && n.push(...o);
   }
   return n;
 }
-function Pn(e, t, r) {
+function _n(e, t, r) {
   if (!e || !S(e))
     return r.push({
       category: "dataOptions",
@@ -3323,40 +3468,40 @@ function Pn(e, t, r) {
       input: e,
       message: "dataOptions is required"
     }), null;
-  const s = {}, { chartType: n } = t, i = r.length, a = e, o = Object.keys(e), u = /* @__PURE__ */ new Map();
-  for (const c of o)
-    if (!fe.has(c)) {
-      const d = v(c, [...fe], (g) => g), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
-      d && d.distance <= x && u.set(c, d.best), r.push({
+  const s = {}, { chartType: n } = t, i = r.length, o = e, a = Object.keys(e), u = /* @__PURE__ */ new Map();
+  for (const l of a)
+    if (!fe.has(l)) {
+      const d = R(l, [...fe], (g) => g), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
+      d && d.distance <= x && u.set(l, d.best), r.push({
         category: "dataOptions",
-        index: c,
-        input: a[c],
-        message: `Unknown dataOptions key '${c}'.${b}`
+        index: l,
+        input: o[l],
+        message: `Unknown dataOptions key '${l}'.${b}`
       });
     }
-  const l = n ? On(n) : void 0;
-  if (l) {
-    for (const c of o)
-      if (c !== "seriesToColorMap" && !l.validAxes.has(c) && fe.has(c)) {
-        const d = v(c, [...l.validAxes], (m) => m), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "", g = [...l.validAxes].join(", ");
+  const c = n ? In(n) : void 0;
+  if (c) {
+    for (const l of a)
+      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && fe.has(l)) {
+        const d = R(l, [...c.validAxes], (m) => m), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "", g = [...c.validAxes].join(", ");
         r.push({
           category: "dataOptions",
-          index: c,
-          input: a[c],
-          message: `Axis '${c}' is not valid for chart type '${n}'. Valid axes: ${g}.${b}`
+          index: l,
+          input: o[l],
+          message: `Axis '${l}' is not valid for chart type '${n}'. Valid axes: ${g}.${b}`
         });
       }
-    for (const c of l.requiredAxes)
-      [...u.values()].includes(c) || (!(c in a) || a[c] == null) && r.push({
+    for (const l of c.requiredAxes)
+      [...u.values()].includes(l) || (!(l in o) || o[l] == null) && r.push({
         category: "dataOptions",
-        index: c,
+        index: l,
         input: null,
-        message: `Chart type '${n}' requires '${l.requiredAxes.join(
+        message: `Chart type '${n}' requires '${c.requiredAxes.join(
           "' and '"
-        )}'. Missing: ${c}.`
+        )}'. Missing: ${l}.`
       });
     n === "indicator" && (["value", "secondary", "min", "max"].some(
-      (b) => b in a && a[b] != null
+      (b) => b in o && o[b] != null
     ) || r.push({
       category: "dataOptions",
       index: -1,
@@ -3372,76 +3517,76 @@ function Pn(e, t, r) {
   if (r.length > i)
     return null;
   const p = Object.entries(e);
-  for (const [c, d] of p) {
+  for (const [l, d] of p) {
     if (!d) continue;
-    if (c === "seriesToColorMap") {
-      s[c] = d;
+    if (l === "seriesToColorMap") {
+      s[l] = d;
       continue;
     }
-    if (c === "columns") {
-      s[c] = In(
-        zt(d),
+    if (l === "columns") {
+      s[l] = Un(
+        _t(d),
         t,
         r,
         he("columns")
       );
       continue;
     }
-    const b = Dn(c, d, n) ? "dimension" : "measure", g = re(
-      c,
+    const b = Pn(l, d, n) ? "dimension" : "measure", g = re(
+      l,
       d,
       b,
       t,
       r
     );
     if (g !== null) {
-      const m = n === "calendar-heatmap" && c === "value";
-      s[c] = m || !Array.isArray(d) ? g[0] : g;
+      const m = n === "calendar-heatmap" && l === "value";
+      s[l] = m || !Array.isArray(d) ? g[0] : g;
     }
   }
   return r.length > i ? null : s;
 }
-function kn(e) {
+function Vn(e) {
   if (typeof e != "string") return "iqr";
   const t = e.split("/")[1];
   return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
 }
-const Qn = (e) => {
+const si = (e) => {
   var m;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = Mn(t);
-  if (a.length > 0)
-    return { success: !1, errors: a };
-  const o = i.chartType, u = qe(n), l = [];
-  let p = Pn(
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = kn(t);
+  if (o.length > 0)
+    return { success: !1, errors: o };
+  const a = i.chartType, u = xe(n), c = [];
+  let p = _n(
     i.dataOptions,
-    { dataSource: s, schemaIndex: u, chartType: o },
-    l
+    { dataSource: s, schemaIndex: u, chartType: a },
+    c
   );
-  if (o === "boxplot" && p) {
-    const F = kn((m = i.styleOptions) == null ? void 0 : m.subtype), C = F === "iqr" || F === "standardDeviation";
-    p = A(y({}, p), { boxType: F, outliersEnabled: C });
+  if (a === "boxplot" && p) {
+    const A = Vn((m = i.styleOptions) == null ? void 0 : m.subtype), C = A === "iqr" || A === "standardDeviation";
+    p = w(y({}, p), { boxType: A, outliersEnabled: C });
   }
-  let c = null;
-  i.filters && i.filters.length > 0 && (c = w(
-    () => De({
+  let l = null;
+  i.filters && i.filters.length > 0 && (l = F(
+    () => Me({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
-    l
+    c
   ));
   let d = null;
-  if (i.highlights && i.highlights.length > 0 && (d = w(
-    () => Me({
+  if (i.highlights && i.highlights.length > 0 && (d = F(
+    () => Ne({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
-    l
-  )), l.length > 0 || p === null)
+    c
+  )), c.length > 0 || p === null)
     return {
       success: !1,
-      errors: l
+      errors: c
     };
-  if (!Bt(i.chartType))
+  if (!Ut(i.chartType))
     return {
       success: !1,
       errors: [
@@ -3457,15 +3602,15 @@ const Qn = (e) => {
   return {
     success: !0,
     data: y(y(y({
-      dataSet: Fe(s),
+      dataSet: Ae(s),
       chartType: b,
       dataOptions: p
     }, i.styleOptions && {
       // Pass-through NLQ JSON; shape matches ChartStyleOptions.
       styleOptions: i.styleOptions
-    }), c && { filters: c }), d && { highlights: d })
+    }), l && { filters: l }), d && { highlights: d })
   };
-}, Xn = (e) => {
+}, ni = (e) => {
   const t = [];
   if (!e.chartType)
     return {
@@ -3492,11 +3637,11 @@ const Qn = (e) => {
       ]
     };
   let r = null;
-  const s = Bn(e.dataOptions);
+  const s = Wn(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
-    const u = w(
+    const u = F(
       () => ve(e.filters),
       t
     );
@@ -3504,15 +3649,15 @@ const Qn = (e) => {
   }
   let i;
   if (e.highlights && e.highlights.length > 0) {
-    const u = w(
-      () => Re(e.highlights),
+    const u = F(
+      () => Ie(e.highlights),
       t
     );
     i = u != null ? u : void 0;
   }
   if (t.length > 0 || r === null)
     return { success: !1, errors: t };
-  const a = y(y(y({
+  const o = y(y(y({
     chartType: e.chartType,
     dataOptions: r
   }, e.styleOptions && {
@@ -3521,11 +3666,11 @@ const Qn = (e) => {
   return {
     success: !0,
     data: Q(
-      a
+      o
     )
   };
 };
-function Bn(e) {
+function Wn(e) {
   const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
   for (const [n, i] of Object.entries(e)) {
     if (n === "seriesToColorMap" && i) {
@@ -3536,25 +3681,25 @@ function Bn(e) {
       i != null && (t[n] = i);
       continue;
     }
-    const a = Array.isArray(i) ? i : [i], o = Array.isArray(i), u = [], l = [];
-    for (let p = 0; p < a.length; p++) {
-      const c = a[p], b = zn(c) ? Ne([
-        c
-      ]) : Ie([c]);
+    const o = Array.isArray(i) ? i : [i], a = Array.isArray(i), u = [], c = [];
+    for (let p = 0; p < o.length; p++) {
+      const l = o[p], b = jn(l) ? Re([
+        l
+      ]) : Pe([l]);
       b.success ? u.push(...b.data) : b.errors.forEach((g) => {
         var m;
-        l.push(A(y({}, g), { index: p, input: (m = g.input) != null ? m : c }));
+        c.push(w(y({}, g), { index: p, input: (m = g.input) != null ? m : l }));
       });
     }
-    if (l.length > 0) {
-      r.push(...l);
+    if (c.length > 0) {
+      r.push(...c);
       continue;
     }
-    t[n] = o ? u : u[0];
+    t[n] = a ? u : u[0];
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function zn(e) {
+function jn(e) {
   const t = Array.isArray(e) ? e[0] : e;
   if (!t || !S(t))
     return !0;
@@ -3573,13 +3718,13 @@ function zn(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const Ze = ["rows", "columns", "values", "grandTotals"];
-function Ln(e) {
+const et = ["rows", "columns", "values", "grandTotals"];
+function Kn(e) {
   if (!S(e)) return !1;
   const t = Object.keys(e);
   return t.every((r) => r === "rows" || r === "columns") && t.every((r) => typeof e[r] == "boolean");
 }
-function Un(e) {
+function Gn(e) {
   const t = [], r = {
     dataOptions: {}
   };
@@ -3592,37 +3737,37 @@ function Un(e) {
     }), { normalized: r, errors: t };
   const s = e.dataOptions;
   if (s === void 0) {
-    const n = Object.keys(e), i = v("dataOptions", n, (u) => u), a = i && i.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", o = i && i.distance <= x ? { [i.best]: e[i.best] } : e;
+    const n = Object.keys(e), i = R("dataOptions", n, (u) => u), o = i && i.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", a = i && i.distance <= x ? { [i.best]: e[i.best] } : e;
     t.push({
       category: "dataOptions",
       index: -1,
-      input: o,
-      message: `dataOptions is required.${a}`
+      input: a,
+      message: `dataOptions is required.${o}`
     });
   } else if (S(s)) {
     const n = s;
     r.dataOptions = n;
-    for (const a of Object.keys(n))
-      if (!Ze.includes(a)) {
-        const o = v(a, [...Ze], (l) => l), u = o && o.distance <= x ? ` Did you mean '${o.best}'?` : "";
+    for (const o of Object.keys(n))
+      if (!et.includes(o)) {
+        const a = R(o, [...et], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
         t.push({
           category: "dataOptions",
-          index: a,
-          input: n[a],
-          message: `Unknown dataOptions key '${a}'. Valid keys: rows, columns, values, grandTotals.${u}`
+          index: o,
+          input: n[o],
+          message: `Unknown dataOptions key '${o}'. Valid keys: rows, columns, values, grandTotals.${u}`
         });
       }
-    for (const a of ["rows", "columns", "values"]) {
-      const o = n[a];
-      o != null && !Array.isArray(o) && t.push({
+    for (const o of ["rows", "columns", "values"]) {
+      const a = n[o];
+      a != null && !Array.isArray(a) && t.push({
         category: "dataOptions",
-        index: a,
-        input: o,
-        message: `dataOptions.${a} must be an array`
+        index: o,
+        input: a,
+        message: `dataOptions.${o} must be an array`
       });
     }
     const i = n.grandTotals;
-    i != null && !Ln(i) && t.push({
+    i != null && !Kn(i) && t.push({
       category: "dataOptions",
       index: "grandTotals",
       input: i,
@@ -3631,7 +3776,7 @@ function Un(e) {
   }
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
 }
-function _n(e, t, r) {
+function Yn(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
       category: "dataOptions",
@@ -3640,15 +3785,15 @@ function _n(e, t, r) {
       message: "dataOptions is required"
     }), null;
   const s = {}, n = r.length;
-  for (const a of ["rows", "columns"]) {
-    const o = re(
-      a,
-      e[a],
+  for (const o of ["rows", "columns"]) {
+    const a = re(
+      o,
+      e[o],
       "dimension",
       t,
       r
     );
-    o && (s[a] = o);
+    a && (s[o] = a);
   }
   const i = re(
     "values",
@@ -3659,41 +3804,41 @@ function _n(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const Zn = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = Un(t);
-  if (a.length > 0)
-    return { success: !1, errors: a };
-  const o = qe(n), u = [], l = _n(
+const ii = (e) => {
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Gn(t);
+  if (o.length > 0)
+    return { success: !1, errors: o };
+  const a = xe(n), u = [], c = Yn(
     i.dataOptions,
-    { dataSource: s, schemaIndex: o },
+    { dataSource: s, schemaIndex: a },
     u
   );
   let p = null;
-  i.filters && i.filters.length > 0 && (p = w(
-    () => De({
+  i.filters && i.filters.length > 0 && (p = F(
+    () => Me({
       data: i.filters || [],
-      context: { dataSource: s, schemaIndex: o }
+      context: { dataSource: s, schemaIndex: a }
     }),
     u
   ));
-  let c = null;
-  return i.highlights && i.highlights.length > 0 && (c = w(
-    () => Me({
+  let l = null;
+  return i.highlights && i.highlights.length > 0 && (l = F(
+    () => Ne({
       data: i.highlights || [],
-      context: { dataSource: s, schemaIndex: o }
+      context: { dataSource: s, schemaIndex: a }
     }),
     u
-  )), u.length > 0 || l === null ? {
+  )), u.length > 0 || c === null ? {
     success: !1,
     errors: u
   } : {
     success: !0,
     data: y(y(y({
-      dataSet: Fe(s),
-      dataOptions: l
-    }, i.styleOptions && { styleOptions: i.styleOptions }), p && { filters: p }), c && { highlights: c })
+      dataSet: Ae(s),
+      dataOptions: c
+    }, i.styleOptions && { styleOptions: i.styleOptions }), p && { filters: p }), l && { highlights: l })
   };
-}, ei = (e) => {
+}, oi = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
@@ -3708,49 +3853,49 @@ const Zn = (e) => {
       ]
     };
   const r = e.dataOptions, s = {};
-  for (const l of ["rows", "columns"]) {
-    const p = r[l];
+  for (const c of ["rows", "columns"]) {
+    const p = r[c];
     if (p && p.length > 0) {
-      const c = Xe(l, p, "dimension");
-      c.success ? s[l] = c.data : t.push(...c.errors);
+      const l = Ze(c, p, "dimension");
+      l.success ? s[c] = l.data : t.push(...l.errors);
     }
   }
   const n = r.values;
   if (n && n.length > 0) {
-    const l = Xe("values", n, "measure");
-    l.success ? s.values = l.data : t.push(...l.errors);
+    const c = Ze("values", n, "measure");
+    c.success ? s.values = c.data : t.push(...c.errors);
   }
   r.grandTotals !== void 0 && (s.grandTotals = r.grandTotals);
   let i;
   if (e.filters) {
-    const l = w(
+    const c = F(
       () => ve(e.filters),
       t
     );
-    i = l != null ? l : void 0;
+    i = c != null ? c : void 0;
   }
-  let a;
+  let o;
   if (e.highlights && e.highlights.length > 0) {
-    const l = w(
-      () => Re(e.highlights),
+    const c = F(
+      () => Ie(e.highlights),
       t
     );
-    a = l != null ? l : void 0;
+    o = c != null ? c : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const o = y(y(y({
+  const a = y(y(y({
     dataOptions: s
-  }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), a && a.length > 0 && { highlights: a });
+  }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), o && o.length > 0 && { highlights: o });
   return {
     success: !0,
     data: Q(
-      o
+      a
     )
   };
 };
-function Vn(e) {
-  const { filters: t, relations: r } = zr(
+function Jn(e) {
+  const { filters: t, relations: r } = _r(
     e.filters || []
   );
   return {
@@ -3763,23 +3908,23 @@ function Vn(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function ti(e, t, r = !1) {
-  const s = Vn(e), n = kr(s, t);
-  return Br(n, r);
+function ai(e, t, r = !1) {
+  const s = Jn(e), n = Lr(s, t);
+  return Ur(n, r);
 }
 export {
-  Yn as CustomSuperJSON,
-  ni as EMPTY_EXPANDED_QUERY_MODEL,
-  ii as EMPTY_SIMPLE_QUERY_MODEL,
-  ai as isByIdDashboardCodeParams,
-  oi as isByIdWidgetCodeParams,
-  ui as isClientSideDashboardCodeParams,
-  li as isClientSideWidgetCodeParams,
-  Qn as translateChartFromJSON,
-  Xn as translateChartToJSON,
-  Zn as translatePivotTableFromJSON,
-  ei as translatePivotTableToJSON,
-  Jn as translateQueryFromJSON,
-  Hn as translateQueryToJSON,
-  ti as translateQueryToJaql
+  ei as CustomSuperJSON,
+  li as EMPTY_EXPANDED_QUERY_MODEL,
+  fi as EMPTY_SIMPLE_QUERY_MODEL,
+  di as isByIdDashboardCodeParams,
+  mi as isByIdWidgetCodeParams,
+  pi as isClientSideDashboardCodeParams,
+  gi as isClientSideWidgetCodeParams,
+  si as translateChartFromJSON,
+  ni as translateChartToJSON,
+  ii as translatePivotTableFromJSON,
+  oi as translatePivotTableToJSON,
+  ti as translateQueryFromJSON,
+  ri as translateQueryToJSON,
+  ai as translateQueryToJaql
 };