@sisense/mcp-server 0.2.8 → 0.2.9

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

@@ -65,9 +65,9 @@ import {
   ye,
   zd,
   zi
-} from "./sse-server-xfrv5734.js";
+} from "./sse-server-r50cemee.js";
 
-// node_modules/@sisense/sdk-ui/dist/dimensions-C0BmtTH2.js
+// node_modules/@sisense/sdk-ui/dist/dimensions-C1R5YRt-.js
 class y extends vn {
   constructor(t, e, r, o, d, m2, l, c, a, g2) {
     if (super(t, d || E.Dimension, m2, c, a), this.__serializable = "DimensionalDimension", this._dimensions = [], this._attributes = [], this._sort = C.None, !a && e) {
@@ -216,23 +216,23 @@ function q(i) {
 }
 
 // node_modules/@sisense/sdk-ui/dist/analytics-composer/node.js
-var zt = Object.defineProperty;
-var Pt = Object.defineProperties;
-var Lt = Object.getOwnPropertyDescriptors;
-var ze = Object.getOwnPropertySymbols;
-var _t = Object.prototype.hasOwnProperty;
-var Ut = Object.prototype.propertyIsEnumerable;
-var Pe = (e, t, r) => (t in e) ? zt(e, t, { enumerable: true, configurable: true, writable: true, value: r }) : e[t] = r;
-var g2 = (e, t) => {
+var Vt = Object.defineProperty;
+var Wt = Object.defineProperties;
+var jt = Object.getOwnPropertyDescriptors;
+var Ue = Object.getOwnPropertySymbols;
+var Kt = Object.prototype.hasOwnProperty;
+var Gt = Object.prototype.propertyIsEnumerable;
+var _e = (e, t, r) => (t in e) ? Vt(e, t, { enumerable: true, configurable: true, writable: true, value: r }) : e[t] = r;
+var y2 = (e, t) => {
   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;
 };
-var F = (e, t) => Pt(e, Lt(t));
-function jr(e, t) {
+var F = (e, t) => Wt(e, jt(t));
+function Yr(e, t) {
   const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, o) => Array.from({ length: s + 1 }, (a, u) => o === 0 ? u : u === 0 ? o : 0));
   for (let i = 1;i <= r; i++)
     for (let o = 1;o <= s; o++)
@@ -240,7 +240,7 @@ function jr(e, t) {
   return n[r][s];
 }
 
-class Vr {
+class Jr {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map, this.valueToKey = /* @__PURE__ */ new Map;
   }
@@ -258,9 +258,9 @@ class Vr {
   }
 }
 
-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));
@@ -276,7 +276,7 @@ class rt {
   }
 }
 
-class Wr extends rt {
+class Hr extends ot {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map;
   }
@@ -287,7 +287,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 = [];
@@ -295,8 +295,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;
@@ -306,13 +306,13 @@ 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))
@@ -320,7 +320,7 @@ function _e(e, t) {
   }
 }
 
-class Yr {
+class Zr {
   constructor() {
     this.transfomers = {};
   }
@@ -328,36 +328,36 @@ 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];
   }
 }
