@sisense/mcp-server 0.2.2 → 0.2.4

package/dist/{sse-server-brx9qtyd.js → sse-server-22mq7fhc.js}

@@ -1,72 +1,74 @@
 import {
-  $r,
   Bi,
+  C,
   Cd,
-  Cr,
-  Ct,
+  Dr,
   E,
+  Ed,
   Fi,
   Gh,
-  Hi,
+  Hh,
+  Ii,
   Jh,
   Kh,
-  L,
-  Ld,
-  Md,
   Nd,
+  Ni,
   Nr,
-  Nt,
-  Qe,
+  Od,
+  Oe,
+  Or,
   Qh,
-  Qt,
-  Rd,
-  Ri,
-  Se,
-  Sh,
+  Ui,
+  Ve,
   Vh,
+  Vt,
   Wh,
   Xh,
   Y,
   Yh,
   Z,
   Zh,
-  _e,
-  _r,
+  _d,
   ap,
   be,
+  bh,
   bp,
+  br,
   dp,
   ep,
+  fp,
+  ft,
   g,
-  gp,
-  gt,
   h1 as h,
   ip,
   ji,
   kh,
   m,
+  me,
   mp,
   ne,
-  np,
+  pp,
   qh,
   rp,
   tp,
-  vs,
   wd,
+  wr,
+  wt,
   xd,
+  xt,
   ye,
-  yr,
-  zi
-} from "./sse-server-3e0efmg2.js";
+  ys,
+  zh
+} from "./sse-server-d3yx2z0r.js";
 
