@sisense/sdk-ui 2.21.0 → 2.23.0

package/dist/analytics-composer/node.js

@@ -1,186 +1,193 @@
-var Xe = Object.defineProperty, ve = Object.defineProperties;
-var er = Object.getOwnPropertyDescriptors;
-var pe = Object.getOwnPropertySymbols;
-var rr = Object.prototype.hasOwnProperty, tr = Object.prototype.propertyIsEnumerable;
-var ye = (e, r, t) => r in e ? Xe(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, p = (e, r) => {
-  for (var t in r || (r = {}))
-    rr.call(r, t) && ye(e, t, r[t]);
-  if (pe)
-    for (var t of pe(r))
-      tr.call(r, t) && ye(e, t, r[t]);
+var zt = Object.defineProperty, Pt = Object.defineProperties;
+var Lt = Object.getOwnPropertyDescriptors;
+var ze = Object.getOwnPropertySymbols;
+var _t = Object.prototype.hasOwnProperty, Ut = Object.prototype.propertyIsEnumerable;
+var Pe = (e, t, r) => t in e ? zt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, g = (e, t) => {
+  for (var r in t || (t = {}))
+    _t.call(t, r) && Pe(e, r, t[r]);
+  if (ze)
+    for (var r of ze(t))
+      Ut.call(t, r) && Pe(e, r, t[r]);
   return e;
-}, b = (e, r) => ve(e, er(r));
-import { f as sr, J as nr } from "../types-Ockb-LJ0.js";
-import { b as _s, E as Us, a as Ws, i as js, e as Js, d as Gs } from "../types-Ockb-LJ0.js";
-import { bW as ir, bA as or, bX as ar, bY as ur, bZ as cr, aw as se, b_ as lr, av as fr, b$ as dr, b8 as mr, ax as pr, c0 as yr, bb as gr, b9 as hr, aL as br, b7 as Fr, ba as wr, d as qr, c as Er, k as Cr, c1 as $r, c2 as Ar, c3 as xr, c4 as Dr, c5 as Mr, c6 as Sr, c7 as Tr, c8 as Nr, c9 as Rr, ca as Or, cb as Ir, au as zr, cc as Pr, cd as Br, S as ne, h as kr, s as ie, b as U, M as O, ce as Ee, bG as Ce, cf as Lr, cg as Vr, ch as _r, ci as Ur, cj as Wr, aH as jr, an as ge, am as Jr, ck as $e, a7 as Gr, cl as Kr, y as Qr, x as Yr } from "../execute-query-B21bnb05.js";
-import { i as Hr, b as Zr, D as Xr, d as vr, a as et } from "../dimensions-DuUqQgpi.js";
-class rt {
+}, F = (e, t) => Pt(e, Lt(t));
+import { f as jt, J as Vt } from "../types-B96nVbgX.js";
+import { b as ri, E as si, a as ni, i as ii, e as oi, d as ai } from "../types-B96nVbgX.js";
+import { cb as Wt, bK as Kt, cc as Jt, cd as Yt, ce as Gt, aG as be, cf as Qt, aF as Ht, cg as Xt, bi as Zt, aH as er, ch as tr, bl as rr, bj as sr, aV as nr, bh as ir, bk as or, d as ar, c as ur, k as cr, ci as lr, cj as fr, ck as dr, cl as mr, cm as pr, cn as yr, co as gr, cp as hr, cq as br, cr as Fr, cs as wr, aE as qr, ct as Ar, cu as Cr, S as B, t as H, h as Er, b as $, av as _, at as te, cv as xr, cw as $r, cx as Tr, M as L, cy as Dr, cz as Sr, aR as Or, ax as Le, aw as Fe, bQ as re, U as Mr, V as vr, cA as tt, ag as Nr, A as Rr, cB as Ir, y as kr, x as Br } from "../execute-query-CHYTupEo.js";
+import { i as zr, b as Pr, D as Lr, d as _r, a as Ur } from "../dimensions-C0BmtTH2.js";
+function jr(e, t) {
+  const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, o) => Array.from({ length: s + 1 }, (a, u) => o === 0 ? u : u === 0 ? o : 0));
+  for (let i = 1; i <= r; i++)
+    for (let o = 1; o <= s; o++)
+      n[i][o] = Math.min(n[i - 1][o] + 1, n[i][o - 1] + 1, n[i - 1][o - 1] + (e[i - 1] === t[o - 1] ? 0 : 1));
+  return n[r][s];
+}
+class Vr {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
-  set(r, t) {
-    this.keyToValue.set(r, t), this.valueToKey.set(t, r);
+  set(t, r) {
+    this.keyToValue.set(t, r), this.valueToKey.set(r, t);
   }
-  getByKey(r) {
-    return this.keyToValue.get(r);
+  getByKey(t) {
+    return this.keyToValue.get(t);
   }
-  getByValue(r) {
-    return this.valueToKey.get(r);
+  getByValue(t) {
+    return this.valueToKey.get(t);
   }
   clear() {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class Ae {
-  constructor(r) {
-    this.generateIdentifier = r, this.kv = new rt();
+class rt {
+  constructor(t) {
+    this.generateIdentifier = t, this.kv = new Vr();
   }
-  register(r, t) {
-    this.kv.getByValue(r) || (t || (t = this.generateIdentifier(r)), this.kv.set(t, r));
+  register(t, r) {
+    this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
   }
   clear() {
     this.kv.clear();
   }
-  getIdentifier(r) {
-    return this.kv.getByValue(r);
+  getIdentifier(t) {
+    return this.kv.getByValue(t);
   }
-  getValue(r) {
-    return this.kv.getByKey(r);
+  getValue(t) {
+    return this.kv.getByKey(t);
   }
 }
-class tt extends Ae {
+class Wr extends rt {
   constructor() {
-    super((r) => r.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
+    super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
-  register(r, t) {
-    typeof t == "object" ? (t.allowProps && this.classToAllowedProps.set(r, t.allowProps), super.register(r, t.identifier)) : super.register(r, t);
+  register(t, r) {
+    typeof r == "object" ? (r.allowProps && this.classToAllowedProps.set(t, r.allowProps), super.register(t, r.identifier)) : super.register(t, r);
   }
-  getAllowedProps(r) {
-    return this.classToAllowedProps.get(r);
+  getAllowedProps(t) {
+    return this.classToAllowedProps.get(t);
   }
 }
-function st(e) {
+function Kr(e) {
   if ("values" in Object)
     return Object.values(e);
-  const r = [];
-  for (const t in e)
-    e.hasOwnProperty(t) && r.push(e[t]);
-  return r;
+  const t = [];
+  for (const r in e)
+    e.hasOwnProperty(r) && t.push(e[r]);
+  return t;
 }
-function nt(e, r) {
-  const t = st(e);
-  if ("find" in t)
-    return t.find(r);
-  const s = t;
+function Jr(e, t) {
+  const r = Kr(e);
+  if ("find" in r)
+    return r.find(t);
+  const s = r;
   for (let n = 0; n < s.length; n++) {
-    const o = s[n];
-    if (r(o))
-      return o;
+    const i = s[n];
+    if (t(i))
+      return i;
   }
 }
-function I(e, r) {
-  Object.entries(e).forEach(([t, s]) => r(s, t));
+function U(e, t) {
+  Object.entries(e).forEach(([r, s]) => t(s, r));
 }
-function W(e, r) {
-  return e.indexOf(r) !== -1;
+function Z(e, t) {
+  return e.indexOf(t) !== -1;
 }
-function he(e, r) {
-  for (let t = 0; t < e.length; t++) {
-    const s = e[t];
-    if (r(s))
+function _e(e, t) {
+  for (let r = 0; r < e.length; r++) {
+    const s = e[r];
+    if (t(s))
       return s;
   }
 }
-class it {
+class Yr {
   constructor() {
     this.transfomers = {};
   }
-  register(r) {
-    this.transfomers[r.name] = r;
+  register(t) {
+    this.transfomers[t.name] = t;
   }
-  findApplicable(r) {
-    return nt(this.transfomers, (t) => t.isApplicable(r));
+  findApplicable(t) {
+    return Jr(this.transfomers, (r) => r.isApplicable(t));
   }
-  findByName(r) {
-    return this.transfomers[r];
+  findByName(t) {
+    return this.transfomers[t];
   }
 }
-const ot = (e) => Object.prototype.toString.call(e).slice(8, -1), xe = (e) => typeof e == "undefined", at = (e) => e === null, B = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Z = (e) => B(e) && Object.keys(e).length === 0, D = (e) => Array.isArray(e), ut = (e) => typeof e == "string", ct = (e) => typeof e == "number" && !isNaN(e), lt = (e) => typeof e == "boolean", ft = (e) => e instanceof RegExp, k = (e) => e instanceof Map, L = (e) => e instanceof Set, De = (e) => ot(e) === "Symbol", dt = (e) => e instanceof Date && !isNaN(e.valueOf()), mt = (e) => e instanceof Error, be = (e) => typeof e == "number" && isNaN(e), pt = (e) => lt(e) || at(e) || xe(e) || ct(e) || ut(e) || De(e), yt = (e) => typeof e == "bigint", gt = (e) => e === 1 / 0 || e === -1 / 0, ht = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), bt = (e) => e instanceof URL, Me = (e) => e.replace(/\./g, "\\."), Q = (e) => e.map(String).map(Me).join("."), P = (e) => {
-  const r = [];
-  let t = "";
+const Gr = (e) => Object.prototype.toString.call(e).slice(8, -1), st = (e) => typeof e == "undefined", Qr = (e) => e === null, K = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, fe = (e) => K(e) && Object.keys(e).length === 0, R = (e) => Array.isArray(e), Hr = (e) => typeof e == "string", Xr = (e) => typeof e == "number" && !isNaN(e), Zr = (e) => typeof e == "boolean", es = (e) => e instanceof RegExp, J = (e) => e instanceof Map, Y = (e) => e instanceof Set, nt = (e) => Gr(e) === "Symbol", ts = (e) => e instanceof Date && !isNaN(e.valueOf()), rs = (e) => e instanceof Error, Ue = (e) => typeof e == "number" && isNaN(e), ss = (e) => Zr(e) || Qr(e) || st(e) || Xr(e) || Hr(e) || nt(e), ns = (e) => typeof e == "bigint", is = (e) => e === 1 / 0 || e === -1 / 0, os = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), as = (e) => e instanceof URL, it = (e) => e.replace(/\./g, "\\."), ae = (e) => e.map(String).map(it).join("."), W = (e) => {
+  const t = [];
+  let r = "";
   for (let n = 0; n < e.length; n++) {
-    let o = e.charAt(n);
-    if (o === "\\" && e.charAt(n + 1) === ".") {
-      t += ".", n++;
+    let i = e.charAt(n);
+    if (i === "\\" && e.charAt(n + 1) === ".") {
+      r += ".", n++;
       continue;
     }
-    if (o === ".") {
-      r.push(t), t = "";
+    if (i === ".") {
+      t.push(r), r = "";
       continue;
     }
-    t += o;
+    r += i;
   }
-  const s = t;
-  return r.push(s), r;
+  const s = r;
+  return t.push(s), t;
 };
-function $(e, r, t, s) {
+function v(e, t, r, s) {
   return {
     isApplicable: e,
-    annotation: r,
-    transform: t,
+    annotation: t,
+    transform: r,
     untransform: s
   };
 }
-const Se = [
-  $(xe, "undefined", () => null, () => {
+const ot = [
+  v(st, "undefined", () => null, () => {
   }),
-  $(yt, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  $(dt, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  $(mt, "Error", (e, r) => {
-    const t = {
+  v(ns, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  v(ts, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  v(rs, "Error", (e, t) => {
+    const r = {
       name: e.name,
       message: e.message
     };
-    return r.allowedErrorProps.forEach((s) => {
-      t[s] = e[s];
-    }), t;
-  }, (e, r) => {
-    const t = new Error(e.message);
-    return t.name = e.name, t.stack = e.stack, r.allowedErrorProps.forEach((s) => {
-      t[s] = e[s];
-    }), t;
+    return t.allowedErrorProps.forEach((s) => {
+      r[s] = e[s];
+    }), r;
+  }, (e, t) => {
+    const r = new Error(e.message);
+    return r.name = e.name, r.stack = e.stack, t.allowedErrorProps.forEach((s) => {
+      r[s] = e[s];
+    }), r;
   }),
-  $(ft, "regexp", (e) => "" + e, (e) => {
-    const r = e.slice(1, e.lastIndexOf("/")), t = e.slice(e.lastIndexOf("/") + 1);
-    return new RegExp(r, t);
+  v(es, "regexp", (e) => "" + e, (e) => {
+    const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
+    return new RegExp(t, r);
   }),
-  $(
-    L,
+  v(
+    Y,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  $(k, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  $((e) => be(e) || gt(e), "number", (e) => be(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
-  $((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  $(bt, "URL", (e) => e.toString(), (e) => new URL(e))
+  v(J, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  v((e) => Ue(e) || is(e), "number", (e) => Ue(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  v((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  v(as, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function j(e, r, t, s) {
+function se(e, t, r, s) {
   return {
     isApplicable: e,
-    annotation: r,
-    transform: t,
+    annotation: t,
+    transform: r,
     untransform: s
   };
 }
-const Te = j((e, r) => De(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
-  const s = t.symbolRegistry.getValue(r[1]);
+const at = se((e, t) => nt(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+  const s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), Ft = [
+}), us = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -190,124 +197,124 @@ const Te = j((e, r) => De(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, r) => (e[r.name] = r, e), {}), Ne = j(ht, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
-  const t = Ft[r[1]];
-  if (!t)
+].reduce((e, t) => (e[t.name] = t, e), {}), ut = se(os, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
+  const r = us[t[1]];
+  if (!r)
     throw new Error("Trying to deserialize unknown typed array");
-  return new t(e);
+  return new r(e);
 });
-function Re(e, r) {
-  return e != null && e.constructor ? !!r.classRegistry.getIdentifier(e.constructor) : !1;
+function ct(e, t) {
+  return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const Oe = j(Re, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
-  const t = r.classRegistry.getAllowedProps(e.constructor);
-  if (!t)
-    return p({}, e);
+const lt = se(ct, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+  const r = t.classRegistry.getAllowedProps(e.constructor);
+  if (!r)
+    return g({}, e);
   const s = {};
-  return t.forEach((n) => {
+  return r.forEach((n) => {
     s[n] = e[n];
   }), s;
-}, (e, r, t) => {
-  const s = t.classRegistry.getValue(r[1]);
+}, (e, t, r) => {
+  const s = r.classRegistry.getValue(t[1]);
   if (!s)
-    throw new Error(`Trying to deserialize unknown class '${r[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
+    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);
-}), Ie = j((e, r) => !!r.customTransformerRegistry.findApplicable(e), (e, r) => ["custom", r.customTransformerRegistry.findApplicable(e).name], (e, r) => r.customTransformerRegistry.findApplicable(e).serialize(e), (e, r, t) => {
-  const s = t.customTransformerRegistry.findByName(r[1]);
+}), ft = se((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
+  const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
-}), wt = [Oe, Te, Ie, Ne], Fe = (e, r) => {
-  const t = he(wt, (n) => n.isApplicable(e, r));
-  if (t)
+}), cs = [lt, at, ft, ut], je = (e, t) => {
+  const r = _e(cs, (n) => n.isApplicable(e, t));
+  if (r)
     return {
-      value: t.transform(e, r),
-      type: t.annotation(e, r)
+      value: r.transform(e, t),
+      type: r.annotation(e, t)
     };
-  const s = he(Se, (n) => n.isApplicable(e, r));
+  const s = _e(ot, (n) => n.isApplicable(e, t));
   if (s)
     return {
-      value: s.transform(e, r),
+      value: s.transform(e, t),
       type: s.annotation
     };
-}, ze = {};
-Se.forEach((e) => {
-  ze[e.annotation] = e;
+}, dt = {};
+ot.forEach((e) => {
+  dt[e.annotation] = e;
 });
-const qt = (e, r, t) => {
-  if (D(r))
-    switch (r[0]) {
+const ls = (e, t, r) => {
+  if (R(t))
+    switch (t[0]) {
       case "symbol":
-        return Te.untransform(e, r, t);
+        return at.untransform(e, t, r);
       case "class":
-        return Oe.untransform(e, r, t);
+        return lt.untransform(e, t, r);
       case "custom":
-        return Ie.untransform(e, r, t);
+        return ft.untransform(e, t, r);
       case "typed-array":
-        return Ne.untransform(e, r, t);
+        return ut.untransform(e, t, r);
       default:
-        throw new Error("Unknown transformation: " + r);
+        throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = ze[r];
+    const s = dt[t];
     if (!s)
-      throw new Error("Unknown transformation: " + r);
-    return s.untransform(e, t);
+      throw new Error("Unknown transformation: " + t);
+    return s.untransform(e, r);
   }
-}, R = (e, r) => {
-  if (r > e.size)
+}, P = (e, t) => {
+  if (t > e.size)
     throw new Error("index out of bounds");
-  const t = e.keys();
-  for (; r > 0; )
-    t.next(), r--;
-  return t.next().value;
+  const r = e.keys();
+  for (; t > 0; )
+    r.next(), t--;
+  return r.next().value;
 };
-function Pe(e) {
-  if (W(e, "__proto__"))
+function mt(e) {
+  if (Z(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (W(e, "prototype"))
+  if (Z(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (W(e, "constructor"))
+  if (Z(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const Et = (e, r) => {
-  Pe(r);
-  for (let t = 0; t < r.length; t++) {
-    const s = r[t];
-    if (L(e))
-      e = R(e, +s);
-    else if (k(e)) {
-      const n = +s, o = +r[++t] == 0 ? "key" : "value", i = R(e, n);
-      switch (o) {
+const fs = (e, t) => {
+  mt(t);
+  for (let r = 0; r < t.length; r++) {
+    const s = t[r];
+    if (Y(e))
+      e = P(e, +s);
+    else if (J(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", o = P(e, n);
+      switch (i) {
         case "key":
-          e = i;
+          e = o;
           break;
         case "value":
-          e = e.get(i);
+          e = e.get(o);
           break;
       }
     } else
       e = e[s];
   }
   return e;
-}, X = (e, r, t) => {
-  if (Pe(r), r.length === 0)
-    return t(e);
+}, de = (e, t, r) => {
+  if (mt(t), t.length === 0)
+    return r(e);
   let s = e;
-  for (let o = 0; o < r.length - 1; o++) {
-    const i = r[o];
-    if (D(s)) {
-      const a = +i;
+  for (let i = 0; i < t.length - 1; i++) {
+    const o = t[i];
+    if (R(s)) {
+      const a = +o;
       s = s[a];
-    } else if (B(s))
-      s = s[i];
-    else if (L(s)) {
-      const a = +i;
-      s = R(s, a);
-    } else if (k(s)) {
-      if (o === r.length - 2)
+    } else if (K(s))
+      s = s[o];
+    else if (Y(s)) {
+      const a = +o;
+      s = P(s, a);
+    } else if (J(s)) {
+      if (i === t.length - 2)
         break;
-      const u = +i, c = +r[++o] == 0 ? "key" : "value", m = R(s, u);
+      const u = +o, c = +t[++i] == 0 ? "key" : "value", m = P(s, u);
       switch (c) {
         case "key":
           s = m;
@@ -318,352 +325,354 @@ const Et = (e, r) => {
       }
     }
   }
-  const n = r[r.length - 1];
-  if (D(s) ? s[+n] = t(s[+n]) : B(s) && (s[n] = t(s[n])), L(s)) {
-    const o = R(s, +n), i = t(o);
-    o !== i && (s.delete(o), s.add(i));
+  const n = t[t.length - 1];
+  if (R(s) ? s[+n] = r(s[+n]) : K(s) && (s[n] = r(s[n])), Y(s)) {
+    const i = P(s, +n), o = r(i);
+    i !== o && (s.delete(i), s.add(o));
   }
-  if (k(s)) {
-    const o = +r[r.length - 2], i = R(s, o);
+  if (J(s)) {
+    const i = +t[t.length - 2], o = P(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
-        const u = t(i);
-        s.set(u, s.get(i)), u !== i && s.delete(i);
+        const u = r(o);
+        s.set(u, s.get(o)), u !== o && s.delete(o);
         break;
       }
       case "value": {
-        s.set(i, t(s.get(i)));
+        s.set(o, r(s.get(o)));
         break;
       }
     }
   }
   return e;
 };
-function v(e, r, t = []) {
+function me(e, t, r = []) {
   if (!e)
     return;
-  if (!D(e)) {
-    I(e, (o, i) => v(o, r, [...t, ...P(i)]));
+  if (!R(e)) {
+    U(e, (i, o) => me(i, t, [...r, ...W(o)]));
     return;
   }
   const [s, n] = e;
-  n && I(n, (o, i) => {
-    v(o, r, [...t, ...P(i)]);
-  }), r(s, t);
+  n && U(n, (i, o) => {
+    me(i, t, [...r, ...W(o)]);
+  }), t(s, r);
 }
-function Ct(e, r, t) {
-  return v(r, (s, n) => {
-    e = X(e, n, (o) => qt(o, s, t));
+function ds(e, t, r) {
+  return me(t, (s, n) => {
+    e = de(e, n, (i) => ls(i, s, r));
   }), e;
 }
-function $t(e, r) {
-  function t(s, n) {
-    const o = Et(e, P(n));
-    s.map(P).forEach((i) => {
-      e = X(e, i, () => o);
+function ms(e, t) {
+  function r(s, n) {
+    const i = fs(e, W(n));
+    s.map(W).forEach((o) => {
+      e = de(e, o, () => i);
     });
   }
-  if (D(r)) {
-    const [s, n] = r;
-    s.forEach((o) => {
-      e = X(e, P(o), () => e);
-    }), n && I(n, t);
+  if (R(t)) {
+    const [s, n] = t;
+    s.forEach((i) => {
+      e = de(e, W(i), () => e);
+    }), n && U(n, r);
   } else
-    I(r, t);
+    U(t, r);
   return e;
 }
-const At = (e, r) => B(e) || D(e) || k(e) || L(e) || Re(e, r);
-function xt(e, r, t) {
-  const s = t.get(e);
-  s ? s.push(r) : t.set(e, [r]);
+const ps = (e, t) => K(e) || R(e) || J(e) || Y(e) || ct(e, t);
+function ys(e, t, r) {
+  const s = r.get(e);
+  s ? s.push(t) : r.set(e, [t]);
 }
-function Dt(e, r) {
-  const t = {};
+function gs(e, t) {
+  const r = {};
   let s;
   return e.forEach((n) => {
     if (n.length <= 1)
       return;
-    r || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
-    const [o, ...i] = n;
-    o.length === 0 ? s = i.map(Q) : t[Q(o)] = i.map(Q);
-  }), s ? Z(t) ? [s] : [s, t] : Z(t) ? void 0 : t;
-}
-const Be = (e, r, t, s, n = [], o = [], i = /* @__PURE__ */ new Map()) => {
-  var g;
-  const a = pt(e);
+    t || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
+    const [i, ...o] = n;
+    i.length === 0 ? s = o.map(ae) : r[ae(i)] = o.map(ae);
+  }), s ? fe(r) ? [s] : [s, r] : fe(r) ? void 0 : r;
+}
+const pt = (e, t, r, s, n = [], i = [], o = /* @__PURE__ */ new Map()) => {
+  var h;
+  const a = ss(e);
   if (!a) {
-    xt(e, n, r);
-    const f = i.get(e);
-    if (f)
+    ys(e, n, t);
+    const p = o.get(e);
+    if (p)
       return s ? {
         transformedValue: null
-      } : f;
+      } : p;
   }
-  if (!At(e, t)) {
-    const f = Fe(e, t), h = f ? {
-      transformedValue: f.value,
-      annotations: [f.type]
+  if (!ps(e, r)) {
+    const p = je(e, r), d = p ? {
+      transformedValue: p.value,
+      annotations: [p.type]
     } : {
       transformedValue: e
     };
-    return a || i.set(e, h), h;
+    return a || o.set(e, d), d;
   }
-  if (W(o, e))
+  if (Z(i, e))
     return {
       transformedValue: null
     };
-  const u = Fe(e, t), c = (g = u == null ? void 0 : u.value) != null ? g : e, m = D(c) ? [] : {}, d = {};
-  I(c, (f, h) => {
-    if (h === "__proto__" || h === "constructor" || h === "prototype")
-      throw new Error(`Detected property ${h}. This is a prototype pollution risk, please remove it from your object.`);
-    const A = Be(f, r, t, s, [...n, h], [...o, e], i);
-    m[h] = A.transformedValue, D(A.annotations) ? d[h] = A.annotations : B(A.annotations) && I(A.annotations, (z, N) => {
-      d[Me(h) + "." + N] = z;
+  const u = je(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, m = R(c) ? [] : {}, l = {};
+  U(c, (p, d) => {
+    if (d === "__proto__" || d === "constructor" || d === "prototype")
+      throw new Error(`Detected property ${d}. This is a prototype pollution risk, please remove it from your object.`);
+    const b = pt(p, t, r, s, [...n, d], [...i, e], o);
+    m[d] = b.transformedValue, R(b.annotations) ? l[d] = b.annotations : K(b.annotations) && U(b.annotations, (A, O) => {
+      l[it(d) + "." + O] = A;
     });
   });
-  const y = Z(d) ? {
+  const f = fe(l) ? {
     transformedValue: m,
     annotations: u ? [u.type] : void 0
   } : {
     transformedValue: m,
-    annotations: u ? [u.type, d] : d
+    annotations: u ? [u.type, l] : l
   };
-  return a || i.set(e, y), y;
+  return a || o.set(e, f), f;
 };
-function ke(e) {
+function yt(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function we(e) {
-  return ke(e) === "Array";
+function Ve(e) {
+  return yt(e) === "Array";
 }
-function Mt(e) {
-  if (ke(e) !== "Object")
+function hs(e) {
+  if (yt(e) !== "Object")
     return !1;
-  const r = Object.getPrototypeOf(e);
-  return !!r && r.constructor === Object && r === Object.prototype;
+  const t = Object.getPrototypeOf(e);
+  return !!t && t.constructor === Object && t === Object.prototype;
 }
-function St(e, r, t, s, n) {
-  const o = {}.propertyIsEnumerable.call(s, r) ? "enumerable" : "nonenumerable";
-  o === "enumerable" && (e[r] = t), n && o === "nonenumerable" && Object.defineProperty(e, r, {
-    value: t,
+function bs(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,
     enumerable: !1,
     writable: !0,
     configurable: !0
   });
 }
-function ee(e, r = {}) {
-  if (we(e))
-    return e.map((n) => ee(n, r));
-  if (!Mt(e))
+function pe(e, t = {}) {
+  if (Ve(e))
+    return e.map((n) => pe(n, t));
+  if (!hs(e))
     return e;
-  const t = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
-  return [...t, ...s].reduce((n, o) => {
-    if (we(r.props) && !r.props.includes(o))
+  const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
+  return [...r, ...s].reduce((n, i) => {
+    if (Ve(t.props) && !t.props.includes(i))
       return n;
-    const i = e[o], a = ee(i, r);
-    return St(n, o, a, e, r.nonenumerable), n;
+    const o = e[i], a = pe(o, t);
+    return bs(n, i, a, e, t.nonenumerable), n;
   }, {});
 }
-class l {
+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: r = !1 } = {}) {
-    this.classRegistry = new tt(), this.symbolRegistry = new Ae((t) => {
+  constructor({ dedupe: t = !1 } = {}) {
+    this.classRegistry = new Wr(), this.symbolRegistry = new rt((r) => {
       var s;
-      return (s = t.description) != null ? s : "";
-    }), this.customTransformerRegistry = new it(), this.allowedErrorProps = [], this.dedupe = r;
+      return (s = r.description) != null ? s : "";
+    }), this.customTransformerRegistry = new Yr(), this.allowedErrorProps = [], this.dedupe = t;
   }
-  serialize(r) {
-    const t = /* @__PURE__ */ new Map(), s = Be(r, t, this, this.dedupe), n = {
+  serialize(t) {
+    const r = /* @__PURE__ */ new Map(), s = pt(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = b(p({}, n.meta), {
+    s.annotations && (n.meta = F(g({}, n.meta), {
       values: s.annotations
     }));
-    const o = Dt(t, this.dedupe);
-    return o && (n.meta = b(p({}, n.meta), {
-      referentialEqualities: o
+    const i = gs(r, this.dedupe);
+    return i && (n.meta = F(g({}, n.meta), {
+      referentialEqualities: i
     })), n;
   }
-  deserialize(r) {
-    const { json: t, meta: s } = r;
-    let n = ee(t);
-    return s != null && s.values && (n = Ct(n, s.values, this)), s != null && s.referentialEqualities && (n = $t(n, s.referentialEqualities)), n;
+  deserialize(t) {
+    const { json: r, meta: s } = t;
+    let n = pe(r);
+    return s != null && s.values && (n = ds(n, s.values, this)), s != null && s.referentialEqualities && (n = ms(n, s.referentialEqualities)), n;
   }
-  stringify(r) {
-    return JSON.stringify(this.serialize(r));
+  stringify(t) {
+    return JSON.stringify(this.serialize(t));
   }
-  parse(r) {
-    return this.deserialize(JSON.parse(r));
+  parse(t) {
+    return this.deserialize(JSON.parse(t));
   }
-  registerClass(r, t) {
-    this.classRegistry.register(r, t);
+  registerClass(t, r) {
+    this.classRegistry.register(t, r);
   }
-  registerSymbol(r, t) {
-    this.symbolRegistry.register(r, t);
+  registerSymbol(t, r) {
+    this.symbolRegistry.register(t, r);
   }
-  registerCustom(r, t) {
-    this.customTransformerRegistry.register(p({
-      name: t
-    }, r));
+  registerCustom(t, r) {
+    this.customTransformerRegistry.register(g({
+      name: r
+    }, t));
   }
-  allowErrorProps(...r) {
-    this.allowedErrorProps.push(...r);
+  allowErrorProps(...t) {
+    this.allowedErrorProps.push(...t);
   }
 }
-l.defaultInstance = new l();
-l.serialize = l.defaultInstance.serialize.bind(l.defaultInstance);
-l.deserialize = l.defaultInstance.deserialize.bind(l.defaultInstance);
-l.stringify = l.defaultInstance.stringify.bind(l.defaultInstance);
-l.parse = l.defaultInstance.parse.bind(l.defaultInstance);
-l.registerClass = l.defaultInstance.registerClass.bind(l.defaultInstance);
-l.registerSymbol = l.defaultInstance.registerSymbol.bind(l.defaultInstance);
-l.registerCustom = l.defaultInstance.registerCustom.bind(l.defaultInstance);
-l.allowErrorProps = l.defaultInstance.allowErrorProps.bind(l.defaultInstance);
-const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem, e.type), oe = (e) => new qr(
+y.defaultInstance = new y();
+y.serialize = y.defaultInstance.serialize.bind(y.defaultInstance);
+y.deserialize = y.defaultInstance.deserialize.bind(y.defaultInstance);
+y.stringify = y.defaultInstance.stringify.bind(y.defaultInstance);
+y.parse = y.defaultInstance.parse.bind(y.defaultInstance);
+y.registerClass = y.defaultInstance.registerClass.bind(y.defaultInstance);
+y.registerSymbol = y.defaultInstance.registerSymbol.bind(y.defaultInstance);
+y.registerCustom = y.defaultInstance.registerCustom.bind(y.defaultInstance);
+y.allowErrorProps = y.defaultInstance.allowErrorProps.bind(y.defaultInstance);
+const z = (e) => e === void 0 ? B.None : e, Fs = (e) => new Vt(e.metadataItem, e.type), we = (e) => new ar(
   e.name,
   e.expression,
   e.type,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
   e.composeCode
-), ae = (e) => new Er(
+), qe = (e) => new ur(
   e.name,
   e.expression,
   e.granularity,
   e.format,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
   e.composeCode
-), q = (e) => {
+), D = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return oe(e);
+      return we(e);
     case "DimensionalLevelAttribute":
-      return ae(e);
+      return qe(e);
     default:
       return e;
   }
-}, Le = (e) => new Xr(
+}, gt = (e) => new Lr(
   e.name,
   e.expression,
-  e.attributes.map(q),
-  e.dimensions.map(Nt),
+  e.attributes.map(D),
+  e.dimensions.map(ws),
   e.type,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
   e.composeCode,
-  e.defaultAttribute ? q(e.defaultAttribute) : void 0
-), Ve = (e) => new vr(
+  e.defaultAttribute ? D(e.defaultAttribute) : void 0
+), ht = (e) => new _r(
   e.name,
   e.expression,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
-  e.composeCode
-), Nt = (e) => {
+  e.composeCode,
+  e.indexed,
+  e.merged
+), ws = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Le(e);
+      return gt(e);
     case "DimensionalDateDimension":
-      return Ve(e);
+      return ht(e);
     default:
       return e;
   }
-}, ue = (e) => new Cr(
+}, Ae = (e) => new cr(
   e.name,
-  q(e.attribute),
+  D(e.attribute),
   e.aggregation,
   e.format,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
   e.composeCode
-), ce = (e) => {
-  const r = Object.fromEntries(
-    Object.entries(e.context).map(([t, s]) => {
+), Ce = (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 [t, oe(s)];
+            return [r, we(s)];
           case "DimensionalLevelAttribute":
-            return [t, ae(s)];
+            return [r, qe(s)];
           case "DimensionalBaseMeasure":
-            return [t, ue(s)];
+            return [r, Ae(s)];
           case "DimensionalCalculatedMeasure":
-            return [t, ce(s)];
+            return [r, Ce(s)];
           default:
-            return [t, s];
+            return [r, s];
         }
-      return [t, s];
+      return [r, s];
     })
   );
-  return new $r(
+  return new lr(
     e.name,
     e.expression,
-    r,
+    t,
     e.format,
     e.description,
-    T(e.sort),
+    z(e.sort),
     e.dataSource,
     e.composeCode
   );
-}, _e = (e) => new Ar(
+}, bt = (e) => new fr(
   e.name,
-  q(e.attribute),
+  D(e.attribute),
   e.format,
   e.description,
-  T(e.sort),
+  z(e.sort),
   e.dataSource,
   e.composeCode
-), Y = (e) => {
+), ue = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return ue(e);
+      return Ae(e);
     case "DimensionalCalculatedMeasure":
-      return ce(e);
+      return Ce(e);
     case "DimensionalMeasureTemplate":
-      return _e(e);
+      return bt(e);
     default:
       return e;
   }
-}, F = (e) => {
+}, C = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Br(
-        q(e.attribute),
+      return new Cr(
+        D(e.attribute),
         e.members,
-        e.config.backgroundFilter ? b(p({}, e.config), { backgroundFilter: F(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? F(g({}, e.config), { backgroundFilter: C(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Pr(
-        e.filters.map((t) => F(t)),
+      return new Ar(
+        e.filters.map((r) => C(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new zr(
-        e._filters.map((t) => F(t)),
+      return new qr(
+        e._filters.map((r) => C(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Ir(
-        F(e.filter),
-        e.input ? F(e.input) : void 0,
+      return new wr(
+        C(e.filter),
+        e.input ? C(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new Or(
-        q(e.attribute),
-        Y(e.measure),
+      return new Fr(
+        D(e.attribute),
+        ue(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -672,25 +681,25 @@ const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem,
         e.composeCode
       );
     case "RankingFilter":
-      return new Rr(
-        q(e.attribute),
-        Y(e.measure),
+      return new br(
+        D(e.attribute),
+        ue(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Nr(
-        Y(e.measure),
+      return new hr(
+        ue(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new Tr(
-        q(e.attribute),
+      return new gr(
+        D(e.attribute),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -699,26 +708,26 @@ const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem,
         e.composeCode
       );
     case "TextFilter":
-      return new Sr(
-        q(e.attribute),
+      return new yr(
+        D(e.attribute),
         e.operatorA,
         e.valueA,
         e.config,
         e.composeCode
       );
     case "DateRangeFilter": {
-      const { valueA: t, valueB: s } = e;
-      return new Mr(
-        q(e.attribute),
-        t,
+      const { valueA: r, valueB: s } = e;
+      return new pr(
+        D(e.attribute),
+        r,
         s,
         e.config,
         e.composeCode
       );
     }
     case "RelativeDateFilter":
-      return new Dr(
-        q(e.attribute),
+      return new mr(
+        D(e.attribute),
         e.offset,
         e.count,
         e.operator,
@@ -727,8 +736,8 @@ const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem,
         e.composeCode
       );
     case "CustomFilter":
-      return new xr(
-        q(e.attribute),
+      return new dr(
+        D(e.attribute),
         e.jaqlExpression,
         e.config,
         e.composeCode
@@ -737,433 +746,510 @@ const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem,
       return e;
   }
 };
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: jt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Tt(e)
+    deserialize: (e) => Fs(e)
   },
   "JaqlElement"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: Wt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => oe(e)
+    deserialize: (e) => we(e)
   },
   "DimensionalAttribute"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: Kt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ae(e)
+    deserialize: (e) => qe(e)
   },
   "DimensionalLevelAttribute"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Hr,
+    isApplicable: zr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Le(e)
+    deserialize: (e) => gt(e)
   },
   "DimensionalDimension"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Zr,
+    isApplicable: Pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ve(e)
+    deserialize: (e) => ht(e)
   },
   "DimensionalDateDimension"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ar,
+    isApplicable: Jt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ue(e)
+    deserialize: (e) => Ae(e)
   },
   "DimensionalBaseMeasure"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: Yt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ce(e)
+    deserialize: (e) => Ce(e)
   },
   "DimensionalCalculatedMeasure"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: cr,
+    isApplicable: Gt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => _e(e)
+    deserialize: (e) => bt(e)
   },
   "DimensionalMeasureTemplate"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: se,
+    isApplicable: be,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "MembersFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: lr,
+    isApplicable: Qt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "LogicalAttributeFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: fr,
+    isApplicable: Ht,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "CascadingFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: dr,
+    isApplicable: Xt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "ExcludeFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: mr,
+    isApplicable: Zt,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "MeasureFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: pr,
+    isApplicable: er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "RankingFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: yr,
+    isApplicable: tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "MeasureRankingFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: gr,
+    isApplicable: rr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "NumericFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: hr,
+    isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "TextFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: br,
+    isApplicable: nr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "DateRangeFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: Fr,
+    isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "RelativeDateFilter"
 );
-l.registerCustom(
+y.registerCustom(
   {
-    isApplicable: wr,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => F(e)
+    deserialize: (e) => C(e)
   },
   "CustomFilter"
 );
-const zs = l, w = "DM.";
+const Kn = y, q = "DM.";
+function T(e) {
+  return typeof e == "object" && e !== null;
+}
 function E(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Ue(e) {
+function Ft(e) {
   return e.every(E);
 }
-function J(e) {
+function ne(e) {
   return "attribute" in e && "config" in e;
 }
-function _(e) {
+function X(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function le(e) {
-  return !J(e) && !_(e);
+function Ee(e) {
+  return !ne(e) && !X(e);
 }
-function Rt(e) {
-  return typeof e == "object" && e !== null && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+function qs(e) {
+  return T(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
-function Ot(e) {
-  const r = e;
-  return typeof e != "object" || e === null || r === null || !("column" in r) ? !1 : E(r.column);
-}
-function It(e) {
-  const r = [...e].sort((o, i) => i.name.length - o.name.length), t = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-  for (const o of e) {
-    t.set(o.name, o);
-    const i = [...o.columns].sort((u, c) => c.name.length - u.name.length);
-    n.set(o.name, i);
+function As(e) {
+  return !T(e) || !("column" in e) ? !1 : E(e.column);
+}
+const x = 3;
+function M(e, t, r) {
+  if (t.length === 0) return;
+  let s = Number.MAX_SAFE_INTEGER, n;
+  for (const i of t) {
+    const o = r(i), a = jr(e, o);
+    a < s && (s = a, n = i);
+  }
+  return n !== void 0 ? { best: n, distance: s } : void 0;
+}
+function xe(e) {
+  const t = [...e].sort((i, o) => o.name.length - i.name.length), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
+  for (const i of e) {
+    r.set(i.name, i);
+    const o = [...i.columns].sort((u, c) => c.name.length - u.name.length);
+    n.set(i.name, o);
     const a = /* @__PURE__ */ new Map();
-    for (const u of o.columns)
+    for (const u of i.columns)
       a.set(u.name, u);
-    s.set(o.name, a);
+    s.set(i.name, a);
   }
   return {
-    sortedTables: r,
+    sortedTables: t,
     tableColumnMap: n,
-    tableMap: t,
+    tableMap: r,
     columnMap: s
   };
 }
-function We(e, r) {
-  if (!e.startsWith(w))
+function $e(e, t) {
+  if (!e.startsWith(q))
     throw new Error(
-      `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
     );
-  const t = e.slice(w.length);
-  if (!t)
+  const r = e.slice(q.length);
+  if (!r)
     throw new Error(
-      `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
+      `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
     );
   let s, n;
-  for (const d of r.sortedTables)
-    if (t.startsWith(d.name + ".")) {
-      const y = t.slice(d.name.length + 1);
-      if (!y)
+  for (const d of t.sortedTables)
+    if (r.startsWith(d.name + ".")) {
+      const b = r.slice(d.name.length + 1);
+      if (!b)
         throw new Error(
-          `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
+          `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
         );
-      s = d, n = y;
+      s = d, n = b;
       break;
     }
   if (!s) {
-    const d = t.indexOf(".");
+    const d = r.indexOf(".");
     if (d === -1)
       throw new Error(
-        `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
+        `Invalid dimensional element name format: '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
       );
-    const y = t.slice(0, d);
-    throw new Error(`Table "${y}" not found in the data model`);
-  }
-  const o = r.tableColumnMap.get(s.name);
-  if (!o)
-    throw new Error(`Table "${s.name}" found but has no columns`);
-  let i, a;
-  const u = U.all;
-  for (const d of o) {
+    const b = r.slice(0, d), A = M(b, t.sortedTables, (oe) => oe.name), O = A && A.distance <= x ? ` Did you mean '${A.best.name}'?` : "";
+    throw new Error(`Table '${b}' not found in the data model.${O}`);
+  }
+  const i = t.tableColumnMap.get(s.name);
+  if (!i)
+    throw new Error(`Table '${s.name}' found but has no columns`);
+  let o, a;
+  const u = $.all;
+  for (const d of i) {
     if (n === d.name)
       return { table: s, column: d };
     if (!n.startsWith(d.name + "."))
       continue;
-    const y = n.slice(d.name.length + 1);
-    if (!y)
+    const b = n.slice(d.name.length + 1);
+    if (!b)
       continue;
-    const g = u.includes(y), f = ie(d.dataType);
-    if (g) {
-      if (f)
-        return { table: s, column: d, level: y };
-      i || (i = d, a = y);
+    const A = u.includes(b), O = H(d.dataType);
+    if (A) {
+      if (O)
+        return { table: s, column: d, level: b };
+      o || (o = d, a = b);
       continue;
     }
-    f && !i && (i = d, a = y);
+    O && !o && (o = d, a = b);
   }
-  if (i && a)
-    throw u.includes(a) ? new Error(
-      `Invalid date level "${a}" in dimensional element "${e}". Column "${s.name}.${i.name}" is not a datetime column`
-    ) : new Error(
-      `Invalid date level "${a}" in dimensional element "${e}". Valid levels are: ${u.join(
+  if (o && a) {
+    if (u.includes(a))
+      throw new Error(
+        `Invalid date level '${a}' in dimensional element '${e}'. Column '${s.name}.${o.name}' is not a datetime column`
+      );
+    const d = M(a, u, (A) => A), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
+    throw new Error(
+      `Invalid date level '${a}' in dimensional element '${e}'. Valid levels are: ${u.join(
         ", "
-      )}`
+      )}.${b}`
     );
-  const c = n.indexOf("."), m = c === -1 ? n : n.slice(0, c);
-  throw new Error(`Column "${m}" not found in table "${s.name}"`);
+  }
+  const c = n.indexOf("."), m = c === -1 ? n : n.slice(0, c), l = M(n, i, (d) => d.name), f = l && l.distance <= x && l.best.name !== m, h = f ? ` Did you mean '${l.best.name}'?` : "", p = !f && n.endsWith(".") && (l == null ? void 0 : l.best.name) === m ? ` Use '${m}' without a trailing dot.` : "";
+  throw new Error(
+    `Column '${m}' not found in table '${s.name}'.${h}${p}`
+  );
 }
-function zt(e, r) {
-  const { table: t, column: s, level: n } = We(e, r);
+function Cs(e, t) {
+  const { table: r, column: s, level: n } = $e(e, t);
   if (n) {
-    if (!ie(s.dataType))
+    if (!H(s.dataType))
       throw new Error(
-        `Invalid date level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is not a datetime column`
+        `Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`
       );
-    const o = U.all;
-    if (!o.includes(n))
+    const i = $.all;
+    if (!i.includes(n))
       throw new Error(
-        `Invalid date level "${n}" in dimensional element "${e}". Valid levels are: ${o.join(
+        `Invalid date level '${n}' in dimensional element '${e}'. Valid levels are: ${i.join(
           ", "
         )}`
       );
-    const i = U.dateOnly;
-    if (s.dataType === "date" && !i.includes(n))
+    const o = $.dateOnly;
+    if (s.dataType === "date" && !o.includes(n))
       throw new Error(
-        `Invalid level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is only a date column, not a datetime column`
+        `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a date column, not a datetime column`
       );
-    const a = U.timeOnly;
+    const a = $.timeOnly;
     if (s.dataType === "time" && !a.includes(n))
       throw new Error(
-        `Invalid level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is only a time column, not a date column`
+        `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a time column, not a date column`
       );
   }
-  return { column: s, level: n };
+  return { table: r, column: s, level: n };
 }
-function je(e) {
-  return e.type === O.TextAttribute;
-}
-function Je(e) {
-  return e.type === O.NumericAttribute;
-}
-function Pt(e) {
-  return e.type === O.DateLevel;
-}
-function Bt(e) {
-  return je(e) || Je(e);
-}
-function G(e) {
-  return e.type === O.TextAttribute ? "text" : e.type === O.NumericAttribute ? "numeric" : e.type === O.DateLevel ? "date/datetime" : "unknown";
-}
-function K(e, r, t) {
-  const { column: s, level: n } = zt(e, t);
-  return kr({
-    expression: s.expression,
-    dataType: s.dataType,
-    granularity: n,
+function G(e, t, r, s) {
+  const { table: n, column: i, level: o } = Cs(e, r);
+  let a = o;
+  if (H(i.dataType) && a === void 0 && (s != null && s.inferredDateLevel)) {
+    const u = s.inferredDateLevel, c = $.all;
+    if (!c.includes(u))
+      throw new Error(
+        `Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`
+      );
+    const m = `${e}.${u}`, l = $.dateOnly;
+    if (i.dataType === "date" && !l.includes(u))
+      throw new Error(
+        `Invalid level '${u}' in dimensional element '${m}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
+      );
+    const f = $.timeOnly;
+    if (i.dataType === "time" && !f.includes(u))
+      throw new Error(
+        `Invalid level '${u}' in dimensional element '${m}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
+      );
+    a = u;
+  }
+  return Er({
+    expression: i.expression,
+    dataType: i.dataType,
+    granularity: a,
     format: void 0,
     sort: void 0,
-    dataSource: r
+    dataSource: t
   });
 }
-function kt(e, r, t) {
-  const { column: s, level: n } = We(e, t);
+function Es(e, t, r) {
+  const { column: s, level: n } = $e(e, r);
   if (n)
     throw new Error(
-      `Invalid DateDimension name format: "${e}". Expected format: "${w}TableName.ColumnName"`
+      `Invalid DateDimension name format: '${e}'. Expected format: '${q}TableName.ColumnName'`
     );
-  if (!ie(s.dataType))
+  if (!H(s.dataType))
     throw new Error(
-      `Invalid DateDimension name "${e}". Column "${s.name}" is not a datetime column (got ${s.dataType}).`
+      `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return et({
+  return Ur({
     name: s.name,
     expression: s.expression,
-    dataSource: r
+    dataSource: t
   });
 }
-function x(e, r) {
-  const t = e();
-  return t.success ? t.data : (r.push(...t.errors), null);
-}
-const Lt = (e, r, t) => {
-  if (!r)
-    return { attribute: e };
-  const s = typeof r == "object" ? r.direction : r;
-  return Ee(s) ? { attribute: e.sort(Ce(s)) } : {
-    attribute: e,
-    error: b(p({}, t), {
-      message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${s}".`
-    })
-  };
-}, Vt = (e, r, t, s) => {
-  const n = K(e.column, r, t);
-  return Lt(n, e.sortType, s);
-}, _t = (e, r, t, s) => typeof e == "string" ? { attribute: K(e, r, t) } : Rt(e) ? Vt(e, r, t, s) : {
-  error: b(p({}, s), {
-    message: 'Invalid dimension item. Expected a string (composeCode) or object with "column" and optional "sortType".'
+const xs = (e, t) => {
+  if (!e) return;
+  const r = typeof e == "object" ? e.direction : e;
+  if (!te(r))
+    return F(g({}, t), {
+      message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
+    });
+}, $s = (e, t, r, s) => {
+  const n = xs(e.sortType, s);
+  if (n)
+    return {
+      attribute: G(e.column, t, r),
+      style: {},
+      error: n
+    };
+  const i = G(e.column, t, r), o = _(e, "column");
+  return { attribute: i, style: o };
+}, Ts = (e, t, r, s) => typeof e == "string" ? { attribute: G(e, t, r) } : qs(e) ? $s(e, t, r, s) : {
+  error: F(g({}, s), {
+    message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, Ut = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  if (!r)
+}, wt = (e) => {
+  const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
+  if (!t)
     return { success: !0, data: [] };
-  if (!Array.isArray(r))
+  if (!Array.isArray(t))
     return {
       success: !1,
       errors: [
         {
           category: "dimensions",
           index: -1,
-          input: r,
+          input: t,
           message: "Invalid dimensions JSON. Expected an array."
         }
       ]
     };
-  const n = [], o = [];
-  return r.forEach((i, a) => {
+  const n = [], i = [];
+  return t.forEach((o, a) => {
     const u = {
       category: "dimensions",
       index: a,
-      input: i
+      input: o
     };
     try {
-      const c = _t(i, t, s, u);
+      const c = Ts(o, r, s, u);
       if (c.error) {
-        o.push(c.error);
+        i.push(c.error);
         return;
       }
-      c.attribute && n.push(c.attribute);
+      c.attribute && n.push(
+        c.style !== void 0 ? { attribute: c.attribute, style: c.style } : { attribute: c.attribute }
+      );
     } catch (c) {
       const m = c instanceof Error ? c.message : "Unknown error";
-      o.push(b(p({}, u), { message: m }));
+      i.push(F(g({}, u), { message: m }));
     }
-  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function fe(e, r) {
-  const t = Reflect.get(e, r);
-  if (typeof t != "function")
-    throw new Error(`Function "${r}" not found or is not a function`);
-  return t;
+function Te(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 Wt(e, r) {
-  const t = e.replace("measureFactory.", ""), n = fe(Lr, t)(...r);
-  if (!le(n))
-    throw new Error(`Function "${e}" did not return a valid Measure`);
+function Ds(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Te(xr, r)(...t);
+  if (!Ee(n))
+    throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function jt(e, r) {
-  const t = e.replace("filterFactory.logic.", ""), n = fe(Vr, t)(...r);
-  if (!_(n))
-    throw new Error(`Function "${e}" did not return a valid FilterRelations`);
+function Ss(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Te($r, r)(...t);
+  if (!X(n))
+    throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function Jt(e, r) {
+function Os(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return jt(e, r);
-  const t = e.replace("filterFactory.", ""), n = fe(_r, t)(...r);
-  if (!J(n) && !_(n))
-    throw new Error(`Function "${e}" did not return a valid Filter or FilterRelations`);
+    return Ss(e, t);
+  const r = e.replace("filterFactory.", ""), n = Te(Tr, r)(...t);
+  if (!ne(n) && !X(n))
+    throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function Gt(e, r) {
+function Ms(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Wt(e, r);
+    return Ds(e, t);
   if (s === "filterFactory")
-    return Jt(e, r);
+    return Os(e, t);
   throw new Error(
-    `Unsupported factory: "${s}". Supported factories: measureFactory, filterFactory`
+    `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const Kt = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g, Ge = /* @__PURE__ */ new Set([
+const ye = {
+  SDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Seconds,
+    argType: "datetime"
+  },
+  MNDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Minutes,
+    argType: "datetime"
+  },
+  HDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Hours,
+    argType: "datetime"
+  },
+  DDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Days,
+    argType: "datetime"
+  },
+  MDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Months,
+    argType: "datetime"
+  },
+  QDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Quarters,
+    argType: "datetime"
+  },
+  YDIFF: {
+    category: "time-diff",
+    argCount: 2,
+    requiredDateLevel: $.Years,
+    argType: "datetime"
+  }
+}, vs = Object.keys(ye).filter(
+  (e) => ye[e].category === "time-diff"
+);
+function qt() {
+  return vs;
+}
+function At(e) {
+  const t = ye[e.toUpperCase()];
+  return t == null ? void 0 : t.requiredDateLevel;
+}
+const Ns = /\[(\w[\w.-]*)\]/g, Ct = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
   "COUNT",
@@ -1191,219 +1277,322 @@ const Kt = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g, Ge = /* @__PURE__ */ new Set([
   "SKEWP",
   "SKEW",
   "SLOPE"
-]), Qt = new RegExp(
-  `\\b(${Array.from(Ge).join("|")})\\s*\\(`,
+]), Rs = new RegExp(
+  `\\b(${Array.from(Ct).join("|")})\\s*\\(`,
   "i"
 );
-function Yt(e) {
-  return E(e) ? !0 : typeof e == "string" && e.startsWith(w) ? !1 : e && typeof e == "object" && "kind" in e ? e.kind === "measure" : !0;
+function Et(e) {
+  return E(e) ? !0 : typeof e == "string" && e.startsWith(q) ? !1 : T(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function Ht(e) {
-  const r = /\b(\w+)\s*\(/g, t = /* @__PURE__ */ new Set();
+function Is(e) {
+  const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
   let s;
-  for (; (s = r.exec(e)) !== null; ) {
+  for (; (s = t.exec(e)) !== null; ) {
     const n = s[1];
-    Ge.has(n.toUpperCase()) || t.add(n);
+    Ct.has(n.toUpperCase()) || r.add(n);
   }
-  return Array.from(t);
+  return Array.from(r);
 }
-function Zt(e) {
-  return e.length === 1 ? `[${e[0]}]` : e.map((r) => `[${r}]`).join(", ");
+function ks(e) {
+  return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function Xt(e) {
+function Bs(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
-function vt(e, r, t = {}) {
-  const {
-    warnUnusedContext: s = !0,
-    errorOnUnusedContext: n = !0,
-    allowEmptyFormula: o = !1,
-    errorPrefix: i = "customFormula validation"
-  } = t, a = {
-    isValid: !0,
-    errors: [],
-    warnings: [],
-    references: [],
-    unusedContextKeys: []
+const j = (e) => e.startsWith("[") ? e : `[${e}]`, xt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function $t(e, t) {
+  if (t.length === 0) return [];
+  const r = t.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), s = new RegExp(
+    `\\b(${r})\\s*\\(\\s*\\[([^\\]]+)\\]\\s*,\\s*\\[([^\\]]+)\\]\\s*\\)`,
+    "gi"
+  );
+  return [...e.matchAll(s)].map((n) => ({
+    functionName: n[1].toUpperCase(),
+    ref1: n[2].trim(),
+    ref2: n[3].trim()
+  }));
+}
+function zs(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)),
+    errorPrefix: i,
+    warnUnusedContext: (a = r.warnUnusedContext) != null ? a : !0,
+    errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : !0,
+    schemaIndex: r.schemaIndex,
+    result: { isValid: !0, errors: [], warnings: [], references: [], unusedContextKeys: [] }
   };
-  if (!e || e.trim().length === 0)
-    return o || (a.errors.push(`${i}args[1]: Formula cannot be empty`), a.isValid = !1), a;
-  const u = /\b\w+\s*\[/gi, c = e.match(u);
-  if (c) {
-    const g = c[0].replace(/\s*\[.*$/, "");
-    a.errors.push(
-      `${i}args[1]: Invalid syntax: '${g}' - operator cannot be used before bracket reference without parentheses`
-    ), a.isValid = !1;
-  }
-  a.references = [
+}
+function N(e, t) {
+  e.result.errors.push(t), e.result.isValid = !1;
+}
+const Ps = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function Ls(e) {
+  const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find(
+    (s) => !Ps.has(s[1].toUpperCase())
+  );
+  r && N(
+    e,
+    `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`
+  );
+}
+function _s(e) {
+  return [
     ...new Set(
-      [...e.matchAll(new RegExp(Kt.source, "g"))].map((g) => g[1])
+      [...e.matchAll(new RegExp(Ns.source, "g"))].map((t) => t[1])
     )
   ];
-  const m = Object.keys(r);
-  if (a.references.length === 0)
-    return a.warnings.push(
-      `${i}args[1]: No bracket references found in formula - ensure this is intentional`
-    ), a;
-  if (m.length === 0)
-    return a.errors.push(
-      `${i}args[2]: Context cannot be empty - custom formulas require context definitions`
-    ), a.isValid = !1, a;
-  const d = a.references.filter((g) => !m.includes(g));
-  if (d.length > 0 && (a.isValid = !1, d.length === 1 ? a.errors.push(
-    `${i}args[1]: Reference [${d[0]}] not found in context. Available keys: ${m.join(", ")}`
-  ) : a.errors.push(
-    `${i}args[1]: References [${d.join(
-      "], ["
-    )}] not found in context. Available keys: ${m.join(", ")}`
-  )), !Qt.test(e)) {
-    const g = a.references.filter(
-      (f) => f in r && !Yt(r[f])
+}
+function Us(e) {
+  const t = e.result.references.filter(
+    (n) => !e.canonicalContextKeys.has(j(n))
+  );
+  if (t.length === 0) return;
+  const r = e.contextKeys.map((n) => `[${xt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
+  N(
+    e,
+    `${e.errorPrefix}args[1]: ${s} not found in context. Available keys: ${r}`
+  );
+}
+function js(e) {
+  if (Rs.test(e.formula)) return;
+  const t = e.result.references.filter((r) => {
+    var n;
+    const s = (n = e.context[j(r)]) != null ? n : e.context[r];
+    return s !== void 0 && !Et(s);
+  });
+  t.length !== 0 && N(
+    e,
+    `${e.errorPrefix}args[1]: ${Bs(
+      Is(e.formula)
+    )}Bracket reference(s) ${ks(
+      t
+    )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
+  );
+}
+function Vs(e) {
+  if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0) return;
+  const t = new Set(e.result.references.map(j)), r = e.contextKeys.filter((i) => !t.has(j(i)));
+  if (e.result.unusedContextKeys = r, r.length === 0) return;
+  const s = r.map((i) => `[${xt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
+  e.errorOnUnusedContext ? N(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
+}
+function We(e, t, r, s) {
+  var o;
+  const n = (o = s.context[j(e)]) != null ? o : s.context[e];
+  if (n === void 0) return;
+  if (!(typeof n == "string" && n.startsWith(q))) {
+    Et(n) && N(
+      s,
+      `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${q}Table.Column.Level).`
     );
-    g.length > 0 && (a.errors.push(
-      `${i}args[1]: ${Xt(
-        Ht(e)
-      )}Bracket reference(s) ${Zt(
-        g
-      )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
-    ), a.isValid = !1);
-  }
-  if ((s || n) && m.length > 0) {
-    const g = m.filter((f) => !a.references.includes(f));
-    if (a.unusedContextKeys = g, g.length > 0) {
-      const f = `${i}args[2]: Context keys [${g.join(
-        ", "
-      )}] are defined but not used in formula`;
-      n ? (a.errors.push(f), a.isValid = !1) : s && a.warnings.push(f);
-    }
+    return;
   }
-  return a;
+  if (s.schemaIndex)
+    try {
+      const a = $e(n, s.schemaIndex);
+      H(a.column.dataType) ? r && a.level && a.level !== r && N(
+        s,
+        `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${a.level}'.`
+      ) : N(
+        s,
+        `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimensions. Reference [${e}] resolves to non-datetime column '${a.column.name}'.`
+      );
+    } catch (a) {
+      const u = a instanceof Error ? a.message : "Unknown error";
+      N(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
+    }
 }
-function es(e, r, t = {}) {
-  const s = vt(e, r, t);
+function Ws(e) {
+  const t = qt(), r = $t(e.formula, t);
+  for (const s of r) {
+    const n = At(s.functionName);
+    We(s.ref1, s, n, e), We(s.ref2, s, n, e);
+  }
+}
+function Ks(e, t, r = {}) {
+  var n;
+  const s = zs(e, t, r);
+  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || N(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (Ls(s), s.result.references = _s(e), s.result.references.length === 0 ? (s.result.warnings.push(
+    `${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`
+  ), s.result) : s.contextKeys.length === 0 ? (N(
+    s,
+    `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`
+  ), s.result) : (Us(s), js(s), Vs(s), Ws(s), s.result));
+}
+function Js(e, t, r = {}) {
+  const s = Ks(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 rs(e, r) {
+function Ys(e, t) {
   if (e.length < 3 || e.length > 5)
     throw new Error(
-      `${r.pathPrefix}Expected 3, 4, or 5 arguments for customFormula (title, formula, context, format?, description?)`
+      `${t.pathPrefix}Expected 3, 4, or 5 arguments for customFormula (title, formula, context, format?, description?)`
+    );
+  const r = e[1];
+  if (typeof r != "string")
+    throw new Error(
+      `${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`
     );
-  const t = e[1], s = e[2];
-  es(t, s, {
-    errorPrefix: `${r.pathPrefix}`,
+  const s = r, n = e[2];
+  if (!T(n))
+    throw new Error(
+      `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
+    );
+  const i = n;
+  Js(s, i, {
+    errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
-    allowEmptyFormula: !1
+    allowEmptyFormula: !1,
     // Custom formulas must have content
+    schemaIndex: t.schemaIndex
   });
-  const n = {};
-  for (const [o, i] of Object.entries(s)) {
-    const a = `args[2].${o}`;
-    if (E(i))
-      n[`${o}`] = C({
-        data: i,
+  const o = Gs(s), a = {};
+  for (const [u, c] of Object.entries(i)) {
+    const m = `args[2].${u}`;
+    if (E(c))
+      a[`${u}`] = S({
+        data: c,
         context: {
-          dataSource: r.dataSource,
-          schemaIndex: r.schemaIndex,
-          pathPrefix: a
+          dataSource: t.dataSource,
+          schemaIndex: t.schemaIndex,
+          pathPrefix: m
         }
       });
-    else if (typeof i == "string" && i.startsWith(w))
+    else if (typeof c == "string" && c.startsWith(q)) {
+      const l = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, f = o[l];
       try {
-        n[`${o}`] = K(
-          i,
-          r.dataSource,
-          r.schemaIndex
+        a[`${u}`] = G(
+          c,
+          t.dataSource,
+          t.schemaIndex,
+          f !== void 0 ? { inferredDateLevel: f } : void 0
         );
-      } catch (u) {
-        const c = u instanceof Error ? u.message : "Unknown error";
-        throw new Error(`${a}: ${c}`);
+      } catch (h) {
+        const p = h instanceof Error ? h.message : "Unknown error";
+        throw new Error(`${m}: ${p}`);
       }
-    else if (i && typeof i == "object" && "kind" in i)
-      n[`${o}`] = i;
+    } else if (c && typeof c == "object" && "kind" in c)
+      a[`${u}`] = c;
     else
       throw new Error(
-        `${a}: Invalid context value for key '${o}'. Expected a function call or attribute reference (${w}...), but got: ${typeof i}`
+        `${m}: Invalid context value for key '${u}'. Expected a function call or attribute reference (${q}...), but got: ${typeof c}`
       );
   }
-  e[2] = n;
+  e[2] = a;
 }
-function de(e, r) {
-  const t = e[0];
-  if (!t || typeof t != "object" || !("type" in t))
-    throw new Error(`${r.pathPrefix}args[0]: Expected attribute as first argument`);
-  return t;
+function Gs(e) {
+  const t = qt(), r = $t(e, t), s = {};
+  for (const n of r) {
+    const i = At(n.functionName);
+    if (i !== void 0)
+      for (const o of [n.ref1, n.ref2]) {
+        const a = s[o];
+        if (a !== void 0 && a !== i)
+          throw new Error(
+            `Reference [${o}] is used in time-diff functions with conflicting date levels ('${a}' and '${i}'). Specify the date level in the context (e.g. DM.Table.Column.${i}).`
+          );
+        s[o] = i;
+      }
+  }
+  return s;
+}
+function Tt(e) {
+  return e.type === L.TextAttribute;
+}
+function Dt(e) {
+  return e.type === L.NumericAttribute;
 }
-function qe(e, r) {
-  const t = de(e, r);
-  if (!Bt(t))
+function Qs(e) {
+  return e.type === L.DateLevel;
+}
+function Hs(e) {
+  return Tt(e) || Dt(e);
+}
+function ie(e) {
+  return e.type === L.TextAttribute ? "text" : e.type === L.NumericAttribute ? "numeric" : e.type === L.DateLevel ? "date/datetime" : "unknown";
+}
+function De(e, t) {
+  const r = e[0];
+  if (!r || typeof r != "object" || !("type" in r))
+    throw new Error(`${t.pathPrefix}args[0]: Expected attribute as first argument`);
+  return r;
+}
+function Ke(e, t) {
+  const r = De(e, t);
+  if (!Hs(r))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${G(
-        t
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ie(
+        r
       )} attribute`
     );
 }
-function M(e, r) {
-  const t = de(e, r);
-  if (!Je(t))
+function I(e, t) {
+  const r = De(e, t);
+  if (!Dt(r))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be numeric type, got ${G(
-        t
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ie(
+        r
       )} attribute`
     );
 }
-function S(e, r) {
-  const t = de(e, r);
-  if (!je(t))
+function k(e, t) {
+  const r = De(e, t);
+  if (!Tt(r))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be string type, got ${G(
-        t
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ie(
+        r
       )} attribute`
     );
 }
-function ts(e, r) {
-  const t = e[0];
-  if (!t || typeof t != "object" || !("attribute" in t))
-    throw new Error(`${r.pathPrefix}args[0]: Expected filter as first argument`);
-  return t;
+function Xs(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 ss(e, r) {
-  const t = ts(e, r);
-  if (!se(t))
+function Zs(e, t) {
+  const r = Xs(e, t);
+  if (!be(r))
     throw new Error(
-      `${r.pathPrefix}args[0]: exclude filter only accepts members filter, got ${t.__serializable || "unknown"} filter`
+      `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
 }
-const ns = {
-  "measureFactory.customFormula": rs,
+const en = {
+  "measureFactory.customFormula": Ys,
   // String | Number filters
-  "filterFactory.equals": qe,
-  "filterFactory.doesntEqual": qe,
+  "filterFactory.equals": Ke,
+  "filterFactory.doesntEqual": Ke,
   // Numeric filters
-  "filterFactory.greaterThan": M,
-  "filterFactory.greaterThanOrEqual": M,
-  "filterFactory.lessThan": M,
-  "filterFactory.lessThanOrEqual": M,
-  "filterFactory.between": M,
-  "filterFactory.betweenNotEqual": M,
-  "filterFactory.numeric": M,
+  "filterFactory.greaterThan": I,
+  "filterFactory.greaterThanOrEqual": I,
+  "filterFactory.lessThan": I,
+  "filterFactory.lessThanOrEqual": I,
+  "filterFactory.between": I,
+  "filterFactory.betweenNotEqual": I,
+  "filterFactory.numeric": I,
   // String filters
-  "filterFactory.contains": S,
-  "filterFactory.doesntContain": S,
-  "filterFactory.startsWith": S,
-  "filterFactory.doesntStartWith": S,
-  "filterFactory.endsWith": S,
-  "filterFactory.doesntEndWith": S,
-  "filterFactory.like": S,
+  "filterFactory.contains": k,
+  "filterFactory.doesntContain": k,
+  "filterFactory.startsWith": k,
+  "filterFactory.doesntStartWith": k,
+  "filterFactory.endsWith": k,
+  "filterFactory.doesntEndWith": k,
+  "filterFactory.like": k,
   // Exclude filter
-  "filterFactory.exclude": ss
+  "filterFactory.exclude": Zs
 };
-function is(e) {
-  return ns[`${e}`];
+function tn(e) {
+  return en[`${e}`];
 }
-const os = {
+const St = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -1930,608 +2119,677 @@ const os = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function me(e) {
-  return os[`${e}`];
+function Se(e) {
+  return St[`${e}`];
 }
-function as(e) {
-  const r = me(e);
-  return r ? r.filter((t) => t.required).length : 0;
+function rn(e) {
+  const t = Se(e);
+  return t ? t.filter((r) => r.required).length : 0;
 }
-function us(e) {
-  const r = me(e);
-  return r ? r.length : 0;
+function sn(e) {
+  const t = Se(e);
+  return t ? t.length : 0;
 }
-function cs(e) {
+function nn(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
-  const t = Date.parse(e);
-  if (isNaN(t) || e.length < 10)
+  const r = Date.parse(e);
+  if (isNaN(r) || e.length < 10)
     return !1;
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function H(e, r, t, s) {
-  if (e.startsWith(w))
+function ce(e, t, r, s) {
+  if (e.startsWith(q))
     try {
-      return K(e, r, t);
+      return G(e, t, r);
     } catch (n) {
-      const o = n instanceof Error ? n.message : "Unknown error";
-      throw new Error(`${s}: ${o}`);
+      const i = n instanceof Error ? n.message : "Unknown error";
+      throw new Error(`${s}: ${i}`);
     }
   throw new Error(
-    `${s}: Invalid attribute "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
+    `${s}: Invalid attribute '${e}'. Expected format: '${q}TableName.ColumnName[.Level]'`
   );
 }
-function ls(e, r, t, s) {
-  if (e.startsWith(w))
+function on(e, t, r, s) {
+  if (e.startsWith(q))
     try {
-      return kt(e, r, t);
+      return Es(e, t, r);
     } catch (n) {
-      const o = n instanceof Error ? n.message : "Unknown error";
-      throw new Error(`${s}: ${o}`);
+      const i = n instanceof Error ? n.message : "Unknown error";
+      throw new Error(`${s}: ${i}`);
     }
   throw new Error(
-    `${s}: Invalid date dimension string "${e}". Expected format: "${w}TableName.ColumnName"`
+    `${s}: Invalid date dimension string '${e}'. Expected format: '${q}TableName.ColumnName'`
   );
 }
-function fs(e) {
-  const r = e.data, { argSchema: t, dataSource: s, schemaIndex: n, pathPrefix: o } = e.context, i = o;
-  if (r === void 0) {
-    if (t.required)
-      throw new Error(`${i}: Required argument is missing (expected ${t.type})`);
+function an(e) {
+  const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, o = i;
+  if (t === void 0) {
+    if (r.required)
+      throw new Error(`${o}: Required argument is missing (expected ${r.type})`);
     return;
   }
-  switch (t.type) {
-    case "string":
-      if (typeof r != "string")
-        throw new Error(`${i}: Expected string, got ${typeof r}`);
-      return r;
-    case "number":
-      if (typeof r != "number")
-        throw new Error(`${i}: Expected number, got ${typeof r}`);
-      return r;
-    case "boolean":
-      if (typeof r != "boolean")
-        throw new Error(`${i}: Expected boolean, got ${typeof r}`);
-      return r;
-    case "string[]":
-      if (!Array.isArray(r))
-        throw new Error(
-          `${i}: Expected array of strings, got ${typeof r}. Example: ["value1", "value2"]`
-        );
-      if (!r.every((a) => typeof a == "string"))
-        throw new Error(
-          `${i}: Expected array of strings, but contains non-string values`
-        );
-      return r;
-    case "number[]":
-      if (!Array.isArray(r))
-        throw new Error(
-          `${i}: Expected array of numbers, got ${typeof r}. Example: [10, 20]`
-        );
-      if (!r.every((a) => typeof a == "number"))
-        throw new Error(
-          `${i}: Expected array of numbers, but contains non-number values`
-        );
-      return r;
-    case "Attribute":
-      if (typeof r != "string")
-        throw new Error(
-          `${i}: Expected attribute string, got ${typeof r}. Example: "DM.Commerce.Revenue"`
-        );
-      return H(r, s, n, i);
-    case "Attribute[]":
-      if (!Array.isArray(r))
-        throw new Error(
-          `${i}: Expected array of attributes, got ${typeof r}. Example: ["DM.Commerce.AgeRange"]`
-        );
-      return r.map((a, u) => {
-        if (typeof a != "string")
-          throw new Error(`${i}[${u}]: Expected attribute string, got ${typeof a}`);
-        return H(a, s, n, `${i}[${u}]`);
-      });
-    case "Measure":
-    case "BaseMeasure":
-      if (!E(r))
-        throw new Error(
-          `${i}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`
-        );
-      return C({
-        data: r,
-        context: { dataSource: s, schemaIndex: n, pathPrefix: i }
-      });
-    case "Measure[]":
-      if (!Array.isArray(r))
-        throw new Error(
-          `${i}: Expected array of measure function calls, got ${typeof r}`
-        );
-      return r.map((a, u) => {
-        if (!E(a))
+  if (!(t === null && !r.required))
+    switch (r.type) {
+      case "string":
+        if (typeof t != "string")
+          throw new Error(`${o}: Expected string, got ${typeof t}`);
+        return t;
+      case "number":
+        if (typeof t != "number")
+          throw new Error(`${o}: Expected number, got ${typeof t}`);
+        return t;
+      case "boolean":
+        if (typeof t != "boolean")
+          throw new Error(`${o}: Expected boolean, got ${typeof t}`);
+        return t;
+      case "string[]":
+        if (!Array.isArray(t))
+          throw new Error(
+            `${o}: Expected array of strings, got ${typeof t}. Example: ['value1', 'value2']`
+          );
+        if (!t.every((a) => typeof a == "string"))
+          throw new Error(
+            `${o}: Expected array of strings, but contains non-string values`
+          );
+        return t;
+      case "number[]":
+        if (!Array.isArray(t))
           throw new Error(
-            `${i}[${u}]: Expected measure function call, got ${typeof a}`
+            `${o}: Expected array of numbers, got ${typeof t}. Example: [10, 20]`
           );
-        return C({
-          data: a,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+        if (!t.every((a) => typeof a == "number"))
+          throw new Error(
+            `${o}: Expected array of numbers, but contains non-number values`
+          );
+        return t;
+      case "Attribute":
+        if (typeof t != "string")
+          throw new Error(
+            `${o}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
+          );
+        return ce(t, s, n, o);
+      case "Attribute[]":
+        if (!Array.isArray(t))
+          throw new Error(
+            `${o}: Expected array of attributes, got ${typeof t}. Example: ['DM.Commerce.AgeRange']`
+          );
+        return t.map((a, u) => {
+          if (typeof a != "string")
+            throw new Error(`${o}[${u}]: Expected attribute string, got ${typeof a}`);
+          return ce(a, s, n, `${o}[${u}]`);
         });
-      });
-    case "Filter":
-      if (!E(r))
-        throw new Error(
-          `${i}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`
-        );
-      return C({
-        data: r,
-        context: { dataSource: s, schemaIndex: n, pathPrefix: i }
-      });
-    case "Filter[]":
-      if (!Array.isArray(r))
-        throw new Error(
-          `${i}: Expected array of filter function calls, got ${typeof r}`
-        );
-      return r.map((a, u) => {
-        if (!E(a))
+      case "Measure":
+      case "BaseMeasure":
+        if (!E(t))
           throw new Error(
-            `${i}[${u}]: Expected filter function call, got ${typeof a}`
+            `${o}: Expected measure function call, got ${typeof t}. Example: {'function': 'measureFactory.sum', 'args': ['DM.Commerce.Revenue']}`
           );
-        return C({
-          data: a,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+        return S({
+          data: t,
+          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
-      });
-    case "FilterRelationsNode":
-      if (Array.isArray(r))
-        return r.map((a, u) => {
+      case "Measure[]":
+        if (!Array.isArray(t))
+          throw new Error(
+            `${o}: Expected array of measure function calls, got ${typeof t}`
+          );
+        return t.map((a, u) => {
           if (!E(a))
             throw new Error(
-              `${i}[${u}]: Expected filter function call, got ${typeof a}`
+              `${o}[${u}]: Expected measure function call, got ${typeof a}`
             );
-          return C({
+          return S({
             data: a,
-            context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
           });
         });
-      if (E(r))
-        return C({
-          data: r,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: i }
+      case "Filter":
+        if (!E(t))
+          throw new Error(
+            `${o}: Expected filter function call, got ${typeof t}. Example: {'function': 'filterFactory.contains', 'args': ['DM.Brand.Brand', 'Apple']}`
+          );
+        return S({
+          data: t,
+          context: { dataSource: s, schemaIndex: n, pathPrefix: o }
         });
-      throw new Error(
-        `${i}: Expected filter function call or array of filters, got ${typeof r}`
-      );
-    case "DateDimension":
-      if (typeof r != "string")
+      case "Filter[]":
+        if (!Array.isArray(t))
+          throw new Error(
+            `${o}: Expected array of filter function calls, got ${typeof t}`
+          );
+        return t.map((a, u) => {
+          if (!E(a))
+            throw new Error(
+              `${o}[${u}]: Expected filter function call, got ${typeof a}`
+            );
+          return S({
+            data: a,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+          });
+        });
+      case "FilterRelationsNode":
+        if (Array.isArray(t))
+          return t.map((a, u) => {
+            if (!E(a))
+              throw new Error(
+                `${o}[${u}]: Expected filter function call, got ${typeof a}`
+              );
+            return S({
+              data: a,
+              context: { dataSource: s, schemaIndex: n, pathPrefix: `${o}[${u}]` }
+            });
+          });
+        if (E(t))
+          return S({
+            data: t,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          });
         throw new Error(
-          `${i}: Expected date dimension string, got ${typeof r}. Example: "DM.Commerce.Date"`
+          `${o}: Expected filter function call or array of filters, got ${typeof t}`
         );
-      return ls(r, s, n, i);
-    case "LevelAttribute": {
-      if (typeof r != "string")
-        throw new Error(
-          `${i}: Expected date attribute string, got ${typeof r}. Example: "DM.Commerce.Date.Years"`
+      case "DateDimension":
+        if (typeof t != "string")
+          throw new Error(
+            `${o}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
+          );
+        return on(t, s, n, o);
+      case "LevelAttribute": {
+        if (typeof t != "string")
+          throw new Error(
+            `${o}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
+          );
+        const a = ce(
+          t,
+          s,
+          n,
+          o
         );
-      const a = H(
-        r,
-        s,
-        n,
-        i
-      );
-      if (!Pt(a))
+        if (!Qs(a))
+          throw new Error(
+            `${o}: Attribute must be date/datetime type, got ${ie(
+              a
+            )} attribute`
+          );
+        return a;
+      }
+      case "Measure | number":
+        if (typeof t == "number")
+          return t;
+        if (E(t))
+          return S({
+            data: t,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: o }
+          });
         throw new Error(
-          `${i}: Attribute must be date/datetime type, got ${G(
-            a
-          )} attribute`
+          `${o}: Expected measure function call or number, got ${typeof t}`
         );
-      return a;
+      case "Date | string":
+        if (typeof t == "string") {
+          if (nn(t))
+            return t;
+          throw new Error(
+            `${o}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
+          );
+        } else {
+          if (t instanceof Date)
+            return t;
+          throw new Error(
+            `${o}: Expected date string or Date object, got ${typeof t}`
+          );
+        }
+      case "string | number":
+        if (typeof t == "string" || typeof t == "number")
+          return t;
+        throw new Error(`${o}: Expected string or number, got ${typeof t}`);
+      case "BaseFilterConfig":
+      case "MembersFilterConfig":
+      case "CustomFormulaContext":
+      case "any":
+        if (t == null && r.required)
+          throw new Error(`${o}: Required argument is null/undefined`);
+        return t;
+      default:
+        return t;
     }
-    case "Measure | number":
-      if (typeof r == "number")
-        return r;
-      if (E(r))
-        return C({
-          data: r,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: i }
-        });
-      throw new Error(
-        `${i}: Expected measure function call or number, got ${typeof r}`
-      );
-    case "Date | string":
-      if (typeof r == "string") {
-        if (cs(r))
-          return r;
-        throw new Error(
-          `${i}: Expected valid ISO date string or Date object, got invalid date string "${r}"`
-        );
-      } else {
-        if (r instanceof Date)
-          return r;
-        throw new Error(
-          `${i}: Expected date string or Date object, got ${typeof r}`
-        );
-      }
-    case "string | number":
-      if (typeof r == "string" || typeof r == "number")
-        return r;
-      throw new Error(`${i}: Expected string or number, got ${typeof r}`);
-    case "BaseFilterConfig":
-    case "MembersFilterConfig":
-    case "CustomFormulaContext":
-    case "any":
-      if (r == null && t.required)
-        throw new Error(`${i}: Required argument is null/undefined`);
-      return r;
-    default:
-      return r;
-  }
 }
-function C(e) {
-  const { data: r } = e, { dataSource: t, schemaIndex: s, pathPrefix: n } = e.context, { function: o, args: i } = r, a = n ? `${n}.` : "", u = me(o);
-  if (!u)
-    throw new Error(`${a}function: Unknown function "${o}"`);
-  const c = as(o), m = us(o);
-  if (i.length < c)
+function S(e) {
+  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: o } = t, a = n ? `${n}.` : "", u = Se(i);
+  if (!u) {
+    const p = Object.keys(St), d = M(i, p, (A) => A), b = d && d.distance <= x ? ` Did you mean '${d.best}'?` : "";
     throw new Error(
-      `${a}function: Expected at least ${c} arguments, got ${i.length}`
+      `${a}function: Unknown function '${i}'.${b}`
     );
-  if (i.length > m)
+  }
+  const c = rn(i), m = sn(i);
+  if (o.length < c)
     throw new Error(
-      `${a}function: Expected at most ${m} arguments, got ${i.length}`
+      `${a}function: Expected at least ${c} arguments, got ${o.length}`
     );
-  const d = [], y = [];
-  for (let f = 0; f < Math.max(i.length, u.length); f++) {
-    const h = u[`${f}`], A = i[`${f}`], z = a ? `${a}args[${f}]` : `args[${f}]`;
-    if (A === void 0) {
-      h != null && h.required && y.push(`${z}: Missing required argument (expected ${h.type})`);
+  if (o.length > m)
+    throw new Error(
+      `${a}function: Expected at most ${m} arguments, got ${o.length}`
+    );
+  const l = [], f = [];
+  for (let p = 0; p < Math.max(o.length, u.length); p++) {
+    const d = u[`${p}`], b = o[`${p}`], A = a ? `${a}args[${p}]` : `args[${p}]`;
+    if (b === void 0) {
+      d != null && d.required && f.push(`${A}: Missing required argument (expected ${d.type})`);
       continue;
     }
-    if (!h) {
-      y.push(`${z}: Unexpected argument`);
+    if (!d) {
+      f.push(`${A}: Unexpected argument`);
       continue;
     }
     try {
-      const N = fs({
-        data: A,
+      const O = an({
+        data: b,
         context: {
-          dataSource: t,
+          dataSource: r,
           schemaIndex: s,
-          pathPrefix: z,
-          argSchema: h
+          pathPrefix: A,
+          argSchema: d
         }
       });
-      d.push(N);
-    } catch (N) {
-      const Ze = N instanceof Error ? N.message : "Unknown error";
-      y.push(Ze);
+      l.push(O);
+    } catch (O) {
+      const oe = O instanceof Error ? O.message : "Unknown error";
+      f.push(oe);
     }
   }
-  if (y.length > 0) {
-    const f = y.join("; ");
-    throw new Error(f);
+  if (f.length > 0) {
+    const p = f.join("; ");
+    throw new Error(p);
   }
-  const g = is(o);
-  if (g)
+  const h = tn(i);
+  if (h)
     try {
-      g(d, {
-        dataSource: t,
+      h(l, {
+        dataSource: r,
         schemaIndex: s,
         pathPrefix: a
       });
-    } catch (f) {
-      const h = f instanceof Error ? f.message : "Unknown validation error";
-      throw new Error(h);
+    } catch (p) {
+      const d = p instanceof Error ? p.message : "Unknown validation error";
+      throw new Error(d);
     }
-  return Gt(o, d);
+  return Ms(i, l);
 }
-function Ke(e) {
-  const { attribute: r, config: t } = e;
-  if (se(e) && Ur(r)) {
-    const { granularity: s } = r, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), o = Wr(t), i = Object.keys(o).length === 0 ? void 0 : o;
-    return jr(r, n, i);
+function Ot(e) {
+  const { attribute: t, config: r } = e;
+  if (be(e) && Dr(t)) {
+    const { granularity: s } = t, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), i = Sr(r), o = Object.keys(i).length === 0 ? void 0 : i;
+    return Or(t, n, o);
   }
   return e;
 }
-function ds(e) {
-  let r = [];
-  for (const t of e)
-    _(t) ? r = ge(t, r) : r = ge([Ke(t)], r);
-  return r != null ? r : [];
+function un(e) {
+  let t = [];
+  for (const r of e)
+    X(r) ? t = Le(r, t) : t = Le([Ot(r)], t);
+  return t != null ? t : [];
 }
-const ms = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], o = [];
-  return r.forEach((i, a) => {
+const cn = (e) => {
+  const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
+  return t.forEach((o, a) => {
     const u = {
       category: "filters",
       index: a,
-      input: i
+      input: o
     };
     try {
-      const c = C({
-        data: i,
-        context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
+      const c = S({
+        data: o,
+        context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !_(c) && !J(c) ? o.push(b(p({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !X(c) && !ne(c) ? i.push(F(g({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
       const m = c instanceof Error ? c.message : "Unknown error";
-      o.push(b(p({}, u), { message: m }));
+      i.push(F(g({}, u), { message: m }));
     }
-  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: ds(n) };
-}, ps = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? Ue(r) ? ms({
-    data: r,
-    context: { dataSource: t, schemaIndex: s }
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: un(n) };
+}, Oe = (e) => {
+  const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
+  return t ? Ft(t) ? cn({
+    data: t,
+    context: { dataSource: r, schemaIndex: s }
   }) : {
     success: !1,
     errors: [
       {
         category: "filters",
         index: -1,
-        input: r,
-        message: 'Invalid filters JSON. Expected an array of function calls with "function" and "args" properties.'
+        input: t,
+        message: "Invalid filters JSON. Expected an array of function calls with 'function' and 'args' properties."
       }
     ]
   } : { success: !0, data: [] };
-}, ys = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], o = [];
-  return r.forEach((i, a) => {
+}, 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,
-      input: i
+      input: o
     };
     try {
-      const c = C({
-        data: i,
-        context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
+      const c = S({
+        data: o,
+        context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      J(c) ? n.push(Ke(c)) : o.push(b(p({}, u), { message: "Invalid filter JSON" }));
+      ne(c) ? n.push(Ot(c)) : i.push(F(g({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
       const m = c instanceof Error ? c.message : "Unknown error";
-      o.push(b(p({}, u), { message: m }));
+      i.push(F(g({}, u), { message: m }));
     }
-  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
-}, gs = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? Ue(r) ? ys({
-    data: r,
-    context: { dataSource: t, schemaIndex: s }
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
+}, Me = (e) => {
+  const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
+  return t ? Ft(t) ? ln({
+    data: t,
+    context: { dataSource: r, schemaIndex: s }
   }) : {
     success: !1,
     errors: [
       {
         category: "highlights",
         index: -1,
-        input: r,
-        message: 'Invalid highlights JSON. Expected an array of function calls with "function" and "args" properties.'
+        input: t,
+        message: "Invalid highlights JSON. Expected an array of function calls with 'function' and 'args' properties."
       }
     ]
   } : { success: !0, data: [] };
-}, hs = (e, r, t) => {
-  const { dataSource: s, schemaIndex: n } = r;
+}, fn = (e, t) => {
+  if (e && !te(e))
+    return F(g({}, t), {
+      message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
+    });
+}, dn = (e, t, r) => {
+  const { dataSource: s, schemaIndex: n } = t;
   try {
-    const o = C({
+    const i = S({
       data: e,
       context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
     });
-    return le(o) ? { success: !0, data: o } : {
+    return Ee(i) ? { success: !0, data: i } : {
       success: !1,
-      errors: [b(p({}, t), { message: "Invalid measure JSON" })]
+      errors: [F(g({}, r), { message: "Invalid measure JSON" })]
     };
-  } catch (o) {
-    const i = o instanceof Error ? o.message : "Unknown error";
+  } catch (i) {
+    const o = i instanceof Error ? i.message : "Unknown error";
     return {
       success: !1,
-      errors: [b(p({}, t), { message: i })]
+      errors: [F(g({}, r), { message: o })]
     };
   }
-}, bs = (e, r, t) => r ? Ee(r) ? { measure: e.sort(Ce(r)) } : {
-  measure: e,
-  error: b(p({}, t), {
-    message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${r}".`
-  })
-} : { measure: e }, Fs = (e, r, t, s) => {
-  const n = C({
+}, mn = (e, t, r, s) => {
+  const n = S({
     data: e.column,
-    context: { dataSource: r, schemaIndex: t, pathPrefix: "" }
+    context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
   });
-  return le(n) ? bs(n, e.sortType, s) : { error: b(p({}, s), { message: "Invalid measure JSON" }) };
-}, ws = (e, r, t, s) => {
-  if (Ot(e))
-    return Fs(e, r, t, s);
+  if (!Ee(n))
+    return {
+      style: {},
+      error: F(g({}, s), { message: "Invalid measure JSON" })
+    };
+  const i = fn(e.sortType, s);
+  if (i) {
+    const a = _(e, "column");
+    return { measure: n, style: a, error: i };
+  }
+  const o = _(e, "column");
+  return { measure: n, style: o };
+}, pn = (e, t, r, s) => {
+  if (As(e))
+    return mn(e, t, r, s);
   if (E(e)) {
-    const n = hs(
+    const n = dn(
       e,
-      { dataSource: r, schemaIndex: t },
+      { dataSource: t, schemaIndex: r },
       s
     );
     return n.success ? { measure: n.data } : { error: n.errors[0] };
   }
   return {
-    error: b(p({}, s), {
-      message: 'Invalid measure item. Expected a function call (function/args) or object with "column" and optional "sortType".'
+    error: F(g({}, s), {
+      message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, qs = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  if (!r)
+}, Mt = (e) => {
+  const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
+  if (!t)
     return { success: !0, data: [] };
-  if (!Array.isArray(r))
+  if (!Array.isArray(t))
     return {
       success: !1,
       errors: [
         {
           category: "measures",
           index: -1,
-          input: r,
+          input: t,
           message: "Invalid measures JSON. Expected an array."
         }
       ]
     };
-  const n = [], o = [];
-  return r.forEach((i, a) => {
+  const n = [], i = [];
+  return t.forEach((o, a) => {
     const u = {
       category: "measures",
       index: a,
-      input: i
+      input: o
     };
     try {
-      const c = ws(i, t, s, u);
+      const c = pn(o, r, s, u);
       if (c.error) {
-        o.push(c.error);
+        i.push(c.error);
         return;
       }
-      c.measure && n.push(c.measure);
+      c.measure && n.push(
+        c.style !== void 0 ? { measure: c.measure, style: c.style } : { measure: c.measure }
+      );
     } catch (c) {
       const m = c instanceof Error ? c.message : "Unknown error";
-      o.push(b(p({}, u), { message: m }));
+      i.push(F(g({}, u), { message: m }));
     }
-  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
-}, Ps = (e) => {
-  const { data: r } = e, { dataSource: t, tables: s } = e.context, n = It(s), o = [], i = x(
-    () => Ut({
-      data: r.dimensions || [],
-      context: { dataSource: t, schemaIndex: n }
+  }), 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)])
+  ) : e;
+}
+function w(e, t, r) {
+  const s = e();
+  if (!s.success) {
+    const n = r ? s.errors.map(r) : s.errors;
+    return t.push(...n), null;
+  }
+  return s.data;
+}
+const ve = "$trend", Ne = "$forecast";
+function yn(e) {
+  return e.map(({ attribute: t, style: r }) => {
+    const s = r == null ? void 0 : r.sortType;
+    if (!s) return t;
+    const n = typeof s == "object" ? s.direction : s;
+    return te(n) ? t.sort(re(n)) : t;
+  });
+}
+function gn(e) {
+  var t, r;
+  return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1;
+}
+function hn(e) {
+  var t, r;
+  return (r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1;
+}
+function bn(e) {
+  var r, s;
+  const t = [];
+  for (const { measure: n, style: i } of e) {
+    const o = i == null ? void 0 : i.sortType, a = o && te(o) ? n.sort(re(o)) : n;
+    t.push(a), i != null && i.trend && !gn(n) && t.push(
+      Mr(n, `${ve}_${(r = n.name) != null ? r : "Measure"}`, i.trend)
+    ), i != null && i.forecast && !hn(n) && t.push(
+      vr(
+        n,
+        `${Ne}_${(s = n.name) != null ? s : "Measure"}`,
+        i.forecast
+      )
+    );
+  }
+  return t;
+}
+const Jn = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = xe(s), i = [], o = w(
+    () => wt({
+      data: t.dimensions || [],
+      context: { dataSource: r, schemaIndex: n }
     }),
-    o
-  ), a = x(
-    () => qs({
-      data: r.measures || [],
-      context: { dataSource: t, schemaIndex: n }
+    i
+  ), a = w(
+    () => Mt({
+      data: t.measures || [],
+      context: { dataSource: r, schemaIndex: n }
     }),
-    o
-  ), u = x(
-    () => ps({
-      data: r.filters || [],
-      context: { dataSource: t, schemaIndex: n }
+    i
+  ), u = w(
+    () => Oe({
+      data: t.filters || [],
+      context: { dataSource: r, schemaIndex: n }
     }),
-    o
+    i
   );
   let c = null;
-  return r.highlights && (c = x(
-    () => gs({
-      data: r.highlights || [],
-      context: { dataSource: t, schemaIndex: n }
+  return t.highlights && (c = w(
+    () => Me({
+      data: t.highlights || [],
+      context: { dataSource: r, schemaIndex: n }
     }),
-    o
-  )), o.length > 0 ? {
+    i
+  )), i.length > 0 ? {
     success: !1,
-    errors: o
+    errors: i
   } : {
     success: !0,
-    data: p({
-      dataSource: Jr(t),
-      dimensions: i || [],
-      measures: a || [],
+    data: g({
+      dataSource: Fe(r),
+      dimensions: o ? yn(o) : [],
+      measures: a ? bn(a) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function Es(e) {
-  const r = [], t = [];
+function Je(e) {
+  return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
+}
+function Re(e) {
+  const t = [], r = [];
   return e.forEach((s, n) => {
-    const o = () => typeof s.toJSON == "function" ? s.toJSON() : s;
-    if (!s.composeCode) {
-      t.push({
+    var l, f, h;
+    const i = Je(s) ? s.column : s, o = Je(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    if (!i.composeCode) {
+      r.push({
         category: "dimensions",
         index: n,
-        input: o(),
-        message: `Dimension at index ${n} (${s.name || "unnamed"}) is missing composeCode`
+        input: a(),
+        message: `Dimension at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
-    if (!s.composeCode.startsWith(w)) {
-      t.push({
+    if (!i.composeCode.startsWith(q)) {
+      r.push({
         category: "dimensions",
         index: n,
-        input: o(),
-        message: `Expected composeCode to start with "${w}" for dimension at index ${n} (${s.name || "unnamed"}). Got: "${s.composeCode}"`
+        input: a(),
+        message: `Expected composeCode to start with '${q}' for dimension at index ${n} (${i.name || "unnamed"}). Got: '${i.composeCode}'`
       });
       return;
     }
-    const i = s.getSort();
-    if (i !== void 0 && i !== ne.None) {
-      const a = {
-        column: s.composeCode,
-        sortType: $e(i)
-      };
-      r.push(a);
+    const u = (h = o != null && o.sortType ? re(o.sortType) : void 0) != null ? h : ((l = i.getSort) == null ? void 0 : l.call(i)) !== void 0 && ((f = i.getSort) == null ? void 0 : f.call(i)) !== B.None ? i.getSort() : void 0, c = o ? _(o, "column") : {};
+    if (u !== void 0 && u !== B.None || o && Object.keys(c).length > 0) {
+      const p = g(g({
+        column: i.composeCode
+      }, u !== void 0 && u !== B.None && { sortType: tt(u) }), c);
+      t.push(p);
     } else
-      r.push(s.composeCode);
-  }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
+      t.push(i.composeCode);
+  }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function Qe(e, r) {
-  const t = [];
-  let s = "", n = 0, o = !1, i = null;
+function vt(e, t) {
+  const r = [];
+  let s = "", n = 0, i = !1, o = null;
   for (let a = 0; a < e.length; a++) {
     const u = e[a], c = e[a + 1];
-    if (o) {
-      if (u !== i) {
+    if (i) {
+      if (u !== o) {
         s += u;
         continue;
       }
-      if (c === i) {
+      if (c === o) {
         s += u + c, a++;
         continue;
       }
-      o = !1, i = null, s += u;
+      i = !1, o = null, s += u;
       continue;
     } else {
       if (u === "'" || u === '"') {
-        o = !0, i = u, s += u;
+        i = !0, o = u, s += u;
         continue;
       }
-      if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === r && n === 0) {
-        t.push(s.trim()), s = "";
+      if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === t && n === 0) {
+        r.push(s.trim()), s = "";
         continue;
       }
     }
     s += u;
   }
-  return s.trim() && t.push(s.trim()), t;
+  return s.trim() && r.push(s.trim()), r;
 }
-function Cs(e, r) {
-  let t = 0, s = !1, n = null;
-  for (let o = 0; o < e.length; o++) {
-    const i = e[o], a = e[o + 1];
+function Fn(e, t) {
+  let r = 0, s = !1, n = null;
+  for (let i = 0; i < e.length; i++) {
+    const o = e[i], a = e[i + 1];
     if (s) {
-      if (i !== n) continue;
+      if (o !== n) continue;
       if (a === n) {
-        o++;
+        i++;
         continue;
       }
       s = !1, n = null;
     } else {
-      if (i === "'" || i === '"') {
-        s = !0, n = i;
+      if (o === "'" || o === '"') {
+        s = !0, n = o;
         continue;
       }
-      if ("([{".includes(i) && t++, ")]}".includes(i) && t--, i === r && t === 0) return o;
+      if ("([{".includes(o) && r++, ")]}".includes(o) && r--, o === t && r === 0) return i;
     }
   }
   return -1;
 }
-function $s(e) {
+function wn(e) {
   return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
 }
 function V(e) {
   if (!e || typeof e != "string")
     throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
-  const r = e.trim();
-  if (!r)
-    throw new Error("Invalid composeCode: empty string");
-  const t = r.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
+  const t = e.trim();
   if (!t)
-    throw new Error(`Invalid composeCode format: expected function call, got "${r}"`);
-  const s = t[1], n = t[2], o = Ye(n);
+    throw new Error("Invalid composeCode: empty string");
+  const r = t.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
+  if (!r)
+    throw new Error(`Invalid composeCode format: expected function call, got '${t}'`);
+  const s = r[1], n = r[2], i = Nt(n);
   return {
     function: s,
-    args: o
+    args: i
   };
 }
-function Ye(e) {
-  return e.trim() ? Qe(e, ",").map(He) : [];
+function Nt(e) {
+  return e.trim() ? vt(e, ",").map(Rt) : [];
 }
-function He(e) {
+function Rt(e) {
   if (!e)
     throw new Error("Cannot parse empty argument value");
   if (e === "null")
@@ -2545,40 +2803,40 @@ function He(e) {
   if (e.match(/^-?\d+(\.\d+)?$/))
     return parseFloat(e);
   if (e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"')) {
-    const t = e[0];
-    return e.slice(1, -1).replace(new RegExp(`${t}${t}`, "g"), t);
+    const r = e[0];
+    return e.slice(1, -1).replace(new RegExp(`${r}${r}`, "g"), r);
   }
   if (e.startsWith("[") && e.endsWith("]")) {
-    const t = e.slice(1, -1).trim();
-    if (!t)
+    const r = e.slice(1, -1).trim();
+    if (!r)
       return [];
-    const s = Ye(t);
+    const s = Nt(r);
     return s.every((n) => typeof n == "string"), s;
   }
   if (e.startsWith("{") && e.endsWith("}")) {
-    const t = e.slice(1, -1).trim();
-    return t ? xs(t) : {};
+    const r = e.slice(1, -1).trim();
+    return r ? An(r) : {};
   }
   return e.includes("(") && e.includes(")") ? V(e) : (e.startsWith("DM."), e);
 }
-function As(e) {
-  const r = Cs(e, ":");
-  if (r === -1)
-    throw new Error(`Invalid object property: expected "key: value", got "${e}"`);
-  const t = $s(e.slice(0, r).trim()), s = He(e.slice(r + 1).trim());
-  return [t, s];
+function qn(e) {
+  const t = Fn(e, ":");
+  if (t === -1)
+    throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
+  const r = wn(e.slice(0, t).trim()), s = Rt(e.slice(t + 1).trim());
+  return [r, s];
 }
-function xs(e) {
+function An(e) {
   if (!e.trim()) return {};
-  const r = Qe(e, ",").map(As).filter(([, t]) => t !== null);
-  return Object.fromEntries(r);
+  const t = vt(e, ",").map(qn).filter(([, r]) => r !== null);
+  return Object.fromEntries(t);
 }
-const re = "Unknown error";
-function Ds(e) {
+const ge = "Unknown error";
+function Ie(e) {
   if (!e)
     return { success: !0, data: [] };
-  const r = [];
-  if (Gr(e)) {
+  const t = [];
+  if (Nr(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -2594,7 +2852,7 @@ function Ds(e) {
     try {
       return { success: !0, data: [V(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : re;
+      const n = s instanceof Error ? s.message : ge;
       return {
         success: !1,
         errors: [
@@ -2602,162 +2860,914 @@ function Ds(e) {
             category: "filters",
             index: -1,
             input: e,
-            message: `Failed to parse composeCode for FilterRelations: ${n}. ComposeCode: "${e.composeCode}"`
+            message: `Failed to parse composeCode for FilterRelations: ${n}. ComposeCode: '${e.composeCode}'`
           }
         ]
       };
     }
   }
-  const t = [];
+  const r = [];
   return e.forEach((s, n) => {
+    var i;
     if (!s.composeCode) {
-      r.push({
+      t.push({
         category: "filters",
         index: n,
         input: s,
-        message: `Filter at index ${n} (${s.name || "unnamed"}) is missing composeCode`
+        message: `Filter at index ${n} (${(i = s.name) != null ? i : "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
       const o = V(s.composeCode);
-      t.push(o);
+      r.push(o);
     } catch (o) {
-      const i = o instanceof Error ? o.message : re;
-      r.push({
+      const a = o instanceof Error ? o.message : ge;
+      t.push({
         category: "filters",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for filter at index ${n}: ${i}. ComposeCode: "${s.composeCode}"`
+        message: `Failed to parse composeCode for filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
-  }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
+  }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function Ms(e) {
+function ke(e) {
   if (!e)
     return { success: !0, data: [] };
-  const r = [], t = [];
+  const t = [], r = [];
   return e.forEach((s, n) => {
+    var i;
     if (!s.composeCode) {
-      t.push({
+      r.push({
         category: "highlights",
         index: n,
         input: s,
-        message: `Highlight filter at index ${n} (${s.name || "unnamed"}) is missing composeCode`
+        message: `Highlight filter at index ${n} (${(i = s.name) != null ? i : "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
       const o = V(s.composeCode);
-      r.push(o);
+      t.push(o);
     } catch (o) {
-      const i = o instanceof Error ? o.message : re;
-      t.push({
+      const a = o instanceof Error ? o.message : ge;
+      r.push({
         category: "highlights",
         index: n,
         input: s,
-        message: `Failed to parse composeCode for highlight filter at index ${n}: ${i}. ComposeCode: "${s.composeCode}"`
+        message: `Failed to parse composeCode for highlight filter at index ${n}: ${a}. ComposeCode: '${s.composeCode}'`
       });
     }
-  }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
+  }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
+}
+function Ye(e) {
+  return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Ss(e) {
-  const r = [], t = [];
+function Be(e) {
+  const t = [], r = [];
   return e.forEach((s, n) => {
-    const o = () => typeof s.toJSON == "function" ? s.toJSON() : s;
-    if (!s.composeCode) {
-      t.push({
+    var u, c, m;
+    const i = Ye(s) ? s.column : s, o = Ye(s) ? s : void 0, a = () => typeof i.toJSON == "function" ? i.toJSON() : i;
+    if (!i.composeCode) {
+      r.push({
         category: "measures",
         index: n,
-        input: o(),
-        message: `Measure at index ${n} (${s.name || "unnamed"}) is missing composeCode`
+        input: a(),
+        message: `Measure at index ${n} (${i.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const i = V(s.composeCode), a = s.getSort();
-      if (a !== void 0 && a !== ne.None) {
-        const u = {
-          column: i,
-          sortType: $e(a)
-        };
-        r.push(u);
+      const l = V(i.composeCode), f = (m = o != null && o.sortType ? re(o.sortType) : void 0) != null ? m : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== B.None ? i.getSort() : void 0;
+      if (f !== void 0 && f !== B.None || o && Object.keys(_(o, "column")).length > 0) {
+        const p = o ? _(o, "column") : {}, d = g(g({
+          column: l
+        }, f !== void 0 && f !== B.None && { sortType: tt(f) }), p);
+        t.push(d);
       } else
-        r.push(i);
-    } catch (i) {
-      const a = i instanceof Error ? i.message : "Unknown error";
-      t.push({
+        t.push(l);
+    } catch (l) {
+      const f = l instanceof Error ? l.message : "Unknown error";
+      r.push({
         category: "measures",
         index: n,
-        input: o(),
-        message: `Failed to parse composeCode for measure at index ${n} (${s.name || "unnamed"}): ${a}. ComposeCode: "${s.composeCode}"`
+        input: a(),
+        message: `Failed to parse composeCode for measure at index ${n} (${i.name || "unnamed"}): ${f}. ComposeCode: '${i.composeCode}'`
       });
     }
-  }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
+  }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function te(e) {
-  return typeof e == "string" ? e.replace(/\[\[([^\]]+)\]\]/g, "$1") : Array.isArray(e) ? e.map(te) : e !== null && typeof e == "object" ? Object.fromEntries(
-    Object.entries(e).map(([r, t]) => [r, te(t)])
-  ) : e;
+function Ge(e) {
+  var t, r, s, n;
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(ve)) != null ? n : !1);
 }
-function Bs(e) {
-  const r = [], t = x(
-    () => Es(e.dimensions || []),
-    r
-  ), s = x(
-    () => Ss(e.measures || []),
-    r
-  ), n = x(
-    () => Ds(e.filters),
-    r
+function Qe(e) {
+  var t, r, s, n;
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(Ne)) != null ? n : !1);
+}
+function He(e) {
+  try {
+    const t = V(e.trim());
+    return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
+  } catch (t) {
+    return;
+  }
+}
+function Cn(e) {
+  var s, n, i;
+  if (!(e != null && e.length)) return [];
+  const t = /* @__PURE__ */ new Set(), r = [];
+  for (let o = 0; o < e.length; o++) {
+    if (t.has(o)) continue;
+    const a = e[o];
+    if (Ge(a) || Qe(a)) {
+      r.push(a);
+      continue;
+    }
+    const u = (s = a.name) != null ? s : "Measure", c = `${ve}_${u}`, m = `${Ne}_${u}`;
+    let l, f, h = o + 1;
+    if (h < e.length && !t.has(h) && Ge(e[h]) && e[h].name === c) {
+      const p = (n = e[h].composeCode) == null ? void 0 : n.trim();
+      p && (l = He(p), t.add(h), h++);
+    }
+    if (h < e.length && !t.has(h) && Qe(e[h]) && e[h].name === m) {
+      const p = (i = e[h].composeCode) == null ? void 0 : i.trim();
+      p && (f = He(p), t.add(h));
+    }
+    l !== void 0 || f !== void 0 ? r.push(g(g({
+      column: a
+    }, l && Object.keys(l).length > 0 && { trend: l }), f && Object.keys(f).length > 0 && { forecast: f })) : r.push(a);
+  }
+  return r;
+}
+function Yn(e) {
+  const t = [], r = w(
+    () => Re(e.dimensions || []),
+    t
+  ), s = Cn(e.measures || []), n = w(
+    () => Be(s),
+    t
+  ), i = w(
+    () => Ie(e.filters),
+    t
   );
   let o = null;
-  if (e.highlights && e.highlights.length > 0 && (o = x(
-    () => Ms(e.highlights),
-    r
-  )), r.length > 0)
+  if (e.highlights && e.highlights.length > 0 && (o = w(
+    () => ke(e.highlights),
+    t
+  )), t.length > 0)
     return {
       success: !1,
-      errors: r
+      errors: t
     };
-  const i = p({
-    dimensions: t || [],
-    measures: s || [],
-    filters: n || []
+  const a = g({
+    dimensions: r || [],
+    measures: n || [],
+    filters: i || []
   }, o && { highlights: o });
   return {
     success: !0,
     // Strip [[delimiters]] from all strings to preserve original names with spaces
-    data: te(i)
+    data: Q(a)
   };
 }
-function Ts(e) {
-  const { filters: r, relations: t } = Yr(
+const It = new Set(
+  Rr.filter((e) => e !== "image")
+), Xe = Object.freeze([...It]), le = /* @__PURE__ */ new Set([
+  "category",
+  "value",
+  "breakBy",
+  "breakByPoint",
+  "x",
+  "y",
+  "breakByColor",
+  "size",
+  "boxType",
+  "outliers",
+  "geo",
+  "colorBy",
+  "details",
+  "color",
+  "date",
+  "columns",
+  "rows",
+  "values",
+  "secondary",
+  "min",
+  "max",
+  "seriesToColorMap"
+]), En = {
+  line: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  area: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  bar: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  column: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  streamgraph: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  polar: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  pie: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  funnel: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  treemap: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  sunburst: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  },
+  scatter: {
+    validAxes: /* @__PURE__ */ new Set(["x", "y", "breakByPoint", "breakByColor", "size", "seriesToColorMap"]),
+    requiredAxes: []
+  },
+  table: {
+    validAxes: /* @__PURE__ */ new Set(["columns"]),
+    requiredAxes: ["columns"]
+  },
+  indicator: {
+    validAxes: /* @__PURE__ */ new Set(["value", "secondary", "min", "max"]),
+    requiredAxes: []
+  },
+  boxplot: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "boxType", "outliers"]),
+    requiredAxes: ["value"]
+  },
+  areamap: {
+    validAxes: /* @__PURE__ */ new Set(["geo", "color"]),
+    requiredAxes: ["geo"]
+  },
+  scattermap: {
+    validAxes: /* @__PURE__ */ new Set(["geo", "size", "colorBy", "details"]),
+    requiredAxes: ["geo"]
+  },
+  "calendar-heatmap": {
+    validAxes: /* @__PURE__ */ new Set(["date", "value"]),
+    requiredAxes: ["date", "value"]
+  },
+  arearange: {
+    validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
+    requiredAxes: ["category", "value"]
+  }
+}, xn = /* @__PURE__ */ new Set([
+  "category",
+  "breakBy",
+  "breakByPoint",
+  "rows",
+  "geo",
+  "details",
+  "date"
+]), $n = /* @__PURE__ */ new Set([
+  "value",
+  "size",
+  "colorBy",
+  "boxType",
+  "outliers",
+  "values",
+  "secondary",
+  "min",
+  "max",
+  "color"
+]);
+function Tn(e) {
+  const t = En[e];
+  if (t)
+    return {
+      validAxes: new Set(t.validAxes),
+      requiredAxes: Object.freeze([...t.requiredAxes])
+    };
+}
+function kt(e) {
+  return typeof e == "string" && It.has(e);
+}
+function Dn(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || xn.has(e))
+    return !0;
+  if ($n.has(e))
+    return !1;
+  const s = Array.isArray(t) ? t[0] : t;
+  if (!s)
+    return !0;
+  let n;
+  return T(s) && "column" in s && (n = s.column), !(E(s) || n !== void 0 && E(n));
+}
+function Sn(e) {
+  const t = [], r = {
+    chartType: "",
+    dataOptions: {}
+  };
+  if (!T(e))
+    return t.push({
+      category: "chartType",
+      index: -1,
+      input: e,
+      message: "Expected an object"
+    }), { normalized: r, errors: t };
+  const s = e.chartType;
+  if (s === void 0) {
+    const i = Object.keys(e), o = M("chartType", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'chartType'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
+    t.push({
+      category: "chartType",
+      index: -1,
+      input: u,
+      message: `chartType is required.${a}`
+    });
+  } else if (kt(s))
+    r.chartType = s;
+  else {
+    const i = M(String(s), Xe, (u) => u), o = i && i.distance <= x ? ` Did you mean '${i.best}'?` : "", a = Xe.slice(0, 8).join(", ");
+    t.push({
+      category: "chartType",
+      index: -1,
+      input: s,
+      message: `Invalid chartType '${s}'. Valid types: ${a}, ...${o}`
+    });
+  }
+  const n = e.dataOptions;
+  if (n === void 0) {
+    const i = Object.keys(e), o = M("dataOptions", i, (c) => c), a = o && o.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${o.best}')` : "", u = o && o.distance <= x ? { [o.best]: e[o.best] } : e;
+    t.push({
+      category: "dataOptions",
+      index: -1,
+      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 On(e) {
+  return e.map(
+    ({ attribute: t, style: r }) => r ? g({ column: t }, r) : t
+  );
+}
+function Mn(e) {
+  return e.map(
+    ({ measure: t, style: r }) => r ? g({ column: t }, r) : t
+  );
+}
+function Bt(e) {
+  return Array.isArray(e) ? e : [e];
+}
+function he(e) {
+  return (t) => F(g({}, t), {
+    category: "dataOptions",
+    index: e
+  });
+}
+function ee(e, t, r, s, n) {
+  const i = t ? Bt(
+    t
+  ) : [];
+  if (i.length === 0)
+    return [];
+  if (r === "dimension") {
+    const a = w(
+      () => wt({
+        data: i,
+        context: s
+      }),
+      n,
+      he(e)
+    );
+    return a !== null ? On(a) : null;
+  }
+  const o = w(
+    () => Mt({
+      data: i,
+      context: s
+    }),
+    n,
+    he(e)
+  );
+  return o !== null ? Mn(o) : null;
+}
+function Ze(e, t, r) {
+  const s = Array.isArray(t) ? t : t != null ? [t] : [];
+  if (r === "dimension") {
+    const i = Re(
+      s
+    );
+    return i.success ? { success: !0, data: i.data } : {
+      success: !1,
+      errors: i.errors.map((o) => F(g({}, o), {
+        category: "dataOptions",
+        index: e
+      }))
+    };
+  }
+  const n = Be(s);
+  return n.success ? { success: !0, data: n.data } : {
+    success: !1,
+    errors: n.errors.map((i) => F(g({}, i), {
+      category: "dataOptions",
+      index: e
+    }))
+  };
+}
+function vn(e, t) {
+  let r;
+  T(e) && "column" in e && (r = e.column);
+  const n = !(E(e) || r !== void 0 && E(r)) ? "dimension" : "measure", i = [], o = ee("columns", [e], n, t, i);
+  return o !== null ? { success: !0, data: o } : { success: !1, errors: i };
+}
+function Nn(e, t, r, s) {
+  const n = [];
+  for (const i of e) {
+    const o = w(
+      () => vn(i, t),
+      r,
+      s
+    );
+    o && n.push(...o);
+  }
+  return n;
+}
+function Rn(e, t, r) {
+  if (!e || !T(e))
+    return r.push({
+      category: "dataOptions",
+      index: -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 (!le.has(l)) {
+      const f = M(l, [...le], (p) => p), h = f && f.distance <= x ? ` Did you mean '${f.best}'?` : "";
+      f && f.distance <= x && u.set(l, f.best), r.push({
+        category: "dataOptions",
+        index: l,
+        input: o[l],
+        message: `Unknown dataOptions key '${l}'.${h}`
+      });
+    }
+  const c = n ? Tn(n) : void 0;
+  if (c) {
+    for (const l of a)
+      if (l !== "seriesToColorMap" && !c.validAxes.has(l) && le.has(l)) {
+        const f = M(l, [...c.validAxes], (d) => d), h = f && f.distance <= x ? ` Did you mean '${f.best}'?` : "", p = [...c.validAxes].join(", ");
+        r.push({
+          category: "dataOptions",
+          index: l,
+          input: o[l],
+          message: `Axis '${l}' is not valid for chart type '${n}'. Valid axes: ${p}.${h}`
+        });
+      }
+    for (const l of c.requiredAxes)
+      [...u.values()].includes(l) || (!(l in o) || o[l] == null) && r.push({
+        category: "dataOptions",
+        index: l,
+        input: null,
+        message: `Chart type '${n}' requires '${c.requiredAxes.join(
+          "' and '"
+        )}'. Missing: ${l}.`
+      });
+    n === "indicator" && (["value", "secondary", "min", "max"].some(
+      (h) => h in o && o[h] != null
+    ) || r.push({
+      category: "dataOptions",
+      index: -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,
+      input: e,
+      message: "Scatter chart requires at least one of: x, y."
+    }));
+  }
+  if (r.length > i)
+    return null;
+  const m = Object.entries(e);
+  for (const [l, f] of m) {
+    if (!f) continue;
+    if (l === "seriesToColorMap") {
+      s[l] = f;
+      continue;
+    }
+    if (l === "columns") {
+      s[l] = Nn(
+        Bt(f),
+        t,
+        r,
+        he("columns")
+      );
+      continue;
+    }
+    const h = Dn(l, f, n) ? "dimension" : "measure", p = ee(
+      l,
+      f,
+      h,
+      t,
+      r
+    );
+    if (p !== null) {
+      const d = n === "calendar-heatmap" && l === "value";
+      s[l] = d || !Array.isArray(f) ? p[0] : p;
+    }
+  }
+  return r.length > i ? null : s;
+}
+function In(e) {
+  if (typeof e != "string") return "iqr";
+  const t = e.split("/")[1];
+  return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
+}
+const Gn = (e) => {
+  var d;
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Sn(t);
+  if (o.length > 0)
+    return { success: !1, errors: o };
+  const a = i.chartType, u = xe(n), c = [];
+  let m = Rn(
+    i.dataOptions,
+    { dataSource: s, schemaIndex: u, chartType: a },
+    c
+  );
+  if (a === "boxplot" && m) {
+    const b = In((d = i.styleOptions) == null ? void 0 : d.subtype), A = b === "iqr" || b === "standardDeviation";
+    m = F(g({}, m), { boxType: b, outliersEnabled: A });
+  }
+  let l = null;
+  i.filters && i.filters.length > 0 && (l = w(
+    () => Oe({
+      data: i.filters || [],
+      context: { dataSource: s, schemaIndex: u }
+    }),
+    c
+  ));
+  let f = null;
+  if (i.highlights && i.highlights.length > 0 && (f = w(
+    () => Me({
+      data: i.highlights || [],
+      context: { dataSource: s, schemaIndex: u }
+    }),
+    c
+  )), c.length > 0 || m === null)
+    return {
+      success: !1,
+      errors: c
+    };
+  if (!kt(i.chartType))
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "chartType",
+          index: -1,
+          input: i.chartType,
+          message: "Invalid chartType"
+        }
+      ]
+    };
+  const h = i.chartType;
+  return {
+    success: !0,
+    data: g(g(g({
+      dataSet: Fe(s),
+      chartType: h,
+      dataOptions: m
+    }, i.styleOptions && {
+      // Pass-through NLQ JSON; shape matches ChartStyleOptions.
+      styleOptions: i.styleOptions
+    }), l && { filters: l }), f && { highlights: f })
+  };
+}, Qn = (e) => {
+  const t = [];
+  if (!e.chartType)
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "dimensions",
+          index: -1,
+          input: e,
+          message: "chartType is required"
+        }
+      ]
+    };
+  if (!e.dataOptions)
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "dimensions",
+          index: -1,
+          input: e,
+          message: "dataOptions is required"
+        }
+      ]
+    };
+  let r = null;
+  const s = kn(e.dataOptions);
+  s.success ? r = s.data : t.push(...s.errors);
+  let n;
+  if (e.filters) {
+    const u = w(
+      () => Ie(e.filters),
+      t
+    );
+    n = u != null ? u : void 0;
+  }
+  let i;
+  if (e.highlights && e.highlights.length > 0) {
+    const u = w(
+      () => ke(e.highlights),
+      t
+    );
+    i = u != null ? u : void 0;
+  }
+  if (t.length > 0 || r === null)
+    return { success: !1, errors: t };
+  const o = g(g(g({
+    chartType: e.chartType,
+    dataOptions: r
+  }, e.styleOptions && {
+    styleOptions: e.styleOptions
+  }), n && n.length > 0 && { filters: n }), i && i.length > 0 && { highlights: i });
+  return {
+    success: !0,
+    data: Q(
+      o
+    )
+  };
+};
+function kn(e) {
+  const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
+  for (const [n, i] of Object.entries(e)) {
+    if (n === "seriesToColorMap" && i) {
+      t[n] = i;
+      continue;
+    }
+    if (s.has(n) || i == null) {
+      i != null && (t[n] = i);
+      continue;
+    }
+    const o = Array.isArray(i) ? i : [i], a = Array.isArray(i), u = [], c = [];
+    for (let m = 0; m < o.length; m++) {
+      const l = o[m], h = Bn(l) ? Re([
+        l
+      ]) : Be([l]);
+      h.success ? u.push(...h.data) : h.errors.forEach((p) => {
+        var d;
+        c.push(F(g({}, p), { index: m, input: (d = p.input) != null ? d : l }));
+      });
+    }
+    if (c.length > 0) {
+      r.push(...c);
+      continue;
+    }
+    t[n] = a ? u : u[0];
+  }
+  return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
+}
+function Bn(e) {
+  const t = Array.isArray(e) ? e[0] : e;
+  if (!t || !T(t))
+    return !0;
+  const r = "column" in t && t.column != null && T(t.column) ? t.column : t;
+  if ("composeCode" in r) {
+    const s = r.composeCode;
+    if (typeof s == "string" && s.startsWith("DM."))
+      return !0;
+    if (typeof s == "string" && (s.includes("measureFactory") || s.includes("Formula")))
+      return !1;
+  }
+  if ("type" in r) {
+    const s = r.type;
+    if (s === "basemeasure" || s === "calculatedmeasure")
+      return !1;
+  }
+  return !("aggregation" in r || "attribute" in r && "aggregation" in r);
+}
+const et = ["rows", "columns", "values", "grandTotals"];
+function zn(e) {
+  if (!T(e)) return !1;
+  const t = Object.keys(e);
+  return t.every((r) => r === "rows" || r === "columns") && t.every((r) => typeof e[r] == "boolean");
+}
+function Pn(e) {
+  const t = [], r = {
+    dataOptions: {}
+  };
+  if (!T(e))
+    return t.push({
+      category: "dataOptions",
+      index: -1,
+      input: e,
+      message: "Expected an object"
+    }), { normalized: r, errors: t };
+  const s = e.dataOptions;
+  if (s === void 0) {
+    const n = Object.keys(e), i = M("dataOptions", n, (u) => u), o = i && i.distance <= x ? ` Did you mean 'dataOptions'? (You may have typed '${i.best}')` : "", a = i && i.distance <= x ? { [i.best]: e[i.best] } : e;
+    t.push({
+      category: "dataOptions",
+      index: -1,
+      input: a,
+      message: `dataOptions is required.${o}`
+    });
+  } else if (T(s)) {
+    const n = s;
+    r.dataOptions = n;
+    for (const o of Object.keys(n))
+      if (!et.includes(o)) {
+        const a = M(o, [...et], (c) => c), u = a && a.distance <= x ? ` Did you mean '${a.best}'?` : "";
+        t.push({
+          category: "dataOptions",
+          index: o,
+          input: n[o],
+          message: `Unknown dataOptions key '${o}'. Valid keys: rows, columns, values, grandTotals.${u}`
+        });
+      }
+    for (const o of ["rows", "columns", "values"]) {
+      const a = n[o];
+      a != null && !Array.isArray(a) && t.push({
+        category: "dataOptions",
+        index: o,
+        input: a,
+        message: `dataOptions.${o} must be an array`
+      });
+    }
+    const i = n.grandTotals;
+    i != null && !zn(i) && t.push({
+      category: "dataOptions",
+      index: "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 Ln(e, t, r) {
+  if (!e || typeof e != "object")
+    return r.push({
+      category: "dataOptions",
+      index: -1,
+      input: e,
+      message: "dataOptions is required"
+    }), null;
+  const s = {}, n = r.length;
+  for (const o of ["rows", "columns"]) {
+    const a = ee(
+      o,
+      e[o],
+      "dimension",
+      t,
+      r
+    );
+    a && (s[o] = a);
+  }
+  const i = ee(
+    "values",
+    e.values,
+    "measure",
+    t,
+    r
+  );
+  return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
+}
+const Hn = (e) => {
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: o } = Pn(t);
+  if (o.length > 0)
+    return { success: !1, errors: o };
+  const a = xe(n), u = [], c = Ln(
+    i.dataOptions,
+    { dataSource: s, schemaIndex: a },
+    u
+  );
+  let m = null;
+  i.filters && i.filters.length > 0 && (m = w(
+    () => Oe({
+      data: i.filters || [],
+      context: { dataSource: s, schemaIndex: a }
+    }),
+    u
+  ));
+  let l = null;
+  return i.highlights && i.highlights.length > 0 && (l = w(
+    () => Me({
+      data: i.highlights || [],
+      context: { dataSource: s, schemaIndex: a }
+    }),
+    u
+  )), u.length > 0 || c === null ? {
+    success: !1,
+    errors: u
+  } : {
+    success: !0,
+    data: g(g(g({
+      dataSet: Fe(s),
+      dataOptions: c
+    }, i.styleOptions && { styleOptions: i.styleOptions }), m && { filters: m }), l && { highlights: l })
+  };
+}, Xn = (e) => {
+  const t = [];
+  if (!e.dataOptions)
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "dataOptions",
+          index: -1,
+          input: e,
+          message: "dataOptions is required"
+        }
+      ]
+    };
+  const r = e.dataOptions, s = {};
+  for (const c of ["rows", "columns"]) {
+    const m = r[c];
+    if (m && m.length > 0) {
+      const l = Ze(c, m, "dimension");
+      l.success ? s[c] = l.data : t.push(...l.errors);
+    }
+  }
+  const n = r.values;
+  if (n && n.length > 0) {
+    const c = Ze("values", n, "measure");
+    c.success ? s.values = c.data : t.push(...c.errors);
+  }
+  r.grandTotals !== void 0 && (s.grandTotals = r.grandTotals);
+  let i;
+  if (e.filters) {
+    const c = w(
+      () => Ie(e.filters),
+      t
+    );
+    i = c != null ? c : void 0;
+  }
+  let o;
+  if (e.highlights && e.highlights.length > 0) {
+    const c = w(
+      () => ke(e.highlights),
+      t
+    );
+    o = c != null ? c : void 0;
+  }
+  if (t.length > 0)
+    return { success: !1, errors: t };
+  const a = g(g(g({
+    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
+    )
+  };
+};
+function _n(e) {
+  const { filters: t, relations: r } = Br(
     e.filters || []
   );
   return {
     dataSource: e.dataSource,
     dimensions: e.dimensions,
     measures: e.measures,
-    filters: r,
-    filterRelations: t,
+    filters: t,
+    filterRelations: r,
     highlights: e.highlights
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function ks(e, r, t = !1) {
-  const s = Ts(e), n = Kr(s, r);
-  return Qr(n, t);
+function Zn(e, t, r = !1) {
+  const s = _n(e), n = Ir(s, t);
+  return kr(n, r);
 }
 export {
-  zs as CustomSuperJSON,
-  _s as EMPTY_EXPANDED_QUERY_MODEL,
-  Us as EMPTY_SIMPLE_QUERY_MODEL,
-  Ws as isByIdDashboardCodeParams,
-  js as isByIdWidgetCodeParams,
-  Js as isClientSideDashboardCodeParams,
-  Gs as isClientSideWidgetCodeParams,
-  Ps as translateQueryFromJSON,
-  Bs as translateQueryToJSON,
-  ks as translateQueryToJaql
+  Kn as CustomSuperJSON,
+  ri as EMPTY_EXPANDED_QUERY_MODEL,
+  si as EMPTY_SIMPLE_QUERY_MODEL,
+  ni as isByIdDashboardCodeParams,
+  ii as isByIdWidgetCodeParams,
+  oi as isClientSideDashboardCodeParams,
+  ai as isClientSideWidgetCodeParams,
+  Gn as translateChartFromJSON,
+  Qn as translateChartToJSON,
+  Hn as translatePivotTableFromJSON,
+  Xn as translatePivotTableToJSON,
+  Jn as translateQueryFromJSON,
+  Yn as translateQueryToJSON,
+  Zn as translateQueryToJaql
 };