@sisense/sdk-ui 2.24.0 → 2.26.0

package/dist/analytics-composer/node.js

@@ -1,19 +1,19 @@
 var Vt = Object.defineProperty, Wt = Object.defineProperties;
 var jt = Object.getOwnPropertyDescriptors;
-var Ue = Object.getOwnPropertySymbols;
+var ke = Object.getOwnPropertySymbols;
 var Kt = Object.prototype.hasOwnProperty, Gt = Object.prototype.propertyIsEnumerable;
-var _e = (e, t, r) => t in e ? Vt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
+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 = {}))
-    Kt.call(t, r) && _e(e, r, t[r]);
-  if (Ue)
-    for (var r of Ue(t))
-      Gt.call(t, r) && _e(e, r, t[r]);
+    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;
-}, F = (e, t) => Wt(e, jt(t));
-import { f as Yt, J as Jt } from "../types-DJtC8_5_.js";
-import { b as pi, E as gi, a as yi, i as hi, e as bi, d as Ai } from "../types-DJtC8_5_.js";
-import { cb as Ht, bK as Qt, cc as Xt, cd as Zt, ce as er, aG as Fe, cf as tr, aF as rr, cg as sr, bi as nr, aH as ir, ch as or, bl as ar, bj as ur, aV as cr, bh as lr, bk as fr, d as dr, c as mr, k as pr, ci as gr, cj as yr, ck as hr, cl as br, cm as Ar, cn as Fr, co as wr, cp as Er, cq as Cr, cr as Tr, cs as qr, aE as xr, ct as $r, cu as Sr, S as B, t as X, h as Or, b as $, av as _, at as se, cv as Dr, cw as Mr, cx as Nr, M as U, cy as Rr, cz as vr, aR as Ir, ax as Ve, aw as we, bQ as ne, U as Pr, V as kr, cA as it, ag as Br, A as zr, cB as Lr, y as Ur, x as _r } from "../execute-query-b9oy2Egy.js";
-import { i as Vr, b as Wr, D as jr, d as Kr, a as Gr } from "../dimensions-C1R5YRt-.js";
+}, 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++)
@@ -21,7 +21,152 @@ function Yr(e, t) {
       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 Jr {
+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 Jr {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class ot {
+class ut {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new Jr();
+    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 ot {
     return this.kv.getByKey(t);
   }
 }
-class Hr extends ot {
+class ts extends ut {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -66,7 +211,7 @@ class Hr extends ot {
     return this.classToAllowedProps.get(t);
   }
 }
-function Qr(e) {
+function rs(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -74,8 +219,8 @@ function Qr(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function Xr(e, t) {
-  const r = Qr(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 Xr(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 We(e, t) {
+function Le(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class Zr {
+class ns {
   constructor() {
     this.transfomers = {};
   }
@@ -106,13 +251,13 @@ class Zr {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return Xr(this.transfomers, (r) => r.isApplicable(t));
+    return ss(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const es = (e) => Object.prototype.toString.call(e).slice(8, -1), at = (e) => typeof e == "undefined", ts = (e) => e === null, G = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, pe = (e) => G(e) && Object.keys(e).length === 0, I = (e) => Array.isArray(e), rs = (e) => typeof e == "string", ss = (e) => typeof e == "number" && !isNaN(e), ns = (e) => typeof e == "boolean", is = (e) => e instanceof RegExp, Y = (e) => e instanceof Map, J = (e) => e instanceof Set, ut = (e) => es(e) === "Symbol", os = (e) => e instanceof Date && !isNaN(e.valueOf()), as = (e) => e instanceof Error, je = (e) => typeof e == "number" && isNaN(e), us = (e) => ns(e) || ts(e) || at(e) || ss(e) || rs(e) || ut(e), cs = (e) => typeof e == "bigint", ls = (e) => e === 1 / 0 || e === -1 / 0, fs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), ds = (e) => e instanceof URL, ct = (e) => e.replace(/\./g, "\\."), ce = (e) => e.map(String).map(ct).join("."), K = (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++) {
@@ -138,12 +283,12 @@ function v(e, t, r, s) {
     untransform: s
   };
 }
-const lt = [
-  v(at, "undefined", () => null, () => {
+const dt = [
+  v(ct, "undefined", () => null, () => {
   }),
-  v(cs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  v(os, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  v(as, "Error", (e, t) => {
+  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,7 +302,7 @@ const lt = [
       r[s] = e[s];
     }), r;
   }),
-  v(is, "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);
   }),
@@ -170,11 +315,11 @@ const lt = [
     (e) => new Set(e)
   ),
   v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  v((e) => je(e) || ls(e), "number", (e) => je(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  v((e) => 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(ds, "URL", (e) => e.toString(), (e) => new URL(e))
+  v(hs, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function ie(e, t, r, s) {
+function se(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -182,12 +327,12 @@ function ie(e, t, r, s) {
     untransform: s
   };
 }
-const ft = ie((e, t) => ut(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;
-}), ms = [
+}), bs = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -197,16 +342,16 @@ const ft = ie((e, t) => ut(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), dt = ie(fs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = ms[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 mt(e, t) {
+function gt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const pt = ie(mt, (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 pt = ie(mt, (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);
-}), gt = ie((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
+}), 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);
-}), ps = [pt, ft, gt, dt], Ke = (e, t) => {
-  const r = We(ps, (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 = We(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
     };
-}, yt = {};
-lt.forEach((e) => {
-  yt[e.annotation] = e;
+}, bt = {};
+dt.forEach((e) => {
+  bt[e.annotation] = e;
 });
-const gs = (e, t, r) => {
+const ws = (e, t, r) => {
   if (I(t))
     switch (t[0]) {
       case "symbol":
-        return ft.untransform(e, t, r);
+        return mt.untransform(e, t, r);
       case "class":
-        return pt.untransform(e, t, r);
+        return yt.untransform(e, t, r);
       case "custom":
-        return gt.untransform(e, t, r);
+        return ht.untransform(e, t, r);
       case "typed-array":
-        return dt.untransform(e, t, r);
+        return pt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = yt[t];
+    const s = bt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
@@ -269,7 +414,7 @@ const gs = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function ht(e) {
+function At(e) {
   if (ee(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
   if (ee(e, "prototype"))
@@ -277,8 +422,8 @@ function ht(e) {
   if (ee(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const ys = (e, t) => {
-  ht(t);
+const Fs = (e, t) => {
+  At(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
     if (J(e))
@@ -297,8 +442,8 @@ const ys = (e, t) => {
       e = e[s];
   }
   return e;
-}, ge = (e, t, r) => {
-  if (ht(t), t.length === 0)
+}, me = (e, t, r) => {
+  if (At(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
@@ -346,45 +491,45 @@ const ys = (e, t) => {
   }
   return e;
 };
-function ye(e, t, r = []) {
+function pe(e, t, r = []) {
   if (!e)
     return;
   if (!I(e)) {
-    V(e, (i, o) => ye(i, t, [...r, ...K(o)]));
+    W(e, (i, o) => pe(i, t, [...r, ...K(o)]));
     return;
   }
   const [s, n] = e;
-  n && V(n, (i, o) => {
-    ye(i, t, [...r, ...K(o)]);
+  n && W(n, (i, o) => {
+    pe(i, t, [...r, ...K(o)]);
   }), t(s, r);
 }
-function hs(e, t, r) {
-  return ye(t, (s, n) => {
-    e = ge(e, n, (i) => gs(i, s, r));
+function Es(e, t, r) {
+  return pe(t, (s, n) => {
+    e = me(e, n, (i) => ws(i, s, r));
   }), e;
 }
-function bs(e, t) {
+function Cs(e, t) {
   function r(s, n) {
-    const i = ys(e, K(n));
+    const i = Fs(e, K(n));
     s.map(K).forEach((o) => {
-      e = ge(e, o, () => i);
+      e = me(e, o, () => i);
     });
   }
   if (I(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = ge(e, K(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 As = (e, t) => G(e) || I(e) || Y(e) || J(e) || mt(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 ws(e, t) {
+function xs(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
@@ -392,22 +537,22 @@ function ws(e, t) {
       return;
     t || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
     const [i, ...o] = n;
-    i.length === 0 ? s = o.map(ce) : r[ce(i)] = o.map(ce);
-  }), s ? pe(r) ? [s] : [s, r] : pe(r) ? void 0 : r;
+    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 bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
+const wt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
   var b;
-  const a = us(e);
+  const a = ms(e);
   if (!a) {
-    Fs(e, n, t);
+    Ts(e, n, t);
     const g = o.get(e);
     if (g)
       return s ? {
         transformedValue: null
       } : g;
   }
-  if (!As(e, r)) {
-    const g = Ke(e, r), m = g ? {
+  if (!qs(e, r)) {
+    const g = _e(e, r), m = g ? {
       transformedValue: g.value,
       annotations: [g.type]
     } : {
@@ -419,16 +564,16 @@ const bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
     return {
       transformedValue: null
     };
-  const u = Ke(e, r), c = (b = u == null ? void 0 : u.value) != null ? b : e, p = I(c) ? [] : {}, l = {};
-  V(c, (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 A = bt(g, t, r, s, [...n, m], [...i, e], o);
-    p[m] = A.transformedValue, I(A.annotations) ? l[m] = A.annotations : G(A.annotations) && V(A.annotations, (C, N) => {
-      l[ct(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 = pe(l) ? {
+  const d = de(l) ? {
     transformedValue: p,
     annotations: u ? [u.type] : void 0
   } : {
@@ -437,19 +582,19 @@ const bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
   };
   return a || o.set(e, d), d;
 };
-function At(e) {
+function Ft(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Ge(e) {
-  return At(e) === "Array";
+function Ve(e) {
+  return Ft(e) === "Array";
 }
-function Es(e) {
-  if (At(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 Cs(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,
@@ -458,17 +603,17 @@ function Cs(e, t, r, s, n) {
     configurable: !0
   });
 }
-function he(e, t = {}) {
-  if (Ge(e))
-    return e.map((n) => he(n, t));
-  if (!Es(e))
+function ge(e, t = {}) {
+  if (Ve(e))
+    return e.map((n) => ge(n, t));
+  if (!$s(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Ge(t.props) && !t.props.includes(i))
+    if (Ve(t.props) && !t.props.includes(i))
       return n;
-    const o = e[i], a = he(o, t);
-    return Cs(n, i, a, e, t.nonenumerable), n;
+    const 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 Hr(), this.symbolRegistry = new ot((r) => {
+    this.classRegistry = new ts(), this.symbolRegistry = new ut((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new Zr(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new ns(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = bt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = wt(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = F(y({}, n.meta), {
+    s.annotations && (n.meta = w(y({}, n.meta), {
       values: s.annotations
     }));
-    const i = ws(r, this.dedupe);
-    return i && (n.meta = F(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 = he(r);
-    return s != null && s.values && (n = hs(n, s.values, this)), s != null && s.referentialEqualities && (n = bs(n, s.referentialEqualities)), n;
+    let n = ge(r);
+    return s != null && s.values && (n = 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, Ts = (e) => new Jt(e.metadataItem, e.type), Ee = (e) => new dr(
+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, Ts = (e) => new Jt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), Ce = (e) => new mr(
+), Ee = (e) => new mr(
   e.name,
   e.expression,
   e.granularity,
@@ -548,24 +693,24 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
 ), O = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return Ee(e);
+      return Fe(e);
     case "DimensionalLevelAttribute":
-      return Ce(e);
+      return Ee(e);
     default:
       return e;
   }
-}, Ft = (e) => new jr(
+}, Et = (e) => new jr(
   e.name,
   e.expression,
   e.attributes.map(O),
-  e.dimensions.map(qs),
+  e.dimensions.map(Ds),
   e.type,
   e.description,
   z(e.sort),
   e.dataSource,
   e.composeCode,
   e.defaultAttribute ? O(e.defaultAttribute) : void 0
-), wt = (e) => new Kr(
+), Ct = (e) => new Kr(
   e.name,
   e.expression,
   e.description,
@@ -574,16 +719,16 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
   e.composeCode,
   e.indexed,
   e.merged
-), qs = (e) => {
+), Ds = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Ft(e);
+      return Et(e);
     case "DimensionalDateDimension":
-      return wt(e);
+      return Ct(e);
     default:
       return e;
   }
-}, Te = (e) => new pr(
+}, Ce = (e) => new pr(
   e.name,
   O(e.attribute),
   e.aggregation,
@@ -598,11 +743,11 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
       if (s && typeof s == "object" && "__serializable" in s)
         switch (s.__serializable) {
           case "DimensionalAttribute":
-            return [r, Ee(s)];
+            return [r, Fe(s)];
           case "DimensionalLevelAttribute":
-            return [r, Ce(s)];
+            return [r, Ee(s)];
           case "DimensionalBaseMeasure":
-            return [r, Te(s)];
+            return [r, Ce(s)];
           case "DimensionalCalculatedMeasure":
             return [r, qe(s)];
           default:
@@ -621,7 +766,7 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
     e.dataSource,
     e.composeCode
   );
-}, Et = (e) => new yr(
+}, qt = (e) => new yr(
   e.name,
   O(e.attribute),
   e.format,
@@ -629,50 +774,50 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), le = (e) => {
+), ue = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Te(e);
+      return Ce(e);
     case "DimensionalCalculatedMeasure":
       return qe(e);
     case "DimensionalMeasureTemplate":
-      return Et(e);
+      return qt(e);
     default:
       return e;
   }
-}, T = (e) => {
+}, q = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
       return new Sr(
         O(e.attribute),
         e.members,
-        e.config.backgroundFilter ? F(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 $r(
-        e.filters.map((r) => T(r)),
+        e.filters.map((r) => q(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
       return new xr(
-        e._filters.map((r) => T(r)),
+        e._filters.map((r) => q(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new qr(
-        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 Tr(
+      return new qr(
         O(e.attribute),
-        le(e.measure),
+        ue(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -683,7 +828,7 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
     case "RankingFilter":
       return new Cr(
         O(e.attribute),
-        le(e.measure),
+        ue(e.measure),
         e.operator,
         e.count,
         e.config,
@@ -691,14 +836,14 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
       );
     case "MeasureRankingFilter":
       return new Er(
-        le(e.measure),
+        ue(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new wr(
+      return new Fr(
         O(e.attribute),
         e.operatorA,
         e.valueA,
@@ -708,7 +853,7 @@ const z = (e) => e === void 0 ? B.None : e, Ts = (e) => new Jt(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new Fr(
+      return new wr(
         O(e.attribute),
         e.operatorA,
         e.valueA,
@@ -750,7 +895,7 @@ h.registerCustom(
   {
     isApplicable: Yt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ts(e)
+    deserialize: (e) => Os(e)
   },
   "JaqlElement"
 );
@@ -758,7 +903,7 @@ h.registerCustom(
   {
     isApplicable: Ht,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ee(e)
+    deserialize: (e) => Fe(e)
   },
   "DimensionalAttribute"
 );
@@ -766,7 +911,7 @@ h.registerCustom(
   {
     isApplicable: Qt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ce(e)
+    deserialize: (e) => Ee(e)
   },
   "DimensionalLevelAttribute"
 );
@@ -774,7 +919,7 @@ h.registerCustom(
   {
     isApplicable: Vr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ft(e)
+    deserialize: (e) => Et(e)
   },
   "DimensionalDimension"
 );
@@ -782,7 +927,7 @@ h.registerCustom(
   {
     isApplicable: Wr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => wt(e)
+    deserialize: (e) => Ct(e)
   },
   "DimensionalDateDimension"
 );
@@ -790,7 +935,7 @@ h.registerCustom(
   {
     isApplicable: Xt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Te(e)
+    deserialize: (e) => Ce(e)
   },
   "DimensionalBaseMeasure"
 );
@@ -806,15 +951,15 @@ h.registerCustom(
   {
     isApplicable: er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Et(e)
+    deserialize: (e) => qt(e)
   },
   "DimensionalMeasureTemplate"
 );
 h.registerCustom(
   {
-    isApplicable: Fe,
+    isApplicable: be,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MembersFilter"
 );
@@ -822,7 +967,7 @@ h.registerCustom(
   {
     isApplicable: tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "LogicalAttributeFilter"
 );
@@ -830,7 +975,7 @@ h.registerCustom(
   {
     isApplicable: rr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "CascadingFilter"
 );
@@ -838,7 +983,7 @@ h.registerCustom(
   {
     isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "ExcludeFilter"
 );
@@ -846,7 +991,7 @@ h.registerCustom(
   {
     isApplicable: nr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MeasureFilter"
 );
@@ -854,7 +999,7 @@ h.registerCustom(
   {
     isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "RankingFilter"
 );
@@ -862,7 +1007,7 @@ h.registerCustom(
   {
     isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "MeasureRankingFilter"
 );
@@ -870,7 +1015,7 @@ h.registerCustom(
   {
     isApplicable: ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "NumericFilter"
 );
@@ -878,7 +1023,7 @@ h.registerCustom(
   {
     isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "TextFilter"
 );
@@ -886,7 +1031,7 @@ h.registerCustom(
   {
     isApplicable: cr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "DateRangeFilter"
 );
@@ -894,7 +1039,7 @@ h.registerCustom(
   {
     isApplicable: lr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "RelativeDateFilter"
 );
@@ -902,34 +1047,34 @@ h.registerCustom(
   {
     isApplicable: fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => T(e)
+    deserialize: (e) => q(e)
   },
   "CustomFilter"
 );
-const ni = 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 Ct(e) {
-  return e.every(q);
+function Tt(e) {
+  return e.every(T);
 }
-function oe(e) {
+function ne(e) {
   return "attribute" in e && "config" in e;
 }
 function Z(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function xe(e) {
-  return !oe(e) && !Z(e);
+function Te(e) {
+  return !ne(e) && !Z(e);
 }
-function xs(e) {
+function Ms(e) {
   return S(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function $s(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 R(e, t, r) {
@@ -941,14 +1086,14 @@ function R(e, t, r) {
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-const Tt = "en";
-function fe(e, t) {
-  return e.localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+const xt = "en";
+function ce(e, t) {
+  return e.localeCompare(t, xt, { sensitivity: "accent" }) === 0;
 }
-function Ye(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+function We(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, xt, { sensitivity: "accent" }) === 0;
 }
-function $e(e) {
+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);
@@ -966,7 +1111,7 @@ function $e(e) {
     columnMap: s
   };
 }
-function Se(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,7 +1123,7 @@ function Se(e, t) {
     );
   let s, n;
   for (const m of t.sortedTables)
-    if (Ye(r, m.name + ".")) {
+    if (We(r, m.name + ".")) {
       const A = r.slice(m.name.length + 1);
       if (!A)
         throw new Error(
@@ -993,7 +1138,7 @@ function Se(e, t) {
       throw new Error(
         `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
       );
-    const A = r.slice(0, m), C = R(A, t.sortedTables, (ue) => ue.name), N = C && C.distance <= x ? ` Did you mean '${C.best.name}'?` : "";
+    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);
@@ -1002,9 +1147,9 @@ function Se(e, t) {
   let o, a;
   const u = $.all;
   for (const m of i) {
-    if (fe(n, m.name))
+    if (ce(n, m.name))
       return { table: s, column: m };
-    if (!Ye(n, m.name + "."))
+    if (!We(n, m.name + "."))
       continue;
     const A = n.slice(m.name.length + 1);
     if (!A)
@@ -1030,13 +1175,13 @@ function Se(e, t) {
       )}.${A}`
     );
   }
-  const c = n.indexOf("."), p = c === -1 ? n : n.slice(0, c), l = R(n, i, (m) => m.name), d = l && l.distance <= x && !fe(l.best.name, p), b = d ? ` Did you mean '${l.best.name}'?` : "", g = !d && n.endsWith(".") && l !== void 0 && fe(l.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 Ss(e, t) {
-  const { table: r, column: s, level: n } = Se(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(
@@ -1063,7 +1208,7 @@ function Ss(e, t) {
   return { table: r, column: s, level: n };
 }
 function H(e, t, r, s) {
-  const { table: n, column: i, level: o } = Ss(e, r);
+  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;
@@ -1092,8 +1237,8 @@ function H(e, t, r, s) {
     dataSource: t
   });
 }
-function Os(e, t, r) {
-  const { column: s, level: n } = Se(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'`
@@ -1108,15 +1253,15 @@ function Os(e, t, r) {
     dataSource: t
   });
 }
-const Ds = (e, t) => {
+const Is = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!se(r))
-    return F(y({}, t), {
+  if (!tt(r))
+    return w(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, Ms = (e, t, r, s) => {
-  const n = Ds(e.sortType, s);
+}, Ps = (e, t, r, s) => {
+  const n = Is(e.sortType, s);
   if (n)
     return {
       attribute: H(e.column, t, r),
@@ -1125,11 +1270,11 @@ const Ds = (e, t) => {
     };
   const i = H(e.column, t, r), o = _(e, "column");
   return { attribute: i, style: o };
-}, Ns = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : xs(e) ? Ms(e, t, r, s) : {
-  error: F(y({}, s), {
+}, 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'."
   })
-}, qt = (e) => {
+}, $t = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1153,7 +1298,7 @@ const Ds = (e, t) => {
       input: o
     };
     try {
-      const c = Ns(o, r, s, u);
+      const c = ks(o, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -1163,47 +1308,47 @@ const Ds = (e, t) => {
       );
     } catch (c) {
       const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y({}, u), { message: p }));
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function Oe(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 Rs(e, t) {
-  const r = e.replace("measureFactory.", ""), n = Oe(Dr, r)(...t);
-  if (!xe(n))
+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 = Oe(Mr, 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 Is(e, t) {
+function Ls(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return vs(e, t);
-  const r = e.replace("filterFactory.", ""), n = Oe(Nr, r)(...t);
-  if (!oe(n) && !Z(n))
+    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 Ps(e, t) {
+function Us(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Rs(e, t);
+    return Bs(e, t);
   if (s === "filterFactory")
-    return Is(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), ks = /* @__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,159 +1478,19 @@ const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), ks = /*
   SIN: f("scalar", 1, 1),
   SQRT: f("scalar", 1, 1),
   TAN: f("scalar", 1, 1)
-}, Bs = Object.keys(te).filter(
+}, Vs = Object.keys(te).filter(
   (e) => te[e].category === "xdiff"
 );
-function xt() {
-  return Bs;
+function St() {
+  return Vs;
 }
-function $t(e) {
+function Ot(e) {
   const t = te[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-function zs(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`;
 }
-function De(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 Ls(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 Us(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 _s(e) {
-  return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
-}
-function W(e) {
-  if (!e || typeof e != "string")
-    throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
-  const t = e.trim();
-  if (!t)
-    throw new Error("Invalid composeCode: empty string");
-  const r = t.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
-  if (!r)
-    throw new Error(`Invalid composeCode format: expected function call, got '${t}'`);
-  const s = r[1], n = r[2], i = St(n);
-  return {
-    function: s,
-    args: i
-  };
-}
-function St(e) {
-  return e.trim() ? De(e, ",").map(Ot) : [];
-}
-function Ot(e) {
-  if (!e)
-    throw new Error("Cannot parse empty argument value");
-  if (e === "null")
-    return null;
-  if (e === "undefined")
-    return;
-  if (e === "true")
-    return !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 = St(r);
-    return s.every((n) => typeof n == "string"), s;
-  }
-  if (e.startsWith("{") && e.endsWith("}")) {
-    const r = e.slice(1, -1).trim();
-    return r ? Ws(r) : {};
-  }
-  return e.includes("(") && e.includes(")") ? W(e) : (e.startsWith("DM."), e);
-}
-function Vs(e) {
-  const t = Ls(e, ":");
-  if (t === -1)
-    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = _s(e.slice(0, t).trim()), s = Ot(e.slice(t + 1).trim());
-  return [r, s];
-}
-function Ws(e) {
-  if (!e.trim()) return {};
-  const t = De(e, ",").map(Vs).filter(([, r]) => r !== null);
-  return Object.fromEntries(t);
-}
 const js = /\[(\w[\w.-]*)\]/g, Dt = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
@@ -1512,7 +1517,7 @@ const js = /\[(\w[\w.-]*)\]/g, Dt = /* @__PURE__ */ new Set([
   "i"
 );
 function Mt(e) {
-  return q(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
+  return T(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
 }
 function Gs(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
@@ -1588,14 +1593,14 @@ function Zs(e, t) {
   return e.length;
 }
 function en(e) {
-  return De(e, ",").filter((t) => t.trim().length > 0).length;
+  return we(e, ",").filter((t) => t.trim().length > 0).length;
 }
 function tn(e, t, r, s) {
   for (; t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = Us(e, n);
+  const n = t, i = Hr(e, n);
   if (i === -1)
     return n + 1;
   const o = e.slice(n + 1, i);
@@ -1625,7 +1630,7 @@ function vt(e) {
 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 (ks.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`
@@ -1635,7 +1640,7 @@ function rn(e) {
     const o = te[n];
     if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
       s.add(n);
-      const a = zs(o.minArgs, o.maxArgs);
+      const a = Ws(o.minArgs, o.maxArgs);
       M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
     }
   }
@@ -1681,7 +1686,7 @@ function an(e) {
   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) {
+function je(e, t, r, s) {
   var o;
   const n = (o = s.context[j(e)]) != null ? o : s.context[e];
   if (n === void 0) return;
@@ -1694,7 +1699,7 @@ function Je(e, t, r, s) {
   }
   if (s.schemaIndex)
     try {
-      const a = Se(n, s.schemaIndex);
+      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 '${a.level}'.`
@@ -1708,10 +1713,10 @@ function Je(e, t, r, s) {
     }
 }
 function un(e) {
-  const t = xt(), r = Rt(e.formula, t);
+  const t = St(), r = Rt(e.formula, t);
   for (const s of r) {
-    const n = $t(s.functionName);
-    Je(s.ref1, s, n, e), Je(s.ref2, s, n, e);
+    const n = Ot(s.functionName);
+    je(s.ref1, s, n, e), je(s.ref2, s, n, e);
   }
 }
 function cn(e, t, r = {}) {
@@ -1757,7 +1762,7 @@ function fn(e, t) {
   const o = dn(s), a = {};
   for (const [u, c] of Object.entries(i)) {
     const p = `args[2].${u}`;
-    if (q(c))
+    if (T(c))
       a[`${u}`] = D({
         data: c,
         context: {
@@ -1789,9 +1794,9 @@ function fn(e, t) {
   e[2] = a;
 }
 function dn(e) {
-  const t = xt(), r = Rt(e, t), s = {};
+  const t = St(), r = Rt(e, t), s = {};
   for (const n of r) {
-    const i = $t(n.functionName);
+    const i = Ot(n.functionName);
     if (i !== void 0)
       for (const o of [n.ref1, n.ref2]) {
         const a = s[o];
@@ -1816,38 +1821,38 @@ function mn(e) {
 function pn(e) {
   return It(e) || Pt(e);
 }
-function ae(e) {
+function ie(e) {
   return e.type === U.TextAttribute ? "text" : e.type === U.NumericAttribute ? "numeric" : e.type === U.DateLevel ? "date/datetime" : "unknown";
 }
-function Me(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 He(e, t) {
-  const r = Me(e, t);
+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 ${ae(
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(
         r
       )} attribute`
     );
 }
 function P(e, t) {
-  const r = Me(e, t);
+  const r = Oe(e, t);
   if (!Pt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ae(
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(
         r
       )} attribute`
     );
 }
 function k(e, t) {
-  const r = Me(e, t);
+  const r = Oe(e, t);
   if (!It(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ae(
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(
         r
       )} attribute`
     );
@@ -1860,7 +1865,7 @@ function gn(e, t) {
 }
 function yn(e, t) {
   const r = gn(e, t);
-  if (!Fe(r))
+  if (!be(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
@@ -1868,8 +1873,8 @@ function yn(e, t) {
 const hn = {
   "measureFactory.customFormula": fn,
   // String | Number filters
-  "filterFactory.equals": He,
-  "filterFactory.doesntEqual": He,
+  "filterFactory.equals": Ke,
+  "filterFactory.doesntEqual": Ke,
   // Numeric filters
   "filterFactory.greaterThan": P,
   "filterFactory.greaterThanOrEqual": P,
@@ -2419,18 +2424,18 @@ const kt = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function Ne(e) {
+function De(e) {
   return kt[`${e}`];
 }
 function An(e) {
-  const t = Ne(e);
+  const t = De(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function Fn(e) {
-  const t = Ne(e);
+function wn(e) {
+  const t = De(e);
   return t ? t.length : 0;
 }
-function wn(e) {
+function Fn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2439,7 +2444,7 @@ function wn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function de(e, t, r, s) {
+function le(e, t, r, s) {
   if (e.startsWith(E))
     try {
       return H(e, t, r);
@@ -2454,7 +2459,7 @@ function de(e, t, r, s) {
 function En(e, t, r, s) {
   if (e.startsWith(E))
     try {
-      return Os(e, t, r);
+      return vs(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
@@ -2509,7 +2514,7 @@ function Cn(e) {
           throw new Error(
             `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return de(t, s, n, o);
+        return le(t, s, n, o);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
@@ -2518,11 +2523,11 @@ function Cn(e) {
         return t.map((a, u) => {
           if (typeof a != "string")
             throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
-          return de(a, s, n, `${o}[${u}]`);
+          return le(a, s, n, `${o}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!q(t))
+        if (!T(t))
           throw new Error(
             `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
@@ -2536,7 +2541,7 @@ function Cn(e) {
             `${o}: Expected array of measure function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!q(a))
+          if (!T(a))
             throw new Error(
               `${o}[${u}]: Expected measure function call, got ${typeof a}`
             );
@@ -2546,7 +2551,7 @@ function Cn(e) {
           });
         });
       case "Filter":
-        if (!q(t))
+        if (!T(t))
           throw new Error(
             `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
           );
@@ -2560,7 +2565,7 @@ function Cn(e) {
             `${o}: Expected array of filter function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!q(a))
+          if (!T(a))
             throw new Error(
               `${o}[${u}]: Expected filter function call, got ${typeof a}`
             );
@@ -2572,7 +2577,7 @@ function Cn(e) {
       case "FilterRelationsNode":
         if (Array.isArray(t))
           return t.map((a, u) => {
-            if (!q(a))
+            if (!T(a))
               throw new Error(
                 `${o}[${u}]: Expected filter function call, got ${typeof a}`
               );
@@ -2581,7 +2586,7 @@ function Cn(e) {
               context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
             });
           });
-        if (q(t))
+        if (T(t))
           return D({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
@@ -2600,7 +2605,7 @@ function Cn(e) {
           throw new Error(
             `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const a = de(
+        const a = le(
           t,
           s,
           n,
@@ -2608,7 +2613,7 @@ function Cn(e) {
         );
         if (!mn(a))
           throw new Error(
-            `${o}: Attribute must be date/datetime type, got ${ae(
+            `${o}: Attribute must be date/datetime type, got ${ie(
               a
             )} attribute`
           );
@@ -2617,7 +2622,7 @@ function Cn(e) {
       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: o }
@@ -2627,7 +2632,7 @@ function Cn(e) {
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (wn(t))
+          if (Fn(t))
             return t;
           throw new Error(
             `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
@@ -2655,14 +2660,14 @@ function Cn(e) {
     }
 }
 function D(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = Ne(i);
+  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(kt), m = R(i, g, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
     throw new Error(
       `${a}function: Unknown function '${i}'.${A}`
     );
   }
-  const c = An(i), p = Fn(i);
+  const c = An(i), p = wn(i);
   if (o.length < c)
     throw new Error(
       `${a}function: Expected at least ${c} arguments, got ${o.length}`
@@ -2694,8 +2699,8 @@ function D(e) {
       });
       l.push(N);
     } catch (N) {
-      const ue = N instanceof Error ? N.message : "Unknown error";
-      d.push(ue);
+      const oe = N instanceof Error ? N.message : "Unknown error";
+      d.push(oe);
     }
   }
   if (d.length > 0) {
@@ -2714,23 +2719,23 @@ function D(e) {
       const m = g instanceof Error ? g.message : "Unknown validation error";
       throw new Error(m);
     }
-  return Ps(i, l);
+  return Us(i, l);
 }
 function Bt(e) {
   const { attribute: t, config: r } = e;
-  if (Fe(e) && Rr(t)) {
+  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 Tn(e) {
+function qn(e) {
   let t = [];
   for (const r of e)
-    Z(r) ? t = Ve(r, t) : t = Ve([Bt(r)], t);
+    Z(r) ? t = ze(r, t) : t = ze([Bt(r)], t);
   return t != null ? t : [];
 }
-const qn = (e) => {
+const Tn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
@@ -2743,15 +2748,15 @@ const qn = (e) => {
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !Z(c) && !oe(c) ? i.push(F(y({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !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(F(y({}, u), { message: p }));
+      i.push(w(y({}, u), { message: p }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: Tn(n) };
-}, Re = (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 ? Ct(t) ? qn({
+  return t ? Tt(t) ? Tn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2778,15 +2783,15 @@ const qn = (e) => {
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      oe(c) ? n.push(Bt(c)) : i.push(F(y({}, u), { message: "Invalid filter JSON" }));
+      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(F(y({}, u), { message: p }));
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, ve = (e) => {
+}, Ne = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ct(t) ? xn({
+  return t ? Tt(t) ? xn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2801,8 +2806,8 @@ const qn = (e) => {
     ]
   } : { success: !0, data: [] };
 }, $n = (e, t) => {
-  if (e && !se(e))
-    return F(y({}, t), {
+  if (e && !tt(e))
+    return w(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
 }, Sn = (e, t, r) => {
@@ -2812,15 +2817,15 @@ const qn = (e) => {
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return xe(i) ? { success: !0, data: i } : {
+    return Te(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [F(y({}, r), { message: "Invalid measure JSON" })]
+      errors: [w(y({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
     const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [F(y({}, r), { message: o })]
+      errors: [w(y({}, r), { message: o })]
     };
   }
 }, On = (e, t, r, s) => {
@@ -2828,10 +2833,10 @@ const qn = (e) => {
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  if (!xe(n))
+  if (!Te(n))
     return {
       style: {},
-      error: F(y({}, s), { message: "Invalid measure JSON" })
+      error: w(y({}, s), { message: "Invalid measure JSON" })
     };
   const i = $n(e.sortType, s);
   if (i) {
@@ -2841,9 +2846,9 @@ const qn = (e) => {
   const o = _(e, "column");
   return { measure: n, style: o };
 }, Dn = (e, t, r, s) => {
-  if ($s(e))
+  if (Ns(e))
     return On(e, t, r, s);
-  if (q(e)) {
+  if (T(e)) {
     const n = Sn(
       e,
       { dataSource: t, schemaIndex: r },
@@ -2852,7 +2857,7 @@ const qn = (e) => {
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: F(y({}, s), {
+    error: w(y({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
@@ -2890,7 +2895,7 @@ const qn = (e) => {
       );
     } catch (c) {
       const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(y({}, u), { message: p }));
+      i.push(w(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
@@ -2899,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;
@@ -2907,63 +2912,29 @@ function w(e, t, r) {
   }
   return s.data;
 }
-const Ie = "$trend", Pe = "$forecast";
-function Mn(e) {
-  return e.map(({ attribute: t, style: r }) => {
-    const s = r == null ? void 0 : r.sortType;
-    if (!s) return t;
-    const n = typeof s == "object" ? s.direction : s;
-    return se(n) ? t.sort(ne(n)) : t;
-  });
-}
-function Nn(e) {
-  var t, r;
-  return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1;
-}
-function Rn(e) {
-  var t, r;
-  return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1;
-}
-function vn(e) {
-  var r, s;
-  const t = [];
-  for (const { measure: n, style: i } of e) {
-    const o = i == null ? void 0 : i.sortType, a = o && se(o) ? n.sort(ne(o)) : n;
-    t.push(a), i != null && i.trend && !Nn(n) && t.push(
-      Pr(n, `${Ie}_${(r = n.name) != null ? r : "Measure"}`, i.trend)
-    ), i != null && i.forecast && !Rn(n) && t.push(
-      kr(
-        n,
-        `${Pe}_${(s = n.name) != null ? s : "Measure"}`,
-        i.forecast
-      )
-    );
-  }
-  return t;
-}
-const ii = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = $e(s), i = [], o = w(
-    () => qt({
+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
-  ), a = w(
+  ), a = F(
     () => zt({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), u = w(
-    () => Re({
+  ), u = F(
+    () => Me({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   );
   let c = null;
-  return t.highlights && (c = w(
-    () => ve({
+  return t.highlights && (c = F(
+    () => Ne({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2974,21 +2945,21 @@ const ii = (e) => {
   } : {
     success: !0,
     data: y({
-      dataSource: we(r),
-      dimensions: o ? Mn(o) : [],
-      measures: a ? vn(a) : [],
+      dataSource: Ae(r),
+      dimensions: o ? Pr(o) : [],
+      measures: a ? kr(a) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Qe(e) {
+function Ge(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function ke(e) {
+function Re(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
     var l, d, b;
-    const i = Qe(s) ? s.column : s, o = Qe(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    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",
@@ -3007,18 +2978,18 @@ function ke(e) {
       });
       return;
     }
-    const u = (b = o != null && o.sortType ? ne(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") : {};
+    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: it(u) }), c);
+      }, u !== void 0 && u !== B.None && { sortType: st(u) }), c);
       t.push(g);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-const be = "Unknown error";
-function Be(e) {
+const ye = "Unknown error";
+function ve(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
@@ -3036,9 +3007,9 @@ function Be(e) {
         ]
       };
     try {
-      return { success: !0, data: [W(e.composeCode)] };
+      return { success: !0, data: [V(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : be;
+      const n = s instanceof Error ? s.message : ye;
       return {
         success: !1,
         errors: [
@@ -3065,10 +3036,10 @@ function Be(e) {
       return;
     }
     try {
-      const o = W(s.composeCode);
+      const o = V(s.composeCode);
       r.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : be;
+      const a = o instanceof Error ? o.message : ye;
       t.push({
         category: "filters",
         index: n,
@@ -3078,7 +3049,7 @@ function Be(e) {
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function ze(e) {
+function Ie(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -3094,10 +3065,10 @@ function ze(e) {
       return;
     }
     try {
-      const o = W(s.composeCode);
+      const o = V(s.composeCode);
       t.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : be;
+      const a = o instanceof Error ? o.message : ye;
       r.push({
         category: "highlights",
         index: n,
@@ -3107,14 +3078,14 @@ function ze(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Xe(e) {
+function Ye(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Le(e) {
+function Pe(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
     var u, c, p;
-    const i = Xe(s) ? s.column : s, o = Xe(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    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",
@@ -3125,11 +3096,11 @@ function Le(e) {
       return;
     }
     try {
-      const l = W(i.composeCode), d = (p = o != null && o.sortType ? ne(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;
+      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: it(d) }), g);
+        }, d !== void 0 && d !== B.None && { sortType: st(d) }), g);
         t.push(m);
       } else
         t.push(l);
@@ -3144,42 +3115,42 @@ function Le(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Ze(e) {
+function Je(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(Ie)) != 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 et(e) {
+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(Pe)) != null ? n : !1);
+  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 tt(e) {
+function Qe(e) {
   try {
-    const t = W(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 In(e) {
+function Mn(e) {
   var s, n, i;
   if (!(e != null && e.length)) return [];
   const t = /* @__PURE__ */ new Set(), r = [];
   for (let o = 0; o < e.length; o++) {
     if (t.has(o)) continue;
     const a = e[o];
-    if (Ze(a) || et(a)) {
+    if (Je(a) || He(a)) {
       r.push(a);
       continue;
     }
-    const u = (s = a.name) != null ? s : "Measure", c = `${Ie}_${u}`, p = `${Pe}_${u}`;
+    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) && Ze(e[b]) && e[b].name === c) {
+    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 && (l = tt(g), t.add(b), b++);
+      g && (l = Qe(g), t.add(b), b++);
     }
-    if (b < e.length && !t.has(b) && et(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 = tt(g), t.add(b));
+      g && (d = Qe(g), t.add(b));
     }
     l !== void 0 || d !== void 0 ? r.push(y(y({
       column: a
@@ -3187,20 +3158,20 @@ function In(e) {
   }
   return r;
 }
-function oi(e) {
-  const t = [], r = w(
-    () => ke(e.dimensions || []),
+function ri(e) {
+  const t = [], r = F(
+    () => Re(e.dimensions || []),
     t
-  ), s = In(e.measures || []), n = w(
-    () => Le(s),
+  ), s = Mn(e.measures || []), n = F(
+    () => Pe(s),
     t
-  ), i = w(
-    () => Be(e.filters),
+  ), i = F(
+    () => ve(e.filters),
     t
   );
   let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = w(
-    () => ze(e.highlights),
+  if (e.highlights && e.highlights.length > 0 && (o = F(
+    () => Ie(e.highlights),
     t
   )), t.length > 0)
     return {
@@ -3220,7 +3191,7 @@ function oi(e) {
 }
 const Lt = new Set(
   zr.filter((e) => e !== "image")
-), rt = Object.freeze([...Lt]), me = /* @__PURE__ */ new Set([
+), Xe = Object.freeze([...Lt]), fe = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3243,7 +3214,7 @@ const Lt = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), Pn = {
+]), Nn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3316,7 +3287,7 @@ const Lt = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, kn = /* @__PURE__ */ new Set([
+}, Rn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3324,7 +3295,7 @@ const Lt = new Set(
   "geo",
   "details",
   "date"
-]), Bn = /* @__PURE__ */ new Set([
+]), vn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3336,8 +3307,8 @@ const Lt = new Set(
   "max",
   "color"
 ]);
-function zn(e) {
-  const t = Pn[e];
+function In(e) {
+  const t = Nn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
@@ -3347,18 +3318,18 @@ function zn(e) {
 function Ut(e) {
   return typeof e == "string" && Lt.has(e);
 }
-function Ln(e, t, r) {
-  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || kn.has(e))
+function Pn(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Rn.has(e))
     return !0;
-  if (Bn.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 Un(e) {
+function kn(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
@@ -3382,7 +3353,7 @@ function Un(e) {
   } else if (Ut(s))
     r.chartType = s;
   else {
-    const i = R(String(s), rt, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = rt.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,
@@ -3402,12 +3373,12 @@ function Un(e) {
   } 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 _n(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
   );
@@ -3415,8 +3386,8 @@ function Vn(e) {
 function _t(e) {
   return Array.isArray(e) ? e : [e];
 }
-function Ae(e) {
-  return (t) => F(y({}, t), {
+function he(e) {
+  return (t) => w(y({}, t), {
     category: "dataOptions",
     index: e
   });
@@ -3428,60 +3399,60 @@ function re(e, t, r, s, n) {
   if (i.length === 0)
     return [];
   if (r === "dimension") {
-    const a = w(
-      () => qt({
+    const a = F(
+      () => $t({
         data: i,
         context: s
       }),
       n,
-      Ae(e)
+      he(e)
     );
-    return a !== null ? _n(a) : null;
+    return a !== null ? Bn(a) : null;
   }
-  const o = w(
+  const o = F(
     () => zt({
       data: i,
       context: s
     }),
     n,
-    Ae(e)
+    he(e)
   );
-  return o !== null ? Vn(o) : null;
+  return o !== null ? zn(o) : null;
 }
-function st(e, t, r) {
+function Ze(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = ke(
+    const i = Re(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((o) => F(y({}, o), {
+      errors: i.errors.map((o) => w(y({}, o), {
         category: "dataOptions",
         index: e
       }))
     };
   }
-  const n = Le(s);
+  const n = Pe(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => F(y({}, i), {
+    errors: n.errors.map((i) => w(y({}, i), {
       category: "dataOptions",
       index: e
     }))
   };
 }
-function Wn(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 = [], o = re("columns", [e], n, t, 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 jn(e, t, r, s) {
+function Un(e, t, r, s) {
   const n = [];
   for (const i of e) {
-    const o = w(
-      () => Wn(i, t),
+    const o = F(
+      () => Ln(i, t),
       r,
       s
     );
@@ -3489,7 +3460,7 @@ function jn(e, t, r, s) {
   }
   return n;
 }
-function Kn(e, t, r) {
+function _n(e, t, r) {
   if (!e || !S(e))
     return r.push({
       category: "dataOptions",
@@ -3499,8 +3470,8 @@ function Kn(e, t, r) {
     }), null;
   const s = {}, { chartType: n } = t, i = r.length, o = e, a = Object.keys(e), u = /* @__PURE__ */ new Map();
   for (const l of a)
-    if (!me.has(l)) {
-      const d = R(l, [...me], (g) => g), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
+    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: l,
@@ -3508,10 +3479,10 @@ function Kn(e, t, r) {
         message: `Unknown dataOptions key '${l}'.${b}`
       });
     }
-  const c = n ? zn(n) : void 0;
+  const c = n ? In(n) : void 0;
   if (c) {
     for (const l of a)
-      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && me.has(l)) {
+      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",
@@ -3553,15 +3524,15 @@ function Kn(e, t, r) {
       continue;
     }
     if (l === "columns") {
-      s[l] = jn(
+      s[l] = Un(
         _t(d),
         t,
         r,
-        Ae("columns")
+        he("columns")
       );
       continue;
     }
-    const b = Ln(l, d, n) ? "dimension" : "measure", g = re(
+    const b = Pn(l, d, n) ? "dimension" : "measure", g = re(
       l,
       d,
       b,
@@ -3575,37 +3546,37 @@ function Kn(e, t, r) {
   }
   return r.length > i ? null : s;
 }
-function Gn(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 ai = (e) => {
+const si = (e) => {
   var m;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Un(t);
+  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 = $e(n), c = [];
-  let p = Kn(
+  const a = i.chartType, u = xe(n), c = [];
+  let p = _n(
     i.dataOptions,
     { dataSource: s, schemaIndex: u, chartType: a },
     c
   );
   if (a === "boxplot" && p) {
-    const A = Gn((m = i.styleOptions) == null ? void 0 : m.subtype), C = A === "iqr" || A === "standardDeviation";
-    p = F(y({}, p), { boxType: A, outliersEnabled: C });
+    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 l = null;
-  i.filters && i.filters.length > 0 && (l = w(
-    () => Re({
+  i.filters && i.filters.length > 0 && (l = F(
+    () => Me({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
   ));
   let d = null;
-  if (i.highlights && i.highlights.length > 0 && (d = w(
-    () => ve({
+  if (i.highlights && i.highlights.length > 0 && (d = F(
+    () => Ne({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
@@ -3631,7 +3602,7 @@ const ai = (e) => {
   return {
     success: !0,
     data: y(y(y({
-      dataSet: we(s),
+      dataSet: Ae(s),
       chartType: b,
       dataOptions: p
     }, i.styleOptions && {
@@ -3639,7 +3610,7 @@ const ai = (e) => {
       styleOptions: i.styleOptions
     }), l && { filters: l }), d && { highlights: d })
   };
-}, ui = (e) => {
+}, ni = (e) => {
   const t = [];
   if (!e.chartType)
     return {
@@ -3666,20 +3637,20 @@ const ai = (e) => {
       ]
     };
   let r = null;
-  const s = Yn(e.dataOptions);
+  const s = Wn(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
-    const u = w(
-      () => Be(e.filters),
+    const u = F(
+      () => ve(e.filters),
       t
     );
     n = u != null ? u : void 0;
   }
   let i;
   if (e.highlights && e.highlights.length > 0) {
-    const u = w(
-      () => ze(e.highlights),
+    const u = F(
+      () => Ie(e.highlights),
       t
     );
     i = u != null ? u : void 0;
@@ -3699,7 +3670,7 @@ const ai = (e) => {
     )
   };
 };
-function Yn(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) {
@@ -3712,12 +3683,12 @@ function Yn(e) {
     }
     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) ? ke([
+      const l = o[p], b = jn(l) ? Re([
         l
-      ]) : Le([l]);
+      ]) : Pe([l]);
       b.success ? u.push(...b.data) : b.errors.forEach((g) => {
         var m;
-        c.push(F(y({}, g), { index: p, input: (m = g.input) != null ? m : l }));
+        c.push(w(y({}, g), { index: p, input: (m = g.input) != null ? m : l }));
       });
     }
     if (c.length > 0) {
@@ -3728,7 +3699,7 @@ function Yn(e) {
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Jn(e) {
+function jn(e) {
   const t = Array.isArray(e) ? e[0] : e;
   if (!t || !S(t))
     return !0;
@@ -3747,13 +3718,13 @@ function Jn(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const nt = ["rows", "columns", "values", "grandTotals"];
-function Hn(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 Qn(e) {
+function Gn(e) {
   const t = [], r = {
     dataOptions: {}
   };
@@ -3777,8 +3748,8 @@ function Qn(e) {
     const n = s;
     r.dataOptions = n;
     for (const o of Object.keys(n))
-      if (!nt.includes(o)) {
-        const a = R(o, [...nt], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
+      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: o,
@@ -3796,7 +3767,7 @@ function Qn(e) {
       });
     }
     const i = n.grandTotals;
-    i != null && !Hn(i) && t.push({
+    i != null && !Kn(i) && t.push({
       category: "dataOptions",
       index: "grandTotals",
       input: i,
@@ -3805,7 +3776,7 @@ function Qn(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 Xn(e, t, r) {
+function Yn(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
       category: "dataOptions",
@@ -3833,26 +3804,26 @@ function Xn(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const ci = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Qn(t);
+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 = $e(n), u = [], c = Xn(
+  const a = xe(n), u = [], c = Yn(
     i.dataOptions,
     { dataSource: s, schemaIndex: a },
     u
   );
   let p = null;
-  i.filters && i.filters.length > 0 && (p = w(
-    () => Re({
+  i.filters && i.filters.length > 0 && (p = F(
+    () => Me({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: a }
     }),
     u
   ));
   let l = null;
-  return i.highlights && i.highlights.length > 0 && (l = w(
-    () => ve({
+  return i.highlights && i.highlights.length > 0 && (l = F(
+    () => Ne({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: a }
     }),
@@ -3863,11 +3834,11 @@ const ci = (e) => {
   } : {
     success: !0,
     data: y(y(y({
-      dataSet: we(s),
+      dataSet: Ae(s),
       dataOptions: c
     }, i.styleOptions && { styleOptions: i.styleOptions }), p && { filters: p }), l && { highlights: l })
   };
-}, li = (e) => {
+}, oi = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
@@ -3885,28 +3856,28 @@ const ci = (e) => {
   for (const c of ["rows", "columns"]) {
     const p = r[c];
     if (p && p.length > 0) {
-      const l = st(c, p, "dimension");
+      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 c = st("values", n, "measure");
+    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 c = w(
-      () => Be(e.filters),
+    const c = F(
+      () => ve(e.filters),
       t
     );
     i = c != null ? c : void 0;
   }
   let o;
   if (e.highlights && e.highlights.length > 0) {
-    const c = w(
-      () => ze(e.highlights),
+    const c = F(
+      () => Ie(e.highlights),
       t
     );
     o = c != null ? c : void 0;
@@ -3923,7 +3894,7 @@ const ci = (e) => {
     )
   };
 };
-function Zn(e) {
+function Jn(e) {
   const { filters: t, relations: r } = _r(
     e.filters || []
   );
@@ -3937,23 +3908,23 @@ function Zn(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function fi(e, t, r = !1) {
-  const s = Zn(e), n = Lr(s, t);
+function ai(e, t, r = !1) {
+  const s = Jn(e), n = Lr(s, t);
   return Ur(n, r);
 }
 export {
-  ni as CustomSuperJSON,
-  pi as EMPTY_EXPANDED_QUERY_MODEL,
-  gi as EMPTY_SIMPLE_QUERY_MODEL,
-  yi as isByIdDashboardCodeParams,
-  hi as isByIdWidgetCodeParams,
-  bi as isClientSideDashboardCodeParams,
-  Ai as isClientSideWidgetCodeParams,
-  ai as translateChartFromJSON,
-  ui as translateChartToJSON,
-  ci as translatePivotTableFromJSON,
-  li as translatePivotTableToJSON,
-  ii as translateQueryFromJSON,
-  oi as translateQueryToJSON,
-  fi 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
 };