-// node_modules/@sisense/sdk-ui/dist/dimensions-Blw0p98x.js
-class c extends yr {
+// node_modules/@sisense/sdk-ui/dist/dimensions-BiLyFpCg.js
+class c extends br {
   constructor(e, t, s, r, u, m2, l, d, y, a) {
-    if (super(e, u || E.Dimension, m2, d, y), this.__serializable = "DimensionalDimension", this._dimensions = [], this._attributes = [], this._sort = L.None, !y && t) {
-      const { table: g2, column: b } = _e(t);
-      this.composeCode = `${Ri}.${gt(g2)}.${gt(b)}`;
+    if (super(e, u || E.Dimension, m2, d, y), this.__serializable = "DimensionalDimension", this._dimensions = [], this._attributes = [], this._sort = C.None, !y && t) {
+      const { table: g2, column: b } = Oe(t);
+      this.composeCode = `${Ni}.${ft(g2)}.${ft(b)}`;
     }
-    this._sort = l || L.None, this._expression = t, this.setDimensions(r || []), this.setAttributes(s), a && (this.defaultAttribute = a);
+    this._sort = l || C.None, this._expression = t, this.setDimensions(r || []), this.setAttributes(s), a && (this.defaultAttribute = a);
   }
   static parseType(e) {
     switch (e) {
@@ -84,21 +86,21 @@ class c extends yr {
   }
   getAttachedName(e, t) {
     let s = e;
-    const r = be(e);
+    const r = me(e);
     return (r === "id" || r === "name" || Object.getOwnPropertyDescriptor(this, r) !== undefined || this[r] !== undefined) && (s = t), s;
   }
   setDimensions(e) {
     this._dimensions = e;
     for (let t = 0;t < e.length; t++) {
       const s = this.getAttachedName(e[t].name, e[t].attributes[0].expression);
-      this[be(s)] = e[t], s != e[t].name && (e[t].name = s);
+      this[me(s)] = e[t], s != e[t].name && (e[t].name = s);
     }
   }
   setAttributes(e) {
     this._attributes = e || [];
     for (let t = 0;t < e.length; t++) {
       const s = this.getAttachedName(e[t].name, e[t].expression);
-      this[be(s)] = e[t], e[t].name != s && (e[t].name = s);
+      this[me(s)] = e[t], e[t].name != s && (e[t].name = s);
     }
   }
   get id() {
@@ -132,10 +134,10 @@ class c extends yr {
       jaql: {
         title: this.name,
         dim: this.expression,
-        datatype: vs(this.type)
+        datatype: ys(this.type)
       }
     };
-    return this._sort != L.None && (t.jaql.sort = this._sort == L.Ascending ? "asc" : "desc"), e === true ? t.jaql : t;
+    return this._sort != C.None && (t.jaql.sort = this._sort == C.Ascending ? "asc" : "desc"), e === true ? t.jaql : t;
   }
 }
 var z = (i) => i && i.__serializable === "DimensionalDimension";
@@ -190,9 +192,9 @@ function R(i) {
     if (i.attributes) {
       let a;
       for (let g2 = 0;g2 < i.attributes.length; g2++)
-        a = i.attributes[g2], l.push(new Qe(a.name, a.expression, a.type, a.description, a.sort, a.dataSource));
+        a = i.attributes[g2], l.push(new Ve(a.name, a.expression, a.type, a.description, a.sort, a.dataSource));
     } else
-      s && l.push(new Qe(e, s, r, t, u, m2));
+      s && l.push(new Ve(e, s, r, t, u, m2));
   const d = Object.getOwnPropertyNames(i).map((a) => i[a]).filter((a) => E.isDimension(a == null ? undefined : a.type));
   if (d.length == 0 && i.dimensions)
     for (let a = 0;a < i.dimensions.length; a++)
@@ -206,24 +208,24 @@ function x(i) {
 }
 
 // node_modules/@sisense/sdk-ui/dist/analytics-composer/node.js
-var Qe2 = Object.defineProperty;
-var Ye = Object.defineProperties;
-var He = Object.getOwnPropertyDescriptors;
-var pe = Object.getOwnPropertySymbols;
-var Ze = Object.prototype.hasOwnProperty;
-var Ge = Object.prototype.propertyIsEnumerable;
-var ye2 = (e, r, t) => (r in e) ? Qe2(e, r, { enumerable: true, configurable: true, writable: true, value: t }) : e[r] = t;
-var b2 = (e, r) => {
+var er = Object.defineProperty;
+var rr = Object.defineProperties;
+var tr = Object.getOwnPropertyDescriptors;
+var ye2 = Object.getOwnPropertySymbols;
+var sr = Object.prototype.hasOwnProperty;
+var nr = Object.prototype.propertyIsEnumerable;
+var ge = (e, r, t) => (r in e) ? er(e, r, { enumerable: true, configurable: true, writable: true, value: t }) : e[r] = t;
+var g2 = (e, r) => {
   for (var t in r || (r = {}))
-    Ze.call(r, t) && ye2(e, t, r[t]);
-  if (pe)
-    for (var t of pe(r))
-      Ge.call(r, t) && ye2(e, t, r[t]);
+    sr.call(r, t) && ge(e, t, r[t]);
+  if (ye2)
+    for (var t of ye2(r))
+      nr.call(r, t) && ge(e, t, r[t]);
   return e;
 };
-var E3 = (e, r) => Ye(e, He(r));
+var h2 = (e, r) => rr(e, tr(r));
 
-class Gr {
+class st {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map, this.valueToKey = /* @__PURE__ */ new Map;
   }
@@ -241,9 +243,9 @@ class Gr {
   }
 }
 
-class Ee {
+class De {
   constructor(r) {
-    this.generateIdentifier = r, this.kv = new Gr;
+    this.generateIdentifier = r, this.kv = new st;
   }
   register(r, t) {
     this.kv.getByValue(r) || (t || (t = this.generateIdentifier(r)), this.kv.set(t, r));
@@ -259,7 +261,7 @@ class Ee {
   }
 }
 
-class Xr extends Ee {
+class nt extends De {
   constructor() {
     super((r) => r.name), this.classToAllowedProps = /* @__PURE__ */ new Map;
   }
@@ -270,7 +272,7 @@ class Xr extends Ee {
     return this.classToAllowedProps.get(r);
   }
 }
-function vr(e) {
+function it(e) {
   if ("values" in Object)
     return Object.values(e);
   const r = [];
@@ -278,24 +280,24 @@ function vr(e) {
     e.hasOwnProperty(t) && r.push(e[t]);
   return r;
 }
-function et(e, r) {
-  const t = vr(e);
+function ot(e, r) {
+  const t = it(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 z2(e, r) {
   Object.entries(e).forEach(([t, s]) => r(s, t));
 }
-function U(e, r) {
+function j2(e, r) {
   return e.indexOf(r) !== -1;
 }
-function he(e, r) {
+function be2(e, r) {
   for (let t = 0;t < e.length; t++) {
     const s = e[t];
     if (r(s))
@@ -303,7 +305,7 @@ function he(e, r) {
   }
 }
 
-class rt {
+class at {
   constructor() {
     this.transfomers = {};
   }
@@ -311,54 +313,54 @@ class rt {
     this.transfomers[r.name] = r;
   }
   findApplicable(r) {
-    return et(this.transfomers, (t) => t.isApplicable(r));
+    return ot(this.transfomers, (t) => t.isApplicable(r));
   }
   findByName(r) {
     return this.transfomers[r];
   }
 }
-var tt = (e) => Object.prototype.toString.call(e).slice(8, -1);
-var Ce = (e) => typeof e == "undefined";
-var st = (e) => e === null;
+var ut = (e) => Object.prototype.toString.call(e).slice(8, -1);
+var Me = (e) => typeof e == "undefined";
+var ct = (e) => e === null;
 var k = (e) => typeof e != "object" || e === null || e === Object.prototype ? false : Object.getPrototypeOf(e) === null ? true : Object.getPrototypeOf(e) === Object.prototype;
-var G = (e) => k(e) && Object.keys(e).length === 0;
-var N = (e) => Array.isArray(e);
-var nt = (e) => typeof e == "string";
-var it = (e) => typeof e == "number" && !isNaN(e);
-var at = (e) => typeof e == "boolean";
-var ot = (e) => e instanceof RegExp;
-var _ = (e) => e instanceof Map;
-var L2 = (e) => e instanceof Set;
-var $e = (e) => tt(e) === "Symbol";
-var ut = (e) => e instanceof Date && !isNaN(e.valueOf());
-var lt = (e) => e instanceof Error;
-var be2 = (e) => typeof e == "number" && isNaN(e);
-var ct = (e) => at(e) || st(e) || Ce(e) || it(e) || nt(e) || $e(e);
-var ft = (e) => typeof e == "bigint";
-var dt = (e) => e === 1 / 0 || e === -1 / 0;
-var mt = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
-var pt = (e) => e instanceof URL;
-var xe = (e) => e.replace(/\./g, "\\.");
-var Y2 = (e) => e.map(String).map(xe).join(".");
+var X = (e) => k(e) && Object.keys(e).length === 0;
+var S = (e) => Array.isArray(e);
+var lt = (e) => typeof e == "string";
+var ft2 = (e) => typeof e == "number" && !isNaN(e);
+var dt = (e) => typeof e == "boolean";
+var mt = (e) => e instanceof RegExp;
+var L = (e) => e instanceof Map;
+var V = (e) => e instanceof Set;
+var Se = (e) => ut(e) === "Symbol";
+var pt = (e) => e instanceof Date && !isNaN(e.valueOf());
+var yt = (e) => e instanceof Error;
+var Fe = (e) => typeof e == "number" && isNaN(e);
+var gt = (e) => dt(e) || ct(e) || Me(e) || ft2(e) || lt(e) || Se(e);
+var ht = (e) => typeof e == "bigint";
+var bt = (e) => e === 1 / 0 || e === -1 / 0;
+var Ft = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView);
+var wt2 = (e) => e instanceof URL;
+var Te = (e) => e.replace(/\./g, "\\.");
+var Y2 = (e) => e.map(String).map(Te).join(".");
 var 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;
 };
-function $(e, r, t, s) {
+function A(e, r, t, s) {
   return {
     isApplicable: e,
     annotation: r,
@@ -366,11 +368,11 @@ function $(e, r, t, s) {
     untransform: s
   };
 }
-var Ae = [
-  $(Ce, "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) => {
+var Ne = [
+  A(Me, "undefined", () => null, () => {}),
+  A(ht, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  A(pt, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  A(yt, "Error", (e, r) => {
     const t = {
       name: e.name,
       message: e.message
@@ -384,17 +386,17 @@ var Ae = [
       t[s] = e[s];
     }), t;
   }),
-  $(ot, "regexp", (e) => "" + e, (e) => {
+  A(mt, "regexp", (e) => "" + e, (e) => {
     const r = e.slice(1, e.lastIndexOf("/")), t = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(r, t);
   }),
-  $(L2, "set", (e) => [...e.values()], (e) => new Set(e)),
-  $(_, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  $((e) => be2(e) || dt(e), "number", (e) => be2(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))
+  A(V, "set", (e) => [...e.values()], (e) => new Set(e)),
+  A(L, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  A((e) => Fe(e) || bt(e), "number", (e) => Fe(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  A((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  A(wt2, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function j2(e, r, t, s) {
+function J(e, r, t, s) {
   return {
     isApplicable: e,
     annotation: r,
@@ -402,13 +404,13 @@ function j2(e, r, t, s) {
     untransform: s
   };
 }
-var De = j2((e, r) => $e(e) ? !!r.symbolRegistry.getIdentifier(e) : false, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
+var Re = J((e, r) => Se(e) ? !!r.symbolRegistry.getIdentifier(e) : false, (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;
 });
-var yt = [
+var qt = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -419,19 +421,19 @@ var yt = [
   Float64Array,
   Uint8ClampedArray
 ].reduce((e, r) => (e[r.name] = r, e), {});
-var Me = j2(mt, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
-  const t = yt[r[1]];
+var Oe2 = J(Ft, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
+  const t = qt[r[1]];
   if (!t)
     throw new Error("Trying to deserialize unknown typed array");
   return new t(e);
 });
-function Ne(e, r) {
+function Ie(e, r) {
   return e != null && e.constructor ? !!r.classRegistry.getIdentifier(e.constructor) : false;
 }
-var Re = j2(Ne, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
+var ze = J(Ie, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
   const t = r.classRegistry.getAllowedProps(e.constructor);
   if (!t)
-    return b2({}, e);
+    return g2({}, e);
   const s = {};
   return t.forEach((n) => {
     s[n] = e[n];
@@ -442,53 +444,53 @@ var Re = j2(Ne, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)
     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);
 });
-var Se2 = j2((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) => {
+var Be = 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);
 });
-var gt2 = [Re, De, Se2, Me];
-var Fe = (e, r) => {
-  const t = he(gt2, (n) => n.isApplicable(e, r));
+var Et = [ze, Re, Be, Oe2];
+var we = (e, r) => {
+  const t = be2(Et, (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 = be2(Ne, (n) => n.isApplicable(e, r));
   if (s)
     return {
       value: s.transform(e, r),
       type: s.annotation
     };
 };
-var Oe = {};
-Ae.forEach((e) => {
-  Oe[e.annotation] = e;
+var Pe = {};
+Ne.forEach((e) => {
+  Pe[e.annotation] = e;
 });
-var ht = (e, r, t) => {
-  if (N(r))
+var Ct = (e, r, t) => {
+  if (S(r))
     switch (r[0]) {
       case "symbol":
-        return De.untransform(e, r, t);
-      case "class":
         return Re.untransform(e, r, t);
+      case "class":
+        return ze.untransform(e, r, t);
       case "custom":
-        return Se2.untransform(e, r, t);
+        return Be.untransform(e, r, t);
       case "typed-array":
-        return Me.untransform(e, r, t);
+        return Oe2.untransform(e, r, t);
       default:
         throw new Error("Unknown transformation: " + r);
     }
   else {
-    const s = Oe[r];
+    const s = Pe[r];
     if (!s)
       throw new Error("Unknown transformation: " + r);
     return s.untransform(e, t);
   }
 };
-var I = (e, r) => {
+var O = (e, r) => {
   if (r > e.size)
     throw new Error("index out of bounds");
   const t = e.keys();
@@ -496,23 +498,23 @@ var I = (e, r) => {
     t.next(), r--;
   return t.next().value;
 };
-function Te(e) {
-  if (U(e, "__proto__"))
+function ke(e) {
+  if (j2(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (U(e, "prototype"))
+  if (j2(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (U(e, "constructor"))
+  if (j2(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-var bt = (e, r) => {
-  Te(r);
+var $t = (e, r) => {
+  ke(r);
   for (let t = 0;t < r.length; t++) {
     const s = r[t];
-    if (L2(e))
-      e = I(e, +s);
-    else if (_(e)) {
-      const n = +s, a = +r[++t] == 0 ? "key" : "value", i = I(e, n);
-      switch (a) {
+    if (V(e))
+      e = O(e, +s);
+    else if (L(e)) {
+      const n = +s, o = +r[++t] == 0 ? "key" : "value", i = O(e, n);
+      switch (o) {
         case "key":
           e = i;
           break;
@@ -525,25 +527,25 @@ var bt = (e, r) => {
   }
   return e;
 };
-var X = (e, r, t) => {
-  if (Te(r), r.length === 0)
+var v = (e, r, t) => {
+  if (ke(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];
+  for (let o = 0;o < r.length - 1; o++) {
+    const i = r[o];
+    if (S(s)) {
+      const a = +i;
+      s = s[a];
     } else if (k(s))
       s = s[i];
-    else if (L2(s)) {
-      const o = +i;
-      s = I(s, o);
-    } else if (_(s)) {
-      if (a === r.length - 2)
+    else if (V(s)) {
+      const a = +i;
+      s = O(s, a);
+    } else if (L(s)) {
+      if (o === r.length - 2)
         break;
-      const u = +i, l = +r[++a] == 0 ? "key" : "value", p2 = I(s, u);
-      switch (l) {
+      const u = +i, c2 = +r[++o] == 0 ? "key" : "value", p2 = O(s, u);
+      switch (c2) {
         case "key":
           s = p2;
           break;
@@ -554,12 +556,12 @@ var X = (e, r, t) => {
     }
   }
   const n = r[r.length - 1];
-  if (N(s) ? s[+n] = t(s[+n]) : k(s) && (s[n] = t(s[n])), L2(s)) {
-    const a = I(s, +n), i = t(a);
-    a !== i && (s.delete(a), s.add(i));
+  if (S(s) ? s[+n] = t(s[+n]) : k(s) && (s[n] = t(s[n])), V(s)) {
+    const o = O(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 (L(s)) {
+    const o = +r[r.length - 2], i = O(s, o);
     switch (+n == 0 ? "key" : "value") {
       case "key": {
         const u = t(i);
@@ -574,155 +576,155 @@ var X = (e, r, t) => {
   }
   return e;
 };
-function v(e, r, t = []) {
+function ee(e, r, t = []) {
   if (!e)
     return;
-  if (!N(e)) {
-    B(e, (a, i) => v(a, r, [...t, ...P(i)]));
+  if (!S(e)) {
+    z2(e, (o, i) => ee(o, r, [...t, ...P(i)]));
     return;
   }
   const [s, n] = e;
-  n && B(n, (a, i) => {
-    v(a, r, [...t, ...P(i)]);
+  n && z2(n, (o, i) => {
+    ee(o, r, [...t, ...P(i)]);
   }), r(s, t);
 }
-function Ft(e, r, t) {
-  return v(r, (s, n) => {
-    e = X(e, n, (a) => ht(a, s, t));
+function At(e, r, t) {
+  return ee(r, (s, n) => {
+    e = v(e, n, (o) => Ct(o, s, t));
   }), e;
 }
-function wt(e, r) {
+function xt2(e, r) {
   function t(s, n) {
-    const a = bt(e, P(n));
+    const o = $t(e, P(n));
     s.map(P).forEach((i) => {
-      e = X(e, i, () => a);
+      e = v(e, i, () => o);
     });
   }
-  if (N(r)) {
+  if (S(r)) {
     const [s, n] = r;
-    s.forEach((a) => {
-      e = X(e, P(a), () => e);
-    }), n && B(n, t);
+    s.forEach((o) => {
+      e = v(e, P(o), () => e);
+    }), n && z2(n, t);
   } else
-    B(r, t);
+    z2(r, t);
   return e;
 }
-var qt = (e, r) => k(e) || N(e) || _(e) || L2(e) || Ne(e, r);
-function Et(e, r, t) {
+var Dt = (e, r) => k(e) || S(e) || L(e) || V(e) || Ie(e, r);
+function Mt(e, r, t) {
   const s = t.get(e);
   s ? s.push(r) : t.set(e, [r]);
 }
-function Ct2(e, r) {
+function St(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(Y2) : t[Y2(a)] = i.map(Y2);
-  }), s ? G(t) ? [s] : [s, t] : G(t) ? undefined : t;
-}
-var 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(Y2) : t[Y2(o)] = i.map(Y2);
+  }), s ? X(t) ? [s] : [s, t] : X(t) ? undefined : t;
+}
+var Le = (e, r, t, s, n = [], o = [], i = /* @__PURE__ */ new Map) => {
+  var x2;
+  const a = gt(e);
+  if (!a) {
+    Mt(e, n, r);
+    const f2 = i.get(e);
+    if (f2)
       return s ? {
         transformedValue: null
-      } : d;
+      } : f2;
   }
-  if (!qt(e, t)) {
-    const d = Fe(e, t), f2 = d ? {
-      transformedValue: d.value,
-      annotations: [d.type]
+  if (!Dt(e, t)) {
+    const f2 = we(e, t), d = f2 ? {
+      transformedValue: f2.value,
+      annotations: [f2.type]
     } : {
       transformedValue: e
     };
-    return o || i.set(e, f2), f2;
+    return a || i.set(e, d), d;
   }
-  if (U(a, e))
+  if (j2(o, e))
     return {
       transformedValue: null
     };
-  const u = Fe(e, t), l = (F = u == null ? undefined : u.value) != null ? F : e, p2 = N(l) ? [] : {}, m2 = {};
-  B(l, (d, f2) => {
-    if (f2 === "__proto__" || f2 === "constructor" || f2 === "prototype")
-      throw new Error(`Detected property ${f2}. This is a prototype pollution risk, please remove it from your object.`);
-    const w = Ie(d, r, t, s, [...n, f2], [...a, e], i);
-    p2[f2] = w.transformedValue, N(w.annotations) ? m2[f2] = w.annotations : k(w.annotations) && B(w.annotations, (T2, A) => {
-      m2[xe(f2) + "." + A] = T2;
+  const u = we(e, t), c2 = (x2 = u == null ? undefined : u.value) != null ? x2 : e, p2 = S(c2) ? [] : {}, m2 = {};
+  z2(c2, (f2, d) => {
+    if (d === "__proto__" || d === "constructor" || d === "prototype")
+      throw new Error(`Detected property ${d}. This is a prototype pollution risk, please remove it from your object.`);
+    const w = Le(f2, r, t, s, [...n, d], [...o, e], i);
+    p2[d] = w.transformedValue, S(w.annotations) ? m2[d] = w.annotations : k(w.annotations) && z2(w.annotations, ($, D) => {
+      m2[Te(d) + "." + D] = $;
     });
   });
-  const y = G(m2) ? {
+  const y = X(m2) ? {
     transformedValue: p2,
     annotations: u ? [u.type] : undefined
   } : {
     transformedValue: p2,
     annotations: u ? [u.type, m2] : m2
   };
-  return o || i.set(e, y), y;
+  return a || i.set(e, y), y;
 };
-function ze(e) {
+function Ve2(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function we(e) {
-  return ze(e) === "Array";
+function qe(e) {
+  return Ve2(e) === "Array";
 }
-function $t(e) {
-  if (ze(e) !== "Object")
+function Tt(e) {
+  if (Ve2(e) !== "Object")
     return false;
   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 Nt(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: false,
     writable: true,
     configurable: true
   });
 }
-function ee(e, r = {}) {
-  if (we(e))
-    return e.map((n) => ee(n, r));
-  if (!$t(e))
+function re(e, r = {}) {
+  if (qe(e))
+    return e.map((n) => re(n, r));
+  if (!Tt(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 (qe(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 = re(i, r);
+    return Nt(n, o, a, e, r.nonenumerable), n;
   }, {});
 }
 
-class c2 {
+class l {
   constructor({ dedupe: r = false } = {}) {
-    this.classRegistry = new Xr, this.symbolRegistry = new Ee((t) => {
+    this.classRegistry = new nt, this.symbolRegistry = new De((t) => {
       var s;
       return (s = t.description) != null ? s : "";
-    }), this.customTransformerRegistry = new rt, this.allowedErrorProps = [], this.dedupe = r;
+    }), this.customTransformerRegistry = new at, 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 = Le(r, t, this, this.dedupe), n = {
       json: s.transformedValue
     };
-    s.annotations && (n.meta = E3(b2({}, n.meta), {
+    s.annotations && (n.meta = h2(g2({}, n.meta), {
       values: s.annotations
     }));
-    const a = Ct2(t, this.dedupe);
-    return a && (n.meta = E3(b2({}, n.meta), {
-      referentialEqualities: a
+    const o = St(t, this.dedupe);
+    return o && (n.meta = h2(g2({}, 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;
+    let n = re(t);
+    return s != null && s.values && (n = At(n, s.values, this)), s != null && s.referentialEqualities && (n = xt2(n, s.referentialEqualities)), n;
   }
   stringify(r) {
     return JSON.stringify(this.serialize(r));
@@ -737,7 +739,7 @@ class c2 {
     this.symbolRegistry.register(r, t);
   }
   registerCustom(r, t) {
-    this.customTransformerRegistry.register(b2({
+    this.customTransformerRegistry.register(g2({
       name: t
     }, r));
   }
@@ -745,236 +747,240 @@ class c2 {
     this.allowedErrorProps.push(...r);
   }
 }
-c2.defaultInstance = new c2;
-c2.serialize = c2.defaultInstance.serialize.bind(c2.defaultInstance);
-c2.deserialize = c2.defaultInstance.deserialize.bind(c2.defaultInstance);
-c2.stringify = c2.defaultInstance.stringify.bind(c2.defaultInstance);
-c2.parse = c2.defaultInstance.parse.bind(c2.defaultInstance);
-c2.registerClass = c2.defaultInstance.registerClass.bind(c2.defaultInstance);
-c2.registerSymbol = c2.defaultInstance.registerSymbol.bind(c2.defaultInstance);
-c2.registerCustom = c2.defaultInstance.registerCustom.bind(c2.defaultInstance);
-c2.allowErrorProps = c2.defaultInstance.allowErrorProps.bind(c2.defaultInstance);
-var O = (e) => e === undefined ? L.None : e;
-var At = (e) => new m(e.metadataItem, e.type);
-var ie = (e) => new Qe(e.name, e.expression, e.type, e.description, O(e.sort), e.dataSource, e.composeCode);
-var ae = (e) => new Y(e.name, e.expression, e.granularity, e.format, e.description, O(e.sort), e.dataSource, e.composeCode);
+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);
+var R2 = (e) => e === undefined ? C.None : e;
+var Rt = (e) => new m(e.metadataItem, e.type);
+var ae = (e) => new Ve(e.name, e.expression, e.type, e.description, R2(e.sort), e.dataSource, e.composeCode);
+var ue = (e) => new Y(e.name, e.expression, e.granularity, e.format, e.description, R2(e.sort), e.dataSource, e.composeCode);
 var q3 = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return ie(e);
-    case "DimensionalLevelAttribute":
       return ae(e);
+    case "DimensionalLevelAttribute":
+      return ue(e);
     default:
       return e;
   }
 };
-var Be = (e) => new c(e.name, e.expression, e.attributes.map(q3), e.dimensions.map(Dt), e.type, e.description, O(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? q3(e.defaultAttribute) : undefined);
-var Pe = (e) => new p(e.name, e.expression, e.description, O(e.sort), e.dataSource, e.composeCode);
-var Dt = (e) => {
+var _e = (e) => new c(e.name, e.expression, e.attributes.map(q3), e.dimensions.map(Ot), e.type, e.description, R2(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? q3(e.defaultAttribute) : undefined);
+var Ue = (e) => new p(e.name, e.expression, e.description, R2(e.sort), e.dataSource, e.composeCode);
+var Ot = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Be(e);
+      return _e(e);
     case "DimensionalDateDimension":
-      return Pe(e);
+      return Ue(e);
     default:
       return e;
   }
 };
-var oe = (e) => new ye(e.name, q3(e.attribute), e.aggregation, e.format, e.description, O(e.sort), e.dataSource, e.composeCode);
-var ue = (e) => {
+var ce = (e) => new be(e.name, q3(e.attribute), e.aggregation, e.format, e.description, R2(e.sort), e.dataSource, e.composeCode);
+var le = (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)];
-        case "DimensionalLevelAttribute":
           return [t, ae(s)];
+        case "DimensionalLevelAttribute":
+          return [t, ue(s)];
         case "DimensionalBaseMeasure":
-          return [t, oe(s)];
+          return [t, ce(s)];
         case "DimensionalCalculatedMeasure":
-          return [t, ue(s)];
+          return [t, le(s)];
         default:
           return [t, s];
       }
     return [t, s];
   }));
-  return new Z(e.name, e.expression, r, e.format, e.description, O(e.sort), e.dataSource, e.composeCode);
+  return new Z(e.name, e.expression, r, e.format, e.description, R2(e.sort), e.dataSource, e.composeCode);
 };
-var ke = (e) => new Qt(e.name, q3(e.attribute), e.format, e.description, O(e.sort), e.dataSource, e.composeCode);
+var We = (e) => new Vt(e.name, q3(e.attribute), e.format, e.description, R2(e.sort), e.dataSource, e.composeCode);
 var H = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return oe(e);
+      return ce(e);
     case "DimensionalCalculatedMeasure":
-      return ue(e);
+      return le(e);
     case "DimensionalMeasureTemplate":
-      return ke(e);
+      return We(e);
     default:
       return e;
   }
 };
-var g2 = (e) => {
+var b2 = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new xd(q3(e.attribute), e.members, e.config.backgroundFilter ? E3(b2({}, e.config), { backgroundFilter: g2(e.config.backgroundFilter) }) : e.config, e.composeCode);
+      return new Ed(q3(e.attribute), e.members, e.config.backgroundFilter ? h2(g2({}, e.config), { backgroundFilter: b2(e.config.backgroundFilter) }) : e.config, e.composeCode);
     case "LogicalAttributeFilter":
-      return new Bi(e.filters.map((t) => g2(t)), e.operator, e.config, e.composeCode);
+      return new Fi(e.filters.map((t) => b2(t)), e.operator, e.config, e.composeCode);
     case "CascadingFilter":
-      return new wd(e._filters.map((t) => g2(t)), e.config, e.composeCode);
+      return new Od(e._filters.map((t) => b2(t)), e.config, e.composeCode);
     case "ExcludeFilter":
-      return new Nd(g2(e.filter), e.input ? g2(e.input) : undefined, e.config, e.composeCode);
+      return new _d(b2(e.filter), e.input ? b2(e.input) : undefined, e.config, e.composeCode);
     case "MeasureFilter":
-      return new Cd(q3(e.attribute), H(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new xd(q3(e.attribute), H(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "RankingFilter":
-      return new zi(q3(e.attribute), H(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Ui(q3(e.attribute), H(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "MeasureRankingFilter":
-      return new Hi(H(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Bi(H(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "NumericFilter":
-      return new Rd(q3(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new wd(q3(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "TextFilter":
       return new ne(q3(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
     case "DateRangeFilter": {
       const { valueA: t, valueB: s } = e;
-      return new Ld(q3(e.attribute), t, s, e.config, e.composeCode);
+      return new Nd(q3(e.attribute), t, s, e.config, e.composeCode);
     }
     case "RelativeDateFilter":
-      return new _r(q3(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
+      return new Or(q3(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
     case "CustomFilter":
-      return new Md(q3(e.attribute), e.jaqlExpression, e.config, e.composeCode);
+      return new Cd(q3(e.attribute), e.jaqlExpression, e.config, e.composeCode);
     default:
       return e;
   }
 };
-c2.registerCustom({
+l.registerCustom({
   isApplicable: h,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => At(e)
+  deserialize: (e) => Rt(e)
 }, "JaqlElement");
-c2.registerCustom({
-  isApplicable: dp,
+l.registerCustom({
+  isApplicable: fp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ie(e)
+  deserialize: (e) => ae(e)
 }, "DimensionalAttribute");
-c2.registerCustom({
-  isApplicable: gp,
+l.registerCustom({
+  isApplicable: dp,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ae(e)
+  deserialize: (e) => ue(e)
 }, "DimensionalLevelAttribute");
-c2.registerCustom({
+l.registerCustom({
   isApplicable: z,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Be(e)
+  deserialize: (e) => _e(e)
 }, "DimensionalDimension");
-c2.registerCustom({
+l.registerCustom({
   isApplicable: q,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Pe(e)
+  deserialize: (e) => Ue(e)
 }, "DimensionalDateDimension");
-c2.registerCustom({
-  isApplicable: ji,
+l.registerCustom({
+  isApplicable: Ii,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => oe(e)
+  deserialize: (e) => ce(e)
 }, "DimensionalBaseMeasure");
-c2.registerCustom({
-  isApplicable: kh,
+l.registerCustom({
+  isApplicable: Hh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ue(e)
+  deserialize: (e) => le(e)
 }, "DimensionalCalculatedMeasure");
-c2.registerCustom({
-  isApplicable: Wh,
+l.registerCustom({
+  isApplicable: kh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ke(e)
+  deserialize: (e) => We(e)
 }, "DimensionalMeasureTemplate");
-c2.registerCustom({
-  isApplicable: Vh,
+l.registerCustom({
+  isApplicable: Wh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "MembersFilter");
-c2.registerCustom({
-  isApplicable: Xh,
+l.registerCustom({
+  isApplicable: Yh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "LogicalAttributeFilter");
-c2.registerCustom({
-  isApplicable: Nt,
+l.registerCustom({
+  isApplicable: xt,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "CascadingFilter");
-c2.registerCustom({
-  isApplicable: Zh,
+l.registerCustom({
+  isApplicable: Jh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "ExcludeFilter");
-c2.registerCustom({
-  isApplicable: Yh,
+l.registerCustom({
+  isApplicable: Kh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "MeasureFilter");
-c2.registerCustom({
-  isApplicable: Kh,
+l.registerCustom({
+  isApplicable: Vh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "RankingFilter");
-c2.registerCustom({
-  isApplicable: Jh,
+l.registerCustom({
+  isApplicable: Qh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "MeasureRankingFilter");
-c2.registerCustom({
-  isApplicable: Qh,
+l.registerCustom({
+  isApplicable: Gh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "NumericFilter");
-c2.registerCustom({
-  isApplicable: tp,
+l.registerCustom({
+  isApplicable: Xh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "TextFilter");
-c2.registerCustom({
-  isApplicable: rp,
+l.registerCustom({
+  isApplicable: ep,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "DateRangeFilter");
-c2.registerCustom({
-  isApplicable: ep,
+l.registerCustom({
+  isApplicable: Zh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "RelativeDateFilter");
-c2.registerCustom({
-  isApplicable: Gh,
+l.registerCustom({
+  isApplicable: qh,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => g2(e)
+  deserialize: (e) => b2(e)
 }, "CustomFilter");
-var Fs = c2;
-var h2 = "DM.";
-function x2(e) {
+var Ps = l;
+var F = "DM.";
+function E3(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function le(e) {
-  return e.every(x2);
+function je(e) {
+  return e.every(E3);
 }
 function K(e) {
   return "attribute" in e && "config" in e;
 }
-function W(e) {
+function U(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function _e2(e) {
-  return !K(e) && !W(e);
+function fe(e) {
+  return !K(e) && !U(e);
+}
+function It(e) {
+  return typeof e == "object" && e !== null && "column" in e && typeof e.column == "string" && !(("function" in e) && ("args" in e));
 }
-function Mt(e) {
-  return e.every((r) => typeof r == "string");
+function zt(e) {
+  const r = e;
+  return typeof e != "object" || e === null || r === null || !("column" in r) ? false : E3(r.column);
 }
-function Nt2(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 Bt(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, c2) => c2.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,
@@ -983,34 +989,34 @@ function Nt2(e) {
     columnMap: s
   };
 }
-function Le(e, r) {
-  if (!e.startsWith(h2))
-    throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${h2}TableName.ColumnName[.Level]"`);
-  const t = e.slice(h2.length);
+function Je(e, r) {
+  if (!e.startsWith(F))
+    throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`);
+  const t = e.slice(F.length);
   if (!t)
-    throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${h2}TableName.ColumnName[.Level]"`);
+    throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`);
   let s, n;
   for (const m2 of r.sortedTables)
     if (t.startsWith(m2.name + ".")) {
       const y = t.slice(m2.name.length + 1);
       if (!y)
-        throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${h2}TableName.ColumnName[.Level]"`);
+        throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`);
       s = m2, n = y;
       break;
     }
   if (!s) {
     const m2 = t.indexOf(".");
     if (m2 === -1)
-      throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${h2}TableName.ColumnName[.Level]"`);
+      throw new Error(`Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`);
     const y = t.slice(0, m2);
     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;
+  let i, a;
   const u = g.all;
-  for (const m2 of a) {
+  for (const m2 of o) {
     if (n === m2.name)
       return { table: s, column: m2 };
     if (!n.startsWith(m2.name + "."))
@@ -1018,55 +1024,55 @@ function Le(e, r) {
     const y = n.slice(m2.name.length + 1);
     if (!y)
       continue;
-    const F = u.includes(y), d = Nr(m2.dataType);
-    if (F) {
-      if (d)
+    const x2 = u.includes(y), f2 = wr(m2.dataType);
+    if (x2) {
+      if (f2)
         return { table: s, column: m2, level: y };
-      i || (i = m2, o = y);
+      i || (i = m2, a = y);
       continue;
     }
-    d && !i && (i = m2, o = y);
+    f2 && !i && (i = m2, 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`) : new Error(`Invalid date level "${o}" in dimensional element "${e}". Valid levels are: ${u.join(", ")}`);
-  const l = n.indexOf("."), p2 = l === -1 ? n : n.slice(0, l);
+  if (i && a)
+    throw u.includes(a) ? new Error(`Invalid date level "${a}" in dimensional element "${e}". Column "${s.name}.${i.name}" is not a datetime column`) : new Error(`Invalid date level "${a}" in dimensional element "${e}". Valid levels are: ${u.join(", ")}`);
+  const c2 = n.indexOf("."), p2 = c2 === -1 ? n : n.slice(0, c2);
   throw new Error(`Column "${p2}" not found in table "${s.name}"`);
 }
-function Rt(e, r) {
-  const { table: t, column: s, level: n } = Le(e, r);
+function Pt(e, r) {
+  const { table: t, column: s, level: n } = Je(e, r);
   if (n) {
-    if (!Nr(s.dataType))
+    if (!wr(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 = g.all;
-    if (!a.includes(n))
-      throw new Error(`Invalid date level "${n}" in dimensional element "${e}". Valid levels are: ${a.join(", ")}`);
+    const o = g.all;
+    if (!o.includes(n))
+      throw new Error(`Invalid date level "${n}" in dimensional element "${e}". Valid levels are: ${o.join(", ")}`);
     const i = g.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 = g.timeOnly;
-    if (s.dataType === "time" && !o.includes(n))
+    const a = g.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) {
+function Ke(e) {
   return e.type === E.TextAttribute;
 }
-function We(e) {
+function Ge(e) {
   return e.type === E.NumericAttribute;
 }
-function St(e) {
+function kt(e) {
   return e.type === E.DateLevel;
 }
-function Ot(e) {
-  return Ve(e) || We(e);
+function Lt(e) {
+  return Ke(e) || Ge(e);
 }
-function Q(e) {
+function G(e) {
   return e.type === E.TextAttribute ? "text" : e.type === E.NumericAttribute ? "numeric" : e.type === E.DateLevel ? "date/datetime" : "unknown";
 }
-function ce(e, r, t) {
-  const { column: s, level: n } = Rt(e, t);
-  return Cr({
+function Q(e, r, t) {
+  const { column: s, level: n } = Pt(e, t);
+  return Nr({
     expression: s.expression,
     dataType: s.dataType,
     granularity: n,
@@ -1075,11 +1081,11 @@ function ce(e, r, t) {
     dataSource: r
   });
 }
-function Tt(e, r, t) {
-  const { column: s, level: n } = Le(e, t);
+function Vt2(e, r, t) {
+  const { column: s, level: n } = Je(e, t);
   if (n)
-    throw new Error(`Invalid DateDimension name format: "${e}". Expected format: "${h2}TableName.ColumnName"`);
-  if (!Nr(s.dataType))
+    throw new Error(`Invalid DateDimension name format: "${e}". Expected format: "${F}TableName.ColumnName"`);
+  if (!wr(s.dataType))
     throw new Error(`Invalid DateDimension name "${e}". Column "${s.name}" is not a datetime column (got ${s.dataType}).`);
   return x({
     name: s.name,
@@ -1091,11 +1097,31 @@ function M(e, r) {
   const t = e();
   return t.success ? t.data : (r.push(...t.errors), null);
 }
-var It = (e) => {
+var _t = (e, r, t) => {
+  if (!r)
+    return { attribute: e };
+  const s = typeof r == "object" ? r.direction : r;
+  return mp(s) ? { attribute: e.sort(ap(s)) } : {
+    attribute: e,
+    error: h2(g2({}, t), {
+      message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${s}".`
+    })
+  };
+};
+var Ut = (e, r, t, s) => {
+  const n = Q(e.column, r, t);
+  return _t(n, e.sortType, s);
+};
+var Wt = (e, r, t, s) => typeof e == "string" ? { attribute: Q(e, r, t) } : It(e) ? Ut(e, r, t, s) : {
+  error: h2(g2({}, s), {
+    message: 'Invalid dimension item. Expected a string (composeCode) or object with "column" and optional "sortType".'
+  })
+};
+var jt = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
   if (!r)
     return { success: true, data: [] };
-  if (!Mt(r))
+  if (!Array.isArray(r))
     return {
       success: false,
       errors: [
@@ -1103,68 +1129,118 @@ var 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 p2 = l instanceof Error ? l.message : "Unknown error";
-      a.push(E3(b2({}, u), { message: p2 }));
+      const c2 = Wt(i, t, s, u);
+      if (c2.error) {
+        o.push(c2.error);
+        return;
+      }
+      c2.attribute && n.push(c2.attribute);
+    } catch (c2) {
+      const p2 = c2 instanceof Error ? c2.message : "Unknown error";
+      o.push(h2(g2({}, u), { message: p2 }));
     }
-  }), a.length > 0 ? { success: false, errors: a } : { success: true, data: n };
+  }), o.length > 0 ? { success: false, errors: o } : { success: true, data: n };
 };
-function fe(e, r) {
+function de(e, r) {
   const t = Reflect.get(e, r);
   if (typeof t != "function")
     throw new Error(`Function "${r}" not found or is not a function`);
   return t;
 }
-function zt(e, r) {
-  const t = e.replace("measureFactory.", ""), n = fe(qh, t)(...r);
-  if (!_e2(n))
+function Jt2(e, r) {
+  const t = e.replace("measureFactory.", ""), n = de(zh, t)(...r);
+  if (!fe(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(Se, t)(...r);
-  if (!W(n))
+function Kt(e, r) {
+  const t = e.replace("filterFactory.logic.", ""), n = de(ye, t)(...r);
+  if (!U(n))
     throw new Error(`Function "${e}" did not return a valid FilterRelations`);
   return n;
 }
-function Pt(e, r) {
+function Gt(e, r) {
   if (e.startsWith("filterFactory.logic."))
-    return Bt(e, r);
-  const t = e.replace("filterFactory.", ""), n = fe(np, t)(...r);
-  if (!K(n) && !W(n))
+    return Kt(e, r);
+  const t = e.replace("filterFactory.", ""), n = de(tp, t)(...r);
+  if (!K(n) && !U(n))
     throw new Error(`Function "${e}" did not return a valid Filter or FilterRelations`);
   return n;
 }
-function kt(e, r) {
+function Qt(e, r) {
   const s = e.split(".")[0];
   if (s === "measureFactory")
-    return zt(e, r);
+    return Jt2(e, r);
   if (s === "filterFactory")
-    return Pt(e, r);
+    return Gt(e, r);
   throw new Error(`Unsupported factory: "${s}". Supported factories: measureFactory, filterFactory`);
 }
-var _t = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g;
-function Lt(e, r, t = {}) {
+var Yt = /\[(\w[\w.-]*)\]/g;
+var Qe = /* @__PURE__ */ new Set([
+  "AVG",
+  "COUNT",
+  "DUPCOUNT",
+  "LARGEST",
+  "MAX",
+  "MEDIAN",
+  "MIN",
+  "MODE",
+  "SUM",
+  "WTDAVG",
+  "WTDSUM",
+  "MTDAVG",
+  "MTDSUM",
+  "QTDAVG",
+  "QTDSUM",
+  "YTDAVG",
+  "YTDSUM",
+  "CORREL",
+  "COVARP",
+  "COVAR",
+  "SKEWP",
+  "SKEW",
+  "SLOPE"
+]);
+var Ht = new RegExp(`\\b(${Array.from(Qe).join("|")})\\s*\\(`, "i");
+function Zt(e) {
+  return E3(e) ? true : typeof e == "string" && e.startsWith(F) ? false : e && typeof e == "object" && ("kind" in e) ? e.kind === "measure" : true;
+}
+function Xt(e) {
+  const r = /\b(\w+)\s*\(/g, t = /* @__PURE__ */ new Set;
+  let s;
+  for (;(s = r.exec(e)) !== null; ) {
+    const n = s[1];
+    Qe.has(n.toUpperCase()) || t.add(n);
+  }
+  return Array.from(t);
+}
+function vt(e) {
+  return e.length === 1 ? `[${e[0]}]` : e.map((r) => `[${r}]`).join(", ");
+}
+function es(e) {
+  return e.length === 0 ? "" : e.length === 1 ? `${e[0]} is not an aggregative function. ` : `${e.join(", ")} are not aggregative functions. `;
+}
+var B = (e) => e.startsWith("[") ? e : `[${e}]`;
+var Ee = (e) => e.startsWith("[") && e.endsWith("]") ? e.slice(1, -1) : e;
+function rs(e, r, t = {}) {
   const {
     warnUnusedContext: s = true,
     errorOnUnusedContext: n = true,
-    allowEmptyFormula: a = false,
+    allowEmptyFormula: o = false,
     errorPrefix: i = "customFormula validation"
-  } = t, o = {
+  } = t, a = {
     isValid: true,
     errors: [],
     warnings: [],
@@ -1172,138 +1248,140 @@ 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 = false), o;
-  const u = /\b\w+\s*\[/gi, l = e.match(u);
-  if (l) {
-    const f2 = l[0].replace(/\s*\[.*$/, "");
-    o.errors.push(`${i}args[1]: Invalid syntax: '${f2}' - operator cannot be used before bracket reference without parentheses`), o.isValid = false;
-  }
-  const p2 = _t, m2 = /* @__PURE__ */ new Set;
-  let y;
-  for (;(y = p2.exec(e)) !== null; ) {
-    const f2 = y[1];
-    m2.add(f2);
-  }
-  o.references = Array.from(m2);
-  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 false;
-    const D = r[A];
-    return x2(D) ? false : typeof D == "string" && D.startsWith(h2) ? true : D && typeof D == "object" && ("kind" in D) ? D.kind !== "measure" : false;
-  }) && (o.errors.push(`${i}args[1]: Formulas with bracket references must contain aggregate function calls`), o.isValid = false)), o.references.length === 0)
-    return o.warnings.push(`${i}args[1]: No bracket references found in formula - ensure this is intentional`), o;
-  if (F.length === 0)
-    return o.errors.push(`${i}args[2]: Context cannot be empty - custom formulas require context definitions`), o.isValid = false, o;
-  const d = [];
-  for (const f2 of o.references)
-    F.includes(f2) || d.push(f2);
-  if (d.length > 0 && (o.isValid = false, d.length === 1 ? o.errors.push(`${i}args[1]: Reference [${d[0]}] not found in context. Available keys: ${F.join(", ")}`) : o.errors.push(`${i}args[1]: References [${d.join("], [")}] not found in context. Available keys: ${F.join(", ")}`)), (s || n) && F.length > 0) {
-    const f2 = F.filter((w) => !o.references.includes(w));
-    if (o.unusedContextKeys = f2, f2.length > 0) {
-      const w = `${i}args[2]: Context keys [${f2.join(", ")}] are defined but not used in formula`;
-      n ? (o.errors.push(w), o.isValid = false) : s && o.warnings.push(w);
+    return o || (a.errors.push(`${i}args[1]: Formula cannot be empty`), a.isValid = false), a;
+  const u = /\b\w+\s*\[/gi, c2 = e.match(u);
+  if (c2) {
+    const f2 = c2[0].replace(/\s*\[.*$/, "");
+    a.errors.push(`${i}args[1]: Invalid syntax: '${f2}' - operator cannot be used before bracket reference without parentheses`), a.isValid = false;
+  }
+  a.references = [
+    ...new Set([...e.matchAll(new RegExp(Yt.source, "g"))].map((f2) => f2[1]))
+  ];
+  const p2 = Object.keys(r);
+  if (a.references.length === 0)
+    return a.warnings.push(`${i}args[1]: No bracket references found in formula - ensure this is intentional`), a;
+  if (p2.length === 0)
+    return a.errors.push(`${i}args[2]: Context cannot be empty - custom formulas require context definitions`), a.isValid = false, a;
+  const m2 = new Set(p2.map(B)), y = a.references.filter((f2) => !m2.has(B(f2)));
+  if (y.length > 0) {
+    a.isValid = false;
+    const f2 = p2.map((d) => `[${Ee(d)}]`).join(", ");
+    y.length === 1 ? a.errors.push(`${i}args[1]: Reference [${y[0]}] not found in context. Available keys: ${f2}`) : a.errors.push(`${i}args[1]: References [${y.join("], [")}] not found in context. Available keys: ${f2}`);
+  }
+  if (!Ht.test(e)) {
+    const f2 = a.references.filter((d) => {
+      var $;
+      const w = ($ = r[B(d)]) != null ? $ : r[d];
+      return w !== undefined && !Zt(w);
+    });
+    f2.length > 0 && (a.errors.push(`${i}args[1]: ${es(Xt(e))}Bracket reference(s) ${vt(f2)} point to raw attributes and must be wrapped in an aggregative function (e.g. SUM, AVG)`), a.isValid = false);
+  }
+  if ((s || n) && p2.length > 0) {
+    const f2 = new Set(a.references.map(B)), d = p2.filter((w) => !f2.has(B(w)));
+    if (a.unusedContextKeys = d, d.length > 0) {
+      const w = d.map((D) => `[${Ee(D)}]`).join(", "), $ = `${i}args[2]: Context keys ${w} are defined but not used in formula`;
+      n ? (a.errors.push($), a.isValid = false) : s && a.warnings.push($);
     }
   }
-  return o;
+  return a;
 }
-function Vt(e, r, t = {}) {
-  const s = Lt(e, r, t);
+function ts(e, r, t = {}) {
+  const s = rs(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 ss(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, {
+  ts(t, s, {
     errorPrefix: `${r.pathPrefix}`,
     errorOnUnusedContext: true,
     allowEmptyFormula: false
   });
   const n = {};
-  for (const [a, i] of Object.entries(s)) {
-    const o = `args[2].${a}`;
-    if (x2(i))
-      n[`${a}`] = C({
+  for (const [o, i] of Object.entries(s)) {
+    const a = `args[2].${o}`;
+    if (E3(i))
+      n[`${o}`] = C2({
         data: i,
         context: {
           dataSource: r.dataSource,
           schemaIndex: r.schemaIndex,
-          pathPrefix: o
+          pathPrefix: a
         }
       });
-    else if (typeof i == "string" && i.startsWith(h2))
+    else if (typeof i == "string" && i.startsWith(F))
       try {
-        n[`${a}`] = ce(i, r.dataSource, r.schemaIndex);
+        n[`${o}`] = Q(i, r.dataSource, r.schemaIndex);
       } catch (u) {
-        const l = u instanceof Error ? u.message : "Unknown error";
-        throw new Error(`${o}: ${l}`);
+        const c2 = u instanceof Error ? u.message : "Unknown error";
+        throw new Error(`${a}: ${c2}`);
       }
     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 (${h2}...), but got: ${typeof i}`);
+      throw new Error(`${a}: Invalid context value for key '${o}'. Expected a function call or attribute reference (${F}...), but got: ${typeof i}`);
   }
   e[2] = n;
 }
-function de(e, r) {
+function me2(e, r) {
   const t = e[0];
   if (!t || typeof t != "object" || !("type" in t))
     throw new Error(`${r.pathPrefix}args[0]: Expected attribute as first argument`);
   return t;
 }
-function qe(e, r) {
-  const t = de(e, r);
-  if (!Ot(t))
-    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${Q(t)} attribute`);
+function Ce(e, r) {
+  const t = me2(e, r);
+  if (!Lt(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${G(t)} attribute`);
 }
-function R2(e, r) {
-  const t = de(e, r);
-  if (!We(t))
-    throw new Error(`${r.pathPrefix}args[0]: Attribute must be numeric type, got ${Q(t)} attribute`);
+function T2(e, r) {
+  const t = me2(e, r);
+  if (!Ge(t))
+    throw new Error(`${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))
-    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string type, got ${Q(t)} attribute`);
+function N(e, r) {
+  const t = me2(e, r);
+  if (!Ke(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string type, got ${G(t)} attribute`);
 }
-function Jt(e, r) {
+function ns(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);
-  if (!Vh(t))
+function is(e, r) {
+  const t = ns(e, r);
+  if (!Wh(t))
     throw new Error(`${r.pathPrefix}args[0]: exclude filter only accepts members filter, got ${t.__serializable || "unknown"} filter`);
 }
-var jt = {
-  "measureFactory.customFormula": Wt,
-  "filterFactory.equals": qe,
-  "filterFactory.doesntEqual": qe,
-  "filterFactory.greaterThan": R2,
-  "filterFactory.greaterThanOrEqual": R2,
-  "filterFactory.lessThan": R2,
-  "filterFactory.lessThanOrEqual": R2,
-  "filterFactory.between": R2,
-  "filterFactory.betweenNotEqual": R2,
-  "filterFactory.numeric": R2,
-  "filterFactory.contains": S,
-  "filterFactory.doesntContain": S,
-  "filterFactory.startsWith": S,
-  "filterFactory.doesntStartWith": S,
-  "filterFactory.endsWith": S,
-  "filterFactory.doesntEndWith": S,
-  "filterFactory.like": S,
-  "filterFactory.exclude": Ut
+var os = {
+  "measureFactory.customFormula": ss,
+  "filterFactory.equals": Ce,
+  "filterFactory.doesntEqual": Ce,
+  "filterFactory.greaterThan": T2,
+  "filterFactory.greaterThanOrEqual": T2,
+  "filterFactory.lessThan": T2,
+  "filterFactory.lessThanOrEqual": T2,
+  "filterFactory.between": T2,
+  "filterFactory.betweenNotEqual": T2,
+  "filterFactory.numeric": T2,
+  "filterFactory.contains": N,
+  "filterFactory.doesntContain": N,
+  "filterFactory.startsWith": N,
+  "filterFactory.doesntStartWith": N,
+  "filterFactory.endsWith": N,
+  "filterFactory.doesntEndWith": N,
+  "filterFactory.like": N,
+  "filterFactory.exclude": is
 };
-function Kt(e) {
-  return jt[`${e}`];
+function as(e) {
+  return os[`${e}`];
 }
-var Qt2 = {
+var us = {
   "measureFactory.sum": [
     { type: "Attribute", required: true },
     { type: "string", required: false },
@@ -1722,18 +1800,18 @@ var Qt2 = {
     { type: "FilterRelationsNode", required: true }
   ]
 };
-function me(e) {
-  return Qt2[`${e}`];
+function pe(e) {
+  return us[`${e}`];
 }
-function Yt2(e) {
-  const r = me(e);
+function cs(e) {
+  const r = pe(e);
   return r ? r.filter((t) => t.required).length : 0;
 }
-function Ht(e) {
-  const r = me(e);
+function ls(e) {
+  const r = pe(e);
   return r ? r.length : 0;
 }
-function Zt(e) {
+function fs(e) {
   if (typeof e != "string" || !/^\d{4}-\d{2}-\d{2}/.test(e))
     return false;
   const t = Date.parse(e);
@@ -1743,259 +1821,260 @@ function Zt(e) {
   return !isNaN(s.getTime());
 }
 function Z2(e, r, t, s) {
-  if (e.startsWith(h2))
+  if (e.startsWith(F))
     try {
-      return ce(e, r, t);
+      return Q(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: "${h2}TableName.ColumnName[.Level]"`);
+  throw new Error(`${s}: Invalid attribute "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`);
 }
-function Gt(e, r, t, s) {
-  if (e.startsWith(h2))
+function ds(e, r, t, s) {
+  if (e.startsWith(F))
     try {
-      return Tt(e, r, t);
+      return Vt2(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: "${h2}TableName.ColumnName"`);
+  throw new Error(`${s}: Invalid date dimension string "${e}". Expected format: "${F}TableName.ColumnName"`);
 }
-function Xt(e) {
-  const r = e.data, { argSchema: t, dataSource: s, schemaIndex: n, pathPrefix: a } = e.context, i = a;
+function ms(e) {
+  const r = e.data, { argSchema: t, dataSource: s, schemaIndex: n, pathPrefix: o } = e.context, i = o;
   if (r === undefined) {
     if (t.required)
       throw new Error(`${i}: Required argument is missing (expected ${t.type})`);
     return;
   }
-  switch (t.type) {
-    case "string":
-      if (typeof r != "string")
-        throw new Error(`${i}: Expected string, got ${typeof r}`);
-      return r;
-    case "number":
-      if (typeof r != "number")
-        throw new Error(`${i}: Expected number, got ${typeof r}`);
-      return r;
-    case "boolean":
-      if (typeof r != "boolean")
-        throw new Error(`${i}: Expected boolean, got ${typeof r}`);
-      return r;
-    case "string[]":
-      if (!Array.isArray(r))
-        throw new Error(`${i}: Expected array of strings, got ${typeof r}. Example: ["value1", "value2"]`);
-      if (!r.every((o) => typeof o == "string"))
-        throw new Error(`${i}: Expected array of strings, but contains non-string values`);
-      return r;
-    case "number[]":
-      if (!Array.isArray(r))
-        throw new Error(`${i}: Expected array of numbers, got ${typeof r}. Example: [10, 20]`);
-      if (!r.every((o) => typeof o == "number"))
-        throw new Error(`${i}: Expected array of numbers, but contains non-number values`);
-      return r;
-    case "Attribute":
-      if (typeof r != "string")
-        throw new Error(`${i}: Expected attribute string, got ${typeof r}. Example: "DM.Commerce.Revenue"`);
-      return Z2(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 Z2(o, s, n, `${i}[${u}]`);
-      });
-    case "Measure":
-    case "BaseMeasure":
-      if (!x2(r))
-        throw new Error(`${i}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`);
-      return C({
-        data: r,
-        context: { dataSource: s, schemaIndex: n, pathPrefix: i }
-      });
-    case "Measure[]":
-      if (!Array.isArray(r))
-        throw new Error(`${i}: Expected array of measure function calls, got ${typeof r}`);
-      return r.map((o, u) => {
-        if (!x2(o))
-          throw new Error(`${i}[${u}]: Expected measure function call, got ${typeof o}`);
-        return C({
-          data: o,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+  if (!(r === null && !t.required))
+    switch (t.type) {
+      case "string":
+        if (typeof r != "string")
+          throw new Error(`${i}: Expected string, got ${typeof r}`);
+        return r;
+      case "number":
+        if (typeof r != "number")
+          throw new Error(`${i}: Expected number, got ${typeof r}`);
+        return r;
+      case "boolean":
+        if (typeof r != "boolean")
+          throw new Error(`${i}: Expected boolean, got ${typeof r}`);
+        return r;
+      case "string[]":
+        if (!Array.isArray(r))
+          throw new Error(`${i}: Expected array of strings, got ${typeof r}. Example: ["value1", "value2"]`);
+        if (!r.every((a) => typeof a == "string"))
+          throw new Error(`${i}: Expected array of strings, but contains non-string values`);
+        return r;
+      case "number[]":
+        if (!Array.isArray(r))
+          throw new Error(`${i}: Expected array of numbers, got ${typeof r}. Example: [10, 20]`);
+        if (!r.every((a) => typeof a == "number"))
+          throw new Error(`${i}: Expected array of numbers, but contains non-number values`);
+        return r;
+      case "Attribute":
+        if (typeof r != "string")
+          throw new Error(`${i}: Expected attribute string, got ${typeof r}. Example: "DM.Commerce.Revenue"`);
+        return Z2(r, s, n, i);
+      case "Attribute[]":
+        if (!Array.isArray(r))
+          throw new Error(`${i}: Expected array of attributes, got ${typeof r}. Example: ["DM.Commerce.AgeRange"]`);
+        return r.map((a, u) => {
+          if (typeof a != "string")
+            throw new Error(`${i}[${u}]: Expected attribute string, got ${typeof a}`);
+          return Z2(a, s, n, `${i}[${u}]`);
         });
-      });
-    case "Filter":
-      if (!x2(r))
-        throw new Error(`${i}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`);
-      return C({
-        data: r,
-        context: { dataSource: s, schemaIndex: n, pathPrefix: i }
-      });
-    case "Filter[]":
-      if (!Array.isArray(r))
-        throw new Error(`${i}: Expected array of filter function calls, got ${typeof r}`);
-      return r.map((o, u) => {
-        if (!x2(o))
-          throw new Error(`${i}[${u}]: Expected filter function call, got ${typeof o}`);
-        return C({
-          data: o,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+      case "Measure":
+      case "BaseMeasure":
+        if (!E3(r))
+          throw new Error(`${i}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`);
+        return C2({
+          data: r,
+          context: { dataSource: s, schemaIndex: n, pathPrefix: i }
         });
-      });
-    case "FilterRelationsNode":
-      if (Array.isArray(r))
-        return r.map((o, u) => {
-          if (!x2(o))
-            throw new Error(`${i}[${u}]: Expected filter function call, got ${typeof o}`);
-          return C({
-            data: o,
+      case "Measure[]":
+        if (!Array.isArray(r))
+          throw new Error(`${i}: Expected array of measure function calls, got ${typeof r}`);
+        return r.map((a, u) => {
+          if (!E3(a))
+            throw new Error(`${i}[${u}]: Expected measure function call, got ${typeof a}`);
+          return C2({
+            data: a,
             context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
           });
         });
-      if (x2(r))
-        return C({
+      case "Filter":
+        if (!E3(r))
+          throw new Error(`${i}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`);
+        return C2({
           data: r,
           context: { dataSource: s, schemaIndex: n, pathPrefix: i }
         });
-      throw new Error(`${i}: Expected filter function call or array of filters, got ${typeof r}`);
-    case "DateDimension":
-      if (typeof r != "string")
-        throw new Error(`${i}: Expected date dimension string, got ${typeof r}. Example: "DM.Commerce.Date"`);
-      return Gt(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 = Z2(r, s, n, i);
-      if (!St(o))
-        throw new Error(`${i}: Attribute must be date/datetime type, got ${Q(o)} attribute`);
-      return o;
-    }
-    case "Measure | number":
-      if (typeof r == "number")
-        return r;
-      if (x2(r))
-        return C({
-          data: r,
-          context: { dataSource: s, schemaIndex: n, pathPrefix: i }
+      case "Filter[]":
+        if (!Array.isArray(r))
+          throw new Error(`${i}: Expected array of filter function calls, got ${typeof r}`);
+        return r.map((a, u) => {
+          if (!E3(a))
+            throw new Error(`${i}[${u}]: Expected filter function call, got ${typeof a}`);
+          return C2({
+            data: a,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+          });
         });
-      throw new Error(`${i}: Expected measure function call or number, got ${typeof r}`);
-    case "Date | string":
-      if (typeof r == "string") {
-        if (Zt(r))
+      case "FilterRelationsNode":
+        if (Array.isArray(r))
+          return r.map((a, u) => {
+            if (!E3(a))
+              throw new Error(`${i}[${u}]: Expected filter function call, got ${typeof a}`);
+            return C2({
+              data: a,
+              context: { dataSource: s, schemaIndex: n, pathPrefix: `${i}[${u}]` }
+            });
+          });
+        if (E3(r))
+          return C2({
+            data: r,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: i }
+          });
+        throw new Error(`${i}: Expected filter function call or array of filters, got ${typeof r}`);
+      case "DateDimension":
+        if (typeof r != "string")
+          throw new Error(`${i}: Expected date dimension string, got ${typeof r}. Example: "DM.Commerce.Date"`);
+        return ds(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 a = Z2(r, s, n, i);
+        if (!kt(a))
+          throw new Error(`${i}: Attribute must be date/datetime type, got ${G(a)} attribute`);
+        return a;
+      }
+      case "Measure | number":
+        if (typeof r == "number")
           return r;
-        throw new Error(`${i}: Expected valid ISO date string or Date object, got invalid date string "${r}"`);
-      } else {
-        if (r instanceof Date)
+        if (E3(r))
+          return C2({
+            data: r,
+            context: { dataSource: s, schemaIndex: n, pathPrefix: i }
+          });
+        throw new Error(`${i}: Expected measure function call or number, got ${typeof r}`);
+      case "Date | string":
+        if (typeof r == "string") {
+          if (fs(r))
+            return r;
+          throw new Error(`${i}: Expected valid ISO date string or Date object, got invalid date string "${r}"`);
+        } else {
+          if (r instanceof Date)
+            return r;
+          throw new Error(`${i}: Expected date string or Date object, got ${typeof r}`);
+        }
+      case "string | number":
+        if (typeof r == "string" || typeof r == "number")
           return r;
-        throw new Error(`${i}: Expected date string or Date object, got ${typeof r}`);
-      }
-    case "string | number":
-      if (typeof r == "string" || typeof r == "number")
+        throw new Error(`${i}: Expected string or number, got ${typeof r}`);
+      case "BaseFilterConfig":
+      case "MembersFilterConfig":
+      case "CustomFormulaContext":
+      case "any":
+        if (r == null && t.required)
+          throw new Error(`${i}: Required argument is null/undefined`);
         return r;
-      throw new Error(`${i}: Expected string or number, got ${typeof r}`);
-    case "BaseFilterConfig":
-    case "MembersFilterConfig":
-    case "CustomFormulaContext":
-    case "any":
-      if (r == null && t.required)
-        throw new Error(`${i}: Required argument is null/undefined`);
-      return r;
-    default:
-      return r;
-  }
+      default:
+        return r;
+    }
 }
-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);
+function C2(e) {
+  const { data: r } = e, { dataSource: t, schemaIndex: s, pathPrefix: n } = e.context, { function: o, args: i } = r, a = n ? `${n}.` : "", u = pe(o);
   if (!u)
-    throw new Error(`${o}function: Unknown function "${a}"`);
-  const l = Yt2(a), p2 = Ht(a);
-  if (i.length < l)
-    throw new Error(`${o}function: Expected at least ${l} arguments, got ${i.length}`);
+    throw new Error(`${a}function: Unknown function "${o}"`);
+  const c2 = cs(o), p2 = ls(o);
+  if (i.length < c2)
+    throw new Error(`${a}function: Expected at least ${c2} arguments, got ${i.length}`);
   if (i.length > p2)
-    throw new Error(`${o}function: Expected at most ${p2} arguments, got ${i.length}`);
+    throw new Error(`${a}function: Expected at most ${p2} arguments, got ${i.length}`);
   const m2 = [], y = [];
-  for (let d = 0;d < Math.max(i.length, u.length); d++) {
-    const f2 = u[`${d}`], w = i[`${d}`], T2 = o ? `${o}args[${d}]` : `args[${d}]`;
+  for (let f2 = 0;f2 < Math.max(i.length, u.length); f2++) {
+    const d = u[`${f2}`], w = i[`${f2}`], $ = a ? `${a}args[${f2}]` : `args[${f2}]`;
     if (w === undefined) {
-      f2 != null && f2.required && y.push(`${T2}: Missing required argument (expected ${f2.type})`);
+      d != null && d.required && y.push(`${$}: Missing required argument (expected ${d.type})`);
       continue;
     }
-    if (!f2) {
-      y.push(`${T2}: Unexpected argument`);
+    if (!d) {
+      y.push(`${$}: Unexpected argument`);
       continue;
     }
     try {
-      const A = Xt({
+      const D = ms({
         data: w,
         context: {
           dataSource: t,
           schemaIndex: s,
-          pathPrefix: T2,
-          argSchema: f2
+          pathPrefix: $,
+          argSchema: d
         }
       });
-      m2.push(A);
-    } catch (A) {
-      const D = A instanceof Error ? A.message : "Unknown error";
-      y.push(D);
+      m2.push(D);
+    } catch (D) {
+      const ve = D instanceof Error ? D.message : "Unknown error";
+      y.push(ve);
     }
   }
   if (y.length > 0) {
-    const d = y.join("; ");
-    throw new Error(d);
+    const f2 = y.join("; ");
+    throw new Error(f2);
   }
-  const F = Kt(a);
-  if (F)
+  const x2 = as(o);
+  if (x2)
     try {
-      F(m2, {
+      x2(m2, {
         dataSource: t,
         schemaIndex: s,
-        pathPrefix: o
+        pathPrefix: a
       });
-    } catch (d) {
-      const f2 = d instanceof Error ? d.message : "Unknown validation error";
-      throw new Error(f2);
+    } catch (f2) {
+      const d = f2 instanceof Error ? f2.message : "Unknown validation error";
+      throw new Error(d);
     }
-  return kt(a, m2);
+  return Qt(o, m2);
 }
-function Je(e) {
+function Ye(e) {
   const { attribute: r, config: t } = e;
-  if (Vh(e) && mp(r)) {
-    const { granularity: s } = r, n = e.members.map((o) => s === "Years" && !isNaN(Number(o)) ? `${o}-01-01T00:00:00` : o), a = Fi(t), i = Object.keys(a).length === 0 ? undefined : a;
-    return Ct(r, n, i);
+  if (Wh(e) && pp(r)) {
+    const { granularity: s } = r, n = e.members.map((a) => s === "Years" && !isNaN(Number(a)) ? `${a}-01-01T00:00:00` : a), o = ji(t), i = Object.keys(o).length === 0 ? undefined : o;
+    return wt(r, n, i);
   }
   return e;
 }
-function vt(e) {
+function ps(e) {
   let r = [];
   for (const t of e)
-    W(t) ? r = bp(t, r) : r = bp([Je(t)], r);
+    U(t) ? r = bp(t, r) : r = bp([Ye(t)], r);
   return r != null ? r : [];
 }
-var es = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+var ys2 = (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 c2 = C2({
         data: i,
         context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
       });
-      !W(l) && !K(l) ? a.push(E3(b2({}, u), { message: "Invalid filter JSON" })) : n.push(l);
-    } catch (l) {
-      const p2 = l instanceof Error ? l.message : "Unknown error";
-      a.push(E3(b2({}, u), { message: p2 }));
+      !U(c2) && !K(c2) ? o.push(h2(g2({}, u), { message: "Invalid filter JSON" })) : n.push(c2);
+    } catch (c2) {
+      const p2 = c2 instanceof Error ? c2.message : "Unknown error";
+      o.push(h2(g2({}, u), { message: p2 }));
     }
-  }), a.length > 0 ? { success: false, errors: a } : { success: true, data: vt(n) };
+  }), o.length > 0 ? { success: false, errors: o } : { success: true, data: ps(n) };
 };
-var rs = (e) => {
+var gs = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? le(r) ? es({
+  return r ? je(r) ? ys2({
     data: r,
     context: { dataSource: t, schemaIndex: s }
   }) : {
@@ -2010,29 +2089,29 @@ var rs = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var ts = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+var hs = (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 c2 = C2({
         data: i,
         context: { dataSource: t, schemaIndex: s, pathPrefix: "" }
       });
-      K(l) ? n.push(Je(l)) : a.push(E3(b2({}, u), { message: "Invalid filter JSON" }));
-    } catch (l) {
-      const p2 = l instanceof Error ? l.message : "Unknown error";
-      a.push(E3(b2({}, u), { message: p2 }));
+      K(c2) ? n.push(Ye(c2)) : o.push(h2(g2({}, u), { message: "Invalid filter JSON" }));
+    } catch (c2) {
+      const p2 = c2 instanceof Error ? c2.message : "Unknown error";
+      o.push(h2(g2({}, u), { message: p2 }));
     }
-  }), a.length > 0 ? { success: false, errors: a } : { success: true, data: n };
+  }), o.length > 0 ? { success: false, errors: o } : { success: true, data: n };
 };
-var ss = (e) => {
+var bs = (e) => {
   const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
-  return r ? le(r) ? ts({
+  return r ? je(r) ? hs({
     data: r,
     context: { dataSource: t, schemaIndex: s }
   }) : {
@@ -2047,73 +2126,117 @@ var ss = (e) => {
     ]
   } : { success: true, data: [] };
 };
-var ns = (e) => {
-  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context, n = [], a = [];
-  return r.forEach((i, o) => {
+var Fs = (e, r, t) => {
+  const { dataSource: s, schemaIndex: n } = r;
+  try {
+    const o = C2({
+      data: e,
+      context: { dataSource: s, schemaIndex: n, pathPrefix: "" }
+    });
+    return fe(o) ? { success: true, data: o } : {
+      success: false,
+      errors: [h2(g2({}, t), { message: "Invalid measure JSON" })]
+    };
+  } catch (o) {
+    const i = o instanceof Error ? o.message : "Unknown error";
+    return {
+      success: false,
+      errors: [h2(g2({}, t), { message: i })]
+    };
+  }
+};
+var ws = (e, r, t) => r ? mp(r) ? { measure: e.sort(ap(r)) } : {
+  measure: e,
+  error: h2(g2({}, t), {
+    message: `Invalid sort type. Expected "sortAsc", "sortDesc", or "sortNone". Got: "${r}".`
+  })
+} : { measure: e };
+var qs = (e, r, t, s) => {
+  const n = C2({
+    data: e.column,
+    context: { dataSource: r, schemaIndex: t, pathPrefix: "" }
+  });
+  return fe(n) ? ws(n, e.sortType, s) : { error: h2(g2({}, s), { message: "Invalid measure JSON" }) };
+};
+var Es = (e, r, t, s) => {
+  if (zt(e))
+    return qs(e, r, t, s);
+  if (E3(e)) {
+    const n = Fs(e, { dataSource: r, schemaIndex: t }, s);
+    return n.success ? { measure: n.data } : { error: n.errors[0] };
+  }
+  return {
+    error: h2(g2({}, s), {
+      message: 'Invalid measure item. Expected a function call (function/args) or object with "column" and optional "sortType".'
+    })
+  };
+};
+var Cs = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: s } = e.context;
+  if (!r)
+    return { success: true, data: [] };
+  if (!Array.isArray(r))
+    return {
+      success: false,
+      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: "" }
-      });
-      _e2(l) ? n.push(l) : a.push(E3(b2({}, u), { message: "Invalid measure JSON" }));
-    } catch (l) {
-      const p2 = l instanceof Error ? l.message : "Unknown error";
-      a.push(E3(b2({}, u), { message: p2 }));
-    }
-  }), a.length > 0 ? { success: false, errors: a } : { success: true, data: n };
-};
-var 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: false,
-    errors: [
-      {
-        category: "measures",
-        index: -1,
-        input: r,
-        message: 'Invalid measures JSON. Expected an array of function calls with "function" and "args" properties.'
+      const c2 = Es(i, t, s, u);
+      if (c2.error) {
+        o.push(c2.error);
+        return;
       }
-    ]
-  } : { success: true, data: [] };
+      c2.measure && n.push(c2.measure);
+    } catch (c2) {
+      const p2 = c2 instanceof Error ? c2.message : "Unknown error";
+      o.push(h2(g2({}, u), { message: p2 }));
+    }
+  }), o.length > 0 ? { success: false, errors: o } : { success: true, data: n };
 };
-var ws = (e) => {
-  const { data: r } = e, { dataSource: t, tables: s } = e.context, n = Nt2(s), a = [], i = M(() => It({
+var ks = (e) => {
+  const { data: r } = e, { dataSource: t, tables: s } = e.context, n = Bt(s), o = [], i = M(() => jt({
     data: r.dimensions || [],
     context: { dataSource: t, schemaIndex: n }
-  }), a), o = M(() => is({
+  }), o), a = M(() => Cs({
     data: r.measures || [],
     context: { dataSource: t, schemaIndex: n }
-  }), a), u = M(() => rs({
+  }), o), u = M(() => gs({
     data: r.filters || [],
     context: { dataSource: t, schemaIndex: n }
-  }), a);
-  let l = null;
-  return r.highlights && (l = M(() => ss({
+  }), o);
+  let c2 = null;
+  return r.highlights && (c2 = M(() => bs({
     data: r.highlights || [],
     context: { dataSource: t, schemaIndex: n }
-  }), a)), a.length > 0 ? {
+  }), o)), o.length > 0 ? {
     success: false,
-    errors: a
+    errors: o
   } : {
     success: true,
-    data: b2({
-      dataSource: ap(t),
+    data: g2({
+      dataSource: ip(t),
       dimensions: i || [],
-      measures: o || [],
+      measures: a || [],
       filters: u || []
-    }, l && { highlights: l })
+    }, c2 && { highlights: c2 })
   };
 };
-function ps(e) {
-  const { filters: r, relations: t } = ip(e.filters || []);
+function Rs(e) {
+  const { filters: r, relations: t } = rp(e.filters || []);
   return {
     dataSource: e.dataSource,
     dimensions: e.dimensions,
@@ -2123,9 +2246,9 @@ function ps(e) {
     highlights: e.highlights
   };
 }
-function Es(e, r, t = false) {
-  const s = ps(e), n = $r(s, r);
-  return Sh(n, t);
+function Vs(e, r, t = false) {
+  const s = Rs(e), n = Dr(s, r);
+  return bh(n, t);
 }
 
-export { c, R, x, Fs, ws, Es };
+export { c, R, x, Ps, ks, Vs };