@sisense/sdk-ui 2.23.0 → 2.24.0

package/dist/analytics-composer/node.js

@@ -1,27 +1,27 @@
-var zt = Object.defineProperty, Pt = Object.defineProperties;
-var Lt = Object.getOwnPropertyDescriptors;
-var ze = Object.getOwnPropertySymbols;
-var _t = Object.prototype.hasOwnProperty, Ut = Object.prototype.propertyIsEnumerable;
-var Pe = (e, t, r) => t in e ? zt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, g = (e, t) => {
+var Vt = Object.defineProperty, Wt = Object.defineProperties;
+var jt = Object.getOwnPropertyDescriptors;
+var Ue = 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) => {
   for (var r in t || (t = {}))
-    _t.call(t, r) && Pe(e, r, t[r]);
-  if (ze)
-    for (var r of ze(t))
-      Ut.call(t, r) && Pe(e, r, t[r]);
+    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]);
   return e;
-}, F = (e, t) => Pt(e, Lt(t));
-import { f as jt, J as Vt } from "../types-B96nVbgX.js";
-import { b as ri, E as si, a as ni, i as ii, e as oi, d as ai } from "../types-B96nVbgX.js";
-import { cb as Wt, bK as Kt, cc as Jt, cd as Yt, ce as Gt, aG as be, cf as Qt, aF as Ht, cg as Xt, bi as Zt, aH as er, ch as tr, bl as rr, bj as sr, aV as nr, bh as ir, bk as or, d as ar, c as ur, k as cr, ci as lr, cj as fr, ck as dr, cl as mr, cm as pr, cn as yr, co as gr, cp as hr, cq as br, cr as Fr, cs as wr, aE as qr, ct as Ar, cu as Cr, S as B, t as H, h as Er, b as $, av as _, at as te, cv as xr, cw as $r, cx as Tr, M as L, cy as Dr, cz as Sr, aR as Or, ax as Le, aw as Fe, bQ as re, U as Mr, V as vr, cA as tt, ag as Nr, A as Rr, cB as Ir, y as kr, x as Br } from "../execute-query-CHYTupEo.js";
-import { i as zr, b as Pr, D as Lr, d as _r, a as Ur } from "../dimensions-C0BmtTH2.js";
-function jr(e, t) {
+}, 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";
+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 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 Vr {
+class Jr {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -38,9 +38,9 @@ class Vr {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class rt {
+class ot {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new Vr();
+    this.generateIdentifier = t, this.kv = new Jr();
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -55,7 +55,7 @@ class rt {
     return this.kv.getByKey(t);
   }
 }
-class Wr extends rt {
+class Hr extends ot {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -66,7 +66,7 @@ class Wr extends rt {
     return this.classToAllowedProps.get(t);
   }
 }
-function Kr(e) {
+function Qr(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -74,8 +74,8 @@ function Kr(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function Jr(e, t) {
-  const r = Kr(e);
+function Xr(e, t) {
+  const r = Qr(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -85,20 +85,20 @@ function Jr(e, t) {
       return i;
   }
 }
-function U(e, t) {
+function V(e, t) {
   Object.entries(e).forEach(([r, s]) => t(s, r));
 }
-function Z(e, t) {
+function ee(e, t) {
   return e.indexOf(t) !== -1;
 }
-function _e(e, t) {
+function We(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class Yr {
+class Zr {
   constructor() {
     this.transfomers = {};
   }
@@ -106,13 +106,13 @@ class Yr {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return Jr(this.transfomers, (r) => r.isApplicable(t));
+    return Xr(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const Gr = (e) => Object.prototype.toString.call(e).slice(8, -1), st = (e) => typeof e == "undefined", Qr = (e) => e === null, K = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, fe = (e) => K(e) && Object.keys(e).length === 0, R = (e) => Array.isArray(e), Hr = (e) => typeof e == "string", Xr = (e) => typeof e == "number" && !isNaN(e), Zr = (e) => typeof e == "boolean", es = (e) => e instanceof RegExp, J = (e) => e instanceof Map, Y = (e) => e instanceof Set, nt = (e) => Gr(e) === "Symbol", ts = (e) => e instanceof Date && !isNaN(e.valueOf()), rs = (e) => e instanceof Error, Ue = (e) => typeof e == "number" && isNaN(e), ss = (e) => Zr(e) || Qr(e) || st(e) || Xr(e) || Hr(e) || nt(e), ns = (e) => typeof e == "bigint", is = (e) => e === 1 / 0 || e === -1 / 0, os = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), as = (e) => e instanceof URL, it = (e) => e.replace(/\./g, "\\."), ae = (e) => e.map(String).map(it).join("."), W = (e) => {
+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 t = [];
   let r = "";
   for (let n = 0; n < e.length; n++) {
@@ -138,12 +138,12 @@ function v(e, t, r, s) {
     untransform: s
   };
 }
-const ot = [
-  v(st, "undefined", () => null, () => {
+const lt = [
+  v(at, "undefined", () => null, () => {
   }),
-  v(ns, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  v(ts, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  v(rs, "Error", (e, t) => {
+  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) => {
     const r = {
       name: e.name,
       message: e.message
@@ -157,24 +157,24 @@ const ot = [
       r[s] = e[s];
     }), r;
   }),
-  v(es, "regexp", (e) => "" + e, (e) => {
+  v(is, "regexp", (e) => "" + e, (e) => {
     const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(t, r);
   }),
   v(
-    Y,
+    J,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  v(J, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  v((e) => Ue(e) || is(e), "number", (e) => Ue(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  v((e) => je(e) || ls(e), "number", (e) => je(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
   v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  v(as, "URL", (e) => e.toString(), (e) => new URL(e))
+  v(ds, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function se(e, t, r, s) {
+function ie(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -182,12 +182,12 @@ function se(e, t, r, s) {
     untransform: s
   };
 }
-const at = se((e, t) => nt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+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 s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), us = [
+}), ms = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -197,19 +197,19 @@ const at = se((e, t) => nt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), ut = se(os, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = us[t[1]];
+].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]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function ct(e, t) {
+function mt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const lt = se(ct, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+const pt = ie(mt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
-    return g({}, e);
+    return y({}, e);
   const s = {};
   return r.forEach((n) => {
     s[n] = e[n];
@@ -219,49 +219,49 @@ const lt = se(ct, (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);
-}), ft = 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) => {
+}), 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) => {
   const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
-}), cs = [lt, at, ft, ut], je = (e, t) => {
-  const r = _e(cs, (n) => n.isApplicable(e, t));
+}), ps = [pt, ft, gt, dt], Ke = (e, t) => {
+  const r = We(ps, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = _e(ot, (n) => n.isApplicable(e, t));
+  const s = We(lt, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
-}, dt = {};
-ot.forEach((e) => {
-  dt[e.annotation] = e;
+}, yt = {};
+lt.forEach((e) => {
+  yt[e.annotation] = e;
 });
-const ls = (e, t, r) => {
-  if (R(t))
+const gs = (e, t, r) => {
+  if (I(t))
     switch (t[0]) {
       case "symbol":
-        return at.untransform(e, t, r);
+        return ft.untransform(e, t, r);
       case "class":
-        return lt.untransform(e, t, r);
+        return pt.untransform(e, t, r);
       case "custom":
-        return ft.untransform(e, t, r);
+        return gt.untransform(e, t, r);
       case "typed-array":
-        return ut.untransform(e, t, r);
+        return dt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = dt[t];
+    const s = yt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
   }
-}, P = (e, t) => {
+}, L = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -269,22 +269,22 @@ const ls = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function mt(e) {
-  if (Z(e, "__proto__"))
+function ht(e) {
+  if (ee(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (Z(e, "prototype"))
+  if (ee(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (Z(e, "constructor"))
+  if (ee(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const fs = (e, t) => {
-  mt(t);
+const ys = (e, t) => {
+  ht(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
-    if (Y(e))
-      e = P(e, +s);
-    else if (J(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = P(e, n);
+    if (J(e))
+      e = L(e, +s);
+    else if (Y(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = L(e, n);
       switch (i) {
         case "key":
           e = o;
@@ -297,41 +297,41 @@ const fs = (e, t) => {
       e = e[s];
   }
   return e;
-}, de = (e, t, r) => {
-  if (mt(t), t.length === 0)
+}, ge = (e, t, r) => {
+  if (ht(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
     const o = t[i];
-    if (R(s)) {
+    if (I(s)) {
       const a = +o;
       s = s[a];
-    } else if (K(s))
+    } else if (G(s))
       s = s[o];
-    else if (Y(s)) {
+    else if (J(s)) {
       const a = +o;
-      s = P(s, a);
-    } else if (J(s)) {
+      s = L(s, a);
+    } else if (Y(s)) {
       if (i === t.length - 2)
         break;
-      const u = +o, c = +t[++i] == 0 ? "key" : "value", m = P(s, u);
+      const u = +o, c = +t[++i] == 0 ? "key" : "value", p = L(s, u);
       switch (c) {
         case "key":
-          s = m;
+          s = p;
           break;
         case "value":
-          s = s.get(m);
+          s = s.get(p);
           break;
       }
     }
   }
   const n = t[t.length - 1];
-  if (R(s) ? s[+n] = r(s[+n]) : K(s) && (s[n] = r(s[n])), Y(s)) {
-    const i = P(s, +n), o = r(i);
+  if (I(s) ? s[+n] = r(s[+n]) : G(s) && (s[n] = r(s[n])), J(s)) {
+    const i = L(s, +n), o = r(i);
     i !== o && (s.delete(i), s.add(o));
   }
-  if (J(s)) {
-    const i = +t[t.length - 2], o = P(s, i);
+  if (Y(s)) {
+    const i = +t[t.length - 2], o = L(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
         const u = r(o);
@@ -346,45 +346,45 @@ const fs = (e, t) => {
   }
   return e;
 };
-function me(e, t, r = []) {
+function ye(e, t, r = []) {
   if (!e)
     return;
-  if (!R(e)) {
-    U(e, (i, o) => me(i, t, [...r, ...W(o)]));
+  if (!I(e)) {
+    V(e, (i, o) => ye(i, t, [...r, ...K(o)]));
     return;
   }
   const [s, n] = e;
-  n && U(n, (i, o) => {
-    me(i, t, [...r, ...W(o)]);
+  n && V(n, (i, o) => {
+    ye(i, t, [...r, ...K(o)]);
   }), t(s, r);
 }
-function ds(e, t, r) {
-  return me(t, (s, n) => {
-    e = de(e, n, (i) => ls(i, s, r));
+function hs(e, t, r) {
+  return ye(t, (s, n) => {
+    e = ge(e, n, (i) => gs(i, s, r));
   }), e;
 }
-function ms(e, t) {
+function bs(e, t) {
   function r(s, n) {
-    const i = fs(e, W(n));
-    s.map(W).forEach((o) => {
-      e = de(e, o, () => i);
+    const i = ys(e, K(n));
+    s.map(K).forEach((o) => {
+      e = ge(e, o, () => i);
     });
   }
-  if (R(t)) {
+  if (I(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = de(e, W(i), () => e);
-    }), n && U(n, r);
+      e = ge(e, K(i), () => e);
+    }), n && V(n, r);
   } else
-    U(t, r);
+    V(t, r);
   return e;
 }
-const ps = (e, t) => K(e) || R(e) || J(e) || Y(e) || ct(e, t);
-function ys(e, t, r) {
+const As = (e, t) => G(e) || I(e) || Y(e) || J(e) || mt(e, t);
+function Fs(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function gs(e, t) {
+function ws(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
@@ -392,64 +392,64 @@ function gs(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(ae) : r[ae(i)] = o.map(ae);
-  }), s ? fe(r) ? [s] : [s, r] : fe(r) ? void 0 : r;
+    i.length === 0 ? s = o.map(ce) : r[ce(i)] = o.map(ce);
+  }), s ? pe(r) ? [s] : [s, r] : pe(r) ? void 0 : r;
 }
-const pt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
-  var h;
-  const a = ss(e);
+const bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
+  var b;
+  const a = us(e);
   if (!a) {
-    ys(e, n, t);
-    const p = o.get(e);
-    if (p)
+    Fs(e, n, t);
+    const g = o.get(e);
+    if (g)
       return s ? {
         transformedValue: null
-      } : p;
+      } : g;
   }
-  if (!ps(e, r)) {
-    const p = je(e, r), d = p ? {
-      transformedValue: p.value,
-      annotations: [p.type]
+  if (!As(e, r)) {
+    const g = Ke(e, r), m = g ? {
+      transformedValue: g.value,
+      annotations: [g.type]
     } : {
       transformedValue: e
     };
-    return a || o.set(e, d), d;
+    return a || o.set(e, m), m;
   }
-  if (Z(i, e))
+  if (ee(i, e))
     return {
       transformedValue: null
     };
-  const u = je(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, m = R(c) ? [] : {}, l = {};
-  U(c, (p, d) => {
-    if (d === "__proto__" || d === "constructor" || d === "prototype")
-      throw new Error(`Detected property ${d}. This is a prototype pollution risk, please remove it from your object.`);
-    const b = pt(p, t, r, s, [...n, d], [...i, e], o);
-    m[d] = b.transformedValue, R(b.annotations) ? l[d] = b.annotations : K(b.annotations) && U(b.annotations, (A, O) => {
-      l[it(d) + "." + O] = A;
+  const u = Ke(e, r), c = (b = u == null ? void 0 : u.value) != null ? b : e, p = I(c) ? [] : {}, l = {};
+  V(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 f = fe(l) ? {
-    transformedValue: m,
+  const d = pe(l) ? {
+    transformedValue: p,
     annotations: u ? [u.type] : void 0
   } : {
-    transformedValue: m,
+    transformedValue: p,
     annotations: u ? [u.type, l] : l
   };
-  return a || o.set(e, f), f;
+  return a || o.set(e, d), d;
 };
-function yt(e) {
+function At(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Ve(e) {
-  return yt(e) === "Array";
+function Ge(e) {
+  return At(e) === "Array";
 }
-function hs(e) {
-  if (yt(e) !== "Object")
+function Es(e) {
+  if (At(e) !== "Object")
     return !1;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function bs(e, t, r, s, n) {
+function Cs(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,45 +458,45 @@ function bs(e, t, r, s, n) {
     configurable: !0
   });
 }
-function pe(e, t = {}) {
-  if (Ve(e))
-    return e.map((n) => pe(n, t));
-  if (!hs(e))
+function he(e, t = {}) {
+  if (Ge(e))
+    return e.map((n) => he(n, t));
+  if (!Es(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Ve(t.props) && !t.props.includes(i))
+    if (Ge(t.props) && !t.props.includes(i))
       return n;
-    const o = e[i], a = pe(o, t);
-    return bs(n, i, a, e, t.nonenumerable), n;
+    const o = e[i], a = he(o, t);
+    return Cs(n, i, a, e, t.nonenumerable), n;
   }, {});
 }
-class y {
+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 Wr(), this.symbolRegistry = new rt((r) => {
+    this.classRegistry = new Hr(), this.symbolRegistry = new ot((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new Yr(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new Zr(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = pt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = bt(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = F(g({}, n.meta), {
+    s.annotations && (n.meta = F(y({}, n.meta), {
       values: s.annotations
     }));
-    const i = gs(r, this.dedupe);
-    return i && (n.meta = F(g({}, n.meta), {
+    const i = ws(r, this.dedupe);
+    return i && (n.meta = F(y({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
-    let n = pe(r);
-    return s != null && s.values && (n = ds(n, s.values, this)), s != null && s.referentialEqualities && (n = ms(n, s.referentialEqualities)), n;
+    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;
   }
   stringify(t) {
     return JSON.stringify(this.serialize(t));
@@ -511,7 +511,7 @@ class y {
     this.symbolRegistry.register(t, r);
   }
   registerCustom(t, r) {
-    this.customTransformerRegistry.register(g({
+    this.customTransformerRegistry.register(y({
       name: r
     }, t));
   }
@@ -519,16 +519,16 @@ class y {
     this.allowedErrorProps.push(...t);
   }
 }
-y.defaultInstance = new y();
-y.serialize = y.defaultInstance.serialize.bind(y.defaultInstance);
-y.deserialize = y.defaultInstance.deserialize.bind(y.defaultInstance);
-y.stringify = y.defaultInstance.stringify.bind(y.defaultInstance);
-y.parse = y.defaultInstance.parse.bind(y.defaultInstance);
-y.registerClass = y.defaultInstance.registerClass.bind(y.defaultInstance);
-y.registerSymbol = y.defaultInstance.registerSymbol.bind(y.defaultInstance);
-y.registerCustom = y.defaultInstance.registerCustom.bind(y.defaultInstance);
-y.allowErrorProps = y.defaultInstance.allowErrorProps.bind(y.defaultInstance);
-const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e.type), we = (e) => new ar(
+h.defaultInstance = new h();
+h.serialize = h.defaultInstance.serialize.bind(h.defaultInstance);
+h.deserialize = h.defaultInstance.deserialize.bind(h.defaultInstance);
+h.stringify = h.defaultInstance.stringify.bind(h.defaultInstance);
+h.parse = h.defaultInstance.parse.bind(h.defaultInstance);
+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(
   e.name,
   e.expression,
   e.type,
@@ -536,7 +536,7 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), qe = (e) => new ur(
+), Ce = (e) => new mr(
   e.name,
   e.expression,
   e.granularity,
@@ -545,27 +545,27 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
   z(e.sort),
   e.dataSource,
   e.composeCode
-), D = (e) => {
+), O = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return we(e);
+      return Ee(e);
     case "DimensionalLevelAttribute":
-      return qe(e);
+      return Ce(e);
     default:
       return e;
   }
-}, gt = (e) => new Lr(
+}, Ft = (e) => new jr(
   e.name,
   e.expression,
-  e.attributes.map(D),
-  e.dimensions.map(ws),
+  e.attributes.map(O),
+  e.dimensions.map(qs),
   e.type,
   e.description,
   z(e.sort),
   e.dataSource,
   e.composeCode,
-  e.defaultAttribute ? D(e.defaultAttribute) : void 0
-), ht = (e) => new _r(
+  e.defaultAttribute ? O(e.defaultAttribute) : void 0
+), wt = (e) => new Kr(
   e.name,
   e.expression,
   e.description,
@@ -574,44 +574,44 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
   e.composeCode,
   e.indexed,
   e.merged
-), ws = (e) => {
+), qs = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return gt(e);
+      return Ft(e);
     case "DimensionalDateDimension":
-      return ht(e);
+      return wt(e);
     default:
       return e;
   }
-}, Ae = (e) => new cr(
+}, Te = (e) => new pr(
   e.name,
-  D(e.attribute),
+  O(e.attribute),
   e.aggregation,
   e.format,
   e.description,
   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, we(s)];
+            return [r, Ee(s)];
           case "DimensionalLevelAttribute":
-            return [r, qe(s)];
+            return [r, Ce(s)];
           case "DimensionalBaseMeasure":
-            return [r, Ae(s)];
+            return [r, Te(s)];
           case "DimensionalCalculatedMeasure":
-            return [r, Ce(s)];
+            return [r, qe(s)];
           default:
             return [r, s];
         }
       return [r, s];
     })
   );
-  return new lr(
+  return new gr(
     e.name,
     e.expression,
     t,
@@ -621,58 +621,58 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
     e.dataSource,
     e.composeCode
   );
-}, bt = (e) => new fr(
+}, Et = (e) => new yr(
   e.name,
-  D(e.attribute),
+  O(e.attribute),
   e.format,
   e.description,
   z(e.sort),
   e.dataSource,
   e.composeCode
-), ue = (e) => {
+), le = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Ae(e);
+      return Te(e);
     case "DimensionalCalculatedMeasure":
-      return Ce(e);
+      return qe(e);
     case "DimensionalMeasureTemplate":
-      return bt(e);
+      return Et(e);
     default:
       return e;
   }
-}, C = (e) => {
+}, T = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Cr(
-        D(e.attribute),
+      return new Sr(
+        O(e.attribute),
         e.members,
-        e.config.backgroundFilter ? F(g({}, e.config), { backgroundFilter: C(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? F(y({}, e.config), { backgroundFilter: T(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Ar(
-        e.filters.map((r) => C(r)),
+      return new $r(
+        e.filters.map((r) => T(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new qr(
-        e._filters.map((r) => C(r)),
+      return new xr(
+        e._filters.map((r) => T(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new wr(
-        C(e.filter),
-        e.input ? C(e.input) : void 0,
+      return new qr(
+        T(e.filter),
+        e.input ? T(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new Fr(
-        D(e.attribute),
-        ue(e.measure),
+      return new Tr(
+        O(e.attribute),
+        le(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -681,25 +681,25 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
         e.composeCode
       );
     case "RankingFilter":
-      return new br(
-        D(e.attribute),
-        ue(e.measure),
+      return new Cr(
+        O(e.attribute),
+        le(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new hr(
-        ue(e.measure),
+      return new Er(
+        le(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new gr(
-        D(e.attribute),
+      return new wr(
+        O(e.attribute),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -708,8 +708,8 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new yr(
-        D(e.attribute),
+      return new Fr(
+        O(e.attribute),
         e.operatorA,
         e.valueA,
         e.config,
@@ -717,8 +717,8 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
       );
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new pr(
-        D(e.attribute),
+      return new Ar(
+        O(e.attribute),
         r,
         s,
         e.config,
@@ -726,8 +726,8 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
       );
     }
     case "RelativeDateFilter":
-      return new mr(
-        D(e.attribute),
+      return new br(
+        O(e.attribute),
         e.offset,
         e.count,
         e.operator,
@@ -736,8 +736,8 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
         e.composeCode
       );
     case "CustomFilter":
-      return new dr(
-        D(e.attribute),
+      return new hr(
+        O(e.attribute),
         e.jaqlExpression,
         e.config,
         e.composeCode
@@ -746,202 +746,209 @@ const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e
       return e;
   }
 };
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: jt,
+    isApplicable: Yt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Fs(e)
+    deserialize: (e) => Ts(e)
   },
   "JaqlElement"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Wt,
+    isApplicable: Ht,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => we(e)
+    deserialize: (e) => Ee(e)
   },
   "DimensionalAttribute"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Kt,
+    isApplicable: Qt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => qe(e)
+    deserialize: (e) => Ce(e)
   },
   "DimensionalLevelAttribute"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: zr,
+    isApplicable: Vr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => gt(e)
+    deserialize: (e) => Ft(e)
   },
   "DimensionalDimension"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Pr,
+    isApplicable: Wr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ht(e)
+    deserialize: (e) => wt(e)
   },
   "DimensionalDateDimension"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Jt,
+    isApplicable: Xt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ae(e)
+    deserialize: (e) => Te(e)
   },
   "DimensionalBaseMeasure"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Yt,
+    isApplicable: Zt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ce(e)
+    deserialize: (e) => qe(e)
   },
   "DimensionalCalculatedMeasure"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Gt,
+    isApplicable: er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => bt(e)
+    deserialize: (e) => Et(e)
   },
   "DimensionalMeasureTemplate"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: be,
+    isApplicable: Fe,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "MembersFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Qt,
+    isApplicable: tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "LogicalAttributeFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Ht,
+    isApplicable: rr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "CascadingFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Xt,
+    isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "ExcludeFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: Zt,
+    isApplicable: nr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "MeasureFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: er,
+    isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "RankingFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: tr,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "MeasureRankingFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: rr,
+    isApplicable: ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "NumericFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "TextFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: nr,
+    isApplicable: cr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "DateRangeFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: lr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "RelativeDateFilter"
 );
-y.registerCustom(
+h.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => C(e)
+    deserialize: (e) => T(e)
   },
   "CustomFilter"
 );
-const Kn = y, q = "DM.";
-function T(e) {
+const ni = h, E = "DM.";
+function S(e) {
   return typeof e == "object" && e !== null;
 }
-function E(e) {
+function q(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Ft(e) {
-  return e.every(E);
+function Ct(e) {
+  return e.every(q);
 }
-function ne(e) {
+function oe(e) {
   return "attribute" in e && "config" in e;
 }
-function X(e) {
+function Z(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function Ee(e) {
-  return !ne(e) && !X(e);
+function xe(e) {
+  return !oe(e) && !Z(e);
 }
-function qs(e) {
-  return T(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+function xs(e) {
+  return S(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function As(e) {
-  return !T(e) || !("column" in e) ? !1 : E(e.column);
+function $s(e) {
+  return !S(e) || !("column" in e) ? !1 : q(e.column);
 }
 const x = 3;
-function M(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 o = r(i), a = jr(e, o);
+    const o = r(i), a = Yr(e, o);
     a < s && (s = a, n = i);
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-function xe(e) {
+const Tt = "en";
+function fe(e, t) {
+  return e.localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+}
+function Ye(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Tt, { sensitivity: "accent" }) === 0;
+}
+function $e(e) {
   const t = [...e].sort((i, o) => o.name.length - i.name.length), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
   for (const i of e) {
     r.set(i.name, i);
@@ -959,79 +966,79 @@ function xe(e) {
     columnMap: s
   };
 }
-function $e(e, t) {
-  if (!e.startsWith(q))
+function Se(e, t) {
+  if (!e.startsWith(E))
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
     );
-  const r = e.slice(q.length);
+  const r = e.slice(E.length);
   if (!r)
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
     );
   let s, n;
-  for (const d of t.sortedTables)
-    if (r.startsWith(d.name + ".")) {
-      const b = r.slice(d.name.length + 1);
-      if (!b)
+  for (const m of t.sortedTables)
+    if (Ye(r, m.name + ".")) {
+      const A = r.slice(m.name.length + 1);
+      if (!A)
         throw new Error(
-          `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
+          `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
         );
-      s = d, n = b;
+      s = m, n = A;
       break;
     }
   if (!s) {
-    const d = r.indexOf(".");
-    if (d === -1)
+    const m = r.indexOf(".");
+    if (m === -1)
       throw new Error(
-        `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
+        `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
       );
-    const b = r.slice(0, d), A = M(b, t.sortedTables, (oe) => oe.name), O = A && A.distance <= x ? ` Did you mean '${A.best.name}'?` : "";
-    throw new Error(`Table '${b}' not found in the data model.${O}`);
+    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}'?` : "";
+    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 o, a;
   const u = $.all;
-  for (const d of i) {
-    if (n === d.name)
-      return { table: s, column: d };
-    if (!n.startsWith(d.name + "."))
+  for (const m of i) {
+    if (fe(n, m.name))
+      return { table: s, column: m };
+    if (!Ye(n, m.name + "."))
       continue;
-    const b = n.slice(d.name.length + 1);
-    if (!b)
+    const A = n.slice(m.name.length + 1);
+    if (!A)
       continue;
-    const A = u.includes(b), O = H(d.dataType);
-    if (A) {
-      if (O)
-        return { table: s, column: d, level: b };
-      o || (o = d, a = b);
+    const C = u.includes(A), N = X(m.dataType);
+    if (C) {
+      if (N)
+        return { table: s, column: m, level: A };
+      o || (o = m, a = A);
       continue;
     }
-    O && !o && (o = d, a = b);
+    N && !o && (o = m, a = A);
   }
   if (o && a) {
     if (u.includes(a))
       throw new Error(
         `Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`
       );
-    const d = M(a, u, (A) => A), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
+    const m = R(a, u, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
     throw new Error(
       `Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(
         ", "
-      )}.${b}`
+      )}.${A}`
     );
   }
-  const c = n.indexOf("."), m = c === -1 ? n : n.slice(0, c), l = M(n, i, (d) => d.name), f = l && l.distance <= x && l.best.name !== m, h = f ? ` Did you mean '${l.best.name}'?` : "", p = !f && n.endsWith(".") && (l == null ? void 0 : l.best.name) === m ? ` Use '${m}' 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 && !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.` : "";
   throw new Error(
-    `Column '${m}' not found in table '${s.name}'.${h}${p}`
+    `Column '${p}' not found in table '${s.name}'.${b}${g}`
   );
 }
-function Cs(e, t) {
-  const { table: r, column: s, level: n } = $e(e, t);
+function Ss(e, t) {
+  const { table: r, column: s, level: n } = Se(e, t);
   if (n) {
-    if (!H(s.dataType))
+    if (!X(s.dataType))
       throw new Error(
         `Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`
       );
@@ -1055,28 +1062,28 @@ function Cs(e, t) {
   }
   return { table: r, column: s, level: n };
 }
-function G(e, t, r, s) {
-  const { table: n, column: i, level: o } = Cs(e, r);
+function H(e, t, r, s) {
+  const { table: n, column: i, level: o } = Ss(e, r);
   let a = o;
-  if (H(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
+  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: ${c.join(", ")}`
       );
-    const m = `${e}.${u}`, l = $.dateOnly;
+    const p = `${e}.${u}`, l = $.dateOnly;
     if (i.dataType === "date" && !l.includes(u))
       throw new Error(
-        `Invalid level '${u}' in dimensional element '${m}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
+        `Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
       );
-    const f = $.timeOnly;
-    if (i.dataType === "time" && !f.includes(u))
+    const d = $.timeOnly;
+    if (i.dataType === "time" && !d.includes(u))
       throw new Error(
-        `Invalid level '${u}' in dimensional element '${m}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
+        `Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
       );
     a = u;
   }
-  return Er({
+  return Or({
     expression: i.expression,
     dataType: i.dataType,
     granularity: a,
@@ -1085,44 +1092,44 @@ function G(e, t, r, s) {
     dataSource: t
   });
 }
-function Es(e, t, r) {
-  const { column: s, level: n } = $e(e, r);
+function Os(e, t, r) {
+  const { column: s, level: n } = Se(e, r);
   if (n)
     throw new Error(
-      `Invalid DateDimension name format: '${e}'. Expected format: '${q}TableName.ColumnName'`
+      `Invalid DateDimension name format: '${e}'. Expected format: '${E}TableName.ColumnName'`
     );
-  if (!H(s.dataType))
+  if (!X(s.dataType))
     throw new Error(
       `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return Ur({
+  return Gr({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-const xs = (e, t) => {
+const Ds = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!te(r))
-    return F(g({}, t), {
+  if (!se(r))
+    return F(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, $s = (e, t, r, s) => {
-  const n = xs(e.sortType, s);
+}, Ms = (e, t, r, s) => {
+  const n = Ds(e.sortType, s);
   if (n)
     return {
-      attribute: G(e.column, t, r),
+      attribute: H(e.column, t, r),
       style: {},
       error: n
     };
-  const i = G(e.column, t, r), o = _(e, "column");
+  const i = H(e.column, t, r), o = _(e, "column");
   return { attribute: i, style: o };
-}, Ts = (e, t, r, s) => typeof e == "string" ? { attribute: G(e, t, r) } : qs(e) ? $s(e, t, r, s) : {
-  error: F(g({}, s), {
+}, Ns = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : xs(e) ? Ms(e, t, r, s) : {
+  error: F(y({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, wt = (e) => {
+}, qt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1146,7 +1153,7 @@ const xs = (e, t) => {
       input: o
     };
     try {
-      const c = Ts(o, r, s, u);
+      const c = Ns(o, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -1155,106 +1162,335 @@ const xs = (e, t) => {
         c.style !== void 0 ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute }
       );
     } catch (c) {
-      const m = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g({}, u), { message: m }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function Te(e, t) {
+function Oe(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 Ds(e, t) {
-  const r = e.replace("measureFactory.", ""), n = Te(xr, r)(...t);
-  if (!Ee(n))
+function Rs(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Oe(Dr, r)(...t);
+  if (!xe(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function Ss(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = Te($r, r)(...t);
-  if (!X(n))
+function vs(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Oe(Mr, r)(...t);
+  if (!Z(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Os(e, t) {
+function Is(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return Ss(e, t);
-  const r = e.replace("filterFactory.", ""), n = Te(Tr, r)(...t);
-  if (!ne(n) && !X(n))
+    return vs(e, t);
+  const r = e.replace("filterFactory.", ""), n = Oe(Nr, r)(...t);
+  if (!oe(n) && !Z(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Ms(e, t) {
+function Ps(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Ds(e, t);
+    return Rs(e, t);
   if (s === "filterFactory")
-    return Os(e, t);
+    return Is(e, t);
   throw new Error(
     `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const ye = {
-  SDIFF: {
-    category: "time-diff",
-    argCount: 2,
+const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), ks = /* @__PURE__ */ new Set([
+  "CORREL",
+  "COVARP",
+  "COVAR",
+  "EXPONDIST",
+  "INTERCEPT",
+  "LARGEST",
+  "NORMDIST",
+  "POISSONDIST",
+  "SKEWP",
+  "SKEW",
+  "SLOPE",
+  "TDIST",
+  "COSH",
+  "SINH",
+  "TANH",
+  "ORDERING",
+  "RDOUBLE",
+  "RINT"
+]), te = {
+  // ── X-diff (datetime difference operators) ──
+  SDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Seconds,
     argType: "datetime"
-  },
-  MNDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  MNDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Minutes,
     argType: "datetime"
-  },
-  HDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  HDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Hours,
     argType: "datetime"
-  },
-  DDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  DDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Days,
     argType: "datetime"
-  },
-  MDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  MDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Months,
     argType: "datetime"
-  },
-  QDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  QDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Quarters,
     argType: "datetime"
-  },
-  YDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  YDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Years,
     argType: "datetime"
-  }
-}, vs = Object.keys(ye).filter(
-  (e) => ye[e].category === "time-diff"
+  }),
+  // ── Aggregation ──
+  ANYVALUE: f("aggregative", 1, 1),
+  SUM: f("aggregative", 1, 2),
+  AVG: f("aggregative", 1, 2),
+  MIN: f("aggregative", 1, 2),
+  MAX: f("aggregative", 1, 2),
+  COUNT: f("aggregative", 1, 2),
+  DUPCOUNT: f("aggregative", 1, 1),
+  COUNTDUPLICATES: f("aggregative", 1, 1),
+  STDEV: f("aggregative", 1, 2),
+  STDEVP: f("aggregative", 1, 2),
+  VAR: f("aggregative", 1, 2),
+  VARP: f("aggregative", 1, 2),
+  MEDIAN: f("aggregative", 1, 2),
+  QUARTILE: f("aggregative", 2, 3),
+  PERCENTILE: f("aggregative", 2, 3),
+  LOWERWHISKERMAX_IQR: f("aggregative", 1, 1),
+  LOWERWHISKERMAX_STDEVP: f("aggregative", 1, 1),
+  UPPERWHISKERMIN_IQR: f("aggregative", 1, 1),
+  UPPERWHISKERMIN_STDEVP: f("aggregative", 1, 1),
+  OUTLIERSCOUNT_IQR: f("aggregative", 1, 1),
+  OUTLIERSCOUNT_STDEVP: f("aggregative", 1, 1),
+  MODE: f("aggregative", 1, 1),
+  NOAGGFUNCTION: f("aggregative", 1, 1),
+  // ── Window ──
+  RANK: f("window", 0, Number.POSITIVE_INFINITY),
+  RSUM: f("window", 1, 2),
+  RAVG: f("window", 1, 2),
+  YTDSUM: f("window", 1, 1),
+  QTDSUM: f("window", 1, 1),
+  MTDSUM: f("window", 1, 1),
+  WTDSUM: f("window", 1, 1),
+  YTDAVG: f("window", 1, 1),
+  QTDAVG: f("window", 1, 1),
+  MTDAVG: f("window", 1, 1),
+  WTDAVG: f("window", 1, 1),
+  // ── String ──
+  CONCAT: f("string", 2, Number.POSITIVE_INFINITY),
+  LEFT: f("string", 2, 2),
+  RIGHT: f("string", 2, 2),
+  // ── Scalar / math ──
+  ABS: f("scalar", 1, 1),
+  ACOS: f("scalar", 1, 1),
+  ASIN: f("scalar", 1, 1),
+  ATAN: f("scalar", 1, 1),
+  CEILING: f("scalar", 1, 1),
+  CONTRIBUTION: f("scalar", 1, 1),
+  COS: f("scalar", 1, 1),
+  COT: f("scalar", 1, 1),
+  DIFFPASTDAY: f("scalar", 1, 1),
+  DIFFPASTMONTH: f("scalar", 1, 1),
+  DIFFPASTPERIOD: f("scalar", 1, 1),
+  DIFFPASTQUARTER: f("scalar", 1, 1),
+  DIFFPASTWEEK: f("scalar", 1, 1),
+  DIFFPASTYEAR: f("scalar", 1, 1),
+  EXP: f("scalar", 1, 1),
+  FLOOR: f("scalar", 1, 1),
+  GROWTH: f("growth", 1, 1),
+  GROWTHPASTMONTH: f("growth", 1, 1),
+  GROWTHPASTQUARTER: f("growth", 1, 1),
+  GROWTHPASTWEEK: f("growth", 1, 1),
+  GROWTHPASTYEAR: f("growth", 1, 1),
+  GROWTHRATE: f("growth", 1, 1),
+  LN: f("scalar", 1, 1),
+  LOG10: f("scalar", 1, 1),
+  MINUS: f("scalar", 1, 1),
+  MOD: f("scalar", 2, 2),
+  QUOTIENT: f("scalar", 2, 2),
+  PASTDAY: f("date", 1, 2),
+  PASTMONTH: f("date", 1, 2),
+  PASTPERIOD: f("date", 1, 2),
+  PASTQUARTER: f("date", 1, 2),
+  PASTWEEK: f("date", 1, 2),
+  PASTYEAR: f("date", 1, 2),
+  PERCENTILEDISCFORINTERNALUSEONLY: f("scalar", 1, 1),
+  PERCENTILECONTFORINTERNALUSEONLY: f("scalar", 1, 1),
+  POWER: f("scalar", 2, 2),
+  ROUND: f("scalar", 2, 2),
+  SIN: f("scalar", 1, 1),
+  SQRT: f("scalar", 1, 1),
+  TAN: f("scalar", 1, 1)
+}, Bs = Object.keys(te).filter(
+  (e) => te[e].category === "xdiff"
 );
-function qt() {
-  return vs;
+function xt() {
+  return Bs;
 }
-function At(e) {
-  const t = ye[e.toUpperCase()];
+function $t(e) {
+  const t = te[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-const Ns = /\[(\w[\w.-]*)\]/g, Ct = /* @__PURE__ */ new Set([
+function zs(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",
   "COUNT",
   "DUPCOUNT",
-  "LARGEST",
   "MAX",
   "MEDIAN",
   "MIN",
@@ -1268,39 +1504,33 @@ const Ns = /\[(\w[\w.-]*)\]/g, Ct = /* @__PURE__ */ new Set([
   "QTDAVG",
   "QTDSUM",
   "YTDAVG",
-  "YTDSUM",
+  "YTDSUM"
   // RAVG, RSUM are non-aggregative per Sisense doc (Other Functions, not (A))
-  // Elasticube – Aggregative
-  "CORREL",
-  "COVARP",
-  "COVAR",
-  "SKEWP",
-  "SKEW",
-  "SLOPE"
-]), Rs = new RegExp(
-  `\\b(${Array.from(Ct).join("|")})\\s*\\(`,
+  // CORREL, COVAR*, SKEW*, SLOPE, LARGEST are unsupported in custom formulas (see UNSUPPORTED_FORMULA_FUNCTIONS).
+]), Ks = new RegExp(
+  `\\b(${Array.from(Dt).join("|")})\\s*\\(`,
   "i"
 );
-function Et(e) {
-  return E(e) ? !0 : typeof e == "string" && e.startsWith(q) ? !1 : T(e) && "kind" in e ? e.kind === "measure" : !0;
+function Mt(e) {
+  return q(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function Is(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];
-    Ct.has(n.toUpperCase()) || r.add(n);
+    Dt.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function ks(e) {
+function Ys(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function Bs(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}]`, xt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function $t(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*\\)`,
@@ -1312,7 +1542,7 @@ function $t(e, t) {
     ref2: n[3].trim()
   }));
 }
-function zs(e, t, r) {
+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 {
@@ -1327,110 +1557,180 @@ function zs(e, t, r) {
     result: { isValid: !0, errors: [], warnings: [], references: [], unusedContextKeys: [] }
   };
 }
-function N(e, t) {
+function M(e, t) {
   e.result.errors.push(t), e.result.isValid = !1;
 }
-const Ps = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function Ls(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) => !Ps.has(s[1].toUpperCase())
+    (s) => !Qs.has(s[1].toUpperCase())
   );
-  r && N(
+  r && M(
     e,
     `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`
   );
 }
-function _s(e) {
+function Zs(e, t) {
+  const r = e[t];
+  let s = t + 1;
+  for (; s < e.length; ) {
+    const n = e[s], i = e[s + 1];
+    if (n !== r) {
+      s++;
+      continue;
+    }
+    if (i === r) {
+      s += 2;
+      continue;
+    }
+    return s + 1;
+  }
+  return e.length;
+}
+function en(e) {
+  return De(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);
+  if (i === -1)
+    return n + 1;
+  const o = e.slice(n + 1, i);
+  return s.push({ name: r.toUpperCase(), argCount: en(o) }), s.push(...vt(o)), i + 1;
+}
+function vt(e) {
+  const t = [];
+  let r = 0;
+  for (; r < e.length; ) {
+    const s = e[r];
+    if (s === "'" || s === '"') {
+      r = Zs(e, r);
+      continue;
+    }
+    if (/[A-Za-z_]/.test(s)) {
+      const n = r;
+      for (r++; r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
+        r++;
+      const i = e.slice(n, r);
+      r = tn(e, r, i, t);
+      continue;
+    }
+    r++;
+  }
+  return t;
+}
+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)) {
+      r.has(n) || (r.add(n), M(
+        e,
+        `${e.errorPrefix}args[1]: Function ${n} is not supported in custom formulas`
+      ));
+      continue;
+    }
+    const o = te[n];
+    if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
+      s.add(n);
+      const a = zs(o.minArgs, o.maxArgs);
+      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
+    }
+  }
+}
+function sn(e) {
   return [
     ...new Set(
-      [...e.matchAll(new RegExp(Ns.source, "g"))].map((t) => t[1])
+      [...e.matchAll(new RegExp(js.source, "g"))].map((t) => t[1])
     )
   ];
 }
-function Us(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) => `[${xt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
-  N(
+  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 js(e) {
-  if (Rs.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 && !Et(s);
+    return s !== void 0 && !Mt(s);
   });
-  t.length !== 0 && N(
+  t.length !== 0 && M(
     e,
-    `${e.errorPrefix}args[1]: ${Bs(
-      Is(e.formula)
-    )}Bracket reference(s) ${ks(
+    `${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 Vs(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) => `[${xt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
-  e.errorOnUnusedContext ? N(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
+  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 We(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;
-  if (!(typeof n == "string" && n.startsWith(q))) {
-    Et(n) && N(
+  if (!(typeof n == "string" && n.startsWith(E))) {
+    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. ${q}Table.Column.Level).`
+      `${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).`
     );
     return;
   }
   if (s.schemaIndex)
     try {
-      const a = $e(n, s.schemaIndex);
-      H(a.column.dataType) ? r && a.level && a.level !== r && N(
+      const a = Se(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}'.`
-      ) : N(
+      ) : M(
         s,
         `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`
       );
     } catch (a) {
       const u = a instanceof Error ? a.message : "Unknown error";
-      N(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
+      M(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function Ws(e) {
-  const t = qt(), r = $t(e.formula, t);
+function un(e) {
+  const t = xt(), r = Rt(e.formula, t);
   for (const s of r) {
-    const n = At(s.functionName);
-    We(s.ref1, s, n, e), We(s.ref2, s, n, e);
+    const n = $t(s.functionName);
+    Je(s.ref1, s, n, e), Je(s.ref2, s, n, e);
   }
 }
-function Ks(e, t, r = {}) {
+function cn(e, t, r = {}) {
   var n;
-  const s = zs(e, t, r);
-  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || N(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Ls(s), s.result.references = _s(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 ? (N(
+  ), s.result) : s.contextKeys.length === 0 ? (M(
     s,
     `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`
-  ), s.result) : (Us(s), js(s), Vs(s), Ws(s), s.result));
+  ), s.result) : (nn(s), on(s), an(s), un(s), s.result));
 }
-function Js(e, t, r = {}) {
-  const s = Ks(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 Ys(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?)`
@@ -1441,12 +1741,12 @@ function Ys(e, t) {
       `${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`
     );
   const s = r, n = e[2];
-  if (!T(n))
+  if (!S(n))
     throw new Error(
       `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
     );
   const i = n;
-  Js(s, i, {
+  ln(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1454,130 +1754,130 @@ function Ys(e, t) {
     // Custom formulas must have content
     schemaIndex: t.schemaIndex
   });
-  const o = Gs(s), a = {};
+  const o = dn(s), a = {};
   for (const [u, c] of Object.entries(i)) {
-    const m = `args[2].${u}`;
-    if (E(c))
-      a[`${u}`] = S({
+    const p = `args[2].${u}`;
+    if (q(c))
+      a[`${u}`] = D({
         data: c,
         context: {
           dataSource: t.dataSource,
           schemaIndex: t.schemaIndex,
-          pathPrefix: m
+          pathPrefix: p
         }
       });
-    else if (typeof c == "string" && c.startsWith(q)) {
-      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, f = o[l];
+    else if (typeof c == "string" && c.startsWith(E)) {
+      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = o[l];
       try {
-        a[`${u}`] = G(
+        a[`${u}`] = H(
           c,
           t.dataSource,
           t.schemaIndex,
-          f !== void 0 ? { inferredDateLevel: f } : void 0
+          d !== void 0 ? { inferredDateLevel: d } : void 0
         );
-      } catch (h) {
-        const p = h instanceof Error ? h.message : "Unknown error";
-        throw new Error(`${m}: ${p}`);
+      } catch (b) {
+        const g = b instanceof Error ? b.message : "Unknown error";
+        throw new Error(`${p}: ${g}`);
       }
     } else if (c && typeof c == "object" && "kind" in c)
       a[`${u}`] = c;
     else
       throw new Error(
-        `${m}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${q}...), but got: ${typeof c}`
+        `${p}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E}...), but got: ${typeof c}`
       );
   }
   e[2] = a;
 }
-function Gs(e) {
-  const t = qt(), r = $t(e, t), s = {};
+function dn(e) {
+  const t = xt(), r = Rt(e, t), s = {};
   for (const n of r) {
-    const i = At(n.functionName);
+    const i = $t(n.functionName);
     if (i !== void 0)
       for (const o of [n.ref1, n.ref2]) {
         const a = s[o];
         if (a !== void 0 && a !== i)
           throw new Error(
-            `Reference [${o}] is used in time-diff functions with conflicting date levels ('${a}' 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[o] = i;
       }
   }
   return s;
 }
-function Tt(e) {
-  return e.type === L.TextAttribute;
+function It(e) {
+  return e.type === U.TextAttribute;
 }
-function Dt(e) {
-  return e.type === L.NumericAttribute;
+function Pt(e) {
+  return e.type === U.NumericAttribute;
 }
-function Qs(e) {
-  return e.type === L.DateLevel;
+function mn(e) {
+  return e.type === U.DateLevel;
 }
-function Hs(e) {
-  return Tt(e) || Dt(e);
+function pn(e) {
+  return It(e) || Pt(e);
 }
-function ie(e) {
-  return e.type === L.TextAttribute ? "text" : e.type === L.NumericAttribute ? "numeric" : e.type === L.DateLevel ? "date/datetime" : "unknown";
+function ae(e) {
+  return e.type === U.TextAttribute ? "text" : e.type === U.NumericAttribute ? "numeric" : e.type === U.DateLevel ? "date/datetime" : "unknown";
 }
-function De(e, t) {
+function Me(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 Ke(e, t) {
-  const r = De(e, t);
-  if (!Hs(r))
+function He(e, t) {
+  const r = Me(e, t);
+  if (!pn(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ae(
         r
       )} attribute`
     );
 }
-function I(e, t) {
-  const r = De(e, t);
-  if (!Dt(r))
+function P(e, t) {
+  const r = Me(e, t);
+  if (!Pt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ae(
         r
       )} attribute`
     );
 }
 function k(e, t) {
-  const r = De(e, t);
-  if (!Tt(r))
+  const r = Me(e, t);
+  if (!It(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ae(
         r
       )} attribute`
     );
 }
-function Xs(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 Zs(e, t) {
-  const r = Xs(e, t);
-  if (!be(r))
+function yn(e, t) {
+  const r = gn(e, t);
+  if (!Fe(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
 }
-const en = {
-  "measureFactory.customFormula": Ys,
+const hn = {
+  "measureFactory.customFormula": fn,
   // String | Number filters
-  "filterFactory.equals": Ke,
-  "filterFactory.doesntEqual": Ke,
+  "filterFactory.equals": He,
+  "filterFactory.doesntEqual": He,
   // Numeric filters
-  "filterFactory.greaterThan": I,
-  "filterFactory.greaterThanOrEqual": I,
-  "filterFactory.lessThan": I,
-  "filterFactory.lessThanOrEqual": I,
-  "filterFactory.between": I,
-  "filterFactory.betweenNotEqual": I,
-  "filterFactory.numeric": I,
+  "filterFactory.greaterThan": P,
+  "filterFactory.greaterThanOrEqual": P,
+  "filterFactory.lessThan": P,
+  "filterFactory.lessThanOrEqual": P,
+  "filterFactory.between": P,
+  "filterFactory.betweenNotEqual": P,
+  "filterFactory.numeric": P,
   // String filters
   "filterFactory.contains": k,
   "filterFactory.doesntContain": k,
@@ -1587,12 +1887,12 @@ const en = {
   "filterFactory.doesntEndWith": k,
   "filterFactory.like": k,
   // Exclude filter
-  "filterFactory.exclude": Zs
+  "filterFactory.exclude": yn
 };
-function tn(e) {
-  return en[`${e}`];
+function bn(e) {
+  return hn[`${e}`];
 }
-const St = {
+const kt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -2119,18 +2419,18 @@ const St = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function Se(e) {
-  return St[`${e}`];
+function Ne(e) {
+  return kt[`${e}`];
 }
-function rn(e) {
-  const t = Se(e);
+function An(e) {
+  const t = Ne(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function sn(e) {
-  const t = Se(e);
+function Fn(e) {
+  const t = Ne(e);
   return t ? t.length : 0;
 }
-function nn(e) {
+function wn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2139,31 +2439,31 @@ function nn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function ce(e, t, r, s) {
-  if (e.startsWith(q))
+function de(e, t, r, s) {
+  if (e.startsWith(E))
     try {
-      return G(e, t, r);
+      return H(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
     }
   throw new Error(
-    `${s}: Invalid attribute '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
+    `${s}: Invalid attribute '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
   );
 }
-function on(e, t, r, s) {
-  if (e.startsWith(q))
+function En(e, t, r, s) {
+  if (e.startsWith(E))
     try {
-      return Es(e, t, r);
+      return Os(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
     }
   throw new Error(
-    `${s}: Invalid date dimension string '${e}'. Expected format: '${q}TableName.ColumnName'`
+    `${s}: Invalid date dimension string '${e}'. Expected format: '${E}TableName.ColumnName'`
   );
 }
-function an(e) {
+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)
@@ -2209,7 +2509,7 @@ function an(e) {
           throw new Error(
             `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return ce(t, s, n, o);
+        return de(t, s, n, o);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
@@ -2218,15 +2518,15 @@ function an(e) {
         return t.map((a, u) => {
           if (typeof a != "string")
             throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
-          return ce(a, s, n, `${o}[${u}]`);
+          return de(a, s, n, `${o}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!E(t))
+        if (!q(t))
           throw new Error(
             `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
-        return S({
+        return D({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2236,21 +2536,21 @@ function an(e) {
             `${o}: Expected array of measure function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!E(a))
+          if (!q(a))
             throw new Error(
               `${o}[${u}]: Expected measure function call, got ${typeof a}`
             );
-          return S({
+          return D({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
       case "Filter":
-        if (!E(t))
+        if (!q(t))
           throw new Error(
             `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
           );
-        return S({
+        return D({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2260,11 +2560,11 @@ function an(e) {
             `${o}: Expected array of filter function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!E(a))
+          if (!q(a))
             throw new Error(
               `${o}[${u}]: Expected filter function call, got ${typeof a}`
             );
-          return S({
+          return D({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
@@ -2272,17 +2572,17 @@ function an(e) {
       case "FilterRelationsNode":
         if (Array.isArray(t))
           return t.map((a, u) => {
-            if (!E(a))
+            if (!q(a))
               throw new Error(
                 `${o}[${u}]: Expected filter function call, got ${typeof a}`
               );
-            return S({
+            return D({
               data: a,
               context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
             });
           });
-        if (E(t))
-          return S({
+        if (q(t))
+          return D({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
@@ -2294,21 +2594,21 @@ function an(e) {
           throw new Error(
             `${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
           );
-        return on(t, s, n, o);
+        return En(t, s, n, o);
       case "LevelAttribute": {
         if (typeof t != "string")
           throw new Error(
             `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const a = ce(
+        const a = de(
           t,
           s,
           n,
           o
         );
-        if (!Qs(a))
+        if (!mn(a))
           throw new Error(
-            `${o}: Attribute must be date/datetime type, got ${ie(
+            `${o}: Attribute must be date/datetime type, got ${ae(
               a
             )} attribute`
           );
@@ -2317,8 +2617,8 @@ function an(e) {
       case "Measure | number":
         if (typeof t == "number")
           return t;
-        if (E(t))
-          return S({
+        if (q(t))
+          return D({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
@@ -2327,7 +2627,7 @@ function an(e) {
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (nn(t))
+          if (wn(t))
             return t;
           throw new Error(
             `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
@@ -2354,83 +2654,83 @@ function an(e) {
         return t;
     }
 }
-function S(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = Se(i);
+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);
   if (!u) {
-    const p = Object.keys(St), d = M(i, p, (A) => A), b = d && d.distance <= x ? ` Did you mean '${d.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(
-      `${a}function: Unknown function '${i}'.${b}`
+      `${a}function: Unknown function '${i}'.${A}`
     );
   }
-  const c = rn(i), m = sn(i);
+  const c = An(i), p = Fn(i);
   if (o.length < c)
     throw new Error(
       `${a}function: Expected at least ${c} arguments, got ${o.length}`
     );
-  if (o.length > m)
+  if (o.length > p)
     throw new Error(
-      `${a}function: Expected at most ${m} arguments, got ${o.length}`
+      `${a}function: Expected at most ${p} arguments, got ${o.length}`
     );
-  const l = [], f = [];
-  for (let p = 0; p < Math.max(o.length, u.length); p++) {
-    const d = u[`${p}`], b = o[`${p}`], A = a ? `${a}args[${p}]` : `args[${p}]`;
-    if (b === void 0) {
-      d != null && d.required && f.push(`${A}: Missing required argument (expected ${d.type})`);
+  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;
     }
-    if (!d) {
-      f.push(`${A}: Unexpected argument`);
+    if (!m) {
+      d.push(`${C}: Unexpected argument`);
       continue;
     }
     try {
-      const O = an({
-        data: b,
+      const N = Cn({
+        data: A,
         context: {
           dataSource: r,
           schemaIndex: s,
-          pathPrefix: A,
-          argSchema: d
+          pathPrefix: C,
+          argSchema: m
         }
       });
-      l.push(O);
-    } catch (O) {
-      const oe = O instanceof Error ? O.message : "Unknown error";
-      f.push(oe);
+      l.push(N);
+    } catch (N) {
+      const ue = N instanceof Error ? N.message : "Unknown error";
+      d.push(ue);
     }
   }
-  if (f.length > 0) {
-    const p = f.join("; ");
-    throw new Error(p);
+  if (d.length > 0) {
+    const g = d.join("; ");
+    throw new Error(g);
   }
-  const h = tn(i);
-  if (h)
+  const b = bn(i);
+  if (b)
     try {
-      h(l, {
+      b(l, {
         dataSource: r,
         schemaIndex: s,
         pathPrefix: a
       });
-    } catch (p) {
-      const d = p instanceof Error ? p.message : "Unknown validation error";
-      throw new Error(d);
+    } catch (g) {
+      const m = g instanceof Error ? g.message : "Unknown validation error";
+      throw new Error(m);
     }
-  return Ms(i, l);
+  return Ps(i, l);
 }
-function Ot(e) {
+function Bt(e) {
   const { attribute: t, config: r } = e;
-  if (be(e) && Dr(t)) {
-    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = Sr(r), o = Object.keys(i).length === 0 ? void 0 : i;
-    return Or(t, n, o);
+  if (Fe(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 un(e) {
+function Tn(e) {
   let t = [];
   for (const r of e)
-    X(r) ? t = Le(r, t) : t = Le([Ot(r)], t);
+    Z(r) ? t = Ve(r, t) : t = Ve([Bt(r)], t);
   return t != null ? t : [];
 }
-const cn = (e) => {
+const qn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
@@ -2439,19 +2739,19 @@ const cn = (e) => {
       input: o
     };
     try {
-      const c = S({
+      const c = D({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !X(c) && !ne(c) ? i.push(F(g({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !Z(c) && !oe(c) ? i.push(F(y({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
-      const m = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g({}, u), { message: m }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y({}, u), { message: p }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: un(n) };
-}, Oe = (e) => {
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: Tn(n) };
+}, Re = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ft(t) ? cn({
+  return t ? Ct(t) ? qn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2465,7 +2765,7 @@ const cn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, ln = (e) => {
+}, xn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
@@ -2474,19 +2774,19 @@ const cn = (e) => {
       input: o
     };
     try {
-      const c = S({
+      const c = D({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      ne(c) ? n.push(Ot(c)) : i.push(F(g({}, u), { message: "Invalid filter JSON" }));
+      oe(c) ? n.push(Bt(c)) : i.push(F(y({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
-      const m = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g({}, u), { message: m }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, Me = (e) => {
+}, ve = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ft(t) ? ln({
+  return t ? Ct(t) ? xn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2500,51 +2800,51 @@ const cn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, fn = (e, t) => {
-  if (e && !te(e))
-    return F(g({}, t), {
+}, $n = (e, t) => {
+  if (e && !se(e))
+    return F(y({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
-}, dn = (e, t, r) => {
+}, Sn = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
-    const i = S({
+    const i = D({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return Ee(i) ? { success: !0, data: i } : {
+    return xe(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [F(g({}, r), { message: "Invalid measure JSON" })]
+      errors: [F(y({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
     const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [F(g({}, r), { message: o })]
+      errors: [F(y({}, r), { message: o })]
     };
   }
-}, mn = (e, t, r, s) => {
-  const n = S({
+}, On = (e, t, r, s) => {
+  const n = D({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  if (!Ee(n))
+  if (!xe(n))
     return {
       style: {},
-      error: F(g({}, s), { message: "Invalid measure JSON" })
+      error: F(y({}, s), { message: "Invalid measure JSON" })
     };
-  const i = fn(e.sortType, s);
+  const i = $n(e.sortType, s);
   if (i) {
     const a = _(e, "column");
     return { measure: n, style: a, error: i };
   }
   const o = _(e, "column");
   return { measure: n, style: o };
-}, pn = (e, t, r, s) => {
-  if (As(e))
-    return mn(e, t, r, s);
-  if (E(e)) {
-    const n = dn(
+}, Dn = (e, t, r, s) => {
+  if ($s(e))
+    return On(e, t, r, s);
+  if (q(e)) {
+    const n = Sn(
       e,
       { dataSource: t, schemaIndex: r },
       s
@@ -2552,11 +2852,11 @@ const cn = (e) => {
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: F(g({}, s), {
+    error: F(y({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, Mt = (e) => {
+}, zt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -2580,7 +2880,7 @@ const cn = (e) => {
       input: o
     };
     try {
-      const c = pn(o, r, s, u);
+      const c = Dn(o, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -2589,8 +2889,8 @@ const cn = (e) => {
         c.style !== void 0 ? { measure: c.measure, style: c.style } : { measure: c.measure }
       );
     } catch (c) {
-      const m = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g({}, u), { message: m }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y({}, u), { message: p }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
@@ -2607,55 +2907,55 @@ function w(e, t, r) {
   }
   return s.data;
 }
-const ve = "$trend", Ne = "$forecast";
-function yn(e) {
+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 te(n) ? t.sort(re(n)) : t;
+    return se(n) ? t.sort(ne(n)) : t;
   });
 }
-function gn(e) {
+function Nn(e) {
   var t, r;
   return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1;
 }
-function hn(e) {
+function Rn(e) {
   var t, r;
   return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1;
 }
-function bn(e) {
+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 && te(o) ? n.sort(re(o)) : n;
-    t.push(a), i != null && i.trend && !gn(n) && t.push(
-      Mr(n, `${ve}_${(r = n.name) != null ? r : "Measure"}`, i.trend)
-    ), i != null && i.forecast && !hn(n) && t.push(
-      vr(
+    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,
-        `${Ne}_${(s = n.name) != null ? s : "Measure"}`,
+        `${Pe}_${(s = n.name) != null ? s : "Measure"}`,
         i.forecast
       )
     );
   }
   return t;
 }
-const Jn = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = xe(s), i = [], o = w(
-    () => wt({
+const ii = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = $e(s), i = [], o = w(
+    () => qt({
       data: t.dimensions || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   ), a = w(
-    () => Mt({
+    () => zt({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   ), u = w(
-    () => Oe({
+    () => Re({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2663,7 +2963,7 @@ const Jn = (e) => {
   );
   let c = null;
   return t.highlights && (c = w(
-    () => Me({
+    () => ve({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2673,22 +2973,22 @@ const Jn = (e) => {
     errors: i
   } : {
     success: !0,
-    data: g({
-      dataSource: Fe(r),
-      dimensions: o ? yn(o) : [],
-      measures: a ? bn(a) : [],
+    data: y({
+      dataSource: we(r),
+      dimensions: o ? Mn(o) : [],
+      measures: a ? vn(a) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Je(e) {
+function Qe(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Re(e) {
+function ke(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var l, f, h;
-    const i = Je(s) ? s.column : s, o = Je(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    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;
     if (!i.composeCode) {
       r.push({
         category: "dimensions",
@@ -2698,145 +2998,31 @@ function Re(e) {
       });
       return;
     }
-    if (!i.composeCode.startsWith(q)) {
+    if (!i.composeCode.startsWith(E)) {
       r.push({
         category: "dimensions",
         index: n,
         input: a(),
-        message: `Expected composeCode to start with '${q}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
+        message: `Expected composeCode to start with '${E}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (h = o != null && o.sortType ? re(o.sortType) : void 0) != null ? h : ((l = i.getSort) == null ? void 0 : l.call(i)) !== void 0 && ((f = i.getSort) == null ? void 0 : f.call(i)) !== B.None ? i.getSort() : void 0, c = o ? _(o, "column") : {};
+    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") : {};
     if (u !== void 0 && u !== B.None || o && Object.keys(c).length > 0) {
-      const p = g(g({
+      const g = y(y({
         column: i.composeCode
-      }, u !== void 0 && u !== B.None && { sortType: tt(u) }), c);
-      t.push(p);
+      }, u !== void 0 && u !== B.None && { sortType: it(u) }), c);
+      t.push(g);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function vt(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 Fn(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 wn(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 = Nt(n);
-  return {
-    function: s,
-    args: i
-  };
-}
-function Nt(e) {
-  return e.trim() ? vt(e, ",").map(Rt) : [];
-}
-function Rt(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 = Nt(r);
-    return s.every((n) => typeof n == "string"), s;
-  }
-  if (e.startsWith("{") && e.endsWith("}")) {
-    const r = e.slice(1, -1).trim();
-    return r ? An(r) : {};
-  }
-  return e.includes("(") && e.includes(")") ? V(e) : (e.startsWith("DM."), e);
-}
-function qn(e) {
-  const t = Fn(e, ":");
-  if (t === -1)
-    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = wn(e.slice(0, t).trim()), s = Rt(e.slice(t + 1).trim());
-  return [r, s];
-}
-function An(e) {
-  if (!e.trim()) return {};
-  const t = vt(e, ",").map(qn).filter(([, r]) => r !== null);
-  return Object.fromEntries(t);
-}
-const ge = "Unknown error";
-function Ie(e) {
+const be = "Unknown error";
+function Be(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
-  if (Nr(e)) {
+  if (Br(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -2850,9 +3036,9 @@ function Ie(e) {
         ]
       };
     try {
-      return { success: !0, data: [V(e.composeCode)] };
+      return { success: !0, data: [W(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : ge;
+      const n = s instanceof Error ? s.message : be;
       return {
         success: !1,
         errors: [
@@ -2879,10 +3065,10 @@ function Ie(e) {
       return;
     }
     try {
-      const o = V(s.composeCode);
+      const o = W(s.composeCode);
       r.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : ge;
+      const a = o instanceof Error ? o.message : be;
       t.push({
         category: "filters",
         index: n,
@@ -2892,7 +3078,7 @@ function Ie(e) {
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function ke(e) {
+function ze(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -2908,10 +3094,10 @@ function ke(e) {
       return;
     }
     try {
-      const o = V(s.composeCode);
+      const o = W(s.composeCode);
       t.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : ge;
+      const a = o instanceof Error ? o.message : be;
       r.push({
         category: "highlights",
         index: n,
@@ -2921,14 +3107,14 @@ function ke(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Ye(e) {
+function Xe(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Be(e) {
+function Le(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var u, c, m;
-    const i = Ye(s) ? s.column : s, o = Ye(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    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;
     if (!i.composeCode) {
       r.push({
         category: "measures",
@@ -2939,89 +3125,89 @@ function Be(e) {
       return;
     }
     try {
-      const l = V(i.composeCode), f = (m = o != null && o.sortType ? re(o.sortType) : void 0) != null ? m : ((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 (f !== void 0 && f !== B.None || o && Object.keys(_(o, "column")).length > 0) {
-        const p = o ? _(o, "column") : {}, d = g(g({
+      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;
+      if (d !== void 0 && d !== B.None || o && Object.keys(_(o, "column")).length > 0) {
+        const g = o ? _(o, "column") : {}, m = y(y({
           column: l
-        }, f !== void 0 && f !== B.None && { sortType: tt(f) }), p);
-        t.push(d);
+        }, d !== void 0 && d !== B.None && { sortType: it(d) }), g);
+        t.push(m);
       } else
         t.push(l);
     } catch (l) {
-      const f = l instanceof Error ? l.message : "Unknown error";
+      const d = l instanceof Error ? l.message : "Unknown error";
       r.push({
         category: "measures",
         index: n,
         input: a(),
-        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${f}. ComposeCode: '${i.composeCode}'`
+        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 Ge(e) {
+function Ze(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(ve)) != 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(Ie)) != null ? n : !1);
 }
-function Qe(e) {
+function et(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(Ne)) != 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(Pe)) != null ? n : !1);
 }
-function He(e) {
+function tt(e) {
   try {
-    const t = V(e.trim());
+    const t = W(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
   } catch (t) {
     return;
   }
 }
-function Cn(e) {
+function In(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 (Ge(a) || Qe(a)) {
+    if (Ze(a) || et(a)) {
       r.push(a);
       continue;
     }
-    const u = (s = a.name) != null ? s : "Measure", c = `${ve}_${u}`, m = `${Ne}_${u}`;
-    let l, f, h = o + 1;
-    if (h < e.length && !t.has(h) && Ge(e[h]) && e[h].name === c) {
-      const p = (n = e[h].composeCode) == null ? void 0 : n.trim();
-      p && (l = He(p), t.add(h), h++);
+    const u = (s = a.name) != null ? s : "Measure", c = `${Ie}_${u}`, p = `${Pe}_${u}`;
+    let l, d, b = o + 1;
+    if (b < e.length && !t.has(b) && Ze(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++);
     }
-    if (h < e.length && !t.has(h) && Qe(e[h]) && e[h].name === m) {
-      const p = (i = e[h].composeCode) == null ? void 0 : i.trim();
-      p && (f = He(p), t.add(h));
+    if (b < e.length && !t.has(b) && et(e[b]) && e[b].name === p) {
+      const g = (i = e[b].composeCode) == null ? void 0 : i.trim();
+      g && (d = tt(g), t.add(b));
     }
-    l !== void 0 || f !== void 0 ? r.push(g(g({
+    l !== void 0 || d !== void 0 ? r.push(y(y({
       column: a
-    }, l && Object.keys(l).length > 0 && { trend: l }), f && Object.keys(f).length > 0 && { forecast: f })) : r.push(a);
+    }, l && Object.keys(l).length > 0 && { trend: l }), d && Object.keys(d).length > 0 && { forecast: d })) : r.push(a);
   }
   return r;
 }
-function Yn(e) {
+function oi(e) {
   const t = [], r = w(
-    () => Re(e.dimensions || []),
+    () => ke(e.dimensions || []),
     t
-  ), s = Cn(e.measures || []), n = w(
-    () => Be(s),
+  ), s = In(e.measures || []), n = w(
+    () => Le(s),
     t
   ), i = w(
-    () => Ie(e.filters),
+    () => Be(e.filters),
     t
   );
   let o = null;
   if (e.highlights && e.highlights.length > 0 && (o = w(
-    () => ke(e.highlights),
+    () => ze(e.highlights),
     t
   )), t.length > 0)
     return {
       success: !1,
       errors: t
     };
-  const a = g({
+  const a = y({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
@@ -3032,9 +3218,9 @@ function Yn(e) {
     data: Q(a)
   };
 }
-const It = new Set(
-  Rr.filter((e) => e !== "image")
-), Xe = Object.freeze([...It]), le = /* @__PURE__ */ new Set([
+const Lt = new Set(
+  zr.filter((e) => e !== "image")
+), rt = Object.freeze([...Lt]), me = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3057,7 +3243,7 @@ const It = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), En = {
+]), Pn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3130,7 +3316,7 @@ const It = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, xn = /* @__PURE__ */ new Set([
+}, kn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3138,7 +3324,7 @@ const It = new Set(
   "geo",
   "details",
   "date"
-]), $n = /* @__PURE__ */ new Set([
+]), Bn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3150,34 +3336,34 @@ const It = new Set(
   "max",
   "color"
 ]);
-function Tn(e) {
-  const t = En[e];
+function zn(e) {
+  const t = Pn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
       requiredAxes: Object.freeze([...t.requiredAxes])
     };
 }
-function kt(e) {
-  return typeof e == "string" && It.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" || xn.has(e))
+function Ln(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || kn.has(e))
     return !0;
-  if ($n.has(e))
+  if (Bn.has(e))
     return !1;
   const s = Array.isArray(t) ? t[0] : t;
   if (!s)
     return !0;
   let n;
-  return T(s) && "column" in s && (n = s.column), !(E(s) || n !== void 0 && E(n));
+  return S(s) && "column" in s && (n = s.column), !(q(s) || n !== void 0 && q(n));
 }
-function Sn(e) {
+function Un(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
   };
-  if (!T(e))
+  if (!S(e))
     return t.push({
       category: "chartType",
       index: -1,
@@ -3186,17 +3372,17 @@ function Sn(e) {
     }), { normalized: r, errors: t };
   const s = e.chartType;
   if (s === void 0) {
-    const i = Object.keys(e), o = M("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;
+    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.${a}`
     });
-  } else if (kt(s))
+  } else if (Ut(s))
     r.chartType = s;
   else {
-    const i = M(String(s), Xe, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = Xe.slice(0, 8).join(", ");
+    const i = R(String(s), rt, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = rt.slice(0, 8).join(", ");
     t.push({
       category: "chartType",
       index: -1,
@@ -3206,7 +3392,7 @@ function Sn(e) {
   }
   const n = e.dataOptions;
   if (n === void 0) {
-    const i = Object.keys(e), o = M("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;
+    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,
@@ -3216,86 +3402,86 @@ function Sn(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 On(e) {
+function _n(e) {
   return e.map(
-    ({ attribute: t, style: r }) => r ? g({ column: t }, r) : t
+    ({ attribute: t, style: r }) => r ? y({ column: t }, r) : t
   );
 }
-function Mn(e) {
+function Vn(e) {
   return e.map(
-    ({ measure: t, style: r }) => r ? g({ column: t }, r) : t
+    ({ measure: t, style: r }) => r ? y({ column: t }, r) : t
   );
 }
-function Bt(e) {
+function _t(e) {
   return Array.isArray(e) ? e : [e];
 }
-function he(e) {
-  return (t) => F(g({}, t), {
+function Ae(e) {
+  return (t) => F(y({}, t), {
     category: "dataOptions",
     index: e
   });
 }
-function ee(e, t, r, s, n) {
-  const i = t ? Bt(
+function re(e, t, r, s, n) {
+  const i = t ? _t(
     t
   ) : [];
   if (i.length === 0)
     return [];
   if (r === "dimension") {
     const a = w(
-      () => wt({
+      () => qt({
         data: i,
         context: s
       }),
       n,
-      he(e)
+      Ae(e)
     );
-    return a !== null ? On(a) : null;
+    return a !== null ? _n(a) : null;
   }
   const o = w(
-    () => Mt({
+    () => zt({
       data: i,
       context: s
     }),
     n,
-    he(e)
+    Ae(e)
   );
-  return o !== null ? Mn(o) : null;
+  return o !== null ? Vn(o) : null;
 }
-function Ze(e, t, r) {
+function st(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = Re(
+    const i = ke(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((o) => F(g({}, o), {
+      errors: i.errors.map((o) => F(y({}, o), {
         category: "dataOptions",
         index: e
       }))
     };
   }
-  const n = Be(s);
+  const n = Le(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => F(g({}, i), {
+    errors: n.errors.map((i) => F(y({}, i), {
       category: "dataOptions",
       index: e
     }))
   };
 }
-function vn(e, t) {
+function Wn(e, t) {
   let r;
-  T(e) && "column" in e && (r = e.column);
-  const n = !(E(e) || r !== void 0 && E(r)) ? "dimension" : "measure", i = [], o = ee("columns", [e], n, t, i);
+  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);
   return o !== null ? { success: !0, data: o } : { success: !1, errors: i };
 }
-function Nn(e, t, r, s) {
+function jn(e, t, r, s) {
   const n = [];
   for (const i of e) {
     const o = w(
-      () => vn(i, t),
+      () => Wn(i, t),
       r,
       s
     );
@@ -3303,8 +3489,8 @@ function Nn(e, t, r, s) {
   }
   return n;
 }
-function Rn(e, t, r) {
-  if (!e || !T(e))
+function Kn(e, t, r) {
+  if (!e || !S(e))
     return r.push({
       category: "dataOptions",
       index: -1,
@@ -3313,25 +3499,25 @@ function Rn(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 (!le.has(l)) {
-      const f = M(l, [...le], (p) => p), h = f && f.distance <= x ? ` Did you mean '${f.best}'?` : "";
-      f && f.distance <= x && u.set(l, f.best), r.push({
+    if (!me.has(l)) {
+      const d = R(l, [...me], (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,
         input: o[l],
-        message: `Unknown dataOptions key '${l}'.${h}`
+        message: `Unknown dataOptions key '${l}'.${b}`
       });
     }
-  const c = n ? Tn(n) : void 0;
+  const c = n ? zn(n) : void 0;
   if (c) {
     for (const l of a)
-      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && le.has(l)) {
-        const f = M(l, [...c.validAxes], (d) => d), h = f && f.distance <= x ? ` Did you mean '${f.best}'?` : "", p = [...c.validAxes].join(", ");
+      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && me.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: l,
           input: o[l],
-          message: `Axis '${l}' is not valid for chart type '${n}'. Valid axes: ${p}.${h}`
+          message: `Axis '${l}' is not valid for chart type '${n}'. Valid axes: ${g}.${b}`
         });
       }
     for (const l of c.requiredAxes)
@@ -3344,7 +3530,7 @@ function Rn(e, t, r) {
         )}'. Missing: ${l}.`
       });
     n === "indicator" && (["value", "secondary", "min", "max"].some(
-      (h) => h in o && o[h] != null
+      (b) => b in o && o[b] != null
     ) || r.push({
       category: "dataOptions",
       index: -1,
@@ -3359,77 +3545,77 @@ function Rn(e, t, r) {
   }
   if (r.length > i)
     return null;
-  const m = Object.entries(e);
-  for (const [l, f] of m) {
-    if (!f) continue;
+  const p = Object.entries(e);
+  for (const [l, d] of p) {
+    if (!d) continue;
     if (l === "seriesToColorMap") {
-      s[l] = f;
+      s[l] = d;
       continue;
     }
     if (l === "columns") {
-      s[l] = Nn(
-        Bt(f),
+      s[l] = jn(
+        _t(d),
         t,
         r,
-        he("columns")
+        Ae("columns")
       );
       continue;
     }
-    const h = Dn(l, f, n) ? "dimension" : "measure", p = ee(
+    const b = Ln(l, d, n) ? "dimension" : "measure", g = re(
       l,
-      f,
-      h,
+      d,
+      b,
       t,
       r
     );
-    if (p !== null) {
-      const d = n === "calendar-heatmap" && l === "value";
-      s[l] = d || !Array.isArray(f) ? p[0] : p;
+    if (g !== null) {
+      const m = n === "calendar-heatmap" && l === "value";
+      s[l] = m || !Array.isArray(d) ? g[0] : g;
     }
   }
   return r.length > i ? null : s;
 }
-function In(e) {
+function Gn(e) {
   if (typeof e != "string") return "iqr";
   const t = e.split("/")[1];
   return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
 }
-const Gn = (e) => {
-  var d;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Sn(t);
+const ai = (e) => {
+  var m;
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Un(t);
   if (o.length > 0)
     return { success: !1, errors: o };
-  const a = i.chartType, u = xe(n), c = [];
-  let m = Rn(
+  const a = i.chartType, u = $e(n), c = [];
+  let p = Kn(
     i.dataOptions,
     { dataSource: s, schemaIndex: u, chartType: a },
     c
   );
-  if (a === "boxplot" && m) {
-    const b = In((d = i.styleOptions) == null ? void 0 : d.subtype), A = b === "iqr" || b === "standardDeviation";
-    m = F(g({}, m), { boxType: b, outliersEnabled: A });
+  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 });
   }
   let l = null;
   i.filters && i.filters.length > 0 && (l = w(
-    () => Oe({
+    () => Re({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
   ));
-  let f = null;
-  if (i.highlights && i.highlights.length > 0 && (f = w(
-    () => Me({
+  let d = null;
+  if (i.highlights && i.highlights.length > 0 && (d = w(
+    () => ve({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
-  )), c.length > 0 || m === null)
+  )), c.length > 0 || p === null)
     return {
       success: !1,
       errors: c
     };
-  if (!kt(i.chartType))
+  if (!Ut(i.chartType))
     return {
       success: !1,
       errors: [
@@ -3441,19 +3627,19 @@ const Gn = (e) => {
         }
       ]
     };
-  const h = i.chartType;
+  const b = i.chartType;
   return {
     success: !0,
-    data: g(g(g({
-      dataSet: Fe(s),
-      chartType: h,
-      dataOptions: m
+    data: y(y(y({
+      dataSet: we(s),
+      chartType: b,
+      dataOptions: p
     }, i.styleOptions && {
       // Pass-through NLQ JSON; shape matches ChartStyleOptions.
       styleOptions: i.styleOptions
-    }), l && { filters: l }), f && { highlights: f })
+    }), l && { filters: l }), d && { highlights: d })
   };
-}, Qn = (e) => {
+}, ui = (e) => {
   const t = [];
   if (!e.chartType)
     return {
@@ -3480,12 +3666,12 @@ const Gn = (e) => {
       ]
     };
   let r = null;
-  const s = kn(e.dataOptions);
+  const s = Yn(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
     const u = w(
-      () => Ie(e.filters),
+      () => Be(e.filters),
       t
     );
     n = u != null ? u : void 0;
@@ -3493,14 +3679,14 @@ const Gn = (e) => {
   let i;
   if (e.highlights && e.highlights.length > 0) {
     const u = w(
-      () => ke(e.highlights),
+      () => ze(e.highlights),
       t
     );
     i = u != null ? u : void 0;
   }
   if (t.length > 0 || r === null)
     return { success: !1, errors: t };
-  const o = g(g(g({
+  const o = y(y(y({
     chartType: e.chartType,
     dataOptions: r
   }, e.styleOptions && {
@@ -3513,7 +3699,7 @@ const Gn = (e) => {
     )
   };
 };
-function kn(e) {
+function Yn(e) {
   const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
   for (const [n, i] of Object.entries(e)) {
     if (n === "seriesToColorMap" && i) {
@@ -3525,13 +3711,13 @@ function kn(e) {
       continue;
     }
     const o = Array.isArray(i) ? i : [i], a = Array.isArray(i), u = [], c = [];
-    for (let m = 0; m < o.length; m++) {
-      const l = o[m], h = Bn(l) ? Re([
+    for (let p = 0; p < o.length; p++) {
+      const l = o[p], b = Jn(l) ? ke([
         l
-      ]) : Be([l]);
-      h.success ? u.push(...h.data) : h.errors.forEach((p) => {
-        var d;
-        c.push(F(g({}, p), { index: m, input: (d = p.input) != null ? d : l }));
+      ]) : Le([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 }));
       });
     }
     if (c.length > 0) {
@@ -3542,11 +3728,11 @@ function kn(e) {
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Bn(e) {
+function Jn(e) {
   const t = Array.isArray(e) ? e[0] : e;
-  if (!t || !T(t))
+  if (!t || !S(t))
     return !0;
-  const r = "column" in t && t.column != null && T(t.column) ? t.column : t;
+  const r = "column" in t && t.column != null && S(t.column) ? t.column : t;
   if ("composeCode" in r) {
     const s = r.composeCode;
     if (typeof s == "string" && s.startsWith("DM."))
@@ -3561,17 +3747,17 @@ function Bn(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const et = ["rows", "columns", "values", "grandTotals"];
-function zn(e) {
-  if (!T(e)) return !1;
+const nt = ["rows", "columns", "values", "grandTotals"];
+function Hn(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 Pn(e) {
+function Qn(e) {
   const t = [], r = {
     dataOptions: {}
   };
-  if (!T(e))
+  if (!S(e))
     return t.push({
       category: "dataOptions",
       index: -1,
@@ -3580,19 +3766,19 @@ function Pn(e) {
     }), { normalized: r, errors: t };
   const s = e.dataOptions;
   if (s === void 0) {
-    const n = Object.keys(e), i = M("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;
+    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: a,
       message: `dataOptions is required.${o}`
     });
-  } else if (T(s)) {
+  } else if (S(s)) {
     const n = s;
     r.dataOptions = n;
     for (const o of Object.keys(n))
-      if (!et.includes(o)) {
-        const a = M(o, [...et], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
+      if (!nt.includes(o)) {
+        const a = R(o, [...nt], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
         t.push({
           category: "dataOptions",
           index: o,
@@ -3610,7 +3796,7 @@ function Pn(e) {
       });
     }
     const i = n.grandTotals;
-    i != null && !zn(i) && t.push({
+    i != null && !Hn(i) && t.push({
       category: "dataOptions",
       index: "grandTotals",
       input: i,
@@ -3619,7 +3805,7 @@ function Pn(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 Ln(e, t, r) {
+function Xn(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
       category: "dataOptions",
@@ -3629,7 +3815,7 @@ function Ln(e, t, r) {
     }), null;
   const s = {}, n = r.length;
   for (const o of ["rows", "columns"]) {
-    const a = ee(
+    const a = re(
       o,
       e[o],
       "dimension",
@@ -3638,7 +3824,7 @@ function Ln(e, t, r) {
     );
     a && (s[o] = a);
   }
-  const i = ee(
+  const i = re(
     "values",
     e.values,
     "measure",
@@ -3647,18 +3833,18 @@ function Ln(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const Hn = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Pn(t);
+const ci = (e) => {
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Qn(t);
   if (o.length > 0)
     return { success: !1, errors: o };
-  const a = xe(n), u = [], c = Ln(
+  const a = $e(n), u = [], c = Xn(
     i.dataOptions,
     { dataSource: s, schemaIndex: a },
     u
   );
-  let m = null;
-  i.filters && i.filters.length > 0 && (m = w(
-    () => Oe({
+  let p = null;
+  i.filters && i.filters.length > 0 && (p = w(
+    () => Re({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: a }
     }),
@@ -3666,7 +3852,7 @@ const Hn = (e) => {
   ));
   let l = null;
   return i.highlights && i.highlights.length > 0 && (l = w(
-    () => Me({
+    () => ve({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: a }
     }),
@@ -3676,12 +3862,12 @@ const Hn = (e) => {
     errors: u
   } : {
     success: !0,
-    data: g(g(g({
-      dataSet: Fe(s),
+    data: y(y(y({
+      dataSet: we(s),
       dataOptions: c
-    }, i.styleOptions && { styleOptions: i.styleOptions }), m && { filters: m }), l && { highlights: l })
+    }, i.styleOptions && { styleOptions: i.styleOptions }), p && { filters: p }), l && { highlights: l })
   };
-}, Xn = (e) => {
+}, li = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
@@ -3697,22 +3883,22 @@ const Hn = (e) => {
     };
   const r = e.dataOptions, s = {};
   for (const c of ["rows", "columns"]) {
-    const m = r[c];
-    if (m && m.length > 0) {
-      const l = Ze(c, m, "dimension");
+    const p = r[c];
+    if (p && p.length > 0) {
+      const l = st(c, p, "dimension");
       l.success ? s[c] = l.data : t.push(...l.errors);
     }
   }
   const n = r.values;
   if (n && n.length > 0) {
-    const c = Ze("values", n, "measure");
+    const c = st("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(
-      () => Ie(e.filters),
+      () => Be(e.filters),
       t
     );
     i = c != null ? c : void 0;
@@ -3720,14 +3906,14 @@ const Hn = (e) => {
   let o;
   if (e.highlights && e.highlights.length > 0) {
     const c = w(
-      () => ke(e.highlights),
+      () => ze(e.highlights),
       t
     );
     o = c != null ? c : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const a = g(g(g({
+  const a = y(y(y({
     dataOptions: s
   }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), o && o.length > 0 && { highlights: o });
   return {
@@ -3737,8 +3923,8 @@ const Hn = (e) => {
     )
   };
 };
-function _n(e) {
-  const { filters: t, relations: r } = Br(
+function Zn(e) {
+  const { filters: t, relations: r } = _r(
     e.filters || []
   );
   return {
@@ -3751,23 +3937,23 @@ function _n(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function Zn(e, t, r = !1) {
-  const s = _n(e), n = Ir(s, t);
-  return kr(n, r);
+function fi(e, t, r = !1) {
+  const s = Zn(e), n = Lr(s, t);
+  return Ur(n, r);
 }
 export {
-  Kn as CustomSuperJSON,
-  ri as EMPTY_EXPANDED_QUERY_MODEL,
-  si as EMPTY_SIMPLE_QUERY_MODEL,
-  ni as isByIdDashboardCodeParams,
-  ii as isByIdWidgetCodeParams,
-  oi as isClientSideDashboardCodeParams,
-  ai as isClientSideWidgetCodeParams,
-  Gn as translateChartFromJSON,
-  Qn as translateChartToJSON,
-  Hn as translatePivotTableFromJSON,
-  Xn as translatePivotTableToJSON,
-  Jn as translateQueryFromJSON,
-  Yn as translateQueryToJSON,
-  Zn as translateQueryToJaql
+  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
 };