@sisense/sdk-ui 2.20.0 → 2.21.0

package/dist/analytics-composer/node.js

@@ -1,20 +1,20 @@
-var Qe = Object.defineProperty, Ye = Object.defineProperties;
-var He = Object.getOwnPropertyDescriptors;
+var Xe = Object.defineProperty, ve = Object.defineProperties;
+var er = Object.getOwnPropertyDescriptors;
 var pe = Object.getOwnPropertySymbols;
-var Ze = Object.prototype.hasOwnProperty, Ge = Object.prototype.propertyIsEnumerable;
-var ye = (e, r, t) => r in e ? Qe(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, b = (e, r) => {
+var rr = Object.prototype.hasOwnProperty, tr = Object.prototype.propertyIsEnumerable;
+var ye = (e, r, t) => r in e ? Xe(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, p = (e, r) => {
   for (var t in r || (r = {}))
-    Ze.call(r, t) && ye(e, t, r[t]);
+    rr.call(r, t) && ye(e, t, r[t]);
   if (pe)
     for (var t of pe(r))
-      Ge.call(r, t) && ye(e, t, r[t]);
+      tr.call(r, t) && ye(e, t, r[t]);
   return e;
-}, E = (e, r) => Ye(e, He(r));
-import { f as Xe, J as ve } from "../types-tDJE6TNR.js";
-import { b as xs, E as As, a as Ds, i as Ms, e as Ns, d as Rs } from "../types-tDJE6TNR.js";
-import { bW as er, bA as rr, bX as tr, bY as sr, bZ as nr, aw as se, b_ as ir, av as ar, b$ as or, b8 as ur, ax as lr, c0 as cr, bb as fr, b9 as dr, aL as mr, b7 as pr, ba as yr, d as gr, c as hr, k as br, c1 as Fr, c2 as wr, c3 as qr, c4 as Er, c5 as Cr, c6 as $r, c7 as xr, c8 as Ar, c9 as Dr, ca as Mr, cb as Nr, au as Rr, cc as Sr, cd as Or, S as Tr, h as Ir, s as ne, b as J, M as z, ce as zr, cf as Br, cg as Pr, ch as kr, ci as _r, aH as Lr, an as ge, am as Vr, a7 as Wr, cj as Jr, y as Ur, x as jr } from "../execute-query-VxgY3tbz.js";
-import { i as Kr, b as Qr, D as Yr, d as Hr, a as Zr } from "../dimensions-Blw0p98x.js";
-class Gr {
+}, b = (e, r) => ve(e, er(r));
+import { f as sr, J as nr } from "../types-Ockb-LJ0.js";
+import { b as _s, E as Us, a as Ws, i as js, e as Js, d as Gs } from "../types-Ockb-LJ0.js";
+import { bW as ir, bA as or, bX as ar, bY as ur, bZ as cr, aw as se, b_ as lr, av as fr, b$ as dr, b8 as mr, ax as pr, c0 as yr, bb as gr, b9 as hr, aL as br, b7 as Fr, ba as wr, d as qr, c as Er, k as Cr, c1 as $r, c2 as Ar, c3 as xr, c4 as Dr, c5 as Mr, c6 as Sr, c7 as Tr, c8 as Nr, c9 as Rr, ca as Or, cb as Ir, au as zr, cc as Pr, cd as Br, S as ne, h as kr, s as ie, b as U, M as O, ce as Ee, bG as Ce, cf as Lr, cg as Vr, ch as _r, ci as Ur, cj as Wr, aH as jr, an as ge, am as Jr, ck as $e, a7 as Gr, cl as Kr, y as Qr, x as Yr } from "../execute-query-B21bnb05.js";
+import { i as Hr, b as Zr, D as Xr, d as vr, a as et } from "../dimensions-DuUqQgpi.js";
+class rt {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -31,9 +31,9 @@ class Gr {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class Ee {
+class Ae {
   constructor(r) {
-    this.generateIdentifier = r, this.kv = new Gr();
+    this.generateIdentifier = r, this.kv = new rt();
   }
   register(r, t) {
     this.kv.getByValue(r) || (t || (t = this.generateIdentifier(r)), this.kv.set(t, r));
@@ -48,7 +48,7 @@ class Ee {
     return this.kv.getByKey(r);
   }
 }
-class Xr extends Ee {
+class tt extends Ae {
   constructor() {
     super((r) => r.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -59,7 +59,7 @@ class Xr extends Ee {
     return this.classToAllowedProps.get(r);
   }
 }
-function vr(e) {
+function st(e) {
   if ("values" in Object)
     return Object.values(e);
   const r = [];
@@ -67,21 +67,21 @@ function vr(e) {
     e.hasOwnProperty(t) && r.push(e[t]);
   return r;
 }
-function et(e, r) {
-  const t = vr(e);
+function nt(e, r) {
+  const t = st(e);
   if ("find" in t)
     return t.find(r);
   const s = t;
   for (let n = 0; n < s.length; n++) {
-    const a = s[n];
-    if (r(a))
-      return a;
+    const o = s[n];
+    if (r(o))
+      return o;
   }
 }
-function B(e, r) {
+function I(e, r) {
   Object.entries(e).forEach(([t, s]) => r(s, t));
 }
-function U(e, r) {
+function W(e, r) {
   return e.indexOf(r) !== -1;
 }
 function he(e, r) {
@@ -91,7 +91,7 @@ function he(e, r) {
       return s;
   }
 }
-class rt {
+class it {
   constructor() {
     this.transfomers = {};
   }
@@ -99,26 +99,26 @@ class rt {
     this.transfomers[r.name] = r;
   }
   findApplicable(r) {
-    return et(this.transfomers, (t) => t.isApplicable(r));
+    return nt(this.transfomers, (t) => t.isApplicable(r));
   }
   findByName(r) {
     return this.transfomers[r];
   }
 }
-const tt = (e) => Object.prototype.toString.call(e).slice(8, -1), Ce = (e) => typeof e == "undefined", st = (e) => e === null, k = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, G = (e) => k(e) && Object.keys(e).length === 0, N = (e) => Array.isArray(e), nt = (e) => typeof e == "string", it = (e) => typeof e == "number" && !isNaN(e), at = (e) => typeof e == "boolean", ot = (e) => e instanceof RegExp, _ = (e) => e instanceof Map, L = (e) => e instanceof Set, $e = (e) => tt(e) === "Symbol", ut = (e) => e instanceof Date && !isNaN(e.valueOf()), lt = (e) => e instanceof Error, be = (e) => typeof e == "number" && isNaN(e), ct = (e) => at(e) || st(e) || Ce(e) || it(e) || nt(e) || $e(e), ft = (e) => typeof e == "bigint", dt = (e) => e === 1 / 0 || e === -1 / 0, mt = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), pt = (e) => e instanceof URL, xe = (e) => e.replace(/\./g, "\\."), Y = (e) => e.map(String).map(xe).join("."), P = (e) => {
+const ot = (e) => Object.prototype.toString.call(e).slice(8, -1), xe = (e) => typeof e == "undefined", at = (e) => e === null, B = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Z = (e) => B(e) && Object.keys(e).length === 0, D = (e) => Array.isArray(e), ut = (e) => typeof e == "string", ct = (e) => typeof e == "number" && !isNaN(e), lt = (e) => typeof e == "boolean", ft = (e) => e instanceof RegExp, k = (e) => e instanceof Map, L = (e) => e instanceof Set, De = (e) => ot(e) === "Symbol", dt = (e) => e instanceof Date && !isNaN(e.valueOf()), mt = (e) => e instanceof Error, be = (e) => typeof e == "number" && isNaN(e), pt = (e) => lt(e) || at(e) || xe(e) || ct(e) || ut(e) || De(e), yt = (e) => typeof e == "bigint", gt = (e) => e === 1 / 0 || e === -1 / 0, ht = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), bt = (e) => e instanceof URL, Me = (e) => e.replace(/\./g, "\\."), Q = (e) => e.map(String).map(Me).join("."), P = (e) => {
   const r = [];
   let t = "";
   for (let n = 0; n < e.length; n++) {
-    let a = e.charAt(n);
-    if (a === "\\" && e.charAt(n + 1) === ".") {
+    let o = e.charAt(n);
+    if (o === "\\" && e.charAt(n + 1) === ".") {
       t += ".", n++;
       continue;
     }
-    if (a === ".") {
+    if (o === ".") {
       r.push(t), t = "";
       continue;
     }
-    t += a;
+    t += o;
   }
   const s = t;
   return r.push(s), r;
@@ -131,12 +131,12 @@ function $(e, r, t, s) {
     untransform: s
   };
 }
-const Ae = [
-  $(Ce, "undefined", () => null, () => {
+const Se = [
+  $(xe, "undefined", () => null, () => {
   }),
-  $(ft, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  $(ut, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  $(lt, "Error", (e, r) => {
+  $(yt, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  $(dt, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  $(mt, "Error", (e, r) => {
     const t = {
       name: e.name,
       message: e.message
@@ -150,7 +150,7 @@ const Ae = [
       t[s] = e[s];
     }), t;
   }),
-  $(ot, "regexp", (e) => "" + e, (e) => {
+  $(ft, "regexp", (e) => "" + e, (e) => {
     const r = e.slice(1, e.lastIndexOf("/")), t = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(r, t);
   }),
@@ -162,10 +162,10 @@ const Ae = [
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  $(_, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  $((e) => be(e) || dt(e), "number", (e) => be(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  $(k, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  $((e) => be(e) || gt(e), "number", (e) => be(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
   $((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  $(pt, "URL", (e) => e.toString(), (e) => new URL(e))
+  $(bt, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
 function j(e, r, t, s) {
   return {
@@ -175,12 +175,12 @@ function j(e, r, t, s) {
     untransform: s
   };
 }
-const De = j((e, r) => $e(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
+const Te = j((e, r) => De(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
   const s = t.symbolRegistry.getValue(r[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown symbol");
   return s;
-}), yt = [
+}), Ft = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -190,19 +190,19 @@ const De = j((e, r) => $e(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, r) => (e[r.name] = r, e), {}), Me = j(mt, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
-  const t = yt[r[1]];
+].reduce((e, r) => (e[r.name] = r, e), {}), Ne = j(ht, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
+  const t = Ft[r[1]];
   if (!t)
     throw new Error("Trying to deserialize unknown typed array");
   return new t(e);
 });
-function Ne(e, r) {
+function Re(e, r) {
   return e != null && e.constructor ? !!r.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const Re = j(Ne, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
+const Oe = j(Re, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
   const t = r.classRegistry.getAllowedProps(e.constructor);
   if (!t)
-    return b({}, e);
+    return p({}, e);
   const s = {};
   return t.forEach((n) => {
     s[n] = e[n];
@@ -212,49 +212,49 @@ const Re = j(Ne, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor
   if (!s)
     throw new Error(`Trying to deserialize unknown class '${r[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
   return Object.assign(Object.create(s.prototype), e);
-}), Se = j((e, r) => !!r.customTransformerRegistry.findApplicable(e), (e, r) => ["custom", r.customTransformerRegistry.findApplicable(e).name], (e, r) => r.customTransformerRegistry.findApplicable(e).serialize(e), (e, r, t) => {
+}), Ie = j((e, r) => !!r.customTransformerRegistry.findApplicable(e), (e, r) => ["custom", r.customTransformerRegistry.findApplicable(e).name], (e, r) => r.customTransformerRegistry.findApplicable(e).serialize(e), (e, r, t) => {
   const s = t.customTransformerRegistry.findByName(r[1]);
   if (!s)
     throw new Error("Trying to deserialize unknown custom value");
   return s.deserialize(e);
-}), gt = [Re, De, Se, Me], Fe = (e, r) => {
-  const t = he(gt, (n) => n.isApplicable(e, r));
+}), wt = [Oe, Te, Ie, Ne], Fe = (e, r) => {
+  const t = he(wt, (n) => n.isApplicable(e, r));
   if (t)
     return {
       value: t.transform(e, r),
       type: t.annotation(e, r)
     };
-  const s = he(Ae, (n) => n.isApplicable(e, r));
+  const s = he(Se, (n) => n.isApplicable(e, r));
   if (s)
     return {
       value: s.transform(e, r),
       type: s.annotation
     };
-}, Oe = {};
-Ae.forEach((e) => {
-  Oe[e.annotation] = e;
+}, ze = {};
+Se.forEach((e) => {
+  ze[e.annotation] = e;
 });
-const ht = (e, r, t) => {
-  if (N(r))
+const qt = (e, r, t) => {
+  if (D(r))
     switch (r[0]) {
       case "symbol":
-        return De.untransform(e, r, t);
+        return Te.untransform(e, r, t);
       case "class":
-        return Re.untransform(e, r, t);
+        return Oe.untransform(e, r, t);
       case "custom":
-        return Se.untransform(e, r, t);
+        return Ie.untransform(e, r, t);
       case "typed-array":
-        return Me.untransform(e, r, t);
+        return Ne.untransform(e, r, t);
       default:
         throw new Error("Unknown transformation: " + r);
     }
   else {
-    const s = Oe[r];
+    const s = ze[r];
     if (!s)
       throw new Error("Unknown transformation: " + r);
     return s.untransform(e, t);
   }
-}, I = (e, r) => {
+}, R = (e, r) => {
   if (r > e.size)
     throw new Error("index out of bounds");
   const t = e.keys();
@@ -262,23 +262,23 @@ const ht = (e, r, t) => {
     t.next(), r--;
   return t.next().value;
 };
-function Te(e) {
-  if (U(e, "__proto__"))
+function Pe(e) {
+  if (W(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (U(e, "prototype"))
+  if (W(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (U(e, "constructor"))
+  if (W(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const bt = (e, r) => {
-  Te(r);
+const Et = (e, r) => {
+  Pe(r);
   for (let t = 0; t < r.length; t++) {
     const s = r[t];
     if (L(e))
-      e = I(e, +s);
-    else if (_(e)) {
-      const n = +s, a = +r[++t] == 0 ? "key" : "value", i = I(e, n);
-      switch (a) {
+      e = R(e, +s);
+    else if (k(e)) {
+      const n = +s, o = +r[++t] == 0 ? "key" : "value", i = R(e, n);
+      switch (o) {
         case "key":
           e = i;
           break;
@@ -291,40 +291,40 @@ const bt = (e, r) => {
   }
   return e;
 }, X = (e, r, t) => {
-  if (Te(r), r.length === 0)
+  if (Pe(r), r.length === 0)
     return t(e);
   let s = e;
-  for (let a = 0; a < r.length - 1; a++) {
-    const i = r[a];
-    if (N(s)) {
-      const o = +i;
-      s = s[o];
-    } else if (k(s))
+  for (let o = 0; o < r.length - 1; o++) {
+    const i = r[o];
+    if (D(s)) {
+      const a = +i;
+      s = s[a];
+    } else if (B(s))
       s = s[i];
     else if (L(s)) {
-      const o = +i;
-      s = I(s, o);
-    } else if (_(s)) {
-      if (a === r.length - 2)
+      const a = +i;
+      s = R(s, a);
+    } else if (k(s)) {
+      if (o === r.length - 2)
         break;
-      const u = +i, l = +r[++a] == 0 ? "key" : "value", p = I(s, u);
-      switch (l) {
+      const u = +i, c = +r[++o] == 0 ? "key" : "value", m = R(s, u);
+      switch (c) {
         case "key":
-          s = p;
+          s = m;
           break;
         case "value":
-          s = s.get(p);
+          s = s.get(m);
           break;
       }
     }
   }
   const n = r[r.length - 1];
-  if (N(s) ? s[+n] = t(s[+n]) : k(s) && (s[n] = t(s[n])), L(s)) {
-    const a = I(s, +n), i = t(a);
-    a !== i && (s.delete(a), s.add(i));
+  if (D(s) ? s[+n] = t(s[+n]) : B(s) && (s[n] = t(s[n])), L(s)) {
+    const o = R(s, +n), i = t(o);
+    o !== i && (s.delete(o), s.add(i));
   }
-  if (_(s)) {
-    const a = +r[r.length - 2], i = I(s, a);
+  if (k(s)) {
+    const o = +r[r.length - 2], i = R(s, o);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
         const u = t(i);
@@ -342,109 +342,109 @@ const bt = (e, r) => {
 function v(e, r, t = []) {
   if (!e)
     return;
-  if (!N(e)) {
-    B(e, (a, i) => v(a, r, [...t, ...P(i)]));
+  if (!D(e)) {
+    I(e, (o, i) => v(o, r, [...t, ...P(i)]));
     return;
   }
   const [s, n] = e;
-  n && B(n, (a, i) => {
-    v(a, r, [...t, ...P(i)]);
+  n && I(n, (o, i) => {
+    v(o, r, [...t, ...P(i)]);
   }), r(s, t);
 }
-function Ft(e, r, t) {
+function Ct(e, r, t) {
   return v(r, (s, n) => {
-    e = X(e, n, (a) => ht(a, s, t));
+    e = X(e, n, (o) => qt(o, s, t));
   }), e;
 }
-function wt(e, r) {
+function $t(e, r) {
   function t(s, n) {
-    const a = bt(e, P(n));
+    const o = Et(e, P(n));
     s.map(P).forEach((i) => {
-      e = X(e, i, () => a);
+      e = X(e, i, () => o);
     });
   }
-  if (N(r)) {
+  if (D(r)) {
     const [s, n] = r;
-    s.forEach((a) => {
-      e = X(e, P(a), () => e);
-    }), n && B(n, t);
+    s.forEach((o) => {
+      e = X(e, P(o), () => e);
+    }), n && I(n, t);
   } else
-    B(r, t);
+    I(r, t);
   return e;
 }
-const qt = (e, r) => k(e) || N(e) || _(e) || L(e) || Ne(e, r);
-function Et(e, r, t) {
+const At = (e, r) => B(e) || D(e) || k(e) || L(e) || Re(e, r);
+function xt(e, r, t) {
   const s = t.get(e);
   s ? s.push(r) : t.set(e, [r]);
 }
-function Ct(e, r) {
+function Dt(e, r) {
   const t = {};
   let s;
   return e.forEach((n) => {
     if (n.length <= 1)
       return;
-    r || (n = n.map((o) => o.map(String)).sort((o, u) => o.length - u.length));
-    const [a, ...i] = n;
-    a.length === 0 ? s = i.map(Y) : t[Y(a)] = i.map(Y);
-  }), s ? G(t) ? [s] : [s, t] : G(t) ? void 0 : t;
-}
-const Ie = (e, r, t, s, n = [], a = [], i = /* @__PURE__ */ new Map()) => {
-  var F;
-  const o = ct(e);
-  if (!o) {
-    Et(e, n, r);
-    const d = i.get(e);
-    if (d)
+    r || (n = n.map((a) => a.map(String)).sort((a, u) => a.length - u.length));
+    const [o, ...i] = n;
+    o.length === 0 ? s = i.map(Q) : t[Q(o)] = i.map(Q);
+  }), s ? Z(t) ? [s] : [s, t] : Z(t) ? void 0 : t;
+}
+const Be = (e, r, t, s, n = [], o = [], i = /* @__PURE__ */ new Map()) => {
+  var g;
+  const a = pt(e);
+  if (!a) {
+    xt(e, n, r);
+    const f = i.get(e);
+    if (f)
       return s ? {
         transformedValue: null
-      } : d;
+      } : f;
   }
-  if (!qt(e, t)) {
-    const d = Fe(e, t), f = d ? {
-      transformedValue: d.value,
-      annotations: [d.type]
+  if (!At(e, t)) {
+    const f = Fe(e, t), h = f ? {
+      transformedValue: f.value,
+      annotations: [f.type]
     } : {
       transformedValue: e
     };
-    return o || i.set(e, f), f;
+    return a || i.set(e, h), h;
   }
-  if (U(a, e))
+  if (W(o, e))
     return {
       transformedValue: null
     };
-  const u = Fe(e, t), l = (F = u == null ? void 0 : u.value) != null ? F : e, p = N(l) ? [] : {}, m = {};
-  B(l, (d, f) => {
-    if (f === "__proto__" || f === "constructor" || f === "prototype")
-      throw new Error(`Detected property ${f}. This is a prototype pollution risk, please remove it from your object.`);
-    const w = Ie(d, r, t, s, [...n, f], [...a, e], i);
-    p[f] = w.transformedValue, N(w.annotations) ? m[f] = w.annotations : k(w.annotations) && B(w.annotations, (T, A) => {
-      m[xe(f) + "." + A] = T;
+  const u = Fe(e, t), c = (g = u == null ? void 0 : u.value) != null ? g : e, m = D(c) ? [] : {}, d = {};
+  I(c, (f, h) => {
+    if (h === "__proto__" || h === "constructor" || h === "prototype")
+      throw new Error(`Detected property ${h}. This is a prototype pollution risk, please remove it from your object.`);
+    const A = Be(f, r, t, s, [...n, h], [...o, e], i);
+    m[h] = A.transformedValue, D(A.annotations) ? d[h] = A.annotations : B(A.annotations) && I(A.annotations, (z, N) => {
+      d[Me(h) + "." + N] = z;
     });
   });
-  const y = G(m) ? {
-    transformedValue: p,
+  const y = Z(d) ? {
+    transformedValue: m,
     annotations: u ? [u.type] : void 0
   } : {
-    transformedValue: p,
-    annotations: u ? [u.type, m] : m
+    transformedValue: m,
+    annotations: u ? [u.type, d] : d
   };
-  return o || i.set(e, y), y;
+  return a || i.set(e, y), y;
 };
-function ze(e) {
+function ke(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
 function we(e) {
-  return ze(e) === "Array";
+  return ke(e) === "Array";
 }
-function $t(e) {
-  if (ze(e) !== "Object")
+function Mt(e) {
+  if (ke(e) !== "Object")
     return !1;
   const r = Object.getPrototypeOf(e);
   return !!r && r.constructor === Object && r === Object.prototype;
 }
-function xt(e, r, t, s, n) {
-  const a = {}.propertyIsEnumerable.call(s, r) ? "enumerable" : "nonenumerable";
-  a === "enumerable" && (e[r] = t), n && a === "nonenumerable" && Object.defineProperty(e, r, {
+function St(e, r, t, s, n) {
+  const o = {}.propertyIsEnumerable.call(s, r) ? "enumerable" : "nonenumerable";
+  o === "enumerable" && (e[r] = t), n && o === "nonenumerable" && Object.defineProperty(e, r, {
     value: t,
     enumerable: !1,
     writable: !0,
@@ -454,42 +454,42 @@ function xt(e, r, t, s, n) {
 function ee(e, r = {}) {
   if (we(e))
     return e.map((n) => ee(n, r));
-  if (!$t(e))
+  if (!Mt(e))
     return e;
   const t = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
-  return [...t, ...s].reduce((n, a) => {
-    if (we(r.props) && !r.props.includes(a))
+  return [...t, ...s].reduce((n, o) => {
+    if (we(r.props) && !r.props.includes(o))
       return n;
-    const i = e[a], o = ee(i, r);
-    return xt(n, a, o, e, r.nonenumerable), n;
+    const i = e[o], a = ee(i, r);
+    return St(n, o, a, e, r.nonenumerable), n;
   }, {});
 }
-class c {
+class l {
   /**
    * @param dedupeReferentialEqualities  If true, SuperJSON will make sure only one instance of referentially equal objects are serialized and the rest are replaced with `null`.
    */
   constructor({ dedupe: r = !1 } = {}) {
-    this.classRegistry = new Xr(), this.symbolRegistry = new Ee((t) => {
+    this.classRegistry = new tt(), this.symbolRegistry = new Ae((t) => {
       var s;
       return (s = t.description) != null ? s : "";
-    }), this.customTransformerRegistry = new rt(), this.allowedErrorProps = [], this.dedupe = r;
+    }), this.customTransformerRegistry = new it(), this.allowedErrorProps = [], this.dedupe = r;
   }
   serialize(r) {
-    const t = /* @__PURE__ */ new Map(), s = Ie(r, t, this, this.dedupe), n = {
+    const t = /* @__PURE__ */ new Map(), s = Be(r, t, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = E(b({}, n.meta), {
+    s.annotations && (n.meta = b(p({}, n.meta), {
       values: s.annotations
     }));
-    const a = Ct(t, this.dedupe);
-    return a && (n.meta = E(b({}, n.meta), {
-      referentialEqualities: a
+    const o = Dt(t, this.dedupe);
+    return o && (n.meta = b(p({}, n.meta), {
+      referentialEqualities: o
     })), n;
   }
   deserialize(r) {
     const { json: t, meta: s } = r;
     let n = ee(t);
-    return s != null && s.values && (n = Ft(n, s.values, this)), s != null && s.referentialEqualities && (n = wt(n, s.referentialEqualities)), n;
+    return s != null && s.values && (n = Ct(n, s.values, this)), s != null && s.referentialEqualities && (n = $t(n, s.referentialEqualities)), n;
   }
   stringify(r) {
     return JSON.stringify(this.serialize(r));
@@ -504,7 +504,7 @@ class c {
     this.symbolRegistry.register(r, t);
   }
   registerCustom(r, t) {
-    this.customTransformerRegistry.register(b({
+    this.customTransformerRegistry.register(p({
       name: t
     }, r));
   }
@@ -512,158 +512,158 @@ class c {
     this.allowedErrorProps.push(...r);
   }
 }
-c.defaultInstance = new c();
-c.serialize = c.defaultInstance.serialize.bind(c.defaultInstance);
-c.deserialize = c.defaultInstance.deserialize.bind(c.defaultInstance);
-c.stringify = c.defaultInstance.stringify.bind(c.defaultInstance);
-c.parse = c.defaultInstance.parse.bind(c.defaultInstance);
-c.registerClass = c.defaultInstance.registerClass.bind(c.defaultInstance);
-c.registerSymbol = c.defaultInstance.registerSymbol.bind(c.defaultInstance);
-c.registerCustom = c.defaultInstance.registerCustom.bind(c.defaultInstance);
-c.allowErrorProps = c.defaultInstance.allowErrorProps.bind(c.defaultInstance);
-const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem, e.type), ie = (e) => new gr(
+l.defaultInstance = new l();
+l.serialize = l.defaultInstance.serialize.bind(l.defaultInstance);
+l.deserialize = l.defaultInstance.deserialize.bind(l.defaultInstance);
+l.stringify = l.defaultInstance.stringify.bind(l.defaultInstance);
+l.parse = l.defaultInstance.parse.bind(l.defaultInstance);
+l.registerClass = l.defaultInstance.registerClass.bind(l.defaultInstance);
+l.registerSymbol = l.defaultInstance.registerSymbol.bind(l.defaultInstance);
+l.registerCustom = l.defaultInstance.registerCustom.bind(l.defaultInstance);
+l.allowErrorProps = l.defaultInstance.allowErrorProps.bind(l.defaultInstance);
+const T = (e) => e === void 0 ? ne.None : e, Tt = (e) => new nr(e.metadataItem, e.type), oe = (e) => new qr(
   e.name,
   e.expression,
   e.type,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode
-), ae = (e) => new hr(
+), ae = (e) => new Er(
   e.name,
   e.expression,
   e.granularity,
   e.format,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode
 ), q = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return ie(e);
+      return oe(e);
     case "DimensionalLevelAttribute":
       return ae(e);
     default:
       return e;
   }
-}, Be = (e) => new Yr(
+}, Le = (e) => new Xr(
   e.name,
   e.expression,
   e.attributes.map(q),
-  e.dimensions.map(Dt),
+  e.dimensions.map(Nt),
   e.type,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode,
   e.defaultAttribute ? q(e.defaultAttribute) : void 0
-), Pe = (e) => new Hr(
+), Ve = (e) => new vr(
   e.name,
   e.expression,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode
-), Dt = (e) => {
+), Nt = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Be(e);
+      return Le(e);
     case "DimensionalDateDimension":
-      return Pe(e);
+      return Ve(e);
     default:
       return e;
   }
-}, oe = (e) => new br(
+}, ue = (e) => new Cr(
   e.name,
   q(e.attribute),
   e.aggregation,
   e.format,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode
-), ue = (e) => {
+), ce = (e) => {
   const r = Object.fromEntries(
     Object.entries(e.context).map(([t, s]) => {
       if (s && typeof s == "object" && "__serializable" in s)
         switch (s.__serializable) {
           case "DimensionalAttribute":
-            return [t, ie(s)];
+            return [t, oe(s)];
           case "DimensionalLevelAttribute":
             return [t, ae(s)];
           case "DimensionalBaseMeasure":
-            return [t, oe(s)];
-          case "DimensionalCalculatedMeasure":
             return [t, ue(s)];
+          case "DimensionalCalculatedMeasure":
+            return [t, ce(s)];
           default:
             return [t, s];
         }
       return [t, s];
     })
   );
-  return new Fr(
+  return new $r(
     e.name,
     e.expression,
     r,
     e.format,
     e.description,
-    O(e.sort),
+    T(e.sort),
     e.dataSource,
     e.composeCode
   );
-}, ke = (e) => new wr(
+}, _e = (e) => new Ar(
   e.name,
   q(e.attribute),
   e.format,
   e.description,
-  O(e.sort),
+  T(e.sort),
   e.dataSource,
   e.composeCode
-), H = (e) => {
+), Y = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return oe(e);
-    case "DimensionalCalculatedMeasure":
       return ue(e);
+    case "DimensionalCalculatedMeasure":
+      return ce(e);
     case "DimensionalMeasureTemplate":
-      return ke(e);
+      return _e(e);
     default:
       return e;
   }
-}, g = (e) => {
+}, F = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new Or(
+      return new Br(
         q(e.attribute),
         e.members,
-        e.config.backgroundFilter ? E(b({}, e.config), { backgroundFilter: g(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? b(p({}, e.config), { backgroundFilter: F(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Sr(
-        e.filters.map((t) => g(t)),
+      return new Pr(
+        e.filters.map((t) => F(t)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
-      return new Rr(
-        e._filters.map((t) => g(t)),
+      return new zr(
+        e._filters.map((t) => F(t)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Nr(
-        g(e.filter),
-        e.input ? g(e.input) : void 0,
+      return new Ir(
+        F(e.filter),
+        e.input ? F(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new Mr(
+      return new Or(
         q(e.attribute),
-        H(e.measure),
+        Y(e.measure),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -672,24 +672,24 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
         e.composeCode
       );
     case "RankingFilter":
-      return new Dr(
+      return new Rr(
         q(e.attribute),
-        H(e.measure),
+        Y(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new Ar(
-        H(e.measure),
+      return new Nr(
+        Y(e.measure),
         e.operator,
         e.count,
         e.config,
         e.composeCode
       );
     case "NumericFilter":
-      return new xr(
+      return new Tr(
         q(e.attribute),
         e.operatorA,
         e.valueA,
@@ -699,7 +699,7 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
         e.composeCode
       );
     case "TextFilter":
-      return new $r(
+      return new Sr(
         q(e.attribute),
         e.operatorA,
         e.valueA,
@@ -708,7 +708,7 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
       );
     case "DateRangeFilter": {
       const { valueA: t, valueB: s } = e;
-      return new Cr(
+      return new Mr(
         q(e.attribute),
         t,
         s,
@@ -717,7 +717,7 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
       );
     }
     case "RelativeDateFilter":
-      return new Er(
+      return new Dr(
         q(e.attribute),
         e.offset,
         e.count,
@@ -727,7 +727,7 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
         e.composeCode
       );
     case "CustomFilter":
-      return new qr(
+      return new xr(
         q(e.attribute),
         e.jaqlExpression,
         e.config,
@@ -737,195 +737,199 @@ const O = (e) => e === void 0 ? Tr.None : e, At = (e) => new ve(e.metadataItem,
       return e;
   }
 };
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: Xe,
+    isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => At(e)
+    deserialize: (e) => Tt(e)
   },
   "JaqlElement"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: er,
+    isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ie(e)
+    deserialize: (e) => oe(e)
   },
   "DimensionalAttribute"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: rr,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
     deserialize: (e) => ae(e)
   },
   "DimensionalLevelAttribute"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: Kr,
+    isApplicable: Hr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Be(e)
+    deserialize: (e) => Le(e)
   },
   "DimensionalDimension"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: Qr,
+    isApplicable: Zr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Pe(e)
+    deserialize: (e) => Ve(e)
   },
   "DimensionalDateDimension"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: tr,
+    isApplicable: ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => oe(e)
+    deserialize: (e) => ue(e)
   },
   "DimensionalBaseMeasure"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ue(e)
+    deserialize: (e) => ce(e)
   },
   "DimensionalCalculatedMeasure"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: nr,
+    isApplicable: cr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ke(e)
+    deserialize: (e) => _e(e)
   },
   "DimensionalMeasureTemplate"
 );
-c.registerCustom(
+l.registerCustom(
   {
     isApplicable: se,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "MembersFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: lr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "LogicalAttributeFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: ar,
+    isApplicable: fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "CascadingFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: dr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "ExcludeFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: mr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "MeasureFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: lr,
+    isApplicable: pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "RankingFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: cr,
+    isApplicable: yr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "MeasureRankingFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: fr,
+    isApplicable: gr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "NumericFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: dr,
+    isApplicable: hr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "TextFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: mr,
+    isApplicable: br,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "DateRangeFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: pr,
+    isApplicable: Fr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "RelativeDateFilter"
 );
-c.registerCustom(
+l.registerCustom(
   {
-    isApplicable: yr,
+    isApplicable: wr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => g(e)
+    deserialize: (e) => F(e)
   },
   "CustomFilter"
 );
-const Fs = c, h = "DM.";
-function x(e) {
+const zs = l, w = "DM.";
+function E(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function le(e) {
-  return e.every(x);
+function Ue(e) {
+  return e.every(E);
 }
-function K(e) {
+function J(e) {
   return "attribute" in e && "config" in e;
 }
-function W(e) {
+function _(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function _e(e) {
-  return !K(e) && !W(e);
+function le(e) {
+  return !J(e) && !_(e);
 }
-function Mt(e) {
-  return e.every((r) => typeof r == "string");
-}
-function Nt(e) {
-  const r = [...e].sort((a, i) => i.name.length - a.name.length), t = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-  for (const a of e) {
-    t.set(a.name, a);
-    const i = [...a.columns].sort((u, l) => l.name.length - u.name.length);
-    n.set(a.name, i);
-    const o = /* @__PURE__ */ new Map();
-    for (const u of a.columns)
-      o.set(u.name, u);
-    s.set(a.name, o);
+function Rt(e) {
+  return typeof e == "object" && e !== null && "column" in e && typeof e.column == "string" && !("function" in e && "args" in e);
+}
+function Ot(e) {
+  const r = e;
+  return typeof e != "object" || e === null || r === null || !("column" in r) ? !1 : E(r.column);
+}
+function It(e) {
+  const r = [...e].sort((o, i) => i.name.length - o.name.length), t = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
+  for (const o of e) {
+    t.set(o.name, o);
+    const i = [...o.columns].sort((u, c) => c.name.length - u.name.length);
+    n.set(o.name, i);
+    const a = /* @__PURE__ */ new Map();
+    for (const u of o.columns)
+      a.set(u.name, u);
+    s.set(o.name, a);
   }
   return {
     sortedTables: r,
@@ -934,114 +938,114 @@ function Nt(e) {
     columnMap: s
   };
 }
-function Le(e, r) {
-  if (!e.startsWith(h))
+function We(e, r) {
+  if (!e.startsWith(w))
     throw new Error(
-      `Invalid dimensional element name format: "${e}". Expected format: "${h}TableName.ColumnName[.Level]"`
+      `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
     );
-  const t = e.slice(h.length);
+  const t = e.slice(w.length);
   if (!t)
     throw new Error(
-      `Invalid dimensional element name format: "${e}". Expected format: "${h}TableName.ColumnName[.Level]"`
+      `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
     );
   let s, n;
-  for (const m of r.sortedTables)
-    if (t.startsWith(m.name + ".")) {
-      const y = t.slice(m.name.length + 1);
+  for (const d of r.sortedTables)
+    if (t.startsWith(d.name + ".")) {
+      const y = t.slice(d.name.length + 1);
       if (!y)
         throw new Error(
-          `Invalid dimensional element name format: "${e}". Expected format: "${h}TableName.ColumnName[.Level]"`
+          `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
         );
-      s = m, n = y;
+      s = d, n = y;
       break;
     }
   if (!s) {
-    const m = t.indexOf(".");
-    if (m === -1)
+    const d = t.indexOf(".");
+    if (d === -1)
       throw new Error(
-        `Invalid dimensional element name format: "${e}". Expected format: "${h}TableName.ColumnName[.Level]"`
+        `Invalid dimensional element name format: "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
       );
-    const y = t.slice(0, m);
+    const y = t.slice(0, d);
     throw new Error(`Table "${y}" not found in the data model`);
   }
-  const a = r.tableColumnMap.get(s.name);
-  if (!a)
+  const o = r.tableColumnMap.get(s.name);
+  if (!o)
     throw new Error(`Table "${s.name}" found but has no columns`);
-  let i, o;
-  const u = J.all;
-  for (const m of a) {
-    if (n === m.name)
-      return { table: s, column: m };
-    if (!n.startsWith(m.name + "."))
+  let i, a;
+  const u = U.all;
+  for (const d of o) {
+    if (n === d.name)
+      return { table: s, column: d };
+    if (!n.startsWith(d.name + "."))
       continue;
-    const y = n.slice(m.name.length + 1);
+    const y = n.slice(d.name.length + 1);
     if (!y)
       continue;
-    const F = u.includes(y), d = ne(m.dataType);
-    if (F) {
-      if (d)
-        return { table: s, column: m, level: y };
-      i || (i = m, o = y);
+    const g = u.includes(y), f = ie(d.dataType);
+    if (g) {
+      if (f)
+        return { table: s, column: d, level: y };
+      i || (i = d, a = y);
       continue;
     }
-    d && !i && (i = m, o = y);
+    f && !i && (i = d, a = y);
   }
-  if (i && o)
-    throw u.includes(o) ? new Error(
-      `Invalid date level "${o}" in dimensional element "${e}". Column "${s.name}.${i.name}" is not a datetime column`
+  if (i && a)
+    throw u.includes(a) ? new Error(
+      `Invalid date level "${a}" in dimensional element "${e}". Column "${s.name}.${i.name}" is not a datetime column`
     ) : new Error(
-      `Invalid date level "${o}" in dimensional element "${e}". Valid levels are: ${u.join(
+      `Invalid date level "${a}" in dimensional element "${e}". Valid levels are: ${u.join(
         ", "
       )}`
     );
-  const l = n.indexOf("."), p = l === -1 ? n : n.slice(0, l);
-  throw new Error(`Column "${p}" not found in table "${s.name}"`);
+  const c = n.indexOf("."), m = c === -1 ? n : n.slice(0, c);
+  throw new Error(`Column "${m}" not found in table "${s.name}"`);
 }
-function Rt(e, r) {
-  const { table: t, column: s, level: n } = Le(e, r);
+function zt(e, r) {
+  const { table: t, column: s, level: n } = We(e, r);
   if (n) {
-    if (!ne(s.dataType))
+    if (!ie(s.dataType))
       throw new Error(
         `Invalid date level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is not a datetime column`
       );
-    const a = J.all;
-    if (!a.includes(n))
+    const o = U.all;
+    if (!o.includes(n))
       throw new Error(
-        `Invalid date level "${n}" in dimensional element "${e}". Valid levels are: ${a.join(
+        `Invalid date level "${n}" in dimensional element "${e}". Valid levels are: ${o.join(
           ", "
         )}`
       );
-    const i = J.dateOnly;
+    const i = U.dateOnly;
     if (s.dataType === "date" && !i.includes(n))
       throw new Error(
         `Invalid level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is only a date column, not a datetime column`
       );
-    const o = J.timeOnly;
-    if (s.dataType === "time" && !o.includes(n))
+    const a = U.timeOnly;
+    if (s.dataType === "time" && !a.includes(n))
       throw new Error(
         `Invalid level "${n}" in dimensional element "${e}". Column "${t.name}.${s.name}" is only a time column, not a date column`
       );
   }
   return { column: s, level: n };
 }
-function Ve(e) {
-  return e.type === z.TextAttribute;
+function je(e) {
+  return e.type === O.TextAttribute;
 }
-function We(e) {
-  return e.type === z.NumericAttribute;
+function Je(e) {
+  return e.type === O.NumericAttribute;
 }
-function St(e) {
-  return e.type === z.DateLevel;
+function Pt(e) {
+  return e.type === O.DateLevel;
 }
-function Ot(e) {
-  return Ve(e) || We(e);
+function Bt(e) {
+  return je(e) || Je(e);
 }
-function Q(e) {
-  return e.type === z.TextAttribute ? "text" : e.type === z.NumericAttribute ? "numeric" : e.type === z.DateLevel ? "date/datetime" : "unknown";
+function G(e) {
+  return e.type === O.TextAttribute ? "text" : e.type === O.NumericAttribute ? "numeric" : e.type === O.DateLevel ? "date/datetime" : "unknown";
 }
-function ce(e, r, t) {
-  const { column: s, level: n } = Rt(e, t);
-  return Ir({
+function K(e, r, t) {
+  const { column: s, level: n } = zt(e, t);
+  return kr({
     expression: s.expression,
     dataType: s.dataType,
     granularity: n,
@@ -1050,31 +1054,48 @@ function ce(e, r, t) {
     dataSource: r
   });
 }
-function Tt(e, r, t) {
-  const { column: s, level: n } = Le(e, t);
+function kt(e, r, t) {
+  const { column: s, level: n } = We(e, t);
   if (n)
     throw new Error(
-      `Invalid DateDimension name format: "${e}". Expected format: "${h}TableName.ColumnName"`
+      `Invalid DateDimension name format: "${e}". Expected format: "${w}TableName.ColumnName"`
     );
-  if (!ne(s.dataType))
+  if (!ie(s.dataType))
     throw new Error(
       `Invalid DateDimension name "${e}". Column "${s.name}" is not a datetime column (got ${s.dataType}).`
     );
-  return Zr({
+  return et({
     name: s.name,
     expression: s.expression,
     dataSource: r
   });
 }
-function M(e, r) {
+function x(e, r) {
   const t = e();
   return t.success ? t.data : (r.push(...t.errors), null);
 }
-const It = (e) => {
+const Lt = (e, r, t) => {
+  if (!r)
+    return { attribute: e };
+  const s = typeof r == "object" ? r.direction : r;
+  return Ee(s) ? { attribute: e.sort(Ce(s)) } : {
+    attribute: e,
+    error: b(p({}, t), {
+      message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${s}".`
+    })
+  };
+}, Vt = (e, r, t, s) => {
+  const n = K(e.column, r, t);
+  return Lt(n, e.sortType, s);
+}, _t = (e, r, t, s) => typeof e == "string" ? { attribute: K(e, r, t) } : Rt(e) ? Vt(e, r, t, s) : {
+  error: b(p({}, s), {
+    message: 'Invalid dimension item. Expected a string (composeCode) or object with "column" and optional "sortType".'
+  })
+}, Ut = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
   if (!r)
     return { success: !0, data: [] };
-  if (!Mt(r))
+  if (!Array.isArray(r))
     return {
       success: !1,
       errors: [
@@ -1082,25 +1103,29 @@ const It = (e) => {
           category: "dimensions",
           index: -1,
           input: r,
-          message: "Invalid dimensions JSON. Expected an array of strings."
+          message: "Invalid dimensions JSON. Expected an array."
         }
       ]
     };
-  const n = [], a = [];
-  return r.forEach((i, o) => {
+  const n = [], o = [];
+  return r.forEach((i, a) => {
     const u = {
       category: "dimensions",
-      index: o,
+      index: a,
       input: i
     };
     try {
-      const l = ce(i, t, s);
-      n.push(l);
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      a.push(E(b({}, u), { message: p }));
+      const c = _t(i, t, s, u);
+      if (c.error) {
+        o.push(c.error);
+        return;
+      }
+      c.attribute && n.push(c.attribute);
+    } catch (c) {
+      const m = c instanceof Error ? c.message : "Unknown error";
+      o.push(b(p({}, u), { message: m }));
     }
-  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: n };
+  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
 };
 function fe(e, r) {
   const t = Reflect.get(e, r);
@@ -1108,44 +1133,93 @@ function fe(e, r) {
     throw new Error(`Function "${r}" not found or is not a function`);
   return t;
 }
-function zt(e, r) {
-  const t = e.replace("measureFactory.", ""), n = fe(zr, t)(...r);
-  if (!_e(n))
+function Wt(e, r) {
+  const t = e.replace("measureFactory.", ""), n = fe(Lr, t)(...r);
+  if (!le(n))
     throw new Error(`Function "${e}" did not return a valid Measure`);
   return n;
 }
-function Bt(e, r) {
-  const t = e.replace("filterFactory.logic.", ""), n = fe(Br, t)(...r);
-  if (!W(n))
+function jt(e, r) {
+  const t = e.replace("filterFactory.logic.", ""), n = fe(Vr, t)(...r);
+  if (!_(n))
     throw new Error(`Function "${e}" did not return a valid FilterRelations`);
   return n;
 }
-function Pt(e, r) {
+function Jt(e, r) {
   if (e.startsWith("filterFactory.logic."))
-    return Bt(e, r);
-  const t = e.replace("filterFactory.", ""), n = fe(Pr, t)(...r);
-  if (!K(n) && !W(n))
+    return jt(e, r);
+  const t = e.replace("filterFactory.", ""), n = fe(_r, t)(...r);
+  if (!J(n) && !_(n))
     throw new Error(`Function "${e}" did not return a valid Filter or FilterRelations`);
   return n;
 }
-function kt(e, r) {
+function Gt(e, r) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return zt(e, r);
+    return Wt(e, r);
   if (s === "filterFactory")
-    return Pt(e, r);
+    return Jt(e, r);
   throw new Error(
     `Unsupported factory: "${s}". Supported factories: measureFactory, filterFactory`
   );
 }
-const _t = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g;
-function Lt(e, r, t = {}) {
+const Kt = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g, Ge = /* @__PURE__ */ new Set([
+  // Universal – Aggregative (per Sisense doc: (A) only; Statistical CONTRIBUTION, PERCENTILE, etc. are non-aggregative)
+  "AVG",
+  "COUNT",
+  "DUPCOUNT",
+  "LARGEST",
+  "MAX",
+  "MEDIAN",
+  "MIN",
+  "MODE",
+  "SUM",
+  // Universal – Time-to-date (WTD/MTD/QTD/YTD)
+  "WTDAVG",
+  "WTDSUM",
+  "MTDAVG",
+  "MTDSUM",
+  "QTDAVG",
+  "QTDSUM",
+  "YTDAVG",
+  "YTDSUM",
+  // RAVG, RSUM are non-aggregative per Sisense doc (Other Functions, not (A))
+  // Elasticube – Aggregative
+  "CORREL",
+  "COVARP",
+  "COVAR",
+  "SKEWP",
+  "SKEW",
+  "SLOPE"
+]), Qt = new RegExp(
+  `\\b(${Array.from(Ge).join("|")})\\s*\\(`,
+  "i"
+);
+function Yt(e) {
+  return E(e) ? !0 : typeof e == "string" && e.startsWith(w) ? !1 : e && typeof e == "object" && "kind" in e ? e.kind === "measure" : !0;
+}
+function Ht(e) {
+  const r = /\b(\w+)\s*\(/g, t = /* @__PURE__ */ new Set();
+  let s;
+  for (; (s = r.exec(e)) !== null; ) {
+    const n = s[1];
+    Ge.has(n.toUpperCase()) || t.add(n);
+  }
+  return Array.from(t);
+}
+function Zt(e) {
+  return e.length === 1 ? `[${e[0]}]` : e.map((r) => `[${r}]`).join(", ");
+}
+function Xt(e) {
+  return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
+}
+function vt(e, r, t = {}) {
   const {
     warnUnusedContext: s = !0,
     errorOnUnusedContext: n = !0,
-    allowEmptyFormula: a = !1,
+    allowEmptyFormula: o = !1,
     errorPrefix: i = "customFormula validation"
-  } = t, o = {
+  } = t, a = {
     isValid: !0,
     errors: [],
     warnings: [],
@@ -1153,70 +1227,71 @@ function Lt(e, r, t = {}) {
     unusedContextKeys: []
   };
   if (!e || e.trim().length === 0)
-    return a || (o.errors.push(`${i}args[1]: Formula cannot be empty`), o.isValid = !1), o;
-  const u = /\b\w+\s*\[/gi, l = e.match(u);
-  if (l) {
-    const f = l[0].replace(/\s*\[.*$/, "");
-    o.errors.push(
-      `${i}args[1]: Invalid syntax: '${f}' - operator cannot be used before bracket reference without parentheses`
-    ), o.isValid = !1;
-  }
-  const p = _t, m = /* @__PURE__ */ new Set();
-  let y;
-  for (; (y = p.exec(e)) !== null; ) {
-    const f = y[1];
-    m.add(f);
-  }
-  o.references = Array.from(m);
-  const F = Object.keys(r);
-  if (o.references.length > 0 && (/\b\w+\s*\(/gi.test(e) || o.references.every((A) => {
-    if (!(A in r))
-      return !1;
-    const D = r[A];
-    return x(D) ? !1 : typeof D == "string" && D.startsWith(h) ? !0 : D && typeof D == "object" && "kind" in D ? D.kind !== "measure" : !1;
-  }) && (o.errors.push(
-    `${i}args[1]: Formulas with bracket references must contain aggregate function calls`
-  ), o.isValid = !1)), o.references.length === 0)
-    return o.warnings.push(
+    return o || (a.errors.push(`${i}args[1]: Formula cannot be empty`), a.isValid = !1), a;
+  const u = /\b\w+\s*\[/gi, c = e.match(u);
+  if (c) {
+    const g = c[0].replace(/\s*\[.*$/, "");
+    a.errors.push(
+      `${i}args[1]: Invalid syntax: '${g}' - operator cannot be used before bracket reference without parentheses`
+    ), a.isValid = !1;
+  }
+  a.references = [
+    ...new Set(
+      [...e.matchAll(new RegExp(Kt.source, "g"))].map((g) => g[1])
+    )
+  ];
+  const m = Object.keys(r);
+  if (a.references.length === 0)
+    return a.warnings.push(
       `${i}args[1]: No bracket references found in formula - ensure this is intentional`
-    ), o;
-  if (F.length === 0)
-    return o.errors.push(
+    ), a;
+  if (m.length === 0)
+    return a.errors.push(
       `${i}args[2]: Context cannot be empty - custom formulas require context definitions`
-    ), o.isValid = !1, o;
-  const d = [];
-  for (const f of o.references)
-    F.includes(f) || d.push(f);
-  if (d.length > 0 && (o.isValid = !1, d.length === 1 ? o.errors.push(
-    `${i}args[1]: Reference [${d[0]}] not found in context. Available keys: ${F.join(", ")}`
-  ) : o.errors.push(
+    ), a.isValid = !1, a;
+  const d = a.references.filter((g) => !m.includes(g));
+  if (d.length > 0 && (a.isValid = !1, d.length === 1 ? a.errors.push(
+    `${i}args[1]: Reference [${d[0]}] not found in context. Available keys: ${m.join(", ")}`
+  ) : a.errors.push(
     `${i}args[1]: References [${d.join(
       "], ["
-    )}] not found in context. Available keys: ${F.join(", ")}`
-  )), (s || n) && F.length > 0) {
-    const f = F.filter((w) => !o.references.includes(w));
-    if (o.unusedContextKeys = f, f.length > 0) {
-      const w = `${i}args[2]: Context keys [${f.join(
+    )}] not found in context. Available keys: ${m.join(", ")}`
+  )), !Qt.test(e)) {
+    const g = a.references.filter(
+      (f) => f in r && !Yt(r[f])
+    );
+    g.length > 0 && (a.errors.push(
+      `${i}args[1]: ${Xt(
+        Ht(e)
+      )}Bracket reference(s) ${Zt(
+        g
+      )} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`
+    ), a.isValid = !1);
+  }
+  if ((s || n) && m.length > 0) {
+    const g = m.filter((f) => !a.references.includes(f));
+    if (a.unusedContextKeys = g, g.length > 0) {
+      const f = `${i}args[2]: Context keys [${g.join(
         ", "
       )}] are defined but not used in formula`;
-      n ? (o.errors.push(w), o.isValid = !1) : s && o.warnings.push(w);
+      n ? (a.errors.push(f), a.isValid = !1) : s && a.warnings.push(f);
     }
   }
-  return o;
+  return a;
 }
-function Vt(e, r, t = {}) {
-  const s = Lt(e, r, t);
+function es(e, r, t = {}) {
+  const s = vt(e, r, t);
   if (!s.isValid)
     throw new Error(s.errors.join("; "));
   s.warnings.length > 0 && console.warn("Formula validation warnings:", s.warnings.join("; "));
 }
-function Wt(e, r) {
+function rs(e, r) {
   if (e.length < 3 || e.length > 5)
     throw new Error(
       `${r.pathPrefix}Expected 3, 4, or 5 arguments for customFormula (title, formula, context, format?, description?)`
     );
   const t = e[1], s = e[2];
-  Vt(t, s, {
+  es(t, s, {
     errorPrefix: `${r.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1224,33 +1299,33 @@ function Wt(e, r) {
     // Custom formulas must have content
   });
   const n = {};
-  for (const [a, i] of Object.entries(s)) {
-    const o = `args[2].${a}`;
-    if (x(i))
-      n[`${a}`] = C({
+  for (const [o, i] of Object.entries(s)) {
+    const a = `args[2].${o}`;
+    if (E(i))
+      n[`${o}`] = C({
         data: i,
         context: {
           dataSource: r.dataSource,
           schemaIndex: r.schemaIndex,
-          pathPrefix: o
+          pathPrefix: a
         }
       });
-    else if (typeof i == "string" && i.startsWith(h))
+    else if (typeof i == "string" && i.startsWith(w))
       try {
-        n[`${a}`] = ce(
+        n[`${o}`] = K(
           i,
           r.dataSource,
           r.schemaIndex
         );
       } catch (u) {
-        const l = u instanceof Error ? u.message : "Unknown error";
-        throw new Error(`${o}: ${l}`);
+        const c = u instanceof Error ? u.message : "Unknown error";
+        throw new Error(`${a}: ${c}`);
       }
     else if (i && typeof i == "object" && "kind" in i)
-      n[`${a}`] = i;
+      n[`${o}`] = i;
     else
       throw new Error(
-        `${o}: Invalid context value for key '${a}'. Expected a function call or attribute reference (${h}...), but got: ${typeof i}`
+        `${a}: Invalid context value for key '${o}'. Expected a function call or attribute reference (${w}...), but got: ${typeof i}`
       );
   }
   e[2] = n;
@@ -1263,57 +1338,57 @@ function de(e, r) {
 }
 function qe(e, r) {
   const t = de(e, r);
-  if (!Ot(t))
+  if (!Bt(t))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${Q(
+      `${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${G(
         t
       )} attribute`
     );
 }
-function R(e, r) {
+function M(e, r) {
   const t = de(e, r);
-  if (!We(t))
+  if (!Je(t))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be numeric type, got ${Q(
+      `${r.pathPrefix}args[0]: Attribute must be numeric type, got ${G(
         t
       )} attribute`
     );
 }
 function S(e, r) {
   const t = de(e, r);
-  if (!Ve(t))
+  if (!je(t))
     throw new Error(
-      `${r.pathPrefix}args[0]: Attribute must be string type, got ${Q(
+      `${r.pathPrefix}args[0]: Attribute must be string type, got ${G(
         t
       )} attribute`
     );
 }
-function Jt(e, r) {
+function ts(e, r) {
   const t = e[0];
   if (!t || typeof t != "object" || !("attribute" in t))
     throw new Error(`${r.pathPrefix}args[0]: Expected filter as first argument`);
   return t;
 }
-function Ut(e, r) {
-  const t = Jt(e, r);
+function ss(e, r) {
+  const t = ts(e, r);
   if (!se(t))
     throw new Error(
       `${r.pathPrefix}args[0]: exclude filter only accepts members filter, got ${t.__serializable || "unknown"} filter`
     );
 }
-const jt = {
-  "measureFactory.customFormula": Wt,
+const ns = {
+  "measureFactory.customFormula": rs,
   // String | Number filters
   "filterFactory.equals": qe,
   "filterFactory.doesntEqual": qe,
   // Numeric filters
-  "filterFactory.greaterThan": R,
-  "filterFactory.greaterThanOrEqual": R,
-  "filterFactory.lessThan": R,
-  "filterFactory.lessThanOrEqual": R,
-  "filterFactory.between": R,
-  "filterFactory.betweenNotEqual": R,
-  "filterFactory.numeric": R,
+  "filterFactory.greaterThan": M,
+  "filterFactory.greaterThanOrEqual": M,
+  "filterFactory.lessThan": M,
+  "filterFactory.lessThanOrEqual": M,
+  "filterFactory.between": M,
+  "filterFactory.betweenNotEqual": M,
+  "filterFactory.numeric": M,
   // String filters
   "filterFactory.contains": S,
   "filterFactory.doesntContain": S,
@@ -1323,12 +1398,12 @@ const jt = {
   "filterFactory.doesntEndWith": S,
   "filterFactory.like": S,
   // Exclude filter
-  "filterFactory.exclude": Ut
+  "filterFactory.exclude": ss
 };
-function Kt(e) {
-  return jt[`${e}`];
+function is(e) {
+  return ns[`${e}`];
 }
-const Qt = {
+const os = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -1856,17 +1931,17 @@ const Qt = {
   ]
 };
 function me(e) {
-  return Qt[`${e}`];
+  return os[`${e}`];
 }
-function Yt(e) {
+function as(e) {
   const r = me(e);
   return r ? r.filter((t) => t.required).length : 0;
 }
-function Ht(e) {
+function us(e) {
   const r = me(e);
   return r ? r.length : 0;
 }
-function Zt(e) {
+function cs(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return !1;
   const t = Date.parse(e);
@@ -1875,32 +1950,32 @@ function Zt(e) {
   const s = new Date(e);
   return !isNaN(s.getTime());
 }
-function Z(e, r, t, s) {
-  if (e.startsWith(h))
+function H(e, r, t, s) {
+  if (e.startsWith(w))
     try {
-      return ce(e, r, t);
+      return K(e, r, t);
     } catch (n) {
-      const a = n instanceof Error ? n.message : "Unknown error";
-      throw new Error(`${s}: ${a}`);
+      const o = n instanceof Error ? n.message : "Unknown error";
+      throw new Error(`${s}: ${o}`);
     }
   throw new Error(
-    `${s}: Invalid attribute "${e}". Expected format: "${h}TableName.ColumnName[.Level]"`
+    `${s}: Invalid attribute "${e}". Expected format: "${w}TableName.ColumnName[.Level]"`
   );
 }
-function Gt(e, r, t, s) {
-  if (e.startsWith(h))
+function ls(e, r, t, s) {
+  if (e.startsWith(w))
     try {
-      return Tt(e, r, t);
+      return kt(e, r, t);
     } catch (n) {
-      const a = n instanceof Error ? n.message : "Unknown error";
-      throw new Error(`${s}: ${a}`);
+      const o = n instanceof Error ? n.message : "Unknown error";
+      throw new Error(`${s}: ${o}`);
     }
   throw new Error(
-    `${s}: Invalid date dimension string "${e}". Expected format: "${h}TableName.ColumnName"`
+    `${s}: Invalid date dimension string "${e}". Expected format: "${w}TableName.ColumnName"`
   );
 }
-function Xt(e) {
-  const r = e.data, { argSchema: t, dataSource: s, schemaIndex: n, pathPrefix: a } = e.context, i = a;
+function fs(e) {
+  const r = e.data, { argSchema: t, dataSource: s, schemaIndex: n, pathPrefix: o } = e.context, i = o;
   if (r === void 0) {
     if (t.required)
       throw new Error(`${i}: Required argument is missing (expected ${t.type})`);
@@ -1924,7 +1999,7 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected array of strings, got ${typeof r}. Example: ["value1", "value2"]`
         );
-      if (!r.every((o) => typeof o == "string"))
+      if (!r.every((a) => typeof a == "string"))
         throw new Error(
           `${i}: Expected array of strings, but contains non-string values`
         );
@@ -1934,7 +2009,7 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected array of numbers, got ${typeof r}. Example: [10, 20]`
         );
-      if (!r.every((o) => typeof o == "number"))
+      if (!r.every((a) => typeof a == "number"))
         throw new Error(
           `${i}: Expected array of numbers, but contains non-number values`
         );
@@ -1944,20 +2019,20 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected attribute string, got ${typeof r}. Example: "DM.Commerce.Revenue"`
         );
-      return Z(r, s, n, i);
+      return H(r, s, n, i);
     case "Attribute[]":
       if (!Array.isArray(r))
         throw new Error(
           `${i}: Expected array of attributes, got ${typeof r}. Example: ["DM.Commerce.AgeRange"]`
         );
-      return r.map((o, u) => {
-        if (typeof o != "string")
-          throw new Error(`${i}[${u}]: Expected attribute string, got ${typeof o}`);
-        return Z(o, s, n, `${i}[${u}]`);
+      return r.map((a, u) => {
+        if (typeof a != "string")
+          throw new Error(`${i}[${u}]: Expected attribute string, got ${typeof a}`);
+        return H(a, s, n, `${i}[${u}]`);
       });
     case "Measure":
     case "BaseMeasure":
-      if (!x(r))
+      if (!E(r))
         throw new Error(
           `${i}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`
         );
@@ -1970,18 +2045,18 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected array of measure function calls, got ${typeof r}`
         );
-      return r.map((o, u) => {
-        if (!x(o))
+      return r.map((a, u) => {
+        if (!E(a))
           throw new Error(
-            `${i}[${u}]: Expected measure function call, got ${typeof o}`
+            `${i}[${u}]: Expected measure function call, got ${typeof a}`
           );
         return C({
-          data: o,
+          data: a,
           context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
         });
       });
     case "Filter":
-      if (!x(r))
+      if (!E(r))
         throw new Error(
           `${i}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`
         );
@@ -1994,29 +2069,29 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected array of filter function calls, got ${typeof r}`
         );
-      return r.map((o, u) => {
-        if (!x(o))
+      return r.map((a, u) => {
+        if (!E(a))
           throw new Error(
-            `${i}[${u}]: Expected filter function call, got ${typeof o}`
+            `${i}[${u}]: Expected filter function call, got ${typeof a}`
           );
         return C({
-          data: o,
+          data: a,
           context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
         });
       });
     case "FilterRelationsNode":
       if (Array.isArray(r))
-        return r.map((o, u) => {
-          if (!x(o))
+        return r.map((a, u) => {
+          if (!E(a))
             throw new Error(
-              `${i}[${u}]: Expected filter function call, got ${typeof o}`
+              `${i}[${u}]: Expected filter function call, got ${typeof a}`
             );
           return C({
-            data: o,
+            data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
           });
         });
-      if (x(r))
+      if (E(r))
         return C({
           data: r,
           context: { dataSource: s, schemaIndex: n, pathPrefix: i }
@@ -2029,30 +2104,30 @@ function Xt(e) {
         throw new Error(
           `${i}: Expected date dimension string, got ${typeof r}. Example: "DM.Commerce.Date"`
         );
-      return Gt(r, s, n, i);
+      return ls(r, s, n, i);
     case "LevelAttribute": {
       if (typeof r != "string")
         throw new Error(
           `${i}: Expected date attribute string, got ${typeof r}. Example: "DM.Commerce.Date.Years"`
         );
-      const o = Z(
+      const a = H(
         r,
         s,
         n,
         i
       );
-      if (!St(o))
+      if (!Pt(a))
         throw new Error(
-          `${i}: Attribute must be date/datetime type, got ${Q(
-            o
+          `${i}: Attribute must be date/datetime type, got ${G(
+            a
           )} attribute`
         );
-      return o;
+      return a;
     }
     case "Measure | number":
       if (typeof r == "number")
         return r;
-      if (x(r))
+      if (E(r))
         return C({
           data: r,
           context: { dataSource: s, schemaIndex: n, pathPrefix: i }
@@ -2062,7 +2137,7 @@ function Xt(e) {
       );
     case "Date | string":
       if (typeof r == "string") {
-        if (Zt(r))
+        if (cs(r))
           return r;
         throw new Error(
           `${i}: Expected valid ISO date string or Date object, got invalid date string "${r}"`
@@ -2090,99 +2165,99 @@ function Xt(e) {
   }
 }
 function C(e) {
-  const { data: r } = e, { dataSource: t, schemaIndex: s, pathPrefix: n } = e.context, { function: a, args: i } = r, o = n ? `${n}.` : "", u = me(a);
+  const { data: r } = e, { dataSource: t, schemaIndex: s, pathPrefix: n } = e.context, { function: o, args: i } = r, a = n ? `${n}.` : "", u = me(o);
   if (!u)
-    throw new Error(`${o}function: Unknown function "${a}"`);
-  const l = Yt(a), p = Ht(a);
-  if (i.length < l)
+    throw new Error(`${a}function: Unknown function "${o}"`);
+  const c = as(o), m = us(o);
+  if (i.length < c)
     throw new Error(
-      `${o}function: Expected at least ${l} arguments, got ${i.length}`
+      `${a}function: Expected at least ${c} arguments, got ${i.length}`
     );
-  if (i.length > p)
+  if (i.length > m)
     throw new Error(
-      `${o}function: Expected at most ${p} arguments, got ${i.length}`
+      `${a}function: Expected at most ${m} arguments, got ${i.length}`
     );
-  const m = [], y = [];
-  for (let d = 0; d < Math.max(i.length, u.length); d++) {
-    const f = u[`${d}`], w = i[`${d}`], T = o ? `${o}args[${d}]` : `args[${d}]`;
-    if (w === void 0) {
-      f != null && f.required && y.push(`${T}: Missing required argument (expected ${f.type})`);
+  const d = [], y = [];
+  for (let f = 0; f < Math.max(i.length, u.length); f++) {
+    const h = u[`${f}`], A = i[`${f}`], z = a ? `${a}args[${f}]` : `args[${f}]`;
+    if (A === void 0) {
+      h != null && h.required && y.push(`${z}: Missing required argument (expected ${h.type})`);
       continue;
     }
-    if (!f) {
-      y.push(`${T}: Unexpected argument`);
+    if (!h) {
+      y.push(`${z}: Unexpected argument`);
       continue;
     }
     try {
-      const A = Xt({
-        data: w,
+      const N = fs({
+        data: A,
         context: {
           dataSource: t,
           schemaIndex: s,
-          pathPrefix: T,
-          argSchema: f
+          pathPrefix: z,
+          argSchema: h
         }
       });
-      m.push(A);
-    } catch (A) {
-      const D = A instanceof Error ? A.message : "Unknown error";
-      y.push(D);
+      d.push(N);
+    } catch (N) {
+      const Ze = N instanceof Error ? N.message : "Unknown error";
+      y.push(Ze);
     }
   }
   if (y.length > 0) {
-    const d = y.join("; ");
-    throw new Error(d);
+    const f = y.join("; ");
+    throw new Error(f);
   }
-  const F = Kt(a);
-  if (F)
+  const g = is(o);
+  if (g)
     try {
-      F(m, {
+      g(d, {
         dataSource: t,
         schemaIndex: s,
-        pathPrefix: o
+        pathPrefix: a
       });
-    } catch (d) {
-      const f = d instanceof Error ? d.message : "Unknown validation error";
-      throw new Error(f);
+    } catch (f) {
+      const h = f instanceof Error ? f.message : "Unknown validation error";
+      throw new Error(h);
     }
-  return kt(a, m);
+  return Gt(o, d);
 }
-function Je(e) {
+function Ke(e) {
   const { attribute: r, config: t } = e;
-  if (se(e) && kr(r)) {
-    const { granularity: s } = r, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), a = _r(t), i = Object.keys(a).length === 0 ? void 0 : a;
-    return Lr(r, n, i);
+  if (se(e) && Ur(r)) {
+    const { granularity: s } = r, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), o = Wr(t), i = Object.keys(o).length === 0 ? void 0 : o;
+    return jr(r, n, i);
   }
   return e;
 }
-function vt(e) {
+function ds(e) {
   let r = [];
   for (const t of e)
-    W(t) ? r = ge(t, r) : r = ge([Je(t)], r);
+    _(t) ? r = ge(t, r) : r = ge([Ke(t)], r);
   return r != null ? r : [];
 }
-const es = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+const ms = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], o = [];
+  return r.forEach((i, a) => {
     const u = {
       category: "filters",
-      index: o,
+      index: a,
       input: i
     };
     try {
-      const l = C({
+      const c = C({
         data: i,
         context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
       });
-      !W(l) && !K(l) ? a.push(E(b({}, u), { message: "Invalid filter JSON" })) : n.push(l);
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      a.push(E(b({}, u), { message: p }));
+      !_(c) && !J(c) ? o.push(b(p({}, u), { message: "Invalid filter JSON" })) : n.push(c);
+    } catch (c) {
+      const m = c instanceof Error ? c.message : "Unknown error";
+      o.push(b(p({}, u), { message: m }));
     }
-  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: vt(n) };
-}, rs = (e) => {
+  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: ds(n) };
+}, ps = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? le(r) ? es({
+  return r ? Ue(r) ? ms({
     data: r,
     context: { dataSource: t, schemaIndex: s }
   }) : {
@@ -2196,28 +2271,28 @@ const es = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, ts = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+}, ys = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], o = [];
+  return r.forEach((i, a) => {
     const u = {
       category: "highlights",
-      index: o,
+      index: a,
       input: i
     };
     try {
-      const l = C({
+      const c = C({
         data: i,
         context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
       });
-      K(l) ? n.push(Je(l)) : a.push(E(b({}, u), { message: "Invalid filter JSON" }));
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      a.push(E(b({}, u), { message: p }));
+      J(c) ? n.push(Ke(c)) : o.push(b(p({}, u), { message: "Invalid filter JSON" }));
+    } catch (c) {
+      const m = c instanceof Error ? c.message : "Unknown error";
+      o.push(b(p({}, u), { message: m }));
     }
-  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: n };
-}, ss = (e) => {
+  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
+}, gs = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? le(r) ? ts({
+  return r ? Ue(r) ? ys({
     data: r,
     context: { dataSource: t, schemaIndex: s }
   }) : {
@@ -2231,125 +2306,178 @@ const es = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, ns = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+}, hs = (e, r, t) => {
+  const { dataSource: s, schemaIndex: n } = r;
+  try {
+    const o = C({
+      data: e,
+      context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
+    });
+    return le(o) ? { success: !0, data: o } : {
+      success: !1,
+      errors: [b(p({}, t), { message: "Invalid measure JSON" })]
+    };
+  } catch (o) {
+    const i = o instanceof Error ? o.message : "Unknown error";
+    return {
+      success: !1,
+      errors: [b(p({}, t), { message: i })]
+    };
+  }
+}, bs = (e, r, t) => r ? Ee(r) ? { measure: e.sort(Ce(r)) } : {
+  measure: e,
+  error: b(p({}, t), {
+    message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${r}".`
+  })
+} : { measure: e }, Fs = (e, r, t, s) => {
+  const n = C({
+    data: e.column,
+    context: { dataSource: r, schemaIndex: t, pathPrefix: "" }
+  });
+  return le(n) ? bs(n, e.sortType, s) : { error: b(p({}, s), { message: "Invalid measure JSON" }) };
+}, ws = (e, r, t, s) => {
+  if (Ot(e))
+    return Fs(e, r, t, s);
+  if (E(e)) {
+    const n = hs(
+      e,
+      { dataSource: r, schemaIndex: t },
+      s
+    );
+    return n.success ? { measure: n.data } : { error: n.errors[0] };
+  }
+  return {
+    error: b(p({}, s), {
+      message: 'Invalid measure item. Expected a function call (function/args) or object with "column" and optional "sortType".'
+    })
+  };
+}, qs = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
+  if (!r)
+    return { success: !0, data: [] };
+  if (!Array.isArray(r))
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "measures",
+          index: -1,
+          input: r,
+          message: "Invalid measures JSON. Expected an array."
+        }
+      ]
+    };
+  const n = [], o = [];
+  return r.forEach((i, a) => {
     const u = {
       category: "measures",
-      index: o,
+      index: a,
       input: i
     };
     try {
-      const l = C({
-        data: i,
-        context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
-      });
-      _e(l) ? n.push(l) : a.push(E(b({}, u), { message: "Invalid measure JSON" }));
-    } catch (l) {
-      const p = l instanceof Error ? l.message : "Unknown error";
-      a.push(E(b({}, u), { message: p }));
-    }
-  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: n };
-}, is = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? le(r) ? ns({
-    data: r,
-    context: { dataSource: t, schemaIndex: s }
-  }) : {
-    success: !1,
-    errors: [
-      {
-        category: "measures",
-        index: -1,
-        input: r,
-        message: 'Invalid measures JSON. Expected an array of function calls with "function" and "args" properties.'
+      const c = ws(i, t, s, u);
+      if (c.error) {
+        o.push(c.error);
+        return;
       }
-    ]
-  } : { success: !0, data: [] };
-}, ws = (e) => {
-  const { data: r } = e, { dataSource: t, tables: s } = e.context, n = Nt(s), a = [], i = M(
-    () => It({
+      c.measure && n.push(c.measure);
+    } catch (c) {
+      const m = c instanceof Error ? c.message : "Unknown error";
+      o.push(b(p({}, u), { message: m }));
+    }
+  }), o.length > 0 ? { success: !1, errors: o } : { success: !0, data: n };
+}, Ps = (e) => {
+  const { data: r } = e, { dataSource: t, tables: s } = e.context, n = It(s), o = [], i = x(
+    () => Ut({
       data: r.dimensions || [],
       context: { dataSource: t, schemaIndex: n }
     }),
-    a
-  ), o = M(
-    () => is({
+    o
+  ), a = x(
+    () => qs({
       data: r.measures || [],
       context: { dataSource: t, schemaIndex: n }
     }),
-    a
-  ), u = M(
-    () => rs({
+    o
+  ), u = x(
+    () => ps({
       data: r.filters || [],
       context: { dataSource: t, schemaIndex: n }
     }),
-    a
+    o
   );
-  let l = null;
-  return r.highlights && (l = M(
-    () => ss({
+  let c = null;
+  return r.highlights && (c = x(
+    () => gs({
       data: r.highlights || [],
       context: { dataSource: t, schemaIndex: n }
     }),
-    a
-  )), a.length > 0 ? {
+    o
+  )), o.length > 0 ? {
     success: !1,
-    errors: a
+    errors: o
   } : {
     success: !0,
-    data: b({
-      dataSource: Vr(t),
+    data: p({
+      dataSource: Jr(t),
       dimensions: i || [],
-      measures: o || [],
+      measures: a || [],
       filters: u || []
-    }, l && { highlights: l })
+    }, c && { highlights: c })
   };
 };
-function as(e) {
+function Es(e) {
   const r = [], t = [];
   return e.forEach((s, n) => {
-    const a = () => typeof s.toJSON == "function" ? s.toJSON() : s;
+    const o = () => typeof s.toJSON == "function" ? s.toJSON() : s;
     if (!s.composeCode) {
       t.push({
         category: "dimensions",
         index: n,
-        input: a(),
+        input: o(),
         message: `Dimension at index ${n} (${s.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
-    if (!s.composeCode.startsWith(h)) {
+    if (!s.composeCode.startsWith(w)) {
       t.push({
         category: "dimensions",
         index: n,
-        input: a(),
-        message: `Expected composeCode to start with "${h}" for dimension at index ${n} (${s.name || "unnamed"}). Got: "${s.composeCode}"`
+        input: o(),
+        message: `Expected composeCode to start with "${w}" for dimension at index ${n} (${s.name || "unnamed"}). Got: "${s.composeCode}"`
       });
       return;
     }
-    r.push(s.composeCode);
+    const i = s.getSort();
+    if (i !== void 0 && i !== ne.None) {
+      const a = {
+        column: s.composeCode,
+        sortType: $e(i)
+      };
+      r.push(a);
+    } else
+      r.push(s.composeCode);
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function Ue(e, r) {
+function Qe(e, r) {
   const t = [];
-  let s = "", n = 0, a = !1, i = null;
-  for (let o = 0; o < e.length; o++) {
-    const u = e[o], l = e[o + 1];
-    if (a) {
+  let s = "", n = 0, o = !1, i = null;
+  for (let a = 0; a < e.length; a++) {
+    const u = e[a], c = e[a + 1];
+    if (o) {
       if (u !== i) {
         s += u;
         continue;
       }
-      if (l === i) {
-        s += u + l, o++;
+      if (c === i) {
+        s += u + c, a++;
         continue;
       }
-      a = !1, i = null, s += u;
+      o = !1, i = null, s += u;
       continue;
     } else {
       if (u === "'" || u === '"') {
-        a = !0, i = u, s += u;
+        o = !0, i = u, s += u;
         continue;
       }
       if ("([{".includes(u) && n++, ")]}".includes(u) && n--, u === r && n === 0) {
@@ -2361,14 +2489,14 @@ function Ue(e, r) {
   }
   return s.trim() && t.push(s.trim()), t;
 }
-function os(e, r) {
+function Cs(e, r) {
   let t = 0, s = !1, n = null;
-  for (let a = 0; a < e.length; a++) {
-    const i = e[a], o = e[a + 1];
+  for (let o = 0; o < e.length; o++) {
+    const i = e[o], a = e[o + 1];
     if (s) {
       if (i !== n) continue;
-      if (o === n) {
-        a++;
+      if (a === n) {
+        o++;
         continue;
       }
       s = !1, n = null;
@@ -2377,12 +2505,12 @@ function os(e, r) {
         s = !0, n = i;
         continue;
       }
-      if ("([{".includes(i) && t++, ")]}".includes(i) && t--, i === r && t === 0) return a;
+      if ("([{".includes(i) && t++, ")]}".includes(i) && t--, i === r && t === 0) return o;
     }
   }
   return -1;
 }
-function us(e) {
+function $s(e) {
   return e.startsWith("'") && e.endsWith("'") || e.startsWith('"') && e.endsWith('"') ? e.slice(1, -1) : e;
 }
 function V(e) {
@@ -2394,16 +2522,16 @@ function V(e) {
   const t = r.match(/^([a-zA-Z_$][a-zA-Z0-9_.$]*)\s*\((.*)\)$/);
   if (!t)
     throw new Error(`Invalid composeCode format: expected function call, got "${r}"`);
-  const s = t[1], n = t[2], a = je(n);
+  const s = t[1], n = t[2], o = Ye(n);
   return {
     function: s,
-    args: a
+    args: o
   };
 }
-function je(e) {
-  return e.trim() ? Ue(e, ",").map(Ke) : [];
+function Ye(e) {
+  return e.trim() ? Qe(e, ",").map(He) : [];
 }
-function Ke(e) {
+function He(e) {
   if (!e)
     throw new Error("Cannot parse empty argument value");
   if (e === "null")
@@ -2424,33 +2552,33 @@ function Ke(e) {
     const t = e.slice(1, -1).trim();
     if (!t)
       return [];
-    const s = je(t);
+    const s = Ye(t);
     return s.every((n) => typeof n == "string"), s;
   }
   if (e.startsWith("{") && e.endsWith("}")) {
     const t = e.slice(1, -1).trim();
-    return t ? cs(t) : {};
+    return t ? xs(t) : {};
   }
   return e.includes("(") && e.includes(")") ? V(e) : (e.startsWith("DM."), e);
 }
-function ls(e) {
-  const r = os(e, ":");
+function As(e) {
+  const r = Cs(e, ":");
   if (r === -1)
     throw new Error(`Invalid object property: expected "key: value", got "${e}"`);
-  const t = us(e.slice(0, r).trim()), s = Ke(e.slice(r + 1).trim());
+  const t = $s(e.slice(0, r).trim()), s = He(e.slice(r + 1).trim());
   return [t, s];
 }
-function cs(e) {
+function xs(e) {
   if (!e.trim()) return {};
-  const r = Ue(e, ",").map(ls).filter(([, t]) => t !== null);
+  const r = Qe(e, ",").map(As).filter(([, t]) => t !== null);
   return Object.fromEntries(r);
 }
 const re = "Unknown error";
-function fs(e) {
+function Ds(e) {
   if (!e)
     return { success: !0, data: [] };
   const r = [];
-  if (Wr(e)) {
+  if (Gr(e)) {
     if (!e.composeCode)
       return {
         success: !1,
@@ -2492,10 +2620,10 @@ function fs(e) {
       return;
     }
     try {
-      const a = V(s.composeCode);
-      t.push(a);
-    } catch (a) {
-      const i = a instanceof Error ? a.message : re;
+      const o = V(s.composeCode);
+      t.push(o);
+    } catch (o) {
+      const i = o instanceof Error ? o.message : re;
       r.push({
         category: "filters",
         index: n,
@@ -2505,7 +2633,7 @@ function fs(e) {
     }
   }), r.length > 0 ? { success: !1, errors: r } : { success: !0, data: t };
 }
-function ds(e) {
+function Ms(e) {
   if (!e)
     return { success: !0, data: [] };
   const r = [], t = [];
@@ -2520,10 +2648,10 @@ function ds(e) {
       return;
     }
     try {
-      const a = V(s.composeCode);
-      r.push(a);
-    } catch (a) {
-      const i = a instanceof Error ? a.message : re;
+      const o = V(s.composeCode);
+      r.push(o);
+    } catch (o) {
+      const i = o instanceof Error ? o.message : re;
       t.push({
         category: "highlights",
         index: n,
@@ -2533,29 +2661,36 @@ function ds(e) {
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
 }
-function ms(e) {
+function Ss(e) {
   const r = [], t = [];
   return e.forEach((s, n) => {
-    const a = () => typeof s.toJSON == "function" ? s.toJSON() : s;
+    const o = () => typeof s.toJSON == "function" ? s.toJSON() : s;
     if (!s.composeCode) {
       t.push({
         category: "measures",
         index: n,
-        input: a(),
+        input: o(),
         message: `Measure at index ${n} (${s.name || "unnamed"}) is missing composeCode`
       });
       return;
     }
     try {
-      const i = V(s.composeCode);
-      r.push(i);
+      const i = V(s.composeCode), a = s.getSort();
+      if (a !== void 0 && a !== ne.None) {
+        const u = {
+          column: i,
+          sortType: $e(a)
+        };
+        r.push(u);
+      } else
+        r.push(i);
     } catch (i) {
-      const o = i instanceof Error ? i.message : "Unknown error";
+      const a = i instanceof Error ? i.message : "Unknown error";
       t.push({
         category: "measures",
         index: n,
-        input: a(),
-        message: `Failed to parse composeCode for measure at index ${n} (${s.name || "unnamed"}): ${o}. ComposeCode: "${s.composeCode}"`
+        input: o(),
+        message: `Failed to parse composeCode for measure at index ${n} (${s.name || "unnamed"}): ${a}. ComposeCode: "${s.composeCode}"`
       });
     }
   }), t.length > 0 ? { success: !1, errors: t } : { success: !0, data: r };
@@ -2565,39 +2700,39 @@ function te(e) {
     Object.entries(e).map(([r, t]) => [r, te(t)])
   ) : e;
 }
-function qs(e) {
-  const r = [], t = M(
-    () => as(e.dimensions || []),
+function Bs(e) {
+  const r = [], t = x(
+    () => Es(e.dimensions || []),
     r
-  ), s = M(
-    () => ms(e.measures || []),
+  ), s = x(
+    () => Ss(e.measures || []),
     r
-  ), n = M(
-    () => fs(e.filters),
+  ), n = x(
+    () => Ds(e.filters),
     r
   );
-  let a = null;
-  if (e.highlights && e.highlights.length > 0 && (a = M(
-    () => ds(e.highlights),
+  let o = null;
+  if (e.highlights && e.highlights.length > 0 && (o = x(
+    () => Ms(e.highlights),
     r
   )), r.length > 0)
     return {
       success: !1,
       errors: r
     };
-  const i = b({
+  const i = p({
     dimensions: t || [],
     measures: s || [],
     filters: n || []
-  }, a && { highlights: a });
+  }, o && { highlights: o });
   return {
     success: !0,
     // Strip [[delimiters]] from all strings to preserve original names with spaces
     data: te(i)
   };
 }
-function ps(e) {
-  const { filters: r, relations: t } = jr(
+function Ts(e) {
+  const { filters: r, relations: t } = Yr(
     e.filters || []
   );
   return {
@@ -2610,19 +2745,19 @@ function ps(e) {
     // No count/offset/ungroup - these are execution concerns, not translation concerns
   };
 }
-function Es(e, r, t = !1) {
-  const s = ps(e), n = Jr(s, r);
-  return Ur(n, t);
+function ks(e, r, t = !1) {
+  const s = Ts(e), n = Kr(s, r);
+  return Qr(n, t);
 }
 export {
-  Fs as CustomSuperJSON,
-  xs as EMPTY_EXPANDED_QUERY_MODEL,
-  As as EMPTY_SIMPLE_QUERY_MODEL,
-  Ds as isByIdDashboardCodeParams,
-  Ms as isByIdWidgetCodeParams,
-  Ns as isClientSideDashboardCodeParams,
-  Rs as isClientSideWidgetCodeParams,
-  ws as translateQueryFromJSON,
-  qs as translateQueryToJSON,
-  Es as translateQueryToJaql
+  zs as CustomSuperJSON,
+  _s as EMPTY_EXPANDED_QUERY_MODEL,
+  Us as EMPTY_SIMPLE_QUERY_MODEL,
+  Ws as isByIdDashboardCodeParams,
+  js as isByIdWidgetCodeParams,
+  Js as isClientSideDashboardCodeParams,
+  Gs as isClientSideWidgetCodeParams,
+  Ps as translateQueryFromJSON,
+  Bs as translateQueryToJSON,
+  ks as translateQueryToJaql
 };