@sisense/sdk-ui 2.28.0 → 2.30.0

package/dist/analytics-composer/node.js

@@ -1,54 +1,53 @@
-var sr = Object.defineProperty, nr = Object.defineProperties;
-var ir = Object.getOwnPropertyDescriptors;
-var ie = Object.getOwnPropertySymbols;
-var We = Object.prototype.hasOwnProperty, Ve = Object.prototype.propertyIsEnumerable;
-var Pe = (e, t, r) => t in e ? sr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, l = (e, t) => {
+var cr = Object.defineProperty, lr = Object.defineProperties;
+var fr = Object.getOwnPropertyDescriptors;
+var oe = Object.getOwnPropertySymbols;
+var Ke = Object.prototype.hasOwnProperty, Ge = Object.prototype.propertyIsEnumerable;
+var Je = (e, t, r) => t in e ? cr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, l = (e, t) => {
   for (var r in t || (t = {}))
-    We.call(t, r) && Pe(e, r, t[r]);
-  if (ie)
-    for (var r of ie(t))
-      Ve.call(t, r) && Pe(e, r, t[r]);
+    Ke.call(t, r) && Je(e, r, t[r]);
+  if (oe)
+    for (var r of oe(t))
+      Ge.call(t, r) && Je(e, r, t[r]);
   return e;
-}, F = (e, t) => nr(e, ir(t));
-var ye = (e, t) => {
+}, E = (e, t) => lr(e, fr(t));
+var Ee = (e, t) => {
   var r = {};
   for (var s in e)
-    We.call(e, s) && t.indexOf(s) < 0 && (r[s] = e[s]);
-  if (e != null && ie)
-    for (var s of ie(e))
-      t.indexOf(s) < 0 && Ve.call(e, s) && (r[s] = e[s]);
+    Ke.call(e, s) && t.indexOf(s) < 0 && (r[s] = e[s]);
+  if (e != null && oe)
+    for (var s of oe(e))
+      t.indexOf(s) < 0 && Ge.call(e, s) && (r[s] = e[s]);
   return r;
 };
-import { f as or, J as ar } from "../types-D3fPN43o.js";
-import { b as Bi, E as Li, a as zi, i as Ui, e as _i, d as Pi } from "../types-D3fPN43o.js";
-import { cj as ur, bs as cr, ck as lr, cl as dr, cm as fr, aw as De, cn as pr, av as mr, co as gr, bb as yr, ax as hr, cp as br, be as Er, bc as Fr, aO as Ar, ba as wr, bd as Tr, d as Sr, c as Cr, k as qr, cq as $r, cr as Or, cs as Dr, ct as xr, cu as vr, cv as Nr, cw as Mr, cx as Rr, cy as Ir, cz as kr, cA as Br, aq as Lr, cB as zr, cC as Ur, S as U, t as ee, h as _r, b as $, ai as _, at as ct, cD as Pr, cE as Wr, cF as Vr, M as j, cc as jr, cG as Jr, aK as Kr, aj as je, au as le, cg as Gr, ch as Yr, bQ as lt, cH as dt, ad as Hr, cI as ft, cJ as pt, A as Qr, b_ as mt, cK as Xr, bH as Zr, aD as es } from "../apply-styled-options-to-query-BagjzMqm.js";
-import { i as ts, b as rs, D as ss, d as ns, a as is } from "../dimensions-Bn1EaWiP.js";
-function os(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));
+import { f as dr, J as mr } from "../types-DecTaxy7.js";
+import { b as Hi, E as Qi, a as Xi, i as Zi, e as ea, d as ta } from "../types-DecTaxy7.js";
+import { bt as pr, br as gr, cr as yr, bs as hr, aW as br, cs as Fr, ct as Er, aw as Me, cu as Ar, av as Tr, cv as wr, bh as Sr, ax as Cr, cw as Or, bk as $r, bi as qr, aS as Dr, bg as xr, bj as Nr, cx as vr, at as Mr, bB as Rr, cy as Ir, e as kr, cz as Lr, cA as Br, cB as _r, cC as zr, cD as Ur, cE as Pr, cF as Wr, cG as Vr, cH as jr, cI as Jr, cJ as Kr, as as Gr, cK as Yr, cL as Hr, ak as z, l as se, b as Qr, x as $, a4 as Xr, ag as U, aj as gt, cM as Zr, cN as es, cO as ts, M as J, aX as rs, cP as ss, aO as ns, am as Ye, au as me, cj as is, ck as as, bZ as yt, cQ as ht, ab as os, cR as bt, cS as Ft, A as us, c6 as Et, cT as cs, bQ as ls, aE as fs } from "../apply-styled-options-to-query-BK1NnV4P.js";
+function ds(e, t) {
+  const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, a) => Array.from({ length: s + 1 }, (o, u) => a === 0 ? u : u === 0 ? a : 0));
   for (let i = 1; i <= r; i++)
-    for (let o = 1; o <= s; o++)
-      n[i][o] = Math.min(n[i - 1][o] + 1, n[i][o - 1] + 1, n[i - 1][o - 1] + (e[i - 1] === t[o - 1] ? 0 : 1));
+    for (let a = 1; a <= s; a++)
+      n[i][a] = Math.min(n[i - 1][a] + 1, n[i][a - 1] + 1, n[i - 1][a - 1] + (e[i - 1] === t[a - 1] ? 0 : 1));
   return n[r][s];
 }