-var Gr = (e) => Object.prototype.toString.call(e).slice(8, -1);
-var st = (e) => typeof e == "undefined";
-var Qr = (e) => e === null;
-var K = (e) => typeof e != "object" || e === null || e === Object.prototype ? false : Object.getPrototypeOf(e) === null ? true : Object.getPrototypeOf(e) === Object.prototype;
-var fe = (e) => K(e) && Object.keys(e).length === 0;
-var R = (e) => Array.isArray(e);
-var Hr = (e) => typeof e == "string";
-var Xr = (e) => typeof e == "number" && !isNaN(e);
-var Zr = (e) => typeof e == "boolean";
-var es = (e) => e instanceof RegExp;
-var J2 = (e) => e instanceof Map;
-var Y = (e) => e instanceof Set;
-var nt = (e) => Gr(e) === "Symbol";
-var ts = (e) => e instanceof Date && !isNaN(e.valueOf());
-var rs = (e) => e instanceof Error;
-var Ue = (e) => typeof e == "number" && isNaN(e);
-var ss = (e) => Zr(e) || Qr(e) || st(e) || Xr(e) || Hr(e) || nt(e);
-var ns = (e) => typeof e == "bigint";
-var is = (e) => e === 1 / 0 || e === -1 / 0;
-var os = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
-var as = (e) => e instanceof URL;
-var it = (e) => e.replace(/\./g, "\\.");
-var ae = (e) => e.map(String).map(it).join(".");
-var W = (e) => {
+var es = (e) => Object.prototype.toString.call(e).slice(8, -1);
+var at = (e) => typeof e == "undefined";
+var ts = (e) => e === null;
+var G = (e) => typeof e != "object" || e === null || e === Object.prototype ? false : Object.getPrototypeOf(e) === null ? true : Object.getPrototypeOf(e) === Object.prototype;
+var pe = (e) => G(e) && Object.keys(e).length === 0;
+var I = (e) => Array.isArray(e);
+var rs = (e) => typeof e == "string";
+var ss = (e) => typeof e == "number" && !isNaN(e);
+var ns = (e) => typeof e == "boolean";
+var is = (e) => e instanceof RegExp;
+var Y = (e) => e instanceof Map;
+var J2 = (e) => e instanceof Set;
+var ut = (e) => es(e) === "Symbol";
+var os = (e) => e instanceof Date && !isNaN(e.valueOf());
+var as = (e) => e instanceof Error;
+var je = (e) => typeof e == "number" && isNaN(e);
+var us = (e) => ns(e) || ts(e) || at(e) || ss(e) || rs(e) || ut(e);
+var cs = (e) => typeof e == "bigint";
+var ls = (e) => e === 1 / 0 || e === -1 / 0;
+var fs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
+var ds = (e) => e instanceof URL;
+var ct = (e) => e.replace(/\./g, "\\.");
+var ce = (e) => e.map(String).map(ct).join(".");
+var K = (e) => {
   const t = [];
   let r = "";
   for (let n = 0;n < e.length; n++) {
@@ -383,11 +383,11 @@ function v(e, t, r, s) {
     untransform: s
   };
 }
-var ot = [
-  v(st, "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) => {
+var lt = [
+  v(at, "undefined", () => null, () => {}),
+  v(cs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  v(os, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  v(as, "Error", (e, t) => {
     const r = {
       name: e.name,
       message: e.message
@@ -401,17 +401,17 @@ var 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, "set", (e) => [...e.values()], (e) => new Set(e)),
-  v(J2, "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(J2, "set", (e) => [...e.values()], (e) => new Set(e)),
+  v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  v((e) => je(e) || ls(e), "number", (e) => je(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
   v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  v(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,
@@ -419,13 +419,13 @@ function se(e, t, r, s) {
     untransform: s
   };
 }
-var at = se((e, t) => nt(e) ? !!t.symbolRegistry.getIdentifier(e) : false, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+var ft = ie((e, t) => ut(e) ? !!t.symbolRegistry.getIdentifier(e) : false, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
   const s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
 });
-var us = [
+var ms = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -436,19 +436,19 @@ var us = [
   Float64Array,
   Uint8ClampedArray
 ].reduce((e, t) => (e[t.name] = t, e), {});
-var ut = se(os, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = us[t[1]];
+var 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) : false;
 }
-var lt = se(ct, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+var pt = ie(mt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
-    return g2({}, e);
+    return y2({}, e);
   const s = {};
   return r.forEach((n) => {
     s[n] = e[n];
@@ -459,53 +459,53 @@ var lt = se(ct, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)
     throw new Error(`Trying to deserialize unknown class '${t[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
   return Object.assign(Object.create(s.prototype), e);
 });
-var 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) => {
+var gt2 = ie((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
   const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
 });
-var cs = [lt, at, ft, ut];
-var je = (e, t) => {
-  const r = _e(cs, (n) => n.isApplicable(e, t));
+var ps = [pt, ft, gt2, dt];
+var Ke2 = (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
     };
 };
-var dt = {};
-ot.forEach((e) => {
-  dt[e.annotation] = e;
+var yt = {};
+lt.forEach((e) => {
+  yt[e.annotation] = e;
 });
-var ls = (e, t, r) => {
-  if (R(t))
+var 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 gt2.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);
   }
 };
-var P = (e, t) => {
+var L = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -513,22 +513,22 @@ var P = (e, t) => {
     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");
 }
-var fs = (e, t) => {
-  mt(t);
+var 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 (J2(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = P(e, n);
+    if (J2(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;
@@ -542,41 +542,41 @@ var fs = (e, t) => {
   }
   return e;
 };
-var de = (e, t, r) => {
-  if (mt(t), t.length === 0)
+var 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 (J2(s)) {
       const a = +o;
-      s = P(s, a);
-    } else if (J2(s)) {
+      s = L(s, a);
+    } else if (Y(s)) {
       if (i === t.length - 2)
         break;
-      const u = +o, c = +t[++i] == 0 ? "key" : "value", m2 = P(s, u);
+      const u = +o, c = +t[++i] == 0 ? "key" : "value", p2 = L(s, u);
       switch (c) {
         case "key":
-          s = m2;
+          s = p2;
           break;
         case "value":
-          s = s.get(m2);
+          s = s.get(p2);
           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])), J2(s)) {
+    const i = L(s, +n), o = r(i);
     i !== o && (s.delete(i), s.add(o));
   }
-  if (J2(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);
@@ -591,45 +591,45 @@ var de = (e, t, r) => {
   }
   return e;
 };
-function me(e, t, r = []) {
+function ye2(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) => ye2(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) => {
+    ye2(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 ye2(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;
 }
-var ps = (e, t) => K(e) || R(e) || J2(e) || Y(e) || ct(e, t);
-function ys(e, t, r) {
+var As = (e, t) => G(e) || I(e) || Y(e) || J2(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) => {
@@ -637,64 +637,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) ? undefined : r;
+    i.length === 0 ? s = o.map(ce) : r[ce(i)] = o.map(ce);
+  }), s ? pe(r) ? [s] : [s, r] : pe(r) ? undefined : r;
 }
-var pt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map) => {
-  var h2;
-  const a = ss(e);
+var bt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map) => {
+  var b2;
+  const a = us(e);
   if (!a) {
-    ys(e, n, t);
-    const p2 = o.get(e);
-    if (p2)
+    Fs(e, n, t);
+    const g2 = o.get(e);
+    if (g2)
       return s ? {
         transformedValue: null
-      } : p2;
+      } : g2;
   }
-  if (!ps(e, r)) {
-    const p2 = je(e, r), d = p2 ? {
-      transformedValue: p2.value,
-      annotations: [p2.type]
+  if (!As(e, r)) {
+    const g2 = Ke2(e, r), m2 = g2 ? {
+      transformedValue: g2.value,
+      annotations: [g2.type]
     } : {
       transformedValue: e
     };
-    return a || o.set(e, d), d;
+    return a || o.set(e, m2), m2;
   }
-  if (Z(i, e))
+  if (ee(i, e))
     return {
       transformedValue: null
     };
-  const u = je(e, r), c = (h2 = u == null ? undefined : u.value) != null ? h2 : e, m2 = R(c) ? [] : {}, l = {};
-  U(c, (p2, 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 b2 = pt(p2, t, r, s, [...n, d], [...i, e], o);
-    m2[d] = b2.transformedValue, R(b2.annotations) ? l[d] = b2.annotations : K(b2.annotations) && U(b2.annotations, (A, O) => {
-      l[it(d) + "." + O] = A;
+  const u = Ke2(e, r), c = (b2 = u == null ? undefined : u.value) != null ? b2 : e, p2 = I(c) ? [] : {}, l = {};
+  V(c, (g2, m2) => {
+    if (m2 === "__proto__" || m2 === "constructor" || m2 === "prototype")
+      throw new Error(`Detected property ${m2}. This is a prototype pollution risk, please remove it from your object.`);
+    const A = bt(g2, t, r, s, [...n, m2], [...i, e], o);
+    p2[m2] = A.transformedValue, I(A.annotations) ? l[m2] = A.annotations : G(A.annotations) && V(A.annotations, (C2, N2) => {
+      l[ct(m2) + "." + N2] = C2;
     });
   });
-  const f2 = fe(l) ? {
-    transformedValue: m2,
+  const d = pe(l) ? {
+    transformedValue: p2,
     annotations: u ? [u.type] : undefined
   } : {
-    transformedValue: m2,
+    transformedValue: p2,
     annotations: u ? [u.type, l] : l
   };
-  return a || o.set(e, f2), f2;
+  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 false;
   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,
@@ -703,43 +703,43 @@ function bs(e, t, r, s, n) {
     configurable: true
   });
 }
-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 y2 {
+class h2 {
   constructor({ dedupe: t = false } = {}) {
-    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(g2({}, n.meta), {
+    s.annotations && (n.meta = F(y2({}, n.meta), {
       values: s.annotations
     }));
-    const i = gs(r, this.dedupe);
-    return i && (n.meta = F(g2({}, n.meta), {
+    const i = ws(r, this.dedupe);
+    return i && (n.meta = F(y2({}, 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));
@@ -754,7 +754,7 @@ class y2 {
     this.symbolRegistry.register(t, r);
   }
   registerCustom(t, r) {
-    this.customTransformerRegistry.register(g2({
+    this.customTransformerRegistry.register(y2({
       name: r
     }, t));
   }
@@ -762,54 +762,54 @@ class y2 {
     this.allowedErrorProps.push(...t);
   }
 }
-y2.defaultInstance = new y2;
-y2.serialize = y2.defaultInstance.serialize.bind(y2.defaultInstance);
-y2.deserialize = y2.defaultInstance.deserialize.bind(y2.defaultInstance);
-y2.stringify = y2.defaultInstance.stringify.bind(y2.defaultInstance);
-y2.parse = y2.defaultInstance.parse.bind(y2.defaultInstance);
-y2.registerClass = y2.defaultInstance.registerClass.bind(y2.defaultInstance);
-y2.registerSymbol = y2.defaultInstance.registerSymbol.bind(y2.defaultInstance);
-y2.registerCustom = y2.defaultInstance.registerCustom.bind(y2.defaultInstance);
-y2.allowErrorProps = y2.defaultInstance.allowErrorProps.bind(y2.defaultInstance);
+h2.defaultInstance = new h2;
+h2.serialize = h2.defaultInstance.serialize.bind(h2.defaultInstance);
+h2.deserialize = h2.defaultInstance.deserialize.bind(h2.defaultInstance);
+h2.stringify = h2.defaultInstance.stringify.bind(h2.defaultInstance);
+h2.parse = h2.defaultInstance.parse.bind(h2.defaultInstance);
+h2.registerClass = h2.defaultInstance.registerClass.bind(h2.defaultInstance);
+h2.registerSymbol = h2.defaultInstance.registerSymbol.bind(h2.defaultInstance);
+h2.registerCustom = h2.defaultInstance.registerCustom.bind(h2.defaultInstance);
+h2.allowErrorProps = h2.defaultInstance.allowErrorProps.bind(h2.defaultInstance);
 var z2 = (e) => e === undefined ? C.None : e;
-var Fs = (e) => new m(e.metadataItem, e.type);
-var we = (e) => new Ke(e.name, e.expression, e.type, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var qe = (e) => new J(e.name, e.expression, e.granularity, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var D = (e) => {
+var Ts = (e) => new m(e.metadataItem, e.type);
+var Ee = (e) => new Ke(e.name, e.expression, e.type, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var Ce = (e) => new J(e.name, e.expression, e.granularity, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var O = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return we(e);
+      return Ee(e);
     case "DimensionalLevelAttribute":
-      return qe(e);
+      return Ce(e);
     default:
       return e;
   }
 };
-var gt2 = (e) => new y(e.name, e.expression, e.attributes.map(D), e.dimensions.map(ws), e.type, e.description, z2(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? D(e.defaultAttribute) : undefined);
-var ht = (e) => new p(e.name, e.expression, e.description, z2(e.sort), e.dataSource, e.composeCode, e.indexed, e.merged);
-var ws = (e) => {
+var Ft = (e) => new y(e.name, e.expression, e.attributes.map(O), e.dimensions.map(qs), e.type, e.description, z2(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? O(e.defaultAttribute) : undefined);
+var wt = (e) => new p(e.name, e.expression, e.description, z2(e.sort), e.dataSource, e.composeCode, e.indexed, e.merged);
+var qs = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return gt2(e);
+      return Ft(e);
     case "DimensionalDateDimension":
-      return ht(e);
+      return wt(e);
     default:
       return e;
   }
 };
-var Ae = (e) => new ye(e.name, D(e.attribute), e.aggregation, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var Ce = (e) => {
+var Te = (e) => new ye(e.name, O(e.attribute), e.aggregation, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var qe = (e) => {
   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];
       }
@@ -817,189 +817,196 @@ var Ce = (e) => {
   }));
   return new X(e.name, e.expression, t, e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
 };
-var bt = (e) => new Yt(e.name, D(e.attribute), e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
-var ue = (e) => {
+var Et = (e) => new Yt(e.name, O(e.attribute), e.format, e.description, z2(e.sort), e.dataSource, e.composeCode);
+var 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;
   }
 };
-var C2 = (e) => {
+var T2 = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new jd(D(e.attribute), e.members, e.config.backgroundFilter ? F(g2({}, e.config), { backgroundFilter: C2(e.config.backgroundFilter) }) : e.config, e.composeCode);
+      return new jd(O(e.attribute), e.members, e.config.backgroundFilter ? F(y2({}, e.config), { backgroundFilter: T2(e.config.backgroundFilter) }) : e.config, e.composeCode);
     case "LogicalAttributeFilter":
-      return new Bi(e.filters.map((r) => C2(r)), e.operator, e.config, e.composeCode);
+      return new Bi(e.filters.map((r) => T2(r)), e.operator, e.config, e.composeCode);
     case "CascadingFilter":
-      return new Pd(e._filters.map((r) => C2(r)), e.config, e.composeCode);
+      return new Pd(e._filters.map((r) => T2(r)), e.config, e.composeCode);
     case "ExcludeFilter":
-      return new Fd(C2(e.filter), e.input ? C2(e.input) : undefined, e.config, e.composeCode);
+      return new Fd(T2(e.filter), e.input ? T2(e.input) : undefined, e.config, e.composeCode);
     case "MeasureFilter":
-      return new Ud(D(e.attribute), ue(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new Ud(O(e.attribute), le(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "RankingFilter":
-      return new zi(D(e.attribute), ue(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new zi(O(e.attribute), le(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "MeasureRankingFilter":
-      return new Hi(ue(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Hi(le(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "NumericFilter":
-      return new Bd(D(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new Bd(O(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "TextFilter":
-      return new re(D(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
+      return new re(O(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new zd(D(e.attribute), r, s, e.config, e.composeCode);
+      return new zd(O(e.attribute), r, s, e.config, e.composeCode);
     }
     case "RelativeDateFilter":
-      return new wn(D(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
+      return new wn(O(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
     case "CustomFilter":
-      return new Hd(D(e.attribute), e.jaqlExpression, e.config, e.composeCode);
+      return new Hd(O(e.attribute), e.jaqlExpression, e.config, e.composeCode);
     default:
       return e;
   }
 };
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: h,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Fs(e)
+  deserialize: (e) => Ts(e)
 }, "JaqlElement");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: xp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => we(e)
+  deserialize: (e) => Ee(e)
 }, "DimensionalAttribute");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: wp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => qe(e)
+  deserialize: (e) => Ce(e)
 }, "DimensionalLevelAttribute");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: z,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => gt2(e)
+  deserialize: (e) => Ft(e)
 }, "DimensionalDimension");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: S,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ht(e)
+  deserialize: (e) => wt(e)
 }, "DimensionalDateDimension");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: $i,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ae(e)
+  deserialize: (e) => Te(e)
 }, "DimensionalBaseMeasure");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: ji,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ce(e)
+  deserialize: (e) => qe(e)
 }, "DimensionalCalculatedMeasure");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: ip,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => bt(e)
+  deserialize: (e) => Et(e)
 }, "DimensionalMeasureTemplate");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: ap,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "MembersFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: dp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "LogicalAttributeFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: Nt,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "CascadingFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: fp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "ExcludeFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: lp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "MeasureFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: up,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "RankingFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: cp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "MeasureRankingFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: op,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "NumericFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: hp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "TextFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: pp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "DateRangeFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: gp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "RelativeDateFilter");
-y2.registerCustom({
+h2.registerCustom({
   isApplicable: sp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => C2(e)
+  deserialize: (e) => T2(e)
 }, "CustomFilter");
-var Kn = y2;
-var q3 = "DM.";
-function T2(e) {
+var ni = h2;
+var E3 = "DM.";
+function S2(e) {
   return typeof e == "object" && e !== null;
 }
-function E3(e) {
+function q3(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Ft(e) {
-  return e.every(E3);
+function Ct2(e) {
+  return e.every(q3);
 }
-function ne(e) {
+function oe(e) {
   return "attribute" in e && "config" in e;
 }
-function X2(e) {
+function Z(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function Ee(e) {
-  return !ne(e) && !X2(e);
+function xe(e) {
+  return !oe(e) && !Z(e);
 }
-function qs(e) {
-  return T2(e) && "column" in e && typeof e.column == "string" && !(("function" in e) && ("args" in e));
+function xs(e) {
+  return S2(e) && "column" in e && typeof e.column == "string" && !(("function" in e) && ("args" in e));
 }
-function As(e) {
-  return !T2(e) || !("column" in e) ? false : E3(e.column);
+function $s(e) {
+  return !S2(e) || !("column" in e) ? false : q3(e.column);
 }
 var 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 !== undefined ? { best: n, distance: s } : undefined;
 }
-function xe(e) {
+var 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);
@@ -1017,61 +1024,61 @@ function xe(e) {
     columnMap: s
   };
 }
-function $e(e, t) {
-  if (!e.startsWith(q3))
-    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${q3}TableName.ColumnName[.Level]'`);
-  const r = e.slice(q3.length);
+function Se2(e, t) {
+  if (!e.startsWith(E3))
+    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
+  const r = e.slice(E3.length);
   if (!r)
-    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${q3}TableName.ColumnName[.Level]'`);
+    throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
   let s, n;
-  for (const d of t.sortedTables)
-    if (r.startsWith(d.name + ".")) {
-      const b2 = r.slice(d.name.length + 1);
-      if (!b2)
-        throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${q3}TableName.ColumnName[.Level]'`);
-      s = d, n = b2;
+  for (const m2 of t.sortedTables)
+    if (Ye(r, m2.name + ".")) {
+      const A = r.slice(m2.name.length + 1);
+      if (!A)
+        throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
+      s = m2, n = A;
       break;
     }
   if (!s) {
-    const d = r.indexOf(".");
-    if (d === -1)
-      throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${q3}TableName.ColumnName[.Level]'`);
-    const b2 = r.slice(0, d), A = M(b2, t.sortedTables, (oe) => oe.name), O = A && A.distance <= x ? ` Did you mean '${A.best.name}'?` : "";
-    throw new Error(`Table '${b2}' not found in the data model.${O}`);
+    const m2 = r.indexOf(".");
+    if (m2 === -1)
+      throw new Error(`Invalid dimensional element name format: '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
+    const A = r.slice(0, m2), C2 = R(A, t.sortedTables, (ue) => ue.name), N2 = C2 && C2.distance <= x ? ` Did you mean '${C2.best.name}'?` : "";
+    throw new Error(`Table '${A}' not found in the data model.${N2}`);
   }
   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 = g.all;
-  for (const d of i) {
-    if (n === d.name)
-      return { table: s, column: d };
-    if (!n.startsWith(d.name + "."))
+  for (const m2 of i) {
+    if (fe(n, m2.name))
+      return { table: s, column: m2 };
+    if (!Ye(n, m2.name + "."))
       continue;
-    const b2 = n.slice(d.name.length + 1);
-    if (!b2)
+    const A = n.slice(m2.name.length + 1);
+    if (!A)
       continue;
-    const A = u.includes(b2), O = Rn(d.dataType);
-    if (A) {
-      if (O)
-        return { table: s, column: d, level: b2 };
-      o || (o = d, a = b2);
+    const C2 = u.includes(A), N2 = Rn(m2.dataType);
+    if (C2) {
+      if (N2)
+        return { table: s, column: m2, level: A };
+      o || (o = m2, a = A);
       continue;
     }
-    O && !o && (o = d, a = b2);
+    N2 && !o && (o = m2, 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), b2 = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
-    throw new Error(`Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(", ")}.${b2}`);
+    const m2 = R(a, u, (C2) => C2), A = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
+    throw new Error(`Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(", ")}.${A}`);
   }
-  const c = n.indexOf("."), m2 = c === -1 ? n : n.slice(0, c), l = M(n, i, (d) => d.name), f2 = l && l.distance <= x && l.best.name !== m2, h2 = f2 ? ` Did you mean '${l.best.name}'?` : "", p2 = !f2 && n.endsWith(".") && (l == null ? undefined : l.best.name) === m2 ? ` Use '${m2}' without a trailing dot.` : "";
-  throw new Error(`Column '${m2}' not found in table '${s.name}'.${h2}${p2}`);
+  const c = n.indexOf("."), p2 = c === -1 ? n : n.slice(0, c), l = R(n, i, (m2) => m2.name), d = l && l.distance <= x && !fe(l.best.name, p2), b2 = d ? ` Did you mean '${l.best.name}'?` : "", g2 = !d && n.endsWith(".") && l !== undefined && fe(l.best.name, p2) ? ` Use '${p2}' without a trailing dot.` : "";
+  throw new Error(`Column '${p2}' not found in table '${s.name}'.${b2}${g2}`);
 }
-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 } = Se2(e, t);
   if (n) {
     if (!Rn(s.dataType))
       throw new Error(`Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`);
@@ -1087,19 +1094,19 @@ 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 (Rn(i.dataType) && a === undefined && (s != null && s.inferredDateLevel)) {
     const u = s.inferredDateLevel, c = g.all;
     if (!c.includes(u))
       throw new Error(`Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`);
-    const m2 = `${e}.${u}`, l = g.dateOnly;
+    const p2 = `${e}.${u}`, l = g.dateOnly;
     if (i.dataType === "date" && !l.includes(u))
-      throw new Error(`Invalid level '${u}' in dimensional element '${m2}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`);
-    const f2 = g.timeOnly;
-    if (i.dataType === "time" && !f2.includes(u))
-      throw new Error(`Invalid level '${u}' in dimensional element '${m2}'. Column '${n.name}.${i.name}' is only a time column, not a date column`);
+      throw new Error(`Invalid level '${u}' in dimensional element '${p2}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`);
+    const d = g.timeOnly;
+    if (i.dataType === "time" && !d.includes(u))
+      throw new Error(`Invalid level '${u}' in dimensional element '${p2}'. Column '${n.name}.${i.name}' is only a time column, not a date column`);
     a = u;
   }
   return Ln({
@@ -1111,10 +1118,10 @@ 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 } = Se2(e, r);
   if (n)
-    throw new Error(`Invalid DateDimension name format: '${e}'. Expected format: '${q3}TableName.ColumnName'`);
+    throw new Error(`Invalid DateDimension name format: '${e}'. Expected format: '${E3}TableName.ColumnName'`);
   if (!Rn(s.dataType))
     throw new Error(`Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`);
   return q({
@@ -1123,32 +1130,32 @@ function Es(e, t, r) {
     dataSource: t
   });
 }
-var xs = (e, t) => {
+var Ds = (e, t) => {
   if (!e)
     return;
   const r = typeof e == "object" ? e.direction : e;
   if (!Lp(r))
-    return F(g2({}, t), {
+    return F(y2({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
 };
-var $s = (e, t, r, s) => {
-  const n = xs(e.sortType, s);
+var 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 = ed(e, "column");
+  const i = H(e.column, t, r), o = ed(e, "column");
   return { attribute: i, style: o };
 };
-var Ts = (e, t, r, s) => typeof e == "string" ? { attribute: G(e, t, r) } : qs(e) ? $s(e, t, r, s) : {
-  error: F(g2({}, s), {
+var Ns = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : xs(e) ? Ms(e, t, r, s) : {
+  error: F(y2({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
 };
-var wt = (e) => {
+var qt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: true, data: [] };
@@ -1172,110 +1179,341 @@ var wt = (e) => {
       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;
       }
       c.attribute && n.push(c.style !== undefined ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute });
     } catch (c) {
-      const m2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g2({}, u), { message: m2 }));
+      const p2 = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y2({}, u), { message: p2 }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
-function Te(e, t) {
+function Oe2(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(rp, r)(...t);
-  if (!Ee(n))
+function Rs(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Oe2(rp, 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(Se, r)(...t);
-  if (!X2(n))
+function vs2(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Oe2(Se, 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(mp, r)(...t);
-  if (!ne(n) && !X2(n))
+    return vs2(e, t);
+  const r = e.replace("filterFactory.", ""), n = Oe2(mp, 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`);
 }
-var ye2 = {
-  SDIFF: {
-    category: "time-diff",
-    argCount: 2,
+var f2 = (e, t, r, s) => y2({ category: e, minArgs: t, maxArgs: r }, s);
+var ks = /* @__PURE__ */ new Set([
+  "CORREL",
+  "COVARP",
+  "COVAR",
+  "EXPONDIST",
+  "INTERCEPT",
+  "LARGEST",
+  "NORMDIST",
+  "POISSONDIST",
+  "SKEWP",
+  "SKEW",
+  "SLOPE",
+  "TDIST",
+  "COSH",
+  "SINH",
+  "TANH",
+  "ORDERING",
+  "RDOUBLE",
+  "RINT"
+]);
+var te = {
+  SDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Seconds,
     argType: "datetime"
-  },
-  MNDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  MNDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Minutes,
     argType: "datetime"
-  },
-  HDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  HDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Hours,
     argType: "datetime"
-  },
-  DDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  DDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Days,
     argType: "datetime"
-  },
-  MDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  MDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Months,
     argType: "datetime"
-  },
-  QDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  QDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Quarters,
     argType: "datetime"
-  },
-  YDIFF: {
-    category: "time-diff",
-    argCount: 2,
+  }),
+  YDIFF: f2("xdiff", 2, 2, {
     requiredDateLevel: g.Years,
     argType: "datetime"
-  }
+  }),
+  ANYVALUE: f2("aggregative", 1, 1),
+  SUM: f2("aggregative", 1, 2),
+  AVG: f2("aggregative", 1, 2),
+  MIN: f2("aggregative", 1, 2),
+  MAX: f2("aggregative", 1, 2),
+  COUNT: f2("aggregative", 1, 2),
+  DUPCOUNT: f2("aggregative", 1, 1),
+  COUNTDUPLICATES: f2("aggregative", 1, 1),
+  STDEV: f2("aggregative", 1, 2),
+  STDEVP: f2("aggregative", 1, 2),
+  VAR: f2("aggregative", 1, 2),
+  VARP: f2("aggregative", 1, 2),
+  MEDIAN: f2("aggregative", 1, 2),
+  QUARTILE: f2("aggregative", 2, 3),
+  PERCENTILE: f2("aggregative", 2, 3),
+  LOWERWHISKERMAX_IQR: f2("aggregative", 1, 1),
+  LOWERWHISKERMAX_STDEVP: f2("aggregative", 1, 1),
+  UPPERWHISKERMIN_IQR: f2("aggregative", 1, 1),
+  UPPERWHISKERMIN_STDEVP: f2("aggregative", 1, 1),
+  OUTLIERSCOUNT_IQR: f2("aggregative", 1, 1),
+  OUTLIERSCOUNT_STDEVP: f2("aggregative", 1, 1),
+  MODE: f2("aggregative", 1, 1),
+  NOAGGFUNCTION: f2("aggregative", 1, 1),
+  RANK: f2("window", 0, Number.POSITIVE_INFINITY),
+  RSUM: f2("window", 1, 2),
+  RAVG: f2("window", 1, 2),
+  YTDSUM: f2("window", 1, 1),
+  QTDSUM: f2("window", 1, 1),
+  MTDSUM: f2("window", 1, 1),
+  WTDSUM: f2("window", 1, 1),
+  YTDAVG: f2("window", 1, 1),
+  QTDAVG: f2("window", 1, 1),
+  MTDAVG: f2("window", 1, 1),
+  WTDAVG: f2("window", 1, 1),
+  CONCAT: f2("string", 2, Number.POSITIVE_INFINITY),
+  LEFT: f2("string", 2, 2),
+  RIGHT: f2("string", 2, 2),
+  ABS: f2("scalar", 1, 1),
+  ACOS: f2("scalar", 1, 1),
+  ASIN: f2("scalar", 1, 1),
+  ATAN: f2("scalar", 1, 1),
+  CEILING: f2("scalar", 1, 1),
+  CONTRIBUTION: f2("scalar", 1, 1),
+  COS: f2("scalar", 1, 1),
+  COT: f2("scalar", 1, 1),
+  DIFFPASTDAY: f2("scalar", 1, 1),
+  DIFFPASTMONTH: f2("scalar", 1, 1),
+  DIFFPASTPERIOD: f2("scalar", 1, 1),
+  DIFFPASTQUARTER: f2("scalar", 1, 1),
+  DIFFPASTWEEK: f2("scalar", 1, 1),
+  DIFFPASTYEAR: f2("scalar", 1, 1),
+  EXP: f2("scalar", 1, 1),
+  FLOOR: f2("scalar", 1, 1),
+  GROWTH: f2("growth", 1, 1),
+  GROWTHPASTMONTH: f2("growth", 1, 1),
+  GROWTHPASTQUARTER: f2("growth", 1, 1),
+  GROWTHPASTWEEK: f2("growth", 1, 1),
+  GROWTHPASTYEAR: f2("growth", 1, 1),
+  GROWTHRATE: f2("growth", 1, 1),
+  LN: f2("scalar", 1, 1),
+  LOG10: f2("scalar", 1, 1),
+  MINUS: f2("scalar", 1, 1),
+  MOD: f2("scalar", 2, 2),
+  QUOTIENT: f2("scalar", 2, 2),
+  PASTDAY: f2("date", 1, 2),
+  PASTMONTH: f2("date", 1, 2),
+  PASTPERIOD: f2("date", 1, 2),
+  PASTQUARTER: f2("date", 1, 2),
+  PASTWEEK: f2("date", 1, 2),
+  PASTYEAR: f2("date", 1, 2),
+  PERCENTILEDISCFORINTERNALUSEONLY: f2("scalar", 1, 1),
+  PERCENTILECONTFORINTERNALUSEONLY: f2("scalar", 1, 1),
+  POWER: f2("scalar", 2, 2),
+  ROUND: f2("scalar", 2, 2),
+  SIN: f2("scalar", 1, 1),
+  SQRT: f2("scalar", 1, 1),
+  TAN: f2("scalar", 1, 1)
 };
-var vs2 = Object.keys(ye2).filter((e) => ye2[e].category === "time-diff");
-function qt() {
-  return vs2;
+var Bs = Object.keys(te).filter((e) => te[e].category === "xdiff");
+function xt() {
+  return Bs;
 }
-function At(e) {
-  const t = ye2[e.toUpperCase()];
+function $t(e) {
+  const t = te[e.toUpperCase()];
   return t == null ? undefined : t.requiredDateLevel;
 }
-var Ns = /\[(\w[\w.-]*)\]/g;
-var Ct2 = /* @__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 = false, o = null;
+  for (let a = 0;a < e.length; a++) {
+    const u = e[a], c = e[a + 1];
+    if (i) {
+      if (u !== o) {
+        s += u;
+        continue;
+      }
+      if (c === o) {
+        s += u + c, a++;
+        continue;
+      }
+      i = false, o = null, s += u;
+      continue;
+    } else {
+      if (u === "'" || u === '"') {
+        i = true, o = u, s += u;
+        continue;
+      }
+      if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === t && n === 0) {
+        r.push(s.trim()), s = "";
+        continue;
+      }
+    }
+    s += u;
+  }
+  return s.trim() && r.push(s.trim()), r;
+}
+function Ls(e, t) {
+  let r = 0, s = false, n = null;
+  for (let i = 0;i < e.length; i++) {
+    const o = e[i], a = e[i + 1];
+    if (s) {
+      if (o !== n)
+        continue;
+      if (a === n) {
+        i++;
+        continue;
+      }
+      s = false, n = null;
+    } else {
+      if (o === "'" || o === '"') {
+        s = true, n = o;
+        continue;
+      }
+      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0)
+        return i;
+    }
+  }
+  return -1;
+}
+function Us(e, t) {
+  if (e[t] !== "(")
+    return -1;
+  let r = 1, s = t + 1, n = false, i = null;
+  for (;s < e.length; ) {
+    const o = e[s], a = e[s + 1];
+    if (n) {
+      if (o !== i) {
+        s++;
+        continue;
+      }
+      if (a === i) {
+        s += 2;
+        continue;
+      }
+      n = false, i = null, s++;
+    } else {
+      if (o === "'" || o === '"') {
+        n = true, i = o, s++;
+        continue;
+      }
+      if ("([{".includes(o) && r++, ")]}".includes(o) && --r === 0)
+        return s;
+      s++;
+    }
+  }
+  return -1;
+}
+function _s(e) {
+  return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
+}
+function W(e) {
+  if (!e || typeof e != "string")
+    throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
+  const t = e.trim();
+  if (!t)
+    throw new Error("Invalid composeCode: empty string");
+  const r = t.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
+  if (!r)
+    throw new Error(`Invalid composeCode format: expected function call, got '${t}'`);
+  const s = r[1], n = r[2], i = St(n);
+  return {
+    function: s,
+    args: i
+  };
+}
+function St(e) {
+  return e.trim() ? De(e, ",").map(Ot) : [];
+}
+function Ot(e) {
+  if (!e)
+    throw new Error("Cannot parse empty argument value");
+  if (e === "null")
+    return null;
+  if (e === "undefined")
+    return;
+  if (e === "true")
+    return true;
+  if (e === "false")
+    return false;
+  if (e.match(/^-?\d+(\.\d+)?$/))
+    return parseFloat(e);
+  if (e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"')) {
+    const r = e[0];
+    return e.slice(1, -1).replace(new RegExp(`${r}${r}`, "g"), r);
+  }
+  if (e.startsWith("[") && e.endsWith("]")) {
+    const r = e.slice(1, -1).trim();
+    if (!r)
+      return [];
+    const s = St(r);
+    return s.every((n) => typeof n == "string"), s;
+  }
+  if (e.startsWith("{") && e.endsWith("}")) {
+    const r = e.slice(1, -1).trim();
+    return r ? Ws(r) : {};
+  }
+  return e.includes("(") && e.includes(")") ? W(e) : (e.startsWith("DM."), e);
+}
+function Vs(e) {
+  const t = Ls(e, ":");
+  if (t === -1)
+    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
+  const r = _s(e.slice(0, t).trim()), s = Ot(e.slice(t + 1).trim());
+  return [r, s];
+}
+function Ws(e) {
+  if (!e.trim())
+    return {};
+  const t = De(e, ",").map(Vs).filter(([, r]) => r !== null);
+  return Object.fromEntries(t);
+}
+var js = /\[(\w[\w.-]*)\]/g;
+var Dt = /* @__PURE__ */ new Set([
   "AVG",
   "COUNT",
   "DUPCOUNT",
-  "LARGEST",
   "MAX",
   "MEDIAN",
   "MIN",
@@ -1288,36 +1526,30 @@ var Ct2 = /* @__PURE__ */ new Set([
   "QTDAVG",
   "QTDSUM",
   "YTDAVG",
-  "YTDSUM",
-  "CORREL",
-  "COVARP",
-  "COVAR",
-  "SKEWP",
-  "SKEW",
-  "SLOPE"
+  "YTDSUM"
 ]);
-var Rs = new RegExp(`\\b(${Array.from(Ct2).join("|")})\\s*\\(`, "i");
-function Et(e) {
-  return E3(e) ? true : typeof e == "string" && e.startsWith(q3) ? false : T2(e) && ("kind" in e) ? e.kind === "measure" : true;
+var Ks = new RegExp(`\\b(${Array.from(Dt).join("|")})\\s*\\(`, "i");
+function Mt(e) {
+  return q3(e) ? true : typeof e == "string" && e.startsWith(E3) ? false : S2(e) && ("kind" in e) ? e.kind === "measure" : true;
 }
-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];
-    Ct2.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. `;
 }
 var j2 = (e) => e.startsWith("[") ? e : `[${e}]`;
-var xt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function $t(e, t) {
+var Nt2 = (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*\\)`, "gi");
@@ -1327,7 +1559,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 {
@@ -1342,196 +1574,263 @@ function zs(e, t, r) {
     result: { isValid: true, errors: [], warnings: [], references: [], unusedContextKeys: [] }
   };
 }
-function N2(e, t) {
+function M(e, t) {
   e.result.errors.push(t), e.result.isValid = false;
 }
-var Ps = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function Ls(e) {
-  const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find((s) => !Ps.has(s[1].toUpperCase()));
-  r && N2(e, `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`);
+var Qs = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function Xs(e) {
+  const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find((s) => !Qs.has(s[1].toUpperCase()));
+  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]))
+    ...new Set([...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(j2(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("], [")}]`;
-  N2(e, `${e.errorPrefix}args[1]: ${s} not found in context. Available keys: ${r}`);
+  const r = e.contextKeys.map((n) => `[${Nt2(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))
+function on(e) {
+  if (Ks.test(e.formula))
     return;
   const t = e.result.references.filter((r) => {
     var n;
     const s = (n = e.context[j2(r)]) != null ? n : e.context[r];
-    return s !== undefined && !Et(s);
+    return s !== undefined && !Mt(s);
   });
-  t.length !== 0 && N2(e, `${e.errorPrefix}args[1]: ${Bs(Is(e.formula))}Bracket reference(s) ${ks(t)} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`);
+  t.length !== 0 && M(e, `${e.errorPrefix}args[1]: ${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(j2)), r = e.contextKeys.filter((i) => !t.has(j2(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 ? N2(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
+  const s = r.map((i) => `[${Nt2(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[j2(e)]) != null ? o : s.context[e];
   if (n === undefined)
     return;
-  if (!(typeof n == "string" && n.startsWith(q3))) {
-    Et(n) && N2(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${q3}Table.Column.Level).`);
+  if (!(typeof n == "string" && n.startsWith(E3))) {
+    Mt(n) && M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${E3}Table.Column.Level).`);
     return;
   }
   if (s.schemaIndex)
     try {
-      const a = $e(n, s.schemaIndex);
-      Rn(a.column.dataType) ? r && a.level && a.level !== r && N2(s, `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`) : N2(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`);
+      const a = Se2(n, s.schemaIndex);
+      Rn(a.column.dataType) ? r && a.level && a.level !== r && M(s, `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`) : M(s, `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`);
     } catch (a) {
       const u = a instanceof Error ? a.message : "Unknown error";
-      N2(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 || N2(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(`${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`), s.result) : s.contextKeys.length === 0 ? (N2(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));
+  const s = Hs(e, t, r);
+  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || M(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Xs(s), rn(s), s.result.references = sn(e), s.result.references.length === 0 ? (s.result.warnings.push(`${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`), s.result) : s.contextKeys.length === 0 ? (M(s, `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`), s.result) : (nn(s), on(s), an(s), un(s), s.result));
 }
-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?)`);
   const r = e[1];
   if (typeof r != "string")
     throw new Error(`${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`);
   const s = r, n = e[2];
-  if (!T2(n))
+  if (!S2(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: true,
     allowEmptyFormula: false,
     schemaIndex: t.schemaIndex
   });
-  const o = Gs(s), a = {};
+  const o = dn(s), a = {};
   for (const [u, c] of Object.entries(i)) {
-    const m2 = `args[2].${u}`;
-    if (E3(c))
-      a[`${u}`] = S2({
+    const p2 = `args[2].${u}`;
+    if (q3(c))
+      a[`${u}`] = D({
         data: c,
         context: {
           dataSource: t.dataSource,
           schemaIndex: t.schemaIndex,
-          pathPrefix: m2
+          pathPrefix: p2
         }
       });
-    else if (typeof c == "string" && c.startsWith(q3)) {
-      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, f2 = o[l];
+    else if (typeof c == "string" && c.startsWith(E3)) {
+      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = o[l];
       try {
-        a[`${u}`] = G(c, t.dataSource, t.schemaIndex, f2 !== undefined ? { inferredDateLevel: f2 } : undefined);
-      } catch (h2) {
-        const p2 = h2 instanceof Error ? h2.message : "Unknown error";
-        throw new Error(`${m2}: ${p2}`);
+        a[`${u}`] = H(c, t.dataSource, t.schemaIndex, d !== undefined ? { inferredDateLevel: d } : undefined);
+      } catch (b2) {
+        const g2 = b2 instanceof Error ? b2.message : "Unknown error";
+        throw new Error(`${p2}: ${g2}`);
       }
     } else if (c && typeof c == "object" && "kind" in c)
       a[`${u}`] = c;
     else
-      throw new Error(`${m2}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${q3}...), but got: ${typeof c}`);
+      throw new Error(`${p2}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E3}...), 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 !== undefined)
       for (const o of [n.ref1, n.ref2]) {
         const a = s[o];
         if (a !== undefined && a !== i)
-          throw new Error(`Reference [${o}] is used in time-diff functions with conflicting date levels ('${a}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`);
+          throw new Error(`Reference [${o}] is used in xdiff functions with conflicting date levels ('${a}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`);
         s[o] = i;
       }
   }
   return s;
 }
-function Tt(e) {
+function It(e) {
   return e.type === E.TextAttribute;
 }
-function Dt(e) {
+function Pt(e) {
   return e.type === E.NumericAttribute;
 }
-function Qs(e) {
+function mn(e) {
   return e.type === E.DateLevel;
 }
-function Hs(e) {
-  return Tt(e) || Dt(e);
+function pn(e) {
+  return It(e) || Pt(e);
 }
-function ie(e) {
+function ae(e) {
   return e.type === E.TextAttribute ? "text" : e.type === E.NumericAttribute ? "numeric" : e.type === E.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 Ke2(e, t) {
-  const r = De(e, t);
-  if (!Hs(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(r)} attribute`);
+function He(e, t) {
+  const r = Me(e, t);
+  if (!pn(r))
+    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ae(r)} attribute`);
 }
-function I(e, t) {
-  const r = De(e, t);
-  if (!Dt(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(r)} attribute`);
+function P(e, t) {
+  const r = Me(e, t);
+  if (!Pt(r))
+    throw new Error(`${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ae(r)} attribute`);
 }
 function k(e, t) {
-  const r = De(e, t);
-  if (!Tt(r))
-    throw new Error(`${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(r)} attribute`);
+  const r = Me(e, t);
+  if (!It(r))
+    throw new Error(`${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);
+function yn(e, t) {
+  const r = gn(e, t);
   if (!ap(r))
     throw new Error(`${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`);
 }
-var en = {
-  "measureFactory.customFormula": Ys,
-  "filterFactory.equals": Ke2,
-  "filterFactory.doesntEqual": Ke2,
-  "filterFactory.greaterThan": I,
-  "filterFactory.greaterThanOrEqual": I,
-  "filterFactory.lessThan": I,
-  "filterFactory.lessThanOrEqual": I,
-  "filterFactory.between": I,
-  "filterFactory.betweenNotEqual": I,
-  "filterFactory.numeric": I,
+var hn = {
+  "measureFactory.customFormula": fn,
+  "filterFactory.equals": He,
+  "filterFactory.doesntEqual": He,
+  "filterFactory.greaterThan": P,
+  "filterFactory.greaterThanOrEqual": P,
+  "filterFactory.lessThan": P,
+  "filterFactory.lessThanOrEqual": P,
+  "filterFactory.between": P,
+  "filterFactory.betweenNotEqual": P,
+  "filterFactory.numeric": P,
   "filterFactory.contains": k,
   "filterFactory.doesntContain": k,
   "filterFactory.startsWith": k,
@@ -1539,12 +1838,12 @@ var en = {
   "filterFactory.endsWith": k,
   "filterFactory.doesntEndWith": k,
   "filterFactory.like": k,
-  "filterFactory.exclude": Zs
+  "filterFactory.exclude": yn
 };
-function tn(e) {
-  return en[`${e}`];
+function bn(e) {
+  return hn[`${e}`];
 }
-var St = {
+var kt = {
   "measureFactory.sum": [
     { type: "Attribute", required: true },
     { type: "string", required: false },
@@ -1963,18 +2262,18 @@ var St = {
     { type: "FilterRelationsNode", required: true }
   ]
 };
-function Se2(e) {
-  return St[`${e}`];
+function Ne(e) {
+  return kt[`${e}`];
 }
-function rn(e) {
-  const t = Se2(e);
+function An(e) {
+  const t = Ne(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function sn(e) {
-  const t = Se2(e);
+function Fn(e) {
+  const t = Ne(e);
   return t ? t.length : 0;
 }
-function nn(e) {
+function wn2(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return false;
   const r = Date.parse(e);
@@ -1983,27 +2282,27 @@ function nn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function ce(e, t, r, s) {
-  if (e.startsWith(q3))
+function de(e, t, r, s) {
+  if (e.startsWith(E3))
     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: '${q3}TableName.ColumnName[.Level]'`);
+  throw new Error(`${s}: Invalid attribute '${e}'. Expected format: '${E3}TableName.ColumnName[.Level]'`);
 }
-function on(e, t, r, s) {
-  if (e.startsWith(q3))
+function En(e, t, r, s) {
+  if (e.startsWith(E3))
     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: '${q3}TableName.ColumnName'`);
+  throw new Error(`${s}: Invalid date dimension string '${e}'. Expected format: '${E3}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 === undefined) {
     if (r.required)
@@ -2039,20 +2338,20 @@ function an(e) {
       case "Attribute":
         if (typeof t != "string")
           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(`${o}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`);
         return t.map((a, u) => {
           if (typeof a != "string")
             throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
-          return ce(a, s, n, `${o}[${u}]`);
+          return de(a, s, n, `${o}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!E3(t))
+        if (!q3(t))
           throw new Error(`${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`);
-        return S2({
+        return D({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2060,17 +2359,17 @@ function an(e) {
         if (!Array.isArray(t))
           throw new Error(`${o}: Expected array of measure function calls, got ${typeof t}`);
         return t.map((a, u) => {
-          if (!E3(a))
+          if (!q3(a))
             throw new Error(`${o}[${u}]: Expected measure function call, got ${typeof a}`);
-          return S2({
+          return D({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
       case "Filter":
-        if (!E3(t))
+        if (!q3(t))
           throw new Error(`${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`);
-        return S2({
+        return D({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2078,9 +2377,9 @@ function an(e) {
         if (!Array.isArray(t))
           throw new Error(`${o}: Expected array of filter function calls, got ${typeof t}`);
         return t.map((a, u) => {
-          if (!E3(a))
+          if (!q3(a))
             throw new Error(`${o}[${u}]: Expected filter function call, got ${typeof a}`);
-          return S2({
+          return D({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
@@ -2088,15 +2387,15 @@ function an(e) {
       case "FilterRelationsNode":
         if (Array.isArray(t))
           return t.map((a, u) => {
-            if (!E3(a))
+            if (!q3(a))
               throw new Error(`${o}[${u}]: Expected filter function call, got ${typeof a}`);
-            return S2({
+            return D({
               data: a,
               context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
             });
           });
-        if (E3(t))
-          return S2({
+        if (q3(t))
+          return D({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
@@ -2104,27 +2403,27 @@ function an(e) {
       case "DateDimension":
         if (typeof t != "string")
           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(t, s, n, o);
-        if (!Qs(a))
-          throw new Error(`${o}: Attribute must be date/datetime type, got ${ie(a)} attribute`);
+        const a = de(t, s, n, o);
+        if (!mn(a))
+          throw new Error(`${o}: Attribute must be date/datetime type, got ${ae(a)} attribute`);
         return a;
       }
       case "Measure | number":
         if (typeof t == "number")
           return t;
-        if (E3(t))
-          return S2({
+        if (q3(t))
+          return D({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
         throw new Error(`${o}: Expected measure function call or number, got ${typeof t}`);
       case "Date | string":
         if (typeof t == "string") {
-          if (nn(t))
+          if (wn2(t))
             return t;
           throw new Error(`${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`);
         } else {
@@ -2147,63 +2446,63 @@ function an(e) {
         return t;
     }
 }
-function S2(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = Se2(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 p2 = Object.keys(St), d = M(i, p2, (A) => A), b2 = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
-    throw new Error(`${a}function: Unknown function '${i}'.${b2}`);
+    const g2 = Object.keys(kt), m2 = R(i, g2, (C2) => C2), A = m2 && m2.distance <= x ? ` Did you mean '${m2.best}'?` : "";
+    throw new Error(`${a}function: Unknown function '${i}'.${A}`);
   }
-  const c = rn(i), m2 = sn(i);
+  const c = An(i), p2 = Fn(i);
   if (o.length < c)
     throw new Error(`${a}function: Expected at least ${c} arguments, got ${o.length}`);
-  if (o.length > m2)
-    throw new Error(`${a}function: Expected at most ${m2} arguments, got ${o.length}`);
-  const l = [], f2 = [];
-  for (let p2 = 0;p2 < Math.max(o.length, u.length); p2++) {
-    const d = u[`${p2}`], b2 = o[`${p2}`], A = a ? `${a}args[${p2}]` : `args[${p2}]`;
-    if (b2 === undefined) {
-      d != null && d.required && f2.push(`${A}: Missing required argument (expected ${d.type})`);
+  if (o.length > p2)
+    throw new Error(`${a}function: Expected at most ${p2} arguments, got ${o.length}`);
+  const l = [], d = [];
+  for (let g2 = 0;g2 < Math.max(o.length, u.length); g2++) {
+    const m2 = u[`${g2}`], A = o[`${g2}`], C2 = a ? `${a}args[${g2}]` : `args[${g2}]`;
+    if (A === undefined) {
+      m2 != null && m2.required && d.push(`${C2}: Missing required argument (expected ${m2.type})`);
       continue;
     }
-    if (!d) {
-      f2.push(`${A}: Unexpected argument`);
+    if (!m2) {
+      d.push(`${C2}: Unexpected argument`);
       continue;
     }
     try {
-      const O = an({
-        data: b2,
+      const N2 = Cn({
+        data: A,
         context: {
           dataSource: r,
           schemaIndex: s,
-          pathPrefix: A,
-          argSchema: d
+          pathPrefix: C2,
+          argSchema: m2
         }
       });
-      l.push(O);
-    } catch (O) {
-      const oe = O instanceof Error ? O.message : "Unknown error";
-      f2.push(oe);
+      l.push(N2);
+    } catch (N2) {
+      const ue = N2 instanceof Error ? N2.message : "Unknown error";
+      d.push(ue);
     }
   }
-  if (f2.length > 0) {
-    const p2 = f2.join("; ");
-    throw new Error(p2);
+  if (d.length > 0) {
+    const g2 = d.join("; ");
+    throw new Error(g2);
   }
-  const h2 = tn(i);
-  if (h2)
+  const b2 = bn(i);
+  if (b2)
     try {
-      h2(l, {
+      b2(l, {
         dataSource: r,
         schemaIndex: s,
         pathPrefix: a
       });
-    } catch (p2) {
-      const d = p2 instanceof Error ? p2.message : "Unknown validation error";
-      throw new Error(d);
+    } catch (g2) {
+      const m2 = g2 instanceof Error ? g2.message : "Unknown validation error";
+      throw new Error(m2);
     }
-  return Ms(i, l);
+  return Ps(i, l);
 }
-function Ot(e) {
+function Bt(e) {
   const { attribute: t, config: r } = e;
   if (ap(e) && Rp(t)) {
     const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = Fi(r), o = Object.keys(i).length === 0 ? undefined : i;
@@ -2211,13 +2510,13 @@ function Ot(e) {
   }
   return e;
 }
-function un(e) {
+function Tn(e) {
   let t = [];
   for (const r of e)
-    X2(r) ? t = Mp(r, t) : t = Mp([Ot(r)], t);
+    Z(r) ? t = Mp(r, t) : t = Mp([Bt(r)], t);
   return t != null ? t : [];
 }
-var cn = (e) => {
+var qn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
@@ -2226,20 +2525,20 @@ var cn = (e) => {
       input: o
     };
     try {
-      const c = S2({
+      const c = D({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !X2(c) && !ne(c) ? i.push(F(g2({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !Z(c) && !oe(c) ? i.push(F(y2({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
-      const m2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g2({}, u), { message: m2 }));
+      const p2 = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y2({}, u), { message: p2 }));
     }
-  }), i.length > 0 ? { success: false, errors: i } : { success: true, data: un(n) };
+  }), i.length > 0 ? { success: false, errors: i } : { success: true, data: Tn(n) };
 };
-var Oe2 = (e) => {
+var Re = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ft(t) ? cn({
+  return t ? Ct2(t) ? qn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2254,7 +2553,7 @@ var Oe2 = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var ln = (e) => {
+var xn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
@@ -2263,20 +2562,20 @@ var ln = (e) => {
       input: o
     };
     try {
-      const c = S2({
+      const c = D({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      ne(c) ? n.push(Ot(c)) : i.push(F(g2({}, u), { message: "Invalid filter JSON" }));
+      oe(c) ? n.push(Bt(c)) : i.push(F(y2({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
-      const m2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g2({}, u), { message: m2 }));
+      const p2 = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y2({}, u), { message: p2 }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
-var Me = (e) => {
+var ve = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Ft(t) ? ln({
+  return t ? Ct2(t) ? xn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2291,42 +2590,42 @@ var Me = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var fn = (e, t) => {
+var $n = (e, t) => {
   if (e && !Lp(e))
-    return F(g2({}, t), {
+    return F(y2({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
 };
-var dn = (e, t, r) => {
+var Sn = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
-    const i = S2({
+    const i = D({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return Ee(i) ? { success: true, data: i } : {
+    return xe(i) ? { success: true, data: i } : {
       success: false,
-      errors: [F(g2({}, r), { message: "Invalid measure JSON" })]
+      errors: [F(y2({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
     const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: false,
-      errors: [F(g2({}, r), { message: o })]
+      errors: [F(y2({}, r), { message: o })]
     };
   }
 };
-var mn = (e, t, r, s) => {
-  const n = S2({
+var 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(g2({}, s), { message: "Invalid measure JSON" })
+      error: F(y2({}, s), { message: "Invalid measure JSON" })
     };
-  const i = fn(e.sortType, s);
+  const i = $n(e.sortType, s);
   if (i) {
     const a = ed(e, "column");
     return { measure: n, style: a, error: i };
@@ -2334,20 +2633,20 @@ var mn = (e, t, r, s) => {
   const o = ed(e, "column");
   return { measure: n, style: o };
 };
-var pn = (e, t, r, s) => {
-  if (As(e))
-    return mn(e, t, r, s);
-  if (E3(e)) {
-    const n = dn(e, { dataSource: t, schemaIndex: r }, s);
+var Dn = (e, t, r, s) => {
+  if ($s(e))
+    return On(e, t, r, s);
+  if (q3(e)) {
+    const n = Sn(e, { dataSource: t, schemaIndex: r }, s);
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: F(g2({}, s), {
+    error: F(y2({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
 };
-var Mt = (e) => {
+var zt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: true, data: [] };
@@ -2371,15 +2670,15 @@ var Mt = (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;
       }
       c.measure && n.push(c.style !== undefined ? { measure: c.measure, style: c.style } : { measure: c.measure });
     } catch (c) {
-      const m2 = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(g2({}, u), { message: m2 }));
+      const p2 = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(y2({}, u), { message: p2 }));
     }
   }), i.length > 0 ? { success: false, errors: i } : { success: true, data: n };
 };
@@ -2394,9 +2693,9 @@ function w(e, t, r) {
   }
   return s.data;
 }
-var ve = "$trend";
-var Ne = "$forecast";
-function yn(e) {
+var Ie = "$trend";
+var Pe = "$forecast";
+function Mn(e) {
   return e.map(({ attribute: t, style: r }) => {
     const s = r == null ? undefined : r.sortType;
     if (!s)
@@ -2405,36 +2704,36 @@ function yn(e) {
     return Lp(n) ? t.sort(Ap(n)) : t;
   });
 }
-function gn(e) {
+function Nn(e) {
   var t, r;
   return (r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false;
 }
-function hn(e) {
+function Rn2(e) {
   var t, r;
   return (r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false;
 }
-function bn(e) {
+function vn2(e) {
   var r, s;
   const t = [];
   for (const { measure: n, style: i } of e) {
     const o = i == null ? undefined : i.sortType, a = o && Lp(o) ? n.sort(Ap(o)) : n;
-    t.push(a), i != null && i.trend && !gn(n) && t.push(Ld(n, `${ve}_${(r = n.name) != null ? r : "Measure"}`, i.trend)), i != null && i.forecast && !hn(n) && t.push(Md(n, `${Ne}_${(s = n.name) != null ? s : "Measure"}`, i.forecast));
+    t.push(a), i != null && i.trend && !Nn(n) && t.push(Ld(n, `${Ie}_${(r = n.name) != null ? r : "Measure"}`, i.trend)), i != null && i.forecast && !Rn2(n) && t.push(Md(n, `${Pe}_${(s = n.name) != null ? s : "Measure"}`, i.forecast));
   }
   return t;
 }
-var Jn = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = xe(s), i = [], o = w(() => wt({
+var 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({
+  }), i), a = w(() => zt({
     data: t.measures || [],
     context: { dataSource: r, schemaIndex: n }
-  }), i), u = w(() => Oe2({
+  }), i), u = w(() => Re({
     data: t.filters || [],
     context: { dataSource: r, schemaIndex: n }
   }), i);
   let c = null;
-  return t.highlights && (c = w(() => Me({
+  return t.highlights && (c = w(() => ve({
     data: t.highlights || [],
     context: { dataSource: r, schemaIndex: n }
   }), i)), i.length > 0 ? {
@@ -2442,22 +2741,22 @@ var Jn = (e) => {
     errors: i
   } : {
     success: true,
-    data: g2({
+    data: y2({
       dataSource: Sp(r),
-      dimensions: o ? yn(o) : [],
-      measures: a ? bn(a) : [],
+      dimensions: o ? Mn(o) : [],
+      measures: a ? vn2(a) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Je(e) {
+function Qe(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== undefined;
 }
-function Re(e) {
+function ke(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var l, f2, h2;
-    const i = Je(s) ? s.column : s, o = Je(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var l, d, b2;
+    const i = Qe(s) ? s.column : s, o = Qe(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "dimensions",
@@ -2467,144 +2766,27 @@ function Re(e) {
       });
       return;
     }
-    if (!i.composeCode.startsWith(q3)) {
+    if (!i.composeCode.startsWith(E3)) {
       r.push({
         category: "dimensions",
         index: n,
         input: a(),
-        message: `Expected composeCode to start with '${q3}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
+        message: `Expected composeCode to start with '${E3}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (h2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? h2 : ((l = i.getSort) == null ? undefined : l.call(i)) !== undefined && ((f2 = i.getSort) == null ? undefined : f2.call(i)) !== C.None ? i.getSort() : undefined, c = o ? ed(o, "column") : {};
+    const u = (b2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? b2 : ((l = i.getSort) == null ? undefined : l.call(i)) !== undefined && ((d = i.getSort) == null ? undefined : d.call(i)) !== C.None ? i.getSort() : undefined, c = o ? ed(o, "column") : {};
     if (u !== undefined && u !== C.None || o && Object.keys(c).length > 0) {
-      const p2 = g2(g2({
+      const g2 = y2(y2({
         column: i.composeCode
       }, u !== undefined && u !== C.None && { sortType: Tp(u) }), c);
-      t.push(p2);
+      t.push(g2);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-function vt(e, t) {
-  const r = [];
-  let s = "", n = 0, i = false, o = null;
-  for (let a = 0;a < e.length; a++) {
-    const u = e[a], c = e[a + 1];
-    if (i) {
-      if (u !== o) {
-        s += u;
-        continue;
-      }
-      if (c === o) {
-        s += u + c, a++;
-        continue;
-      }
-      i = false, o = null, s += u;
-      continue;
-    } else {
-      if (u === "'" || u === '"') {
-        i = true, o = u, s += u;
-        continue;
-      }
-      if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === t && n === 0) {
-        r.push(s.trim()), s = "";
-        continue;
-      }
-    }
-    s += u;
-  }
-  return s.trim() && r.push(s.trim()), r;
-}
-function Fn(e, t) {
-  let r = 0, s = false, n = null;
-  for (let i = 0;i < e.length; i++) {
-    const o = e[i], a = e[i + 1];
-    if (s) {
-      if (o !== n)
-        continue;
-      if (a === n) {
-        i++;
-        continue;
-      }
-      s = false, n = null;
-    } else {
-      if (o === "'" || o === '"') {
-        s = true, n = o;
-        continue;
-      }
-      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0)
-        return i;
-    }
-  }
-  return -1;
-}
-function wn2(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 = Nt2(n);
-  return {
-    function: s,
-    args: i
-  };
-}
-function Nt2(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 true;
-  if (e === "false")
-    return false;
-  if (e.match(/^-?\d+(\.\d+)?$/))
-    return parseFloat(e);
-  if (e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"')) {
-    const r = e[0];
-    return e.slice(1, -1).replace(new RegExp(`${r}${r}`, "g"), r);
-  }
-  if (e.startsWith("[") && e.endsWith("]")) {
-    const r = e.slice(1, -1).trim();
-    if (!r)
-      return [];
-    const s = Nt2(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 = wn2(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);
-}
-var ge = "Unknown error";
-function Ie(e) {
+var be2 = "Unknown error";
+function Be(e) {
   if (!e)
     return { success: true, data: [] };
   const t = [];
@@ -2622,9 +2804,9 @@ function Ie(e) {
         ]
       };
     try {
-      return { success: true, data: [V(e.composeCode)] };
+      return { success: true, data: [W(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : ge;
+      const n = s instanceof Error ? s.message : be2;
       return {
         success: false,
         errors: [
@@ -2651,10 +2833,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 : be2;
       t.push({
         category: "filters",
         index: n,
@@ -2664,7 +2846,7 @@ function Ie(e) {
     }
   }), t.length > 0 ? { success: false, errors: t } : { success: true, data: r };
 }
-function ke(e) {
+function ze(e) {
   if (!e)
     return { success: true, data: [] };
   const t = [], r = [];
@@ -2680,10 +2862,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 : be2;
       r.push({
         category: "highlights",
         index: n,
@@ -2693,14 +2875,14 @@ function ke(e) {
     }
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-function Ye(e) {
+function Xe(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== undefined;
 }
-function Be(e) {
+function Le(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var u, c, m2;
-    const i = Ye(s) ? s.column : s, o = Ye(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var u, c, p2;
+    const i = Xe(s) ? s.column : s, o = Xe(s) ? s : undefined, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
     if (!i.composeCode) {
       r.push({
         category: "measures",
@@ -2711,42 +2893,42 @@ function Be(e) {
       return;
     }
     try {
-      const l = V(i.composeCode), f2 = (m2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? m2 : ((u = i.getSort) == null ? undefined : u.call(i)) !== undefined && ((c = i.getSort) == null ? undefined : c.call(i)) !== C.None ? i.getSort() : undefined;
-      if (f2 !== undefined && f2 !== C.None || o && Object.keys(ed(o, "column")).length > 0) {
-        const p2 = o ? ed(o, "column") : {}, d = g2(g2({
+      const l = W(i.composeCode), d = (p2 = o != null && o.sortType ? Ap(o.sortType) : undefined) != null ? p2 : ((u = i.getSort) == null ? undefined : u.call(i)) !== undefined && ((c = i.getSort) == null ? undefined : c.call(i)) !== C.None ? i.getSort() : undefined;
+      if (d !== undefined && d !== C.None || o && Object.keys(ed(o, "column")).length > 0) {
+        const g2 = o ? ed(o, "column") : {}, m2 = y2(y2({
           column: l
-        }, f2 !== undefined && f2 !== C.None && { sortType: Tp(f2) }), p2);
-        t.push(d);
+        }, d !== undefined && d !== C.None && { sortType: Tp(d) }), g2);
+        t.push(m2);
       } else
         t.push(l);
     } catch (l) {
-      const f2 = 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"}): ${f2}. ComposeCode: '${i.composeCode}'`
+        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${d}. ComposeCode: '${i.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: false, errors: r } : { success: true, data: t };
 }
-function Ge(e) {
+function Ze(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(ve)) != null ? n : false);
+  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.trend")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Ie)) != null ? n : false);
 }
-function Qe(e) {
+function et(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Ne)) != null ? n : false);
+  return ((r = (t = e.composeCode) == null ? undefined : t.includes("measureFactory.forecast")) != null ? r : false) || ((n = (s = e.name) == null ? undefined : s.startsWith(Pe)) != null ? n : false);
 }
-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] : undefined;
   } catch (t) {
     return;
   }
 }
-function Cn(e) {
+function In(e) {
   var s, n, i;
   if (!(e != null && e.length))
     return [];
@@ -2755,35 +2937,35 @@ function Cn(e) {
     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}`, m2 = `${Ne}_${u}`;
-    let l, f2, h2 = o + 1;
-    if (h2 < e.length && !t.has(h2) && Ge(e[h2]) && e[h2].name === c) {
-      const p2 = (n = e[h2].composeCode) == null ? undefined : n.trim();
-      p2 && (l = He(p2), t.add(h2), h2++);
+    const u = (s = a.name) != null ? s : "Measure", c = `${Ie}_${u}`, p2 = `${Pe}_${u}`;
+    let l, d, b2 = o + 1;
+    if (b2 < e.length && !t.has(b2) && Ze(e[b2]) && e[b2].name === c) {
+      const g2 = (n = e[b2].composeCode) == null ? undefined : n.trim();
+      g2 && (l = tt(g2), t.add(b2), b2++);
     }
-    if (h2 < e.length && !t.has(h2) && Qe(e[h2]) && e[h2].name === m2) {
-      const p2 = (i = e[h2].composeCode) == null ? undefined : i.trim();
-      p2 && (f2 = He(p2), t.add(h2));
+    if (b2 < e.length && !t.has(b2) && et(e[b2]) && e[b2].name === p2) {
+      const g2 = (i = e[b2].composeCode) == null ? undefined : i.trim();
+      g2 && (d = tt(g2), t.add(b2));
     }
-    l !== undefined || f2 !== undefined ? r.push(g2(g2({
+    l !== undefined || d !== undefined ? r.push(y2(y2({
       column: a
-    }, l && Object.keys(l).length > 0 && { trend: l }), f2 && Object.keys(f2).length > 0 && { forecast: f2 })) : 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) {
-  const t = [], r = w(() => Re(e.dimensions || []), t), s = Cn(e.measures || []), n = w(() => Be(s), t), i = w(() => Ie(e.filters), t);
+function oi(e) {
+  const t = [], r = w(() => ke(e.dimensions || []), t), s = In(e.measures || []), n = w(() => Le(s), t), i = w(() => Be(e.filters), t);
   let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = w(() => ke(e.highlights), t)), t.length > 0)
+  if (e.highlights && e.highlights.length > 0 && (o = w(() => ze(e.highlights), t)), t.length > 0)
     return {
       success: false,
       errors: t
     };
-  const a = g2({
+  const a = y2({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
@@ -2793,9 +2975,9 @@ function Yn(e) {
     data: Q(a)
   };
 }
-var It = new Set(Xp.filter((e) => e !== "image"));
-var Xe = Object.freeze([...It]);
-function _n(e) {
+var Lt = new Set(Xp.filter((e) => e !== "image"));
+var rt = Object.freeze([...Lt]);
+function Zn(e) {
   const { filters: t, relations: r } = bp(e.filters || []);
   return {
     dataSource: e.dataSource,
@@ -2806,9 +2988,9 @@ function _n(e) {
     highlights: e.highlights
   };
 }
-function Zn(e, t, r = false) {
-  const s = _n(e), n = jn(s, t);
+function fi(e, t, r = false) {
+  const s = Zn(e), n = jn(s, t);
   return Dh(n, r);
 }
 
-export { y, N, q, Kn, Jn, Yn, Zn };
+export { y, N, q, ni, ii, oi, fi };