@sisense/sdk-ui 2.11.0 → 2.13.0

package/dist/analytics-composer/node.js

@@ -1,186 +1,186 @@
-var Ie = Object.defineProperty, Te = Object.defineProperties;
-var Me = Object.getOwnPropertyDescriptors;
-var X = Object.getOwnPropertySymbols;
-var ke = Object.prototype.hasOwnProperty, Ne = Object.prototype.propertyIsEnumerable;
-var Z = (e, t, r) => t in e ? Ie(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
-  for (var r in t || (t = {}))
-    ke.call(t, r) && Z(e, r, t[r]);
-  if (X)
-    for (var r of X(t))
-      Ne.call(t, r) && Z(e, r, t[r]);
+var _e = Object.defineProperty, Le = Object.defineProperties;
+var Ve = Object.getOwnPropertyDescriptors;
+var ue = Object.getOwnPropertySymbols;
+var Ue = Object.prototype.hasOwnProperty, Je = Object.prototype.propertyIsEnumerable;
+var le = (e, r, t) => r in e ? _e(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, h = (e, r) => {
+  for (var t in r || (r = {}))
+    Ue.call(r, t) && le(e, t, r[t]);
+  if (ue)
+    for (var t of ue(r))
+      Je.call(r, t) && le(e, t, r[t]);
   return e;
-}, T = (e, t) => Te(e, Me(t));
-import { f as Pe, J as Oe } from "../types-Dxieyr4A.js";
-import { b as Mr, E as kr, a as Nr, i as Pr, e as Or, d as Sr } from "../types-Dxieyr4A.js";
-import { bW as Se, bH as Le, bX as _e, bY as xe, bZ as Be, at as ne, b_ as Ve, as as Ue, b$ as Ke, b5 as Qe, au as qe, b8 as He, b6 as Ye, aH as We, b4 as Xe, b7 as Ze, e as je, d as Ge, l as Je, c0 as ve, c1 as et, c2 as tt, c3 as rt, c4 as st, c5 as nt, c6 as it, c7 as at, c8 as ot, c9 as lt, ao as ct, ca as ut, cb as ft, S as mt, i as dt, cc as ie, c as ae, cd as pt, ce as gt, cf as yt, aD as bt, ah as j, ar as ht, cg as wt, v as At, u as Et } from "../execute-query-CxMSGp-J.js";
-import { i as Dt, b as zt, D as Ft, d as Ct } from "../dimensions-Bk74slQe.js";
-class Rt {
+}, q = (e, r) => Le(e, Ve(r));
+import { f as We, J as Ke } from "../types-CnFd03Ga.js";
+import { b as ti, E as ii, a as si, i as ni, e as ai, d as oi } from "../types-CnFd03Ga.js";
+import { bW as je, bB as Qe, bX as Ye, bY as He, bZ as Xe, av as ge, b_ as Ze, au as Ge, b$ as ve, b6 as er, aw as rr, c0 as tr, b9 as ir, b7 as sr, aI as nr, b5 as ar, b8 as or, e as ur, d as lr, l as cr, c1 as fr, c2 as dr, c3 as yr, c4 as pr, c5 as mr, c6 as gr, c7 as br, c8 as hr, c9 as Fr, ca as qr, cb as wr, at as Er, cc as Ar, cd as Cr, S as xr, i as $r, s as Dr, c as j, M as z, ce as Mr, cf as Rr, cg as Sr, ch as Nr, aE as zr, am as ce, al as Or, ci as Tr, x as Br, w as Pr } from "../execute-query-JhI9RXe_.js";
+import { i as kr, b as Ir, D as _r, d as Lr } from "../dimensions-DOxD1XtL.js";
+class Vr {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
-  set(t, r) {
-    this.keyToValue.set(t, r), this.valueToKey.set(r, t);
+  set(r, t) {
+    this.keyToValue.set(r, t), this.valueToKey.set(t, r);
   }
-  getByKey(t) {
-    return this.keyToValue.get(t);
+  getByKey(r) {
+    return this.keyToValue.get(r);
   }
-  getByValue(t) {
-    return this.valueToKey.get(t);
+  getByValue(r) {
+    return this.valueToKey.get(r);
   }
   clear() {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class oe {
-  constructor(t) {
-    this.generateIdentifier = t, this.kv = new Rt();
+class be {
+  constructor(r) {
+    this.generateIdentifier = r, this.kv = new Vr();
   }
-  register(t, r) {
-    this.kv.getByValue(t) || (r || (r = this.generateIdentifier(t)), this.kv.set(r, t));
+  register(r, t) {
+    this.kv.getByValue(r) || (t || (t = this.generateIdentifier(r)), this.kv.set(t, r));
   }
   clear() {
     this.kv.clear();
   }
-  getIdentifier(t) {
-    return this.kv.getByValue(t);
+  getIdentifier(r) {
+    return this.kv.getByValue(r);
   }
-  getValue(t) {
-    return this.kv.getByKey(t);
+  getValue(r) {
+    return this.kv.getByKey(r);
   }
 }
-class $t extends oe {
+class Ur extends be {
   constructor() {
-    super((t) => t.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
+    super((r) => r.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
-  register(t, r) {
-    typeof r == "object" ? (r.allowProps && this.classToAllowedProps.set(t, r.allowProps), super.register(t, r.identifier)) : super.register(t, r);
+  register(r, t) {
+    typeof t == "object" ? (t.allowProps && this.classToAllowedProps.set(r, t.allowProps), super.register(r, t.identifier)) : super.register(r, t);
   }
-  getAllowedProps(t) {
-    return this.classToAllowedProps.get(t);
+  getAllowedProps(r) {
+    return this.classToAllowedProps.get(r);
   }
 }
-function It(e) {
+function Jr(e) {
   if ("values" in Object)
     return Object.values(e);
-  const t = [];
-  for (const r in e)
-    e.hasOwnProperty(r) && t.push(e[r]);
-  return t;
+  const r = [];
+  for (const t in e)
+    e.hasOwnProperty(t) && r.push(e[t]);
+  return r;
 }
-function Tt(e, t) {
-  const r = It(e);
-  if ("find" in r)
-    return r.find(t);
-  const s = r;
-  for (let n = 0; n < s.length; n++) {
-    const i = s[n];
-    if (t(i))
-      return i;
+function Wr(e, r) {
+  const t = Jr(e);
+  if ("find" in t)
+    return t.find(r);
+  const i = t;
+  for (let s = 0; s < i.length; s++) {
+    const a = i[s];
+    if (r(a))
+      return a;
   }
 }
-function E(e, t) {
-  Object.entries(e).forEach(([r, s]) => t(s, r));
+function O(e, r) {
+  Object.entries(e).forEach(([t, i]) => r(i, t));
 }
-function M(e, t) {
-  return e.indexOf(t) !== -1;
+function V(e, r) {
+  return e.indexOf(r) !== -1;
 }
-function G(e, t) {
-  for (let r = 0; r < e.length; r++) {
-    const s = e[r];
-    if (t(s))
-      return s;
+function fe(e, r) {
+  for (let t = 0; t < e.length; t++) {
+    const i = e[t];
+    if (r(i))
+      return i;
   }
 }
-class Mt {
+class Kr {
   constructor() {
     this.transfomers = {};
   }
-  register(t) {
-    this.transfomers[t.name] = t;
+  register(r) {
+    this.transfomers[r.name] = r;
   }
-  findApplicable(t) {
-    return Tt(this.transfomers, (r) => r.isApplicable(t));
+  findApplicable(r) {
+    return Wr(this.transfomers, (t) => t.isApplicable(r));
   }
-  findByName(t) {
-    return this.transfomers[t];
+  findByName(r) {
+    return this.transfomers[r];
   }
 }
-const kt = (e) => Object.prototype.toString.call(e).slice(8, -1), le = (e) => typeof e == "undefined", Nt = (e) => e === null, C = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, O = (e) => C(e) && Object.keys(e).length === 0, g = (e) => Array.isArray(e), Pt = (e) => typeof e == "string", Ot = (e) => typeof e == "number" && !isNaN(e), St = (e) => typeof e == "boolean", Lt = (e) => e instanceof RegExp, R = (e) => e instanceof Map, $ = (e) => e instanceof Set, ce = (e) => kt(e) === "Symbol", _t = (e) => e instanceof Date && !isNaN(e.valueOf()), xt = (e) => e instanceof Error, J = (e) => typeof e == "number" && isNaN(e), Bt = (e) => St(e) || Nt(e) || le(e) || Ot(e) || Pt(e) || ce(e), Vt = (e) => typeof e == "bigint", Ut = (e) => e === 1 / 0 || e === -1 / 0, Kt = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), Qt = (e) => e instanceof URL, ue = (e) => e.replace(/\./g, "\\."), P = (e) => e.map(String).map(ue).join("."), F = (e) => {
-  const t = [];
-  let r = "";
-  for (let n = 0; n < e.length; n++) {
-    let i = e.charAt(n);
-    if (i === "\\" && e.charAt(n + 1) === ".") {
-      r += ".", n++;
+const jr = (e) => Object.prototype.toString.call(e).slice(8, -1), he = (e) => typeof e == "undefined", Qr = (e) => e === null, k = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, X = (e) => k(e) && Object.keys(e).length === 0, $ = (e) => Array.isArray(e), Yr = (e) => typeof e == "string", Hr = (e) => typeof e == "number" && !isNaN(e), Xr = (e) => typeof e == "boolean", Zr = (e) => e instanceof RegExp, I = (e) => e instanceof Map, _ = (e) => e instanceof Set, Fe = (e) => jr(e) === "Symbol", Gr = (e) => e instanceof Date && !isNaN(e.valueOf()), vr = (e) => e instanceof Error, de = (e) => typeof e == "number" && isNaN(e), et = (e) => Xr(e) || Qr(e) || he(e) || Hr(e) || Yr(e) || Fe(e), rt = (e) => typeof e == "bigint", tt = (e) => e === 1 / 0 || e === -1 / 0, it = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), st = (e) => e instanceof URL, qe = (e) => e.replace(/\./g, "\\."), Q = (e) => e.map(String).map(qe).join("."), P = (e) => {
+  const r = [];
+  let t = "";
+  for (let s = 0; s < e.length; s++) {
+    let a = e.charAt(s);
+    if (a === "\\" && e.charAt(s + 1) === ".") {
+      t += ".", s++;
       continue;
     }
-    if (i === ".") {
-      t.push(r), r = "";
+    if (a === ".") {
+      r.push(t), t = "";
       continue;
     }
-    r += i;
+    t += a;
   }
-  const s = r;
-  return t.push(s), t;
+  const i = t;
+  return r.push(i), r;
 };
-function d(e, t, r, s) {
+function E(e, r, t, i) {
   return {
     isApplicable: e,
-    annotation: t,
-    transform: r,
-    untransform: s
+    annotation: r,
+    transform: t,
+    untransform: i
   };
 }
-const fe = [
-  d(le, "undefined", () => null, () => {
+const we = [
+  E(he, "undefined", () => null, () => {
   }),
-  d(Vt, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  d(_t, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  d(xt, "Error", (e, t) => {
-    const r = {
+  E(rt, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  E(Gr, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  E(vr, "Error", (e, r) => {
+    const t = {
       name: e.name,
       message: e.message
     };
-    return t.allowedErrorProps.forEach((s) => {
-      r[s] = e[s];
-    }), r;
-  }, (e, t) => {
-    const r = new Error(e.message);
-    return r.name = e.name, r.stack = e.stack, t.allowedErrorProps.forEach((s) => {
-      r[s] = e[s];
-    }), r;
+    return r.allowedErrorProps.forEach((i) => {
+      t[i] = e[i];
+    }), t;
+  }, (e, r) => {
+    const t = new Error(e.message);
+    return t.name = e.name, t.stack = e.stack, r.allowedErrorProps.forEach((i) => {
+      t[i] = e[i];
+    }), t;
   }),
-  d(Lt, "regexp", (e) => "" + e, (e) => {
-    const t = e.slice(1, e.lastIndexOf("/")), r = e.slice(e.lastIndexOf("/") + 1);
-    return new RegExp(t, r);
+  E(Zr, "regexp", (e) => "" + e, (e) => {
+    const r = e.slice(1, e.lastIndexOf("/")), t = e.slice(e.lastIndexOf("/") + 1);
+    return new RegExp(r, t);
   }),
-  d(
-    $,
+  E(
+    _,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  d(R, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  d((e) => J(e) || Ut(e), "number", (e) => J(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
-  d((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  d(Qt, "URL", (e) => e.toString(), (e) => new URL(e))
+  E(I, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  E((e) => de(e) || tt(e), "number", (e) => de(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  E((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  E(st, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function k(e, t, r, s) {
+function U(e, r, t, i) {
   return {
     isApplicable: e,
-    annotation: t,
-    transform: r,
-    untransform: s
+    annotation: r,
+    transform: t,
+    untransform: i
   };
 }
-const me = k((e, t) => ce(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t) => ["symbol", t.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, t, r) => {
-  const s = r.symbolRegistry.getValue(t[1]);
-  if (!s)
+const Ee = U((e, r) => Fe(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
+  const i = t.symbolRegistry.getValue(r[1]);
+  if (!i)
     throw new Error("Trying to deserialize unknown symbol");
-  return s;
-}), qt = [
+  return i;
+}), nt = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -190,326 +190,326 @@ const me = k((e, t) => ce(e) ? !!t.symbolRegistry.getIdentifier(e) : !1, (e, t)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, t) => (e[t.name] = t, e), {}), de = k(Kt, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, t) => {
-  const r = qt[t[1]];
-  if (!r)
+].reduce((e, r) => (e[r.name] = r, e), {}), Ae = U(it, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
+  const t = nt[r[1]];
+  if (!t)
     throw new Error("Trying to deserialize unknown typed array");
-  return new r(e);
+  return new t(e);
 });
-function pe(e, t) {
-  return e != null && e.constructor ? !!t.classRegistry.getIdentifier(e.constructor) : !1;
+function Ce(e, r) {
+  return e != null && e.constructor ? !!r.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const ge = k(pe, (e, t) => ["class", t.classRegistry.getIdentifier(e.constructor)], (e, t) => {
-  const r = t.classRegistry.getAllowedProps(e.constructor);
-  if (!r)
-    return y({}, e);
-  const s = {};
-  return r.forEach((n) => {
-    s[n] = e[n];
-  }), s;
-}, (e, t, r) => {
-  const s = r.classRegistry.getValue(t[1]);
-  if (!s)
-    throw new Error(`Trying to deserialize unknown class '${t[1]}' - check https://github.com/blitz-js/superjson/issues/116#issuecomment-773996564`);
-  return Object.assign(Object.create(s.prototype), e);
-}), ye = k((e, t) => !!t.customTransformerRegistry.findApplicable(e), (e, t) => ["custom", t.customTransformerRegistry.findApplicable(e).name], (e, t) => t.customTransformerRegistry.findApplicable(e).serialize(e), (e, t, r) => {
-  const s = r.customTransformerRegistry.findByName(t[1]);
-  if (!s)
+const xe = U(Ce, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
+  const t = r.classRegistry.getAllowedProps(e.constructor);
+  if (!t)
+    return h({}, e);
+  const i = {};
+  return t.forEach((s) => {
+    i[s] = e[s];
+  }), i;
+}, (e, r, t) => {
+  const i = t.classRegistry.getValue(r[1]);
+  if (!i)
+    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(i.prototype), e);
+}), $e = U((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 i = t.customTransformerRegistry.findByName(r[1]);
+  if (!i)
     throw new Error("Trying to deserialize unknown custom value");
-  return s.deserialize(e);
-}), Ht = [ge, me, ye, de], v = (e, t) => {
-  const r = G(Ht, (n) => n.isApplicable(e, t));
-  if (r)
+  return i.deserialize(e);
+}), at = [xe, Ee, $e, Ae], ye = (e, r) => {
+  const t = fe(at, (s) => s.isApplicable(e, r));
+  if (t)
     return {
-      value: r.transform(e, t),
-      type: r.annotation(e, t)
+      value: t.transform(e, r),
+      type: t.annotation(e, r)
     };
-  const s = G(fe, (n) => n.isApplicable(e, t));
-  if (s)
+  const i = fe(we, (s) => s.isApplicable(e, r));
+  if (i)
     return {
-      value: s.transform(e, t),
-      type: s.annotation
+      value: i.transform(e, r),
+      type: i.annotation
     };
-}, be = {};
-fe.forEach((e) => {
-  be[e.annotation] = e;
+}, De = {};
+we.forEach((e) => {
+  De[e.annotation] = e;
 });
-const Yt = (e, t, r) => {
-  if (g(t))
-    switch (t[0]) {
+const ot = (e, r, t) => {
+  if ($(r))
+    switch (r[0]) {
       case "symbol":
-        return me.untransform(e, t, r);
+        return Ee.untransform(e, r, t);
       case "class":
-        return ge.untransform(e, t, r);
+        return xe.untransform(e, r, t);
       case "custom":
-        return ye.untransform(e, t, r);
+        return $e.untransform(e, r, t);
       case "typed-array":
-        return de.untransform(e, t, r);
+        return Ae.untransform(e, r, t);
       default:
-        throw new Error("Unknown transformation: " + t);
+        throw new Error("Unknown transformation: " + r);
     }
   else {
-    const s = be[t];
-    if (!s)
-      throw new Error("Unknown transformation: " + t);
-    return s.untransform(e, r);
+    const i = De[r];
+    if (!i)
+      throw new Error("Unknown transformation: " + r);
+    return i.untransform(e, t);
   }
-}, w = (e, t) => {
-  if (t > e.size)
+}, N = (e, r) => {
+  if (r > e.size)
     throw new Error("index out of bounds");
-  const r = e.keys();
-  for (; t > 0; )
-    r.next(), t--;
-  return r.next().value;
+  const t = e.keys();
+  for (; r > 0; )
+    t.next(), r--;
+  return t.next().value;
 };
-function he(e) {
-  if (M(e, "__proto__"))
+function Me(e) {
+  if (V(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (M(e, "prototype"))
+  if (V(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (M(e, "constructor"))
+  if (V(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const Wt = (e, t) => {
-  he(t);
-  for (let r = 0; r < t.length; r++) {
-    const s = t[r];
-    if ($(e))
-      e = w(e, +s);
-    else if (R(e)) {
-      const n = +s, i = +t[++r] == 0 ? "key" : "value", a = w(e, n);
-      switch (i) {
+const ut = (e, r) => {
+  Me(r);
+  for (let t = 0; t < r.length; t++) {
+    const i = r[t];
+    if (_(e))
+      e = N(e, +i);
+    else if (I(e)) {
+      const s = +i, a = +r[++t] == 0 ? "key" : "value", n = N(e, s);
+      switch (a) {
         case "key":
-          e = a;
+          e = n;
           break;
         case "value":
-          e = e.get(a);
+          e = e.get(n);
           break;
       }
     } else
-      e = e[s];
+      e = e[i];
   }
   return e;
-}, S = (e, t, r) => {
-  if (he(t), t.length === 0)
-    return r(e);
-  let s = e;
-  for (let i = 0; i < t.length - 1; i++) {
-    const a = t[i];
-    if (g(s)) {
-      const o = +a;
-      s = s[o];
-    } else if (C(s))
-      s = s[a];
-    else if ($(s)) {
-      const o = +a;
-      s = w(s, o);
-    } else if (R(s)) {
-      if (i === t.length - 2)
+}, Z = (e, r, t) => {
+  if (Me(r), r.length === 0)
+    return t(e);
+  let i = e;
+  for (let a = 0; a < r.length - 1; a++) {
+    const n = r[a];
+    if ($(i)) {
+      const o = +n;
+      i = i[o];
+    } else if (k(i))
+      i = i[n];
+    else if (_(i)) {
+      const o = +n;
+      i = N(i, o);
+    } else if (I(i)) {
+      if (a === r.length - 2)
         break;
-      const c = +a, I = +t[++i] == 0 ? "key" : "value", h = w(s, c);
-      switch (I) {
+      const u = +n, c = +r[++a] == 0 ? "key" : "value", d = N(i, u);
+      switch (c) {
         case "key":
-          s = h;
+          i = d;
           break;
         case "value":
-          s = s.get(h);
+          i = i.get(d);
           break;
       }
     }
   }
-  const n = t[t.length - 1];
-  if (g(s) ? s[+n] = r(s[+n]) : C(s) && (s[n] = r(s[n])), $(s)) {
-    const i = w(s, +n), a = r(i);
-    i !== a && (s.delete(i), s.add(a));
+  const s = r[r.length - 1];
+  if ($(i) ? i[+s] = t(i[+s]) : k(i) && (i[s] = t(i[s])), _(i)) {
+    const a = N(i, +s), n = t(a);
+    a !== n && (i.delete(a), i.add(n));
   }
-  if (R(s)) {
-    const i = +t[t.length - 2], a = w(s, i);
-    switch (+n == 0 ? "key" : "value") {
+  if (I(i)) {
+    const a = +r[r.length - 2], n = N(i, a);
+    switch (+s == 0 ? "key" : "value") {
       case "key": {
-        const c = r(a);
-        s.set(c, s.get(a)), c !== a && s.delete(a);
+        const u = t(n);
+        i.set(u, i.get(n)), u !== n && i.delete(n);
         break;
       }
       case "value": {
-        s.set(a, r(s.get(a)));
+        i.set(n, t(i.get(n)));
         break;
       }
     }
   }
   return e;
 };
-function L(e, t, r = []) {
+function G(e, r, t = []) {
   if (!e)
     return;
-  if (!g(e)) {
-    E(e, (i, a) => L(i, t, [...r, ...F(a)]));
+  if (!$(e)) {
+    O(e, (a, n) => G(a, r, [...t, ...P(n)]));
     return;
   }
-  const [s, n] = e;
-  n && E(n, (i, a) => {
-    L(i, t, [...r, ...F(a)]);
-  }), t(s, r);
+  const [i, s] = e;
+  s && O(s, (a, n) => {
+    G(a, r, [...t, ...P(n)]);
+  }), r(i, t);
 }
-function Xt(e, t, r) {
-  return L(t, (s, n) => {
-    e = S(e, n, (i) => Yt(i, s, r));
+function lt(e, r, t) {
+  return G(r, (i, s) => {
+    e = Z(e, s, (a) => ot(a, i, t));
   }), e;
 }
-function Zt(e, t) {
-  function r(s, n) {
-    const i = Wt(e, F(n));
-    s.map(F).forEach((a) => {
-      e = S(e, a, () => i);
+function ct(e, r) {
+  function t(i, s) {
+    const a = ut(e, P(s));
+    i.map(P).forEach((n) => {
+      e = Z(e, n, () => a);
     });
   }
-  if (g(t)) {
-    const [s, n] = t;
-    s.forEach((i) => {
-      e = S(e, F(i), () => e);
-    }), n && E(n, r);
+  if ($(r)) {
+    const [i, s] = r;
+    i.forEach((a) => {
+      e = Z(e, P(a), () => e);
+    }), s && O(s, t);
   } else
-    E(t, r);
+    O(r, t);
   return e;
 }
-const jt = (e, t) => C(e) || g(e) || R(e) || $(e) || pe(e, t);
-function Gt(e, t, r) {
-  const s = r.get(e);
-  s ? s.push(t) : r.set(e, [t]);
+const ft = (e, r) => k(e) || $(e) || I(e) || _(e) || Ce(e, r);
+function dt(e, r, t) {
+  const i = t.get(e);
+  i ? i.push(r) : t.set(e, [r]);
 }
-function Jt(e, t) {
-  const r = {};
-  let s;
-  return e.forEach((n) => {
-    if (n.length <= 1)
+function yt(e, r) {
+  const t = {};
+  let i;
+  return e.forEach((s) => {
+    if (s.length <= 1)
       return;
-    t || (n = n.map((o) => o.map(String)).sort((o, c) => o.length - c.length));
-    const [i, ...a] = n;
-    i.length === 0 ? s = a.map(P) : r[P(i)] = a.map(P);
-  }), s ? O(r) ? [s] : [s, r] : O(r) ? void 0 : r;
+    r || (s = s.map((o) => o.map(String)).sort((o, u) => o.length - u.length));
+    const [a, ...n] = s;
+    a.length === 0 ? i = n.map(Q) : t[Q(a)] = n.map(Q);
+  }), i ? X(t) ? [i] : [i, t] : X(t) ? void 0 : t;
 }
-const we = (e, t, r, s, n = [], i = [], a = /* @__PURE__ */ new Map()) => {
-  var W;
-  const o = Bt(e);
+const Re = (e, r, t, i, s = [], a = [], n = /* @__PURE__ */ new Map()) => {
+  var b;
+  const o = et(e);
   if (!o) {
-    Gt(e, n, t);
-    const p = a.get(e);
-    if (p)
-      return s ? {
+    dt(e, s, r);
+    const f = n.get(e);
+    if (f)
+      return i ? {
         transformedValue: null
-      } : p;
+      } : f;
   }
-  if (!jt(e, r)) {
-    const p = v(e, r), m = p ? {
-      transformedValue: p.value,
-      annotations: [p.type]
+  if (!ft(e, t)) {
+    const f = ye(e, t), y = f ? {
+      transformedValue: f.value,
+      annotations: [f.type]
     } : {
       transformedValue: e
     };
-    return o || a.set(e, m), m;
+    return o || n.set(e, y), y;
   }
-  if (M(i, e))
+  if (V(a, e))
     return {
       transformedValue: null
     };
-  const c = v(e, r), I = (W = c == null ? void 0 : c.value) != null ? W : e, h = g(I) ? [] : {}, D = {};
-  E(I, (p, m) => {
-    if (m === "__proto__" || m === "constructor" || m === "prototype")
-      throw new Error(`Detected property ${m}. This is a prototype pollution risk, please remove it from your object.`);
-    const z = we(p, t, r, s, [...n, m], [...i, e], a);
-    h[m] = z.transformedValue, g(z.annotations) ? D[m] = z.annotations : C(z.annotations) && E(z.annotations, (Re, $e) => {
-      D[ue(m) + "." + $e] = Re;
+  const u = ye(e, t), c = (b = u == null ? void 0 : u.value) != null ? b : e, d = $(c) ? [] : {}, g = {};
+  O(c, (f, y) => {
+    if (y === "__proto__" || y === "constructor" || y === "prototype")
+      throw new Error(`Detected property ${y}. This is a prototype pollution risk, please remove it from your object.`);
+    const x = Re(f, r, t, i, [...s, y], [...a, e], n);
+    d[y] = x.transformedValue, $(x.annotations) ? g[y] = x.annotations : k(x.annotations) && O(x.annotations, (B, S) => {
+      g[qe(y) + "." + S] = B;
     });
   });
-  const Y = O(D) ? {
-    transformedValue: h,
-    annotations: c ? [c.type] : void 0
+  const p = X(g) ? {
+    transformedValue: d,
+    annotations: u ? [u.type] : void 0
   } : {
-    transformedValue: h,
-    annotations: c ? [c.type, D] : D
+    transformedValue: d,
+    annotations: u ? [u.type, g] : g
   };
-  return o || a.set(e, Y), Y;
+  return o || n.set(e, p), p;
 };
-function Ae(e) {
+function Se(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
 }
-function ee(e) {
-  return Ae(e) === "Array";
+function pe(e) {
+  return Se(e) === "Array";
 }
-function vt(e) {
-  if (Ae(e) !== "Object")
+function pt(e) {
+  if (Se(e) !== "Object")
     return !1;
-  const t = Object.getPrototypeOf(e);
-  return !!t && t.constructor === Object && t === Object.prototype;
+  const r = Object.getPrototypeOf(e);
+  return !!r && r.constructor === Object && r === Object.prototype;
 }
-function er(e, t, r, s, n) {
-  const i = {}.propertyIsEnumerable.call(s, t) ? "enumerable" : "nonenumerable";
-  i === "enumerable" && (e[t] = r), n && i === "nonenumerable" && Object.defineProperty(e, t, {
-    value: r,
+function mt(e, r, t, i, s) {
+  const a = {}.propertyIsEnumerable.call(i, r) ? "enumerable" : "nonenumerable";
+  a === "enumerable" && (e[r] = t), s && a === "nonenumerable" && Object.defineProperty(e, r, {
+    value: t,
     enumerable: !1,
     writable: !0,
     configurable: !0
   });
 }
-function _(e, t = {}) {
-  if (ee(e))
-    return e.map((n) => _(n, t));
-  if (!vt(e))
+function v(e, r = {}) {
+  if (pe(e))
+    return e.map((s) => v(s, r));
+  if (!pt(e))
     return e;
-  const r = Object.getOwnPropertyNames(e), s = Object.getOwnPropertySymbols(e);
-  return [...r, ...s].reduce((n, i) => {
-    if (ee(t.props) && !t.props.includes(i))
-      return n;
-    const a = e[i], o = _(a, t);
-    return er(n, i, o, e, t.nonenumerable), n;
+  const t = Object.getOwnPropertyNames(e), i = Object.getOwnPropertySymbols(e);
+  return [...t, ...i].reduce((s, a) => {
+    if (pe(r.props) && !r.props.includes(a))
+      return s;
+    const n = e[a], o = v(n, r);
+    return mt(s, a, o, e, r.nonenumerable), s;
   }, {});
 }
 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: t = !1 } = {}) {
-    this.classRegistry = new $t(), this.symbolRegistry = new oe((r) => {
-      var s;
-      return (s = r.description) != null ? s : "";
-    }), this.customTransformerRegistry = new Mt(), this.allowedErrorProps = [], this.dedupe = t;
+  constructor({ dedupe: r = !1 } = {}) {
+    this.classRegistry = new Ur(), this.symbolRegistry = new be((t) => {
+      var i;
+      return (i = t.description) != null ? i : "";
+    }), this.customTransformerRegistry = new Kr(), this.allowedErrorProps = [], this.dedupe = r;
   }
-  serialize(t) {
-    const r = /* @__PURE__ */ new Map(), s = we(t, r, this, this.dedupe), n = {
-      json: s.transformedValue
+  serialize(r) {
+    const t = /* @__PURE__ */ new Map(), i = Re(r, t, this, this.dedupe), s = {
+      json: i.transformedValue
     };
-    s.annotations && (n.meta = T(y({}, n.meta), {
-      values: s.annotations
+    i.annotations && (s.meta = q(h({}, s.meta), {
+      values: i.annotations
     }));
-    const i = Jt(r, this.dedupe);
-    return i && (n.meta = T(y({}, n.meta), {
-      referentialEqualities: i
-    })), n;
+    const a = yt(t, this.dedupe);
+    return a && (s.meta = q(h({}, s.meta), {
+      referentialEqualities: a
+    })), s;
   }
-  deserialize(t) {
-    const { json: r, meta: s } = t;
-    let n = _(r);
-    return s != null && s.values && (n = Xt(n, s.values, this)), s != null && s.referentialEqualities && (n = Zt(n, s.referentialEqualities)), n;
+  deserialize(r) {
+    const { json: t, meta: i } = r;
+    let s = v(t);
+    return i != null && i.values && (s = lt(s, i.values, this)), i != null && i.referentialEqualities && (s = ct(s, i.referentialEqualities)), s;
   }
-  stringify(t) {
-    return JSON.stringify(this.serialize(t));
+  stringify(r) {
+    return JSON.stringify(this.serialize(r));
   }
-  parse(t) {
-    return this.deserialize(JSON.parse(t));
+  parse(r) {
+    return this.deserialize(JSON.parse(r));
   }
-  registerClass(t, r) {
-    this.classRegistry.register(t, r);
+  registerClass(r, t) {
+    this.classRegistry.register(r, t);
   }
-  registerSymbol(t, r) {
-    this.symbolRegistry.register(t, r);
+  registerSymbol(r, t) {
+    this.symbolRegistry.register(r, t);
   }
-  registerCustom(t, r) {
-    this.customTransformerRegistry.register(y({
-      name: r
-    }, t));
+  registerCustom(r, t) {
+    this.customTransformerRegistry.register(h({
+      name: t
+    }, r));
   }
-  allowErrorProps(...t) {
-    this.allowedErrorProps.push(...t);
+  allowErrorProps(...r) {
+    this.allowedErrorProps.push(...r);
   }
 }
 l.defaultInstance = new l();
@@ -521,513 +521,2164 @@ 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 b = (e) => e === void 0 ? mt.None : e, tr = (e) => new Oe(e.metadataItem, e.type), x = (e) => new je(e.name, e.expression, e.type, e.description, b(e.sort), e.dataSource, e.composeCode), B = (e) => new Ge(e.name, e.expression, e.granularity, e.format, e.description, b(e.sort), e.dataSource, e.composeCode), f = (e) => {
+const R = (e) => e === void 0 ? xr.None : e, gt = (e) => new Ke(e.metadataItem, e.type), ee = (e) => new ur(e.name, e.expression, e.type, e.description, R(e.sort), e.dataSource, e.composeCode), re = (e) => new lr(e.name, e.expression, e.granularity, e.format, e.description, R(e.sort), e.dataSource, e.composeCode), F = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return x(e);
+      return ee(e);
     case "DimensionalLevelAttribute":
-      return B(e);
+      return re(e);
     default:
       return e;
   }
-}, Ee = (e) => new Ft(e.name, e.expression, e.attributes.map(f), e.dimensions.map(rr), e.type, e.description, b(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? f(e.defaultAttribute) : void 0), De = (e) => new Ct(e.name, e.expression, e.description, b(e.sort), e.dataSource, e.composeCode), rr = (e) => {
+}, Ne = (e) => new _r(e.name, e.expression, e.attributes.map(F), e.dimensions.map(bt), e.type, e.description, R(e.sort), e.dataSource, e.composeCode, e.defaultAttribute ? F(e.defaultAttribute) : void 0), ze = (e) => new Lr(e.name, e.expression, e.description, R(e.sort), e.dataSource, e.composeCode), bt = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Ee(e);
+      return Ne(e);
     case "DimensionalDateDimension":
-      return De(e);
+      return ze(e);
     default:
       return e;
   }
-}, V = (e) => new Je(e.name, f(e.attribute), e.aggregation, e.format, e.description, b(e.sort), e.dataSource, e.composeCode), U = (e) => {
-  const t = Object.fromEntries(Object.entries(e.context).map(([r, s]) => {
-    if (s && typeof s == "object" && "__serializable" in s)
-      switch (s.__serializable) {
+}, te = (e) => new cr(e.name, F(e.attribute), e.aggregation, e.format, e.description, R(e.sort), e.dataSource, e.composeCode), ie = (e) => {
+  const r = Object.fromEntries(Object.entries(e.context).map(([t, i]) => {
+    if (i && typeof i == "object" && "__serializable" in i)
+      switch (i.__serializable) {
         case "DimensionalAttribute":
           return [
-            r,
-            x(s)
+            t,
+            ee(i)
           ];
         case "DimensionalLevelAttribute":
           return [
-            r,
-            B(s)
+            t,
+            re(i)
           ];
         case "DimensionalBaseMeasure":
           return [
-            r,
-            V(s)
+            t,
+            te(i)
           ];
         case "DimensionalCalculatedMeasure":
           return [
-            r,
-            U(s)
+            t,
+            ie(i)
           ];
         default:
           return [
-            r,
-            s
+            t,
+            i
           ];
       }
     return [
-      r,
-      s
+      t,
+      i
     ];
   }));
-  return new ve(e.name, e.expression, t, e.format, e.description, b(e.sort), e.dataSource, e.composeCode);
-}, ze = (e) => new et(e.name, f(e.attribute), e.format, e.description, b(e.sort), e.dataSource, e.composeCode), te = (e) => {
+  return new fr(e.name, e.expression, r, e.format, e.description, R(e.sort), e.dataSource, e.composeCode);
+}, Oe = (e) => new dr(e.name, F(e.attribute), e.format, e.description, R(e.sort), e.dataSource, e.composeCode), Y = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return V(e);
+      return te(e);
     case "DimensionalCalculatedMeasure":
-      return U(e);
+      return ie(e);
     case "DimensionalMeasureTemplate":
-      return ze(e);
+      return Oe(e);
     default:
       return e;
   }
-}, u = (e) => {
+}, m = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new ft(f(e.attribute), e.members, e.config.backgroundFilter ? T(y({}, e.config), {
-        backgroundFilter: u(e.config.backgroundFilter)
+      return new Cr(F(e.attribute), e.members, e.config.backgroundFilter ? q(h({}, e.config), {
+        backgroundFilter: m(e.config.backgroundFilter)
       }) : e.config, e.composeCode);
     case "LogicalAttributeFilter":
-      return new ut(e.filters.map((r) => u(r)), e.operator, e.config, e.composeCode);
+      return new Ar(e.filters.map((t) => m(t)), e.operator, e.config, e.composeCode);
     case "CascadingFilter":
-      return new ct(e._filters.map((r) => u(r)), e.config, e.composeCode);
+      return new Er(e._filters.map((t) => m(t)), e.config, e.composeCode);
     case "ExcludeFilter":
-      return new lt(u(e.filter), e.input ? u(e.input) : void 0, e.config, e.composeCode);
+      return new wr(m(e.filter), e.input ? m(e.input) : void 0, e.config, e.composeCode);
     case "MeasureFilter":
-      return new ot(f(e.attribute), te(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new qr(F(e.attribute), Y(e.measure), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "RankingFilter":
-      return new at(f(e.attribute), te(e.measure), e.operator, e.count, e.config, e.composeCode);
+      return new Fr(F(e.attribute), Y(e.measure), e.operator, e.count, e.config, e.composeCode);
+    case "MeasureRankingFilter":
+      return new hr(Y(e.measure), e.operator, e.count, e.config, e.composeCode);
     case "NumericFilter":
-      return new it(f(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
+      return new br(F(e.attribute), e.operatorA, e.valueA, e.operatorB, e.valueB, e.config, e.composeCode);
     case "TextFilter":
-      return new nt(f(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
+      return new gr(F(e.attribute), e.operatorA, e.valueA, e.config, e.composeCode);
     case "DateRangeFilter": {
-      const { valueA: r, valueB: s } = e;
-      return new st(f(e.attribute), r, s, e.config, e.composeCode);
+      const { valueA: t, valueB: i } = e;
+      return new mr(F(e.attribute), t, i, e.config, e.composeCode);
     }
     case "RelativeDateFilter":
-      return new rt(f(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
+      return new pr(F(e.attribute), e.offset, e.count, e.operator, e.anchor, e.config, e.composeCode);
     case "CustomFilter":
-      return new tt(f(e.attribute), e.jaqlExpression, e.config, e.composeCode);
+      return new yr(F(e.attribute), e.jaqlExpression, e.config, e.composeCode);
     default:
       return e;
   }
 };
 l.registerCustom({
-  isApplicable: Pe,
+  isApplicable: We,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => tr(e)
+  deserialize: (e) => gt(e)
 }, "JaqlElement");
 l.registerCustom({
-  isApplicable: Se,
+  isApplicable: je,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => x(e)
+  deserialize: (e) => ee(e)
 }, "DimensionalAttribute");
 l.registerCustom({
-  isApplicable: Le,
+  isApplicable: Qe,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => B(e)
+  deserialize: (e) => re(e)
 }, "DimensionalLevelAttribute");
 l.registerCustom({
-  isApplicable: Dt,
+  isApplicable: kr,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => Ee(e)
+  deserialize: (e) => Ne(e)
 }, "DimensionalDimension");
 l.registerCustom({
-  isApplicable: zt,
+  isApplicable: Ir,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => De(e)
+  deserialize: (e) => ze(e)
 }, "DimensionalDateDimension");
 l.registerCustom({
-  isApplicable: _e,
+  isApplicable: Ye,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => V(e)
+  deserialize: (e) => te(e)
 }, "DimensionalBaseMeasure");
 l.registerCustom({
-  isApplicable: xe,
+  isApplicable: He,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => U(e)
+  deserialize: (e) => ie(e)
 }, "DimensionalCalculatedMeasure");
 l.registerCustom({
-  isApplicable: Be,
+  isApplicable: Xe,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => ze(e)
+  deserialize: (e) => Oe(e)
 }, "DimensionalMeasureTemplate");
 l.registerCustom({
-  isApplicable: ne,
+  isApplicable: ge,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "MembersFilter");
 l.registerCustom({
-  isApplicable: Ve,
+  isApplicable: Ze,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "LogicalAttributeFilter");
 l.registerCustom({
-  isApplicable: Ue,
+  isApplicable: Ge,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "CascadingFilter");
 l.registerCustom({
-  isApplicable: Ke,
+  isApplicable: ve,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "ExcludeFilter");
 l.registerCustom({
-  isApplicable: Qe,
+  isApplicable: er,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "MeasureFilter");
 l.registerCustom({
-  isApplicable: qe,
+  isApplicable: rr,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "RankingFilter");
 l.registerCustom({
-  isApplicable: He,
+  isApplicable: tr,
+  serialize: (e) => e.serialize(),
+  deserialize: (e) => m(e)
+}, "MeasureRankingFilter");
+l.registerCustom({
+  isApplicable: ir,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "NumericFilter");
 l.registerCustom({
-  isApplicable: Ye,
+  isApplicable: sr,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "TextFilter");
 l.registerCustom({
-  isApplicable: We,
+  isApplicable: nr,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "DateRangeFilter");
 l.registerCustom({
-  isApplicable: Xe,
+  isApplicable: ar,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "RelativeDateFilter");
 l.registerCustom({
-  isApplicable: Ze,
+  isApplicable: or,
   serialize: (e) => e.serialize(),
-  deserialize: (e) => u(e)
+  deserialize: (e) => m(e)
 }, "CustomFilter");
-const Cr = l, A = "DM.";
-function sr(e) {
+const Zt = l, T = "DM.";
+function C(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function K(e) {
-  return e.every(sr);
+function se(e) {
+  return e.every(C);
 }
-function Q(e) {
+function J(e) {
   return "attribute" in e && "config" in e;
 }
-function q(e) {
+function L(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function nr(e) {
-  return !Q(e) && !q(e);
-}
-function H(e, t) {
-  const r = {}, s = e !== "" ? e + "." : "";
-  for (const n in t)
-    if (typeof t[`${n}`] == "function")
-      r[`${s}${n}`] = t[`${n}`];
-    else if (typeof t[`${n}`] == "object") {
-      const i = H("", t[`${n}`]);
-      for (const a in i)
-        r[`${s}${n}.${a}`] = i[`${a}`];
-    }
-  return r;
+function Te(e) {
+  return !J(e) && !L(e);
 }
-const re = H("measureFactory", pt), se = H("filterFactory", gt);
-function ir(e, t) {
-  const s = e.split(".")[0];
-  if (s === "filterFactory" && se[`${e}`])
-    return se[`${e}`](...t);
-  if (s === "measureFactory" && re[`${e}`])
-    return re[`${e}`](...t);
-  throw new Error(`Function "${e}" not found in filterFactory or measureFactory.`);
+function ht(e) {
+  return e.every((r) => typeof r == "string");
 }
-function ar(e) {
-  const t = e.split(".");
-  if (t.length < 3 || `${t[0]}.` !== A)
-    throw new Error(`Invalid attribute name format: "${e}". Expected format: "${A}TableName.ColumnName[.Level]".`);
-  const r = t[1], s = t[2];
-  let n;
-  return t.length === 4 && (n = t[3]), {
-    tableName: r,
-    columnName: s,
-    level: n
+function Ft(e) {
+  const r = e.split(".");
+  if (r.length < 3 || `${r[0]}.` !== T)
+    throw new Error(`Invalid attribute name format: "${e}". Expected format: "${T}TableName.ColumnName[.Level]"`);
+  const t = r[1], i = r[2];
+  let s;
+  return r.length === 4 && (s = r[3]), {
+    tableName: t,
+    columnName: i,
+    level: s
   };
 }
-function or(e, t) {
-  const { tableName: r, columnName: s, level: n } = ar(e), i = t.find((o) => o.name === r);
-  if (!i)
-    throw new Error(`Table "${r}" not found in the data model.`);
-  const a = i.columns.find((o) => o.name === s);
+function qt(e, r) {
+  const { tableName: t, columnName: i, level: s } = Ft(e), a = r.find((o) => o.name === t);
   if (!a)
-    throw new Error(`Column "${s}" not found in table "${r}".`);
-  if (n) {
-    if (a.dataType !== ie.DATETIME)
-      throw new Error(`Invalid date level "${n}" in attribute "${e}". Column "${r}.${s}" is not a datetime column.`);
-    const o = ae.all;
-    if (!o.includes(n))
-      throw new Error(`Invalid date level "${n}" in attribute "${e}". Valid levels are: ${o.join(", ")}.`);
+    throw new Error(`Table "${t}" not found in the data model`);
+  const n = a.columns.find((o) => o.name === i);
+  if (!n)
+    throw new Error(`Column "${i}" not found in table "${t}"`);
+  if (s) {
+    if (!Dr(n.dataType))
+      throw new Error(`Invalid date level "${s}" in attribute "${e}". Column "${t}.${i}" is not a datetime column`);
+    const o = j.all;
+    if (!o.includes(s))
+      throw new Error(`Invalid date level "${s}" in attribute "${e}". Valid levels are: ${o.join(", ")}`);
+    const u = j.dateOnly;
+    if (n.dataType === "date" && !u.includes(s))
+      throw new Error(`Invalid level "${s}" in attribute "${e}". Column "${t}.${i}" is only a date column, not a datetime column`);
+    const c = j.timeOnly;
+    if (n.dataType === "time" && !c.includes(s))
+      throw new Error(`Invalid level "${s}" in attribute "${e}". Column "${t}.${i}" is only a time column, not a date column`);
   }
   return {
-    field: a,
-    level: n
+    field: n,
+    level: s
   };
 }
-function lr(e, t) {
-  if (e.startsWith(A)) return {
-    isLikelyAttribute: !0,
-    suggestion: e
-  };
-  const r = e.split(".");
-  if (r.length === 2) {
-    const [s, n] = r, i = t.some((a) => a.name === s && a.columns.some((o) => o.name === n));
-    return i ? {
-      isLikelyAttribute: i,
-      suggestion: `${A}${e}`
-    } : {
-      isLikelyAttribute: !1
+function Be(e) {
+  return e.type === z.TextAttribute;
+}
+function Pe(e) {
+  return e.type === z.NumericAttribute;
+}
+function wt(e) {
+  return e.type === z.DateLevel;
+}
+function Et(e) {
+  return Be(e) || Pe(e);
+}
+function W(e) {
+  return e.type === z.TextAttribute ? "text" : e.type === z.NumericAttribute ? "numeric" : e.type === z.DateLevel ? "date/datetime" : "unknown";
+}
+function ne(e, r, t) {
+  const { field: i, level: s } = qt(e, t);
+  return $r({
+    expression: i.expression,
+    dataType: i.dataType,
+    granularity: s,
+    format: void 0,
+    sort: void 0,
+    dataSource: r
+  });
+}
+const At = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context;
+  if (!r)
+    return {
+      success: !0,
+      data: []
     };
-  }
-  if (r.length === 3) {
-    const [s, n, i] = r, a = t.find((c) => c.name === s);
-    if (!a)
-      return {
-        isLikelyAttribute: !1
-      };
-    const o = a.columns.find((c) => c.name === n);
-    return o ? o.dataType === ie.DATETIME && ae.all.includes(i) ? {
-      isLikelyAttribute: !0,
-      suggestion: `${A}${e}`
-    } : {
-      isLikelyAttribute: !1
-    } : {
-      isLikelyAttribute: !1
+  if (!ht(r))
+    return {
+      success: !1,
+      errors: [
+        {
+          category: "dimensions",
+          index: -1,
+          input: r,
+          message: "Invalid dimensions JSON. Expected an array of strings."
+        }
+      ]
     };
-  }
-  return {
-    isLikelyAttribute: !1
+  const s = [], a = [];
+  return r.forEach((n, o) => {
+    const u = {
+      category: "dimensions",
+      index: o,
+      input: n
+    };
+    try {
+      const c = ne(n, t, i);
+      s.push(c);
+    } catch (c) {
+      const d = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(h({}, u), {
+        message: d
+      }));
+    }
+  }), a.length > 0 ? {
+    success: !1,
+    errors: a
+  } : {
+    success: !0,
+    data: s
   };
+};
+function ae(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 Fe(e, t, r) {
-  const { field: s, level: n } = or(e, r);
-  return dt({
-    expression: s.expression,
-    dataType: s.dataType,
-    granularity: n,
-    format: void 0,
-    sort: void 0,
-    dataSource: t
+function Ct(e, r) {
+  const t = e.replace("measureFactory.", ""), s = ae(Mr, t)(...r);
+  if (!Te(s))
+    throw new Error(`Function "${e}" did not return a valid Measure`);
+  return s;
+}
+function xt(e, r) {
+  const t = e.replace("filterFactory.logic.", ""), s = ae(Rr, t)(...r);
+  if (!L(s))
+    throw new Error(`Function "${e}" did not return a valid FilterRelations`);
+  return s;
+}
+function $t(e, r) {
+  if (e.startsWith("filterFactory.logic."))
+    return xt(e, r);
+  const t = e.replace("filterFactory.", ""), s = ae(Sr, t)(...r);
+  if (!J(s) && !L(s))
+    throw new Error(`Function "${e}" did not return a valid Filter or FilterRelations`);
+  return s;
+}
+function Dt(e, r) {
+  const i = e.split(".")[0];
+  if (i === "measureFactory")
+    return Ct(e, r);
+  if (i === "filterFactory")
+    return $t(e, r);
+  throw new Error(`Unsupported factory: "${i}". Supported factories: measureFactory, filterFactory`);
+}
+const Mt = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g;
+function Rt(e, r, t = {}) {
+  const { warnUnusedContext: i = !0, errorOnUnusedContext: s = !0, allowEmptyFormula: a = !1, errorPrefix: n = "customFormula validation" } = t, o = {
+    isValid: !0,
+    errors: [],
+    warnings: [],
+    references: [],
+    unusedContextKeys: []
+  };
+  if (!e || e.trim().length === 0)
+    return a || (o.errors.push(`${n}args[1]: Formula cannot be empty`), o.isValid = !1), o;
+  const u = Object.keys(r);
+  if (u.length === 0)
+    return o.errors.push(`${n}args[2]: Context cannot be empty - custom formulas require context definitions`), o.isValid = !1, o;
+  const c = Mt, d = /* @__PURE__ */ new Set();
+  let g;
+  for (; (g = c.exec(e)) !== null; ) {
+    const b = g[1];
+    d.add(b);
+  }
+  o.references = Array.from(d), o.references.length === 0 && o.warnings.push(`${n}args[1]: No bracket references found in formula - ensure this is intentional`);
+  const p = [];
+  for (const b of o.references)
+    u.includes(b) || p.push(b);
+  if (p.length > 0 && (o.isValid = !1, p.length === 1 ? o.errors.push(`${n}args[1]: Reference [${p[0]}] not found in context. Available keys: ${u.join(", ")}`) : o.errors.push(`${n}args[1]: References [${p.join("], [")}] not found in context. Available keys: ${u.join(", ")}`)), (i || s) && u.length > 0) {
+    const b = u.filter((f) => !o.references.includes(f));
+    if (o.unusedContextKeys = b, b.length > 0) {
+      const f = `${n}args[2]: Context keys [${b.join(", ")}] are defined but not used in formula`;
+      s ? (o.errors.push(f), o.isValid = !1) : i && o.warnings.push(f);
+    }
+  }
+  return o;
+}
+function St(e, r, t = {}) {
+  const i = Rt(e, r, t);
+  if (!i.isValid)
+    throw new Error(i.errors.join("; "));
+  i.warnings.length > 0 && console.warn("Formula validation warnings:", i.warnings.join("; "));
+}
+function Nt(e, r) {
+  if (e.length < 3)
+    throw new Error(`${r.pathPrefix}Expected at least 3 arguments for customFormula`);
+  const t = e[1], i = e[2];
+  St(t, i, {
+    errorPrefix: `${r.pathPrefix}`,
+    errorOnUnusedContext: !0,
+    allowEmptyFormula: !1
   });
+  const s = {};
+  for (const [a, n] of Object.entries(i)) {
+    const o = `args[2].${a}`;
+    if (C(n))
+      s[`${a}`] = w({
+        data: n,
+        context: {
+          dataSource: r.dataSource,
+          tables: r.tables,
+          pathPrefix: o
+        }
+      });
+    else if (typeof n == "string" && n.startsWith(T))
+      try {
+        s[`${a}`] = ne(n, r.dataSource, r.tables);
+      } catch (u) {
+        const c = u instanceof Error ? u.message : "Unknown error";
+        throw new Error(`${o}: ${c}`);
+      }
+    else if (n && typeof n == "object" && "kind" in n)
+      s[`${a}`] = n;
+    else
+      throw new Error(`${o}: Invalid context value for key '${a}'. Expected a function call or attribute reference (${T}...), but got: ${typeof n}`);
+  }
+  e[2] = s;
+}
+function K(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 me(e, r) {
+  const t = K(e, r);
+  if (!Et(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${W(t)} attribute`);
 }
-function cr(e, t, r) {
-  if (typeof e == "object" && e !== null && !Array.isArray(e) && "function" in e && "args" in e)
-    return N(e, t, r);
-  if (typeof e == "string") {
-    if (e.startsWith(A))
-      return Fe(e, t, r);
-    const { isLikelyAttribute: s, suggestion: n } = lr(e, r);
-    if (s)
-      throw new Error(`Invalid attribute format: "${e}". Did you mean "${n}"?`);
+function D(e, r) {
+  const t = K(e, r);
+  if (!Pe(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be numeric type, got ${W(t)} attribute`);
+}
+function M(e, r) {
+  const t = K(e, r);
+  if (!Be(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be string type, got ${W(t)} attribute`);
+}
+function A(e, r) {
+  const t = K(e, r);
+  if (!wt(t))
+    throw new Error(`${r.pathPrefix}args[0]: Attribute must be date/datetime type, got ${W(t)} attribute`);
+}
+const zt = {
+  "measureFactory.customFormula": Nt,
+  // String | Number filters
+  "filterFactory.equals": me,
+  "filterFactory.doesntEqual": me,
+  // Numeric filters
+  "filterFactory.greaterThan": D,
+  "filterFactory.greaterThanOrEqual": D,
+  "filterFactory.lessThan": D,
+  "filterFactory.lessThanOrEqual": D,
+  "filterFactory.between": D,
+  "filterFactory.betweenNotEqual": D,
+  "filterFactory.numeric": D,
+  // String filters
+  "filterFactory.contains": M,
+  "filterFactory.doesntContain": M,
+  "filterFactory.startsWith": M,
+  "filterFactory.doesntStartWith": M,
+  "filterFactory.endsWith": M,
+  "filterFactory.doesntEndWith": M,
+  "filterFactory.like": M,
+  // Date filters
+  "filterFactory.dateFrom": A,
+  "filterFactory.dateTo": A,
+  "filterFactory.dateRange": A,
+  "filterFactory.dateRelative": A,
+  "filterFactory.dateRelativeFrom": A,
+  "filterFactory.dateRelativeTo": A,
+  "filterFactory.thisYear": A,
+  "filterFactory.thisMonth": A,
+  "filterFactory.thisQuarter": A,
+  "filterFactory.today": A
+};
+function Ot(e) {
+  return zt[`${e}`];
+}
+const Tt = {
+  // ==================== MEASURE FACTORY FUNCTIONS ====================
+  // Basic aggregations
+  "measureFactory.sum": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.average": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.avg": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.min": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.max": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.median": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.count": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.countDistinct": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.aggregate": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  // Constants and formulas
+  "measureFactory.constant": [
+    {
+      type: "number",
+      required: !0
+    }
+  ],
+  "measureFactory.customFormula": [
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "CustomFormulaContext",
+      required: !0
+    }
+  ],
+  // Arithmetic operations
+  "measureFactory.add": [
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "boolean",
+      required: !1
+    }
+  ],
+  "measureFactory.subtract": [
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "boolean",
+      required: !1
+    }
+  ],
+  "measureFactory.multiply": [
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "boolean",
+      required: !1
+    }
+  ],
+  "measureFactory.divide": [
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "Measure | number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "boolean",
+      required: !1
+    }
+  ],
+  // Advanced analytics
+  "measureFactory.measuredValue": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "Filter[]",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.rank": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "Attribute[]",
+      required: !1
+    }
+  ],
+  "measureFactory.trend": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "any",
+      required: !1
+    }
+  ],
+  "measureFactory.forecast": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "any",
+      required: !1
+    }
+  ],
+  // Time-based aggregations
+  "measureFactory.yearToDateSum": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.quarterToDateSum": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.monthToDateSum": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.weekToDateSum": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.runningSum": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "boolean",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  // Growth and difference calculations
+  "measureFactory.growth": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.growthRate": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.growthPastWeek": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.growthPastMonth": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.growthPastQuarter": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.growthPastYear": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.difference": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.diffPastWeek": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.diffPastMonth": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.diffPastQuarter": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.diffPastYear": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  // Past period measures
+  "measureFactory.pastDay": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.pastWeek": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.pastMonth": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.pastQuarter": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  "measureFactory.pastYear": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  // Statistics
+  "measureFactory.contribution": [
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    }
+  ],
+  // ==================== FILTER FACTORY FUNCTIONS ====================
+  // Logical filters
+  "filterFactory.union": [
+    {
+      type: "Filter[]",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.intersection": [
+    {
+      type: "Filter[]",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.exclude": [
+    {
+      type: "Filter",
+      required: !0
+    },
+    {
+      type: "Filter",
+      required: !1
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Text filters
+  "filterFactory.contains": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.doesntContain": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.startsWith": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.doesntStartWith": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.endsWith": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.doesntEndWith": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.like": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.equals": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string | number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.doesntEqual": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string | number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Numeric filters
+  "filterFactory.greaterThan": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.greaterThanOrEqual": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.lessThan": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.lessThanOrEqual": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.between": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.betweenNotEqual": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.numeric": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "number",
+      required: !1
+    },
+    {
+      type: "string",
+      required: !1
+    },
+    {
+      type: "number",
+      required: !1
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Member filters
+  "filterFactory.members": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "string[]",
+      required: !0
+    },
+    {
+      type: "MembersFilterConfig",
+      required: !1
+    }
+  ],
+  // Date filters
+  "filterFactory.dateFrom": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "Date | string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.dateTo": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "Date | string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.dateRange": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "Date | string",
+      required: !0
+    },
+    {
+      type: "Date | string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.dateRelative": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.dateRelativeFrom": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.dateRelativeTo": [
+    {
+      type: "LevelAttribute",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "string",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.thisYear": [
+    {
+      type: "DateDimension",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.thisMonth": [
+    {
+      type: "DateDimension",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.thisQuarter": [
+    {
+      type: "DateDimension",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.today": [
+    {
+      type: "DateDimension",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Measure filters
+  "filterFactory.measureEquals": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureGreaterThan": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureGreaterThanOrEqual": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureLessThan": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureLessThanOrEqual": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureBetween": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureBetweenNotEqual": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Ranking filters
+  "filterFactory.topRanking": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.bottomRanking": [
+    {
+      type: "Attribute",
+      required: !0
+    },
+    {
+      type: "Measure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureTopRanking": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  "filterFactory.measureBottomRanking": [
+    {
+      type: "BaseMeasure",
+      required: !0
+    },
+    {
+      type: "number",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Advanced filters
+  "filterFactory.cascading": [
+    {
+      type: "Filter[]",
+      required: !0
+    },
+    {
+      type: "BaseFilterConfig",
+      required: !1
+    }
+  ],
+  // Logic functions
+  "filterFactory.logic.and": [
+    {
+      type: "FilterRelationsNode",
+      required: !0
+    },
+    {
+      type: "FilterRelationsNode",
+      required: !0
+    }
+  ],
+  "filterFactory.logic.or": [
+    {
+      type: "FilterRelationsNode",
+      required: !0
+    },
+    {
+      type: "FilterRelationsNode",
+      required: !0
+    }
+  ]
+};
+function oe(e) {
+  return Tt[`${e}`];
+}
+function Bt(e) {
+  const r = oe(e);
+  return r ? r.filter((t) => t.required).length : 0;
+}
+function Pt(e) {
+  const r = oe(e);
+  return r ? r.length : 0;
+}
+function kt(e) {
+  if (typeof e != "string")
+    return !1;
+  const r = Date.parse(e);
+  if (!(!isNaN(r) && e.length >= 10))
+    return !1;
+  const i = new Date(e);
+  return !isNaN(i.getTime()) && i.toISOString().startsWith(e.substring(0, 10));
+}
+function H(e, r, t, i) {
+  if (e.startsWith(T))
+    try {
+      return ne(e, r, t);
+    } catch (s) {
+      const a = s instanceof Error ? s.message : "Unknown error";
+      throw new Error(`${i}: ${a}`);
+    }
+  throw new Error(`${i}: Invalid attribute "${e}". Expected format: "${T}TableName.ColumnName[.Level]"`);
+}
+function It(e) {
+  const r = e.data, { argSchema: t, dataSource: i, tables: s, pathPrefix: a } = e.context, n = a;
+  if (r === void 0) {
+    if (t.required)
+      throw new Error(`${n}: Required argument is missing (expected ${t.type})`);
+    return;
+  }
+  switch (t.type) {
+    case "string":
+      if (typeof r != "string")
+        throw new Error(`${n}: Expected string, got ${typeof r}`);
+      return r;
+    case "number":
+      if (typeof r != "number")
+        throw new Error(`${n}: Expected number, got ${typeof r}`);
+      return r;
+    case "boolean":
+      if (typeof r != "boolean")
+        throw new Error(`${n}: Expected boolean, got ${typeof r}`);
+      return r;
+    case "string[]":
+      if (!Array.isArray(r))
+        throw new Error(`${n}: Expected array of strings, got ${typeof r}. Example: ["value1", "value2"]`);
+      if (!r.every((o) => typeof o == "string"))
+        throw new Error(`${n}: Expected array of strings, but contains non-string values`);
+      return r;
+    case "number[]":
+      if (!Array.isArray(r))
+        throw new Error(`${n}: Expected array of numbers, got ${typeof r}. Example: [10, 20]`);
+      if (!r.every((o) => typeof o == "number"))
+        throw new Error(`${n}: Expected array of numbers, but contains non-number values`);
+      return r;
+    case "Attribute":
+      if (typeof r != "string")
+        throw new Error(`${n}: Expected attribute string, got ${typeof r}. Example: "DM.Commerce.Revenue"`);
+      return H(r, i, s, n);
+    case "Attribute[]":
+      if (!Array.isArray(r))
+        throw new Error(`${n}: Expected array of attributes, got ${typeof r}. Example: ["DM.Commerce.AgeRange"]`);
+      return r.map((o, u) => {
+        if (typeof o != "string")
+          throw new Error(`${n}[${u}]: Expected attribute string, got ${typeof o}`);
+        return H(o, i, s, `${n}[${u}]`);
+      });
+    case "Measure":
+    case "BaseMeasure":
+      if (!C(r))
+        throw new Error(`${n}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`);
+      return w({
+        data: r,
+        context: {
+          dataSource: i,
+          tables: s,
+          pathPrefix: n
+        }
+      });
+    case "Measure[]":
+      if (!Array.isArray(r))
+        throw new Error(`${n}: Expected array of measure function calls, got ${typeof r}`);
+      return r.map((o, u) => {
+        if (!C(o))
+          throw new Error(`${n}[${u}]: Expected measure function call, got ${typeof o}`);
+        return w({
+          data: o,
+          context: {
+            dataSource: i,
+            tables: s,
+            pathPrefix: `${n}[${u}]: `
+          }
+        });
+      });
+    case "Filter":
+      if (!C(r))
+        throw new Error(`${n}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`);
+      return w({
+        data: r,
+        context: {
+          dataSource: i,
+          tables: s,
+          pathPrefix: n
+        }
+      });
+    case "Filter[]":
+      if (!Array.isArray(r))
+        throw new Error(`${n}: Expected array of filter function calls, got ${typeof r}`);
+      return r.map((o, u) => {
+        if (!C(o))
+          throw new Error(`${n}[${u}]: Expected filter function call, got ${typeof o}`);
+        return w({
+          data: o,
+          context: {
+            dataSource: i,
+            tables: s,
+            pathPrefix: `${n}[${u}]: `
+          }
+        });
+      });
+    case "FilterRelationsNode":
+      if (Array.isArray(r))
+        return r.map((o, u) => {
+          if (!C(o))
+            throw new Error(`${n}[${u}]: Expected filter function call, got ${typeof o}`);
+          return w({
+            data: o,
+            context: {
+              dataSource: i,
+              tables: s,
+              pathPrefix: `${n}[${u}]: `
+            }
+          });
+        });
+      if (C(r))
+        return w({
+          data: r,
+          context: {
+            dataSource: i,
+            tables: s,
+            pathPrefix: n
+          }
+        });
+      throw new Error(`${n}: Expected filter function call or array of filters, got ${typeof r}`);
+    case "DateDimension":
+    case "LevelAttribute":
+      if (typeof r != "string")
+        throw new Error(`${n}: Expected date attribute string, got ${typeof r}. Example: "DM.Commerce.Date.Years"`);
+      return H(r, i, s, n);
+    case "Measure | number":
+      if (typeof r == "number")
+        return r;
+      if (C(r))
+        return w({
+          data: r,
+          context: {
+            dataSource: i,
+            tables: s,
+            pathPrefix: n
+          }
+        });
+      throw new Error(`${n}: Expected measure function call or number, got ${typeof r}`);
+    case "Date | string":
+      if (typeof r == "string") {
+        if (kt(r))
+          return r;
+        throw new Error(`${n}: Expected valid ISO date string or Date object, got invalid date string "${r}"`);
+      } else {
+        if (r instanceof Date)
+          return r;
+        throw new Error(`${n}: Expected date string or Date object, got ${typeof r}`);
+      }
+    case "string | number":
+      if (typeof r == "string" || typeof r == "number")
+        return r;
+      throw new Error(`${n}: Expected string or number, got ${typeof r}`);
+    case "BaseFilterConfig":
+    case "MembersFilterConfig":
+    case "CustomFormulaContext":
+    case "any":
+      if (r == null && t.required)
+        throw new Error(`${n}: Required argument is null/undefined`);
+      return r;
+    default:
+      return r;
   }
-  return e;
 }
-function N(e, t, r) {
-  const { function: s, args: n } = e, i = n.map((a) => cr(a, t, r));
-  return ir(s, i);
+function w(e) {
+  const { data: r } = e, { dataSource: t, tables: i, pathPrefix: s } = e.context, { function: a, args: n } = r, o = s ? `${s}.` : "", u = oe(a);
+  if (!u)
+    throw new Error(`${o}function: Unknown function "${a}"`);
+  const c = Bt(a), d = Pt(a);
+  if (n.length < c)
+    throw new Error(`${o}function: Expected at least ${c} arguments, got ${n.length}`);
+  if (n.length > d)
+    throw new Error(`${o}function: Expected at most ${d} arguments, got ${n.length}`);
+  const g = [], p = [];
+  for (let f = 0; f < Math.max(n.length, u.length); f++) {
+    const y = u[`${f}`], x = n[`${f}`], B = o ? `${o}args[${f}]` : `args[${f}]`;
+    if (x === void 0) {
+      y != null && y.required && p.push(`${B}: Missing required argument (expected ${y.type})`);
+      continue;
+    }
+    if (!y) {
+      p.push(`${B}: Unexpected argument`);
+      continue;
+    }
+    try {
+      const S = It({
+        data: x,
+        context: {
+          dataSource: t,
+          tables: i,
+          pathPrefix: B,
+          argSchema: y
+        }
+      });
+      g.push(S);
+    } catch (S) {
+      const Ie = S instanceof Error ? S.message : "Unknown error";
+      p.push(Ie);
+    }
+  }
+  if (p.length > 0) {
+    const f = p.join("; ");
+    throw new Error(f);
+  }
+  const b = Ot(a);
+  if (b)
+    try {
+      b(g, {
+        dataSource: t,
+        tables: i,
+        pathPrefix: o
+      });
+    } catch (f) {
+      const y = f instanceof Error ? f.message : "Unknown validation error";
+      throw new Error(y);
+    }
+  return Dt(a, g);
 }
-function Ce(e) {
-  const { attribute: t, config: r } = e;
-  if (ne(e) && yt(t)) {
-    const { granularity: s } = t;
-    return bt(t, e.members.map((n) => s === "Years" && !isNaN(Number(n)) ? `${n}-01-01T00:00:00` : n), r);
+function ke(e) {
+  const { attribute: r, config: t } = e;
+  if (ge(e) && Nr(r)) {
+    const { granularity: i } = r;
+    return zr(r, e.members.map((s) => i === "Years" && !isNaN(Number(s)) ? `${s}-01-01T00:00:00` : s), t);
   }
   return e;
 }
-function ur(e) {
-  let t = [];
-  for (const r of e)
-    q(r) ? t = j(r, t) : t = j([
-      Ce(r)
-    ], t);
-  return t != null ? t : [];
+function _t(e) {
+  let r = [];
+  for (const t of e)
+    L(t) ? r = ce(t, r) : r = ce([
+      ke(t)
+    ], r);
+  return r != null ? r : [];
 }
-const fr = (e, t, r) => {
-  const s = [], n = [];
-  return e.forEach((i, a) => {
+const Lt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+  return r.forEach((n, o) => {
+    const u = {
+      category: "filters",
+      index: o,
+      input: n
+    };
     try {
-      const o = N(i, t, r);
-      !q(o) && !Q(o) ? n.push(`Filter ${a + 1} (${i.function}): Invalid filter JSON`) : s.push(o);
-    } catch (o) {
-      const c = o instanceof Error ? o.message : "Unknown error";
-      n.push(`Filter ${a + 1} (${i.function}): ${c}`);
+      const c = w({
+        data: n,
+        context: {
+          dataSource: t,
+          tables: i,
+          pathPrefix: ""
+        }
+      });
+      !L(c) && !J(c) ? a.push(q(h({}, u), {
+        message: "Invalid filter JSON"
+      })) : s.push(c);
+    } catch (c) {
+      const d = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(h({}, u), {
+        message: d
+      }));
     }
-  }), n.length > 0 ? {
+  }), a.length > 0 ? {
     success: !1,
-    errors: n
+    errors: a
   } : {
     success: !0,
-    data: ur(s)
+    data: _t(s)
   };
-}, mr = (e, t, r) => e ? K(e) ? fr(e, t, r) : {
-  success: !1,
-  errors: [
-    'Invalid filters JSON. Expected an array of function calls with "function" and "args" properties.'
-  ]
-} : {
-  success: !0,
-  data: []
-}, dr = (e, t, r) => {
-  const s = [], n = [];
-  return e.forEach((i, a) => {
-    try {
-      const o = N(i, t, r);
-      Q(o) ? s.push(Ce(o)) : n.push(`Highlight ${a + 1} (${i.function}): Invalid filter JSON`);
-    } catch (o) {
-      const c = o instanceof Error ? o.message : "Unknown error";
-      n.push(`Highlight ${a + 1} (${i.function}): ${c}`);
+}, Vt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context;
+  return r ? se(r) ? Lt({
+    data: r,
+    context: {
+      dataSource: t,
+      tables: i
     }
-  }), n.length > 0 ? {
+  }) : {
     success: !1,
-    errors: n
+    errors: [
+      {
+        category: "filters",
+        index: -1,
+        input: r,
+        message: 'Invalid filters JSON. Expected an array of function calls with "function" and "args" properties.'
+      }
+    ]
   } : {
     success: !0,
-    data: s
+    data: []
   };
-}, pr = (e, t, r) => e ? K(e) ? dr(e, t, r) : {
-  success: !1,
-  errors: [
-    'Invalid highlights JSON. Expected an array of function calls with "function" and "args" properties.'
-  ]
-} : {
-  success: !0,
-  data: []
-};
-function gr(e) {
-  return e.every((t) => typeof t == "string");
-}
-const yr = (e, t, r) => {
-  if (!e)
-    return {
-      success: !0,
-      data: []
-    };
-  if (!gr(e))
-    return {
-      success: !1,
-      errors: [
-        "Invalid dimensions JSON. Expected an array of strings."
-      ]
+}, Ut = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+  return r.forEach((n, o) => {
+    const u = {
+      category: "highlights",
+      index: o,
+      input: n
     };
-  const s = [], n = [];
-  return e.forEach((i, a) => {
     try {
-      const o = Fe(i, t, r);
-      s.push(o);
-    } catch (o) {
-      const c = o instanceof Error ? o.message : "Unknown error";
-      n.push(`Dimension ${a + 1} ("${i}"): ${c}`);
+      const c = w({
+        data: n,
+        context: {
+          dataSource: t,
+          tables: i,
+          pathPrefix: ""
+        }
+      });
+      J(c) ? s.push(ke(c)) : a.push(q(h({}, u), {
+        message: "Invalid filter JSON"
+      }));
+    } catch (c) {
+      const d = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(h({}, u), {
+        message: d
+      }));
     }
-  }), n.length > 0 ? {
+  }), a.length > 0 ? {
     success: !1,
-    errors: n
+    errors: a
   } : {
     success: !0,
     data: s
   };
-}, br = (e, t, r) => {
-  const s = [], n = [];
-  return e.forEach((i, a) => {
+}, Jt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context;
+  return r ? se(r) ? Ut({
+    data: r,
+    context: {
+      dataSource: t,
+      tables: i
+    }
+  }) : {
+    success: !1,
+    errors: [
+      {
+        category: "highlights",
+        index: -1,
+        input: r,
+        message: 'Invalid highlights JSON. Expected an array of function calls with "function" and "args" properties.'
+      }
+    ]
+  } : {
+    success: !0,
+    data: []
+  };
+}, Wt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+  return r.forEach((n, o) => {
+    const u = {
+      category: "measures",
+      index: o,
+      input: n
+    };
     try {
-      const o = N(i, t, r);
-      nr(o) ? s.push(o) : n.push(`Measure ${a + 1} (${i.function}): Invalid measure JSON`);
-    } catch (o) {
-      const c = o instanceof Error ? o.message : "Unknown error";
-      n.push(`Measure ${a + 1} (${i.function}): ${c}`);
+      const c = w({
+        data: n,
+        context: {
+          dataSource: t,
+          tables: i,
+          pathPrefix: ""
+        }
+      });
+      Te(c) ? s.push(c) : a.push(q(h({}, u), {
+        message: "Invalid measure JSON"
+      }));
+    } catch (c) {
+      const d = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(h({}, u), {
+        message: d
+      }));
     }
-  }), n.length > 0 ? {
+  }), a.length > 0 ? {
     success: !1,
-    errors: n
+    errors: a
   } : {
     success: !0,
     data: s
   };
-}, hr = (e, t, r) => e ? K(e) ? br(e, t, r) : {
-  success: !1,
-  errors: [
-    'Invalid measures JSON. Expected an array of function calls with "function" and "args" properties.'
-  ]
-} : {
-  success: !0,
-  data: []
-};
-function wr(e) {
-  const t = {}, r = [];
-  for (const s in e) {
-    const n = e[`${s}`], i = n();
-    if (i.success)
-      t[`${s}`] = i.data;
-    else {
-      const a = i.errors.map((o) => `[${s}] ${o}`);
-      r.push(...a);
+}, Kt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context;
+  return r ? se(r) ? Wt({
+    data: r,
+    context: {
+      dataSource: t,
+      tables: i
     }
-  }
-  return r.length > 0 ? {
+  }) : {
     success: !1,
-    errors: r
+    errors: [
+      {
+        category: "measures",
+        index: -1,
+        input: r,
+        message: 'Invalid measures JSON. Expected an array of function calls with "function" and "args" properties.'
+      }
+    ]
   } : {
     success: !0,
-    data: t
+    data: []
   };
-}
-const Rr = (e, t, r) => {
-  const s = {
-    dimensions: () => yr(e.dimensions || [], t, r),
-    measures: () => hr(e.measures || [], t, r),
-    filters: () => mr(e.filters || [], t, r)
+}, Gt = (e) => {
+  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = (g) => {
+    const p = g();
+    return p.success ? p.data : (s.push(...p.errors), null);
+  }, n = a(() => At({
+    data: r.dimensions || [],
+    context: {
+      dataSource: t,
+      tables: i
+    }
+  })), o = a(() => Kt({
+    data: r.measures || [],
+    context: {
+      dataSource: t,
+      tables: i
+    }
+  })), u = a(() => Vt({
+    data: r.filters || [],
+    context: {
+      dataSource: t,
+      tables: i
+    }
+  }));
+  let c = null;
+  return r.highlights && (c = a(() => Jt({
+    data: r.highlights || [],
+    context: {
+      dataSource: t,
+      tables: i
+    }
+  }))), s.length > 0 ? {
+    success: !1,
+    errors: s
+  } : {
+    success: !0,
+    data: h({
+      dataSource: Or(t),
+      dimensions: n || [],
+      measures: o || [],
+      filters: u || []
+    }, c && {
+      highlights: c
+    })
   };
-  e.highlights && (s.highlights = () => pr(e.highlights || [], t, r));
-  const n = wr(s);
-  if (!n.success) {
-    const a = `Translation failed with ${n.errors.length} error(s):
-${n.errors.join(`
-`)}`;
-    throw new Error(a);
-  }
-  return y({
-    dataSource: ht(t)
-  }, n.data);
 };
-function Ar(e) {
-  const { filters: t, relations: r } = Et(e.filters || []);
+function jt(e) {
+  const { filters: r, relations: t } = Pr(e.filters || []);
   return {
     dataSource: e.dataSource,
     dimensions: e.dimensions,
     measures: e.measures,
-    filters: t,
-    filterRelations: r,
+    filters: r,
+    filterRelations: t,
     highlights: e.highlights
   };
 }
-function $r(e, t, r = !1) {
-  const s = Ar(e), n = wt(s, t);
-  return At(n, r);
+function vt(e, r, t = !1) {
+  const i = jt(e), s = Tr(i, r);
+  return Br(s, t);
 }
 export {
-  Cr as CustomSuperJSON,
-  Mr as EMPTY_EXPANDED_QUERY_MODEL,
-  kr as EMPTY_SIMPLE_QUERY_MODEL,
-  Nr as isByIdDashboardCodeParams,
-  Pr as isByIdWidgetCodeParams,
-  Or as isClientSideDashboardCodeParams,
-  Sr as isClientSideWidgetCodeParams,
-  Rr as translateQueryJSON,
-  $r as translateQueryToJaql
+  Zt as CustomSuperJSON,
+  ti as EMPTY_EXPANDED_QUERY_MODEL,
+  ii as EMPTY_SIMPLE_QUERY_MODEL,
+  si as isByIdDashboardCodeParams,
+  ni as isByIdWidgetCodeParams,
+  ai as isClientSideDashboardCodeParams,
+  oi as isClientSideWidgetCodeParams,
+  Gt as translateQueryJSON,
+  vt as translateQueryToJaql
 };