@sisense/sdk-ui 2.27.0 → 2.28.0

package/dist/analytics-composer/node.js

@@ -1,27 +1,36 @@
-var Vt = Object.defineProperty, Wt = Object.defineProperties;
-var jt = Object.getOwnPropertyDescriptors;
-var ke = Object.getOwnPropertySymbols;
-var Kt = Object.prototype.hasOwnProperty, Gt = Object.prototype.propertyIsEnumerable;
-var Be = (e, t, r) => t in e ? Vt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
+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) => {
   for (var r in t || (t = {}))
-    Kt.call(t, r) && Be(e, r, t[r]);
-  if (ke)
-    for (var r of ke(t))
-      Gt.call(t, r) && Be(e, r, t[r]);
+    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]);
   return e;
-}, w = (e, t) => Wt(e, jt(t));
-import { f as Yt, J as Jt } from "../types-CzqDZ83C.js";
-import { b as li, E as fi, a as di, i as mi, e as pi, d as gi } from "../types-CzqDZ83C.js";
-import { ch as Ht, bs as Qt, ci as Xt, cj as Zt, ck as er, aw as be, cl as tr, av as rr, cm as sr, bb as nr, ax as ir, cn as or, be as ar, bc as ur, aO as cr, ba as lr, bd as fr, d as dr, c as mr, k as pr, co as gr, cp as yr, cq as hr, cr as br, cs as Ar, ct as wr, cu as Fr, cv as Er, cw as Cr, cx as qr, cy as Tr, aq as xr, cz as $r, cA as Sr, S as B, t as X, h as Or, b as $, ai as _, at as tt, cB as Dr, cC as Mr, cD as Nr, M as U, c9 as Rr, cE as vr, aK as Ir, aj as ze, au as Ae, ce as Pr, cf as kr, bP as rt, cF as st, ad as Br, cG as nt, cH as it, A as zr, cI as Lr, bG as Ur, aD as _r } from "../apply-styled-options-to-query-BzMAmDnD.js";
-import { i as Vr, b as Wr, D as jr, d as Kr, a as Gr } from "../dimensions-C3WSSE5j.js";
-function Yr(e, t) {
+}, F = (e, t) => nr(e, ir(t));
+var ye = (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]);
+  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));
   for (let i = 1; i <= r; i++)
     for (let o = 1; o <= s; o++)
       n[i][o] = Math.min(n[i - 1][o] + 1, n[i][o - 1] + 1, n[i - 1][o - 1] + (e[i - 1] === t[o - 1] ? 0 : 1));
   return n[r][s];
 }
