@sisense/sdk-ui 2.29.0 → 2.30.0

package/dist/analytics-composer/node.js

@@ -1,35 +1,35 @@
-var ur = Object.defineProperty, cr = Object.defineProperties;
-var lr = Object.getOwnPropertyDescriptors;
-var ae = Object.getOwnPropertySymbols;
-var Je = Object.prototype.hasOwnProperty, Ke = Object.prototype.propertyIsEnumerable;
-var je = (e, t, r) => t in e ? ur(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, l = (e, t) => {
+var cr = Object.defineProperty, lr = Object.defineProperties;
+var fr = Object.getOwnPropertyDescriptors;
+var oe = Object.getOwnPropertySymbols;
+var Ke = Object.prototype.hasOwnProperty, Ge = Object.prototype.propertyIsEnumerable;
+var Je = (e, t, r) => t in e ? cr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, l = (e, t) => {
   for (var r in t || (t = {}))
-    Je.call(t, r) && je(e, r, t[r]);
-  if (ae)
-    for (var r of ae(t))
-      Ke.call(t, r) && je(e, r, t[r]);
+    Ke.call(t, r) && Je(e, r, t[r]);
+  if (oe)
+    for (var r of oe(t))
+      Ge.call(t, r) && Je(e, r, t[r]);
   return e;
-}, E = (e, t) => cr(e, lr(t));
-var Fe = (e, t) => {
+}, E = (e, t) => lr(e, fr(t));
+var Ee = (e, t) => {
   var r = {};
   for (var s in e)
-    Je.call(e, s) && t.indexOf(s) < 0 && (r[s] = e[s]);
-  if (e != null && ae)
-    for (var s of ae(e))
-      t.indexOf(s) < 0 && Ke.call(e, s) && (r[s] = e[s]);
+    Ke.call(e, s) && t.indexOf(s) < 0 && (r[s] = e[s]);
+  if (e != null && oe)
+    for (var s of oe(e))
+      t.indexOf(s) < 0 && Ge.call(e, s) && (r[s] = e[s]);
   return r;
 };
-import { f as fr, J as dr } from "../types-7YG0uOzO.js";
-import { b as Ki, E as Gi, a as Yi, i as Hi, e as Qi, d as Xi } from "../types-7YG0uOzO.js";
-import { ci as mr, bq as pr, cj as gr, ck as yr, cl as hr, cm as br, cn as Fr, at as ve, co as Er, as as Ar, cp as Tr, b9 as wr, au as Sr, cq as Cr, bc as Or, ba as qr, aM as $r, b8 as Dr, bb as xr, cr as Nr, aq as vr, bp as Mr, cs as Rr, e as Ir, ct as kr, cu as Lr, cv as Br, cw as zr, cx as Ur, cy as _r, cz as Pr, cA as Wr, cB as Vr, cC as jr, cD as Jr, al as Kr, cE as Gr, cF as Yr, ap as U, l as te, b as Hr, x as q, a1 as Qr, ad as _, ao as pt, cG as Xr, cH as Zr, cI as es, M as j, cb as ts, cJ as rs, aI as ss, af as Ge, ar as de, cf as ns, cg as is, bO as gt, cK as yt, a8 as as, cL as ht, cM as bt, A as os, bY as Ft, cN as us, bF as cs, aA as ls } from "../apply-styled-options-to-query-CaP4IMrQ.js";
-function fs(e, t) {
+import { f as dr, J as mr } from "../types-DecTaxy7.js";
+import { b as Hi, E as Qi, a as Xi, i as Zi, e as ea, d as ta } from "../types-DecTaxy7.js";
+import { bt as pr, br as gr, cr as yr, bs as hr, aW as br, cs as Fr, ct as Er, aw as Me, cu as Ar, av as Tr, cv as wr, bh as Sr, ax as Cr, cw as Or, bk as $r, bi as qr, aS as Dr, bg as xr, bj as Nr, cx as vr, at as Mr, bB as Rr, cy as Ir, e as kr, cz as Lr, cA as Br, cB as _r, cC as zr, cD as Ur, cE as Pr, cF as Wr, cG as Vr, cH as jr, cI as Jr, cJ as Kr, as as Gr, cK as Yr, cL as Hr, ak as z, l as se, b as Qr, x as $, a4 as Xr, ag as U, aj as gt, cM as Zr, cN as es, cO as ts, M as J, aX as rs, cP as ss, aO as ns, am as Ye, au as me, cj as is, ck as as, bZ as yt, cQ as ht, ab as os, cR as bt, cS as Ft, A as us, c6 as Et, cT as cs, bQ as ls, aE as fs } from "../apply-styled-options-to-query-BK1NnV4P.js";
+function ds(e, t) {
   const r = e.length, s = t.length, n = Array.from({ length: r + 1 }, (i, a) => Array.from({ length: s + 1 }, (o, u) => a === 0 ? u : u === 0 ? a : 0));
   for (let i = 1; i <= r; i++)
     for (let a = 1; a <= s; a++)
       n[i][a] = Math.min(n[i - 1][a] + 1, n[i][a - 1] + 1, n[i - 1][a - 1] + (e[i - 1] === t[a - 1] ? 0 : 1));
   return n[r][s];
 }
-function Me(e, t) {
+function Re(e, t) {
   const r = [];
   let s = "", n = 0, i = !1, a = null;
   for (let o = 0; o < e.length; o++) {
@@ -59,7 +59,7 @@ function Me(e, t) {
   }
   return s.trim() && r.push(s.trim()), r;
 }
-function ds(e, t) {
+function ms(e, t) {
   let r = 0, s = !1, n = null;
   for (let i = 0; i < e.length; i++) {
     const a = e[i], o = e[i + 1];
@@ -82,7 +82,7 @@ function ds(e, t) {
   }
   return -1;
 }
-function ms(e, t) {
+function ps(e, t) {
   if (e[t] !== "(")
     return -1;
   let r = 1, s = t + 1, n = !1, i = null;
@@ -110,10 +110,10 @@ function ms(e, t) {
   }
   return -1;
 }
-function ps(e) {
+function gs(e) {
   return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
 }
-function J(e) {
+function K(e) {
   if (!e || typeof e != "string")
     throw new Error(`Invalid composeCode: expected non-empty string, got ${typeof e}`);
   const t = e.trim();
@@ -122,16 +122,16 @@ function J(e) {
   const r = t.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
   if (!r)
     throw new Error(`Invalid composeCode format: expected function call, got '${t}'`);
-  const s = r[1], n = r[2], i = Et(n);
+  const s = r[1], n = r[2], i = At(n);
   return {
     function: s,
     args: i
   };
 }
-function Et(e) {
-  return e.trim() ? Me(e, ",").map(At) : [];
-}
 function At(e) {
+  return e.trim() ? Re(e, ",").map(Tt) : [];
+}
+function Tt(e) {
   if (!e)
     throw new Error("Cannot parse empty argument value");
   if (e === "null")
@@ -152,29 +152,29 @@ function At(e) {
     const r = e.slice(1, -1).trim();
     if (!r)
       return [];
-    const s = Et(r);
+    const s = At(r);
     return s.every((n) => typeof n == "string"), s;
   }
   if (e.startsWith("{") && e.endsWith("}")) {
     const r = e.slice(1, -1).trim();
-    return r ? ys(r) : {};
+    return r ? hs(r) : {};
   }
-  return e.includes("(") && e.includes(")") ? J(e) : (e.startsWith("DM."), e);
+  return e.includes("(") && e.includes(")") ? K(e) : (e.startsWith("DM."), e);
 }
-function gs(e) {
-  const t = ds(e, ":");
+function ys(e) {
+  const t = ms(e, ":");
   if (t === -1)
     throw new Error(`Invalid object property: expected 'key: value', got '${e}'`);
-  const r = ps(e.slice(0, t).trim()), s = At(e.slice(t + 1).trim());
+  const r = gs(e.slice(0, t).trim()), s = Tt(e.slice(t + 1).trim());
   return [r, s];
 }
-function ys(e) {
+function hs(e) {
   if (!e.trim())
     return {};
-  const t = Me(e, ",").map(gs).filter(([, r]) => r !== null);
+  const t = Re(e, ",").map(ys).filter(([, r]) => r !== null);
   return Object.fromEntries(t);
 }
-class hs {
+class bs {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -191,9 +191,9 @@ class hs {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class Tt {
+class wt {
   constructor(t) {
-    this.generateIdentifier = t, this.kv = new hs();
+    this.generateIdentifier = t, this.kv = new bs();
   }
   register(t, r) {
     this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
@@ -208,7 +208,7 @@ class Tt {
     return this.kv.getByKey(t);
   }
 }
-class bs extends Tt {
+class Fs extends wt {
   constructor() {
     super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -219,7 +219,7 @@ class bs extends Tt {
     return this.classToAllowedProps.get(t);
   }
 }
-function Fs(e) {
+function Es(e) {
   if ("values" in Object)
     return Object.values(e);
   const t = [];
@@ -227,8 +227,8 @@ function Fs(e) {
     e.hasOwnProperty(r) && t.push(e[r]);
   return t;
 }
-function Es(e, t) {
-  const r = Fs(e);
+function As(e, t) {
+  const r = Es(e);
   if ("find" in r)
     return r.find(t);
   const s = r;
@@ -238,20 +238,20 @@ function Es(e, t) {
       return i;
   }
 }
-function K(e, t) {
+function G(e, t) {
   Object.entries(e).forEach(([r, s]) => t(s, r));
 }
-function oe(e, t) {
+function ue(e, t) {
   return e.indexOf(t) !== -1;
 }
-function Ye(e, t) {
+function He(e, t) {
   for (let r = 0; r < e.length; r++) {
     const s = e[r];
     if (t(s))
       return s;
   }
 }
-class As {
+class Ts {
   constructor() {
     this.transfomers = {};
   }
@@ -259,13 +259,13 @@ class As {
     this.transfomers[t.name] = t;
   }
   findApplicable(t) {
-    return Es(this.transfomers, (r) => r.isApplicable(t));
+    return As(this.transfomers, (r) => r.isApplicable(t));
   }
   findByName(t) {
     return this.transfomers[t];
   }
 }
-const Ts = (e) => Object.prototype.toString.call(e).slice(8, -1), wt = (e) => typeof e == "undefined", ws = (e) => e === null, Q = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Ce = (e) => Q(e) && Object.keys(e).length === 0, k = (e) => Array.isArray(e), Ss = (e) => typeof e == "string", Cs = (e) => typeof e == "number" && !isNaN(e), Os = (e) => typeof e == "boolean", qs = (e) => e instanceof RegExp, X = (e) => e instanceof Map, Z = (e) => e instanceof Set, St = (e) => Ts(e) === "Symbol", $s = (e) => e instanceof Date && !isNaN(e.valueOf()), Ds = (e) => e instanceof Error, He = (e) => typeof e == "number" && isNaN(e), xs = (e) => Os(e) || ws(e) || wt(e) || Cs(e) || Ss(e) || St(e), Ns = (e) => typeof e == "bigint", vs = (e) => e === 1 / 0 || e === -1 / 0, Ms = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), Rs = (e) => e instanceof URL, Ct = (e) => e.replace(/\./g, "\\."), Ee = (e) => e.map(String).map(Ct).join("."), Y = (e) => {
+const ws = (e) => Object.prototype.toString.call(e).slice(8, -1), St = (e) => typeof e == "undefined", Ss = (e) => e === null, Z = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Oe = (e) => Z(e) && Object.keys(e).length === 0, k = (e) => Array.isArray(e), Cs = (e) => typeof e == "string", Os = (e) => typeof e == "number" && !isNaN(e), $s = (e) => typeof e == "boolean", qs = (e) => e instanceof RegExp, ee = (e) => e instanceof Map, te = (e) => e instanceof Set, Ct = (e) => ws(e) === "Symbol", Ds = (e) => e instanceof Date && !isNaN(e.valueOf()), xs = (e) => e instanceof Error, Qe = (e) => typeof e == "number" && isNaN(e), Ns = (e) => $s(e) || Ss(e) || St(e) || Os(e) || Cs(e) || Ct(e), vs = (e) => typeof e == "bigint", Ms = (e) => e === 1 / 0 || e === -1 / 0, Rs = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), Is = (e) => e instanceof URL, Ot = (e) => e.replace(/\./g, "\\."), Ae = (e) => e.map(String).map(Ot).join("."), Q = (e) => {
   const t = [];
   let r = "";
   for (let n = 0; n < e.length; n++) {
@@ -291,12 +291,12 @@ function I(e, t, r, s) {
     untransform: s
   };
 }
-const Ot = [
-  I(wt, "undefined", () => null, () => {
+const $t = [
+  I(St, "undefined", () => null, () => {
   }),
-  I(Ns, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  I($s, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  I(Ds, "Error", (e, t) => {
+  I(vs, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  I(Ds, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  I(xs, "Error", (e, t) => {
     const r = {
       name: e.name,
       message: e.message
@@ -315,19 +315,19 @@ const Ot = [
     return new RegExp(t, r);
   }),
   I(
-    Z,
+    te,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  I(X, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  I((e) => He(e) || vs(e), "number", (e) => He(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  I(ee, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  I((e) => Qe(e) || Ms(e), "number", (e) => Qe(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
   I((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  I(Rs, "URL", (e) => e.toString(), (e) => new URL(e))
+  I(Is, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function me(e, t, r, s) {
+function pe(e, t, r, s) {
   return {
     isApplicable: e,
     annotation: t,
@@ -335,12 +335,12 @@ function me(e, t, r, s) {
     untransform: s
   };
 }
-const qt = me((e, t) => St(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
+const qt = pe((e, t) => Ct(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
   const s = r.symbolRegistry.getValue(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), Is = [
+}), ks = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -350,16 +350,16 @@ const qt = me((e, t) => St(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), $t = me(Ms, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = Is[t[1]];
+].reduce((e, t) => (e[t.name] = t, e), {}), Dt = pe(Rs, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
+  const r = ks[t[1]];
   if (!r)
     throw new Error("Trying to deserialize unknown typed array");
   return new r(e);
 });
-function Dt(e, t) {
+function xt(e, t) {
   return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const xt = me(Dt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
+const Nt = pe(xt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
   const r = t.classRegistry.getAllowedProps(e.constructor);
   if (!r)
     return l({}, e);
@@ -372,49 +372,49 @@ const xt = me(Dt, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructo
   if (!s)
     throw new Error(`Trying to deserialize unknown class '${t[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
   return Object.assign(Object.create(s.prototype), e);
-}), Nt = me((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
+}), vt = pe((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
   const s = r.customTransformerRegistry.findByName(t[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
-}), ks = [xt, qt, Nt, $t], Qe = (e, t) => {
-  const r = Ye(ks, (n) => n.isApplicable(e, t));
+}), Ls = [Nt, qt, vt, Dt], Xe = (e, t) => {
+  const r = He(Ls, (n) => n.isApplicable(e, t));
   if (r)
     return {
       value: r.transform(e, t),
       type: r.annotation(e, t)
     };
-  const s = Ye(Ot, (n) => n.isApplicable(e, t));
+  const s = He($t, (n) => n.isApplicable(e, t));
   if (s)
     return {
       value: s.transform(e, t),
       type: s.annotation
     };
-}, vt = {};
-Ot.forEach((e) => {
-  vt[e.annotation] = e;
+}, Mt = {};
+$t.forEach((e) => {
+  Mt[e.annotation] = e;
 });
-const Ls = (e, t, r) => {
+const Bs = (e, t, r) => {
   if (k(t))
     switch (t[0]) {
       case "symbol":
         return qt.untransform(e, t, r);
       case "class":
-        return xt.untransform(e, t, r);
-      case "custom":
         return Nt.untransform(e, t, r);
+      case "custom":
+        return vt.untransform(e, t, r);
       case "typed-array":
-        return $t.untransform(e, t, r);
+        return Dt.untransform(e, t, r);
       default:
         throw new Error("Unknown transformation: " + t);
     }
   else {
-    const s = vt[t];
+    const s = Mt[t];
     if (!s)
       throw new Error("Unknown transformation: " + t);
     return s.untransform(e, r);
   }
-}, V = (e, t) => {
+}, j = (e, t) => {
   if (t > e.size)
     throw new Error("index out of bounds");
   const r = e.keys();
@@ -422,22 +422,22 @@ const Ls = (e, t, r) => {
     r.next(), t--;
   return r.next().value;
 };
-function Mt(e) {
-  if (oe(e, "__proto__"))
+function Rt(e) {
+  if (ue(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (oe(e, "prototype"))
+  if (ue(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (oe(e, "constructor"))
+  if (ue(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const Bs = (e, t) => {
-  Mt(t);
+const _s = (e, t) => {
+  Rt(t);
   for (let r = 0; r < t.length; r++) {
     const s = t[r];
-    if (Z(e))
-      e = V(e, +s);
-    else if (X(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = V(e, n);
+    if (te(e))
+      e = j(e, +s);
+    else if (ee(e)) {
+      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = j(e, n);
       switch (i) {
         case "key":
           e = a;
@@ -450,8 +450,8 @@ const Bs = (e, t) => {
       e = e[s];
   }
   return e;
-}, Oe = (e, t, r) => {
-  if (Mt(t), t.length === 0)
+}, $e = (e, t, r) => {
+  if (Rt(t), t.length === 0)
     return r(e);
   let s = e;
   for (let i = 0; i < t.length - 1; i++) {
@@ -459,15 +459,15 @@ const Bs = (e, t) => {
     if (k(s)) {
       const o = +a;
       s = s[o];
-    } else if (Q(s))
+    } else if (Z(s))
       s = s[a];
-    else if (Z(s)) {
+    else if (te(s)) {
       const o = +a;
-      s = V(s, o);
-    } else if (X(s)) {
+      s = j(s, o);
+    } else if (ee(s)) {
       if (i === t.length - 2)
         break;
-      const u = +a, c = +t[++i] == 0 ? "key" : "value", g = V(s, u);
+      const u = +a, c = +t[++i] == 0 ? "key" : "value", g = j(s, u);
       switch (c) {
         case "key":
           s = g;
@@ -479,12 +479,12 @@ const Bs = (e, t) => {
     }
   }
   const n = t[t.length - 1];
-  if (k(s) ? s[+n] = r(s[+n]) : Q(s) && (s[n] = r(s[n])), Z(s)) {
-    const i = V(s, +n), a = r(i);
+  if (k(s) ? s[+n] = r(s[+n]) : Z(s) && (s[n] = r(s[n])), te(s)) {
+    const i = j(s, +n), a = r(i);
     i !== a && (s.delete(i), s.add(a));
   }
-  if (X(s)) {
-    const i = +t[t.length - 2], a = V(s, i);
+  if (ee(s)) {
+    const i = +t[t.length - 2], a = j(s, i);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
         const u = r(a);
@@ -503,41 +503,41 @@ function qe(e, t, r = []) {
   if (!e)
     return;
   if (!k(e)) {
-    K(e, (i, a) => qe(i, t, [...r, ...Y(a)]));
+    G(e, (i, a) => qe(i, t, [...r, ...Q(a)]));
     return;
   }
   const [s, n] = e;
-  n && K(n, (i, a) => {
-    qe(i, t, [...r, ...Y(a)]);
+  n && G(n, (i, a) => {
+    qe(i, t, [...r, ...Q(a)]);
   }), t(s, r);
 }
 function zs(e, t, r) {
   return qe(t, (s, n) => {
-    e = Oe(e, n, (i) => Ls(i, s, r));
+    e = $e(e, n, (i) => Bs(i, s, r));
   }), e;
 }
 function Us(e, t) {
   function r(s, n) {
-    const i = Bs(e, Y(n));
-    s.map(Y).forEach((a) => {
-      e = Oe(e, a, () => i);
+    const i = _s(e, Q(n));
+    s.map(Q).forEach((a) => {
+      e = $e(e, a, () => i);
     });
   }
   if (k(t)) {
     const [s, n] = t;
     s.forEach((i) => {
-      e = Oe(e, Y(i), () => e);
-    }), n && K(n, r);
+      e = $e(e, Q(i), () => e);
+    }), n && G(n, r);
   } else
-    K(t, r);
+    G(t, r);
   return e;
 }
-const _s = (e, t) => Q(e) || k(e) || X(e) || Z(e) || Dt(e, t);
-function Ps(e, t, r) {
+const Ps = (e, t) => Z(e) || k(e) || ee(e) || te(e) || xt(e, t);
+function Ws(e, t, r) {
   const s = r.get(e);
   s ? s.push(t) : r.set(e, [t]);
 }
-function Ws(e, t) {
+function Vs(e, t) {
   const r = {};
   let s;
   return e.forEach((n) => {
@@ -545,22 +545,22 @@ function Ws(e, t) {
       return;
     t || (n = n.map((o) => o.map(String)).sort((o, u) => o.length - u.length));
     const [i, ...a] = n;
-    i.length === 0 ? s = a.map(Ee) : r[Ee(i)] = a.map(Ee);
-  }), s ? Ce(r) ? [s] : [s, r] : Ce(r) ? void 0 : r;
+    i.length === 0 ? s = a.map(Ae) : r[Ae(i)] = a.map(Ae);
+  }), s ? Oe(r) ? [s] : [s, r] : Oe(r) ? void 0 : r;
 }
-const Rt = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
+const It = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
   var h;
-  const o = xs(e);
+  const o = Ns(e);
   if (!o) {
-    Ps(e, n, t);
+    Ws(e, n, t);
     const b = a.get(e);
     if (b)
       return s ? {
         transformedValue: null
       } : b;
   }
-  if (!_s(e, r)) {
-    const b = Qe(e, r), m = b ? {
+  if (!Ps(e, r)) {
+    const b = Xe(e, r), m = b ? {
       transformedValue: b.value,
       annotations: [b.type]
     } : {
@@ -568,20 +568,20 @@ const Rt = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
     };
     return o || a.set(e, m), m;
   }
-  if (oe(i, e))
+  if (ue(i, e))
     return {
       transformedValue: null
     };
-  const u = Qe(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, g = k(c) ? [] : {}, f = {};
-  K(c, (b, m) => {
+  const u = Xe(e, r), c = (h = u == null ? void 0 : u.value) != null ? h : e, g = k(c) ? [] : {}, f = {};
+  G(c, (b, m) => {
     if (m === "__proto__" || m === "constructor" || m === "prototype")
       throw new Error(`Detected property ${m}. This is a prototype pollution risk, please remove it from your object.`);
-    const F = Rt(b, t, r, s, [...n, m], [...i, e], a);
-    g[m] = F.transformedValue, k(F.annotations) ? f[m] = F.annotations : Q(F.annotations) && K(F.annotations, (O, N) => {
-      f[Ct(m) + "." + N] = O;
+    const F = It(b, t, r, s, [...n, m], [...i, e], a);
+    g[m] = F.transformedValue, k(F.annotations) ? f[m] = F.annotations : Z(F.annotations) && G(F.annotations, (O, N) => {
+      f[Ot(m) + "." + N] = O;
     });
   });
-  const p = Ce(f) ? {
+  const p = Oe(f) ? {
     transformedValue: g,
     annotations: u ? [u.type] : void 0
   } : {
@@ -590,19 +590,19 @@ const Rt = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
   };
   return o || a.set(e, p), p;
 };
-function It(e) {
+function kt(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function Xe(e) {
-  return It(e) === "Array";
+function Ze(e) {
+  return kt(e) === "Array";
 }
-function Vs(e) {
-  if (It(e) !== "Object")
+function js(e) {
+  if (kt(e) !== "Object")
     return !1;
   const t = Object.getPrototypeOf(e);
   return !!t && t.constructor === Object && t === Object.prototype;
 }
-function js(e, t, r, s, n) {
+function Js(e, t, r, s, n) {
   const i = {}.propertyIsEnumerable.call(s, t) ? "enumerable" : "nonenumerable";
   i === "enumerable" && (e[t] = r), n && i === "nonenumerable" && Object.defineProperty(e, t, {
     value: r,
@@ -611,17 +611,17 @@ function js(e, t, r, s, n) {
     configurable: !0
   });
 }
-function $e(e, t = {}) {
-  if (Xe(e))
-    return e.map((n) => $e(n, t));
-  if (!Vs(e))
+function De(e, t = {}) {
+  if (Ze(e))
+    return e.map((n) => De(n, t));
+  if (!js(e))
     return e;
   const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
   return [...r, ...s].reduce((n, i) => {
-    if (Xe(t.props) && !t.props.includes(i))
+    if (Ze(t.props) && !t.props.includes(i))
       return n;
-    const a = e[i], o = $e(a, t);
-    return js(n, i, o, e, t.nonenumerable), n;
+    const a = e[i], o = De(a, t);
+    return Js(n, i, o, e, t.nonenumerable), n;
   }, {});
 }
 class y {
@@ -629,26 +629,26 @@ class y {
    * @param dedupeReferentialEqualities  If true, SuperJSON will make sure only one instance of referentially equal objects are serialized and the rest are replaced with `null`.
    */
   constructor({ dedupe: t = !1 } = {}) {
-    this.classRegistry = new bs(), this.symbolRegistry = new Tt((r) => {
+    this.classRegistry = new Fs(), this.symbolRegistry = new wt((r) => {
       var s;
       return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new As(), this.allowedErrorProps = [], this.dedupe = t;
+    }), this.customTransformerRegistry = new Ts(), this.allowedErrorProps = [], this.dedupe = t;
   }
   serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = Rt(t, r, this, this.dedupe), n = {
+    const r = /* @__PURE__ */ new Map(), s = It(t, r, this, this.dedupe), n = {
       json: s.transformedValue
     };
     s.annotations && (n.meta = E(l({}, n.meta), {
       values: s.annotations
     }));
-    const i = Ws(r, this.dedupe);
+    const i = Vs(r, this.dedupe);
     return i && (n.meta = E(l({}, n.meta), {
       referentialEqualities: i
     })), n;
   }
   deserialize(t) {
     const { json: r, meta: s } = t;
-    let n = $e(r);
+    let n = De(r);
     return s != null && s.values && (n = zs(n, s.values, this)), s != null && s.referentialEqualities && (n = Us(n, s.referentialEqualities)), n;
   }
   stringify(t) {
@@ -681,15 +681,22 @@ y.registerClass = y.defaultInstance.registerClass.bind(y.defaultInstance);
 y.registerSymbol = y.defaultInstance.registerSymbol.bind(y.defaultInstance);
 y.registerCustom = y.defaultInstance.registerCustom.bind(y.defaultInstance);
 y.allowErrorProps = y.defaultInstance.allowErrorProps.bind(y.defaultInstance);
-const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e.type), Re = (e) => new Nr(
+const P = (e) => e === void 0 ? z.None : e, W = (e) => {
+  var t, r;
+  return (r = (t = e.title) != null ? t : e.name) != null ? r : "";
+}, Ks = (e) => new mr(e.metadataItem, e.type), Ie = (e) => new vr(
   e.name,
   e.expression,
   e.type,
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), Ie = (e) => new vr(
+  e.composeCode,
+  e.panel,
+  e.indexed,
+  e.merged,
+  W(e)
+), ke = (e) => new Mr(
   e.name,
   e.expression,
   e.granularity,
@@ -697,28 +704,33 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
+  e.composeCode,
+  e.panel,
+  e.indexed,
+  e.merged,
+  W(e)
 ), v = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return Re(e);
-    case "DimensionalLevelAttribute":
       return Ie(e);
+    case "DimensionalLevelAttribute":
+      return ke(e);
     default:
       return e;
   }
-}, kt = (e) => new Mr(
+}, Lt = (e) => new Rr(
   e.name,
   e.expression,
   e.attributes.map(v),
-  e.dimensions.map(Ks),
+  e.dimensions.map(Gs),
   e.type,
   e.description,
   P(e.sort),
   e.dataSource,
   e.composeCode,
-  e.defaultAttribute ? v(e.defaultAttribute) : void 0
-), Lt = (e) => new Rr(
+  e.defaultAttribute ? v(e.defaultAttribute) : void 0,
+  W(e)
+), Bt = (e) => new Ir(
   e.name,
   e.expression,
   e.description,
@@ -726,17 +738,18 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
   e.dataSource,
   e.composeCode,
   e.indexed,
-  e.merged
-), Ks = (e) => {
+  e.merged,
+  W(e)
+), Gs = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return kt(e);
-    case "DimensionalDateDimension":
       return Lt(e);
+    case "DimensionalDateDimension":
+      return Bt(e);
     default:
       return e;
   }
-}, ke = (e) => new Ir(
+}, Le = (e) => new kr(
   e.name,
   v(e.attribute),
   e.aggregation,
@@ -744,22 +757,23 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), Le = (e) => {
+  e.composeCode,
+  W(e)
+), Be = (e) => {
   const t = Object.fromEntries(
     Object.entries(e.context).map(([r, s]) => {
       if (s && typeof s == "object" && "__serializable" in s)
         switch (s.__serializable) {
           case "DimensionalAttribute":
-            return [r, Re(s)];
-          case "DimensionalLevelAttribute":
             return [r, Ie(s)];
-          case "DimensionalBaseMeasure":
+          case "DimensionalLevelAttribute":
             return [r, ke(s)];
-          case "DimensionalCalculatedMeasure":
+          case "DimensionalBaseMeasure":
             return [r, Le(s)];
-          case "DimensionalMeasureTemplate":
+          case "DimensionalCalculatedMeasure":
             return [r, Be(s)];
+          case "DimensionalMeasureTemplate":
+            return [r, _e(s)];
           case "MembersFilter":
           case "LogicalAttributeFilter":
           case "CascadingFilter":
@@ -779,7 +793,7 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
       return [r, s];
     })
   );
-  return new kr(
+  return new Lr(
     e.name,
     e.expression,
     t,
@@ -787,60 +801,62 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
     e.description,
     P(e.sort),
     e.dataSource,
-    e.composeCode
+    e.composeCode,
+    W(e)
   );
-}, Be = (e) => new Lr(
+}, _e = (e) => new Br(
   e.name,
   v(e.attribute),
   e.format,
   e.description,
   P(e.sort),
   e.dataSource,
-  e.composeCode
-), Ae = (e) => {
+  e.composeCode,
+  W(e)
+), Te = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return ke(e);
-    case "DimensionalCalculatedMeasure":
       return Le(e);
-    case "DimensionalMeasureTemplate":
+    case "DimensionalCalculatedMeasure":
       return Be(e);
+    case "DimensionalMeasureTemplate":
+      return _e(e);
     default:
       return e;
   }
 }, S = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Yr(
+      return new Hr(
         v(e.attribute),
         e.members,
         e.config.backgroundFilter ? E(l({}, e.config), { backgroundFilter: S(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Gr(
+      return new Yr(
         e.filters.map((r) => S(r)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new Kr(
+      return new Gr(
         e._filters.map((r) => S(r)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Jr(
+      return new Kr(
         S(e.filter),
         e.input ? S(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new jr(
+      return new Jr(
         v(e.attribute),
-        Ae(e.measure),
+        Te(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -849,24 +865,24 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
         e.composeCode
       );
     case "RankingFilter":
-      return new Vr(
+      return new jr(
         v(e.attribute),
-        Ae(e.measure),
+        Te(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Wr(
-        Ae(e.measure),
+      return new Vr(
+        Te(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new Pr(
+      return new Wr(
         v(e.attribute),
         e.operatorA,
         e.valueA,
@@ -876,7 +892,7 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
         e.composeCode
       );
     case "TextFilter":
-      return new _r(
+      return new Pr(
         v(e.attribute),
         e.operatorA,
         e.valueA,
@@ -904,7 +920,7 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
         e.composeCode
       );
     case "CustomFilter":
-      return new Br(
+      return new _r(
         v(e.attribute),
         e.jaqlExpression,
         e.config,
@@ -916,71 +932,71 @@ const P = (e) => e === void 0 ? U.None : e, Js = (e) => new dr(e.metadataItem, e
 };
 y.registerCustom(
   {
-    isApplicable: fr,
+    isApplicable: dr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Js(e)
+    deserialize: (e) => Ks(e)
   },
   "JaqlElement"
 );
 y.registerCustom(
   {
-    isApplicable: mr,
+    isApplicable: pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Re(e)
+    deserialize: (e) => Ie(e)
   },
   "DimensionalAttribute"
 );
 y.registerCustom(
   {
-    isApplicable: pr,
+    isApplicable: gr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Ie(e)
+    deserialize: (e) => ke(e)
   },
   "DimensionalLevelAttribute"
 );
 y.registerCustom(
   {
-    isApplicable: gr,
+    isApplicable: yr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => kt(e)
+    deserialize: (e) => Lt(e)
   },
   "DimensionalDimension"
 );
 y.registerCustom(
   {
-    isApplicable: yr,
+    isApplicable: hr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Lt(e)
+    deserialize: (e) => Bt(e)
   },
   "DimensionalDateDimension"
 );
 y.registerCustom(
   {
-    isApplicable: hr,
+    isApplicable: br,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ke(e)
+    deserialize: (e) => Le(e)
   },
   "DimensionalBaseMeasure"
 );
 y.registerCustom(
   {
-    isApplicable: br,
+    isApplicable: Fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Le(e)
+    deserialize: (e) => Be(e)
   },
   "DimensionalCalculatedMeasure"
 );
 y.registerCustom(
   {
-    isApplicable: Fr,
+    isApplicable: Er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Be(e)
+    deserialize: (e) => _e(e)
   },
   "DimensionalMeasureTemplate"
 );
 y.registerCustom(
   {
-    isApplicable: ve,
+    isApplicable: Me,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -988,7 +1004,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Er,
+    isApplicable: Ar,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -996,7 +1012,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Ar,
+    isApplicable: Tr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1004,7 +1020,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Tr,
+    isApplicable: wr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1012,7 +1028,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: wr,
+    isApplicable: Sr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1020,7 +1036,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Sr,
+    isApplicable: Cr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1028,7 +1044,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Cr,
+    isApplicable: Or,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1036,7 +1052,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Or,
+    isApplicable: $r,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1052,7 +1068,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: $r,
+    isApplicable: Dr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1060,7 +1076,7 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: Dr,
+    isApplicable: xr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
@@ -1068,55 +1084,55 @@ y.registerCustom(
 );
 y.registerCustom(
   {
-    isApplicable: xr,
+    isApplicable: Nr,
     serialize: (e) => e.serialize(),
     deserialize: (e) => S(e)
   },
   "CustomFilter"
 );
-const Bi = y, T = "DM.";
-function $(e) {
+const Ui = y, T = "DM.";
+function q(e) {
   return typeof e == "object" && e !== null;
 }
 function w(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function Bt(e) {
+function _t(e) {
   return Array.isArray(e) && e.every(w);
 }
-function pe(e) {
+function ge(e) {
   return "attribute" in e && "config" in e;
 }
-function re(e) {
+function H(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
 function ze(e) {
-  return !pe(e) && !re(e);
+  return !ge(e) && !H(e);
 }
 function zt(e) {
-  return $(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+  return q(e) && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
 }
 function Ut(e) {
-  return !$(e) || !("column" in e) ? !1 : w(e.column);
+  return !q(e) || !("column" in e) ? !1 : w(e.column);
 }
 const C = 3;
 function x(e, t, r) {
   if (t.length === 0) return;
   let s = Number.MAX_SAFE_INTEGER, n;
   for (const i of t) {
-    const a = r(i), o = fs(e, a);
+    const a = r(i), o = ds(e, a);
     o < s && (s = o, n = i);
   }
   return n !== void 0 ? { best: n, distance: s } : void 0;
 }
-const _t = "en";
-function Te(e, t) {
-  return e.localeCompare(t, _t, { sensitivity: "accent" }) === 0;
+const Pt = "en";
+function we(e, t) {
+  return e.localeCompare(t, Pt, { sensitivity: "accent" }) === 0;
 }
-function Ze(e, t) {
-  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, _t, { sensitivity: "accent" }) === 0;
+function et(e, t) {
+  return t.length <= e.length && e.slice(0, t.length).localeCompare(t, Pt, { sensitivity: "accent" }) === 0;
 }
-function se(e) {
+function ne(e) {
   const t = [...e].sort((i, a) => a.name.length - i.name.length), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
   for (const i of e) {
     r.set(i.name, i);
@@ -1146,7 +1162,7 @@ function Ue(e, t) {
     );
   let s, n;
   for (const m of t.sortedTables)
-    if (Ze(r, m.name + ".")) {
+    if (et(r, m.name + ".")) {
       const F = r.slice(m.name.length + 1);
       if (!F)
         throw new Error(
@@ -1161,23 +1177,23 @@ function Ue(e, t) {
       throw new Error(
         `Invalid dimensional element name format: '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
       );
-    const F = r.slice(0, m), O = x(F, t.sortedTables, (W) => W.name), N = O && O.distance <= C ? ` Did you mean '${O.best.name}'?` : "";
+    const F = r.slice(0, m), O = x(F, t.sortedTables, (V) => V.name), N = O && O.distance <= C ? ` Did you mean '${O.best.name}'?` : "";
     throw new Error(`Table '${F}' not found in the data model.${N}`);
   }
   const i = t.tableColumnMap.get(s.name);
   if (!i)
     throw new Error(`Table '${s.name}' found but has no columns`);
   let a, o;
-  const u = q.all;
+  const u = $.all;
   for (const m of i) {
-    if (Te(n, m.name))
+    if (we(n, m.name))
       return { table: s, column: m };
-    if (!Ze(n, m.name + "."))
+    if (!et(n, m.name + "."))
       continue;
     const F = n.slice(m.name.length + 1);
     if (!F)
       continue;
-    const O = u.includes(F), N = te(m.dataType);
+    const O = u.includes(F), N = se(m.dataType);
     if (O) {
       if (N)
         return { table: s, column: m, level: F };
@@ -1198,31 +1214,31 @@ function Ue(e, t) {
       )}.${F}`
     );
   }
-  const c = n.indexOf("."), g = c === -1 ? n : n.slice(0, c), f = x(n, i, (m) => m.name), p = f && f.distance <= C && !Te(f.best.name, g), h = p ? ` Did you mean '${f.best.name}'?` : "", b = !p && n.endsWith(".") && f !== void 0 && Te(f.best.name, g) ? ` Use '${g}' without a trailing dot.` : "";
+  const c = n.indexOf("."), g = c === -1 ? n : n.slice(0, c), f = x(n, i, (m) => m.name), p = f && f.distance <= C && !we(f.best.name, g), h = p ? ` Did you mean '${f.best.name}'?` : "", b = !p && n.endsWith(".") && f !== void 0 && we(f.best.name, g) ? ` Use '${g}' without a trailing dot.` : "";
   throw new Error(
     `Column '${g}' not found in table '${s.name}'.${h}${b}`
   );
 }
-function Gs(e, t) {
+function Ys(e, t) {
   const { table: r, column: s, level: n } = Ue(e, t);
   if (n) {
-    if (!te(s.dataType))
+    if (!se(s.dataType))
       throw new Error(
         `Invalid date level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is not a datetime column`
       );
-    const i = q.all;
+    const i = $.all;
     if (!i.includes(n))
       throw new Error(
         `Invalid date level '${n}' in dimensional element '${e}'. Valid levels are: ${i.join(
           ", "
         )}`
       );
-    const a = q.dateOnly;
+    const a = $.dateOnly;
     if (s.dataType === "date" && !a.includes(n))
       throw new Error(
         `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a date column, not a datetime column`
       );
-    const o = q.timeOnly;
+    const o = $.timeOnly;
     if (s.dataType === "time" && !o.includes(n))
       throw new Error(
         `Invalid level '${n}' in dimensional element '${e}'. Column '${r.name}.${s.name}' is only a time column, not a date column`
@@ -1230,28 +1246,28 @@ function Gs(e, t) {
   }
   return { table: r, column: s, level: n };
 }
-function ee(e, t, r, s) {
-  const { table: n, column: i, level: a } = Gs(e, r);
+function re(e, t, r, s) {
+  const { table: n, column: i, level: a } = Ys(e, r);
   let o = a;
-  if (te(i.dataType) && o === void 0 && (s != null && s.inferredDateLevel)) {
-    const u = s.inferredDateLevel, c = q.all;
+  if (se(i.dataType) && o === void 0 && (s != null && s.inferredDateLevel)) {
+    const u = s.inferredDateLevel, c = $.all;
     if (!c.includes(u))
       throw new Error(
         `Invalid inferred date level '${u}'. Valid levels are: ${c.join(", ")}`
       );
-    const g = `${e}.${u}`, f = q.dateOnly;
+    const g = `${e}.${u}`, f = $.dateOnly;
     if (i.dataType === "date" && !f.includes(u))
       throw new Error(
         `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a date column, not a datetime column`
       );
-    const p = q.timeOnly;
+    const p = $.timeOnly;
     if (i.dataType === "time" && !p.includes(u))
       throw new Error(
         `Invalid level '${u}' in dimensional element '${g}'. Column '${n.name}.${i.name}' is only a time column, not a date column`
       );
     o = u;
   }
-  return Hr({
+  return Qr({
     expression: i.expression,
     dataType: i.dataType,
     granularity: o,
@@ -1260,44 +1276,44 @@ function ee(e, t, r, s) {
     dataSource: t
   });
 }
-function Ys(e, t, r) {
+function Hs(e, t, r) {
   const { column: s, level: n } = Ue(e, r);
   if (n)
     throw new Error(
       `Invalid DateDimension name format: '${e}'. Expected format: '${T}TableName.ColumnName'`
     );
-  if (!te(s.dataType))
+  if (!se(s.dataType))
     throw new Error(
       `Invalid DateDimension name '${e}'. Column '${s.name}' is not a datetime column (got ${s.dataType}).`
     );
-  return Qr({
+  return Xr({
     name: s.name,
     expression: s.expression,
     dataSource: t
   });
 }
-const Hs = (e, t) => {
+const Qs = (e, t) => {
   if (!e) return;
   const r = typeof e == "object" ? e.direction : e;
-  if (!pt(r))
+  if (!gt(r))
     return E(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${r}'.`
     });
-}, Qs = (e, t, r, s) => {
-  const n = Hs(e.sortType, s);
+}, Xs = (e, t, r, s) => {
+  const n = Qs(e.sortType, s);
   if (n)
     return {
-      attribute: ee(e.column, t, r),
+      attribute: re(e.column, t, r),
       style: {},
       error: n
     };
-  const i = ee(e.column, t, r), a = _(e, "column");
+  const i = re(e.column, t, r), a = U(e, "column");
   return { attribute: i, style: a };
-}, Xs = (e, t, r, s) => typeof e == "string" ? { attribute: ee(e, t, r) } : zt(e) ? Qs(e, t, r, s) : {
+}, Zs = (e, t, r, s) => typeof e == "string" ? { attribute: re(e, t, r) } : zt(e) ? Xs(e, t, r, s) : {
   error: E(l({}, s), {
     message: "Invalid dimension item. Expected a string (composeCode) or object with 'column' and optional 'sortType'."
   })
-}, Pt = (e) => {
+}, Wt = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -1319,7 +1335,7 @@ const Hs = (e, t) => {
       input: a
     };
     try {
-      const c = Xs(a, r, s, u);
+      const c = Zs(a, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -1333,43 +1349,43 @@ const Hs = (e, t) => {
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function _e(e, t) {
+function Pe(e, t) {
   const r = Reflect.get(e, t);
   if (typeof r != "function")
     throw new Error(`Function '${t}' not found or is not a function`);
   return r;
 }
-function Zs(e, t) {
-  const r = e.replace("measureFactory.", ""), n = _e(Xr, r)(...t);
+function en(e, t) {
+  const r = e.replace("measureFactory.", ""), n = Pe(Zr, r)(...t);
   if (!ze(n))
     throw new Error(`Function '${e}' did not return a valid Measure`);
   return n;
 }
-function en(e, t) {
-  const r = e.replace("filterFactory.logic.", ""), n = _e(Zr, r)(...t);
-  if (!re(n))
+function tn(e, t) {
+  const r = e.replace("filterFactory.logic.", ""), n = Pe(es, r)(...t);
+  if (!H(n))
     throw new Error(`Function '${e}' did not return a valid FilterRelations`);
   return n;
 }
-function tn(e, t) {
+function rn(e, t) {
   if (e.startsWith("filterFactory.logic."))
-    return en(e, t);
-  const r = e.replace("filterFactory.", ""), n = _e(es, r)(...t);
-  if (!pe(n) && !re(n))
+    return tn(e, t);
+  const r = e.replace("filterFactory.", ""), n = Pe(ts, r)(...t);
+  if (!ge(n) && !H(n))
     throw new Error(`Function '${e}' did not return a valid Filter or FilterRelations`);
   return n;
 }
-function rn(e, t) {
+function sn(e, t) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return Zs(e, t);
+    return en(e, t);
   if (s === "filterFactory")
-    return tn(e, t);
+    return rn(e, t);
   throw new Error(
     `Unsupported factory: '${s}'. Supported factories: measureFactory, filterFactory`
   );
 }
-const d = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), sn = /* @__PURE__ */ new Set([
+const d = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), nn = /* @__PURE__ */ new Set([
   "CORREL",
   "COVARP",
   "COVAR",
@@ -1388,34 +1404,34 @@ const d = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), sn = /*
   "ORDERING",
   "RDOUBLE",
   "RINT"
-]), ce = {
+]), le = {
   // ── X-diff (datetime difference operators) ──
   SDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Seconds,
+    requiredDateLevel: $.Seconds,
     argType: "datetime"
   }),
   MNDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Minutes,
+    requiredDateLevel: $.Minutes,
     argType: "datetime"
   }),
   HDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Hours,
+    requiredDateLevel: $.Hours,
     argType: "datetime"
   }),
   DDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Days,
+    requiredDateLevel: $.Days,
     argType: "datetime"
   }),
   MDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Months,
+    requiredDateLevel: $.Months,
     argType: "datetime"
   }),
   QDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Quarters,
+    requiredDateLevel: $.Quarters,
     argType: "datetime"
   }),
   YDIFF: d("xdiff", 2, 2, {
-    requiredDateLevel: q.Years,
+    requiredDateLevel: $.Years,
     argType: "datetime"
   }),
   // ── Aggregation ──
@@ -1499,20 +1515,20 @@ const d = (e, t, r, s) => l({ category: e, minArgs: t, maxArgs: r }, s), sn = /*
   SIN: d("scalar", 1, 1),
   SQRT: d("scalar", 1, 1),
   TAN: d("scalar", 1, 1)
-}, nn = Object.keys(ce).filter(
-  (e) => ce[e].category === "xdiff"
+}, an = Object.keys(le).filter(
+  (e) => le[e].category === "xdiff"
 );
-function Wt() {
-  return nn;
+function Vt() {
+  return an;
 }
-function Vt(e) {
-  const t = ce[e.toUpperCase()];
+function jt(e) {
+  const t = le[e.toUpperCase()];
   return t == null ? void 0 : t.requiredDateLevel;
 }
-function an(e, t) {
+function on(e, t) {
   return e === t ? e === 1 ? "1 parameter" : `${e} parameters` : t === Number.POSITIVE_INFINITY ? e <= 1 ? "any number of parameters" : `at least ${e} parameters` : `${e} or ${t} parameters`;
 }
-const on = /\[(\w[\w.-]*)\]/g, jt = /* @__PURE__ */ new Set([
+const un = /\[(\w[\w.-]*)\]/g, Jt = /* @__PURE__ */ new Set([
   // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
   "AVG",
   "COUNT",
@@ -1533,30 +1549,30 @@ const on = /\[(\w[\w.-]*)\]/g, jt = /* @__PURE__ */ new Set([
   "YTDSUM"
   // RAVG, RSUM are non-aggregative per Sisense doc (Other Functions, not (A))
   // CORREL, COVAR*, SKEW*, SLOPE, LARGEST are unsupported in custom formulas (see UNSUPPORTED_FORMULA_FUNCTIONS).
-]), un = new RegExp(
-  `\\b(${Array.from(jt).join("|")})\\s*\\(`,
+]), cn = new RegExp(
+  `\\b(${Array.from(Jt).join("|")})\\s*\\(`,
   "i"
 );
-function Jt(e) {
-  return w(e) ? !0 : typeof e == "string" && e.startsWith(T) ? !1 : $(e) && "kind" in e ? e.kind === "measure" : !0;
+function Kt(e) {
+  return w(e) ? !0 : typeof e == "string" && e.startsWith(T) ? !1 : q(e) && "kind" in e ? e.kind === "measure" : !0;
 }
-function cn(e) {
+function ln(e) {
   const t = /\b(\w+)\s*\(/g, r = /* @__PURE__ */ new Set();
   let s;
   for (; (s = t.exec(e)) !== null; ) {
     const n = s[1];
-    jt.has(n.toUpperCase()) || r.add(n);
+    Jt.has(n.toUpperCase()) || r.add(n);
   }
   return Array.from(r);
 }
-function ln(e) {
+function fn(e) {
   return e.length === 1 ? `[${e[0]}]` : e.map((t) => `[${t}]`).join(", ");
 }
-function fn(e) {
+function dn(e) {
   return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
 }
-const G = (e) => e.startsWith("[") ? e : `[${e}]`, Kt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
-function Gt(e, t) {
+const Y = (e) => e.startsWith("[") ? e : `[${e}]`, Gt = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function Yt(e, t) {
   if (t.length === 0) return [];
   const r = t.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), s = new RegExp(
     `\\b(${r})\\s*\\(\\s*\\[([^\\]]+)\\]\\s*,\\s*\\[([^\\]]+)\\]\\s*\\)`,
@@ -1568,14 +1584,14 @@ function Gt(e, t) {
     ref2: n[3].trim()
   }));
 }
-function dn(e, t, r) {
+function mn(e, t, r) {
   var a, o, u;
   const s = Object.keys(t), n = ((a = r.errorPrefix) != null ? a : "customFormula validation").trim(), i = n === "" ? "" : n.endsWith(" ") ? n : `${n} `;
   return {
     formula: e,
     context: t,
     contextKeys: s,
-    canonicalContextKeys: new Set(s.map(G)),
+    canonicalContextKeys: new Set(s.map(Y)),
     errorPrefix: i,
     warnUnusedContext: (o = r.warnUnusedContext) != null ? o : !0,
     errorOnUnusedContext: (u = r.errorOnUnusedContext) != null ? u : !0,
@@ -1586,17 +1602,17 @@ function dn(e, t, r) {
 function R(e, t) {
   e.result.errors.push(t), e.result.isValid = !1;
 }
-const mn = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
-function pn(e) {
+const pn = /* @__PURE__ */ new Set(["CASE", "WHEN", "THEN", "ELSE", "END", "AND", "OR"]);
+function gn(e) {
   const t = /\b(\w+)\s*\[/gi, r = [...e.formula.matchAll(t)].find(
-    (s) => !mn.has(s[1].toUpperCase())
+    (s) => !pn.has(s[1].toUpperCase())
   );
   r && R(
     e,
     `${e.errorPrefix}args[1]: Invalid syntax: '${r[1]}' - operator cannot be used before bracket reference without parentheses`
   );
 }
-function gn(e, t) {
+function yn(e, t) {
   const r = e[t];
   let s = t + 1;
   for (; s < e.length; ) {
@@ -1613,27 +1629,27 @@ function gn(e, t) {
   }
   return e.length;
 }
-function yn(e) {
-  return Me(e, ",").filter((t) => t.trim().length > 0).length;
+function hn(e) {
+  return Re(e, ",").filter((t) => t.trim().length > 0).length;
 }
-function hn(e, t, r, s) {
+function bn(e, t, r, s) {
   for (; t < e.length && /\s/.test(e[t]); )
     t++;
   if (e[t] !== "(")
     return t;
-  const n = t, i = ms(e, n);
+  const n = t, i = ps(e, n);
   if (i === -1)
     return n + 1;
   const a = e.slice(n + 1, i);
-  return s.push({ name: r.toUpperCase(), argCount: yn(a) }), s.push(...Yt(a)), i + 1;
+  return s.push({ name: r.toUpperCase(), argCount: hn(a) }), s.push(...Ht(a)), i + 1;
 }
-function Yt(e) {
+function Ht(e) {
   const t = [];
   let r = 0;
   for (; r < e.length; ) {
     const s = e[r];
     if (s === "'" || s === '"') {
-      r = gn(e, r);
+      r = yn(e, r);
       continue;
     }
     if (/[A-Za-z_]/.test(s)) {
@@ -1641,78 +1657,78 @@ function Yt(e) {
       for (r++; r < e.length && /[A-Za-z0-9_]/.test(e[r]); )
         r++;
       const i = e.slice(n, r);
-      r = hn(e, r, i, t);
+      r = bn(e, r, i, t);
       continue;
     }
     r++;
   }
   return t;
 }
-function bn(e) {
-  const t = Yt(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
+function Fn(e) {
+  const t = Ht(e.formula), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   for (const { name: n, argCount: i } of t) {
-    if (sn.has(n)) {
+    if (nn.has(n)) {
       r.has(n) || (r.add(n), R(
         e,
         `${e.errorPrefix}args[1]: Function ${n} is not supported in custom formulas`
       ));
       continue;
     }
-    const a = ce[n];
+    const a = le[n];
     if (a && (i < a.minArgs || i > a.maxArgs) && !s.has(n)) {
       s.add(n);
-      const o = an(a.minArgs, a.maxArgs);
+      const o = on(a.minArgs, a.maxArgs);
       R(e, `${e.errorPrefix}args[1]: Function ${n} accepts ${o}`);
     }
   }
 }
-function Fn(e) {
+function En(e) {
   return [
     ...new Set(
-      [...e.matchAll(new RegExp(on.source, "g"))].map((t) => t[1])
+      [...e.matchAll(new RegExp(un.source, "g"))].map((t) => t[1])
     )
   ];
 }
-function En(e) {
+function An(e) {
   const t = e.result.references.filter(
-    (n) => !e.canonicalContextKeys.has(G(n))
+    (n) => !e.canonicalContextKeys.has(Y(n))
   );
   if (t.length === 0) return;
-  const r = e.contextKeys.map((n) => `[${Kt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
+  const r = e.contextKeys.map((n) => `[${Gt(n)}]`).join(", "), s = t.length === 1 ? `Reference [${t[0]}]` : `References [${t.join("], [")}]`;
   R(
     e,
     `${e.errorPrefix}args[1]: ${s} not found in context. Available keys: ${r}`
   );
 }
-function An(e) {
-  if (un.test(e.formula)) return;
+function Tn(e) {
+  if (cn.test(e.formula)) return;
   const t = e.result.references.filter((r) => {
     var n;
-    const s = (n = e.context[G(r)]) != null ? n : e.context[r];
-    return s !== void 0 && !Jt(s);
+    const s = (n = e.context[Y(r)]) != null ? n : e.context[r];
+    return s !== void 0 && !Kt(s);
   });
   t.length !== 0 && R(
     e,
-    `${e.errorPrefix}args[1]: ${fn(
-      cn(e.formula)
-    )}Bracket reference(s) ${ln(
+    `${e.errorPrefix}args[1]: ${dn(
+      ln(e.formula)
+    )}Bracket reference(s) ${fn(
       t
     )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
   );
 }
-function Tn(e) {
+function wn(e) {
   if (!e.warnUnusedContext && !e.errorOnUnusedContext || e.contextKeys.length === 0) return;
-  const t = new Set(e.result.references.map(G)), r = e.contextKeys.filter((i) => !t.has(G(i)));
+  const t = new Set(e.result.references.map(Y)), r = e.contextKeys.filter((i) => !t.has(Y(i)));
   if (e.result.unusedContextKeys = r, r.length === 0) return;
-  const s = r.map((i) => `[${Kt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
+  const s = r.map((i) => `[${Gt(i)}]`).join(", "), n = `${e.errorPrefix}args[2]: Context keys ${s} are defined but not used in formula`;
   e.errorOnUnusedContext ? R(e, n) : e.warnUnusedContext && e.result.warnings.push(n);
 }
-function et(e, t, r, s) {
+function tt(e, t, r, s) {
   var a;
-  const n = (a = s.context[G(e)]) != null ? a : s.context[e];
+  const n = (a = s.context[Y(e)]) != null ? a : s.context[e];
   if (n === void 0) return;
   if (!(typeof n == "string" && n.startsWith(T))) {
-    Jt(n) && R(
+    Kt(n) && R(
       s,
       `${s.errorPrefix}args[1]: ${t.functionName} requires datetime dimension attributes. Reference [${e}] points to a measure; use an attribute (e.g. ${T}Table.Column.Level).`
     );
@@ -1721,7 +1737,7 @@ function et(e, t, r, s) {
   if (s.schemaIndex)
     try {
       const o = Ue(n, s.schemaIndex);
-      te(o.column.dataType) ? r && o.level && o.level !== r && R(
+      se(o.column.dataType) ? r && o.level && o.level !== r && R(
         s,
         `${s.errorPrefix}args[1]: ${t.functionName} expects date level '${r}'. Reference [${e}] has level '${o.level}'.`
       ) : R(
@@ -1733,30 +1749,30 @@ function et(e, t, r, s) {
       R(s, `${s.errorPrefix}args[1]: ${t.functionName} reference [${e}]: ${u}`);
     }
 }
-function wn(e) {
-  const t = Wt(), r = Gt(e.formula, t);
+function Sn(e) {
+  const t = Vt(), r = Yt(e.formula, t);
   for (const s of r) {
-    const n = Vt(s.functionName);
-    et(s.ref1, s, n, e), et(s.ref2, s, n, e);
+    const n = jt(s.functionName);
+    tt(s.ref1, s, n, e), tt(s.ref2, s, n, e);
   }
 }
-function Sn(e, t, r = {}) {
+function Cn(e, t, r = {}) {
   var n;
-  const s = dn(e, t, r);
-  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || R(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (pn(s), bn(s), s.result.references = Fn(e), s.result.references.length === 0 ? (s.result.warnings.push(
+  const s = mn(e, t, r);
+  return !e || e.trim().length === 0 ? ((n = r.allowEmptyFormula) != null && n || R(s, `${s.errorPrefix}args[1]: Formula cannot be empty`), s.result) : (gn(s), Fn(s), s.result.references = En(e), s.result.references.length === 0 ? (s.result.warnings.push(
     `${s.errorPrefix}args[1]: No bracket references found in formula - ensure this is intentional`
   ), s.result) : s.contextKeys.length === 0 ? (R(
     s,
     `${s.errorPrefix}args[2]: Context cannot be empty - custom formulas require context definitions`
-  ), s.result) : (En(s), An(s), Tn(s), wn(s), s.result));
+  ), s.result) : (An(s), Tn(s), wn(s), Sn(s), s.result));
 }
-function Cn(e, t, r = {}) {
-  const s = Sn(e, t, r);
+function On(e, t, r = {}) {
+  const s = Cn(e, t, r);
   if (!s.isValid)
     throw new Error(s.errors.join("; "));
   s.warnings.length > 0 && console.warn("Formula validation warnings:", s.warnings.join("; "));
 }
-function On(e, t) {
+function $n(e, t) {
   if (e.length < 3 || e.length > 5)
     throw new Error(
       `${t.pathPrefix}Expected 3, 4, or 5 arguments for customFormula (title, formula, context, format?, description?)`
@@ -1767,12 +1783,12 @@ function On(e, t) {
       `${t.pathPrefix}args[1]: Expected formula string, got ${typeof r}`
     );
   const s = r, n = e[2];
-  if (!$(n))
+  if (!q(n))
     throw new Error(
       `${t.pathPrefix}args[2]: Expected context object, got ${n === null ? "null" : typeof n}`
     );
   const i = n;
-  Cn(s, i, {
+  On(s, i, {
     errorPrefix: `${t.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1795,7 +1811,7 @@ function On(e, t) {
     else if (typeof c == "string" && c.startsWith(T)) {
       const f = u.startsWith("[") && u.endsWith("]") ? u.slice(1, -1) : u, p = a[f];
       try {
-        o[`${u}`] = ee(
+        o[`${u}`] = re(
           c,
           t.dataSource,
           t.schemaIndex,
@@ -1815,9 +1831,9 @@ function On(e, t) {
   return [e[0], e[1], o, ...e.slice(3)];
 }
 function qn(e) {
-  const t = Wt(), r = Gt(e, t), s = {};
+  const t = Vt(), r = Yt(e, t), s = {};
   for (const n of r) {
-    const i = Vt(n.functionName);
+    const i = jt(n.functionName);
     if (i !== void 0)
       for (const a of [n.ref1, n.ref2]) {
         const o = s[a];
@@ -1830,76 +1846,87 @@ function qn(e) {
   }
   return s;
 }
-function Ht(e) {
-  return e.type === j.TextAttribute;
-}
 function Qt(e) {
-  return e.type === j.NumericAttribute;
+  return e.type === J.TextAttribute;
 }
-function $n(e) {
-  return e.type === j.DateLevel;
+function Xt(e) {
+  return e.type === J.NumericAttribute;
 }
 function Dn(e) {
-  return Ht(e) || Qt(e);
+  return e.type === J.DateLevel;
 }
-function ge(e) {
-  return e.type === j.TextAttribute ? "text" : e.type === j.NumericAttribute ? "numeric" : e.type === j.DateLevel ? "date/datetime" : "unknown";
+function xn(e) {
+  return Qt(e) || Xt(e);
 }
-function Pe(e, t) {
+function ye(e) {
+  return e.type === J.TextAttribute ? "text" : e.type === J.NumericAttribute ? "numeric" : e.type === J.DateLevel ? "date/datetime" : "unknown";
+}
+function We(e, t) {
   const r = e[0];
   if (!r || typeof r != "object" || !("type" in r))
     throw new Error(`${t.pathPrefix}args[0]: Expected attribute as first argument`);
   return r;
 }
-function tt(e, t) {
-  const r = Pe(e, t);
-  if (!Dn(r))
+function rt(e, t) {
+  const r = We(e, t);
+  if (!xn(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ge(
+      `${t.pathPrefix}args[0]: Attribute must be string or numeric type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
 function B(e, t) {
-  const r = Pe(e, t);
-  if (!Qt(r))
+  const r = We(e, t);
+  if (!Xt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ge(
+      `${t.pathPrefix}args[0]: Attribute must be numeric type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
-function z(e, t) {
-  const r = Pe(e, t);
-  if (!Ht(r))
+function _(e, t) {
+  const r = We(e, t);
+  if (!Qt(r))
     throw new Error(
-      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ge(
+      `${t.pathPrefix}args[0]: Attribute must be string type, got ${ye(
         r
       )} attribute`
     );
   return e;
 }
-function xn(e, t) {
+function Nn(e, t) {
   const r = e[0];
   if (!r || typeof r != "object" || !("attribute" in r))
     throw new Error(`${t.pathPrefix}args[0]: Expected filter as first argument`);
   return r;
 }
-function Nn(e, t) {
-  const r = xn(e, t);
-  if (!ve(r))
+function vn(e, t) {
+  const r = Nn(e, t);
+  if (!Me(r))
     throw new Error(
       `${t.pathPrefix}args[0]: exclude filter only accepts members filter, got ${r.__serializable || "unknown"} filter`
     );
   return e;
 }
-const vn = {
-  "measureFactory.customFormula": On,
+const Mn = "FilterRelations (filterFactory.logic.or / filterFactory.logic.and) is not supported inside measureFactory.measuredValue filters. Use plain filters only, or apply logical relations at the query filter level.";
+function Rn(e, t) {
+  const r = e[1];
+  return Array.isArray(r) && r.forEach((s, n) => {
+    if (!(typeof s != "object" || s === null) && H(s))
+      throw new Error(
+        `${t.pathPrefix}args[1][${n}]: ${Mn}`
+      );
+  }), e;
+}
+const In = {
+  "measureFactory.customFormula": $n,
+  "measureFactory.measuredValue": Rn,
   // String | Number filters
-  "filterFactory.equals": tt,
-  "filterFactory.doesntEqual": tt,
+  "filterFactory.equals": rt,
+  "filterFactory.doesntEqual": rt,
   // Numeric filters
   "filterFactory.greaterThan": B,
   "filterFactory.greaterThanOrEqual": B,
@@ -1909,20 +1936,20 @@ const vn = {
   "filterFactory.betweenNotEqual": B,
   "filterFactory.numeric": B,
   // String filters
-  "filterFactory.contains": z,
-  "filterFactory.doesntContain": z,
-  "filterFactory.startsWith": z,
-  "filterFactory.doesntStartWith": z,
-  "filterFactory.endsWith": z,
-  "filterFactory.doesntEndWith": z,
-  "filterFactory.like": z,
+  "filterFactory.contains": _,
+  "filterFactory.doesntContain": _,
+  "filterFactory.startsWith": _,
+  "filterFactory.doesntStartWith": _,
+  "filterFactory.endsWith": _,
+  "filterFactory.doesntEndWith": _,
+  "filterFactory.like": _,
   // Exclude filter
-  "filterFactory.exclude": Nn
+  "filterFactory.exclude": vn
 };
-function Mn(e) {
-  return vn[`${e}`];
+function kn(e) {
+  return In[`${e}`];
 }
-const Xt = {
+const Zt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -2449,18 +2476,18 @@ const Xt = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function ye(e) {
-  return Xt[`${e}`];
+function he(e) {
+  return Zt[`${e}`];
 }
-function Rn(e) {
-  const t = ye(e);
+function Ln(e) {
+  const t = he(e);
   return t ? t.filter((r) => r.required).length : 0;
 }
-function In(e) {
-  const t = ye(e);
+function Bn(e) {
+  const t = he(e);
   return t ? t.length : 0;
 }
-function kn(e) {
+function _n(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const r = Date.parse(e);
@@ -2469,10 +2496,10 @@ function kn(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function we(e, t, r, s) {
+function Se(e, t, r, s) {
   if (e.startsWith(T))
     try {
-      return ee(e, t, r);
+      return re(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
@@ -2481,10 +2508,10 @@ function we(e, t, r, s) {
     `${s}: Invalid attribute '${e}'. Expected format: '${T}TableName.ColumnName[.Level]'`
   );
 }
-function Ln(e, t, r, s) {
+function zn(e, t, r, s) {
   if (e.startsWith(T))
     try {
-      return Ys(e, t, r);
+      return Hs(e, t, r);
     } catch (n) {
       const i = n instanceof Error ? n.message : "Unknown error";
       throw new Error(`${s}: ${i}`);
@@ -2493,7 +2520,7 @@ function Ln(e, t, r, s) {
     `${s}: Invalid date dimension string '${e}'. Expected format: '${T}TableName.ColumnName'`
   );
 }
-function Bn(e) {
+function Un(e) {
   const t = e.data, { argSchema: r, dataSource: s, schemaIndex: n, pathPrefix: i } = e.context, a = i;
   if (t === void 0) {
     if (r.required)
@@ -2539,7 +2566,7 @@ function Bn(e) {
           throw new Error(
             `${a}: Expected attribute string, got ${typeof t}. Example: 'DM.Commerce.Revenue'`
           );
-        return we(t, s, n, a);
+        return Se(t, s, n, a);
       case "Attribute[]":
         if (!Array.isArray(t))
           throw new Error(
@@ -2548,7 +2575,7 @@ function Bn(e) {
         return t.map((o, u) => {
           if (typeof o != "string")
             throw new Error(`${a}[${u}]: Expected attribute string, got ${typeof o}`);
-          return we(o, s, n, `${a}[${u}]`);
+          return Se(o, s, n, `${a}[${u}]`);
         });
       case "Measure":
       case "BaseMeasure":
@@ -2624,21 +2651,21 @@ function Bn(e) {
           throw new Error(
             `${a}: Expected date dimension string, got ${typeof t}. Example: 'DM.Commerce.Date'`
           );
-        return Ln(t, s, n, a);
+        return zn(t, s, n, a);
       case "LevelAttribute": {
         if (typeof t != "string")
           throw new Error(
             `${a}: Expected date attribute string, got ${typeof t}. Example: 'DM.Commerce.Date.Years'`
           );
-        const o = we(
+        const o = Se(
           t,
           s,
           n,
           a
         );
-        if (!$n(o))
+        if (!Dn(o))
           throw new Error(
-            `${a}: Attribute must be date/datetime type, got ${ge(
+            `${a}: Attribute must be date/datetime type, got ${ye(
               o
             )} attribute`
           );
@@ -2657,7 +2684,7 @@ function Bn(e) {
         );
       case "Date | string":
         if (typeof t == "string") {
-          if (kn(t))
+          if (_n(t))
             return t;
           throw new Error(
             `${a}: Expected valid ISO date string or Date object, got invalid date string '${t}'`
@@ -2685,14 +2712,14 @@ function Bn(e) {
     }
 }
 function M(e) {
-  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: a } = t, o = n ? `${n}.` : "", u = ye(i);
+  const { data: t } = e, { dataSource: r, schemaIndex: s, pathPrefix: n } = e.context, { function: i, args: a } = t, o = n ? `${n}.` : "", u = he(i);
   if (!u) {
-    const m = Object.keys(Xt), F = x(i, m, (N) => N), O = F && F.distance <= C ? ` Did you mean '${F.best}'?` : "";
+    const m = Object.keys(Zt), F = x(i, m, (N) => N), O = F && F.distance <= C ? ` Did you mean '${F.best}'?` : "";
     throw new Error(
       `${o}function: Unknown function '${i}'.${O}`
     );
   }
-  const c = Rn(i), g = In(i);
+  const c = Ln(i), g = Bn(i);
   if (a.length < c)
     throw new Error(
       `${o}function: Expected at least ${c} arguments, got ${a.length}`
@@ -2713,7 +2740,7 @@ function M(e) {
       continue;
     }
     try {
-      const W = Bn({
+      const V = Un({
         data: O,
         context: {
           dataSource: r,
@@ -2722,10 +2749,10 @@ function M(e) {
           argSchema: F
         }
       });
-      f.push(W);
-    } catch (W) {
-      const or = W instanceof Error ? W.message : "Unknown error";
-      p.push(or);
+      f.push(V);
+    } catch (V) {
+      const ur = V instanceof Error ? V.message : "Unknown error";
+      p.push(ur);
     }
   }
   if (p.length > 0) {
@@ -2733,7 +2760,7 @@ function M(e) {
     throw new Error(m);
   }
   let h = f;
-  const b = Mn(i);
+  const b = kn(i);
   if (b)
     try {
       h = b(f, {
@@ -2745,23 +2772,23 @@ function M(e) {
       const F = m instanceof Error ? m.message : "Unknown validation error";
       throw new Error(F);
     }
-  return rn(i, h);
+  return sn(i, h);
 }
-function Zt(e) {
+function er(e) {
   const { attribute: t, config: r } = e;
-  if (ve(e) && ts(t)) {
-    const { granularity: s } = t, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), i = rs(r), a = Object.keys(i).length === 0 ? void 0 : i;
-    return ss(t, n, a);
+  if (Me(e) && rs(t)) {
+    const { granularity: s } = t, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), i = ss(r), a = Object.keys(i).length === 0 ? void 0 : i;
+    return ns(t, n, a);
   }
   return e;
 }
-function zn(e) {
+function Pn(e) {
   let t = [];
   for (const r of e)
-    re(r) ? t = Ge(r, t) : t = Ge([Zt(r)], t);
+    H(r) ? t = Ye(r, t) : t = Ye([er(r)], t);
   return t != null ? t : [];
 }
-const Un = (e) => {
+const Wn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((a, o) => {
     const u = {
@@ -2773,15 +2800,15 @@ const Un = (e) => {
         data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      !re(c) && !pe(c) ? i.push(E(l({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+      !H(c) && !ge(c) ? i.push(E(l({}, u), { message: "Invalid filter JSON" })) : n.push(c);
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
       i.push(E(l({}, u), { message: g }));
     }
-  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: zn(n) };
-}, ne = (e) => {
+  }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: Pn(n) };
+}, ie = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Bt(t) ? Un({
+  return t ? _t(t) ? Wn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2794,7 +2821,7 @@ const Un = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, _n = (e) => {
+}, Vn = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context, n = [], i = [];
   return t.forEach((a, o) => {
     const u = {
@@ -2806,15 +2833,15 @@ const Un = (e) => {
         data: a,
         context: { dataSource: r, schemaIndex: s, pathPrefix: "" }
       });
-      pe(c) ? n.push(Zt(c)) : i.push(E(l({}, u), { message: "Invalid filter JSON" }));
+      ge(c) ? n.push(er(c)) : i.push(E(l({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
       const g = c instanceof Error ? c.message : "Unknown error";
       i.push(E(l({}, u), { message: g }));
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
-}, he = (e) => {
+}, be = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
-  return t ? Bt(t) ? _n({
+  return t ? _t(t) ? Vn({
     data: t,
     context: { dataSource: r, schemaIndex: s }
   }) : {
@@ -2827,12 +2854,12 @@ const Un = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, Pn = (e, t) => {
-  if (e && !pt(e))
+}, jn = (e, t) => {
+  if (e && !gt(e))
     return E(l({}, t), {
       message: `Invalid sort type. Expected 'sortAsc', 'sortDesc', or 'sortNone'. Got: '${e}'.`
     });
-}, Wn = (e, t, r) => {
+}, Jn = (e, t, r) => {
   const { dataSource: s, schemaIndex: n } = t;
   try {
     const i = M({
@@ -2850,7 +2877,7 @@ const Un = (e) => {
       errors: [E(l({}, r), { message: a })]
     };
   }
-}, Vn = (e, t, r, s) => {
+}, Kn = (e, t, r, s) => {
   const n = M({
     data: e.column,
     context: { dataSource: t, schemaIndex: r, pathPrefix: "" }
@@ -2860,18 +2887,18 @@ const Un = (e) => {
       style: {},
       error: E(l({}, s), { message: "Invalid measure JSON" })
     };
-  const i = Pn(e.sortType, s);
+  const i = jn(e.sortType, s);
   if (i) {
-    const o = _(e, "column");
+    const o = U(e, "column");
     return { measure: n, style: o, error: i };
   }
-  const a = _(e, "column");
+  const a = U(e, "column");
   return { measure: n, style: a };
-}, jn = (e, t, r, s) => {
+}, Gn = (e, t, r, s) => {
   if (Ut(e))
-    return Vn(e, t, r, s);
+    return Kn(e, t, r, s);
   if (w(e)) {
-    const n = Wn(
+    const n = Jn(
       e,
       { dataSource: t, schemaIndex: r },
       s
@@ -2883,7 +2910,7 @@ const Un = (e) => {
       message: "Invalid measure item. Expected a function call (function/args) or object with 'column' and optional 'sortType'."
     })
   };
-}, er = (e) => {
+}, tr = (e) => {
   const { data: t } = e, { dataSource: r, schemaIndex: s } = e.context;
   if (!t)
     return { success: !0, data: [] };
@@ -2905,7 +2932,7 @@ const Un = (e) => {
       input: a
     };
     try {
-      const c = jn(a, r, s, u);
+      const c = Gn(a, r, s, u);
       if (c.error) {
         i.push(c.error);
         return;
@@ -2919,10 +2946,10 @@ const Un = (e) => {
     }
   }), i.length > 0 ? { success: !1, errors: i } : { success: !0, data: n };
 };
-function ue(e) {
+function ce(e) {
   return typeof e == "string" ? e : e.title;
 }
-function Jn(e) {
+function Yn(e) {
   const t = {};
   for (const [r, s] of Object.entries(e)) {
     const n = {};
@@ -2930,7 +2957,7 @@ function Jn(e) {
   }
   return Object.keys(t).length > 0 ? t : void 0;
 }
-function tr(e) {
+function rr(e) {
   return typeof e == "object" && e !== null && "toJSON" in e && typeof e.toJSON == "function" ? e.toJSON() : e;
 }
 function L(e) {
@@ -2946,21 +2973,21 @@ function A(e, t, r) {
   }
   return s.data;
 }
-const zi = (e) => {
-  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = se(s), i = [], a = A(
-    () => Pt({
+const Pi = (e) => {
+  const { data: t } = e, { dataSource: r, tables: s } = e.context, n = ne(s), i = [], a = A(
+    () => Wt({
       data: t.dimensions || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   ), o = A(
-    () => er({
+    () => tr({
       data: t.measures || [],
       context: { dataSource: r, schemaIndex: n }
     }),
     i
   ), u = A(
-    () => ne({
+    () => ie({
       data: t.filters || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2968,7 +2995,7 @@ const zi = (e) => {
   );
   let c = null;
   return t.highlights && (c = A(
-    () => he({
+    () => be({
       data: t.highlights || [],
       context: { dataSource: r, schemaIndex: n }
     }),
@@ -2979,21 +3006,21 @@ const zi = (e) => {
   } : {
     success: !0,
     data: l({
-      dataSource: de(r),
-      dimensions: a ? ns(a) : [],
-      measures: o ? is(o) : [],
+      dataSource: me(r),
+      dimensions: a ? is(a) : [],
+      measures: o ? as(o) : [],
       filters: u || []
     }, c && { highlights: c })
   };
 };
-function rt(e) {
+function st(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function We(e) {
+function Ve(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
     var f, p, h;
-    const i = rt(s) ? s.column : s, a = rt(s) ? s : void 0, o = () => tr(i);
+    const i = st(s) ? s.column : s, a = st(s) ? s : void 0, o = () => rr(i);
     if (!i.composeCode) {
       r.push({
         path: `dimensions[${n}]`,
@@ -3010,22 +3037,22 @@ function We(e) {
       });
       return;
     }
-    const u = (h = a != null && a.sortType ? gt(a.sortType) : void 0) != null ? h : ((f = i.getSort) == null ? void 0 : f.call(i)) !== void 0 && ((p = i.getSort) == null ? void 0 : p.call(i)) !== U.None ? i.getSort() : void 0, c = a ? _(a, "column") : {};
-    if (u !== void 0 && u !== U.None || a && Object.keys(c).length > 0) {
+    const u = (h = a != null && a.sortType ? yt(a.sortType) : void 0) != null ? h : ((f = i.getSort) == null ? void 0 : f.call(i)) !== void 0 && ((p = i.getSort) == null ? void 0 : p.call(i)) !== z.None ? i.getSort() : void 0, c = a ? U(a, "column") : {};
+    if (u !== void 0 && u !== z.None || a && Object.keys(c).length > 0) {
       const b = l(l({
         column: i.composeCode
-      }, u !== void 0 && u !== U.None && { sortType: yt(u) }), c);
+      }, u !== void 0 && u !== z.None && { sortType: ht(u) }), c);
       t.push(b);
     } else
       t.push(i.composeCode);
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-const De = "Unknown error";
-function ie(e) {
+const xe = "Unknown error";
+function ae(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [];
-  if (as(e)) {
+  if (os(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -3038,9 +3065,9 @@ function ie(e) {
         ]
       };
     try {
-      return { success: !0, data: [J(e.composeCode)] };
+      return { success: !0, data: [K(e.composeCode)] };
     } catch (s) {
-      const n = s instanceof Error ? s.message : De;
+      const n = s instanceof Error ? s.message : xe;
       return {
         success: !1,
         errors: [
@@ -3065,10 +3092,10 @@ function ie(e) {
       return;
     }
     try {
-      const a = J(s.composeCode);
+      const a = K(s.composeCode);
       r.push(a);
     } catch (a) {
-      const o = a instanceof Error ? a.message : De;
+      const o = a instanceof Error ? a.message : xe;
       t.push({
         path: `filters[${n}]`,
         input: s,
@@ -3077,7 +3104,7 @@ function ie(e) {
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function be(e) {
+function Fe(e) {
   if (!e)
     return { success: !0, data: [] };
   const t = [], r = [];
@@ -3092,10 +3119,10 @@ function be(e) {
       return;
     }
     try {
-      const a = J(s.composeCode);
+      const a = K(s.composeCode);
       t.push(a);
     } catch (a) {
-      const o = a instanceof Error ? a.message : De;
+      const o = a instanceof Error ? a.message : xe;
       r.push({
         path: `highlights[${n}]`,
         input: s,
@@ -3104,14 +3131,14 @@ function be(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function st(e) {
+function nt(e) {
   return typeof e == "object" && e !== null && "column" in e && e.column !== void 0;
 }
-function Ve(e) {
+function je(e) {
   const t = [], r = [];
   return e.forEach((s, n) => {
     var u, c, g;
-    const i = st(s) ? s.column : s, a = st(s) ? s : void 0, o = () => tr(i);
+    const i = nt(s) ? s.column : s, a = nt(s) ? s : void 0, o = () => rr(i);
     if (!i.composeCode) {
       r.push({
         path: `measures[${n}]`,
@@ -3121,11 +3148,11 @@ function Ve(e) {
       return;
     }
     try {
-      const f = J(i.composeCode), p = (g = a != null && a.sortType ? gt(a.sortType) : void 0) != null ? g : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== U.None ? i.getSort() : void 0;
-      if (p !== void 0 && p !== U.None || a && Object.keys(_(a, "column")).length > 0) {
-        const b = a ? _(a, "column") : {}, m = l(l({
+      const f = K(i.composeCode), p = (g = a != null && a.sortType ? yt(a.sortType) : void 0) != null ? g : ((u = i.getSort) == null ? void 0 : u.call(i)) !== void 0 && ((c = i.getSort) == null ? void 0 : c.call(i)) !== z.None ? i.getSort() : void 0;
+      if (p !== void 0 && p !== z.None || a && Object.keys(U(a, "column")).length > 0) {
+        const b = a ? U(a, "column") : {}, m = l(l({
           column: f
-        }, p !== void 0 && p !== U.None && { sortType: yt(p) }), b);
+        }, p !== void 0 && p !== z.None && { sortType: ht(p) }), b);
         t.push(m);
       } else
         t.push(f);
@@ -3139,42 +3166,42 @@ function Ve(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function nt(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(ht)) != null ? n : !1);
-}
 function it(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(bt)) != null ? n : !1);
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.trend")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(bt)) != null ? n : !1);
 }
 function at(e) {
+  var t, r, s, n;
+  return ((r = (t = e.composeCode) == null ? void 0 : t.includes("measureFactory.forecast")) != null ? r : !1) || ((n = (s = e.name) == null ? void 0 : s.startsWith(Ft)) != null ? n : !1);
+}
+function ot(e) {
   try {
-    const t = J(e.trim());
+    const t = K(e.trim());
     return t.args[2] != null && typeof t.args[2] == "object" ? t.args[2] : void 0;
   } catch (t) {
     return;
   }
 }
-function Kn(e) {
+function Hn(e) {
   var s, n, i;
   if (!(e != null && e.length)) return [];
   const t = /* @__PURE__ */ new Set(), r = [];
   for (let a = 0; a < e.length; a++) {
     if (t.has(a)) continue;
     const o = e[a];
-    if (nt(o) || it(o)) {
+    if (it(o) || at(o)) {
       r.push(o);
       continue;
     }
-    const u = (s = o.name) != null ? s : "Measure", c = `${ht}_${u}`, g = `${bt}_${u}`;
+    const u = (s = o.name) != null ? s : "Measure", c = `${bt}_${u}`, g = `${Ft}_${u}`;
     let f, p, h = a + 1;
-    if (h < e.length && !t.has(h) && nt(e[h]) && e[h].name === c) {
+    if (h < e.length && !t.has(h) && it(e[h]) && e[h].name === c) {
       const b = (n = e[h].composeCode) == null ? void 0 : n.trim();
-      b && (f = at(b), t.add(h), h++);
+      b && (f = ot(b), t.add(h), h++);
     }
-    if (h < e.length && !t.has(h) && it(e[h]) && e[h].name === g) {
+    if (h < e.length && !t.has(h) && at(e[h]) && e[h].name === g) {
       const b = (i = e[h].composeCode) == null ? void 0 : i.trim();
-      b && (p = at(b), t.add(h));
+      b && (p = ot(b), t.add(h));
     }
     f !== void 0 || p !== void 0 ? r.push(l(l({
       column: o
@@ -3182,20 +3209,20 @@ function Kn(e) {
   }
   return r;
 }
-function Ui(e) {
+function Wi(e) {
   const t = [], r = A(
-    () => We(e.dimensions || []),
+    () => Ve(e.dimensions || []),
     t
-  ), s = Kn(e.measures || []), n = A(
-    () => Ve(s),
+  ), s = Hn(e.measures || []), n = A(
+    () => je(s),
     t
   ), i = A(
-    () => ie(e.filters),
+    () => ae(e.filters),
     t
   );
   let a = null;
   if (e.highlights && e.highlights.length > 0 && (a = A(
-    () => be(e.highlights),
+    () => Fe(e.highlights),
     t
   )), t.length > 0)
     return {
@@ -3213,9 +3240,9 @@ function Ui(e) {
     data: L(o)
   };
 }
-const rr = new Set(
-  os.filter((e) => e !== "image")
-), ot = Object.freeze([...rr]), Se = /* @__PURE__ */ new Set([
+const sr = new Set(
+  us.filter((e) => e !== "image")
+), ut = Object.freeze([...sr]), Ce = /* @__PURE__ */ new Set([
   "category",
   "value",
   "breakBy",
@@ -3238,7 +3265,7 @@ const rr = new Set(
   "min",
   "max",
   "seriesToColorMap"
-]), Gn = {
+]), Qn = {
   line: {
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
@@ -3311,7 +3338,7 @@ const rr = new Set(
     validAxes: /* @__PURE__ */ new Set(["category", "value", "breakBy", "seriesToColorMap"]),
     requiredAxes: ["category", "value"]
   }
-}, Yn = /* @__PURE__ */ new Set([
+}, Xn = /* @__PURE__ */ new Set([
   "category",
   "breakBy",
   "breakByPoint",
@@ -3319,7 +3346,7 @@ const rr = new Set(
   "geo",
   "details",
   "date"
-]), Hn = /* @__PURE__ */ new Set([
+]), Zn = /* @__PURE__ */ new Set([
   "value",
   "size",
   "colorBy",
@@ -3331,34 +3358,34 @@ const rr = new Set(
   "max",
   "color"
 ]);
-function Qn(e) {
-  const t = Gn[e];
+function ei(e) {
+  const t = Qn[e];
   if (t)
     return {
       validAxes: new Set(t.validAxes),
       requiredAxes: Object.freeze([...t.requiredAxes])
     };
 }
-function sr(e) {
-  return typeof e == "string" && rr.has(e);
+function nr(e) {
+  return typeof e == "string" && sr.has(e);
 }
-function Xn(e, t, r) {
-  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Yn.has(e))
+function ti(e, t, r) {
+  if (r === "boxplot" && e === "value" || r === "calendar-heatmap" && e === "date" || Xn.has(e))
     return !0;
-  if (Hn.has(e))
+  if (Zn.has(e))
     return !1;
   const s = Array.isArray(t) ? t[0] : t;
   if (!s)
     return !0;
   let n;
-  return $(s) && "column" in s && (n = s.column), !(w(s) || n !== void 0 && w(n));
+  return q(s) && "column" in s && (n = s.column), !(w(s) || n !== void 0 && w(n));
 }
-function Zn(e) {
+function ri(e) {
   const t = [], r = {
     chartType: "",
     dataOptions: {}
   };
-  if (!$(e))
+  if (!q(e))
     return t.push({
       path: "chartType",
       input: e,
@@ -3372,10 +3399,10 @@ function Zn(e) {
       input: u,
       message: `chartType is required.${o}`
     });
-  } else if (sr(s))
+  } else if (nr(s))
     r.chartType = s;
   else {
-    const i = x(String(s), ot, (u) => u), a = i && i.distance <= C ? ` Did you mean '${i.best}'?` : "", o = ot.slice(0, 8).join(", ");
+    const i = x(String(s), ut, (u) => u), a = i && i.distance <= C ? ` Did you mean '${i.best}'?` : "", o = ut.slice(0, 8).join(", ");
     t.push({
       path: "chartType",
       input: s,
@@ -3396,111 +3423,111 @@ function Zn(e) {
 function D(e, t) {
   return e === -1 ? "dataOptions" : typeof e == "number" ? `dataOptions[${e}]` : t !== void 0 ? `dataOptions.${e}[${t}]` : `dataOptions.${e}`;
 }
-function nr(e, t) {
+function ir(e, t) {
   return e ? t ? `${e}.${t}` : e : t != null ? t : "";
 }
-function ei(e) {
+function si(e) {
   return (t) => E(l({}, t), {
-    path: nr(e, t.path)
+    path: ir(e, t.path)
   });
 }
-function ir(e) {
-  return ei(`widgets[${e}]`);
+function ar(e) {
+  return si(`widgets[${e}]`);
 }
-function ar(e, t) {
+function or(e, t) {
   return e.map(t);
 }
-function ti(e) {
+function ni(e) {
   return e.map(
     ({ attribute: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function ri(e) {
+function ii(e) {
   return e.map(
     ({ measure: t, style: r }) => r ? l({ column: t }, r) : t
   );
 }
-function si(e) {
+function ai(e) {
   return Array.isArray(e) ? e : [e];
 }
-function ni(e) {
+function oi(e) {
   return Array.isArray(e) ? e : [e];
 }
-function ii(e) {
+function ui(e) {
   return Array.isArray(e) ? e : [e];
 }
-const ai = /^(dimensions|measures|filters|highlights)(\[\d+\])?$/;
-function xe(e) {
+const ci = /^(dimensions|measures|filters|highlights)(\[\d+\])?$/;
+function Ne(e) {
   return (t) => {
     const r = t.path.match(/\[(\d+)\]$/), s = r ? Number(r[1]) : void 0, n = D(e, s);
-    if (ai.test(t.path) || t.path.startsWith("dataOptions"))
+    if (ci.test(t.path) || t.path.startsWith("dataOptions"))
       return E(l({}, t), { path: n });
     const i = t.path.replace(/\[\d+\]$/, "");
     return E(l({}, t), {
-      path: nr(i, n)
+      path: ir(i, n)
     });
   };
 }
-function le(e, t, r, s, n) {
+function fe(e, t, r, s, n) {
   if (r === "dimension") {
-    const o = t ? si(t) : [];
+    const o = t ? ai(t) : [];
     if (o.length === 0)
       return [];
     const u = A(
-      () => Pt({
+      () => Wt({
         data: o,
         context: s
       }),
       n,
-      xe(e)
+      Ne(e)
     );
-    return u !== null ? ti(u) : null;
+    return u !== null ? ni(u) : null;
   }
-  const i = t ? ni(t) : [];
+  const i = t ? oi(t) : [];
   if (i.length === 0)
     return [];
   const a = A(
-    () => er({
+    () => tr({
       data: i,
       context: s
     }),
     n,
-    xe(e)
+    Ne(e)
   );
-  return a !== null ? ri(a) : null;
+  return a !== null ? ii(a) : null;
 }
-const ut = (e, t) => {
+const ct = (e, t) => {
   const r = t.path.match(/\[(\d+)\]$/), s = r ? Number(r[1]) : void 0;
   return E(l({}, t), { path: D(e, s) });
 };
-function ct(e, t, r) {
+function lt(e, t, r) {
   const s = Array.isArray(t) ? t : t != null ? [t] : [];
   if (r === "dimension") {
-    const i = We(
+    const i = Ve(
       s
     );
     return i.success ? { success: !0, data: i.data } : {
       success: !1,
-      errors: i.errors.map((a) => ut(e, a))
+      errors: i.errors.map((a) => ct(e, a))
     };
   }
-  const n = Ve(s);
+  const n = je(s);
   return n.success ? { success: !0, data: n.data } : {
     success: !1,
-    errors: n.errors.map((i) => ut(e, i))
+    errors: n.errors.map((i) => ct(e, i))
   };
 }
-function oi(e, t) {
+function li(e, t) {
   let r;
-  $(e) && "column" in e && (r = e.column);
-  const n = !(w(e) || r !== void 0 && w(r)) ? "dimension" : "measure", i = [], a = le("columns", [e], n, t, i);
+  q(e) && "column" in e && (r = e.column);
+  const n = !(w(e) || r !== void 0 && w(r)) ? "dimension" : "measure", i = [], a = fe("columns", [e], n, t, i);
   return a !== null ? { success: !0, data: a } : { success: !1, errors: i };
 }
-function ui(e, t, r, s) {
+function fi(e, t, r, s) {
   const n = [];
   for (const i of e) {
     const a = A(
-      () => oi(i, t),
+      () => li(i, t),
       r,
       s
     );
@@ -3508,8 +3535,8 @@ function ui(e, t, r, s) {
   }
   return n;
 }
-function ci(e, t, r) {
-  if (!e || !$(e))
+function di(e, t, r) {
+  if (!e || !q(e))
     return r.push({
       path: D(-1),
       input: e,
@@ -3517,18 +3544,18 @@ function ci(e, t, r) {
     }), null;
   const s = {}, { chartType: n } = t, i = r.length, a = e, o = Object.keys(e), u = /* @__PURE__ */ new Map();
   for (const f of o)
-    if (!Se.has(f)) {
-      const p = x(f, [...Se], (b) => b), h = p && p.distance <= C ? ` Did you mean '${p.best}'?` : "";
+    if (!Ce.has(f)) {
+      const p = x(f, [...Ce], (b) => b), h = p && p.distance <= C ? ` Did you mean '${p.best}'?` : "";
       p && p.distance <= C && u.set(f, p.best), r.push({
         path: D(f),
         input: a[f],
         message: `Unknown dataOptions key '${f}'.${h}`
       });
     }
-  const c = n ? Qn(n) : void 0;
+  const c = n ? ei(n) : void 0;
   if (c) {
     for (const f of o)
-      if (f !== "seriesToColorMap" && !c.validAxes.has(f) && Se.has(f)) {
+      if (f !== "seriesToColorMap" && !c.validAxes.has(f) && Ce.has(f)) {
         const p = x(f, [...c.validAxes], (m) => m), h = p && p.distance <= C ? ` Did you mean '${p.best}'?` : "", b = [...c.validAxes].join(", ");
         r.push({
           path: D(f),
@@ -3566,15 +3593,15 @@ function ci(e, t, r) {
       continue;
     }
     if (f === "columns") {
-      s[f] = ui(
-        ii(p),
+      s[f] = fi(
+        ui(p),
         t,
         r,
-        xe("columns")
+        Ne("columns")
       );
       continue;
     }
-    const h = Xn(f, p, n) ? "dimension" : "measure", b = le(
+    const h = ti(f, p, n) ? "dimension" : "measure", b = fe(
       f,
       p,
       h,
@@ -3588,29 +3615,29 @@ function ci(e, t, r) {
   }
   return r.length > i ? null : s;
 }
-function li(e) {
+function mi(e) {
   if (typeof e != "string") return "iqr";
   const t = e.split("/")[1];
   return t === "iqr" || t === "extremums" || t === "standardDeviation" ? t : "iqr";
 }
-const fi = (e) => {
+const pi = (e) => {
   var m;
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = Zn(t);
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = ri(t);
   if (a.length > 0)
     return { success: !1, errors: a };
-  const o = i.chartType, u = se(n), c = [];
-  let g = ci(
+  const o = i.chartType, u = ne(n), c = [];
+  let g = di(
     i.dataOptions,
     { dataSource: s, schemaIndex: u, chartType: o },
     c
   );
   if (o === "boxplot" && g) {
-    const F = li((m = i.styleOptions) == null ? void 0 : m.subtype), O = F === "iqr" || F === "standardDeviation";
+    const F = mi((m = i.styleOptions) == null ? void 0 : m.subtype), O = F === "iqr" || F === "standardDeviation";
     g = E(l({}, g), { boxType: F, outliersEnabled: O });
   }
   let f = null;
   i.filters && i.filters.length > 0 && (f = A(
-    () => ne({
+    () => ie({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: u }
     }),
@@ -3618,7 +3645,7 @@ const fi = (e) => {
   ));
   let p = null;
   if (i.highlights && i.highlights.length > 0 && (p = A(
-    () => he({
+    () => be({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: u }
     }),
@@ -3628,7 +3655,7 @@ const fi = (e) => {
       success: !1,
       errors: c
     };
-  if (!sr(i.chartType))
+  if (!nr(i.chartType))
     return {
       success: !1,
       errors: [
@@ -3643,7 +3670,7 @@ const fi = (e) => {
   return {
     success: !0,
     data: l(l(l({
-      dataSet: de(s),
+      dataSet: me(s),
       chartType: h,
       dataOptions: g
     }, i.styleOptions && {
@@ -3651,7 +3678,7 @@ const fi = (e) => {
       styleOptions: i.styleOptions
     }), f && { filters: f }), p && { highlights: p })
   };
-}, di = (e) => {
+}, gi = (e) => {
   const t = [];
   if (!e.chartType)
     return {
@@ -3676,12 +3703,12 @@ const fi = (e) => {
       ]
     };
   let r = null;
-  const s = mi(e.dataOptions);
+  const s = yi(e.dataOptions);
   s.success ? r = s.data : t.push(...s.errors);
   let n;
   if (e.filters) {
     const o = A(
-      () => ie(e.filters),
+      () => ae(e.filters),
       t
     );
     n = o != null ? o : void 0;
@@ -3689,7 +3716,7 @@ const fi = (e) => {
   let i;
   if (e.highlights && e.highlights.length > 0) {
     const o = A(
-      () => be(e.highlights),
+      () => Fe(e.highlights),
       t
     );
     i = o != null ? o : void 0;
@@ -3707,7 +3734,7 @@ const fi = (e) => {
     data: L(a)
   };
 };
-function mi(e) {
+function yi(e) {
   const t = {}, r = [], s = /* @__PURE__ */ new Set(["seriesToColorMap", "boxType", "outliersEnabled", "valueTitle"]);
   for (const [n, i] of Object.entries(e)) {
     if (n === "seriesToColorMap" && i) {
@@ -3720,9 +3747,9 @@ function mi(e) {
     }
     const a = Array.isArray(i) ? i : [i], o = Array.isArray(i), u = [], c = [];
     for (let g = 0; g < a.length; g++) {
-      const f = a[g], h = pi(f) ? We([
+      const f = a[g], h = hi(f) ? Ve([
         f
-      ]) : Ve([f]);
+      ]) : je([f]);
       h.success ? u.push(...h.data) : h.errors.forEach((b) => {
         var m;
         c.push(E(l({}, b), {
@@ -3739,11 +3766,11 @@ function mi(e) {
   }
   return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function pi(e) {
+function hi(e) {
   const t = Array.isArray(e) ? e[0] : e;
-  if (!t || !$(t))
+  if (!t || !q(t))
     return !0;
-  const r = "column" in t && t.column != null && $(t.column) ? t.column : t;
+  const r = "column" in t && t.column != null && q(t.column) ? t.column : t;
   if ("composeCode" in r) {
     const s = r.composeCode;
     if (typeof s == "string" && s.startsWith("DM."))
@@ -3758,17 +3785,17 @@ function pi(e) {
   }
   return !("aggregation" in r || "attribute" in r && "aggregation" in r);
 }
-const lt = ["rows", "columns", "values", "grandTotals"];
-function gi(e) {
-  if (!$(e)) return !1;
+const ft = ["rows", "columns", "values", "grandTotals"];
+function bi(e) {
+  if (!q(e)) return !1;
   const t = Object.keys(e);
   return t.every((r) => r === "rows" || r === "columns") && t.every((r) => typeof e[r] == "boolean");
 }
-function yi(e) {
+function Fi(e) {
   const t = [], r = {
     dataOptions: {}
   };
-  if (!$(e))
+  if (!q(e))
     return t.push({
       path: "dataOptions",
       input: e,
@@ -3782,12 +3809,12 @@ function yi(e) {
       input: o,
       message: `dataOptions is required.${a}`
     });
-  } else if ($(s)) {
+  } else if (q(s)) {
     const n = s;
     r.dataOptions = n;
     for (const a of Object.keys(n))
-      if (!lt.includes(a)) {
-        const o = x(a, [...lt], (c) => c), u = o && o.distance <= C ? ` Did you mean '${o.best}'?` : "";
+      if (!ft.includes(a)) {
+        const o = x(a, [...ft], (c) => c), u = o && o.distance <= C ? ` Did you mean '${o.best}'?` : "";
         t.push({
           path: D(a),
           input: n[a],
@@ -3803,7 +3830,7 @@ function yi(e) {
       });
     }
     const i = n.grandTotals;
-    i != null && !gi(i) && t.push({
+    i != null && !bi(i) && t.push({
       path: D("grandTotals"),
       input: i,
       message: "grandTotals must be an object with optional rows?: boolean, columns?: boolean"
@@ -3811,7 +3838,7 @@ function yi(e) {
   }
   return e.styleOptions !== void 0 && (r.styleOptions = e.styleOptions), e.filters !== void 0 && Array.isArray(e.filters) && (r.filters = e.filters), e.highlights !== void 0 && Array.isArray(e.highlights) && (r.highlights = e.highlights), { normalized: r, errors: t };
 }
-function hi(e, t, r) {
+function Ei(e, t, r) {
   if (!e || typeof e != "object")
     return r.push({
       path: D(-1),
@@ -3820,7 +3847,7 @@ function hi(e, t, r) {
     }), null;
   const s = {}, n = r.length;
   for (const a of ["rows", "columns"]) {
-    const o = le(
+    const o = fe(
       a,
       e[a],
       "dimension",
@@ -3829,7 +3856,7 @@ function hi(e, t, r) {
     );
     o && (s[a] = o);
   }
-  const i = le(
+  const i = fe(
     "values",
     e.values,
     "measure",
@@ -3838,18 +3865,18 @@ function hi(e, t, r) {
   );
   return i && (s.values = i), e.grandTotals !== void 0 && (s.grandTotals = e.grandTotals), r.length > n ? null : s;
 }
-const bi = (e) => {
-  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = yi(t);
+const Ai = (e) => {
+  const { data: t, context: r } = e, { dataSource: s, tables: n } = r, { normalized: i, errors: a } = Fi(t);
   if (a.length > 0)
     return { success: !1, errors: a };
-  const o = se(n), u = [], c = hi(
+  const o = ne(n), u = [], c = Ei(
     i.dataOptions,
     { dataSource: s, schemaIndex: o },
     u
   );
   let g = null;
   i.filters && i.filters.length > 0 && (g = A(
-    () => ne({
+    () => ie({
       data: i.filters || [],
       context: { dataSource: s, schemaIndex: o }
     }),
@@ -3857,7 +3884,7 @@ const bi = (e) => {
   ));
   let f = null;
   return i.highlights && i.highlights.length > 0 && (f = A(
-    () => he({
+    () => be({
       data: i.highlights || [],
       context: { dataSource: s, schemaIndex: o }
     }),
@@ -3868,11 +3895,11 @@ const bi = (e) => {
   } : {
     success: !0,
     data: l(l(l({
-      dataSet: de(s),
+      dataSet: me(s),
       dataOptions: c
     }, i.styleOptions && { styleOptions: i.styleOptions }), g && { filters: g }), f && { highlights: f })
   };
-}, Fi = (e) => {
+}, Ti = (e) => {
   const t = [];
   if (!e.dataOptions)
     return {
@@ -3889,20 +3916,20 @@ const bi = (e) => {
   for (const u of ["rows", "columns"]) {
     const c = r[u];
     if (c && c.length > 0) {
-      const g = ct(u, c, "dimension");
+      const g = lt(u, c, "dimension");
       g.success ? s[u] = g.data : t.push(...g.errors);
     }
   }
   const n = r.values;
   if (n && n.length > 0) {
-    const u = ct("values", n, "measure");
+    const u = lt("values", n, "measure");
     u.success ? s.values = u.data : t.push(...u.errors);
   }
   r.grandTotals !== void 0 && (s.grandTotals = r.grandTotals);
   let i;
   if (e.filters) {
     const u = A(
-      () => ie(e.filters),
+      () => ae(e.filters),
       t
     );
     i = u != null ? u : void 0;
@@ -3910,7 +3937,7 @@ const bi = (e) => {
   let a;
   if (e.highlights && e.highlights.length > 0) {
     const u = A(
-      () => be(e.highlights),
+      () => Fe(e.highlights),
       t
     );
     a = u != null ? u : void 0;
@@ -3924,19 +3951,19 @@ const bi = (e) => {
     success: !0,
     data: L(o)
   };
-}, Ei = (e, t, r) => {
-  const s = se(r.tables), n = { dataSource: r.dataSource, schemaIndex: s }, i = [], a = e && e.length > 0 ? A(
-    () => ne({ data: e, context: n }),
+}, wi = (e, t, r) => {
+  const s = ne(r.tables), n = { dataSource: r.dataSource, schemaIndex: s }, i = [], a = e && e.length > 0 ? A(
+    () => ie({ data: e, context: n }),
     i
   ) : void 0, o = t && t.length > 0 ? A(
-    () => he({ data: t, context: n }),
+    () => be({ data: t, context: n }),
     i
   ) : void 0;
   return i.length > 0 ? { success: !1, errors: i } : {
     success: !0,
     data: l(l({}, a != null && { filters: a }), o != null && { highlights: o })
   };
-}, Ai = [
+}, Si = [
   "widgetType",
   "id",
   "title",
@@ -3944,8 +3971,8 @@ const bi = (e) => {
   "dataSource",
   "config",
   "highlightSelectionDisabled"
-], ft = (e, t, r, s) => {
-  const { id: n, title: i, description: a, dataSource: o, config: u, highlightSelectionDisabled: c } = e, g = _(e, Ai), f = r({ data: g, context: t });
+], dt = (e, t, r, s) => {
+  const { id: n, title: i, description: a, dataSource: o, config: u, highlightSelectionDisabled: c } = e, g = U(e, Si), f = r({ data: g, context: t });
   return f.success ? {
     success: !0,
     data: s(f.data, {
@@ -3957,23 +3984,23 @@ const bi = (e) => {
       highlightSelectionDisabled: c
     })
   } : f;
-}, Ti = (e, t) => {
-  const n = e, { dataSet: r } = n, s = Fe(n, ["dataSet"]);
+}, Ci = (e, t) => {
+  const n = e, { dataSet: r } = n, s = Ee(n, ["dataSet"]);
   return l(l(l(l(l(E(l({}, s), {
     widgetType: "chart",
     id: t.id
-  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Ft(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.highlightSelectionDisabled !== void 0 && {
+  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Et(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.highlightSelectionDisabled !== void 0 && {
     highlightSelectionDisabled: t.highlightSelectionDisabled
   }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
-}, wi = (e, t) => {
-  const n = e, { dataSet: r } = n, s = Fe(n, ["dataSet"]);
+}, Oi = (e, t) => {
+  const n = e, { dataSet: r } = n, s = Ee(n, ["dataSet"]);
   return l(l(l(l(E(l({}, s), {
     widgetType: "pivot",
     id: t.id
-  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Ft(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
-}, Ne = ["chart", "pivot", "text", "custom"], Si = (e) => typeof e == "string" && Ne.includes(e);
-function Ci(e) {
-  if (!$(e))
+  }), t.dataSource !== void 0 ? { dataSource: t.dataSource } : r !== void 0 && Et(r) && { dataSource: r }), t.config !== void 0 && { config: t.config }), t.title !== void 0 && { title: t.title }), t.description !== void 0 && { description: t.description });
+}, ve = ["chart", "pivot", "text", "custom"], $i = (e) => typeof e == "string" && ve.includes(e);
+function qi(e) {
+  if (!q(e))
     return {
       path: "widgetType",
       input: e,
@@ -3988,8 +4015,8 @@ function Ci(e) {
       message: `widgetType is required.${n}`
     };
   }
-  if (!Si(t)) {
-    const r = x(String(t), Ne, (i) => i), s = r && r.distance <= C ? ` Did you mean '${r.best}'?` : "", n = Ne.join(", ");
+  if (!$i(t)) {
+    const r = x(String(t), ve, (i) => i), s = r && r.distance <= C ? ` Did you mean '${r.best}'?` : "", n = ve.join(", ");
     return {
       path: "widgetType",
       input: t,
@@ -4000,30 +4027,30 @@ function Ci(e) {
   }
   return null;
 }
-const Oi = (e) => ({
+const Di = (e) => ({
   path: "id",
   input: e,
   message: "Widget id is required"
-}), qi = (e) => !!e.id, $i = (e) => {
-  const { data: t, context: r } = e, s = Ci(t);
+}), xi = (e) => !!e.id, Ni = (e) => {
+  const { data: t, context: r } = e, s = qi(t);
   if (s)
     return { success: !1, errors: [s] };
-  if (!qi(t))
-    return { success: !1, errors: [Oi(t)] };
+  if (!xi(t))
+    return { success: !1, errors: [Di(t)] };
   switch (t.widgetType) {
     case "chart":
-      return ft(
+      return dt(
         t,
         r,
-        fi,
-        Ti
+        pi,
+        Ci
       );
     case "pivot":
-      return ft(
+      return dt(
         t,
         r,
-        bi,
-        wi
+        Ai,
+        Oi
       );
     case "text":
       return { success: !0, data: l({
@@ -4044,12 +4071,12 @@ const Oi = (e) => ({
         dataOptions: p,
         styleOptions: h,
         customOptions: b
-      } = t, m = Ei(g, f, r);
+      } = t, m = wi(g, f, r);
       return m.success ? { success: !0, data: l(l(l(l(l(l({
         widgetType: "custom",
         id: n,
         customWidgetType: i,
-        dataSource: u !== void 0 ? u : de(r.dataSource),
+        dataSource: u !== void 0 ? u : me(r.dataSource),
         dataOptions: p != null ? p : {}
       }, a !== void 0 && { title: a }), o !== void 0 && { description: o }), c !== void 0 && { config: c }), h !== void 0 && { styleOptions: h }), b !== void 0 && { customOptions: b }), m.data) } : m;
     }
@@ -4067,17 +4094,17 @@ const Oi = (e) => ({
         ]
       };
   }
-}, Di = (e) => {
+}, vi = (e) => {
   const { widgetType: t } = e;
   switch (t) {
     case "chart": {
-      const r = di(e);
+      const r = gi(e);
       if (!r.success) return r;
       const s = l(l(l(l(l(E(l({}, r.data), {
         widgetType: "chart",
         id: e.id
       }), e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ue(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config }), e.highlightSelectionDisabled !== void 0 && {
         highlightSelectionDisabled: e.highlightSelectionDisabled
       });
@@ -4087,13 +4114,13 @@ const Oi = (e) => ({
       };
     }
     case "pivot": {
-      const r = Fi(e);
+      const r = Ti(e);
       if (!r.success) return r;
       const s = l(l(l(l(E(l({}, r.data), {
         widgetType: "pivot",
         id: e.id
       }), e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ue(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config });
       return {
         success: !0,
@@ -4108,10 +4135,10 @@ const Oi = (e) => ({
       }, e.config !== void 0 && { config: e.config }) };
     case "custom": {
       const r = [], s = e.filters !== void 0 ? A(
-        () => ie(e.filters),
+        () => ae(e.filters),
         r
       ) : void 0, n = e.highlights !== void 0 ? A(
-        () => be(e.highlights),
+        () => Fe(e.highlights),
         r
       ) : void 0;
       return r.length > 0 ? { success: !1, errors: r } : { success: !0, data: l(l(l(l(l(l(l(l(l({
@@ -4119,7 +4146,7 @@ const Oi = (e) => ({
         customWidgetType: e.customWidgetType,
         id: e.id
       }, e.title !== void 0 && { title: e.title }), e.description !== void 0 && { description: e.description }), e.dataSource !== void 0 && {
-        dataSource: ue(e.dataSource)
+        dataSource: ce(e.dataSource)
       }), e.config !== void 0 && { config: e.config }), e.dataOptions !== void 0 && {
         dataOptions: e.dataOptions
       }), e.styleOptions !== void 0 && { styleOptions: e.styleOptions }), e.customOptions !== void 0 && {
@@ -4142,13 +4169,13 @@ const Oi = (e) => ({
         ]
       };
   }
-}, _i = (e) => {
+}, Vi = (e) => {
   const { data: t, context: r } = e, s = [], n = [];
   Array.isArray(t.widgets) ? t.widgets.forEach((o, u) => {
-    const c = $i({ data: o, context: r });
+    const c = Ni({ data: o, context: r });
     if (!c.success) {
       s.push(
-        ...ar(c.errors, ir(u))
+        ...or(c.errors, ar(u))
       );
       return;
     }
@@ -4160,9 +4187,9 @@ const Oi = (e) => ({
   });
   let i = null;
   if (t.filters && t.filters.length > 0) {
-    const o = se(r.tables);
+    const o = ne(r.tables);
     i = A(
-      () => ne({
+      () => ie({
         data: t.filters,
         context: { dataSource: r.dataSource, schemaIndex: o }
       }),
@@ -4178,13 +4205,13 @@ const Oi = (e) => ({
   }), t.styleOptions !== void 0 && { styleOptions: t.styleOptions }), t.widgetsOptions !== void 0 && {
     widgetsOptions: t.widgetsOptions
   }) };
-}, Pi = (e) => {
+}, ji = (e) => {
   const t = [], r = [];
   e.widgets.forEach((a, o) => {
-    const u = Di(a);
+    const u = vi(a);
     if (!u.success) {
       t.push(
-        ...ar(u.errors, ir(o))
+        ...or(u.errors, ar(o))
       );
       return;
     }
@@ -4193,27 +4220,27 @@ const Oi = (e) => ({
   let s;
   if (e.filters) {
     const a = A(
-      () => ie(e.filters),
+      () => ae(e.filters),
       t
     );
     s = a != null ? a : void 0;
   }
   if (t.length > 0)
     return { success: !1, errors: t };
-  const n = e.widgetsOptions !== void 0 ? Jn(e.widgetsOptions) : void 0, i = l(l(l(l(l(l(l(l({
+  const n = e.widgetsOptions !== void 0 ? Yn(e.widgetsOptions) : void 0, i = l(l(l(l(l(l(l(l({
     widgets: r
   }, e.id !== void 0 && { id: e.id }), e.title !== void 0 && { title: e.title }), s && s.length > 0 && { filters: s }), e.layoutOptions !== void 0 && {
     layoutOptions: e.layoutOptions
   }), e.config !== void 0 && { config: e.config }), e.defaultDataSource !== void 0 && {
-    defaultDataSource: ue(e.defaultDataSource)
+    defaultDataSource: ce(e.defaultDataSource)
   }), e.styleOptions !== void 0 && { styleOptions: e.styleOptions }), n !== void 0 && { widgetsOptions: n });
   return {
     success: !0,
     data: L(i)
   };
 };
-function xi(e) {
-  const { filters: t, relations: r } = ls(
+function Mi(e) {
+  const { filters: t, relations: r } = fs(
     e.filters || []
   );
   return {
@@ -4226,17 +4253,17 @@ function xi(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function Wi(e, t, r = !1) {
-  const s = xi(e), n = us(s, t);
-  return cs(n, r);
+function Ji(e, t, r = !1) {
+  const s = Mi(e), n = cs(s, t);
+  return ls(n, r);
 }
-function fe(e) {
+function de(e) {
   const t = e.trim();
   return t.startsWith(T) ? t.slice(T.length) : t;
 }
-function H(e) {
+function X(e) {
   var s;
-  const t = ye(e.function);
+  const t = he(e.function);
   if (t) {
     const n = t.findIndex((i) => i.isName);
     if (n >= 0) {
@@ -4245,40 +4272,40 @@ function H(e) {
     }
   }
   const r = e.args[0];
-  return typeof r == "string" ? fe(r) : w(r) ? H(r) : (s = e.function.split(".").pop()) != null ? s : e.function;
+  return typeof r == "string" ? de(r) : w(r) ? X(r) : (s = e.function.split(".").pop()) != null ? s : e.function;
 }
-const dt = "filterFactory.logic.";
-function mt(e) {
+const mt = "filterFactory.logic.";
+function pt(e) {
   var r;
-  if (e.function.startsWith(dt))
-    return e.function.slice(dt.length);
+  if (e.function.startsWith(mt))
+    return e.function.slice(mt.length);
   const t = e.args[0];
-  return typeof t == "string" ? fe(t) : w(t) ? H(t) : (r = e.function.split(".").pop()) != null ? r : e.function;
+  return typeof t == "string" ? de(t) : w(t) ? X(t) : (r = e.function.split(".").pop()) != null ? r : e.function;
 }
-const Ni = "measureFactory.", vi = "filterFactory.", Mi = (e) => e.function.startsWith(Ni), Ri = (e) => e.function.startsWith(vi);
-function Vi(e, t) {
+const Ri = "measureFactory.", Ii = "filterFactory.", ki = (e) => e.function.startsWith(Ri), Li = (e) => e.function.startsWith(Ii);
+function Ki(e, t) {
   var s;
   const r = (s = t == null ? void 0 : t.role) != null ? s : "filter";
-  return typeof e == "string" ? { name: fe(e), type: "dimension" } : zt(e) ? { name: fe(e.column), type: "dimension" } : Ut(e) ? { name: H(e.column), type: "measure" } : w(e) ? Mi(e) ? { name: H(e), type: "measure" } : Ri(e) ? { name: mt(e), type: r } : (t == null ? void 0 : t.role) !== void 0 ? { name: mt(e), type: r } : { name: H(e), type: "measure" } : null;
+  return typeof e == "string" ? { name: de(e), type: "dimension" } : zt(e) ? { name: de(e.column), type: "dimension" } : Ut(e) ? { name: X(e.column), type: "measure" } : w(e) ? ki(e) ? { name: X(e), type: "measure" } : Li(e) ? { name: pt(e), type: r } : (t == null ? void 0 : t.role) !== void 0 ? { name: pt(e), type: r } : { name: X(e), type: "measure" } : null;
 }
 export {
-  Bi as CustomSuperJSON,
-  Ki as EMPTY_EXPANDED_QUERY_MODEL,
-  Gi as EMPTY_SIMPLE_QUERY_MODEL,
-  Vi as getQueryElementSummary,
-  Yi as isByIdDashboardCodeParams,
-  Hi as isByIdWidgetCodeParams,
-  Qi as isClientSideDashboardCodeParams,
-  Xi as isClientSideWidgetCodeParams,
-  fi as translateChartFromJSON,
-  di as translateChartToJSON,
-  _i as translateDashboardFromJSON,
-  Pi as translateDashboardToJSON,
-  bi as translatePivotTableFromJSON,
-  Fi as translatePivotTableToJSON,
-  zi as translateQueryFromJSON,
-  Ui as translateQueryToJSON,
-  Wi as translateQueryToJaql,
-  $i as translateWidgetFromJSON,
-  Di as translateWidgetToJSON
+  Ui as CustomSuperJSON,
+  Hi as EMPTY_EXPANDED_QUERY_MODEL,
+  Qi as EMPTY_SIMPLE_QUERY_MODEL,
+  Ki as getQueryElementSummary,
+  Xi as isByIdDashboardCodeParams,
+  Zi as isByIdWidgetCodeParams,
+  ea as isClientSideDashboardCodeParams,
+  ta as isClientSideWidgetCodeParams,
+  pi as translateChartFromJSON,
+  gi as translateChartToJSON,
+  Vi as translateDashboardFromJSON,
+  ji as translateDashboardToJSON,
+  Ai as translatePivotTableFromJSON,
+  Ti as translatePivotTableToJSON,
+  Pi as translateQueryFromJSON,
+  Wi as translateQueryToJSON,
+  Ji as translateQueryToJaql,
+  Ni as translateWidgetFromJSON,
+  vi as translateWidgetToJSON
 };