-function xe(e, t) {
+function Re(e, t) {
   const r = [];
-  let s = "", n = 0, i = !1, o = null;
-  for (let a = 0; a < e.length; a++) {
-    const u = e[a], c = e[a + 1];
+  let s = "", n = 0, i = !1, a = null;
+  for (let o = 0; o < e.length; o++) {
+    const u = e[o], c = e[o + 1];
     if (i) {
-      if (u !== o) {
+      if (u !== a) {
         s += u;
         continue;
       }
-      if (c === o) {
-        s += u + c, a++;
+      if (c === a) {
+        s += u + c, o++;
         continue;
       }
-      i = !1, o = null, s += u;
+      i = !1, a = null, s += u;
       continue;
     } else {
       if (u === "'" || u === '"') {
-        i = !0, o = u, s += u;
+        i = !0, a = u, s += u;
         continue;
       }
       if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === t && n === 0) {
@@ -60,61 +59,61 @@ function xe(e, t) {
   }
   return s.trim() && r.push(s.trim()), r;
 }
-function as(e, t) {
+function ms(e, t) {
   let r = 0, s = !1, n = null;
   for (let i = 0; i < e.length; i++) {
-    const o = e[i], a = e[i + 1];
+    const a = e[i], o = e[i + 1];
     if (s) {
-      if (o !== n)
+      if (a !== n)
         continue;
-      if (a === n) {
+      if (o === n) {
         i++;
         continue;
       }
       s = !1, n = null;
     } else {
-      if (o === "'" || o === '"') {
-        s = !0, n = o;
+      if (a === "'" || a === '"') {
+        s = !0, n = a;
         continue;
       }
-      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0)
+      if ("([{".includes(a) && r++, ")]}".includes(a) && r--, a === t && r === 0)
         return i;
     }
   }
   return -1;
 }
-function us(e, t) {
+function ps(e, t) {
   if (e[t] !== "(")
     return -1;
   let r = 1, s = t + 1, n = !1, i = null;
   for (; s < e.length; ) {
-    const o = e[s], a = e[s + 1];
+    const a = e[s], o = e[s + 1];
     if (n) {
-      if (o !== i) {
+      if (a !== i) {
         s++;
         continue;
       }
-      if (a === i) {
+      if (o === i) {
         s += 2;
         continue;
       }
       n = !1, i = null, s++;
     } else {
-      if (o === "'" || o === '"') {
-        n = !0, i = o, s++;
+      if (a === "'" || a === '"') {
+        n = !0, i = a, s++;
         continue;
       }
-      if ("([{".includes(o) && r++, ")]}".includes(o) && --r === 0)
+      if ("([{".includes(a) && r++, ")]}".includes(a) && --r === 0)
         return s;
       s++;
     }
   }
   return -1;
 }
-function cs(e) {
+function gs(e) {
   return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
 }
-function J(e) {
+function K(e) {
   if (!e || typeof e != "string")
     throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
   const t = e.trim();
@@ -123,16 +122,16 @@ function J(e) {
   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 = gt(n);
+  const s = r[1], n = r[2], i = At(n);
   return {
     function: s,
     args: i
   };
 }
-function gt(e) {
-  return e.trim() ? xe(e, ",").map(yt) : [];
+function At(e) {
+  return e.trim() ? Re(e, ",").map(Tt) : [];
 }
-function yt(e) {
+function Tt(e) {
   if (!e)
     throw new Error("Cannot parse empty argument value");
   if (e === "null")
@@ -153,29 +152,29 @@ function yt(e) {
     const r = e.slice(1, -1).trim();
     if (!r)
       return [];
-    const s = gt(r);
+    const s = At(r);
     return s.every((n) => typeof n == "string"), s;
   }
   if (e.startsWith("{") && e.endsWith("}")) {
     const r = e.slice(1, -1).trim();
-    return r ? ds(r) : {};
+    return r ? hs(r) : {};
   }
-  return e.includes("(") && e.includes(")") ? J(e) : (e.startsWith("DM."), e);
+  return e.includes("(") && e.includes(")") ? K(e) : (e.startsWith("DM."), e);
 }
-function ls(e) {
-  const t = as(e, ":");
+function ys(e) {
+  const t = ms(e, ":");
   if (t === -1)
     throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = cs(e.slice(0, t).trim()), s = yt(e.slice(t + 1).trim());
+  const r = gs(e.slice(0, t).trim()), s = Tt(e.slice(t + 1).trim());
   return [r, s];
 }
-function ds(e) {
+function hs(e) {
   if (!e.trim())
     return {};
-  const t = xe(e, ",").map(ls).filter(([, r]) => r !== null);
+  const t = Re(e, ",").map(ys).filter(([, r]) => r !== null);
   return Object.fromEntries(t);
 }
-class fs {
+class bs {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -192,9 +191,9 @@ class fs {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class ht {
+class wt {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new fs();
+    this.generateIdentifier = t, this.kv = new bs();
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -209,7 +208,7 @@ class ht {
     return this.kv.getByKey(t);
   }
 }
-class ps extends ht {
+class Fs extends wt {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -220,7 +219,7 @@ class ps extends ht {
     return this.classToAllowedProps.get(t);
   }
 }
-function ms(e) {
+function Es(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -228,8 +227,8 @@ function ms(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function gs(e, t) {
-  const r = ms(e);
+function As(e, t) {
+  const r = Es(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -239,20 +238,20 @@ function gs(e, t) {
       return i;
   }
 }
-function K(e, t) {
+function G(e, t) {
   Object.entries(e).forEach(([r, s]) => t(s, r));
 }
-function oe(e, t) {
+function ue(e, t) {
   return e.indexOf(t) !== -1;
 }
-function Je(e, t) {
+function He(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class ys {
+class Ts {
   constructor() {
     this.transfomers = {};
   }
@@ -260,13 +259,13 @@ class ys {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return gs(this.transfomers, (r) => r.isApplicable(t));
+    return As(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const hs = (e) => Object.prototype.toString.call(e).slice(8, -1), bt = (e) => typeof e == "undefined", bs = (e) => e === null, H = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, we = (e) => H(e) && Object.keys(e).length === 0, k = (e) => Array.isArray(e), Es = (e) => typeof e == "string", Fs = (e) => typeof e == "number" && !isNaN(e), As = (e) => typeof e == "boolean", ws = (e) => e instanceof RegExp, Q = (e) => e instanceof Map, X = (e) => e instanceof Set, Et = (e) => hs(e) === "Symbol", Ts = (e) => e instanceof Date && !isNaN(e.valueOf()), Ss = (e) => e instanceof Error, Ke = (e) => typeof e == "number" && isNaN(e), Cs = (e) => As(e) || bs(e) || bt(e) || Fs(e) || Es(e) || Et(e), qs = (e) => typeof e == "bigint", $s = (e) => e === 1 / 0 || e === -1 / 0, Os = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), Ds = (e) => e instanceof URL, Ft = (e) => e.replace(/\./g, "\\."), he = (e) => e.map(String).map(Ft).join("."), Y = (e) => {
+const ws = (e) => Object.prototype.toString.call(e).slice(8, -1), St = (e) => typeof e == "undefined", Ss = (e) => e === null, Z = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Oe = (e) => Z(e) && Object.keys(e).length === 0, k = (e) => Array.isArray(e), Cs = (e) => typeof e == "string", Os = (e) => typeof e == "number" && !isNaN(e), $s = (e) => typeof e == "boolean", qs = (e) => e instanceof RegExp, ee = (e) => e instanceof Map, te = (e) => e instanceof Set, Ct = (e) => ws(e) === "Symbol", Ds = (e) => e instanceof Date && !isNaN(e.valueOf()), xs = (e) => e instanceof Error, Qe = (e) => typeof e == "number" && isNaN(e), Ns = (e) => $s(e) || Ss(e) || St(e) || Os(e) || Cs(e) || Ct(e), vs = (e) => typeof e == "bigint", Ms = (e) => e === 1 / 0 || e === -1 / 0, Rs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), Is = (e) => e instanceof URL, Ot = (e) => e.replace(/\./g, "\\."), Ae = (e) => e.map(String).map(Ot).join("."), Q = (e) => {
   const t = [];
   let r = "";
   for (let n = 0; n < e.length; n++) {
@@ -292,12 +291,12 @@ function I(e, t, r, s) {
     untransform: s
   };
 }
-const At = [
-  I(bt, "undefined", () => null, () => {
+const $t = [
+  I(St, "undefined", () => null, () => {
   }),
-  I(qs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  I(Ts, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  I(Ss, "Error", (e, t) => {
+  I(vs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  I(Ds, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  I(xs, "Error", (e, t) => {
     const r = {
       name: e.name,
       message: e.message
@@ -311,24 +310,24 @@ const At = [
       r[s] = e[s];
     }), r;
   }),
-  I(ws, "regexp", (e) => "" + e, (e) => {
+  I(qs, "regexp", (e) => "" + e, (e) => {
     const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(t, r);
   }),
   I(
-    X,
+    te,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  I(Q, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  I((e) => Ke(e) || $s(e), "number", (e) => Ke(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  I(ee, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  I((e) => Qe(e) || Ms(e), "number", (e) => Qe(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
   I((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  I(Ds, "URL", (e) => e.toString(), (e) => new URL(e))
+  I(Is, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function de(e, t, r, s) {
+function pe(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -336,12 +335,12 @@ function de(e, t, r, s) {
     untransform: s
   };
 }
-const wt = de((e, t) => Et(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+const qt = pe((e, t) => Ct(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
   const s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), xs = [
+}), ks = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -351,16 +350,16 @@ const wt = de((e, t) => Et(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), Tt = de(Os, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = xs[t[1]];
+].reduce((e, t) => (e[t.name] = t, e), {}), Dt = pe(Rs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
+  const r = ks[t[1]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function St(e, t) {
+function xt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const Ct = de(St, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+const Nt = pe(xt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
     return l({}, e);
@@ -373,49 +372,49 @@ const Ct = de(St, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructo
   if (!s)
     throw new Error(`Trying to deserialize unknown class '${t[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
   return Object.assign(Object.create(s.prototype), e);
-}), qt = de((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) => {
+}), vt = pe((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);
-}), vs = [Ct, wt, qt, Tt], Ge = (e, t) => {
-  const r = Je(vs, (n) => n.isApplicable(e, t));
+}), Ls = [Nt, qt, vt, Dt], Xe = (e, t) => {
+  const r = He(Ls, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = Je(At, (n) => n.isApplicable(e, t));
+  const s = He($t, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
-}, $t = {};
-At.forEach((e) => {
-  $t[e.annotation] = e;
+}, Mt = {};
+$t.forEach((e) => {
+  Mt[e.annotation] = e;
 });
-const Ns = (e, t, r) => {
+const Bs = (e, t, r) => {
   if (k(t))
     switch (t[0]) {
       case "symbol":
-        return wt.untransform(e, t, r);
+        return qt.untransform(e, t, r);
       case "class":
-        return Ct.untransform(e, t, r);
+        return Nt.untransform(e, t, r);
       case "custom":
-        return qt.untransform(e, t, r);
+        return vt.untransform(e, t, r);
       case "typed-array":
-        return Tt.untransform(e, t, r);
+        return Dt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = $t[t];
+    const s = Mt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
   }
-}, V = (e, t) => {
+}, j = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -423,52 +422,52 @@ const Ns = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function Ot(e) {
-  if (oe(e, "__proto__"))
+function Rt(e) {
+  if (ue(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (oe(e, "prototype"))
+  if (ue(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (oe(e, "constructor"))
+  if (ue(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const Ms = (e, t) => {
-  Ot(t);
+const _s = (e, t) => {
+  Rt(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
-    if (X(e))
-      e = V(e, +s);
-    else if (Q(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = V(e, n);
+    if (te(e))
+      e = j(e, +s);
+    else if (ee(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = j(e, n);
       switch (i) {
         case "key":
-          e = o;
+          e = a;
           break;
         case "value":
-          e = e.get(o);
+          e = e.get(a);
           break;
       }
     } else
       e = e[s];
   }
   return e;
-}, Te = (e, t, r) => {
-  if (Ot(t), t.length === 0)
+}, $e = (e, t, r) => {
+  if (Rt(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
-    const o = t[i];
+    const a = t[i];
     if (k(s)) {
-      const a = +o;
-      s = s[a];
-    } else if (H(s))
+      const o = +a;
       s = s[o];
-    else if (X(s)) {
-      const a = +o;
-      s = V(s, a);
-    } else if (Q(s)) {
+    } else if (Z(s))
+      s = s[a];
+    else if (te(s)) {
+      const o = +a;
+      s = j(s, o);
+    } else if (ee(s)) {
       if (i === t.length - 2)
         break;
-      const u = +o, c = +t[++i] == 0 ? "key" : "value", g = V(s, u);
+      const u = +a, c = +t[++i] == 0 ? "key" : "value", g = j(s, u);
       switch (c) {
         case "key":
           s = g;
@@ -480,130 +479,130 @@ const Ms = (e, t) => {
     }
   }
   const n = t[t.length - 1];
-  if (k(s) ? s[+n] = r(s[+n]) : H(s) && (s[n] = r(s[n])), X(s)) {
-    const i = V(s, +n), o = r(i);
-    i !== o && (s.delete(i), s.add(o));
+  if (k(s) ? s[+n] = r(s[+n]) : Z(s) && (s[n] = r(s[n])), te(s)) {
+    const i = j(s, +n), a = r(i);
+    i !== a && (s.delete(i), s.add(a));
   }
-  if (Q(s)) {
-    const i = +t[t.length - 2], o = V(s, i);
+  if (ee(s)) {
+    const i = +t[t.length - 2], a = j(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
-        const u = r(o);
-        s.set(u, s.get(o)), u !== o && s.delete(o);
+        const u = r(a);
+        s.set(u, s.get(a)), u !== a && s.delete(a);
         break;
       }
       case "value": {
-        s.set(o, r(s.get(o)));
+        s.set(a, r(s.get(a)));
         break;
       }
     }
   }
   return e;
 };
-function Se(e, t, r = []) {
+function qe(e, t, r = []) {
   if (!e)
     return;
   if (!k(e)) {
-    K(e, (i, o) => Se(i, t, [...r, ...Y(o)]));
+    G(e, (i, a) => qe(i, t, [...r, ...Q(a)]));
     return;
   }
   const [s, n] = e;
-  n && K(n, (i, o) => {
-    Se(i, t, [...r, ...Y(o)]);
+  n && G(n, (i, a) => {
+    qe(i, t, [...r, ...Q(a)]);
   }), t(s, r);
 }
-function Rs(e, t, r) {
-  return Se(t, (s, n) => {
-    e = Te(e, n, (i) => Ns(i, s, r));
+function zs(e, t, r) {
+  return qe(t, (s, n) => {
+    e = $e(e, n, (i) => Bs(i, s, r));
   }), e;
 }
-function Is(e, t) {
+function Us(e, t) {
   function r(s, n) {
-    const i = Ms(e, Y(n));
-    s.map(Y).forEach((o) => {
-      e = Te(e, o, () => i);
+    const i = _s(e, Q(n));
+    s.map(Q).forEach((a) => {
+      e = $e(e, a, () => i);
     });
   }
   if (k(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = Te(e, Y(i), () => e);
-    }), n && K(n, r);
+      e = $e(e, Q(i), () => e);
+    }), n && G(n, r);
   } else
-    K(t, r);
+    G(t, r);
   return e;
 }
-const ks = (e, t) => H(e) || k(e) || Q(e) || X(e) || St(e, t);
-function Bs(e, t, r) {
+const Ps = (e, t) => Z(e) || k(e) || ee(e) || te(e) || xt(e, t);
+function Ws(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function Ls(e, t) {
+function Vs(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
     if (n.length <= 1)
       return;
-    t || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
-    const [i, ...o] = n;
-    i.length === 0 ? s = o.map(he) : r[he(i)] = o.map(he);
-  }), s ? we(r) ? [s] : [s, r] : we(r) ? void 0 : r;
+    t || (n = n.map((o) => o.map(String)).sort((o, u) => o.length - u.length));
+    const [i, ...a] = n;
+    i.length === 0 ? s = a.map(Ae) : r[Ae(i)] = a.map(Ae);
+  }), s ? Oe(r) ? [s] : [s, r] : Oe(r) ? void 0 : r;
 }
-const Dt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
+const It = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
   var h;
-  const a = Cs(e);
-  if (!a) {
-    Bs(e, n, t);
-    const b = o.get(e);
+  const o = Ns(e);
+  if (!o) {
+    Ws(e, n, t);
+    const b = a.get(e);
     if (b)
       return s ? {
         transformedValue: null
       } : b;
   }
-  if (!ks(e, r)) {
-    const b = Ge(e, r), p = b ? {
+  if (!Ps(e, r)) {
+    const b = Xe(e, r), m = b ? {
       transformedValue: b.value,
       annotations: [b.type]
     } : {
       transformedValue: e
     };
-    return a || o.set(e, p), p;
+    return o || a.set(e, m), m;
   }
-  if (oe(i, e))
+  if (ue(i, e))
     return {
       transformedValue: null
     };
-  const u = Ge(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, g = k(c) ? [] : {}, d = {};
-  K(c, (b, p) => {
-    if (p === "__proto__" || p === "constructor" || p === "prototype")
-      throw new Error(`Detected property ${p}. This is a prototype pollution risk, please remove it from your object.`);
-    const E = Dt(b, t, r, s, [...n, p], [...i, e], o);
-    g[p] = E.transformedValue, k(E.annotations) ? d[p] = E.annotations : H(E.annotations) && K(E.annotations, (C, v) => {
-      d[Ft(p) + "." + v] = C;
+  const u = Xe(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, g = k(c) ? [] : {}, f = {};
+  G(c, (b, m) => {
+    if (m === "__proto__" || m === "constructor" || m === "prototype")
+      throw new Error(`Detected property ${m}. This is a prototype pollution risk, please remove it from your object.`);
+    const F = It(b, t, r, s, [...n, m], [...i, e], a);
+    g[m] = F.transformedValue, k(F.annotations) ? f[m] = F.annotations : Z(F.annotations) && G(F.annotations, (O, N) => {
+      f[Ot(m) + "." + N] = O;
     });
   });
-  const m = we(d) ? {
+  const p = Oe(f) ? {
     transformedValue: g,
     annotations: u ? [u.type] : void 0
   } : {
     transformedValue: g,
-    annotations: u ? [u.type, d] : d
+    annotations: u ? [u.type, f] : f
   };
-  return a || o.set(e, m), m;
+  return o || a.set(e, p), p;
 };
-function xt(e) {
+function kt(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Ye(e) {
-  return xt(e) === "Array";
+function Ze(e) {
+  return kt(e) === "Array";
 }
-function zs(e) {
-  if (xt(e) !== "Object")
+function js(e) {
+  if (kt(e) !== "Object")
     return !1;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function Us(e, t, r, s, n) {
+function Js(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,
@@ -612,17 +611,17 @@ function Us(e, t, r, s, n) {
     configurable: !0
   });
 }
-function Ce(e, t = {}) {
-  if (Ye(e))
-    return e.map((n) => Ce(n, t));
-  if (!zs(e))
+function De(e, t = {}) {
+  if (Ze(e))
+    return e.map((n) => De(n, t));
+  if (!js(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Ye(t.props) && !t.props.includes(i))
+    if (Ze(t.props) && !t.props.includes(i))
       return n;
-    const o = e[i], a = Ce(o, t);
-    return Us(n, i, a, e, t.nonenumerable), n;
+    const a = e[i], o = De(a, t);
+    return Js(n, i, o, e, t.nonenumerable), n;
   }, {});
 }
 class y {
@@ -630,27 +629,27 @@ class y {
    * @param dedupeReferentialEqualities  If true, SuperJSON will make sure only one instance of referentially equal objects are serialized and the rest are replaced with `null`.
    */
   constructor({ dedupe: t = !1 } = {}) {
-    this.classRegistry = new ps(), this.symbolRegistry = new ht((r) => {
+    this.classRegistry = new Fs(), this.symbolRegistry = new wt((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new ys(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new Ts(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = Dt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = It(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = F(l({}, n.meta), {
+    s.annotations && (n.meta = E(l({}, n.meta), {
       values: s.annotations
     }));
-    const i = Ls(r, this.dedupe);
-    return i && (n.meta = F(l({}, n.meta), {
+    const i = Vs(r, this.dedupe);
+    return i && (n.meta = E(l({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
-    let n = Ce(r);
-    return s != null && s.values && (n = Rs(n, s.values, this)), s != null && s.referentialEqualities && (n = Is(n, s.referentialEqualities)), n;
+    let n = De(r);
+    return s != null && s.values && (n = zs(n, s.values, this)), s != null && s.referentialEqualities && (n = Us(n, s.referentialEqualities)), n;
   }
   stringify(t) {
     return JSON.stringify(this.serialize(t));
@@ -682,15 +681,22 @@ y.registerClass = y.defaultInstance.registerClass.bind(y.defaultInstance);
 y.registerSymbol = y.defaultInstance.registerSymbol.bind(y.defaultInstance);
 y.registerCustom = y.defaultInstance.registerCustom.bind(y.defaultInstance);
 y.allowErrorProps = y.defaultInstance.allowErrorProps.bind(y.defaultInstance);
-const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e.type), ve = (e) => new Sr(
+const P = (e) => e === void 0 ? z.None : e, W = (e) => {
+  var t, r;
+  return (r = (t = e.title) != null ? t : e.name) != null ? r : "";
+}, Ks = (e) => new mr(e.metadataItem, e.type), Ie = (e) => new vr(
   e.name,
   e.expression,
   e.type,
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), Ne = (e) => new Cr(
+  e.composeCode,
+  e.panel,
+  e.indexed,
+  e.merged,
+  W(e)
+), ke = (e) => new Mr(
   e.name,
   e.expression,
   e.granularity,
@@ -698,28 +704,33 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), N = (e) => {
+  e.composeCode,
+  e.panel,
+  e.indexed,
+  e.merged,
+  W(e)
+), v = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return ve(e);
+      return Ie(e);
     case "DimensionalLevelAttribute":
-      return Ne(e);
+      return ke(e);
     default:
       return e;
   }
-}, vt = (e) => new ss(
+}, Lt = (e) => new Rr(
   e.name,
   e.expression,
-  e.attributes.map(N),
-  e.dimensions.map(Ps),
+  e.attributes.map(v),
+  e.dimensions.map(Gs),
   e.type,
   e.description,
   P(e.sort),
   e.dataSource,
   e.composeCode,
-  e.defaultAttribute ? N(e.defaultAttribute) : void 0
-), Nt = (e) => new ns(
+  e.defaultAttribute ? v(e.defaultAttribute) : void 0,
+  W(e)
+), Bt = (e) => new Ir(
   e.name,
   e.expression,
   e.description,
@@ -727,45 +738,62 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
   e.dataSource,
   e.composeCode,
   e.indexed,
-  e.merged
-), Ps = (e) => {
+  e.merged,
+  W(e)
+), Gs = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return vt(e);
+      return Lt(e);
     case "DimensionalDateDimension":
-      return Nt(e);
+      return Bt(e);
     default:
       return e;
   }
-}, Me = (e) => new qr(
+}, Le = (e) => new kr(
   e.name,
-  N(e.attribute),
+  v(e.attribute),
   e.aggregation,
   e.format,
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), Re = (e) => {
+  e.composeCode,
+  W(e)
+), Be = (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, ve(s)];
+            return [r, Ie(s)];
           case "DimensionalLevelAttribute":
-            return [r, Ne(s)];
+            return [r, ke(s)];
           case "DimensionalBaseMeasure":
-            return [r, Me(s)];
+            return [r, Le(s)];
           case "DimensionalCalculatedMeasure":
-            return [r, Re(s)];
+            return [r, Be(s)];
+          case "DimensionalMeasureTemplate":
+            return [r, _e(s)];
+          case "MembersFilter":
+          case "LogicalAttributeFilter":
+          case "CascadingFilter":
+          case "ExcludeFilter":
+          case "MeasureFilter":
+          case "RankingFilter":
+          case "MeasureRankingFilter":
+          case "NumericFilter":
+          case "TextFilter":
+          case "DateRangeFilter":
+          case "RelativeDateFilter":
+          case "CustomFilter":
+            return [r, S(s)];
           default:
             return [r, s];
         }
       return [r, s];
     })
   );
-  return new $r(
+  return new Lr(
     e.name,
     e.expression,
     t,
@@ -773,60 +801,62 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
     e.description,
     P(e.sort),
     e.dataSource,
-    e.composeCode
+    e.composeCode,
+    W(e)
   );
-}, Mt = (e) => new Or(
+}, _e = (e) => new Br(
   e.name,
-  N(e.attribute),
+  v(e.attribute),
   e.format,
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), be = (e) => {
+  e.composeCode,
+  W(e)
+), Te = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Me(e);
+      return Le(e);
     case "DimensionalCalculatedMeasure":
-      return Re(e);
+      return Be(e);
     case "DimensionalMeasureTemplate":
-      return Mt(e);
+      return _e(e);
     default:
       return e;
   }
 }, S = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Ur(
-        N(e.attribute),
+      return new Hr(
+        v(e.attribute),
         e.members,
-        e.config.backgroundFilter ? F(l({}, e.config), { backgroundFilter: S(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? E(l({}, e.config), { backgroundFilter: S(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new zr(
+      return new Yr(
         e.filters.map((r) => S(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new Lr(
+      return new Gr(
         e._filters.map((r) => S(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Br(
+      return new Kr(
         S(e.filter),
         e.input ? S(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new kr(
-        N(e.attribute),
-        be(e.measure),
+      return new Jr(
+        v(e.attribute),
+        Te(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -835,25 +865,25 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
         e.composeCode
       );
     case "RankingFilter":
-      return new Ir(
-        N(e.attribute),
-        be(e.measure),
+      return new jr(
+        v(e.attribute),
+        Te(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Rr(
-        be(e.measure),
+      return new Vr(
+        Te(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new Mr(
-        N(e.attribute),
+      return new Wr(
+        v(e.attribute),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -862,8 +892,8 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new Nr(
-        N(e.attribute),
+      return new Pr(
+        v(e.attribute),
         e.operatorA,
         e.valueA,
         e.config,
@@ -871,8 +901,8 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
       );
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new vr(
-        N(e.attribute),
+      return new Ur(
+        v(e.attribute),
         r,
         s,
         e.config,
@@ -880,8 +910,8 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
       );
     }
     case "RelativeDateFilter":
-      return new xr(
-        N(e.attribute),
+      return new zr(
+        v(e.attribute),
         e.offset,
         e.count,
         e.operator,
@@ -890,8 +920,8 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
         e.composeCode
       );
     case "CustomFilter":
-      return new Dr(
-        N(e.attribute),
+      return new _r(
+        v(e.attribute),
         e.jaqlExpression,
         e.config,
         e.composeCode
@@ -902,71 +932,71 @@ const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e
 };
 y.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: dr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => _s(e)
+    deserialize: (e) => Ks(e)
   },
   "JaqlElement"
 );
 y.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ve(e)
+    deserialize: (e) => Ie(e)
   },
   "DimensionalAttribute"
 );
 y.registerCustom(
   {
-    isApplicable: cr,
+    isApplicable: gr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ne(e)
+    deserialize: (e) => ke(e)
   },
   "DimensionalLevelAttribute"
 );
 y.registerCustom(
   {
-    isApplicable: ts,
+    isApplicable: yr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => vt(e)
+    deserialize: (e) => Lt(e)
   },
   "DimensionalDimension"
 );
 y.registerCustom(
   {
-    isApplicable: rs,
+    isApplicable: hr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Nt(e)
+    deserialize: (e) => Bt(e)
   },
   "DimensionalDateDimension"
 );
 y.registerCustom(
   {
-    isApplicable: lr,
+    isApplicable: br,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Me(e)
+    deserialize: (e) => Le(e)
   },
   "DimensionalBaseMeasure"
 );
 y.registerCustom(
   {
-    isApplicable: dr,
+    isApplicable: Fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Re(e)
+    deserialize: (e) => Be(e)
   },
   "DimensionalCalculatedMeasure"
 );
 y.registerCustom(
   {
-    isApplicable: fr,
+    isApplicable: Er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Mt(e)
+    deserialize: (e) => _e(e)
   },
   "DimensionalMeasureTemplate"
 );
 y.registerCustom(
   {
-    isApplicable: De,
+    isApplicable: Me,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -974,7 +1004,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: pr,
+    isApplicable: Ar,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -982,7 +1012,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: mr,
+    isApplicable: Tr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -990,7 +1020,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: gr,
+    isApplicable: wr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -998,7 +1028,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: yr,
+    isApplicable: Sr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1006,7 +1036,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: hr,
+    isApplicable: Cr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1014,7 +1044,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: br,
+    isApplicable: Or,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1022,7 +1052,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Er,
+    isApplicable: $r,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1030,7 +1060,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Fr,
+    isApplicable: qr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1038,7 +1068,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Ar,
+    isApplicable: Dr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1046,7 +1076,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: wr,
+    isApplicable: xr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1054,64 +1084,64 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Tr,
+    isApplicable: Nr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
   "CustomFilter"
 );
-const Di = y, w = "DM.";
-function O(e) {
+const Ui = y, T = "DM.";
+function q(e) {
   return typeof e == "object" && e !== null;
 }
-function q(e) {
+function w(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Rt(e) {
-  return e.every(q);
+function _t(e) {
+  return Array.isArray(e) && e.every(w);
 }
-function fe(e) {
+function ge(e) {
   return "attribute" in e && "config" in e;
 }
-function te(e) {
+function H(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function Ie(e) {
-  return !fe(e) && !te(e);
+function ze(e) {
+  return !ge(e) && !H(e);
 }
-function Ws(e) {
-  return O(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+function zt(e) {
+  return q(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function Vs(e) {
-  return !O(e) || !("column" in e) ? !1 : q(e.column);
+function Ut(e) {
+  return !q(e) || !("column" in e) ? !1 : w(e.column);
 }
-const T = 3;
+const C = 3;
 function x(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 = os(e, o);
-    a < s && (s = a, n = i);
+    const a = r(i), o = ds(e, a);
+    o < s && (s = o, n = i);
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-const It = "en";
-function Ee(e, t) {
-  return e.localeCompare(t, It, { sensitivity: "accent" }) === 0;
+const Pt = "en";
+function we(e, t) {
+  return e.localeCompare(t, Pt, { sensitivity: "accent" }) === 0;
 }
-function He(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, It, { sensitivity: "accent" }) === 0;
+function et(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Pt, { sensitivity: "accent" }) === 0;
 }
-function re(e) {
-  const t = [...e].sort((i, o) => o.name.length - i.name.length), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
+function ne(e) {
+  const t = [...e].sort((i, a) => a.name.length - i.name.length), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
   for (const i of e) {
     r.set(i.name, i);
-    const o = [...i.columns].sort((u, c) => c.name.length - u.name.length);
-    n.set(i.name, o);
-    const a = /* @__PURE__ */ new Map();
+    const a = [...i.columns].sort((u, c) => c.name.length - u.name.length);
+    n.set(i.name, a);
+    const o = /* @__PURE__ */ new Map();
     for (const u of i.columns)
-      a.set(u.name, u);
-    s.set(i.name, a);
+      o.set(u.name, u);
+    s.set(i.name, o);
   }
   return {
     sortedTables: t,
@@ -1120,79 +1150,79 @@ function re(e) {
     columnMap: s
   };
 }
-function ke(e, t) {
-  if (!e.startsWith(w))
+function Ue(e, t) {
+  if (!e.startsWith(T))
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
     );
-  const r = e.slice(w.length);
+  const r = e.slice(T.length);
   if (!r)
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
     );
   let s, n;
-  for (const p of t.sortedTables)
-    if (He(r, p.name + ".")) {
-      const E = r.slice(p.name.length + 1);
-      if (!E)
+  for (const m of t.sortedTables)
+    if (et(r, m.name + ".")) {
+      const F = r.slice(m.name.length + 1);
+      if (!F)
         throw new Error(
-          `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
+          `Invalid dimensional element name format: '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
         );
-      s = p, n = E;
+      s = m, n = F;
       break;
     }
   if (!s) {
-    const p = r.indexOf(".");
-    if (p === -1)
+    const m = r.indexOf(".");
+    if (m === -1)
       throw new Error(
-        `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
+        `Invalid dimensional element name format: '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
       );
-    const E = r.slice(0, p), C = x(E, t.sortedTables, (W) => W.name), v = C && C.distance <= T ? ` Did you mean '${C.best.name}'?` : "";
-    throw new Error(`Table '${E}' not found in the data model.${v}`);
+    const F = r.slice(0, m), O = x(F, t.sortedTables, (V) => V.name), N = O && O.distance <= C ? ` Did you mean '${O.best.name}'?` : "";
+    throw new Error(`Table '${F}' not found in the data model.${N}`);
   }
   const i = t.tableColumnMap.get(s.name);
   if (!i)
     throw new Error(`Table '${s.name}' found but has no columns`);
-  let o, a;
+  let a, o;
   const u = $.all;
-  for (const p of i) {
-    if (Ee(n, p.name))
-      return { table: s, column: p };
-    if (!He(n, p.name + "."))
+  for (const m of i) {
+    if (we(n, m.name))
+      return { table: s, column: m };
+    if (!et(n, m.name + "."))
       continue;
-    const E = n.slice(p.name.length + 1);
-    if (!E)
+    const F = n.slice(m.name.length + 1);
+    if (!F)
       continue;
-    const C = u.includes(E), v = ee(p.dataType);
-    if (C) {
-      if (v)
-        return { table: s, column: p, level: E };
-      o || (o = p, a = E);
+    const O = u.includes(F), N = se(m.dataType);
+    if (O) {
+      if (N)
+        return { table: s, column: m, level: F };
+      a || (a = m, o = F);
       continue;
     }
-    v && !o && (o = p, a = E);
+    N && !a && (a = m, o = F);
   }
-  if (o && a) {
-    if (u.includes(a))
+  if (a && o) {
+    if (u.includes(o))
       throw new Error(
-        `Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`
+        `Invalid date level '${o}' in dimensional element '${e}'. Column '${s.name}.${a.name}' is not a datetime column`
       );
-    const p = x(a, u, (C) => C), E = p && p.distance <= T ? ` Did you mean '${p.best}'?` : "";
+    const m = x(o, u, (O) => O), F = m && m.distance <= C ? ` Did you mean '${m.best}'?` : "";
     throw new Error(
-      `Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(
+      `Invalid date level '${o}' in dimensional element '${e}'. Valid levels are: ${u.join(
         ", "
-      )}.${E}`
+      )}.${F}`
     );
   }
-  const c = n.indexOf("."), g = c === -1 ? n : n.slice(0, c), d = x(n, i, (p) => p.name), m = d && d.distance <= T && !Ee(d.best.name, g), h = m ? ` Did you mean '${d.best.name}'?` : "", b = !m && n.endsWith(".") && d !== void 0 && Ee(d.best.name, g) ? ` Use '${g}' without a trailing dot.` : "";
+  const c = n.indexOf("."), g = c === -1 ? n : n.slice(0, c), f = x(n, i, (m) => m.name), p = f && f.distance <= C && !we(f.best.name, g), h = p ? ` Did you mean '${f.best.name}'?` : "", b = !p && n.endsWith(".") && f !== void 0 && we(f.best.name, g) ? ` Use '${g}' without a trailing dot.` : "";
   throw new Error(
     `Column '${g}' not found in table '${s.name}'.${h}${b}`
   );
 }
-function js(e, t) {
-  const { table: r, column: s, level: n } = ke(e, t);
+function Ys(e, t) {
+  const { table: r, column: s, level: n } = Ue(e, t);
   if (n) {
-    if (!ee(s.dataType))
+    if (!se(s.dataType))
       throw new Error(
         `Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`
       );
@@ -1203,87 +1233,87 @@ function js(e, t) {
           ", "
         )}`
       );
-    const o = $.dateOnly;
-    if (s.dataType === "date" && !o.includes(n))
+    const a = $.dateOnly;
+    if (s.dataType === "date" && !a.includes(n))
       throw new Error(
         `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a date column, not a datetime column`
       );
-    const a = $.timeOnly;
-    if (s.dataType === "time" && !a.includes(n))
+    const o = $.timeOnly;
+    if (s.dataType === "time" && !o.includes(n))
       throw new Error(
         `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a time column, not a date column`
       );
   }
   return { table: r, column: s, level: n };
 }
-function Z(e, t, r, s) {
-  const { table: n, column: i, level: o } = js(e, r);
-  let a = o;
-  if (ee(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
+function re(e, t, r, s) {
+  const { table: n, column: i, level: a } = Ys(e, r);
+  let o = a;
+  if (se(i.dataType) && o === void 0 && (s != null && s.inferredDateLevel)) {
     const u = s.inferredDateLevel, c = $.all;
     if (!c.includes(u))
       throw new Error(
         `Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`
       );
-    const g = `${e}.${u}`, d = $.dateOnly;
-    if (i.dataType === "date" && !d.includes(u))
+    const g = `${e}.${u}`, f = $.dateOnly;
+    if (i.dataType === "date" && !f.includes(u))
       throw new Error(
         `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
       );
-    const m = $.timeOnly;
-    if (i.dataType === "time" && !m.includes(u))
+    const p = $.timeOnly;
+    if (i.dataType === "time" && !p.includes(u))
       throw new Error(
         `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
       );
-    a = u;
+    o = u;
   }
-  return _r({
+  return Qr({
     expression: i.expression,
     dataType: i.dataType,
-    granularity: a,
+    granularity: o,
     format: void 0,
     sort: void 0,
     dataSource: t
   });
 }
-function Js(e, t, r) {
-  const { column: s, level: n } = ke(e, r);
+function Hs(e, t, r) {
+  const { column: s, level: n } = Ue(e, r);
   if (n)
     throw new Error(
-      `Invalid DateDimension name format: '${e}'. Expected format: '${w}TableName.ColumnName'`
+      `Invalid DateDimension name format: '${e}'. Expected format: '${T}TableName.ColumnName'`
     );
-  if (!ee(s.dataType))
+  if (!se(s.dataType))
     throw new Error(
       `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return is({
+  return Xr({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-const Ks = (e, t) => {
+const Qs = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!ct(r))
-    return F(l({}, t), {
+  if (!gt(r))
+    return E(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, Gs = (e, t, r, s) => {
-  const n = Ks(e.sortType, s);
+}, Xs = (e, t, r, s) => {
+  const n = Qs(e.sortType, s);
   if (n)
     return {
-      attribute: Z(e.column, t, r),
+      attribute: re(e.column, t, r),
       style: {},
       error: n
     };
-  const i = Z(e.column, t, r), o = _(e, "column");
-  return { attribute: i, style: o };
-}, Ys = (e, t, r, s) => typeof e == "string" ? { attribute: Z(e, t, r) } : Ws(e) ? Gs(e, t, r, s) : {
-  error: F(l({}, s), {
+  const i = re(e.column, t, r), a = U(e, "column");
+  return { attribute: i, style: a };
+}, Zs = (e, t, r, s) => typeof e == "string" ? { attribute: re(e, t, r) } : zt(e) ? Xs(e, t, r, s) : {
+  error: E(l({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, kt = (e) => {
+}, Wt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1299,13 +1329,13 @@ const Ks = (e, t) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
-      path: `dimensions[${a}]`,
-      input: o
+      path: `dimensions[${o}]`,
+      input: a
     };
     try {
-      const c = Ys(o, r, s, u);
+      const c = Zs(a, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -1315,47 +1345,47 @@ const Ks = (e, t) => {
       );
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(l({}, u), { message: g }));
+      i.push(E(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function Be(e, t) {
+function Pe(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 Hs(e, t) {
-  const r = e.replace("measureFactory.", ""), n = Be(Pr, r)(...t);
-  if (!Ie(n))
+function en(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Pe(Zr, r)(...t);
+  if (!ze(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function Qs(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = Be(Wr, r)(...t);
-  if (!te(n))
+function tn(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Pe(es, r)(...t);
+  if (!H(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Xs(e, t) {
+function rn(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return Qs(e, t);
-  const r = e.replace("filterFactory.", ""), n = Be(Vr, r)(...t);
-  if (!fe(n) && !te(n))
+    return tn(e, t);
+  const r = e.replace("filterFactory.", ""), n = Pe(ts, r)(...t);
+  if (!ge(n) && !H(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Zs(e, t) {
+function sn(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Hs(e, t);
+    return en(e, t);
   if (s === "filterFactory")
-    return Xs(e, t);
+    return rn(e, t);
   throw new Error(
     `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const f = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), en = /* @__PURE__ */ new Set([
+const d = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), nn = /* @__PURE__ */ new Set([
   "CORREL",
   "COVARP",
   "COVAR",
@@ -1374,131 +1404,131 @@ const f = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), en = /*
   "ORDERING",
   "RDOUBLE",
   "RINT"
-]), ue = {
+]), le = {
   // ── X-diff (datetime difference operators) ──
-  SDIFF: f("xdiff", 2, 2, {
+  SDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Seconds,
     argType: "datetime"
   }),
-  MNDIFF: f("xdiff", 2, 2, {
+  MNDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Minutes,
     argType: "datetime"
   }),
-  HDIFF: f("xdiff", 2, 2, {
+  HDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Hours,
     argType: "datetime"
   }),
-  DDIFF: f("xdiff", 2, 2, {
+  DDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Days,
     argType: "datetime"
   }),
-  MDIFF: f("xdiff", 2, 2, {
+  MDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Months,
     argType: "datetime"
   }),
-  QDIFF: f("xdiff", 2, 2, {
+  QDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Quarters,
     argType: "datetime"
   }),
-  YDIFF: f("xdiff", 2, 2, {
+  YDIFF: d("xdiff", 2, 2, {
     requiredDateLevel: $.Years,
     argType: "datetime"
   }),
   // ── Aggregation ──
-  ANYVALUE: f("aggregative", 1, 1),
-  SUM: f("aggregative", 1, 2),
-  AVG: f("aggregative", 1, 2),
-  MIN: f("aggregative", 1, 2),
-  MAX: f("aggregative", 1, 2),
-  COUNT: f("aggregative", 1, 2),
-  DUPCOUNT: f("aggregative", 1, 1),
-  COUNTDUPLICATES: f("aggregative", 1, 1),
-  STDEV: f("aggregative", 1, 2),
-  STDEVP: f("aggregative", 1, 2),
-  VAR: f("aggregative", 1, 2),
-  VARP: f("aggregative", 1, 2),
-  MEDIAN: f("aggregative", 1, 2),
-  QUARTILE: f("aggregative", 2, 3),
-  PERCENTILE: f("aggregative", 2, 3),
-  LOWERWHISKERMAX_IQR: f("aggregative", 1, 1),
-  LOWERWHISKERMAX_STDEVP: f("aggregative", 1, 1),
-  UPPERWHISKERMIN_IQR: f("aggregative", 1, 1),
-  UPPERWHISKERMIN_STDEVP: f("aggregative", 1, 1),
-  OUTLIERSCOUNT_IQR: f("aggregative", 1, 1),
-  OUTLIERSCOUNT_STDEVP: f("aggregative", 1, 1),
-  MODE: f("aggregative", 1, 1),
-  NOAGGFUNCTION: f("aggregative", 1, 1),
+  ANYVALUE: d("aggregative", 1, 1),
+  SUM: d("aggregative", 1, 2),
+  AVG: d("aggregative", 1, 2),
+  MIN: d("aggregative", 1, 2),
+  MAX: d("aggregative", 1, 2),
+  COUNT: d("aggregative", 1, 2),
+  DUPCOUNT: d("aggregative", 1, 1),
+  COUNTDUPLICATES: d("aggregative", 1, 1),
+  STDEV: d("aggregative", 1, 2),
+  STDEVP: d("aggregative", 1, 2),
+  VAR: d("aggregative", 1, 2),
+  VARP: d("aggregative", 1, 2),
+  MEDIAN: d("aggregative", 1, 2),
+  QUARTILE: d("aggregative", 2, 3),
+  PERCENTILE: d("aggregative", 2, 3),
+  LOWERWHISKERMAX_IQR: d("aggregative", 1, 1),
+  LOWERWHISKERMAX_STDEVP: d("aggregative", 1, 1),
+  UPPERWHISKERMIN_IQR: d("aggregative", 1, 1),
+  UPPERWHISKERMIN_STDEVP: d("aggregative", 1, 1),
+  OUTLIERSCOUNT_IQR: d("aggregative", 1, 1),
+  OUTLIERSCOUNT_STDEVP: d("aggregative", 1, 1),
+  MODE: d("aggregative", 1, 1),
+  NOAGGFUNCTION: d("aggregative", 1, 1),
   // ── Window ──
-  RANK: f("window", 0, Number.POSITIVE_INFINITY),
-  RSUM: f("window", 1, 2),
-  RAVG: f("window", 1, 2),
-  YTDSUM: f("window", 1, 1),
-  QTDSUM: f("window", 1, 1),
-  MTDSUM: f("window", 1, 1),
-  WTDSUM: f("window", 1, 1),
-  YTDAVG: f("window", 1, 1),
-  QTDAVG: f("window", 1, 1),
-  MTDAVG: f("window", 1, 1),
-  WTDAVG: f("window", 1, 1),
+  RANK: d("window", 0, Number.POSITIVE_INFINITY),
+  RSUM: d("window", 1, 2),
+  RAVG: d("window", 1, 2),
+  YTDSUM: d("window", 1, 1),
+  QTDSUM: d("window", 1, 1),
+  MTDSUM: d("window", 1, 1),
+  WTDSUM: d("window", 1, 1),
+  YTDAVG: d("window", 1, 1),
+  QTDAVG: d("window", 1, 1),
+  MTDAVG: d("window", 1, 1),
+  WTDAVG: d("window", 1, 1),
   // ── String ──
-  CONCAT: f("string", 2, Number.POSITIVE_INFINITY),
-  LEFT: f("string", 2, 2),
-  RIGHT: f("string", 2, 2),
+  CONCAT: d("string", 2, Number.POSITIVE_INFINITY),
+  LEFT: d("string", 2, 2),
+  RIGHT: d("string", 2, 2),
   // ── Scalar / math ──
-  ABS: f("scalar", 1, 1),
-  ACOS: f("scalar", 1, 1),
-  ASIN: f("scalar", 1, 1),
-  ATAN: f("scalar", 1, 1),
-  CEILING: f("scalar", 1, 1),
-  CONTRIBUTION: f("scalar", 1, 1),
-  COS: f("scalar", 1, 1),
-  COT: f("scalar", 1, 1),
-  DIFFPASTDAY: f("scalar", 1, 1),
-  DIFFPASTMONTH: f("scalar", 1, 1),
-  DIFFPASTPERIOD: f("scalar", 1, 1),
-  DIFFPASTQUARTER: f("scalar", 1, 1),
-  DIFFPASTWEEK: f("scalar", 1, 1),
-  DIFFPASTYEAR: f("scalar", 1, 1),
-  EXP: f("scalar", 1, 1),
-  FLOOR: f("scalar", 1, 1),
-  GROWTH: f("growth", 1, 1),
-  GROWTHPASTMONTH: f("growth", 1, 1),
-  GROWTHPASTQUARTER: f("growth", 1, 1),
-  GROWTHPASTWEEK: f("growth", 1, 1),
-  GROWTHPASTYEAR: f("growth", 1, 1),
-  GROWTHRATE: f("growth", 1, 1),
-  LN: f("scalar", 1, 1),
-  LOG10: f("scalar", 1, 1),
-  MINUS: f("scalar", 1, 1),
-  MOD: f("scalar", 2, 2),
-  QUOTIENT: f("scalar", 2, 2),
-  PASTDAY: f("date", 1, 2),
-  PASTMONTH: f("date", 1, 2),
-  PASTPERIOD: f("date", 1, 2),
-  PASTQUARTER: f("date", 1, 2),
-  PASTWEEK: f("date", 1, 2),
-  PASTYEAR: f("date", 1, 2),
-  PERCENTILEDISCFORINTERNALUSEONLY: f("scalar", 1, 1),
-  PERCENTILECONTFORINTERNALUSEONLY: f("scalar", 1, 1),
-  POWER: f("scalar", 2, 2),
-  ROUND: f("scalar", 2, 2),
-  SIN: f("scalar", 1, 1),
-  SQRT: f("scalar", 1, 1),
-  TAN: f("scalar", 1, 1)
-}, tn = Object.keys(ue).filter(
-  (e) => ue[e].category === "xdiff"
+  ABS: d("scalar", 1, 1),
+  ACOS: d("scalar", 1, 1),
+  ASIN: d("scalar", 1, 1),
+  ATAN: d("scalar", 1, 1),
+  CEILING: d("scalar", 1, 1),
+  CONTRIBUTION: d("scalar", 1, 1),
+  COS: d("scalar", 1, 1),
+  COT: d("scalar", 1, 1),
+  DIFFPASTDAY: d("scalar", 1, 1),
+  DIFFPASTMONTH: d("scalar", 1, 1),
+  DIFFPASTPERIOD: d("scalar", 1, 1),
+  DIFFPASTQUARTER: d("scalar", 1, 1),
+  DIFFPASTWEEK: d("scalar", 1, 1),
+  DIFFPASTYEAR: d("scalar", 1, 1),
+  EXP: d("scalar", 1, 1),
+  FLOOR: d("scalar", 1, 1),
+  GROWTH: d("growth", 1, 1),
+  GROWTHPASTMONTH: d("growth", 1, 1),
+  GROWTHPASTQUARTER: d("growth", 1, 1),
+  GROWTHPASTWEEK: d("growth", 1, 1),
+  GROWTHPASTYEAR: d("growth", 1, 1),
+  GROWTHRATE: d("growth", 1, 1),
+  LN: d("scalar", 1, 1),
+  LOG10: d("scalar", 1, 1),
+  MINUS: d("scalar", 1, 1),
+  MOD: d("scalar", 2, 2),
+  QUOTIENT: d("scalar", 2, 2),
+  PASTDAY: d("date", 1, 2),
+  PASTMONTH: d("date", 1, 2),
+  PASTPERIOD: d("date", 1, 2),
+  PASTQUARTER: d("date", 1, 2),
+  PASTWEEK: d("date", 1, 2),
+  PASTYEAR: d("date", 1, 2),
+  PERCENTILEDISCFORINTERNALUSEONLY: d("scalar", 1, 1),
+  PERCENTILECONTFORINTERNALUSEONLY: d("scalar", 1, 1),
+  POWER: d("scalar", 2, 2),
+  ROUND: d("scalar", 2, 2),
+  SIN: d("scalar", 1, 1),
+  SQRT: d("scalar", 1, 1),
+  TAN: d("scalar", 1, 1)
+}, an = Object.keys(le).filter(
+  (e) => le[e].category === "xdiff"
 );
-function Bt() {
-  return tn;
+function Vt() {
+  return an;
 }
-function Lt(e) {
-  const t = ue[e.toUpperCase()];
+function jt(e) {
+  const t = le[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-function rn(e, t) {
+function on(e, t) {
   return e === t ? e === 1 ? "1 parameter" : `${e} parameters` : t === Number.POSITIVE_INFINITY ? e <= 1 ? "any number of parameters" : `at least ${e} parameters` : `${e} or ${t} parameters`;
 }
-const sn = /\[(\w[\w.-]*)\]/g, zt = /* @__PURE__ */ new Set([
+const un = /\[(\w[\w.-]*)\]/g, Jt = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
   "COUNT",
@@ -1519,30 +1549,30 @@ const sn = /\[(\w[\w.-]*)\]/g, zt = /* @__PURE__ */ new Set([
   "YTDSUM"
   // RAVG, RSUM are non-aggregative per Sisense doc (Other Functions, not (A))
   // CORREL, COVAR*, SKEW*, SLOPE, LARGEST are unsupported in custom formulas (see UNSUPPORTED_FORMULA_FUNCTIONS).
-]), nn = new RegExp(
-  `\\b(${Array.from(zt).join("|")})\\s*\\(`,
+]), cn = new RegExp(
+  `\\b(${Array.from(Jt).join("|")})\\s*\\(`,
   "i"
 );
-function Ut(e) {
-  return q(e) ? !0 : typeof e == "string" && e.startsWith(w) ? !1 : O(e) && "kind" in e ? e.kind === "measure" : !0;
+function Kt(e) {
+  return w(e) ? !0 : typeof e == "string" && e.startsWith(T) ? !1 : q(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function on(e) {
+function ln(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
   let s;
   for (; (s = t.exec(e)) !== null; ) {
     const n = s[1];
-    zt.has(n.toUpperCase()) || r.add(n);
+    Jt.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function an(e) {
+function fn(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function un(e) {
+function dn(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
-const G = (e) => e.startsWith("[") ? e : `[${e}]`, _t = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function Pt(e, t) {
+const Y = (e) => e.startsWith("[") ? e : `[${e}]`, Gt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function Yt(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*\\)`,
@@ -1554,16 +1584,16 @@ function Pt(e, t) {
     ref2: n[3].trim()
   }));
 }
-function cn(e, t, r) {
-  var o, a, u;
-  const s = Object.keys(t), n = ((o = r.errorPrefix) != null ? o : "customFormula validation").trim(), i = n === "" ? "" : n.endsWith(" ") ? n : `${n} `;
+function mn(e, t, r) {
+  var a, o, u;
+  const s = Object.keys(t), n = ((a = r.errorPrefix) != null ? a : "customFormula validation").trim(), i = n === "" ? "" : n.endsWith(" ") ? n : `${n} `;
   return {
     formula: e,
     context: t,
     contextKeys: s,
-    canonicalContextKeys: new Set(s.map(G)),
+    canonicalContextKeys: new Set(s.map(Y)),
     errorPrefix: i,
-    warnUnusedContext: (a = r.warnUnusedContext) != null ? a : !0,
+    warnUnusedContext: (o = r.warnUnusedContext) != null ? o : !0,
     errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : !0,
     schemaIndex: r.schemaIndex,
     result: { isValid: !0, errors: [], warnings: [], references: [], unusedContextKeys: [] }
@@ -1572,17 +1602,17 @@ function cn(e, t, r) {
 function R(e, t) {
   e.result.errors.push(t), e.result.isValid = !1;
 }
-const ln = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function dn(e) {
+const pn = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function gn(e) {
   const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find(
-    (s) => !ln.has(s[1].toUpperCase())
+    (s) => !pn.has(s[1].toUpperCase())
   );
   r && R(
     e,
     `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`
   );
 }
-function fn(e, t) {
+function yn(e, t) {
   const r = e[t];
   let s = t + 1;
   for (; s < e.length; ) {
@@ -1599,27 +1629,27 @@ function fn(e, t) {
   }
   return e.length;
 }
-function pn(e) {
-  return xe(e, ",").filter((t) => t.trim().length > 0).length;
+function hn(e) {
+  return Re(e, ",").filter((t) => t.trim().length > 0).length;
 }
-function mn(e, t, r, s) {
+function bn(e, t, r, s) {
   for (; t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = us(e, n);
+  const n = t, i = ps(e, n);
   if (i === -1)
     return n + 1;
-  const o = e.slice(n + 1, i);
-  return s.push({ name: r.toUpperCase(), argCount: pn(o) }), s.push(...Wt(o)), i + 1;
+  const a = e.slice(n + 1, i);
+  return s.push({ name: r.toUpperCase(), argCount: hn(a) }), s.push(...Ht(a)), i + 1;
 }
-function Wt(e) {
+function Ht(e) {
   const t = [];
   let r = 0;
   for (; r < e.length; ) {
     const s = e[r];
     if (s === "'" || s === '"') {
-      r = fn(e, r);
+      r = yn(e, r);
       continue;
     }
     if (/[A-Za-z_]/.test(s)) {
@@ -1627,122 +1657,122 @@ function Wt(e) {
       for (r++; r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
         r++;
       const i = e.slice(n, r);
-      r = mn(e, r, i, t);
+      r = bn(e, r, i, t);
       continue;
     }
     r++;
   }
   return t;
 }
-function gn(e) {
-  const t = Wt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
+function Fn(e) {
+  const t = Ht(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   for (const { name: n, argCount: i } of t) {
-    if (en.has(n)) {
+    if (nn.has(n)) {
       r.has(n) || (r.add(n), R(
         e,
         `${e.errorPrefix}args[1]: Function ${n} is not supported in custom formulas`
       ));
       continue;
     }
-    const o = ue[n];
-    if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
+    const a = le[n];
+    if (a && (i < a.minArgs || i > a.maxArgs) && !s.has(n)) {
       s.add(n);
-      const a = rn(o.minArgs, o.maxArgs);
-      R(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
+      const o = on(a.minArgs, a.maxArgs);
+      R(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${o}`);
     }
   }
 }
-function yn(e) {
+function En(e) {
   return [
     ...new Set(
-      [...e.matchAll(new RegExp(sn.source, "g"))].map((t) => t[1])
+      [...e.matchAll(new RegExp(un.source, "g"))].map((t) => t[1])
     )
   ];
 }
-function hn(e) {
+function An(e) {
   const t = e.result.references.filter(
-    (n) => !e.canonicalContextKeys.has(G(n))
+    (n) => !e.canonicalContextKeys.has(Y(n))
   );
   if (t.length === 0) return;
-  const r = e.contextKeys.map((n) => `[${_t(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
+  const r = e.contextKeys.map((n) => `[${Gt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
   R(
     e,
     `${e.errorPrefix}args[1]: ${s} not found in context. Available keys: ${r}`
   );
 }
-function bn(e) {
-  if (nn.test(e.formula)) return;
+function Tn(e) {
+  if (cn.test(e.formula)) return;
   const t = e.result.references.filter((r) => {
     var n;
-    const s = (n = e.context[G(r)]) != null ? n : e.context[r];
-    return s !== void 0 && !Ut(s);
+    const s = (n = e.context[Y(r)]) != null ? n : e.context[r];
+    return s !== void 0 && !Kt(s);
   });
   t.length !== 0 && R(
     e,
-    `${e.errorPrefix}args[1]: ${un(
-      on(e.formula)
-    )}Bracket reference(s) ${an(
+    `${e.errorPrefix}args[1]: ${dn(
+      ln(e.formula)
+    )}Bracket reference(s) ${fn(
       t
     )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
   );
 }
-function En(e) {
+function wn(e) {
   if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0) return;
-  const t = new Set(e.result.references.map(G)), r = e.contextKeys.filter((i) => !t.has(G(i)));
+  const t = new Set(e.result.references.map(Y)), r = e.contextKeys.filter((i) => !t.has(Y(i)));
   if (e.result.unusedContextKeys = r, r.length === 0) return;
-  const s = r.map((i) => `[${_t(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
+  const s = r.map((i) => `[${Gt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
   e.errorOnUnusedContext ? R(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
 }
-function Qe(e, t, r, s) {
-  var o;
-  const n = (o = s.context[G(e)]) != null ? o : s.context[e];
+function tt(e, t, r, s) {
+  var a;
+  const n = (a = s.context[Y(e)]) != null ? a : s.context[e];
   if (n === void 0) return;
-  if (!(typeof n == "string" && n.startsWith(w))) {
-    Ut(n) && R(
+  if (!(typeof n == "string" && n.startsWith(T))) {
+    Kt(n) && R(
       s,
-      `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${w}Table.Column.Level).`
+      `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${T}Table.Column.Level).`
     );
     return;
   }
   if (s.schemaIndex)
     try {
-      const a = ke(n, s.schemaIndex);
-      ee(a.column.dataType) ? r && a.level && a.level !== r && R(
+      const o = Ue(n, s.schemaIndex);
+      se(o.column.dataType) ? r && o.level && o.level !== r && R(
         s,
-        `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`
+        `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${o.level}'.`
       ) : R(
         s,
-        `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`
+        `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${o.column.name}'.`
       );
-    } catch (a) {
-      const u = a instanceof Error ? a.message : "Unknown error";
+    } catch (o) {
+      const u = o instanceof Error ? o.message : "Unknown error";
       R(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function Fn(e) {
-  const t = Bt(), r = Pt(e.formula, t);
+function Sn(e) {
+  const t = Vt(), r = Yt(e.formula, t);
   for (const s of r) {
-    const n = Lt(s.functionName);
-    Qe(s.ref1, s, n, e), Qe(s.ref2, s, n, e);
+    const n = jt(s.functionName);
+    tt(s.ref1, s, n, e), tt(s.ref2, s, n, e);
   }
 }
-function An(e, t, r = {}) {
+function Cn(e, t, r = {}) {
   var n;
-  const s = cn(e, t, r);
-  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || R(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (dn(s), gn(s), s.result.references = yn(e), s.result.references.length === 0 ? (s.result.warnings.push(
+  const s = mn(e, t, r);
+  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || R(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (gn(s), Fn(s), s.result.references = En(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 ? (R(
     s,
     `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`
-  ), s.result) : (hn(s), bn(s), En(s), Fn(s), s.result));
+  ), s.result) : (An(s), Tn(s), wn(s), Sn(s), s.result));
 }
-function wn(e, t, r = {}) {
-  const s = An(e, t, r);
+function On(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 Tn(e, t) {
+function $n(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?)`
@@ -1753,12 +1783,12 @@ function Tn(e, t) {
       `${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`
     );
   const s = r, n = e[2];
-  if (!O(n))
+  if (!q(n))
     throw new Error(
       `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
     );
   const i = n;
-  wn(s, i, {
+  On(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1766,11 +1796,11 @@ function Tn(e, t) {
     // Custom formulas must have content
     schemaIndex: t.schemaIndex
   });
-  const o = Sn(s), a = {};
+  const a = qn(s), o = {};
   for (const [u, c] of Object.entries(i)) {
     const g = `args[2].${u}`;
-    if (q(c))
-      a[`${u}`] = M({
+    if (w(c))
+      o[`${u}`] = M({
         data: c,
         context: {
           dataSource: t.dataSource,
@@ -1778,191 +1808,202 @@ function Tn(e, t) {
           pathPrefix: g
         }
       });
-    else if (typeof c == "string" && c.startsWith(w)) {
-      const d = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, m = o[d];
+    else if (typeof c == "string" && c.startsWith(T)) {
+      const f = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, p = a[f];
       try {
-        a[`${u}`] = Z(
+        o[`${u}`] = re(
           c,
           t.dataSource,
           t.schemaIndex,
-          m !== void 0 ? { inferredDateLevel: m } : void 0
+          p !== void 0 ? { inferredDateLevel: p } : void 0
         );
       } catch (h) {
         const b = h instanceof Error ? h.message : "Unknown error";
         throw new Error(`${g}: ${b}`);
       }
     } else if (c && typeof c == "object" && "kind" in c)
-      a[`${u}`] = c;
+      o[`${u}`] = c;
     else
       throw new Error(
-        `${g}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${w}...), but got: ${typeof c}`
+        `${g}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${T}...), but got: ${typeof c}`
       );
   }
-  return [e[0], e[1], a, ...e.slice(3)];
+  return [e[0], e[1], o, ...e.slice(3)];
 }
-function Sn(e) {
-  const t = Bt(), r = Pt(e, t), s = {};
+function qn(e) {
+  const t = Vt(), r = Yt(e, t), s = {};
   for (const n of r) {
-    const i = Lt(n.functionName);
+    const i = jt(n.functionName);
     if (i !== void 0)
-      for (const o of [n.ref1, n.ref2]) {
-        const a = s[o];
-        if (a !== void 0 && a !== i)
+      for (const a of [n.ref1, n.ref2]) {
+        const o = s[a];
+        if (o !== void 0 && o !== 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}).`
+            `Reference [${a}] is used in xdiff functions with conflicting date levels ('${o}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`
           );
-        s[o] = i;
+        s[a] = i;
       }
   }
   return s;
 }
-function Vt(e) {
-  return e.type === j.TextAttribute;
+function Qt(e) {
+  return e.type === J.TextAttribute;
 }
-function jt(e) {
-  return e.type === j.NumericAttribute;
+function Xt(e) {
+  return e.type === J.NumericAttribute;
 }
-function Cn(e) {
-  return e.type === j.DateLevel;
+function Dn(e) {
+  return e.type === J.DateLevel;
 }
-function qn(e) {
-  return Vt(e) || jt(e);
+function xn(e) {
+  return Qt(e) || Xt(e);
 }
-function pe(e) {
-  return e.type === j.TextAttribute ? "text" : e.type === j.NumericAttribute ? "numeric" : e.type === j.DateLevel ? "date/datetime" : "unknown";
+function ye(e) {
+  return e.type === J.TextAttribute ? "text" : e.type === J.NumericAttribute ? "numeric" : e.type === J.DateLevel ? "date/datetime" : "unknown";
 }
-function Le(e, t) {
+function We(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 Xe(e, t) {
-  const r = Le(e, t);
-  if (!qn(r))
+function rt(e, t) {
+  const r = We(e, t);
+  if (!xn(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${pe(
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
-function L(e, t) {
-  const r = Le(e, t);
-  if (!jt(r))
+function B(e, t) {
+  const r = We(e, t);
+  if (!Xt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${pe(
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
-function z(e, t) {
-  const r = Le(e, t);
-  if (!Vt(r))
+function _(e, t) {
+  const r = We(e, t);
+  if (!Qt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string type, got ${pe(
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
-function $n(e, t) {
+function Nn(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 On(e, t) {
-  const r = $n(e, t);
-  if (!De(r))
+function vn(e, t) {
+  const r = Nn(e, t);
+  if (!Me(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
   return e;
 }
-const Dn = {
-  "measureFactory.customFormula": Tn,
+const Mn = "FilterRelations (filterFactory.logic.or / filterFactory.logic.and) is not supported inside measureFactory.measuredValue filters. Use plain filters only, or apply logical relations at the query filter level.";
+function Rn(e, t) {
+  const r = e[1];
+  return Array.isArray(r) && r.forEach((s, n) => {
+    if (!(typeof s != "object" || s === null) && H(s))
+      throw new Error(
+        `${t.pathPrefix}args[1][${n}]: ${Mn}`
+      );
+  }), e;
+}
+const In = {
+  "measureFactory.customFormula": $n,
+  "measureFactory.measuredValue": Rn,
   // String | Number filters
-  "filterFactory.equals": Xe,
-  "filterFactory.doesntEqual": Xe,
+  "filterFactory.equals": rt,
+  "filterFactory.doesntEqual": rt,
   // Numeric filters
-  "filterFactory.greaterThan": L,
-  "filterFactory.greaterThanOrEqual": L,
-  "filterFactory.lessThan": L,
-  "filterFactory.lessThanOrEqual": L,
-  "filterFactory.between": L,
-  "filterFactory.betweenNotEqual": L,
-  "filterFactory.numeric": L,
+  "filterFactory.greaterThan": B,
+  "filterFactory.greaterThanOrEqual": B,
+  "filterFactory.lessThan": B,
+  "filterFactory.lessThanOrEqual": B,
+  "filterFactory.between": B,
+  "filterFactory.betweenNotEqual": B,
+  "filterFactory.numeric": B,
   // String filters
-  "filterFactory.contains": z,
-  "filterFactory.doesntContain": z,
-  "filterFactory.startsWith": z,
-  "filterFactory.doesntStartWith": z,
-  "filterFactory.endsWith": z,
-  "filterFactory.doesntEndWith": z,
-  "filterFactory.like": z,
+  "filterFactory.contains": _,
+  "filterFactory.doesntContain": _,
+  "filterFactory.startsWith": _,
+  "filterFactory.doesntStartWith": _,
+  "filterFactory.endsWith": _,
+  "filterFactory.doesntEndWith": _,
+  "filterFactory.like": _,
   // Exclude filter
-  "filterFactory.exclude": On
+  "filterFactory.exclude": vn
 };
-function xn(e) {
-  return Dn[`${e}`];
+function kn(e) {
+  return In[`${e}`];
 }
-const Jt = {
+const Zt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.average": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.avg": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.min": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.max": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.median": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.count": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.countDistinct": [
     { type: "Attribute", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
@@ -1971,7 +2012,7 @@ const Jt = {
     { type: "Attribute", required: !0 },
     { type: "string", required: !0 },
     // aggregationType
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
@@ -1979,7 +2020,7 @@ const Jt = {
   // Constants and formulas
   "measureFactory.constant": [{ type: "number", required: !0 }],
   "measureFactory.customFormula": [
-    { type: "string", required: !0 },
+    { type: "string", required: !0, isName: !0 },
     // title
     { type: "string", required: !0 },
     // formula
@@ -1994,7 +2035,7 @@ const Jt = {
   "measureFactory.add": [
     { type: "Measure | number", required: !0 },
     { type: "Measure | number", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "boolean", required: !1 }
     // withParentheses
@@ -2002,7 +2043,7 @@ const Jt = {
   "measureFactory.subtract": [
     { type: "Measure | number", required: !0 },
     { type: "Measure | number", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "boolean", required: !1 }
     // withParentheses
@@ -2010,7 +2051,7 @@ const Jt = {
   "measureFactory.multiply": [
     { type: "Measure | number", required: !0 },
     { type: "Measure | number", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "boolean", required: !1 }
     // withParentheses
@@ -2018,7 +2059,7 @@ const Jt = {
   "measureFactory.divide": [
     { type: "Measure | number", required: !0 },
     { type: "Measure | number", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "boolean", required: !1 }
     // withParentheses
@@ -2027,14 +2068,14 @@ const Jt = {
   "measureFactory.measuredValue": [
     { type: "Measure", required: !0 },
     { type: "Filter[]", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 }
     // format
   ],
   "measureFactory.rank": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "string", required: !1 },
     // sort
@@ -2045,14 +2086,14 @@ const Jt = {
   ],
   "measureFactory.trend": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "any", required: !1 }
     // options
   ],
   "measureFactory.forecast": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 },
+    { type: "string", required: !1, isName: !0 },
     // name
     { type: "any", required: !1 }
     // options
@@ -2060,117 +2101,117 @@ const Jt = {
   // Time-based aggregations
   "measureFactory.yearToDateSum": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.quarterToDateSum": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.monthToDateSum": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.weekToDateSum": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.runningSum": [
     { type: "Measure", required: !0 },
     { type: "boolean", required: !1 },
     // continuous
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   // Growth and difference calculations
   "measureFactory.growth": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.growthRate": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.growthPastWeek": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.growthPastMonth": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.growthPastQuarter": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.growthPastYear": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.difference": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.diffPastWeek": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.diffPastMonth": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.diffPastQuarter": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.diffPastYear": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   // Past period measures
   "measureFactory.pastDay": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.pastWeek": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.pastMonth": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.pastQuarter": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   "measureFactory.pastYear": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   // Statistics
   "measureFactory.contribution": [
     { type: "Measure", required: !0 },
-    { type: "string", required: !1 }
+    { type: "string", required: !1, isName: !0 }
     // name
   ],
   // ==================== FILTER FACTORY FUNCTIONS ====================
@@ -2435,18 +2476,18 @@ const Jt = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function ze(e) {
-  return Jt[`${e}`];
+function he(e) {
+  return Zt[`${e}`];
 }
-function vn(e) {
-  const t = ze(e);
+function Ln(e) {
+  const t = he(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function Nn(e) {
-  const t = ze(e);
+function Bn(e) {
+  const t = he(e);
   return t ? t.length : 0;
 }
-function Mn(e) {
+function _n(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2455,319 +2496,319 @@ function Mn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function Fe(e, t, r, s) {
-  if (e.startsWith(w))
+function Se(e, t, r, s) {
+  if (e.startsWith(T))
     try {
-      return Z(e, t, r);
+      return re(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: '${w}TableName.ColumnName[.Level]'`
+    `${s}: Invalid attribute '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
   );
 }
-function Rn(e, t, r, s) {
-  if (e.startsWith(w))
+function zn(e, t, r, s) {
+  if (e.startsWith(T))
     try {
-      return Js(e, t, r);
+      return Hs(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: '${w}TableName.ColumnName'`
+    `${s}: Invalid date dimension string '${e}'. Expected format: '${T}TableName.ColumnName'`
   );
 }
-function In(e) {
-  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, o = i;
+function Un(e) {
+  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, a = i;
   if (t === void 0) {
     if (r.required)
-      throw new Error(`${o}: Required argument is missing (expected ${r.type})`);
+      throw new Error(`${a}: Required argument is missing (expected ${r.type})`);
     return;
   }
   if (!(t === null && !r.required))
     switch (r.type) {
       case "string":
         if (typeof t != "string")
-          throw new Error(`${o}: Expected string, got ${typeof t}`);
+          throw new Error(`${a}: Expected string, got ${typeof t}`);
         return t;
       case "number":
         if (typeof t != "number")
-          throw new Error(`${o}: Expected number, got ${typeof t}`);
+          throw new Error(`${a}: Expected number, got ${typeof t}`);
         return t;
       case "boolean":
         if (typeof t != "boolean")
-          throw new Error(`${o}: Expected boolean, got ${typeof t}`);
+          throw new Error(`${a}: Expected boolean, got ${typeof t}`);
         return t;
       case "string[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${o}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`
+            `${a}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`
           );
-        if (!t.every((a) => typeof a == "string"))
+        if (!t.every((o) => typeof o == "string"))
           throw new Error(
-            `${o}: Expected array of strings, but contains non-string values`
+            `${a}: Expected array of strings, but contains non-string values`
           );
         return t;
       case "number[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${o}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`
+            `${a}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`
           );
-        if (!t.every((a) => typeof a == "number"))
+        if (!t.every((o) => typeof o == "number"))
           throw new Error(
-            `${o}: Expected array of numbers, but contains non-number values`
+            `${a}: Expected array of numbers, but contains non-number values`
           );
         return t;
       case "Attribute":
         if (typeof t != "string")
           throw new Error(
-            `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
+            `${a}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return Fe(t, s, n, o);
+        return Se(t, s, n, a);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${o}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`
+            `${a}: 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 Fe(a, s, n, `${o}[${u}]`);
+        return t.map((o, u) => {
+          if (typeof o != "string")
+            throw new Error(`${a}[${u}]: Expected attribute string, got ${typeof o}`);
+          return Se(o, s, n, `${a}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!q(t))
+        if (!w(t))
           throw new Error(
-            `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
+            `${a}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
         return M({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
         });
       case "Measure[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${o}: Expected array of measure function calls, got ${typeof t}`
+            `${a}: Expected array of measure function calls, got ${typeof t}`
           );
-        return t.map((a, u) => {
-          if (!q(a))
+        return t.map((o, u) => {
+          if (!w(o))
             throw new Error(
-              `${o}[${u}]: Expected measure function call, got ${typeof a}`
+              `${a}[${u}]: Expected measure function call, got ${typeof o}`
             );
           return M({
-            data: a,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+            data: o,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
           });
         });
       case "Filter":
-        if (!q(t))
+        if (!w(t))
           throw new Error(
-            `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
+            `${a}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
           );
         return M({
           data: t,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          context: { dataSource: s, schemaIndex: n, pathPrefix: a }
         });
       case "Filter[]":
         if (!Array.isArray(t))
           throw new Error(
-            `${o}: Expected array of filter function calls, got ${typeof t}`
+            `${a}: Expected array of filter function calls, got ${typeof t}`
           );
-        return t.map((a, u) => {
-          if (!q(a))
+        return t.map((o, u) => {
+          if (!w(o))
             throw new Error(
-              `${o}[${u}]: Expected filter function call, got ${typeof a}`
+              `${a}[${u}]: Expected filter function call, got ${typeof o}`
             );
           return M({
-            data: a,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+            data: o,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
           });
         });
       case "FilterRelationsNode":
         if (Array.isArray(t))
-          return t.map((a, u) => {
-            if (!q(a))
+          return t.map((o, u) => {
+            if (!w(o))
               throw new Error(
-                `${o}[${u}]: Expected filter function call, got ${typeof a}`
+                `${a}[${u}]: Expected filter function call, got ${typeof o}`
               );
             return M({
-              data: a,
-              context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+              data: o,
+              context: { dataSource: s, schemaIndex: n, pathPrefix: `${a}[${u}]` }
             });
           });
-        if (q(t))
+        if (w(t))
           return M({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
           });
         throw new Error(
-          `${o}: Expected filter function call or array of filters, got ${typeof t}`
+          `${a}: Expected filter function call or array of filters, got ${typeof t}`
         );
       case "DateDimension":
         if (typeof t != "string")
           throw new Error(
-            `${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
+            `${a}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
           );
-        return Rn(t, s, n, o);
+        return zn(t, s, n, a);
       case "LevelAttribute": {
         if (typeof t != "string")
           throw new Error(
-            `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
+            `${a}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const a = Fe(
+        const o = Se(
           t,
           s,
           n,
-          o
+          a
         );
-        if (!Cn(a))
+        if (!Dn(o))
           throw new Error(
-            `${o}: Attribute must be date/datetime type, got ${pe(
-              a
+            `${a}: Attribute must be date/datetime type, got ${ye(
+              o
             )} attribute`
           );
-        return a;
+        return o;
       }
       case "Measure | number":
         if (typeof t == "number")
           return t;
-        if (q(t))
+        if (w(t))
           return M({
             data: t,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: a }
           });
         throw new Error(
-          `${o}: Expected measure function call or number, got ${typeof t}`
+          `${a}: Expected measure function call or number, got ${typeof t}`
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (Mn(t))
+          if (_n(t))
             return t;
           throw new Error(
-            `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
+            `${a}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
           );
         } else {
           if (t instanceof Date)
             return t;
           throw new Error(
-            `${o}: Expected date string or Date object, got ${typeof t}`
+            `${a}: Expected date string or Date object, got ${typeof t}`
           );
         }
       case "string | number":
         if (typeof t == "string" || typeof t == "number")
           return t;
-        throw new Error(`${o}: Expected string or number, got ${typeof t}`);
+        throw new Error(`${a}: Expected string or number, got ${typeof t}`);
       case "BaseFilterConfig":
       case "MembersFilterConfig":
       case "CustomFormulaContext":
       case "any":
         if (t == null && r.required)
-          throw new Error(`${o}: Required argument is null/undefined`);
+          throw new Error(`${a}: Required argument is null/undefined`);
         return t;
       default:
         return t;
     }
 }
 function M(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = ze(i);
+  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: a } = t, o = n ? `${n}.` : "", u = he(i);
   if (!u) {
-    const p = Object.keys(Jt), E = x(i, p, (v) => v), C = E && E.distance <= T ? ` Did you mean '${E.best}'?` : "";
+    const m = Object.keys(Zt), F = x(i, m, (N) => N), O = F && F.distance <= C ? ` Did you mean '${F.best}'?` : "";
     throw new Error(
-      `${a}function: Unknown function '${i}'.${C}`
+      `${o}function: Unknown function '${i}'.${O}`
     );
   }
-  const c = vn(i), g = Nn(i);
-  if (o.length < c)
+  const c = Ln(i), g = Bn(i);
+  if (a.length < c)
     throw new Error(
-      `${a}function: Expected at least ${c} arguments, got ${o.length}`
+      `${o}function: Expected at least ${c} arguments, got ${a.length}`
     );
-  if (o.length > g)
+  if (a.length > g)
     throw new Error(
-      `${a}function: Expected at most ${g} arguments, got ${o.length}`
+      `${o}function: Expected at most ${g} arguments, got ${a.length}`
     );
-  const d = [], m = [];
-  for (let p = 0; p < Math.max(o.length, u.length); p++) {
-    const E = u[`${p}`], C = o[`${p}`], v = a ? `${a}args[${p}]` : `args[${p}]`;
-    if (C === void 0) {
-      E != null && E.required && m.push(`${v}: Missing required argument (expected ${E.type})`);
+  const f = [], p = [];
+  for (let m = 0; m < Math.max(a.length, u.length); m++) {
+    const F = u[`${m}`], O = a[`${m}`], N = o ? `${o}args[${m}]` : `args[${m}]`;
+    if (O === void 0) {
+      F != null && F.required && p.push(`${N}: Missing required argument (expected ${F.type})`);
       continue;
     }
-    if (!E) {
-      m.push(`${v}: Unexpected argument`);
+    if (!F) {
+      p.push(`${N}: Unexpected argument`);
       continue;
     }
     try {
-      const W = In({
-        data: C,
+      const V = Un({
+        data: O,
         context: {
           dataSource: r,
           schemaIndex: s,
-          pathPrefix: v,
-          argSchema: E
+          pathPrefix: N,
+          argSchema: F
         }
       });
-      d.push(W);
-    } catch (W) {
-      const rr = W instanceof Error ? W.message : "Unknown error";
-      m.push(rr);
+      f.push(V);
+    } catch (V) {
+      const ur = V instanceof Error ? V.message : "Unknown error";
+      p.push(ur);
     }
   }
-  if (m.length > 0) {
-    const p = m.join("; ");
-    throw new Error(p);
+  if (p.length > 0) {
+    const m = p.join("; ");
+    throw new Error(m);
   }
-  let h = d;
-  const b = xn(i);
+  let h = f;
+  const b = kn(i);
   if (b)
     try {
-      h = b(d, {
+      h = b(f, {
         dataSource: r,
         schemaIndex: s,
-        pathPrefix: a
+        pathPrefix: o
       });
-    } catch (p) {
-      const E = p instanceof Error ? p.message : "Unknown validation error";
-      throw new Error(E);
+    } catch (m) {
+      const F = m instanceof Error ? m.message : "Unknown validation error";
+      throw new Error(F);
     }
-  return Zs(i, h);
+  return sn(i, h);
 }
-function Kt(e) {
+function er(e) {
   const { attribute: t, config: r } = e;
-  if (De(e) && jr(t)) {
-    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = Jr(r), o = Object.keys(i).length === 0 ? void 0 : i;
-    return Kr(t, n, o);
+  if (Me(e) && rs(t)) {
+    const { granularity: s } = t, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), i = ss(r), a = Object.keys(i).length === 0 ? void 0 : i;
+    return ns(t, n, a);
   }
   return e;
 }
-function kn(e) {
+function Pn(e) {
   let t = [];
   for (const r of e)
-    te(r) ? t = je(r, t) : t = je([Kt(r)], t);
+    H(r) ? t = Ye(r, t) : t = Ye([er(r)], t);
   return t != null ? t : [];
 }
-const Bn = (e) => {
+const Wn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
-      path: `filters[${a}]`,
-      input: o
+      path: `filters[${o}]`,
+      input: a
     };
     try {
       const c = M({
-        data: o,
+        data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !te(c) && !fe(c) ? i.push(F(l({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !H(c) && !ge(c) ? i.push(E(l({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(l({}, u), { message: g }));
+      i.push(E(l({}, u), { message: g }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: kn(n) };
-}, se = (e) => {
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: Pn(n) };
+}, ie = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Rt(t) ? Bn({
+  return t ? _t(t) ? Wn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2780,27 +2821,27 @@ const Bn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, Ln = (e) => {
+}, Vn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
-      path: `highlights[${a}]`,
-      input: o
+      path: `highlights[${o}]`,
+      input: a
     };
     try {
       const c = M({
-        data: o,
+        data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      fe(c) ? n.push(Kt(c)) : i.push(F(l({}, u), { message: "Invalid filter JSON" }));
+      ge(c) ? n.push(er(c)) : i.push(E(l({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(l({}, u), { message: g }));
+      i.push(E(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, me = (e) => {
+}, be = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Rt(t) ? Ln({
+  return t ? _t(t) ? Vn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2813,51 +2854,51 @@ const Bn = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, zn = (e, t) => {
-  if (e && !ct(e))
-    return F(l({}, t), {
+}, jn = (e, t) => {
+  if (e && !gt(e))
+    return E(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
-}, Un = (e, t, r) => {
+}, Jn = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
     const i = M({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return Ie(i) ? { success: !0, data: i } : {
+    return ze(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [F(l({}, r), { message: "Invalid measure JSON" })]
+      errors: [E(l({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
-    const o = i instanceof Error ? i.message : "Unknown error";
+    const a = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [F(l({}, r), { message: o })]
+      errors: [E(l({}, r), { message: a })]
     };
   }
-}, _n = (e, t, r, s) => {
+}, Kn = (e, t, r, s) => {
   const n = M({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  if (!Ie(n))
+  if (!ze(n))
     return {
       style: {},
-      error: F(l({}, s), { message: "Invalid measure JSON" })
+      error: E(l({}, s), { message: "Invalid measure JSON" })
     };
-  const i = zn(e.sortType, s);
+  const i = jn(e.sortType, s);
   if (i) {
-    const a = _(e, "column");
-    return { measure: n, style: a, error: i };
+    const o = U(e, "column");
+    return { measure: n, style: o, error: i };
   }
-  const o = _(e, "column");
-  return { measure: n, style: o };
-}, Pn = (e, t, r, s) => {
-  if (Vs(e))
-    return _n(e, t, r, s);
-  if (q(e)) {
-    const n = Un(
+  const a = U(e, "column");
+  return { measure: n, style: a };
+}, Gn = (e, t, r, s) => {
+  if (Ut(e))
+    return Kn(e, t, r, s);
+  if (w(e)) {
+    const n = Jn(
       e,
       { dataSource: t, schemaIndex: r },
       s
@@ -2865,11 +2906,11 @@ const Bn = (e) => {
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: F(l({}, s), {
+    error: E(l({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, Gt = (e) => {
+}, tr = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -2885,13 +2926,13 @@ const Bn = (e) => {
       ]
     };
   const n = [], i = [];
-  return t.forEach((o, a) => {
+  return t.forEach((a, o) => {
     const u = {
-      path: `measures[${a}]`,
-      input: o
+      path: `measures[${o}]`,
+      input: a
     };
     try {
-      const c = Pn(o, r, s, u);
+      const c = Gn(a, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -2901,14 +2942,14 @@ const Bn = (e) => {
       );
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
-      i.push(F(l({}, u), { message: g }));
+      i.push(E(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function ae(e) {
+function ce(e) {
   return typeof e == "string" ? e : e.title;
 }
-function Wn(e) {
+function Yn(e) {
   const t = {};
   for (const [r, s] of Object.entries(e)) {
     const n = {};
@@ -2916,12 +2957,12 @@ function Wn(e) {
   }
   return Object.keys(t).length > 0 ? t : void 0;
 }
-function Yt(e) {
+function rr(e) {
   return typeof e == "object" && e !== null && "toJSON" in e && typeof e.toJSON == "function" ? e.toJSON() : e;
 }
-function B(e) {
-  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(B) : e !== null && typeof e == "object" ? Object.fromEntries(
-    Object.entries(e).map(([t, r]) => [t, B(r)])
+function L(e) {
+  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(L) : e !== null && typeof e == "object" ? Object.fromEntries(
+    Object.entries(e).map(([t, r]) => [t, L(r)])
   ) : e;
 }
 function A(e, t, r) {
@@ -2932,21 +2973,21 @@ function A(e, t, r) {
   }
   return s.data;
 }
-const xi = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = re(s), i = [], o = A(
-    () => kt({
+const Pi = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = ne(s), i = [], a = A(
+    () => Wt({
       data: t.dimensions || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), a = A(
-    () => Gt({
+  ), o = A(
+    () => tr({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   ), u = A(
-    () => se({
+    () => ie({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2954,7 +2995,7 @@ const xi = (e) => {
   );
   let c = null;
   return t.highlights && (c = A(
-    () => me({
+    () => be({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2965,53 +3006,53 @@ const xi = (e) => {
   } : {
     success: !0,
     data: l({
-      dataSource: le(r),
-      dimensions: o ? Gr(o) : [],
-      measures: a ? Yr(a) : [],
+      dataSource: me(r),
+      dimensions: a ? is(a) : [],
+      measures: o ? as(o) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Ze(e) {
+function st(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Ue(e) {
+function Ve(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var d, m, h;
-    const i = Ze(s) ? s.column : s, o = Ze(s) ? s : void 0, a = () => Yt(i);
+    var f, p, h;
+    const i = st(s) ? s.column : s, a = st(s) ? s : void 0, o = () => rr(i);
     if (!i.composeCode) {
       r.push({
         path: `dimensions[${n}]`,
-        input: a(),
+        input: o(),
         message: `Dimension at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
-    if (!i.composeCode.startsWith(w)) {
+    if (!i.composeCode.startsWith(T)) {
       r.push({
         path: `dimensions[${n}]`,
-        input: a(),
-        message: `Expected composeCode to start with '${w}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
+        input: o(),
+        message: `Expected composeCode to start with '${T}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (h = o != null && o.sortType ? lt(o.sortType) : void 0) != null ? h : ((d = i.getSort) == null ? void 0 : d.call(i)) !== void 0 && ((m = i.getSort) == null ? void 0 : m.call(i)) !== U.None ? i.getSort() : void 0, c = o ? _(o, "column") : {};
-    if (u !== void 0 && u !== U.None || o && Object.keys(c).length > 0) {
+    const u = (h = a != null && a.sortType ? yt(a.sortType) : void 0) != null ? h : ((f = i.getSort) == null ? void 0 : f.call(i)) !== void 0 && ((p = i.getSort) == null ? void 0 : p.call(i)) !== z.None ? i.getSort() : void 0, c = a ? U(a, "column") : {};
+    if (u !== void 0 && u !== z.None || a && Object.keys(c).length > 0) {
       const b = l(l({
         column: i.composeCode
-      }, u !== void 0 && u !== U.None && { sortType: dt(u) }), c);
+      }, u !== void 0 && u !== z.None && { sortType: ht(u) }), c);
       t.push(b);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-const qe = "Unknown error";
-function ne(e) {
+const xe = "Unknown error";
+function ae(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
-  if (Hr(e)) {
+  if (os(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -3024,9 +3065,9 @@ function ne(e) {
         ]
       };
     try {
-      return { success: !0, data: [J(e.composeCode)] };
+      return { success: !0, data: [K(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : qe;
+      const n = s instanceof Error ? s.message : xe;
       return {
         success: !1,
         errors: [
@@ -3051,19 +3092,19 @@ function ne(e) {
       return;
     }
     try {
-      const o = J(s.composeCode);
-      r.push(o);
-    } catch (o) {
-      const a = o instanceof Error ? o.message : qe;
+      const a = K(s.composeCode);
+      r.push(a);
+    } catch (a) {
+      const o = a instanceof Error ? a.message : xe;
       t.push({
         path: `filters[${n}]`,
         input: s,
-        message: `Failed to parse composeCode for filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function ge(e) {
+function Fe(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -3078,130 +3119,130 @@ function ge(e) {
       return;
     }
     try {
-      const o = J(s.composeCode);
-      t.push(o);
-    } catch (o) {
-      const a = o instanceof Error ? o.message : qe;
+      const a = K(s.composeCode);
+      t.push(a);
+    } catch (a) {
+      const o = a instanceof Error ? a.message : xe;
       r.push({
         path: `highlights[${n}]`,
         input: s,
-        message: `Failed to parse composeCode for highlight filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
+        message: `Failed to parse composeCode for highlight filter at index ${n}: ${o}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function et(e) {
+function nt(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function _e(e) {
+function je(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
     var u, c, g;
-    const i = et(s) ? s.column : s, o = et(s) ? s : void 0, a = () => Yt(i);
+    const i = nt(s) ? s.column : s, a = nt(s) ? s : void 0, o = () => rr(i);
     if (!i.composeCode) {
       r.push({
         path: `measures[${n}]`,
-        input: a(),
+        input: o(),
         message: `Measure at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const d = J(i.composeCode), m = (g = o != null && o.sortType ? lt(o.sortType) : void 0) != null ? g : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== U.None ? i.getSort() : void 0;
-      if (m !== void 0 && m !== U.None || o && Object.keys(_(o, "column")).length > 0) {
-        const b = o ? _(o, "column") : {}, p = l(l({
-          column: d
-        }, m !== void 0 && m !== U.None && { sortType: dt(m) }), b);
-        t.push(p);
+      const f = K(i.composeCode), p = (g = a != null && a.sortType ? yt(a.sortType) : void 0) != null ? g : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== z.None ? i.getSort() : void 0;
+      if (p !== void 0 && p !== z.None || a && Object.keys(U(a, "column")).length > 0) {
+        const b = a ? U(a, "column") : {}, m = l(l({
+          column: f
+        }, p !== void 0 && p !== z.None && { sortType: ht(p) }), b);
+        t.push(m);
       } else
-        t.push(d);
-    } catch (d) {
-      const m = d instanceof Error ? d.message : "Unknown error";
+        t.push(f);
+    } catch (f) {
+      const p = f instanceof Error ? f.message : "Unknown error";
       r.push({
         path: `measures[${n}]`,
-        input: a(),
-        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${m}. ComposeCode: '${i.composeCode}'`
+        input: o(),
+        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${p}. ComposeCode: '${i.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function tt(e) {
+function it(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(ft)) != null ? n : !1);
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(bt)) != null ? n : !1);
 }
-function rt(e) {
+function at(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(pt)) != null ? n : !1);
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(Ft)) != null ? n : !1);
 }
-function st(e) {
+function ot(e) {
   try {
-    const t = J(e.trim());
+    const t = K(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
   } catch (t) {
     return;
   }
 }
-function Vn(e) {
+function Hn(e) {
   var s, n, i;
   if (!(e != null && e.length)) return [];
   const t = /* @__PURE__ */ new Set(), r = [];
-  for (let o = 0; o < e.length; o++) {
-    if (t.has(o)) continue;
-    const a = e[o];
-    if (tt(a) || rt(a)) {
-      r.push(a);
+  for (let a = 0; a < e.length; a++) {
+    if (t.has(a)) continue;
+    const o = e[a];
+    if (it(o) || at(o)) {
+      r.push(o);
       continue;
     }
-    const u = (s = a.name) != null ? s : "Measure", c = `${ft}_${u}`, g = `${pt}_${u}`;
-    let d, m, h = o + 1;
-    if (h < e.length && !t.has(h) && tt(e[h]) && e[h].name === c) {
+    const u = (s = o.name) != null ? s : "Measure", c = `${bt}_${u}`, g = `${Ft}_${u}`;
+    let f, p, h = a + 1;
+    if (h < e.length && !t.has(h) && it(e[h]) && e[h].name === c) {
       const b = (n = e[h].composeCode) == null ? void 0 : n.trim();
-      b && (d = st(b), t.add(h), h++);
+      b && (f = ot(b), t.add(h), h++);
     }
-    if (h < e.length && !t.has(h) && rt(e[h]) && e[h].name === g) {
+    if (h < e.length && !t.has(h) && at(e[h]) && e[h].name === g) {
       const b = (i = e[h].composeCode) == null ? void 0 : i.trim();
-      b && (m = st(b), t.add(h));
+      b && (p = ot(b), t.add(h));
     }
-    d !== void 0 || m !== void 0 ? r.push(l(l({
-      column: a
-    }, d && Object.keys(d).length > 0 && { trend: d }), m && Object.keys(m).length > 0 && { forecast: m })) : r.push(a);
+    f !== void 0 || p !== void 0 ? r.push(l(l({
+      column: o
+    }, f && Object.keys(f).length > 0 && { trend: f }), p && Object.keys(p).length > 0 && { forecast: p })) : r.push(o);
   }
   return r;
 }
-function vi(e) {
+function Wi(e) {
   const t = [], r = A(
-    () => Ue(e.dimensions || []),
+    () => Ve(e.dimensions || []),
     t
-  ), s = Vn(e.measures || []), n = A(
-    () => _e(s),
+  ), s = Hn(e.measures || []), n = A(
+    () => je(s),
     t
   ), i = A(
-    () => ne(e.filters),
+    () => ae(e.filters),
     t
   );
-  let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = A(
-    () => ge(e.highlights),
+  let a = null;
+  if (e.highlights && e.highlights.length > 0 && (a = A(
+    () => Fe(e.highlights),
     t
   )), t.length > 0)
     return {
       success: !1,
       errors: t
     };
-  const a = l({
+  const o = l({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
-  }, o && { highlights: o });
+  }, a && { highlights: a });
   return {
     success: !0,
     // Strip [[delimiters]] from all strings to preserve original names with spaces
-    data: B(a)
+    data: L(o)
   };
 }
-const Ht = new Set(
-  Qr.filter((e) => e !== "image")
-), nt = Object.freeze([...Ht]), Ae = /* @__PURE__ */ new Set([
+const sr = new Set(
+  us.filter((e) => e !== "image")
+), ut = Object.freeze([...sr]), Ce = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3224,7 +3265,7 @@ const Ht = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), jn = {
+]), Qn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3297,7 +3338,7 @@ const Ht = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, Jn = /* @__PURE__ */ new Set([
+}, Xn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3305,7 +3346,7 @@ const Ht = new Set(
   "geo",
   "details",
   "date"
-]), Kn = /* @__PURE__ */ new Set([
+]), Zn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3317,34 +3358,34 @@ const Ht = new Set(
   "max",
   "color"
 ]);
-function Gn(e) {
-  const t = jn[e];
+function ei(e) {
+  const t = Qn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
       requiredAxes: Object.freeze([...t.requiredAxes])
     };
 }
-function Qt(e) {
-  return typeof e == "string" && Ht.has(e);
+function nr(e) {
+  return typeof e == "string" && sr.has(e);
 }
-function Yn(e, t, r) {
-  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Jn.has(e))
+function ti(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Xn.has(e))
     return !0;
-  if (Kn.has(e))
+  if (Zn.has(e))
     return !1;
   const s = Array.isArray(t) ? t[0] : t;
   if (!s)
     return !0;
   let n;
-  return O(s) && "column" in s && (n = s.column), !(q(s) || n !== void 0 && q(n));
+  return q(s) && "column" in s && (n = s.column), !(w(s) || n !== void 0 && w(n));
 }
-function Hn(e) {
+function ri(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
   };
-  if (!O(e))
+  if (!q(e))
     return t.push({
       path: "chartType",
       input: e,
@@ -3352,29 +3393,29 @@ function Hn(e) {
     }), { normalized: r, errors: t };
   const s = e.chartType;
   if (s === void 0) {
-    const i = Object.keys(e), o = x("chartType", i, (c) => c), a = o && o.distance <= T ? ` Did you mean 'chartType'? (You may have typed '${o.best}')` : "", u = o && o.distance <= T ? { [o.best]: e[o.best] } : e;
+    const i = Object.keys(e), a = x("chartType", i, (c) => c), o = a && a.distance <= C ? ` Did you mean 'chartType'? (You may have typed '${a.best}')` : "", u = a && a.distance <= C ? { [a.best]: e[a.best] } : e;
     t.push({
       path: "chartType",
       input: u,
-      message: `chartType is required.${a}`
+      message: `chartType is required.${o}`
     });
-  } else if (Qt(s))
+  } else if (nr(s))
     r.chartType = s;
   else {
-    const i = x(String(s), nt, (u) => u), o = i && i.distance <= T ? ` Did you mean '${i.best}'?` : "", a = nt.slice(0, 8).join(", ");
+    const i = x(String(s), ut, (u) => u), a = i && i.distance <= C ? ` Did you mean '${i.best}'?` : "", o = ut.slice(0, 8).join(", ");
     t.push({
       path: "chartType",
       input: s,
-      message: `Invalid chartType '${s}'. Valid types: ${a}, ...${o}`
+      message: `Invalid chartType '${s}'. Valid types: ${o}, ...${a}`
     });
   }
   const n = e.dataOptions;
   if (n === void 0) {
-    const i = Object.keys(e), o = x("dataOptions", i, (c) => c), a = o && o.distance <= T ? ` Did you mean 'dataOptions'? (You may have typed '${o.best}')` : "", u = o && o.distance <= T ? { [o.best]: e[o.best] } : e;
+    const i = Object.keys(e), a = x("dataOptions", i, (c) => c), o = a && a.distance <= C ? ` Did you mean 'dataOptions'? (You may have typed '${a.best}')` : "", u = a && a.distance <= C ? { [a.best]: e[a.best] } : e;
     t.push({
       path: "dataOptions",
       input: u,
-      message: `dataOptions is required.${a}`
+      message: `dataOptions is required.${o}`
     });
   } else n !== null && typeof n == "object" && (r.dataOptions = n);
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
@@ -3382,149 +3423,156 @@ function Hn(e) {
 function D(e, t) {
   return e === -1 ? "dataOptions" : typeof e == "number" ? `dataOptions[${e}]` : t !== void 0 ? `dataOptions.${e}[${t}]` : `dataOptions.${e}`;
 }
-function Xt(e, t) {
+function ir(e, t) {
   return e ? t ? `${e}.${t}` : e : t != null ? t : "";
 }
-function Qn(e) {
-  return (t) => F(l({}, t), {
-    path: Xt(e, t.path)
+function si(e) {
+  return (t) => E(l({}, t), {
+    path: ir(e, t.path)
   });
 }
-function Zt(e) {
-  return Qn(`widgets[${e}]`);
+function ar(e) {
+  return si(`widgets[${e}]`);
 }
-function er(e, t) {
+function or(e, t) {
   return e.map(t);
 }
-function Xn(e) {
+function ni(e) {
   return e.map(
     ({ attribute: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function Zn(e) {
+function ii(e) {
   return e.map(
     ({ measure: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function tr(e) {
+function ai(e) {
+  return Array.isArray(e) ? e : [e];
+}
+function oi(e) {
+  return Array.isArray(e) ? e : [e];
+}
+function ui(e) {
   return Array.isArray(e) ? e : [e];
 }
-const ei = /^(dimensions|measures|filters|highlights)(\[\d+\])?$/;
-function $e(e) {
+const ci = /^(dimensions|measures|filters|highlights)(\[\d+\])?$/;
+function Ne(e) {
   return (t) => {
     const r = t.path.match(/\[(\d+)\]$/), s = r ? Number(r[1]) : void 0, n = D(e, s);
-    if (ei.test(t.path) || t.path.startsWith("dataOptions"))
-      return F(l({}, t), { path: n });
+    if (ci.test(t.path) || t.path.startsWith("dataOptions"))
+      return E(l({}, t), { path: n });
     const i = t.path.replace(/\[\d+\]$/, "");
-    return F(l({}, t), {
-      path: Xt(i, n)
+    return E(l({}, t), {
+      path: ir(i, n)
     });
   };
 }
-function ce(e, t, r, s, n) {
-  const i = t ? tr(
-    t
-  ) : [];
-  if (i.length === 0)
-    return [];
+function fe(e, t, r, s, n) {
   if (r === "dimension") {
-    const a = A(
-      () => kt({
-        data: i,
+    const o = t ? ai(t) : [];
+    if (o.length === 0)
+      return [];
+    const u = A(
+      () => Wt({
+        data: o,
         context: s
       }),
       n,
-      $e(e)
+      Ne(e)
     );
-    return a !== null ? Xn(a) : null;
+    return u !== null ? ni(u) : null;
   }
-  const o = A(
-    () => Gt({
+  const i = t ? oi(t) : [];
+  if (i.length === 0)
+    return [];
+  const a = A(
+    () => tr({
       data: i,
       context: s
     }),
     n,
-    $e(e)
+    Ne(e)
   );
-  return o !== null ? Zn(o) : null;
+  return a !== null ? ii(a) : null;
 }
-const it = (e, t) => {
+const ct = (e, t) => {
   const r = t.path.match(/\[(\d+)\]$/), s = r ? Number(r[1]) : void 0;
-  return F(l({}, t), { path: D(e, s) });
+  return E(l({}, t), { path: D(e, s) });
 };
-function ot(e, t, r) {
+function lt(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = Ue(
+    const i = Ve(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((o) => it(e, o))
+      errors: i.errors.map((a) => ct(e, a))
     };
   }
-  const n = _e(s);
+  const n = je(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => it(e, i))
+    errors: n.errors.map((i) => ct(e, i))
   };
 }
-function ti(e, t) {
+function li(e, t) {
   let r;
-  O(e) && "column" in e && (r = e.column);
-  const n = !(q(e) || r !== void 0 && q(r)) ? "dimension" : "measure", i = [], o = ce("columns", [e], n, t, i);
-  return o !== null ? { success: !0, data: o } : { success: !1, errors: i };
+  q(e) && "column" in e && (r = e.column);
+  const n = !(w(e) || r !== void 0 && w(r)) ? "dimension" : "measure", i = [], a = fe("columns", [e], n, t, i);
+  return a !== null ? { success: !0, data: a } : { success: !1, errors: i };
 }
-function ri(e, t, r, s) {
+function fi(e, t, r, s) {
   const n = [];
   for (const i of e) {
-    const o = A(
-      () => ti(i, t),
+    const a = A(
+      () => li(i, t),
       r,
       s
     );
-    o && n.push(...o);
+    a && n.push(...a);
   }
   return n;
 }
-function si(e, t, r) {
-  if (!e || !O(e))
+function di(e, t, r) {
+  if (!e || !q(e))
     return r.push({
       path: D(-1),
       input: e,
       message: "dataOptions is required"
     }), null;
-  const s = {}, { chartType: n } = t, i = r.length, o = e, a = Object.keys(e), u = /* @__PURE__ */ new Map();
-  for (const d of a)
-    if (!Ae.has(d)) {
-      const m = x(d, [...Ae], (b) => b), h = m && m.distance <= T ? ` Did you mean '${m.best}'?` : "";
-      m && m.distance <= T && u.set(d, m.best), r.push({
-        path: D(d),
-        input: o[d],
-        message: `Unknown dataOptions key '${d}'.${h}`
+  const s = {}, { chartType: n } = t, i = r.length, a = e, o = Object.keys(e), u = /* @__PURE__ */ new Map();
+  for (const f of o)
+    if (!Ce.has(f)) {
+      const p = x(f, [...Ce], (b) => b), h = p && p.distance <= C ? ` Did you mean '${p.best}'?` : "";
+      p && p.distance <= C && u.set(f, p.best), r.push({
+        path: D(f),
+        input: a[f],
+        message: `Unknown dataOptions key '${f}'.${h}`
       });
     }
-  const c = n ? Gn(n) : void 0;
+  const c = n ? ei(n) : void 0;
   if (c) {
-    for (const d of a)
-      if (d !== "seriesToColorMap" && !c.validAxes.has(d) && Ae.has(d)) {
-        const m = x(d, [...c.validAxes], (p) => p), h = m && m.distance <= T ? ` Did you mean '${m.best}'?` : "", b = [...c.validAxes].join(", ");
+    for (const f of o)
+      if (f !== "seriesToColorMap" && !c.validAxes.has(f) && Ce.has(f)) {
+        const p = x(f, [...c.validAxes], (m) => m), h = p && p.distance <= C ? ` Did you mean '${p.best}'?` : "", b = [...c.validAxes].join(", ");
         r.push({
-          path: D(d),
-          input: o[d],
-          message: `Axis '${d}' is not valid for chart type '${n}'. Valid axes: ${b}.${h}`
+          path: D(f),
+          input: a[f],
+          message: `Axis '${f}' is not valid for chart type '${n}'. Valid axes: ${b}.${h}`
         });
       }
-    for (const d of c.requiredAxes)
-      [...u.values()].includes(d) || (!(d in o) || o[d] == null) && r.push({
-        path: D(d),
+    for (const f of c.requiredAxes)
+      [...u.values()].includes(f) || (!(f in a) || a[f] == null) && r.push({
+        path: D(f),
         input: null,
         message: `Chart type '${n}' requires '${c.requiredAxes.join(
           "' and '"
-        )}'. Missing: ${d}.`
+        )}'. Missing: ${f}.`
       });
     n === "indicator" && (["value", "secondary", "min", "max"].some(
-      (h) => h in o && o[h] != null
+      (h) => h in a && a[h] != null
     ) || r.push({
       path: D(-1),
       input: e,
@@ -3538,66 +3586,66 @@ function si(e, t, r) {
   if (r.length > i)
     return null;
   const g = Object.entries(e);
-  for (const [d, m] of g) {
-    if (!m) continue;
-    if (d === "seriesToColorMap") {
-      s[d] = m;
+  for (const [f, p] of g) {
+    if (!p) continue;
+    if (f === "seriesToColorMap") {
+      s[f] = p;
       continue;
     }
-    if (d === "columns") {
-      s[d] = ri(
-        tr(m),
+    if (f === "columns") {
+      s[f] = fi(
+        ui(p),
         t,
         r,
-        $e("columns")
+        Ne("columns")
       );
       continue;
     }
-    const h = Yn(d, m, n) ? "dimension" : "measure", b = ce(
-      d,
-      m,
+    const h = ti(f, p, n) ? "dimension" : "measure", b = fe(
+      f,
+      p,
       h,
       t,
       r
     );
     if (b !== null) {
-      const p = n === "calendar-heatmap" && d === "value";
-      s[d] = p || !Array.isArray(m) ? b[0] : b;
+      const m = n === "calendar-heatmap" && f === "value";
+      s[f] = m || !Array.isArray(p) ? b[0] : b;
     }
   }
   return r.length > i ? null : s;
 }
-function ni(e) {
+function mi(e) {
   if (typeof e != "string") return "iqr";
   const t = e.split("/")[1];
   return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
 }
-const ii = (e) => {
-  var p;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Hn(t);
-  if (o.length > 0)
-    return { success: !1, errors: o };
-  const a = i.chartType, u = re(n), c = [];
-  let g = si(
+const pi = (e) => {
+  var m;
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = ri(t);
+  if (a.length > 0)
+    return { success: !1, errors: a };
+  const o = i.chartType, u = ne(n), c = [];
+  let g = di(
     i.dataOptions,
-    { dataSource: s, schemaIndex: u, chartType: a },
+    { dataSource: s, schemaIndex: u, chartType: o },
     c
   );
-  if (a === "boxplot" && g) {
-    const E = ni((p = i.styleOptions) == null ? void 0 : p.subtype), C = E === "iqr" || E === "standardDeviation";
-    g = F(l({}, g), { boxType: E, outliersEnabled: C });
+  if (o === "boxplot" && g) {
+    const F = mi((m = i.styleOptions) == null ? void 0 : m.subtype), O = F === "iqr" || F === "standardDeviation";
+    g = E(l({}, g), { boxType: F, outliersEnabled: O });
   }
-  let d = null;
-  i.filters && i.filters.length > 0 && (d = A(
-    () => se({
+  let f = null;
+  i.filters && i.filters.length > 0 && (f = A(
+    () => ie({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
   ));
-  let m = null;
-  if (i.highlights && i.highlights.length > 0 && (m = A(
-    () => me({
+  let p = null;
+  if (i.highlights && i.highlights.length > 0 && (p = A(
+    () => be({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
@@ -3607,7 +3655,7 @@ const ii = (e) => {
       success: !1,
       errors: c
     };
-  if (!Qt(i.chartType))
+  if (!nr(i.chartType))
     return {
       success: !1,
       errors: [
@@ -3622,15 +3670,15 @@ const ii = (e) => {
   return {
     success: !0,
     data: l(l(l({
-      dataSet: le(s),
+      dataSet: me(s),
       chartType: h,
       dataOptions: g
     }, i.styleOptions && {
       // Pass-through NLQ JSON; shape matches ChartStyleOptions.
       styleOptions: i.styleOptions
-    }), d && { filters: d }), m && { highlights: m })
+    }), f && { filters: f }), p && { highlights: p })
   };
-}, oi = (e) => {
+}, gi = (e) => {
   const t = [];
   if (!e.chartType)
     return {
@@ -3655,27 +3703,27 @@ const ii = (e) => {
       ]
     };
   let r = null;
-  const s = ai(e.dataOptions);
+  const s = yi(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
-    const a = A(
-      () => ne(e.filters),
+    const o = A(
+      () => ae(e.filters),
       t
     );
-    n = a != null ? a : void 0;
+    n = o != null ? o : void 0;
   }
   let i;
   if (e.highlights && e.highlights.length > 0) {
-    const a = A(
-      () => ge(e.highlights),
+    const o = A(
+      () => Fe(e.highlights),
       t
     );
-    i = a != null ? a : void 0;
+    i = o != null ? o : void 0;
   }
   if (t.length > 0 || r === null)
     return { success: !1, errors: t };
-  const o = l(l(l({
+  const a = l(l(l({
     chartType: e.chartType,
     dataOptions: r
   }, e.styleOptions && {
@@ -3683,10 +3731,10 @@ const ii = (e) => {
   }), n && n.length > 0 && { filters: n }), i && i.length > 0 && { highlights: i });
   return {
     success: !0,
-    data: B(o)
+    data: L(a)
   };
 };
-function ai(e) {
+function yi(e) {
   const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
   for (const [n, i] of Object.entries(e)) {
     if (n === "seriesToColorMap" && i) {
@@ -3697,16 +3745,16 @@ function ai(e) {
       i != null && (t[n] = i);
       continue;
     }
-    const o = Array.isArray(i) ? i : [i], a = Array.isArray(i), u = [], c = [];
-    for (let g = 0; g < o.length; g++) {
-      const d = o[g], h = ui(d) ? Ue([
-        d
-      ]) : _e([d]);
+    const a = Array.isArray(i) ? i : [i], o = Array.isArray(i), u = [], c = [];
+    for (let g = 0; g < a.length; g++) {
+      const f = a[g], h = hi(f) ? Ve([
+        f
+      ]) : je([f]);
       h.success ? u.push(...h.data) : h.errors.forEach((b) => {
-        var p;
-        c.push(F(l({}, b), {
+        var m;
+        c.push(E(l({}, b), {
           path: D(n, g),
-          input: (p = b.input) != null ? p : d
+          input: (m = b.input) != null ? m : f
         }));
       });
     }
@@ -3714,15 +3762,15 @@ function ai(e) {
       r.push(...c);
       continue;
     }
-    t[n] = a ? u : u[0];
+    t[n] = o ? u : u[0];
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function ui(e) {
+function hi(e) {
   const t = Array.isArray(e) ? e[0] : e;
-  if (!t || !O(t))
+  if (!t || !q(t))
     return !0;
-  const r = "column" in t && t.column != null && O(t.column) ? t.column : t;
+  const r = "column" in t && t.column != null && q(t.column) ? t.column : t;
   if ("composeCode" in r) {
     const s = r.composeCode;
     if (typeof s == "string" && s.startsWith("DM."))
@@ -3737,17 +3785,17 @@ function ui(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const at = ["rows", "columns", "values", "grandTotals"];
-function ci(e) {
-  if (!O(e)) return !1;
+const ft = ["rows", "columns", "values", "grandTotals"];
+function bi(e) {
+  if (!q(e)) return !1;
   const t = Object.keys(e);
   return t.every((r) => r === "rows" || r === "columns") && t.every((r) => typeof e[r] == "boolean");
 }
-function li(e) {
+function Fi(e) {
   const t = [], r = {
     dataOptions: {}
   };
-  if (!O(e))
+  if (!q(e))
     return t.push({
       path: "dataOptions",
       input: e,
@@ -3755,34 +3803,34 @@ function li(e) {
     }), { normalized: r, errors: t };
   const s = e.dataOptions;
   if (s === void 0) {
-    const n = Object.keys(e), i = x("dataOptions", n, (u) => u), o = i && i.distance <= T ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", a = i && i.distance <= T ? { [i.best]: e[i.best] } : e;
+    const n = Object.keys(e), i = x("dataOptions", n, (u) => u), a = i && i.distance <= C ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", o = i && i.distance <= C ? { [i.best]: e[i.best] } : e;
     t.push({
       path: "dataOptions",
-      input: a,
-      message: `dataOptions is required.${o}`
+      input: o,
+      message: `dataOptions is required.${a}`
     });
-  } else if (O(s)) {
+  } else if (q(s)) {
     const n = s;
     r.dataOptions = n;
-    for (const o of Object.keys(n))
-      if (!at.includes(o)) {
-        const a = x(o, [...at], (c) => c), u = a && a.distance <= T ? ` Did you mean '${a.best}'?` : "";
+    for (const a of Object.keys(n))
+      if (!ft.includes(a)) {
+        const o = x(a, [...ft], (c) => c), u = o && o.distance <= C ? ` Did you mean '${o.best}'?` : "";
         t.push({
-          path: D(o),
-          input: n[o],
-          message: `Unknown dataOptions key '${o}'. Valid keys: rows, columns, values, grandTotals.${u}`
+          path: D(a),
+          input: n[a],
+          message: `Unknown dataOptions key '${a}'. Valid keys: rows, columns, values, grandTotals.${u}`
         });
       }
-    for (const o of ["rows", "columns", "values"]) {
-      const a = n[o];
-      a != null && !Array.isArray(a) && t.push({
-        path: D(o),
-        input: a,
-        message: `dataOptions.${o} must be an array`
+    for (const a of ["rows", "columns", "values"]) {
+      const o = n[a];
+      o != null && !Array.isArray(o) && t.push({
+        path: D(a),
+        input: o,
+        message: `dataOptions.${a} must be an array`
       });
     }
     const i = n.grandTotals;
-    i != null && !ci(i) && t.push({
+    i != null && !bi(i) && t.push({
       path: D("grandTotals"),
       input: i,
       message: "grandTotals must be an object with optional rows?: boolean, columns?: boolean"
@@ -3790,7 +3838,7 @@ function li(e) {
   }
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
 }
-function di(e, t, r) {
+function Ei(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
       path: D(-1),
@@ -3798,17 +3846,17 @@ function di(e, t, r) {
       message: "dataOptions is required"
     }), null;
   const s = {}, n = r.length;
-  for (const o of ["rows", "columns"]) {
-    const a = ce(
-      o,
-      e[o],
+  for (const a of ["rows", "columns"]) {
+    const o = fe(
+      a,
+      e[a],
       "dimension",
       t,
       r
     );
-    a && (s[o] = a);
+    o && (s[a] = o);
   }
-  const i = ce(
+  const i = fe(
     "values",
     e.values,
     "measure",
@@ -3817,28 +3865,28 @@ function di(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const fi = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = li(t);
-  if (o.length > 0)
-    return { success: !1, errors: o };
-  const a = re(n), u = [], c = di(
+const Ai = (e) => {
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = Fi(t);
+  if (a.length > 0)
+    return { success: !1, errors: a };
+  const o = ne(n), u = [], c = Ei(
     i.dataOptions,
-    { dataSource: s, schemaIndex: a },
+    { dataSource: s, schemaIndex: o },
     u
   );
   let g = null;
   i.filters && i.filters.length > 0 && (g = A(
-    () => se({
+    () => ie({
       data: i.filters || [],
-      context: { dataSource: s, schemaIndex: a }
+      context: { dataSource: s, schemaIndex: o }
     }),
     u
   ));
-  let d = null;
-  return i.highlights && i.highlights.length > 0 && (d = A(
-    () => me({
+  let f = null;
+  return i.highlights && i.highlights.length > 0 && (f = A(
+    () => be({
       data: i.highlights || [],
-      context: { dataSource: s, schemaIndex: a }
+      context: { dataSource: s, schemaIndex: o }
     }),
     u
   )), u.length > 0 || c === null ? {
@@ -3847,11 +3895,11 @@ const fi = (e) => {
   } : {
     success: !0,
     data: l(l(l({
-      dataSet: le(s),
+      dataSet: me(s),
       dataOptions: c
-    }, i.styleOptions && { styleOptions: i.styleOptions }), g && { filters: g }), d && { highlights: d })
+    }, i.styleOptions && { styleOptions: i.styleOptions }), g && { filters: g }), f && { highlights: f })
   };
-}, pi = (e) => {
+}, Ti = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
@@ -3868,54 +3916,54 @@ const fi = (e) => {
   for (const u of ["rows", "columns"]) {
     const c = r[u];
     if (c && c.length > 0) {
-      const g = ot(u, c, "dimension");
+      const g = lt(u, c, "dimension");
       g.success ? s[u] = g.data : t.push(...g.errors);
     }
   }
   const n = r.values;
   if (n && n.length > 0) {
-    const u = ot("values", n, "measure");
+    const u = lt("values", n, "measure");
     u.success ? s.values = u.data : t.push(...u.errors);
   }
   r.grandTotals !== void 0 && (s.grandTotals = r.grandTotals);
   let i;
   if (e.filters) {
     const u = A(
-      () => ne(e.filters),
+      () => ae(e.filters),
       t
     );
     i = u != null ? u : void 0;
   }
-  let o;
+  let a;
   if (e.highlights && e.highlights.length > 0) {
     const u = A(
-      () => ge(e.highlights),
+      () => Fe(e.highlights),
       t
     );
-    o = u != null ? u : void 0;
+    a = u != null ? u : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const a = l(l(l({
+  const o = l(l(l({
     dataOptions: s
-  }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), o && o.length > 0 && { highlights: o });
+  }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), a && a.length > 0 && { highlights: a });
   return {
     success: !0,
-    data: B(a)
+    data: L(o)
   };
-}, mi = (e, t, r) => {
-  const s = re(r.tables), n = { dataSource: r.dataSource, schemaIndex: s }, i = [], o = e && e.length > 0 ? A(
-    () => se({ data: e, context: n }),
+}, wi = (e, t, r) => {
+  const s = ne(r.tables), n = { dataSource: r.dataSource, schemaIndex: s }, i = [], a = e && e.length > 0 ? A(
+    () => ie({ data: e, context: n }),
     i
-  ) : void 0, a = t && t.length > 0 ? A(
-    () => me({ data: t, context: n }),
+  ) : void 0, o = t && t.length > 0 ? A(
+    () => be({ data: t, context: n }),
     i
   ) : void 0;
   return i.length > 0 ? { success: !1, errors: i } : {
     success: !0,
-    data: l(l({}, o != null && { filters: o }), a != null && { highlights: a })
+    data: l(l({}, a != null && { filters: a }), o != null && { highlights: o })
   };
-}, gi = [
+}, Si = [
   "widgetType",
   "id",
   "title",
@@ -3923,36 +3971,36 @@ const fi = (e) => {
   "dataSource",
   "config",
   "highlightSelectionDisabled"
-], ut = (e, t, r, s) => {
-  const { id: n, title: i, description: o, dataSource: a, config: u, highlightSelectionDisabled: c } = e, g = _(e, gi), d = r({ data: g, context: t });
-  return d.success ? {
+], dt = (e, t, r, s) => {
+  const { id: n, title: i, description: a, dataSource: o, config: u, highlightSelectionDisabled: c } = e, g = U(e, Si), f = r({ data: g, context: t });
+  return f.success ? {
     success: !0,
-    data: s(d.data, {
+    data: s(f.data, {
       id: n,
       title: i,
-      description: o,
-      dataSource: a,
+      description: a,
+      dataSource: o,
       config: u,
       highlightSelectionDisabled: c
     })
-  } : d;
-}, yi = (e, t) => {
-  const n = e, { dataSet: r } = n, s = ye(n, ["dataSet"]);
-  return l(l(l(l(l(F(l({}, s), {
+  } : f;
+}, Ci = (e, t) => {
+  const n = e, { dataSet: r } = n, s = Ee(n, ["dataSet"]);
+  return l(l(l(l(l(E(l({}, s), {
     widgetType: "chart",
     id: t.id
-  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && mt(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.highlightSelectionDisabled !== void 0 && {
+  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Et(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.highlightSelectionDisabled !== void 0 && {
     highlightSelectionDisabled: t.highlightSelectionDisabled
   }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
-}, hi = (e, t) => {
-  const n = e, { dataSet: r } = n, s = ye(n, ["dataSet"]);
-  return l(l(l(l(F(l({}, s), {
+}, Oi = (e, t) => {
+  const n = e, { dataSet: r } = n, s = Ee(n, ["dataSet"]);
+  return l(l(l(l(E(l({}, s), {
     widgetType: "pivot",
     id: t.id
-  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && mt(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
-}, Oe = ["chart", "pivot", "text", "custom"], bi = (e) => typeof e == "string" && Oe.includes(e);
-function Ei(e) {
-  if (!O(e))
+  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Et(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
+}, ve = ["chart", "pivot", "text", "custom"], $i = (e) => typeof e == "string" && ve.includes(e);
+function qi(e) {
+  if (!q(e))
     return {
       path: "widgetType",
       input: e,
@@ -3960,15 +4008,15 @@ function Ei(e) {
     };
   const t = e.widgetType;
   if (t === void 0) {
-    const r = Object.keys(e), s = x("widgetType", r, (o) => o), n = s && s.distance <= T ? ` Did you mean 'widgetType'? (You may have typed '${s.best}')` : "";
+    const r = Object.keys(e), s = x("widgetType", r, (a) => a), n = s && s.distance <= C ? ` Did you mean 'widgetType'? (You may have typed '${s.best}')` : "";
     return {
       path: "widgetType",
-      input: s && s.distance <= T ? { [s.best]: e[s.best] } : e,
+      input: s && s.distance <= C ? { [s.best]: e[s.best] } : e,
       message: `widgetType is required.${n}`
     };
   }
-  if (!bi(t)) {
-    const r = x(String(t), Oe, (i) => i), s = r && r.distance <= T ? ` Did you mean '${r.best}'?` : "", n = Oe.join(", ");
+  if (!$i(t)) {
+    const r = x(String(t), ve, (i) => i), s = r && r.distance <= C ? ` Did you mean '${r.best}'?` : "", n = ve.join(", ");
     return {
       path: "widgetType",
       input: t,
@@ -3979,30 +4027,30 @@ function Ei(e) {
   }
   return null;
 }
-const Fi = (e) => ({
+const Di = (e) => ({
   path: "id",
   input: e,
   message: "Widget id is required"
-}), Ai = (e) => !!e.id, wi = (e) => {
-  const { data: t, context: r } = e, s = Ei(t);
+}), xi = (e) => !!e.id, Ni = (e) => {
+  const { data: t, context: r } = e, s = qi(t);
   if (s)
     return { success: !1, errors: [s] };
-  if (!Ai(t))
-    return { success: !1, errors: [Fi(t)] };
+  if (!xi(t))
+    return { success: !1, errors: [Di(t)] };
   switch (t.widgetType) {
     case "chart":
-      return ut(
+      return dt(
         t,
         r,
-        ii,
-        yi
+        pi,
+        Ci
       );
     case "pivot":
-      return ut(
+      return dt(
         t,
         r,
-        fi,
-        hi
+        Ai,
+        Oi
       );
     case "text":
       return { success: !0, data: l({
@@ -4014,23 +4062,23 @@ const Fi = (e) => ({
       const {
         id: n,
         customWidgetType: i,
-        title: o,
-        description: a,
+        title: a,
+        description: o,
         dataSource: u,
         config: c,
         filters: g,
-        highlights: d,
-        dataOptions: m,
+        highlights: f,
+        dataOptions: p,
         styleOptions: h,
         customOptions: b
-      } = t, p = mi(g, d, r);
-      return p.success ? { success: !0, data: l(l(l(l(l(l({
+      } = t, m = wi(g, f, r);
+      return m.success ? { success: !0, data: l(l(l(l(l(l({
         widgetType: "custom",
         id: n,
         customWidgetType: i,
-        dataSource: u !== void 0 ? u : le(r.dataSource),
-        dataOptions: m != null ? m : {}
-      }, o !== void 0 && { title: o }), a !== void 0 && { description: a }), c !== void 0 && { config: c }), h !== void 0 && { styleOptions: h }), b !== void 0 && { customOptions: b }), p.data) } : p;
+        dataSource: u !== void 0 ? u : me(r.dataSource),
+        dataOptions: p != null ? p : {}
+      }, a !== void 0 && { title: a }), o !== void 0 && { description: o }), c !== void 0 && { config: c }), h !== void 0 && { styleOptions: h }), b !== void 0 && { customOptions: b }), m.data) } : m;
     }
     default:
       return {
@@ -4046,37 +4094,37 @@ const Fi = (e) => ({
         ]
       };
   }
-}, Ti = (e) => {
+}, vi = (e) => {
   const { widgetType: t } = e;
   switch (t) {
     case "chart": {
-      const r = oi(e);
+      const r = gi(e);
       if (!r.success) return r;
-      const s = l(l(l(l(l(F(l({}, r.data), {
+      const s = l(l(l(l(l(E(l({}, r.data), {
         widgetType: "chart",
         id: e.id
       }), e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ae(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config }), e.highlightSelectionDisabled !== void 0 && {
         highlightSelectionDisabled: e.highlightSelectionDisabled
       });
       return {
         success: !0,
-        data: B(s)
+        data: L(s)
       };
     }
     case "pivot": {
-      const r = pi(e);
+      const r = Ti(e);
       if (!r.success) return r;
-      const s = l(l(l(l(F(l({}, r.data), {
+      const s = l(l(l(l(E(l({}, r.data), {
         widgetType: "pivot",
         id: e.id
       }), e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ae(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config });
       return {
         success: !0,
-        data: B(s)
+        data: L(s)
       };
     }
     case "text":
@@ -4087,10 +4135,10 @@ const Fi = (e) => ({
       }, e.config !== void 0 && { config: e.config }) };
     case "custom": {
       const r = [], s = e.filters !== void 0 ? A(
-        () => ne(e.filters),
+        () => ae(e.filters),
         r
       ) : void 0, n = e.highlights !== void 0 ? A(
-        () => ge(e.highlights),
+        () => Fe(e.highlights),
         r
       ) : void 0;
       return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: l(l(l(l(l(l(l(l(l({
@@ -4098,7 +4146,7 @@ const Fi = (e) => ({
         customWidgetType: e.customWidgetType,
         id: e.id
       }, e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ae(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config }), e.dataOptions !== void 0 && {
         dataOptions: e.dataOptions
       }), e.styleOptions !== void 0 && { styleOptions: e.styleOptions }), e.customOptions !== void 0 && {
@@ -4121,13 +4169,13 @@ const Fi = (e) => ({
         ]
       };
   }
-}, Ni = (e) => {
+}, Vi = (e) => {
   const { data: t, context: r } = e, s = [], n = [];
-  Array.isArray(t.widgets) ? t.widgets.forEach((a, u) => {
-    const c = wi({ data: a, context: r });
+  Array.isArray(t.widgets) ? t.widgets.forEach((o, u) => {
+    const c = Ni({ data: o, context: r });
     if (!c.success) {
       s.push(
-        ...er(c.errors, Zt(u))
+        ...or(c.errors, ar(u))
       );
       return;
     }
@@ -4139,11 +4187,11 @@ const Fi = (e) => ({
   });
   let i = null;
   if (t.filters && t.filters.length > 0) {
-    const a = re(r.tables);
+    const o = ne(r.tables);
     i = A(
-      () => se({
+      () => ie({
         data: t.filters,
-        context: { dataSource: r.dataSource, schemaIndex: a }
+        context: { dataSource: r.dataSource, schemaIndex: o }
       }),
       s
     );
@@ -4157,13 +4205,13 @@ const Fi = (e) => ({
   }), t.styleOptions !== void 0 && { styleOptions: t.styleOptions }), t.widgetsOptions !== void 0 && {
     widgetsOptions: t.widgetsOptions
   }) };
-}, Mi = (e) => {
+}, ji = (e) => {
   const t = [], r = [];
-  e.widgets.forEach((o, a) => {
-    const u = Ti(o);
+  e.widgets.forEach((a, o) => {
+    const u = vi(a);
     if (!u.success) {
       t.push(
-        ...er(u.errors, Zt(a))
+        ...or(u.errors, ar(o))
       );
       return;
     }
@@ -4171,28 +4219,28 @@ const Fi = (e) => ({
   });
   let s;
   if (e.filters) {
-    const o = A(
-      () => ne(e.filters),
+    const a = A(
+      () => ae(e.filters),
       t
     );
-    s = o != null ? o : void 0;
+    s = a != null ? a : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const n = e.widgetsOptions !== void 0 ? Wn(e.widgetsOptions) : void 0, i = l(l(l(l(l(l(l(l({
+  const n = e.widgetsOptions !== void 0 ? Yn(e.widgetsOptions) : void 0, i = l(l(l(l(l(l(l(l({
     widgets: r
   }, e.id !== void 0 && { id: e.id }), e.title !== void 0 && { title: e.title }), s && s.length > 0 && { filters: s }), e.layoutOptions !== void 0 && {
     layoutOptions: e.layoutOptions
   }), e.config !== void 0 && { config: e.config }), e.defaultDataSource !== void 0 && {
-    defaultDataSource: ae(e.defaultDataSource)
+    defaultDataSource: ce(e.defaultDataSource)
   }), e.styleOptions !== void 0 && { styleOptions: e.styleOptions }), n !== void 0 && { widgetsOptions: n });
   return {
     success: !0,
-    data: B(i)
+    data: L(i)
   };
 };
-function Si(e) {
-  const { filters: t, relations: r } = es(
+function Mi(e) {
+  const { filters: t, relations: r } = fs(
     e.filters || []
   );
   return {
@@ -4205,27 +4253,59 @@ function Si(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function Ri(e, t, r = !1) {
-  const s = Si(e), n = Xr(s, t);
-  return Zr(n, r);
+function Ji(e, t, r = !1) {
+  const s = Mi(e), n = cs(s, t);
+  return ls(n, r);
+}
+function de(e) {
+  const t = e.trim();
+  return t.startsWith(T) ? t.slice(T.length) : t;
+}
+function X(e) {
+  var s;
+  const t = he(e.function);
+  if (t) {
+    const n = t.findIndex((i) => i.isName);
+    if (n >= 0) {
+      const i = e.args[n];
+      if (typeof i == "string" && i.length > 0) return i;
+    }
+  }
+  const r = e.args[0];
+  return typeof r == "string" ? de(r) : w(r) ? X(r) : (s = e.function.split(".").pop()) != null ? s : e.function;
+}
+const mt = "filterFactory.logic.";
+function pt(e) {
+  var r;
+  if (e.function.startsWith(mt))
+    return e.function.slice(mt.length);
+  const t = e.args[0];
+  return typeof t == "string" ? de(t) : w(t) ? X(t) : (r = e.function.split(".").pop()) != null ? r : e.function;
+}
+const Ri = "measureFactory.", Ii = "filterFactory.", ki = (e) => e.function.startsWith(Ri), Li = (e) => e.function.startsWith(Ii);
+function Ki(e, t) {
+  var s;
+  const r = (s = t == null ? void 0 : t.role) != null ? s : "filter";
+  return typeof e == "string" ? { name: de(e), type: "dimension" } : zt(e) ? { name: de(e.column), type: "dimension" } : Ut(e) ? { name: X(e.column), type: "measure" } : w(e) ? ki(e) ? { name: X(e), type: "measure" } : Li(e) ? { name: pt(e), type: r } : (t == null ? void 0 : t.role) !== void 0 ? { name: pt(e), type: r } : { name: X(e), type: "measure" } : null;
 }
 export {
-  Di as CustomSuperJSON,
-  Bi as EMPTY_EXPANDED_QUERY_MODEL,
-  Li as EMPTY_SIMPLE_QUERY_MODEL,
-  zi as isByIdDashboardCodeParams,
-  Ui as isByIdWidgetCodeParams,
-  _i as isClientSideDashboardCodeParams,
-  Pi as isClientSideWidgetCodeParams,
-  ii as translateChartFromJSON,
-  oi as translateChartToJSON,
-  Ni as translateDashboardFromJSON,
-  Mi as translateDashboardToJSON,
-  fi as translatePivotTableFromJSON,
-  pi as translatePivotTableToJSON,
-  xi as translateQueryFromJSON,
-  vi as translateQueryToJSON,
-  Ri as translateQueryToJaql,
-  wi as translateWidgetFromJSON,
-  Ti as translateWidgetToJSON
+  Ui as CustomSuperJSON,
+  Hi as EMPTY_EXPANDED_QUERY_MODEL,
+  Qi as EMPTY_SIMPLE_QUERY_MODEL,
+  Ki as getQueryElementSummary,
+  Xi as isByIdDashboardCodeParams,
+  Zi as isByIdWidgetCodeParams,
+  ea as isClientSideDashboardCodeParams,
+  ta as isClientSideWidgetCodeParams,
+  pi as translateChartFromJSON,
+  gi as translateChartToJSON,
+  Vi as translateDashboardFromJSON,
+  ji as translateDashboardToJSON,
+  Ai as translatePivotTableFromJSON,
+  Ti as translatePivotTableToJSON,
+  Pi as translateQueryFromJSON,
+  Wi as translateQueryToJSON,
+  Ji as translateQueryToJaql,
+  Ni as translateWidgetFromJSON,
+  vi as translateWidgetToJSON
 };