-function we(e, t) {
+function xe(e, t) {
   const r = [];
   let s = "", n = 0, i = !1, o = null;
   for (let a = 0; a < e.length; a++) {
@@ -51,7 +60,7 @@ function we(e, t) {
   }
   return s.trim() && r.push(s.trim()), r;
 }
-function Jr(e, t) {
+function as(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];
@@ -74,7 +83,7 @@ function Jr(e, t) {
   }
   return -1;
 }
-function Hr(e, t) {
+function us(e, t) {
   if (e[t] !== "(")
     return -1;
   let r = 1, s = t + 1, n = !1, i = null;
@@ -102,10 +111,10 @@ function Hr(e, t) {
   }
   return -1;
 }
-function Qr(e) {
+function cs(e) {
   return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
 }
-function V(e) {
+function J(e) {
   if (!e || typeof e != "string")
     throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
   const t = e.trim();
@@ -114,16 +123,16 @@ function V(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 = ot(n);
+  const s = r[1], n = r[2], i = gt(n);
   return {
     function: s,
     args: i
   };
 }
-function ot(e) {
-  return e.trim() ? we(e, ",").map(at) : [];
+function gt(e) {
+  return e.trim() ? xe(e, ",").map(yt) : [];
 }
-function at(e) {
+function yt(e) {
   if (!e)
     throw new Error("Cannot parse empty argument value");
   if (e === "null")
@@ -144,29 +153,29 @@ function at(e) {
     const r = e.slice(1, -1).trim();
     if (!r)
       return [];
-    const s = ot(r);
+    const s = gt(r);
     return s.every((n) => typeof n == "string"), s;
   }
   if (e.startsWith("{") && e.endsWith("}")) {
     const r = e.slice(1, -1).trim();
-    return r ? Zr(r) : {};
+    return r ? ds(r) : {};
   }
-  return e.includes("(") && e.includes(")") ? V(e) : (e.startsWith("DM."), e);
+  return e.includes("(") && e.includes(")") ? J(e) : (e.startsWith("DM."), e);
 }
-function Xr(e) {
-  const t = Jr(e, ":");
+function ls(e) {
+  const t = as(e, ":");
   if (t === -1)
     throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = Qr(e.slice(0, t).trim()), s = at(e.slice(t + 1).trim());
+  const r = cs(e.slice(0, t).trim()), s = yt(e.slice(t + 1).trim());
   return [r, s];
 }
-function Zr(e) {
+function ds(e) {
   if (!e.trim())
     return {};
-  const t = we(e, ",").map(Xr).filter(([, r]) => r !== null);
+  const t = xe(e, ",").map(ls).filter(([, r]) => r !== null);
   return Object.fromEntries(t);
 }
-class es {
+class fs {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -183,9 +192,9 @@ class es {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class ut {
+class ht {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new es();
+    this.generateIdentifier = t, this.kv = new fs();
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -200,7 +209,7 @@ class ut {
     return this.kv.getByKey(t);
   }
 }
-class ts extends ut {
+class ps extends ht {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -211,7 +220,7 @@ class ts extends ut {
     return this.classToAllowedProps.get(t);
   }
 }
-function rs(e) {
+function ms(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -219,8 +228,8 @@ function rs(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function ss(e, t) {
-  const r = rs(e);
+function gs(e, t) {
+  const r = ms(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -230,20 +239,20 @@ function ss(e, t) {
       return i;
   }
 }
-function W(e, t) {
+function K(e, t) {
   Object.entries(e).forEach(([r, s]) => t(s, r));
 }
-function ee(e, t) {
+function oe(e, t) {
   return e.indexOf(t) !== -1;
 }
-function Le(e, t) {
+function Je(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class ns {
+class ys {
   constructor() {
     this.transfomers = {};
   }
@@ -251,13 +260,13 @@ class ns {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return ss(this.transfomers, (r) => r.isApplicable(t));
+    return gs(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const is = (e) => Object.prototype.toString.call(e).slice(8, -1), ct = (e) => typeof e == "undefined", os = (e) => e === null, G = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, de = (e) => G(e) && Object.keys(e).length === 0, I = (e) => Array.isArray(e), as = (e) => typeof e == "string", us = (e) => typeof e == "number" && !isNaN(e), cs = (e) => typeof e == "boolean", ls = (e) => e instanceof RegExp, Y = (e) => e instanceof Map, J = (e) => e instanceof Set, lt = (e) => is(e) === "Symbol", fs = (e) => e instanceof Date && !isNaN(e.valueOf()), ds = (e) => e instanceof Error, Ue = (e) => typeof e == "number" && isNaN(e), ms = (e) => cs(e) || os(e) || ct(e) || us(e) || as(e) || lt(e), ps = (e) => typeof e == "bigint", gs = (e) => e === 1 / 0 || e === -1 / 0, ys = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), hs = (e) => e instanceof URL, ft = (e) => e.replace(/\./g, "\\."), ae = (e) => e.map(String).map(ft).join("."), K = (e) => {
+const 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 t = [];
   let r = "";
   for (let n = 0; n < e.length; n++) {
@@ -275,7 +284,7 @@ const is = (e) => Object.prototype.toString.call(e).slice(8, -1), ct = (e) => ty
   const s = r;
   return t.push(s), t;
 };
-function v(e, t, r, s) {
+function I(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -283,12 +292,12 @@ function v(e, t, r, s) {
     untransform: s
   };
 }
-const dt = [
-  v(ct, "undefined", () => null, () => {
+const At = [
+  I(bt, "undefined", () => null, () => {
   }),
-  v(ps, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  v(fs, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  v(ds, "Error", (e, t) => {
+  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) => {
     const r = {
       name: e.name,
       message: e.message
@@ -302,24 +311,24 @@ const dt = [
       r[s] = e[s];
     }), r;
   }),
-  v(ls, "regexp", (e) => "" + e, (e) => {
+  I(ws, "regexp", (e) => "" + e, (e) => {
     const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(t, r);
   }),
-  v(
-    J,
+  I(
+    X,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  v(Y, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  v((e) => Ue(e) || gs(e), "number", (e) => Ue(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
-  v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  v(hs, "URL", (e) => e.toString(), (e) => new URL(e))
+  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((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  I(Ds, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function se(e, t, r, s) {
+function de(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -327,12 +336,12 @@ function se(e, t, r, s) {
     untransform: s
   };
 }
-const mt = se((e, t) => lt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+const 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 s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), bs = [
+}), xs = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -342,19 +351,19 @@ const mt = se((e, t) => lt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), pt = se(ys, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = bs[t[1]];
+].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]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function gt(e, t) {
+function St(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const yt = se(gt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+const Ct = de(St, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
-    return y({}, e);
+    return l({}, e);
   const s = {};
   return r.forEach((n) => {
     s[n] = e[n];
@@ -364,49 +373,49 @@ const yt = se(gt, (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);
-}), ht = se((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
+}), 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) => {
   const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
-}), As = [yt, mt, ht, pt], _e = (e, t) => {
-  const r = Le(As, (n) => n.isApplicable(e, t));
+}), vs = [Ct, wt, qt, Tt], Ge = (e, t) => {
+  const r = Je(vs, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = Le(dt, (n) => n.isApplicable(e, t));
+  const s = Je(At, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
-}, bt = {};
-dt.forEach((e) => {
-  bt[e.annotation] = e;
+}, $t = {};
+At.forEach((e) => {
+  $t[e.annotation] = e;
 });
-const ws = (e, t, r) => {
-  if (I(t))
+const Ns = (e, t, r) => {
+  if (k(t))
     switch (t[0]) {
       case "symbol":
-        return mt.untransform(e, t, r);
+        return wt.untransform(e, t, r);
       case "class":
-        return yt.untransform(e, t, r);
+        return Ct.untransform(e, t, r);
       case "custom":
-        return ht.untransform(e, t, r);
+        return qt.untransform(e, t, r);
       case "typed-array":
-        return pt.untransform(e, t, r);
+        return Tt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = bt[t];
+    const s = $t[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
   }
-}, L = (e, t) => {
+}, V = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -414,22 +423,22 @@ const ws = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function At(e) {
-  if (ee(e, "__proto__"))
+function Ot(e) {
+  if (oe(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (ee(e, "prototype"))
+  if (oe(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (ee(e, "constructor"))
+  if (oe(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const Fs = (e, t) => {
-  At(t);
+const Ms = (e, t) => {
+  Ot(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
-    if (J(e))
-      e = L(e, +s);
-    else if (Y(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = L(e, n);
+    if (X(e))
+      e = V(e, +s);
+    else if (Q(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = V(e, n);
       switch (i) {
         case "key":
           e = o;
@@ -442,41 +451,41 @@ const Fs = (e, t) => {
       e = e[s];
   }
   return e;
-}, me = (e, t, r) => {
-  if (At(t), t.length === 0)
+}, Te = (e, t, r) => {
+  if (Ot(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
     const o = t[i];
-    if (I(s)) {
+    if (k(s)) {
       const a = +o;
       s = s[a];
-    } else if (G(s))
+    } else if (H(s))
       s = s[o];
-    else if (J(s)) {
+    else if (X(s)) {
       const a = +o;
-      s = L(s, a);
-    } else if (Y(s)) {
+      s = V(s, a);
+    } else if (Q(s)) {
       if (i === t.length - 2)
         break;
-      const u = +o, c = +t[++i] == 0 ? "key" : "value", p = L(s, u);
+      const u = +o, c = +t[++i] == 0 ? "key" : "value", g = V(s, u);
       switch (c) {
         case "key":
-          s = p;
+          s = g;
           break;
         case "value":
-          s = s.get(p);
+          s = s.get(g);
           break;
       }
     }
   }
   const n = t[t.length - 1];
-  if (I(s) ? s[+n] = r(s[+n]) : G(s) && (s[n] = r(s[n])), J(s)) {
-    const i = L(s, +n), o = r(i);
+  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 (Y(s)) {
-    const i = +t[t.length - 2], o = L(s, i);
+  if (Q(s)) {
+    const i = +t[t.length - 2], o = V(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
         const u = r(o);
@@ -491,45 +500,45 @@ const Fs = (e, t) => {
   }
   return e;
 };
-function pe(e, t, r = []) {
+function Se(e, t, r = []) {
   if (!e)
     return;
-  if (!I(e)) {
-    W(e, (i, o) => pe(i, t, [...r, ...K(o)]));
+  if (!k(e)) {
+    K(e, (i, o) => Se(i, t, [...r, ...Y(o)]));
     return;
   }
   const [s, n] = e;
-  n && W(n, (i, o) => {
-    pe(i, t, [...r, ...K(o)]);
+  n && K(n, (i, o) => {
+    Se(i, t, [...r, ...Y(o)]);
   }), t(s, r);
 }
-function Es(e, t, r) {
-  return pe(t, (s, n) => {
-    e = me(e, n, (i) => ws(i, s, r));
+function Rs(e, t, r) {
+  return Se(t, (s, n) => {
+    e = Te(e, n, (i) => Ns(i, s, r));
   }), e;
 }
-function Cs(e, t) {
+function Is(e, t) {
   function r(s, n) {
-    const i = Fs(e, K(n));
-    s.map(K).forEach((o) => {
-      e = me(e, o, () => i);
+    const i = Ms(e, Y(n));
+    s.map(Y).forEach((o) => {
+      e = Te(e, o, () => i);
     });
   }
-  if (I(t)) {
+  if (k(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = me(e, K(i), () => e);
-    }), n && W(n, r);
+      e = Te(e, Y(i), () => e);
+    }), n && K(n, r);
   } else
-    W(t, r);
+    K(t, r);
   return e;
 }
-const qs = (e, t) => G(e) || I(e) || Y(e) || J(e) || gt(e, t);
-function Ts(e, t, r) {
+const ks = (e, t) => H(e) || k(e) || Q(e) || X(e) || St(e, t);
+function Bs(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function xs(e, t) {
+function Ls(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
@@ -537,64 +546,64 @@ function xs(e, t) {
       return;
     t || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
     const [i, ...o] = n;
-    i.length === 0 ? s = o.map(ae) : r[ae(i)] = o.map(ae);
-  }), s ? de(r) ? [s] : [s, r] : de(r) ? void 0 : r;
+    i.length === 0 ? s = o.map(he) : r[he(i)] = o.map(he);
+  }), s ? we(r) ? [s] : [s, r] : we(r) ? void 0 : r;
 }
-const wt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
-  var b;
-  const a = ms(e);
+const Dt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
+  var h;
+  const a = Cs(e);
   if (!a) {
-    Ts(e, n, t);
-    const g = o.get(e);
-    if (g)
+    Bs(e, n, t);
+    const b = o.get(e);
+    if (b)
       return s ? {
         transformedValue: null
-      } : g;
+      } : b;
   }
-  if (!qs(e, r)) {
-    const g = _e(e, r), m = g ? {
-      transformedValue: g.value,
-      annotations: [g.type]
+  if (!ks(e, r)) {
+    const b = Ge(e, r), p = b ? {
+      transformedValue: b.value,
+      annotations: [b.type]
     } : {
       transformedValue: e
     };
-    return a || o.set(e, m), m;
+    return a || o.set(e, p), p;
   }
-  if (ee(i, e))
+  if (oe(i, e))
     return {
       transformedValue: null
     };
-  const u = _e(e, r), c = (b = u == null ? void 0 : u.value) != null ? b : e, p = I(c) ? [] : {}, l = {};
-  W(c, (g, m) => {
-    if (m === "__proto__" || m === "constructor" || m === "prototype")
-      throw new Error(`Detected property ${m}. This is a prototype pollution risk, please remove it from your object.`);
-    const A = wt(g, t, r, s, [...n, m], [...i, e], o);
-    p[m] = A.transformedValue, I(A.annotations) ? l[m] = A.annotations : G(A.annotations) && W(A.annotations, (C, N) => {
-      l[ft(m) + "." + N] = C;
+  const 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 d = de(l) ? {
-    transformedValue: p,
+  const m = we(d) ? {
+    transformedValue: g,
     annotations: u ? [u.type] : void 0
   } : {
-    transformedValue: p,
-    annotations: u ? [u.type, l] : l
+    transformedValue: g,
+    annotations: u ? [u.type, d] : d
   };
-  return a || o.set(e, d), d;
+  return a || o.set(e, m), m;
 };
-function Ft(e) {
+function xt(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Ve(e) {
-  return Ft(e) === "Array";
+function Ye(e) {
+  return xt(e) === "Array";
 }
-function $s(e) {
-  if (Ft(e) !== "Object")
+function zs(e) {
+  if (xt(e) !== "Object")
     return !1;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function Ss(e, t, r, s, n) {
+function Us(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,
@@ -603,45 +612,45 @@ function Ss(e, t, r, s, n) {
     configurable: !0
   });
 }
-function ge(e, t = {}) {
-  if (Ve(e))
-    return e.map((n) => ge(n, t));
-  if (!$s(e))
+function Ce(e, t = {}) {
+  if (Ye(e))
+    return e.map((n) => Ce(n, t));
+  if (!zs(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Ve(t.props) && !t.props.includes(i))
+    if (Ye(t.props) && !t.props.includes(i))
       return n;
-    const o = e[i], a = ge(o, t);
-    return Ss(n, i, a, e, t.nonenumerable), n;
+    const o = e[i], a = Ce(o, t);
+    return Us(n, i, a, e, t.nonenumerable), n;
   }, {});
 }
-class h {
+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 ts(), this.symbolRegistry = new ut((r) => {
+    this.classRegistry = new ps(), this.symbolRegistry = new ht((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new ns(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new ys(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = wt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = Dt(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = w(y({}, n.meta), {
+    s.annotations && (n.meta = F(l({}, n.meta), {
       values: s.annotations
     }));
-    const i = xs(r, this.dedupe);
-    return i && (n.meta = w(y({}, n.meta), {
+    const i = Ls(r, this.dedupe);
+    return i && (n.meta = F(l({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
-    let n = ge(r);
-    return s != null && s.values && (n = Es(n, s.values, this)), s != null && s.referentialEqualities && (n = Cs(n, s.referentialEqualities)), n;
+    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;
   }
   stringify(t) {
     return JSON.stringify(this.serialize(t));
@@ -656,7 +665,7 @@ class h {
     this.symbolRegistry.register(t, r);
   }
   registerCustom(t, r) {
-    this.customTransformerRegistry.register(y({
+    this.customTransformerRegistry.register(l({
       name: r
     }, t));
   }
@@ -664,160 +673,160 @@ class h {
     this.allowedErrorProps.push(...t);
   }
 }
-h.defaultInstance = new h();
-h.serialize = h.defaultInstance.serialize.bind(h.defaultInstance);
-h.deserialize = h.defaultInstance.deserialize.bind(h.defaultInstance);
-h.stringify = h.defaultInstance.stringify.bind(h.defaultInstance);
-h.parse = h.defaultInstance.parse.bind(h.defaultInstance);
-h.registerClass = h.defaultInstance.registerClass.bind(h.defaultInstance);
-h.registerSymbol = h.defaultInstance.registerSymbol.bind(h.defaultInstance);
-h.registerCustom = h.defaultInstance.registerCustom.bind(h.defaultInstance);
-h.allowErrorProps = h.defaultInstance.allowErrorProps.bind(h.defaultInstance);
-const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e.type), Fe = (e) => new dr(
+y.defaultInstance = new y();
+y.serialize = y.defaultInstance.serialize.bind(y.defaultInstance);
+y.deserialize = y.defaultInstance.deserialize.bind(y.defaultInstance);
+y.stringify = y.defaultInstance.stringify.bind(y.defaultInstance);
+y.parse = y.defaultInstance.parse.bind(y.defaultInstance);
+y.registerClass = y.defaultInstance.registerClass.bind(y.defaultInstance);
+y.registerSymbol = y.defaultInstance.registerSymbol.bind(y.defaultInstance);
+y.registerCustom = y.defaultInstance.registerCustom.bind(y.defaultInstance);
+y.allowErrorProps = y.defaultInstance.allowErrorProps.bind(y.defaultInstance);
+const P = (e) => e === void 0 ? U.None : e, _s = (e) => new ar(e.metadataItem, e.type), ve = (e) => new Sr(
   e.name,
   e.expression,
   e.type,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode
-), Ee = (e) => new mr(
+), Ne = (e) => new Cr(
   e.name,
   e.expression,
   e.granularity,
   e.format,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode
-), O = (e) => {
+), N = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return Fe(e);
+      return ve(e);
     case "DimensionalLevelAttribute":
-      return Ee(e);
+      return Ne(e);
     default:
       return e;
   }
-}, Et = (e) => new jr(
+}, vt = (e) => new ss(
   e.name,
   e.expression,
-  e.attributes.map(O),
-  e.dimensions.map(Ds),
+  e.attributes.map(N),
+  e.dimensions.map(Ps),
   e.type,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode,
-  e.defaultAttribute ? O(e.defaultAttribute) : void 0
-), Ct = (e) => new Kr(
+  e.defaultAttribute ? N(e.defaultAttribute) : void 0
+), Nt = (e) => new ns(
   e.name,
   e.expression,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode,
   e.indexed,
   e.merged
-), Ds = (e) => {
+), Ps = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Et(e);
+      return vt(e);
     case "DimensionalDateDimension":
-      return Ct(e);
+      return Nt(e);
     default:
       return e;
   }
-}, Ce = (e) => new pr(
+}, Me = (e) => new qr(
   e.name,
-  O(e.attribute),
+  N(e.attribute),
   e.aggregation,
   e.format,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode
-), qe = (e) => {
+), Re = (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, Fe(s)];
+            return [r, ve(s)];
           case "DimensionalLevelAttribute":
-            return [r, Ee(s)];
+            return [r, Ne(s)];
           case "DimensionalBaseMeasure":
-            return [r, Ce(s)];
+            return [r, Me(s)];
           case "DimensionalCalculatedMeasure":
-            return [r, qe(s)];
+            return [r, Re(s)];
           default:
             return [r, s];
         }
       return [r, s];
     })
   );
-  return new gr(
+  return new $r(
     e.name,
     e.expression,
     t,
     e.format,
     e.description,
-    z(e.sort),
+    P(e.sort),
     e.dataSource,
     e.composeCode
   );
-}, qt = (e) => new yr(
+}, Mt = (e) => new Or(
   e.name,
-  O(e.attribute),
+  N(e.attribute),
   e.format,
   e.description,
-  z(e.sort),
+  P(e.sort),
   e.dataSource,
   e.composeCode
-), ue = (e) => {
+), be = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return Ce(e);
+      return Me(e);
     case "DimensionalCalculatedMeasure":
-      return qe(e);
+      return Re(e);
     case "DimensionalMeasureTemplate":
-      return qt(e);
+      return Mt(e);
     default:
       return e;
   }
-}, q = (e) => {
+}, S = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Sr(
-        O(e.attribute),
+      return new Ur(
+        N(e.attribute),
         e.members,
-        e.config.backgroundFilter ? w(y({}, e.config), { backgroundFilter: q(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? F(l({}, e.config), { backgroundFilter: S(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new $r(
-        e.filters.map((r) => q(r)),
+      return new zr(
+        e.filters.map((r) => S(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new xr(
-        e._filters.map((r) => q(r)),
+      return new Lr(
+        e._filters.map((r) => S(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Tr(
-        q(e.filter),
-        e.input ? q(e.input) : void 0,
+      return new Br(
+        S(e.filter),
+        e.input ? S(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new qr(
-        O(e.attribute),
-        ue(e.measure),
+      return new kr(
+        N(e.attribute),
+        be(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -826,25 +835,25 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
         e.composeCode
       );
     case "RankingFilter":
-      return new Cr(
-        O(e.attribute),
-        ue(e.measure),
+      return new Ir(
+        N(e.attribute),
+        be(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Er(
-        ue(e.measure),
+      return new Rr(
+        be(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new Fr(
-        O(e.attribute),
+      return new Mr(
+        N(e.attribute),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -853,8 +862,8 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new wr(
-        O(e.attribute),
+      return new Nr(
+        N(e.attribute),
         e.operatorA,
         e.valueA,
         e.config,
@@ -862,8 +871,8 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
       );
     case "DateRangeFilter": {
       const { valueA: r, valueB: s } = e;
-      return new Ar(
-        O(e.attribute),
+      return new vr(
+        N(e.attribute),
         r,
         s,
         e.config,
@@ -871,8 +880,8 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
       );
     }
     case "RelativeDateFilter":
-      return new br(
-        O(e.attribute),
+      return new xr(
+        N(e.attribute),
         e.offset,
         e.count,
         e.operator,
@@ -881,8 +890,8 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
         e.composeCode
       );
     case "CustomFilter":
-      return new hr(
-        O(e.attribute),
+      return new Dr(
+        N(e.attribute),
         e.jaqlExpression,
         e.config,
         e.composeCode
@@ -891,209 +900,209 @@ const z = (e) => e === void 0 ? B.None : e, Os = (e) => new Jt(e.metadataItem, e
       return e;
   }
 };
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Yt,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Os(e)
+    deserialize: (e) => _s(e)
   },
   "JaqlElement"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Ht,
+    isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Fe(e)
+    deserialize: (e) => ve(e)
   },
   "DimensionalAttribute"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Qt,
+    isApplicable: cr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ee(e)
+    deserialize: (e) => Ne(e)
   },
   "DimensionalLevelAttribute"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Vr,
+    isApplicable: ts,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Et(e)
+    deserialize: (e) => vt(e)
   },
   "DimensionalDimension"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Wr,
+    isApplicable: rs,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ct(e)
+    deserialize: (e) => Nt(e)
   },
   "DimensionalDateDimension"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Xt,
+    isApplicable: lr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ce(e)
+    deserialize: (e) => Me(e)
   },
   "DimensionalBaseMeasure"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Zt,
+    isApplicable: dr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => qe(e)
+    deserialize: (e) => Re(e)
   },
   "DimensionalCalculatedMeasure"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: er,
+    isApplicable: fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => qt(e)
+    deserialize: (e) => Mt(e)
   },
   "DimensionalMeasureTemplate"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: be,
+    isApplicable: De,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "MembersFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: tr,
+    isApplicable: pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "LogicalAttributeFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: rr,
+    isApplicable: mr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "CascadingFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: gr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "ExcludeFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: nr,
+    isApplicable: yr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "MeasureFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: hr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "RankingFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: br,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "MeasureRankingFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ar,
+    isApplicable: Er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "NumericFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: Fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "TextFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: cr,
+    isApplicable: Ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "DateRangeFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: lr,
+    isApplicable: wr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "RelativeDateFilter"
 );
-h.registerCustom(
+y.registerCustom(
   {
-    isApplicable: fr,
+    isApplicable: Tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => q(e)
+    deserialize: (e) => S(e)
   },
   "CustomFilter"
 );
-const ei = h, E = "DM.";
-function S(e) {
+const Di = y, w = "DM.";
+function O(e) {
   return typeof e == "object" && e !== null;
 }
-function T(e) {
+function q(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Tt(e) {
-  return e.every(T);
+function Rt(e) {
+  return e.every(q);
 }
-function ne(e) {
+function fe(e) {
   return "attribute" in e && "config" in e;
 }
-function Z(e) {
+function te(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function Te(e) {
-  return !ne(e) && !Z(e);
+function Ie(e) {
+  return !fe(e) && !te(e);
 }
-function Ms(e) {
-  return S(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+function Ws(e) {
+  return O(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function Ns(e) {
-  return !S(e) || !("column" in e) ? !1 : T(e.column);
+function Vs(e) {
+  return !O(e) || !("column" in e) ? !1 : q(e.column);
 }
-const x = 3;
-function R(e, t, r) {
+const T = 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 = Yr(e, o);
+    const o = r(i), a = os(e, o);
     a < s && (s = a, n = i);
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-const xt = "en";
-function ce(e, t) {
-  return e.localeCompare(t, xt, { sensitivity: "accent" }) === 0;
+const It = "en";
+function Ee(e, t) {
+  return e.localeCompare(t, It, { sensitivity: "accent" }) === 0;
 }
-function We(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, xt, { sensitivity: "accent" }) === 0;
+function He(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, It, { sensitivity: "accent" }) === 0;
 }
-function xe(e) {
+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();
   for (const i of e) {
     r.set(i.name, i);
@@ -1111,79 +1120,79 @@ function xe(e) {
     columnMap: s
   };
 }
-function $e(e, t) {
-  if (!e.startsWith(E))
+function ke(e, t) {
+  if (!e.startsWith(w))
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
     );
-  const r = e.slice(E.length);
+  const r = e.slice(w.length);
   if (!r)
     throw new Error(
-      `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
     );
   let s, n;
-  for (const m of t.sortedTables)
-    if (We(r, m.name + ".")) {
-      const A = r.slice(m.name.length + 1);
-      if (!A)
+  for (const p of t.sortedTables)
+    if (He(r, p.name + ".")) {
+      const E = r.slice(p.name.length + 1);
+      if (!E)
         throw new Error(
-          `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
+          `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
         );
-      s = m, n = A;
+      s = p, n = E;
       break;
     }
   if (!s) {
-    const m = r.indexOf(".");
-    if (m === -1)
+    const p = r.indexOf(".");
+    if (p === -1)
       throw new Error(
-        `Invalid dimensional element name format: '${e}'. Expected format: '${E}TableName.ColumnName[.Level]'`
+        `Invalid dimensional element name format: '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
       );
-    const A = r.slice(0, m), C = R(A, t.sortedTables, (oe) => oe.name), N = C && C.distance <= x ? ` Did you mean '${C.best.name}'?` : "";
-    throw new Error(`Table '${A}' not found in the data model.${N}`);
+    const 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 i = t.tableColumnMap.get(s.name);
   if (!i)
     throw new Error(`Table '${s.name}' found but has no columns`);
   let o, a;
   const u = $.all;
-  for (const m of i) {
-    if (ce(n, m.name))
-      return { table: s, column: m };
-    if (!We(n, m.name + "."))
+  for (const p of i) {
+    if (Ee(n, p.name))
+      return { table: s, column: p };
+    if (!He(n, p.name + "."))
       continue;
-    const A = n.slice(m.name.length + 1);
-    if (!A)
+    const E = n.slice(p.name.length + 1);
+    if (!E)
       continue;
-    const C = u.includes(A), N = X(m.dataType);
+    const C = u.includes(E), v = ee(p.dataType);
     if (C) {
-      if (N)
-        return { table: s, column: m, level: A };
-      o || (o = m, a = A);
+      if (v)
+        return { table: s, column: p, level: E };
+      o || (o = p, a = E);
       continue;
     }
-    N && !o && (o = m, a = A);
+    v && !o && (o = p, a = E);
   }
   if (o && a) {
     if (u.includes(a))
       throw new Error(
         `Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`
       );
-    const m = R(a, u, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
+    const p = x(a, u, (C) => C), E = p && p.distance <= T ? ` Did you mean '${p.best}'?` : "";
     throw new Error(
       `Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(
         ", "
-      )}.${A}`
+      )}.${E}`
     );
   }
-  const c = n.indexOf("."), p = c === -1 ? n : n.slice(0, c), l = R(n, i, (m) => m.name), d = l && l.distance <= x && !ce(l.best.name, p), b = d ? ` Did you mean '${l.best.name}'?` : "", g = !d && n.endsWith(".") && l !== void 0 && ce(l.best.name, p) ? ` Use '${p}' without a trailing dot.` : "";
+  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.` : "";
   throw new Error(
-    `Column '${p}' not found in table '${s.name}'.${b}${g}`
+    `Column '${g}' not found in table '${s.name}'.${h}${b}`
   );
 }
-function Rs(e, t) {
-  const { table: r, column: s, level: n } = $e(e, t);
+function js(e, t) {
+  const { table: r, column: s, level: n } = ke(e, t);
   if (n) {
-    if (!X(s.dataType))
+    if (!ee(s.dataType))
       throw new Error(
         `Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`
       );
@@ -1207,28 +1216,28 @@ function Rs(e, t) {
   }
   return { table: r, column: s, level: n };
 }
-function H(e, t, r, s) {
-  const { table: n, column: i, level: o } = Rs(e, r);
+function Z(e, t, r, s) {
+  const { table: n, column: i, level: o } = js(e, r);
   let a = o;
-  if (X(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
+  if (ee(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
     const u = s.inferredDateLevel, c = $.all;
     if (!c.includes(u))
       throw new Error(
         `Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`
       );
-    const p = `${e}.${u}`, l = $.dateOnly;
-    if (i.dataType === "date" && !l.includes(u))
+    const g = `${e}.${u}`, d = $.dateOnly;
+    if (i.dataType === "date" && !d.includes(u))
       throw new Error(
-        `Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
+        `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
       );
-    const d = $.timeOnly;
-    if (i.dataType === "time" && !d.includes(u))
+    const m = $.timeOnly;
+    if (i.dataType === "time" && !m.includes(u))
       throw new Error(
-        `Invalid level '${u}' in dimensional element '${p}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
+        `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
       );
     a = u;
   }
-  return Or({
+  return _r({
     expression: i.expression,
     dataType: i.dataType,
     granularity: a,
@@ -1237,44 +1246,44 @@ function H(e, t, r, s) {
     dataSource: t
   });
 }
-function vs(e, t, r) {
-  const { column: s, level: n } = $e(e, r);
+function Js(e, t, r) {
+  const { column: s, level: n } = ke(e, r);
   if (n)
     throw new Error(
-      `Invalid DateDimension name format: '${e}'. Expected format: '${E}TableName.ColumnName'`
+      `Invalid DateDimension name format: '${e}'. Expected format: '${w}TableName.ColumnName'`
     );
-  if (!X(s.dataType))
+  if (!ee(s.dataType))
     throw new Error(
       `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return Gr({
+  return is({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-const Is = (e, t) => {
+const Ks = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!tt(r))
-    return w(y({}, t), {
+  if (!ct(r))
+    return F(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, Ps = (e, t, r, s) => {
-  const n = Is(e.sortType, s);
+}, Gs = (e, t, r, s) => {
+  const n = Ks(e.sortType, s);
   if (n)
     return {
-      attribute: H(e.column, t, r),
+      attribute: Z(e.column, t, r),
       style: {},
       error: n
     };
-  const i = H(e.column, t, r), o = _(e, "column");
+  const i = Z(e.column, t, r), o = _(e, "column");
   return { attribute: i, style: o };
-}, ks = (e, t, r, s) => typeof e == "string" ? { attribute: H(e, t, r) } : Ms(e) ? Ps(e, t, r, s) : {
-  error: w(y({}, s), {
+}, Ys = (e, t, r, s) => typeof e == "string" ? { attribute: Z(e, t, r) } : Ws(e) ? Gs(e, t, r, s) : {
+  error: F(l({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, $t = (e) => {
+}, kt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1283,8 +1292,7 @@ const Is = (e, t) => {
       success: !1,
       errors: [
         {
-          category: "dimensions",
-          index: -1,
+          path: "dimensions",
           input: t,
           message: "Invalid dimensions JSON. Expected an array."
         }
@@ -1293,12 +1301,11 @@ const Is = (e, t) => {
   const n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
-      category: "dimensions",
-      index: a,
+      path: `dimensions[${a}]`,
       input: o
     };
     try {
-      const c = ks(o, r, s, u);
+      const c = Ys(o, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -1307,48 +1314,48 @@ const Is = (e, t) => {
         c.style !== void 0 ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute }
       );
     } catch (c) {
-      const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(w(y({}, u), { message: p }));
+      const g = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function Se(e, t) {
+function Be(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 Bs(e, t) {
-  const r = e.replace("measureFactory.", ""), n = Se(Dr, r)(...t);
-  if (!Te(n))
+function Hs(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Be(Pr, r)(...t);
+  if (!Ie(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function zs(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = Se(Mr, r)(...t);
-  if (!Z(n))
+function Qs(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Be(Wr, r)(...t);
+  if (!te(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Ls(e, t) {
+function Xs(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return zs(e, t);
-  const r = e.replace("filterFactory.", ""), n = Se(Nr, r)(...t);
-  if (!ne(n) && !Z(n))
+    return Qs(e, t);
+  const r = e.replace("filterFactory.", ""), n = Be(Vr, r)(...t);
+  if (!fe(n) && !te(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Us(e, t) {
+function Zs(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Bs(e, t);
+    return Hs(e, t);
   if (s === "filterFactory")
-    return Ls(e, t);
+    return Xs(e, t);
   throw new Error(
     `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), _s = /* @__PURE__ */ new Set([
+const f = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), en = /* @__PURE__ */ new Set([
   "CORREL",
   "COVARP",
   "COVAR",
@@ -1367,7 +1374,7 @@ const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), _s = /*
   "ORDERING",
   "RDOUBLE",
   "RINT"
-]), te = {
+]), ue = {
   // ── X-diff (datetime difference operators) ──
   SDIFF: f("xdiff", 2, 2, {
     requiredDateLevel: $.Seconds,
@@ -1478,20 +1485,20 @@ const f = (e, t, r, s) => y({ category: e, minArgs: t, maxArgs: r }, s), _s = /*
   SIN: f("scalar", 1, 1),
   SQRT: f("scalar", 1, 1),
   TAN: f("scalar", 1, 1)
-}, Vs = Object.keys(te).filter(
-  (e) => te[e].category === "xdiff"
+}, tn = Object.keys(ue).filter(
+  (e) => ue[e].category === "xdiff"
 );
-function St() {
-  return Vs;
+function Bt() {
+  return tn;
 }
-function Ot(e) {
-  const t = te[e.toUpperCase()];
+function Lt(e) {
+  const t = ue[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-function Ws(e, t) {
+function rn(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 js = /\[(\w[\w.-]*)\]/g, Dt = /* @__PURE__ */ new Set([
+const sn = /\[(\w[\w.-]*)\]/g, zt = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
   "COUNT",
@@ -1512,30 +1519,30 @@ const js = /\[(\w[\w.-]*)\]/g, Dt = /* @__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).
-]), Ks = new RegExp(
-  `\\b(${Array.from(Dt).join("|")})\\s*\\(`,
+]), nn = new RegExp(
+  `\\b(${Array.from(zt).join("|")})\\s*\\(`,
   "i"
 );
-function Mt(e) {
-  return T(e) ? !0 : typeof e == "string" && e.startsWith(E) ? !1 : S(e) && "kind" in e ? e.kind === "measure" : !0;
+function Ut(e) {
+  return q(e) ? !0 : typeof e == "string" && e.startsWith(w) ? !1 : O(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function Gs(e) {
+function on(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
   let s;
   for (; (s = t.exec(e)) !== null; ) {
     const n = s[1];
-    Dt.has(n.toUpperCase()) || r.add(n);
+    zt.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function Ys(e) {
+function an(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function Js(e) {
+function un(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
-const j = (e) => e.startsWith("[") ? e : `[${e}]`, Nt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function Rt(e, t) {
+const G = (e) => e.startsWith("[") ? e : `[${e}]`, _t = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function Pt(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*\\)`,
@@ -1547,14 +1554,14 @@ function Rt(e, t) {
     ref2: n[3].trim()
   }));
 }
-function Hs(e, t, r) {
+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} `;
   return {
     formula: e,
     context: t,
     contextKeys: s,
-    canonicalContextKeys: new Set(s.map(j)),
+    canonicalContextKeys: new Set(s.map(G)),
     errorPrefix: i,
     warnUnusedContext: (a = r.warnUnusedContext) != null ? a : !0,
     errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : !0,
@@ -1562,20 +1569,20 @@ function Hs(e, t, r) {
     result: { isValid: !0, errors: [], warnings: [], references: [], unusedContextKeys: [] }
   };
 }
-function M(e, t) {
+function R(e, t) {
   e.result.errors.push(t), e.result.isValid = !1;
 }
-const Qs = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function Xs(e) {
+const ln = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function dn(e) {
   const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find(
-    (s) => !Qs.has(s[1].toUpperCase())
+    (s) => !ln.has(s[1].toUpperCase())
   );
-  r && M(
+  r && R(
     e,
     `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`
   );
 }
-function Zs(e, t) {
+function fn(e, t) {
   const r = e[t];
   let s = t + 1;
   for (; s < e.length; ) {
@@ -1592,27 +1599,27 @@ function Zs(e, t) {
   }
   return e.length;
 }
-function en(e) {
-  return we(e, ",").filter((t) => t.trim().length > 0).length;
+function pn(e) {
+  return xe(e, ",").filter((t) => t.trim().length > 0).length;
 }
-function tn(e, t, r, s) {
+function mn(e, t, r, s) {
   for (; t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = Hr(e, n);
+  const n = t, i = us(e, n);
   if (i === -1)
     return n + 1;
   const o = e.slice(n + 1, i);
-  return s.push({ name: r.toUpperCase(), argCount: en(o) }), s.push(...vt(o)), i + 1;
+  return s.push({ name: r.toUpperCase(), argCount: pn(o) }), s.push(...Wt(o)), i + 1;
 }
-function vt(e) {
+function Wt(e) {
   const t = [];
   let r = 0;
   for (; r < e.length; ) {
     const s = e[r];
     if (s === "'" || s === '"') {
-      r = Zs(e, r);
+      r = fn(e, r);
       continue;
     }
     if (/[A-Za-z_]/.test(s)) {
@@ -1620,122 +1627,122 @@ function vt(e) {
       for (r++; r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
         r++;
       const i = e.slice(n, r);
-      r = tn(e, r, i, t);
+      r = mn(e, r, i, t);
       continue;
     }
     r++;
   }
   return t;
 }
-function rn(e) {
-  const t = vt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
+function gn(e) {
+  const t = Wt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   for (const { name: n, argCount: i } of t) {
-    if (_s.has(n)) {
-      r.has(n) || (r.add(n), M(
+    if (en.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 = te[n];
+    const o = ue[n];
     if (o && (i < o.minArgs || i > o.maxArgs) && !s.has(n)) {
       s.add(n);
-      const a = Ws(o.minArgs, o.maxArgs);
-      M(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
+      const a = rn(o.minArgs, o.maxArgs);
+      R(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${a}`);
     }
   }
 }
-function sn(e) {
+function yn(e) {
   return [
     ...new Set(
-      [...e.matchAll(new RegExp(js.source, "g"))].map((t) => t[1])
+      [...e.matchAll(new RegExp(sn.source, "g"))].map((t) => t[1])
     )
   ];
 }
-function nn(e) {
+function hn(e) {
   const t = e.result.references.filter(
-    (n) => !e.canonicalContextKeys.has(j(n))
+    (n) => !e.canonicalContextKeys.has(G(n))
   );
   if (t.length === 0) return;
-  const r = e.contextKeys.map((n) => `[${Nt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
-  M(
+  const r = e.contextKeys.map((n) => `[${_t(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 on(e) {
-  if (Ks.test(e.formula)) return;
+function bn(e) {
+  if (nn.test(e.formula)) return;
   const t = e.result.references.filter((r) => {
     var n;
-    const s = (n = e.context[j(r)]) != null ? n : e.context[r];
-    return s !== void 0 && !Mt(s);
+    const s = (n = e.context[G(r)]) != null ? n : e.context[r];
+    return s !== void 0 && !Ut(s);
   });
-  t.length !== 0 && M(
+  t.length !== 0 && R(
     e,
-    `${e.errorPrefix}args[1]: ${Js(
-      Gs(e.formula)
-    )}Bracket reference(s) ${Ys(
+    `${e.errorPrefix}args[1]: ${un(
+      on(e.formula)
+    )}Bracket reference(s) ${an(
       t
     )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
   );
 }
-function an(e) {
+function En(e) {
   if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0) return;
-  const t = new Set(e.result.references.map(j)), r = e.contextKeys.filter((i) => !t.has(j(i)));
+  const t = new Set(e.result.references.map(G)), r = e.contextKeys.filter((i) => !t.has(G(i)));
   if (e.result.unusedContextKeys = r, r.length === 0) return;
-  const s = r.map((i) => `[${Nt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
-  e.errorOnUnusedContext ? M(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
+  const s = r.map((i) => `[${_t(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 je(e, t, r, s) {
+function Qe(e, t, r, s) {
   var o;
-  const n = (o = s.context[j(e)]) != null ? o : s.context[e];
+  const n = (o = s.context[G(e)]) != null ? o : s.context[e];
   if (n === void 0) return;
-  if (!(typeof n == "string" && n.startsWith(E))) {
-    Mt(n) && M(
+  if (!(typeof n == "string" && n.startsWith(w))) {
+    Ut(n) && R(
       s,
-      `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${E}Table.Column.Level).`
+      `${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).`
     );
     return;
   }
   if (s.schemaIndex)
     try {
-      const a = $e(n, s.schemaIndex);
-      X(a.column.dataType) ? r && a.level && a.level !== r && M(
+      const a = ke(n, s.schemaIndex);
+      ee(a.column.dataType) ? r && a.level && a.level !== r && R(
         s,
         `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`
-      ) : M(
+      ) : R(
         s,
         `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`
       );
     } catch (a) {
       const u = a instanceof Error ? a.message : "Unknown error";
-      M(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
+      R(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function un(e) {
-  const t = St(), r = Rt(e.formula, t);
+function Fn(e) {
+  const t = Bt(), r = Pt(e.formula, t);
   for (const s of r) {
-    const n = Ot(s.functionName);
-    je(s.ref1, s, n, e), je(s.ref2, s, n, e);
+    const n = Lt(s.functionName);
+    Qe(s.ref1, s, n, e), Qe(s.ref2, s, n, e);
   }
 }
-function cn(e, t, r = {}) {
+function An(e, t, r = {}) {
   var n;
-  const s = Hs(e, t, r);
-  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || M(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Xs(s), rn(s), s.result.references = sn(e), s.result.references.length === 0 ? (s.result.warnings.push(
+  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(
     `${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`
-  ), s.result) : s.contextKeys.length === 0 ? (M(
+  ), s.result) : s.contextKeys.length === 0 ? (R(
     s,
     `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`
-  ), s.result) : (nn(s), on(s), an(s), un(s), s.result));
+  ), s.result) : (hn(s), bn(s), En(s), Fn(s), s.result));
 }
-function ln(e, t, r = {}) {
-  const s = cn(e, t, r);
+function wn(e, t, r = {}) {
+  const s = An(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 fn(e, t) {
+function Tn(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?)`
@@ -1746,12 +1753,12 @@ function fn(e, t) {
       `${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`
     );
   const s = r, n = e[2];
-  if (!S(n))
+  if (!O(n))
     throw new Error(
       `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
     );
   const i = n;
-  ln(s, i, {
+  wn(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1759,44 +1766,44 @@ function fn(e, t) {
     // Custom formulas must have content
     schemaIndex: t.schemaIndex
   });
-  const o = dn(s), a = {};
+  const o = Sn(s), a = {};
   for (const [u, c] of Object.entries(i)) {
-    const p = `args[2].${u}`;
-    if (T(c))
-      a[`${u}`] = D({
+    const g = `args[2].${u}`;
+    if (q(c))
+      a[`${u}`] = M({
         data: c,
         context: {
           dataSource: t.dataSource,
           schemaIndex: t.schemaIndex,
-          pathPrefix: p
+          pathPrefix: g
         }
       });
-    else if (typeof c == "string" && c.startsWith(E)) {
-      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, d = o[l];
+    else if (typeof c == "string" && c.startsWith(w)) {
+      const d = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, m = o[d];
       try {
-        a[`${u}`] = H(
+        a[`${u}`] = Z(
           c,
           t.dataSource,
           t.schemaIndex,
-          d !== void 0 ? { inferredDateLevel: d } : void 0
+          m !== void 0 ? { inferredDateLevel: m } : void 0
         );
-      } catch (b) {
-        const g = b instanceof Error ? b.message : "Unknown error";
-        throw new Error(`${p}: ${g}`);
+      } 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;
     else
       throw new Error(
-        `${p}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${E}...), but got: ${typeof c}`
+        `${g}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${w}...), but got: ${typeof c}`
       );
   }
-  e[2] = a;
+  return [e[0], e[1], a, ...e.slice(3)];
 }
-function dn(e) {
-  const t = St(), r = Rt(e, t), s = {};
+function Sn(e) {
+  const t = Bt(), r = Pt(e, t), s = {};
   for (const n of r) {
-    const i = Ot(n.functionName);
+    const i = Lt(n.functionName);
     if (i !== void 0)
       for (const o of [n.ref1, n.ref2]) {
         const a = s[o];
@@ -1809,95 +1816,99 @@ function dn(e) {
   }
   return s;
 }
-function It(e) {
-  return e.type === U.TextAttribute;
+function Vt(e) {
+  return e.type === j.TextAttribute;
 }
-function Pt(e) {
-  return e.type === U.NumericAttribute;
+function jt(e) {
+  return e.type === j.NumericAttribute;
 }
-function mn(e) {
-  return e.type === U.DateLevel;
+function Cn(e) {
+  return e.type === j.DateLevel;
 }
-function pn(e) {
-  return It(e) || Pt(e);
+function qn(e) {
+  return Vt(e) || jt(e);
 }
-function ie(e) {
-  return e.type === U.TextAttribute ? "text" : e.type === U.NumericAttribute ? "numeric" : e.type === U.DateLevel ? "date/datetime" : "unknown";
+function pe(e) {
+  return e.type === j.TextAttribute ? "text" : e.type === j.NumericAttribute ? "numeric" : e.type === j.DateLevel ? "date/datetime" : "unknown";
 }
-function Oe(e, t) {
+function Le(e, t) {
   const r = e[0];
   if (!r || typeof r != "object" || !("type" in r))
     throw new Error(`${t.pathPrefix}args[0]: Expected attribute as first argument`);
   return r;
 }
-function Ke(e, t) {
-  const r = Oe(e, t);
-  if (!pn(r))
+function Xe(e, t) {
+  const r = Le(e, t);
+  if (!qn(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${pe(
         r
       )} attribute`
     );
+  return e;
 }
-function P(e, t) {
-  const r = Oe(e, t);
-  if (!Pt(r))
+function L(e, t) {
+  const r = Le(e, t);
+  if (!jt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${pe(
         r
       )} attribute`
     );
+  return e;
 }
-function k(e, t) {
-  const r = Oe(e, t);
-  if (!It(r))
+function z(e, t) {
+  const r = Le(e, t);
+  if (!Vt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${pe(
         r
       )} attribute`
     );
+  return e;
 }
-function gn(e, t) {
+function $n(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 yn(e, t) {
-  const r = gn(e, t);
-  if (!be(r))
+function On(e, t) {
+  const r = $n(e, t);
+  if (!De(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
+  return e;
 }
-const hn = {
-  "measureFactory.customFormula": fn,
+const Dn = {
+  "measureFactory.customFormula": Tn,
   // String | Number filters
-  "filterFactory.equals": Ke,
-  "filterFactory.doesntEqual": Ke,
+  "filterFactory.equals": Xe,
+  "filterFactory.doesntEqual": Xe,
   // Numeric filters
-  "filterFactory.greaterThan": P,
-  "filterFactory.greaterThanOrEqual": P,
-  "filterFactory.lessThan": P,
-  "filterFactory.lessThanOrEqual": P,
-  "filterFactory.between": P,
-  "filterFactory.betweenNotEqual": P,
-  "filterFactory.numeric": P,
+  "filterFactory.greaterThan": L,
+  "filterFactory.greaterThanOrEqual": L,
+  "filterFactory.lessThan": L,
+  "filterFactory.lessThanOrEqual": L,
+  "filterFactory.between": L,
+  "filterFactory.betweenNotEqual": L,
+  "filterFactory.numeric": L,
   // String filters
-  "filterFactory.contains": k,
-  "filterFactory.doesntContain": k,
-  "filterFactory.startsWith": k,
-  "filterFactory.doesntStartWith": k,
-  "filterFactory.endsWith": k,
-  "filterFactory.doesntEndWith": k,
-  "filterFactory.like": k,
+  "filterFactory.contains": z,
+  "filterFactory.doesntContain": z,
+  "filterFactory.startsWith": z,
+  "filterFactory.doesntStartWith": z,
+  "filterFactory.endsWith": z,
+  "filterFactory.doesntEndWith": z,
+  "filterFactory.like": z,
   // Exclude filter
-  "filterFactory.exclude": yn
+  "filterFactory.exclude": On
 };
-function bn(e) {
-  return hn[`${e}`];
+function xn(e) {
+  return Dn[`${e}`];
 }
-const kt = {
+const Jt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -2424,18 +2435,18 @@ const kt = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function De(e) {
-  return kt[`${e}`];
+function ze(e) {
+  return Jt[`${e}`];
 }
-function An(e) {
-  const t = De(e);
+function vn(e) {
+  const t = ze(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function wn(e) {
-  const t = De(e);
+function Nn(e) {
+  const t = ze(e);
   return t ? t.length : 0;
 }
-function Fn(e) {
+function Mn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2444,31 +2455,31 @@ function Fn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function le(e, t, r, s) {
-  if (e.startsWith(E))
+function Fe(e, t, r, s) {
+  if (e.startsWith(w))
     try {
-      return H(e, t, r);
+      return Z(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: '${E}TableName.ColumnName[.Level]'`
+    `${s}: Invalid attribute '${e}'. Expected format: '${w}TableName.ColumnName[.Level]'`
   );
 }
-function En(e, t, r, s) {
-  if (e.startsWith(E))
+function Rn(e, t, r, s) {
+  if (e.startsWith(w))
     try {
-      return vs(e, t, r);
+      return Js(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: '${E}TableName.ColumnName'`
+    `${s}: Invalid date dimension string '${e}'. Expected format: '${w}TableName.ColumnName'`
   );
 }
-function Cn(e) {
+function In(e) {
   const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, o = i;
   if (t === void 0) {
     if (r.required)
@@ -2514,7 +2525,7 @@ function Cn(e) {
           throw new Error(
             `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return le(t, s, n, o);
+        return Fe(t, s, n, o);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
@@ -2523,15 +2534,15 @@ function Cn(e) {
         return t.map((a, u) => {
           if (typeof a != "string")
             throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
-          return le(a, s, n, `${o}[${u}]`);
+          return Fe(a, s, n, `${o}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
-        if (!T(t))
+        if (!q(t))
           throw new Error(
             `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
-        return D({
+        return M({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2541,21 +2552,21 @@ function Cn(e) {
             `${o}: Expected array of measure function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!T(a))
+          if (!q(a))
             throw new Error(
               `${o}[${u}]: Expected measure function call, got ${typeof a}`
             );
-          return D({
+          return M({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
       case "Filter":
-        if (!T(t))
+        if (!q(t))
           throw new Error(
             `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
           );
-        return D({
+        return M({
           data: t,
           context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
@@ -2565,11 +2576,11 @@ function Cn(e) {
             `${o}: Expected array of filter function calls, got ${typeof t}`
           );
         return t.map((a, u) => {
-          if (!T(a))
+          if (!q(a))
             throw new Error(
               `${o}[${u}]: Expected filter function call, got ${typeof a}`
             );
-          return D({
+          return M({
             data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
@@ -2577,17 +2588,17 @@ function Cn(e) {
       case "FilterRelationsNode":
         if (Array.isArray(t))
           return t.map((a, u) => {
-            if (!T(a))
+            if (!q(a))
               throw new Error(
                 `${o}[${u}]: Expected filter function call, got ${typeof a}`
               );
-            return D({
+            return M({
               data: a,
               context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
             });
           });
-        if (T(t))
-          return D({
+        if (q(t))
+          return M({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
@@ -2599,21 +2610,21 @@ function Cn(e) {
           throw new Error(
             `${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
           );
-        return En(t, s, n, o);
+        return Rn(t, s, n, o);
       case "LevelAttribute": {
         if (typeof t != "string")
           throw new Error(
             `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const a = le(
+        const a = Fe(
           t,
           s,
           n,
           o
         );
-        if (!mn(a))
+        if (!Cn(a))
           throw new Error(
-            `${o}: Attribute must be date/datetime type, got ${ie(
+            `${o}: Attribute must be date/datetime type, got ${pe(
               a
             )} attribute`
           );
@@ -2622,8 +2633,8 @@ function Cn(e) {
       case "Measure | number":
         if (typeof t == "number")
           return t;
-        if (T(t))
-          return D({
+        if (q(t))
+          return M({
             data: t,
             context: { dataSource: s, schemaIndex: n, pathPrefix: o }
           });
@@ -2632,7 +2643,7 @@ function Cn(e) {
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (Fn(t))
+          if (Mn(t))
             return t;
           throw new Error(
             `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
@@ -2659,197 +2670,194 @@ function Cn(e) {
         return t;
     }
 }
-function D(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = De(i);
+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);
   if (!u) {
-    const g = Object.keys(kt), m = R(i, g, (C) => C), A = m && m.distance <= x ? ` Did you mean '${m.best}'?` : "";
+    const p = Object.keys(Jt), E = x(i, p, (v) => v), C = E && E.distance <= T ? ` Did you mean '${E.best}'?` : "";
     throw new Error(
-      `${a}function: Unknown function '${i}'.${A}`
+      `${a}function: Unknown function '${i}'.${C}`
     );
   }
-  const c = An(i), p = wn(i);
+  const c = vn(i), g = Nn(i);
   if (o.length < c)
     throw new Error(
       `${a}function: Expected at least ${c} arguments, got ${o.length}`
     );
-  if (o.length > p)
+  if (o.length > g)
     throw new Error(
-      `${a}function: Expected at most ${p} arguments, got ${o.length}`
+      `${a}function: Expected at most ${g} arguments, got ${o.length}`
     );
-  const l = [], d = [];
-  for (let g = 0; g < Math.max(o.length, u.length); g++) {
-    const m = u[`${g}`], A = o[`${g}`], C = a ? `${a}args[${g}]` : `args[${g}]`;
-    if (A === void 0) {
-      m != null && m.required && d.push(`${C}: Missing required argument (expected ${m.type})`);
+  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})`);
       continue;
     }
-    if (!m) {
-      d.push(`${C}: Unexpected argument`);
+    if (!E) {
+      m.push(`${v}: Unexpected argument`);
       continue;
     }
     try {
-      const N = Cn({
-        data: A,
+      const W = In({
+        data: C,
         context: {
           dataSource: r,
           schemaIndex: s,
-          pathPrefix: C,
-          argSchema: m
+          pathPrefix: v,
+          argSchema: E
         }
       });
-      l.push(N);
-    } catch (N) {
-      const oe = N instanceof Error ? N.message : "Unknown error";
-      d.push(oe);
+      d.push(W);
+    } catch (W) {
+      const rr = W instanceof Error ? W.message : "Unknown error";
+      m.push(rr);
     }
   }
-  if (d.length > 0) {
-    const g = d.join("; ");
-    throw new Error(g);
+  if (m.length > 0) {
+    const p = m.join("; ");
+    throw new Error(p);
   }
-  const b = bn(i);
+  let h = d;
+  const b = xn(i);
   if (b)
     try {
-      b(l, {
+      h = b(d, {
         dataSource: r,
         schemaIndex: s,
         pathPrefix: a
       });
-    } catch (g) {
-      const m = g instanceof Error ? g.message : "Unknown validation error";
-      throw new Error(m);
+    } catch (p) {
+      const E = p instanceof Error ? p.message : "Unknown validation error";
+      throw new Error(E);
     }
-  return Us(i, l);
+  return Zs(i, h);
 }
-function Bt(e) {
+function Kt(e) {
   const { attribute: t, config: r } = e;
-  if (be(e) && Rr(t)) {
-    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = vr(r), o = Object.keys(i).length === 0 ? void 0 : i;
-    return Ir(t, n, o);
+  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);
   }
   return e;
 }
-function qn(e) {
+function kn(e) {
   let t = [];
   for (const r of e)
-    Z(r) ? t = ze(r, t) : t = ze([Bt(r)], t);
+    te(r) ? t = je(r, t) : t = je([Kt(r)], t);
   return t != null ? t : [];
 }
-const Tn = (e) => {
+const Bn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
-      category: "filters",
-      index: a,
+      path: `filters[${a}]`,
       input: o
     };
     try {
-      const c = D({
+      const c = M({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !Z(c) && !ne(c) ? i.push(w(y({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !te(c) && !fe(c) ? i.push(F(l({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
-      const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(w(y({}, u), { message: p }));
+      const g = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(l({}, u), { message: g }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: qn(n) };
-}, Me = (e) => {
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: kn(n) };
+}, se = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Tt(t) ? Tn({
+  return t ? Rt(t) ? Bn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
     success: !1,
     errors: [
       {
-        category: "filters",
-        index: -1,
+        path: "filters",
         input: t,
         message: "Invalid filters JSON. Expected an array of function calls with 'function' and 'args' properties."
       }
     ]
   } : { success: !0, data: [] };
-}, xn = (e) => {
+}, Ln = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
-      category: "highlights",
-      index: a,
+      path: `highlights[${a}]`,
       input: o
     };
     try {
-      const c = D({
+      const c = M({
         data: o,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      ne(c) ? n.push(Bt(c)) : i.push(w(y({}, u), { message: "Invalid filter JSON" }));
+      fe(c) ? n.push(Kt(c)) : i.push(F(l({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
-      const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(w(y({}, u), { message: p }));
+      const g = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, Ne = (e) => {
+}, me = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Tt(t) ? xn({
+  return t ? Rt(t) ? Ln({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
     success: !1,
     errors: [
       {
-        category: "highlights",
-        index: -1,
+        path: "highlights",
         input: t,
         message: "Invalid highlights JSON. Expected an array of function calls with 'function' and 'args' properties."
       }
     ]
   } : { success: !0, data: [] };
-}, $n = (e, t) => {
-  if (e && !tt(e))
-    return w(y({}, t), {
+}, zn = (e, t) => {
+  if (e && !ct(e))
+    return F(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
-}, Sn = (e, t, r) => {
+}, Un = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
-    const i = D({
+    const i = M({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return Te(i) ? { success: !0, data: i } : {
+    return Ie(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [w(y({}, r), { message: "Invalid measure JSON" })]
+      errors: [F(l({}, r), { message: "Invalid measure JSON" })]
     };
   } catch (i) {
     const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [w(y({}, r), { message: o })]
+      errors: [F(l({}, r), { message: o })]
     };
   }
-}, On = (e, t, r, s) => {
-  const n = D({
+}, _n = (e, t, r, s) => {
+  const n = M({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  if (!Te(n))
+  if (!Ie(n))
     return {
       style: {},
-      error: w(y({}, s), { message: "Invalid measure JSON" })
+      error: F(l({}, s), { message: "Invalid measure JSON" })
     };
-  const i = $n(e.sortType, s);
+  const i = zn(e.sortType, s);
   if (i) {
     const a = _(e, "column");
     return { measure: n, style: a, error: i };
   }
   const o = _(e, "column");
   return { measure: n, style: o };
-}, Dn = (e, t, r, s) => {
-  if (Ns(e))
-    return On(e, t, r, s);
-  if (T(e)) {
-    const n = Sn(
+}, Pn = (e, t, r, s) => {
+  if (Vs(e))
+    return _n(e, t, r, s);
+  if (q(e)) {
+    const n = Un(
       e,
       { dataSource: t, schemaIndex: r },
       s
@@ -2857,11 +2865,11 @@ const Tn = (e) => {
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: w(y({}, s), {
+    error: F(l({}, s), {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, zt = (e) => {
+}, Gt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -2870,8 +2878,7 @@ const Tn = (e) => {
       success: !1,
       errors: [
         {
-          category: "measures",
-          index: -1,
+          path: "measures",
           input: t,
           message: "Invalid measures JSON. Expected an array."
         }
@@ -2880,12 +2887,11 @@ const Tn = (e) => {
   const n = [], i = [];
   return t.forEach((o, a) => {
     const u = {
-      category: "measures",
-      index: a,
+      path: `measures[${a}]`,
       input: o
     };
     try {
-      const c = Dn(o, r, s, u);
+      const c = Pn(o, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -2894,17 +2900,31 @@ const Tn = (e) => {
         c.style !== void 0 ? { measure: c.measure, style: c.style } : { measure: c.measure }
       );
     } catch (c) {
-      const p = c instanceof Error ? c.message : "Unknown error";
-      i.push(w(y({}, u), { message: p }));
+      const g = c instanceof Error ? c.message : "Unknown error";
+      i.push(F(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function Q(e) {
-  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(Q) : e !== null && typeof e == "object" ? Object.fromEntries(
-    Object.entries(e).map(([t, r]) => [t, Q(r)])
+function ae(e) {
+  return typeof e == "string" ? e : e.title;
+}
+function Wn(e) {
+  const t = {};
+  for (const [r, s] of Object.entries(e)) {
+    const n = {};
+    s.filtersOptions !== void 0 && (n.filtersOptions = s.filtersOptions), s.partialDtoOptions !== void 0 && (n.partialDtoOptions = s.partialDtoOptions), Object.keys(n).length > 0 && (t[r] = n);
+  }
+  return Object.keys(t).length > 0 ? t : void 0;
+}
+function Yt(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)])
   ) : e;
 }
-function F(e, t, r) {
+function A(e, t, r) {
   const s = e();
   if (!s.success) {
     const n = r ? s.errors.map(r) : s.errors;
@@ -2912,29 +2932,29 @@ function F(e, t, r) {
   }
   return s.data;
 }
-const ti = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = xe(s), i = [], o = F(
-    () => $t({
+const xi = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = re(s), i = [], o = A(
+    () => kt({
       data: t.dimensions || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), a = F(
-    () => zt({
+  ), a = A(
+    () => Gt({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
-  ), u = F(
-    () => Me({
+  ), u = A(
+    () => se({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   );
   let c = null;
-  return t.highlights && (c = F(
-    () => Ne({
+  return t.highlights && (c = A(
+    () => me({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2944,78 +2964,74 @@ const ti = (e) => {
     errors: i
   } : {
     success: !0,
-    data: y({
-      dataSource: Ae(r),
-      dimensions: o ? Pr(o) : [],
-      measures: a ? kr(a) : [],
+    data: l({
+      dataSource: le(r),
+      dimensions: o ? Gr(o) : [],
+      measures: a ? Yr(a) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Ge(e) {
+function Ze(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Re(e) {
+function Ue(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var l, d, b;
-    const i = Ge(s) ? s.column : s, o = Ge(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var d, m, h;
+    const i = Ze(s) ? s.column : s, o = Ze(s) ? s : void 0, a = () => Yt(i);
     if (!i.composeCode) {
       r.push({
-        category: "dimensions",
-        index: n,
+        path: `dimensions[${n}]`,
         input: a(),
         message: `Dimension at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
-    if (!i.composeCode.startsWith(E)) {
+    if (!i.composeCode.startsWith(w)) {
       r.push({
-        category: "dimensions",
-        index: n,
+        path: `dimensions[${n}]`,
         input: a(),
-        message: `Expected composeCode to start with '${E}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
+        message: `Expected composeCode to start with '${w}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const u = (b = o != null && o.sortType ? rt(o.sortType) : void 0) != null ? b : ((l = i.getSort) == null ? void 0 : l.call(i)) !== void 0 && ((d = i.getSort) == null ? void 0 : d.call(i)) !== B.None ? i.getSort() : void 0, c = o ? _(o, "column") : {};
-    if (u !== void 0 && u !== B.None || o && Object.keys(c).length > 0) {
-      const g = y(y({
+    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 b = l(l({
         column: i.composeCode
-      }, u !== void 0 && u !== B.None && { sortType: st(u) }), c);
-      t.push(g);
+      }, u !== void 0 && u !== U.None && { sortType: dt(u) }), c);
+      t.push(b);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-const ye = "Unknown error";
-function ve(e) {
+const qe = "Unknown error";
+function ne(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
-  if (Br(e)) {
+  if (Hr(e)) {
     if (!e.composeCode)
       return {
         success: !1,
         errors: [
           {
-            category: "filters",
-            index: -1,
+            path: "filters",
             input: e,
             message: `FilterRelations is missing composeCode. Operator: ${e.operator || "unknown"}`
           }
         ]
       };
     try {
-      return { success: !0, data: [V(e.composeCode)] };
+      return { success: !0, data: [J(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : ye;
+      const n = s instanceof Error ? s.message : qe;
       return {
         success: !1,
         errors: [
           {
-            category: "filters",
-            index: -1,
+            path: "filters",
             input: e,
             message: `Failed to parse composeCode for FilterRelations: ${n}. ComposeCode: '${e.composeCode}'`
           }
@@ -3028,28 +3044,26 @@ function ve(e) {
     var i;
     if (!s.composeCode) {
       t.push({
-        category: "filters",
-        index: n,
+        path: `filters[${n}]`,
         input: s,
         message: `Filter at index ${n} (${(i = s.name) != null ? i : "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const o = V(s.composeCode);
+      const o = J(s.composeCode);
       r.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : ye;
+      const a = o instanceof Error ? o.message : qe;
       t.push({
-        category: "filters",
-        index: n,
+        path: `filters[${n}]`,
         input: s,
         message: `Failed to parse composeCode for filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function Ie(e) {
+function ge(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -3057,128 +3071,124 @@ function Ie(e) {
     var i;
     if (!s.composeCode) {
       r.push({
-        category: "highlights",
-        index: n,
+        path: `highlights[${n}]`,
         input: s,
         message: `Highlight filter at index ${n} (${(i = s.name) != null ? i : "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const o = V(s.composeCode);
+      const o = J(s.composeCode);
       t.push(o);
     } catch (o) {
-      const a = o instanceof Error ? o.message : ye;
+      const a = o instanceof Error ? o.message : qe;
       r.push({
-        category: "highlights",
-        index: n,
+        path: `highlights[${n}]`,
         input: s,
         message: `Failed to parse composeCode for highlight filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Ye(e) {
+function et(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Pe(e) {
+function _e(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
-    var u, c, p;
-    const i = Ye(s) ? s.column : s, o = Ye(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    var u, c, g;
+    const i = et(s) ? s.column : s, o = et(s) ? s : void 0, a = () => Yt(i);
     if (!i.composeCode) {
       r.push({
-        category: "measures",
-        index: n,
+        path: `measures[${n}]`,
         input: a(),
         message: `Measure at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const l = V(i.composeCode), d = (p = o != null && o.sortType ? rt(o.sortType) : void 0) != null ? p : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== B.None ? i.getSort() : void 0;
-      if (d !== void 0 && d !== B.None || o && Object.keys(_(o, "column")).length > 0) {
-        const g = o ? _(o, "column") : {}, m = y(y({
-          column: l
-        }, d !== void 0 && d !== B.None && { sortType: st(d) }), g);
-        t.push(m);
+      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);
       } else
-        t.push(l);
-    } catch (l) {
-      const d = l instanceof Error ? l.message : "Unknown error";
+        t.push(d);
+    } catch (d) {
+      const m = d instanceof Error ? d.message : "Unknown error";
       r.push({
-        category: "measures",
-        index: n,
+        path: `measures[${n}]`,
         input: a(),
-        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${d}. ComposeCode: '${i.composeCode}'`
+        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${m}. ComposeCode: '${i.composeCode}'`
       });
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Je(e) {
+function tt(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(nt)) != null ? n : !1);
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(ft)) != null ? n : !1);
 }
-function He(e) {
+function rt(e) {
   var t, r, s, n;
-  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(it)) != null ? n : !1);
+  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);
 }
-function Qe(e) {
+function st(e) {
   try {
-    const t = V(e.trim());
+    const t = J(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
   } catch (t) {
     return;
   }
 }
-function Mn(e) {
+function Vn(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 (Je(a) || He(a)) {
+    if (tt(a) || rt(a)) {
       r.push(a);
       continue;
     }
-    const u = (s = a.name) != null ? s : "Measure", c = `${nt}_${u}`, p = `${it}_${u}`;
-    let l, d, b = o + 1;
-    if (b < e.length && !t.has(b) && Je(e[b]) && e[b].name === c) {
-      const g = (n = e[b].composeCode) == null ? void 0 : n.trim();
-      g && (l = Qe(g), t.add(b), b++);
+    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 b = (n = e[h].composeCode) == null ? void 0 : n.trim();
+      b && (d = st(b), t.add(h), h++);
     }
-    if (b < e.length && !t.has(b) && He(e[b]) && e[b].name === p) {
-      const g = (i = e[b].composeCode) == null ? void 0 : i.trim();
-      g && (d = Qe(g), t.add(b));
+    if (h < e.length && !t.has(h) && rt(e[h]) && e[h].name === g) {
+      const b = (i = e[h].composeCode) == null ? void 0 : i.trim();
+      b && (m = st(b), t.add(h));
     }
-    l !== void 0 || d !== void 0 ? r.push(y(y({
+    d !== void 0 || m !== void 0 ? r.push(l(l({
       column: a
-    }, l && Object.keys(l).length > 0 && { trend: l }), d && Object.keys(d).length > 0 && { forecast: d })) : r.push(a);
+    }, d && Object.keys(d).length > 0 && { trend: d }), m && Object.keys(m).length > 0 && { forecast: m })) : r.push(a);
   }
   return r;
 }
-function ri(e) {
-  const t = [], r = F(
-    () => Re(e.dimensions || []),
+function vi(e) {
+  const t = [], r = A(
+    () => Ue(e.dimensions || []),
     t
-  ), s = Mn(e.measures || []), n = F(
-    () => Pe(s),
+  ), s = Vn(e.measures || []), n = A(
+    () => _e(s),
     t
-  ), i = F(
-    () => ve(e.filters),
+  ), i = A(
+    () => ne(e.filters),
     t
   );
   let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = F(
-    () => Ie(e.highlights),
+  if (e.highlights && e.highlights.length > 0 && (o = A(
+    () => ge(e.highlights),
     t
   )), t.length > 0)
     return {
       success: !1,
       errors: t
     };
-  const a = y({
+  const a = l({
     dimensions: r || [],
     measures: n || [],
     filters: i || []
@@ -3186,12 +3196,12 @@ function ri(e) {
   return {
     success: !0,
     // Strip [[delimiters]] from all strings to preserve original names with spaces
-    data: Q(a)
+    data: B(a)
   };
 }
-const Lt = new Set(
-  zr.filter((e) => e !== "image")
-), Xe = Object.freeze([...Lt]), fe = /* @__PURE__ */ new Set([
+const Ht = new Set(
+  Qr.filter((e) => e !== "image")
+), nt = Object.freeze([...Ht]), Ae = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3214,7 +3224,7 @@ const Lt = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), Nn = {
+]), jn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3287,7 +3297,7 @@ const Lt = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, Rn = /* @__PURE__ */ new Set([
+}, Jn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3295,7 +3305,7 @@ const Lt = new Set(
   "geo",
   "details",
   "date"
-]), vn = /* @__PURE__ */ new Set([
+]), Kn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3307,152 +3317,169 @@ const Lt = new Set(
   "max",
   "color"
 ]);
-function In(e) {
-  const t = Nn[e];
+function Gn(e) {
+  const t = jn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
       requiredAxes: Object.freeze([...t.requiredAxes])
     };
 }
-function Ut(e) {
-  return typeof e == "string" && Lt.has(e);
+function Qt(e) {
+  return typeof e == "string" && Ht.has(e);
 }
-function Pn(e, t, r) {
-  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Rn.has(e))
+function Yn(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Jn.has(e))
     return !0;
-  if (vn.has(e))
+  if (Kn.has(e))
     return !1;
   const s = Array.isArray(t) ? t[0] : t;
   if (!s)
     return !0;
   let n;
-  return S(s) && "column" in s && (n = s.column), !(T(s) || n !== void 0 && T(n));
+  return O(s) && "column" in s && (n = s.column), !(q(s) || n !== void 0 && q(n));
 }
-function kn(e) {
+function Hn(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
   };
-  if (!S(e))
+  if (!O(e))
     return t.push({
-      category: "chartType",
-      index: -1,
+      path: "chartType",
       input: e,
       message: "Expected an object"
     }), { normalized: r, errors: t };
   const s = e.chartType;
   if (s === void 0) {
-    const i = Object.keys(e), o = R("chartType", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'chartType'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
+    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;
     t.push({
-      category: "chartType",
-      index: -1,
+      path: "chartType",
       input: u,
       message: `chartType is required.${a}`
     });
-  } else if (Ut(s))
+  } else if (Qt(s))
     r.chartType = s;
   else {
-    const i = R(String(s), Xe, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = Xe.slice(0, 8).join(", ");
+    const i = x(String(s), nt, (u) => u), o = i && i.distance <= T ? ` Did you mean '${i.best}'?` : "", a = nt.slice(0, 8).join(", ");
     t.push({
-      category: "chartType",
-      index: -1,
+      path: "chartType",
       input: s,
       message: `Invalid chartType '${s}'. Valid types: ${a}, ...${o}`
     });
   }
   const n = e.dataOptions;
   if (n === void 0) {
-    const i = Object.keys(e), o = R("dataOptions", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
+    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;
     t.push({
-      category: "dataOptions",
-      index: -1,
+      path: "dataOptions",
       input: u,
       message: `dataOptions is required.${a}`
     });
   } else n !== null && typeof n == "object" && (r.dataOptions = n);
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
 }
-function Bn(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) {
+  return e ? t ? `${e}.${t}` : e : t != null ? t : "";
+}
+function Qn(e) {
+  return (t) => F(l({}, t), {
+    path: Xt(e, t.path)
+  });
+}
+function Zt(e) {
+  return Qn(`widgets[${e}]`);
+}
+function er(e, t) {
+  return e.map(t);
+}
+function Xn(e) {
   return e.map(
-    ({ attribute: t, style: r }) => r ? y({ column: t }, r) : t
+    ({ attribute: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function zn(e) {
+function Zn(e) {
   return e.map(
-    ({ measure: t, style: r }) => r ? y({ column: t }, r) : t
+    ({ measure: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function _t(e) {
+function tr(e) {
   return Array.isArray(e) ? e : [e];
 }
-function he(e) {
-  return (t) => w(y({}, t), {
-    category: "dataOptions",
-    index: e
-  });
+const ei = /^(dimensions|measures|filters|highlights)(\[\d+\])?$/;
+function $e(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 });
+    const i = t.path.replace(/\[\d+\]$/, "");
+    return F(l({}, t), {
+      path: Xt(i, n)
+    });
+  };
 }
-function re(e, t, r, s, n) {
-  const i = t ? _t(
+function ce(e, t, r, s, n) {
+  const i = t ? tr(
     t
   ) : [];
   if (i.length === 0)
     return [];
   if (r === "dimension") {
-    const a = F(
-      () => $t({
+    const a = A(
+      () => kt({
         data: i,
         context: s
       }),
       n,
-      he(e)
+      $e(e)
     );
-    return a !== null ? Bn(a) : null;
+    return a !== null ? Xn(a) : null;
   }
-  const o = F(
-    () => zt({
+  const o = A(
+    () => Gt({
       data: i,
       context: s
     }),
     n,
-    he(e)
+    $e(e)
   );
-  return o !== null ? zn(o) : null;
+  return o !== null ? Zn(o) : null;
 }
-function Ze(e, t, r) {
+const it = (e, t) => {
+  const r = t.path.match(/\[(\d+)\]$/), s = r ? Number(r[1]) : void 0;
+  return F(l({}, t), { path: D(e, s) });
+};
+function ot(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = Re(
+    const i = Ue(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((o) => w(y({}, o), {
-        category: "dataOptions",
-        index: e
-      }))
+      errors: i.errors.map((o) => it(e, o))
     };
   }
-  const n = Pe(s);
+  const n = _e(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => w(y({}, i), {
-      category: "dataOptions",
-      index: e
-    }))
+    errors: n.errors.map((i) => it(e, i))
   };
 }
-function Ln(e, t) {
+function ti(e, t) {
   let r;
-  S(e) && "column" in e && (r = e.column);
-  const n = !(T(e) || r !== void 0 && T(r)) ? "dimension" : "measure", i = [], o = re("columns", [e], n, t, i);
+  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 };
 }
-function Un(e, t, r, s) {
+function ri(e, t, r, s) {
   const n = [];
   for (const i of e) {
-    const o = F(
-      () => Ln(i, t),
+    const o = A(
+      () => ti(i, t),
       r,
       s
     );
@@ -3460,165 +3487,157 @@ function Un(e, t, r, s) {
   }
   return n;
 }
-function _n(e, t, r) {
-  if (!e || !S(e))
+function si(e, t, r) {
+  if (!e || !O(e))
     return r.push({
-      category: "dataOptions",
-      index: -1,
+      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 l of a)
-    if (!fe.has(l)) {
-      const d = R(l, [...fe], (g) => g), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
-      d && d.distance <= x && u.set(l, d.best), r.push({
-        category: "dataOptions",
-        index: l,
-        input: o[l],
-        message: `Unknown dataOptions key '${l}'.${b}`
+  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 c = n ? In(n) : void 0;
+  const c = n ? Gn(n) : void 0;
   if (c) {
-    for (const l of a)
-      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && fe.has(l)) {
-        const d = R(l, [...c.validAxes], (m) => m), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "", g = [...c.validAxes].join(", ");
+    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(", ");
         r.push({
-          category: "dataOptions",
-          index: l,
-          input: o[l],
-          message: `Axis '${l}' is not valid for chart type '${n}'. Valid axes: ${g}.${b}`
+          path: D(d),
+          input: o[d],
+          message: `Axis '${d}' is not valid for chart type '${n}'. Valid axes: ${b}.${h}`
         });
       }
-    for (const l of c.requiredAxes)
-      [...u.values()].includes(l) || (!(l in o) || o[l] == null) && r.push({
-        category: "dataOptions",
-        index: l,
+    for (const d of c.requiredAxes)
+      [...u.values()].includes(d) || (!(d in o) || o[d] == null) && r.push({
+        path: D(d),
         input: null,
         message: `Chart type '${n}' requires '${c.requiredAxes.join(
           "' and '"
-        )}'. Missing: ${l}.`
+        )}'. Missing: ${d}.`
       });
     n === "indicator" && (["value", "secondary", "min", "max"].some(
-      (b) => b in o && o[b] != null
+      (h) => h in o && o[h] != null
     ) || r.push({
-      category: "dataOptions",
-      index: -1,
+      path: D(-1),
       input: e,
       message: "Indicator chart requires at least one of: value, secondary, min, max."
     })), n === "scatter" && ("x" in e && e.x != null || "y" in e && e.y != null || r.push({
-      category: "dataOptions",
-      index: -1,
+      path: D(-1),
       input: e,
       message: "Scatter chart requires at least one of: x, y."
     }));
   }
   if (r.length > i)
     return null;
-  const p = Object.entries(e);
-  for (const [l, d] of p) {
-    if (!d) continue;
-    if (l === "seriesToColorMap") {
-      s[l] = d;
+  const g = Object.entries(e);
+  for (const [d, m] of g) {
+    if (!m) continue;
+    if (d === "seriesToColorMap") {
+      s[d] = m;
       continue;
     }
-    if (l === "columns") {
-      s[l] = Un(
-        _t(d),
+    if (d === "columns") {
+      s[d] = ri(
+        tr(m),
         t,
         r,
-        he("columns")
+        $e("columns")
       );
       continue;
     }
-    const b = Pn(l, d, n) ? "dimension" : "measure", g = re(
-      l,
+    const h = Yn(d, m, n) ? "dimension" : "measure", b = ce(
       d,
-      b,
+      m,
+      h,
       t,
       r
     );
-    if (g !== null) {
-      const m = n === "calendar-heatmap" && l === "value";
-      s[l] = m || !Array.isArray(d) ? g[0] : g;
+    if (b !== null) {
+      const p = n === "calendar-heatmap" && d === "value";
+      s[d] = p || !Array.isArray(m) ? b[0] : b;
     }
   }
   return r.length > i ? null : s;
 }
-function Vn(e) {
+function ni(e) {
   if (typeof e != "string") return "iqr";
   const t = e.split("/")[1];
   return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
 }
-const si = (e) => {
-  var m;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = kn(t);
+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 = xe(n), c = [];
-  let p = _n(
+  const a = i.chartType, u = re(n), c = [];
+  let g = si(
     i.dataOptions,
     { dataSource: s, schemaIndex: u, chartType: a },
     c
   );
-  if (a === "boxplot" && p) {
-    const A = Vn((m = i.styleOptions) == null ? void 0 : m.subtype), C = A === "iqr" || A === "standardDeviation";
-    p = w(y({}, p), { boxType: A, outliersEnabled: C });
+  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 });
   }
-  let l = null;
-  i.filters && i.filters.length > 0 && (l = F(
-    () => Me({
+  let d = null;
+  i.filters && i.filters.length > 0 && (d = A(
+    () => se({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
   ));
-  let d = null;
-  if (i.highlights && i.highlights.length > 0 && (d = F(
-    () => Ne({
+  let m = null;
+  if (i.highlights && i.highlights.length > 0 && (m = A(
+    () => me({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
     c
-  )), c.length > 0 || p === null)
+  )), c.length > 0 || g === null)
     return {
       success: !1,
       errors: c
     };
-  if (!Ut(i.chartType))
+  if (!Qt(i.chartType))
     return {
       success: !1,
       errors: [
         {
-          category: "chartType",
-          index: -1,
+          path: "chartType",
           input: i.chartType,
           message: "Invalid chartType"
         }
       ]
     };
-  const b = i.chartType;
+  const h = i.chartType;
   return {
     success: !0,
-    data: y(y(y({
-      dataSet: Ae(s),
-      chartType: b,
-      dataOptions: p
+    data: l(l(l({
+      dataSet: le(s),
+      chartType: h,
+      dataOptions: g
     }, i.styleOptions && {
       // Pass-through NLQ JSON; shape matches ChartStyleOptions.
       styleOptions: i.styleOptions
-    }), l && { filters: l }), d && { highlights: d })
+    }), d && { filters: d }), m && { highlights: m })
   };
-}, ni = (e) => {
+}, oi = (e) => {
   const t = [];
   if (!e.chartType)
     return {
       success: !1,
       errors: [
         {
-          category: "dimensions",
-          index: -1,
+          path: "chartType",
           input: e,
           message: "chartType is required"
         }
@@ -3629,35 +3648,34 @@ const si = (e) => {
       success: !1,
       errors: [
         {
-          category: "dimensions",
-          index: -1,
+          path: "dataOptions",
           input: e,
           message: "dataOptions is required"
         }
       ]
     };
   let r = null;
-  const s = Wn(e.dataOptions);
+  const s = ai(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
-    const u = F(
-      () => ve(e.filters),
+    const a = A(
+      () => ne(e.filters),
       t
     );
-    n = u != null ? u : void 0;
+    n = a != null ? a : void 0;
   }
   let i;
   if (e.highlights && e.highlights.length > 0) {
-    const u = F(
-      () => Ie(e.highlights),
+    const a = A(
+      () => ge(e.highlights),
       t
     );
-    i = u != null ? u : void 0;
+    i = a != null ? a : void 0;
   }
   if (t.length > 0 || r === null)
     return { success: !1, errors: t };
-  const o = y(y(y({
+  const o = l(l(l({
     chartType: e.chartType,
     dataOptions: r
   }, e.styleOptions && {
@@ -3665,12 +3683,10 @@ const si = (e) => {
   }), n && n.length > 0 && { filters: n }), i && i.length > 0 && { highlights: i });
   return {
     success: !0,
-    data: Q(
-      o
-    )
+    data: B(o)
   };
 };
-function Wn(e) {
+function ai(e) {
   const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
   for (const [n, i] of Object.entries(e)) {
     if (n === "seriesToColorMap" && i) {
@@ -3682,13 +3698,16 @@ function Wn(e) {
       continue;
     }
     const o = Array.isArray(i) ? i : [i], a = Array.isArray(i), u = [], c = [];
-    for (let p = 0; p < o.length; p++) {
-      const l = o[p], b = jn(l) ? Re([
-        l
-      ]) : Pe([l]);
-      b.success ? u.push(...b.data) : b.errors.forEach((g) => {
-        var m;
-        c.push(w(y({}, g), { index: p, input: (m = g.input) != null ? m : l }));
+    for (let g = 0; g < o.length; g++) {
+      const d = o[g], h = ui(d) ? Ue([
+        d
+      ]) : _e([d]);
+      h.success ? u.push(...h.data) : h.errors.forEach((b) => {
+        var p;
+        c.push(F(l({}, b), {
+          path: D(n, g),
+          input: (p = b.input) != null ? p : d
+        }));
       });
     }
     if (c.length > 0) {
@@ -3699,11 +3718,11 @@ function Wn(e) {
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function jn(e) {
+function ui(e) {
   const t = Array.isArray(e) ? e[0] : e;
-  if (!t || !S(t))
+  if (!t || !O(t))
     return !0;
-  const r = "column" in t && t.column != null && S(t.column) ? t.column : t;
+  const r = "column" in t && t.column != null && O(t.column) ? t.column : t;
   if ("composeCode" in r) {
     const s = r.composeCode;
     if (typeof s == "string" && s.startsWith("DM."))
@@ -3718,41 +3737,38 @@ function jn(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const et = ["rows", "columns", "values", "grandTotals"];
-function Kn(e) {
-  if (!S(e)) return !1;
+const at = ["rows", "columns", "values", "grandTotals"];
+function ci(e) {
+  if (!O(e)) return !1;
   const t = Object.keys(e);
   return t.every((r) => r === "rows" || r === "columns") && t.every((r) => typeof e[r] == "boolean");
 }
-function Gn(e) {
+function li(e) {
   const t = [], r = {
     dataOptions: {}
   };
-  if (!S(e))
+  if (!O(e))
     return t.push({
-      category: "dataOptions",
-      index: -1,
+      path: "dataOptions",
       input: e,
       message: "Expected an object"
     }), { normalized: r, errors: t };
   const s = e.dataOptions;
   if (s === void 0) {
-    const n = Object.keys(e), i = R("dataOptions", n, (u) => u), o = i && i.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", a = i && i.distance <= x ? { [i.best]: e[i.best] } : e;
+    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;
     t.push({
-      category: "dataOptions",
-      index: -1,
+      path: "dataOptions",
       input: a,
       message: `dataOptions is required.${o}`
     });
-  } else if (S(s)) {
+  } else if (O(s)) {
     const n = s;
     r.dataOptions = n;
     for (const o of Object.keys(n))
-      if (!et.includes(o)) {
-        const a = R(o, [...et], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
+      if (!at.includes(o)) {
+        const a = x(o, [...at], (c) => c), u = a && a.distance <= T ? ` Did you mean '${a.best}'?` : "";
         t.push({
-          category: "dataOptions",
-          index: o,
+          path: D(o),
           input: n[o],
           message: `Unknown dataOptions key '${o}'. Valid keys: rows, columns, values, grandTotals.${u}`
         });
@@ -3760,33 +3776,30 @@ function Gn(e) {
     for (const o of ["rows", "columns", "values"]) {
       const a = n[o];
       a != null && !Array.isArray(a) && t.push({
-        category: "dataOptions",
-        index: o,
+        path: D(o),
         input: a,
         message: `dataOptions.${o} must be an array`
       });
     }
     const i = n.grandTotals;
-    i != null && !Kn(i) && t.push({
-      category: "dataOptions",
-      index: "grandTotals",
+    i != null && !ci(i) && t.push({
+      path: D("grandTotals"),
       input: i,
       message: "grandTotals must be an object with optional rows?: boolean, columns?: boolean"
     });
   }
   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 Yn(e, t, r) {
+function di(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
-      category: "dataOptions",
-      index: -1,
+      path: D(-1),
       input: e,
       message: "dataOptions is required"
     }), null;
   const s = {}, n = r.length;
   for (const o of ["rows", "columns"]) {
-    const a = re(
+    const a = ce(
       o,
       e[o],
       "dimension",
@@ -3795,7 +3808,7 @@ function Yn(e, t, r) {
     );
     a && (s[o] = a);
   }
-  const i = re(
+  const i = ce(
     "values",
     e.values,
     "measure",
@@ -3804,26 +3817,26 @@ function Yn(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const ii = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Gn(t);
+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 = xe(n), u = [], c = Yn(
+  const a = re(n), u = [], c = di(
     i.dataOptions,
     { dataSource: s, schemaIndex: a },
     u
   );
-  let p = null;
-  i.filters && i.filters.length > 0 && (p = F(
-    () => Me({
+  let g = null;
+  i.filters && i.filters.length > 0 && (g = A(
+    () => se({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: a }
     }),
     u
   ));
-  let l = null;
-  return i.highlights && i.highlights.length > 0 && (l = F(
-    () => Ne({
+  let d = null;
+  return i.highlights && i.highlights.length > 0 && (d = A(
+    () => me({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: a }
     }),
@@ -3833,69 +3846,353 @@ const ii = (e) => {
     errors: u
   } : {
     success: !0,
-    data: y(y(y({
-      dataSet: Ae(s),
+    data: l(l(l({
+      dataSet: le(s),
       dataOptions: c
-    }, i.styleOptions && { styleOptions: i.styleOptions }), p && { filters: p }), l && { highlights: l })
+    }, i.styleOptions && { styleOptions: i.styleOptions }), g && { filters: g }), d && { highlights: d })
   };
-}, oi = (e) => {
+}, pi = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
       success: !1,
       errors: [
         {
-          category: "dataOptions",
-          index: -1,
+          path: "dataOptions",
           input: e,
           message: "dataOptions is required"
         }
       ]
     };
   const r = e.dataOptions, s = {};
-  for (const c of ["rows", "columns"]) {
-    const p = r[c];
-    if (p && p.length > 0) {
-      const l = Ze(c, p, "dimension");
-      l.success ? s[c] = l.data : t.push(...l.errors);
+  for (const u of ["rows", "columns"]) {
+    const c = r[u];
+    if (c && c.length > 0) {
+      const g = ot(u, c, "dimension");
+      g.success ? s[u] = g.data : t.push(...g.errors);
     }
   }
   const n = r.values;
   if (n && n.length > 0) {
-    const c = Ze("values", n, "measure");
-    c.success ? s.values = c.data : t.push(...c.errors);
+    const u = ot("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 c = F(
-      () => ve(e.filters),
+    const u = A(
+      () => ne(e.filters),
       t
     );
-    i = c != null ? c : void 0;
+    i = u != null ? u : void 0;
   }
   let o;
   if (e.highlights && e.highlights.length > 0) {
-    const c = F(
-      () => Ie(e.highlights),
+    const u = A(
+      () => ge(e.highlights),
       t
     );
-    o = c != null ? c : void 0;
+    o = u != null ? u : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const a = y(y(y({
+  const a = l(l(l({
     dataOptions: s
   }, e.styleOptions && { styleOptions: e.styleOptions }), i && i.length > 0 && { filters: i }), o && o.length > 0 && { highlights: o });
   return {
     success: !0,
-    data: Q(
-      a
-    )
+    data: B(a)
+  };
+}, 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 }),
+    i
+  ) : void 0, a = t && t.length > 0 ? A(
+    () => me({ 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 })
+  };
+}, gi = [
+  "widgetType",
+  "id",
+  "title",
+  "description",
+  "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 ? {
+    success: !0,
+    data: s(d.data, {
+      id: n,
+      title: i,
+      description: o,
+      dataSource: a,
+      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), {
+    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 && {
+    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), {
+    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))
+    return {
+      path: "widgetType",
+      input: e,
+      message: "Expected an object"
+    };
+  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}')` : "";
+    return {
+      path: "widgetType",
+      input: s && s.distance <= T ? { [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(", ");
+    return {
+      path: "widgetType",
+      input: t,
+      message: `Invalid widgetType '${String(
+        t
+      )}'. Valid types: ${n}${s}`
+    };
+  }
+  return null;
+}
+const Fi = (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);
+  if (s)
+    return { success: !1, errors: [s] };
+  if (!Ai(t))
+    return { success: !1, errors: [Fi(t)] };
+  switch (t.widgetType) {
+    case "chart":
+      return ut(
+        t,
+        r,
+        ii,
+        yi
+      );
+    case "pivot":
+      return ut(
+        t,
+        r,
+        fi,
+        hi
+      );
+    case "text":
+      return { success: !0, data: l({
+        widgetType: "text",
+        id: t.id,
+        styleOptions: t.styleOptions
+      }, t.config !== void 0 && { config: t.config }) };
+    case "custom": {
+      const {
+        id: n,
+        customWidgetType: i,
+        title: o,
+        description: a,
+        dataSource: u,
+        config: c,
+        filters: g,
+        highlights: d,
+        dataOptions: m,
+        styleOptions: h,
+        customOptions: b
+      } = t, p = mi(g, d, r);
+      return p.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;
+    }
+    default:
+      return {
+        success: !1,
+        errors: [
+          {
+            path: "widgetType",
+            input: t,
+            message: `Unknown widgetType: ${String(
+              t.widgetType
+            )}`
+          }
+        ]
+      };
+  }
+}, Ti = (e) => {
+  const { widgetType: t } = e;
+  switch (t) {
+    case "chart": {
+      const r = oi(e);
+      if (!r.success) return r;
+      const s = l(l(l(l(l(F(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)
+      }), e.config !== void 0 && { config: e.config }), e.highlightSelectionDisabled !== void 0 && {
+        highlightSelectionDisabled: e.highlightSelectionDisabled
+      });
+      return {
+        success: !0,
+        data: B(s)
+      };
+    }
+    case "pivot": {
+      const r = pi(e);
+      if (!r.success) return r;
+      const s = l(l(l(l(F(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)
+      }), e.config !== void 0 && { config: e.config });
+      return {
+        success: !0,
+        data: B(s)
+      };
+    }
+    case "text":
+      return { success: !0, data: l({
+        widgetType: "text",
+        id: e.id,
+        styleOptions: e.styleOptions
+      }, e.config !== void 0 && { config: e.config }) };
+    case "custom": {
+      const r = [], s = e.filters !== void 0 ? A(
+        () => ne(e.filters),
+        r
+      ) : void 0, n = e.highlights !== void 0 ? A(
+        () => ge(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({
+        widgetType: "custom",
+        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)
+      }), 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 && {
+        customOptions: e.customOptions
+      }), s && s.length > 0 && {
+        filters: s
+      }), n && n.length > 0 && {
+        highlights: n
+      }) };
+    }
+    default:
+      return {
+        success: !1,
+        errors: [
+          {
+            path: "widgetType",
+            input: e,
+            message: `Unknown widgetType: ${String(t)}`
+          }
+        ]
+      };
+  }
+}, Ni = (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 });
+    if (!c.success) {
+      s.push(
+        ...er(c.errors, Zt(u))
+      );
+      return;
+    }
+    n.push(c.data);
+  }) : s.push({
+    path: "widgets",
+    input: t.widgets,
+    message: "Invalid dashboard JSON. Expected widgets to be an array."
+  });
+  let i = null;
+  if (t.filters && t.filters.length > 0) {
+    const a = re(r.tables);
+    i = A(
+      () => se({
+        data: t.filters,
+        context: { dataSource: r.dataSource, schemaIndex: a }
+      }),
+      s
+    );
+  }
+  return s.length > 0 ? { success: !1, errors: s } : { success: !0, data: l(l(l(l(l(l(l(l({
+    widgets: n
+  }, t.id !== void 0 && { id: t.id }), t.title !== void 0 && { title: t.title }), i !== null && { filters: i }), t.layoutOptions !== void 0 && {
+    layoutOptions: t.layoutOptions
+  }), t.config !== void 0 && { config: t.config }), t.defaultDataSource !== void 0 && {
+    defaultDataSource: t.defaultDataSource
+  }), t.styleOptions !== void 0 && { styleOptions: t.styleOptions }), t.widgetsOptions !== void 0 && {
+    widgetsOptions: t.widgetsOptions
+  }) };
+}, Mi = (e) => {
+  const t = [], r = [];
+  e.widgets.forEach((o, a) => {
+    const u = Ti(o);
+    if (!u.success) {
+      t.push(
+        ...er(u.errors, Zt(a))
+      );
+      return;
+    }
+    r.push(u.data);
+  });
+  let s;
+  if (e.filters) {
+    const o = A(
+      () => ne(e.filters),
+      t
+    );
+    s = o != null ? o : 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({
+    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)
+  }), e.styleOptions !== void 0 && { styleOptions: e.styleOptions }), n !== void 0 && { widgetsOptions: n });
+  return {
+    success: !0,
+    data: B(i)
   };
 };
-function Jn(e) {
-  const { filters: t, relations: r } = _r(
+function Si(e) {
+  const { filters: t, relations: r } = es(
     e.filters || []
   );
   return {
@@ -3908,23 +4205,27 @@ function Jn(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function ai(e, t, r = !1) {
-  const s = Jn(e), n = Lr(s, t);
-  return Ur(n, r);
+function Ri(e, t, r = !1) {
+  const s = Si(e), n = Xr(s, t);
+  return Zr(n, r);
 }
 export {
-  ei as CustomSuperJSON,
-  li as EMPTY_EXPANDED_QUERY_MODEL,
-  fi as EMPTY_SIMPLE_QUERY_MODEL,
-  di as isByIdDashboardCodeParams,
-  mi as isByIdWidgetCodeParams,
-  pi as isClientSideDashboardCodeParams,
-  gi as isClientSideWidgetCodeParams,
-  si as translateChartFromJSON,
-  ni as translateChartToJSON,
-  ii as translatePivotTableFromJSON,
-  oi as translatePivotTableToJSON,
-  ti as translateQueryFromJSON,
-  ri as translateQueryToJSON,
-  ai as translateQueryToJaql
+  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
 };