@sisense/sdk-ui 2.17.0 → 2.18.0

package/dist/analytics-composer/node.js

@@ -1,20 +1,20 @@
-var Ve = Object.defineProperty, Ue = Object.defineProperties;
-var Je = Object.getOwnPropertyDescriptors;
-var ue = Object.getOwnPropertySymbols;
-var je = Object.prototype.hasOwnProperty, We = Object.prototype.propertyIsEnumerable;
-var le = (e, r, t) => r in e ? Ve(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, h = (e, r) => {
+var _e = Object.defineProperty, Ve = Object.defineProperties;
+var Ue = Object.getOwnPropertyDescriptors;
+var le = Object.getOwnPropertySymbols;
+var We = Object.prototype.hasOwnProperty, Je = Object.prototype.propertyIsEnumerable;
+var ce = (e, r, t) => r in e ? _e(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, b = (e, r) => {
   for (var t in r || (r = {}))
-    je.call(r, t) && le(e, t, r[t]);
-  if (ue)
-    for (var t of ue(r))
-      We.call(r, t) && le(e, t, r[t]);
+    We.call(r, t) && ce(e, t, r[t]);
+  if (le)
+    for (var t of le(r))
+      Je.call(r, t) && ce(e, t, r[t]);
   return e;
-}, q = (e, r) => Ue(e, Je(r));
-import { f as Ke, J as Qe } from "../types-ofTjqFFK.js";
-import { b as oi, E as ui, a as li, i as ci, e as fi, d as di } from "../types-ofTjqFFK.js";
-import { bX as Ye, bC as He, bY as Xe, bZ as Ze, b_ as Ge, aw as G, b$ as ve, av as er, c0 as rr, b7 as tr, ax as ir, c1 as sr, ba as nr, b8 as ar, aJ as or, b6 as ur, b9 as lr, e as cr, d as fr, l as dr, c2 as pr, c3 as yr, c4 as mr, c5 as gr, c6 as br, c7 as hr, c8 as Fr, c9 as qr, ca as wr, cb as Er, cc as Ar, au as xr, cd as Cr, ce as $r, S as Dr, i as Mr, s as ge, c as j, M as z, cf as Rr, cg as Nr, ch as Sr, ci as zr, aF as Or, an as ce, am as Tr, cj as Br, x as Pr, w as kr } from "../execute-query-l7jejslh.js";
-import { i as Ir, b as _r, D as Lr, d as Vr, a as Ur } from "../dimensions-Gma5tFmd.js";
-class Jr {
+}, q = (e, r) => Ve(e, Ue(r));
+import { f as je, J as Ke } from "../types-CHqDjeeH.js";
+import { b as oi, E as ui, a as li, i as ci, e as fi, d as di } from "../types-CHqDjeeH.js";
+import { bW as Qe, bA as Ye, bX as ve, bY as He, bZ as Ge, aw as X, b_ as Xe, av as Ze, b$ as er, b7 as rr, ax as tr, c0 as ir, ba as sr, b8 as nr, aK as ar, b6 as or, b9 as ur, e as lr, d as cr, l as fr, c1 as dr, c2 as mr, c3 as pr, c4 as yr, c5 as gr, c6 as hr, c7 as br, c8 as Fr, c9 as wr, ca as qr, cb as Er, au as xr, cc as Ar, cd as Cr, S as $r, i as Dr, s as Z, c as _, M as S, ce as Mr, cf as Rr, cg as Nr, ch as Tr, aG as Sr, an as fe, am as zr, ci as Ir, x as Or, w as Br } from "../execute-query-CUf3Nz7H.js";
+import { i as Pr, b as kr, D as Lr, d as _r, a as Vr } from "../dimensions-CETtX6B1.js";
+class Ur {
   constructor() {
     this.keyToValue = /* @__PURE__ */ new Map(), this.valueToKey = /* @__PURE__ */ new Map();
   }
@@ -31,9 +31,9 @@ class Jr {
     this.keyToValue.clear(), this.valueToKey.clear();
   }
 }
-class be {
+class he {
   constructor(r) {
-    this.generateIdentifier = r, this.kv = new Jr();
+    this.generateIdentifier = r, this.kv = new Ur();
   }
   register(r, t) {
     this.kv.getByValue(r) || (t || (t = this.generateIdentifier(r)), this.kv.set(t, r));
@@ -48,7 +48,7 @@ class be {
     return this.kv.getByKey(r);
   }
 }
-class jr extends be {
+class Wr extends he {
   constructor() {
     super((r) => r.name), this.classToAllowedProps = /* @__PURE__ */ new Map();
   }
@@ -59,7 +59,7 @@ class jr extends be {
     return this.classToAllowedProps.get(r);
   }
 }
-function Wr(e) {
+function Jr(e) {
   if ("values" in Object)
     return Object.values(e);
   const r = [];
@@ -67,8 +67,8 @@ function Wr(e) {
     e.hasOwnProperty(t) && r.push(e[t]);
   return r;
 }
-function Kr(e, r) {
-  const t = Wr(e);
+function jr(e, r) {
+  const t = Jr(e);
   if ("find" in t)
     return t.find(r);
   const i = t;
@@ -78,20 +78,20 @@ function Kr(e, r) {
       return a;
   }
 }
-function O(e, r) {
+function z(e, r) {
   Object.entries(e).forEach(([t, i]) => r(i, t));
 }
-function L(e, r) {
+function V(e, r) {
   return e.indexOf(r) !== -1;
 }
-function fe(e, r) {
+function de(e, r) {
   for (let t = 0; t < e.length; t++) {
     const i = e[t];
     if (r(i))
       return i;
   }
 }
-class Qr {
+class Kr {
   constructor() {
     this.transfomers = {};
   }
@@ -99,13 +99,13 @@ class Qr {
     this.transfomers[r.name] = r;
   }
   findApplicable(r) {
-    return Kr(this.transfomers, (t) => t.isApplicable(r));
+    return jr(this.transfomers, (t) => t.isApplicable(r));
   }
   findByName(r) {
     return this.transfomers[r];
   }
 }
-const Yr = (e) => Object.prototype.toString.call(e).slice(8, -1), he = (e) => typeof e == "undefined", Hr = (e) => e === null, P = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Y = (e) => P(e) && Object.keys(e).length === 0, $ = (e) => Array.isArray(e), Xr = (e) => typeof e == "string", Zr = (e) => typeof e == "number" && !isNaN(e), Gr = (e) => typeof e == "boolean", vr = (e) => e instanceof RegExp, k = (e) => e instanceof Map, I = (e) => e instanceof Set, Fe = (e) => Yr(e) === "Symbol", et = (e) => e instanceof Date && !isNaN(e.valueOf()), rt = (e) => e instanceof Error, de = (e) => typeof e == "number" && isNaN(e), tt = (e) => Gr(e) || Hr(e) || he(e) || Zr(e) || Xr(e) || Fe(e), it = (e) => typeof e == "bigint", st = (e) => e === 1 / 0 || e === -1 / 0, nt = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), at = (e) => e instanceof URL, qe = (e) => e.replace(/\./g, "\\."), W = (e) => e.map(String).map(qe).join("."), B = (e) => {
+const Qr = (e) => Object.prototype.toString.call(e).slice(8, -1), be = (e) => typeof e == "undefined", Yr = (e) => e === null, B = (e) => typeof e != "object" || e === null || e === Object.prototype ? !1 : Object.getPrototypeOf(e) === null ? !0 : Object.getPrototypeOf(e) === Object.prototype, Y = (e) => B(e) && Object.keys(e).length === 0, $ = (e) => Array.isArray(e), vr = (e) => typeof e == "string", Hr = (e) => typeof e == "number" && !isNaN(e), Gr = (e) => typeof e == "boolean", Xr = (e) => e instanceof RegExp, P = (e) => e instanceof Map, k = (e) => e instanceof Set, Fe = (e) => Qr(e) === "Symbol", Zr = (e) => e instanceof Date && !isNaN(e.valueOf()), et = (e) => e instanceof Error, me = (e) => typeof e == "number" && isNaN(e), rt = (e) => Gr(e) || Yr(e) || be(e) || Hr(e) || vr(e) || Fe(e), tt = (e) => typeof e == "bigint", it = (e) => e === 1 / 0 || e === -1 / 0, st = (e) => ArrayBuffer.isView(e) && !(e instanceof DataView), nt = (e) => e instanceof URL, we = (e) => e.replace(/\./g, "\\."), j = (e) => e.map(String).map(we).join("."), O = (e) => {
   const r = [];
   let t = "";
   for (let s = 0; s < e.length; s++) {
@@ -123,7 +123,7 @@ const Yr = (e) => Object.prototype.toString.call(e).slice(8, -1), he = (e) => ty
   const i = t;
   return r.push(i), r;
 };
-function E(e, r, t, i) {
+function x(e, r, t, i) {
   return {
     isApplicable: e,
     annotation: r,
@@ -131,12 +131,12 @@ function E(e, r, t, i) {
     untransform: i
   };
 }
-const we = [
-  E(he, "undefined", () => null, () => {
+const qe = [
+  x(be, "undefined", () => null, () => {
   }),
-  E(it, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
-  E(et, "Date", (e) => e.toISOString(), (e) => new Date(e)),
-  E(rt, "Error", (e, r) => {
+  x(tt, "bigint", (e) => e.toString(), (e) => typeof BigInt != "undefined" ? BigInt(e) : (console.error("Please add a BigInt polyfill."), e)),
+  x(Zr, "Date", (e) => e.toISOString(), (e) => new Date(e)),
+  x(et, "Error", (e, r) => {
     const t = {
       name: e.name,
       message: e.message
@@ -150,24 +150,24 @@ const we = [
       t[i] = e[i];
     }), t;
   }),
-  E(vr, "regexp", (e) => "" + e, (e) => {
+  x(Xr, "regexp", (e) => "" + e, (e) => {
     const r = e.slice(1, e.lastIndexOf("/")), t = e.slice(e.lastIndexOf("/") + 1);
     return new RegExp(r, t);
   }),
-  E(
-    I,
+  x(
+    k,
     "set",
     // (sets only exist in es6+)
     // eslint-disable-next-line es5/no-es6-methods
     (e) => [...e.values()],
     (e) => new Set(e)
   ),
-  E(k, "map", (e) => [...e.entries()], (e) => new Map(e)),
-  E((e) => de(e) || st(e), "number", (e) => de(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
-  E((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
-  E(at, "URL", (e) => e.toString(), (e) => new URL(e))
+  x(P, "map", (e) => [...e.entries()], (e) => new Map(e)),
+  x((e) => me(e) || it(e), "number", (e) => me(e) ? "NaN" : e > 0 ? "Infinity" : "-Infinity", Number),
+  x((e) => e === 0 && 1 / e === -1 / 0, "number", () => "-0", Number),
+  x(nt, "URL", (e) => e.toString(), (e) => new URL(e))
 ];
-function V(e, r, t, i) {
+function U(e, r, t, i) {
   return {
     isApplicable: e,
     annotation: r,
@@ -175,12 +175,12 @@ function V(e, r, t, i) {
     untransform: i
   };
 }
-const Ee = V((e, r) => Fe(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r) => ["symbol", r.symbolRegistry.getIdentifier(e)], (e) => e.description, (e, r, t) => {
+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 i;
-}), ot = [
+}), at = [
   Int8Array,
   Uint8Array,
   Int16Array,
@@ -190,19 +190,19 @@ const Ee = V((e, r) => Fe(e) ? !!r.symbolRegistry.getIdentifier(e) : !1, (e, r)
   Float32Array,
   Float64Array,
   Uint8ClampedArray
-].reduce((e, r) => (e[r.name] = r, e), {}), Ae = V(nt, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
-  const t = ot[r[1]];
+].reduce((e, r) => (e[r.name] = r, e), {}), xe = U(st, (e) => ["typed-array", e.constructor.name], (e) => [...e], (e, r) => {
+  const t = at[r[1]];
   if (!t)
     throw new Error("Trying to deserialize unknown typed array");
   return new t(e);
 });
-function xe(e, r) {
+function Ae(e, r) {
   return e != null && e.constructor ? !!r.classRegistry.getIdentifier(e.constructor) : !1;
 }
-const Ce = V(xe, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
+const Ce = U(Ae, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor)], (e, r) => {
   const t = r.classRegistry.getAllowedProps(e.constructor);
   if (!t)
-    return h({}, e);
+    return b({}, e);
   const i = {};
   return t.forEach((s) => {
     i[s] = e[s];
@@ -212,29 +212,29 @@ const Ce = V(xe, (e, r) => ["class", r.classRegistry.getIdentifier(e.constructor
   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 = V((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) => {
+}), $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 i.deserialize(e);
-}), ut = [Ce, Ee, $e, Ae], pe = (e, r) => {
-  const t = fe(ut, (s) => s.isApplicable(e, r));
+}), ot = [Ce, Ee, $e, xe], pe = (e, r) => {
+  const t = de(ot, (s) => s.isApplicable(e, r));
   if (t)
     return {
       value: t.transform(e, r),
       type: t.annotation(e, r)
     };
-  const i = fe(we, (s) => s.isApplicable(e, r));
+  const i = de(qe, (s) => s.isApplicable(e, r));
   if (i)
     return {
       value: i.transform(e, r),
       type: i.annotation
     };
 }, De = {};
-we.forEach((e) => {
+qe.forEach((e) => {
   De[e.annotation] = e;
 });
-const lt = (e, r, t) => {
+const ut = (e, r, t) => {
   if ($(r))
     switch (r[0]) {
       case "symbol":
@@ -244,7 +244,7 @@ const lt = (e, r, t) => {
       case "custom":
         return $e.untransform(e, r, t);
       case "typed-array":
-        return Ae.untransform(e, r, t);
+        return xe.untransform(e, r, t);
       default:
         throw new Error("Unknown transformation: " + r);
     }
@@ -254,7 +254,7 @@ const lt = (e, r, t) => {
       throw new Error("Unknown transformation: " + r);
     return i.untransform(e, t);
   }
-}, S = (e, r) => {
+}, T = (e, r) => {
   if (r > e.size)
     throw new Error("index out of bounds");
   const t = e.keys();
@@ -263,21 +263,21 @@ const lt = (e, r, t) => {
   return t.next().value;
 };
 function Me(e) {
-  if (L(e, "__proto__"))
+  if (V(e, "__proto__"))
     throw new Error("__proto__ is not allowed as a property");
-  if (L(e, "prototype"))
+  if (V(e, "prototype"))
     throw new Error("prototype is not allowed as a property");
-  if (L(e, "constructor"))
+  if (V(e, "constructor"))
     throw new Error("constructor is not allowed as a property");
 }
-const ct = (e, r) => {
+const lt = (e, r) => {
   Me(r);
   for (let t = 0; t < r.length; t++) {
     const i = r[t];
-    if (I(e))
-      e = S(e, +i);
-    else if (k(e)) {
-      const s = +i, a = +r[++t] == 0 ? "key" : "value", n = S(e, s);
+    if (k(e))
+      e = T(e, +i);
+    else if (P(e)) {
+      const s = +i, a = +r[++t] == 0 ? "key" : "value", n = T(e, s);
       switch (a) {
         case "key":
           e = n;
@@ -290,7 +290,7 @@ const ct = (e, r) => {
       e = e[i];
   }
   return e;
-}, H = (e, r, t) => {
+}, v = (e, r, t) => {
   if (Me(r), r.length === 0)
     return t(e);
   let i = e;
@@ -299,32 +299,32 @@ const ct = (e, r) => {
     if ($(i)) {
       const o = +n;
       i = i[o];
-    } else if (P(i))
+    } else if (B(i))
       i = i[n];
-    else if (I(i)) {
+    else if (k(i)) {
       const o = +n;
-      i = S(i, o);
-    } else if (k(i)) {
+      i = T(i, o);
+    } else if (P(i)) {
       if (a === r.length - 2)
         break;
-      const u = +n, c = +r[++a] == 0 ? "key" : "value", d = S(i, u);
+      const u = +n, c = +r[++a] == 0 ? "key" : "value", p = T(i, u);
       switch (c) {
         case "key":
-          i = d;
+          i = p;
           break;
         case "value":
-          i = i.get(d);
+          i = i.get(p);
           break;
       }
     }
   }
   const s = r[r.length - 1];
-  if ($(i) ? i[+s] = t(i[+s]) : P(i) && (i[s] = t(i[s])), I(i)) {
-    const a = S(i, +s), n = t(a);
+  if ($(i) ? i[+s] = t(i[+s]) : B(i) && (i[s] = t(i[s])), k(i)) {
+    const a = T(i, +s), n = t(a);
     a !== n && (i.delete(a), i.add(n));
   }
-  if (k(i)) {
-    const a = +r[r.length - 2], n = S(i, a);
+  if (P(i)) {
+    const a = +r[r.length - 2], n = T(i, a);
     switch (+s == 0 ? "key" : "value") {
       case "key": {
         const u = t(n);
@@ -339,45 +339,45 @@ const ct = (e, r) => {
   }
   return e;
 };
-function X(e, r, t = []) {
+function H(e, r, t = []) {
   if (!e)
     return;
   if (!$(e)) {
-    O(e, (a, n) => X(a, r, [...t, ...B(n)]));
+    z(e, (a, n) => H(a, r, [...t, ...O(n)]));
     return;
   }
   const [i, s] = e;
-  s && O(s, (a, n) => {
-    X(a, r, [...t, ...B(n)]);
+  s && z(s, (a, n) => {
+    H(a, r, [...t, ...O(n)]);
   }), r(i, t);
 }
-function ft(e, r, t) {
-  return X(r, (i, s) => {
-    e = H(e, s, (a) => lt(a, i, t));
+function ct(e, r, t) {
+  return H(r, (i, s) => {
+    e = v(e, s, (a) => ut(a, i, t));
   }), e;
 }
-function dt(e, r) {
+function ft(e, r) {
   function t(i, s) {
-    const a = ct(e, B(s));
-    i.map(B).forEach((n) => {
-      e = H(e, n, () => a);
+    const a = lt(e, O(s));
+    i.map(O).forEach((n) => {
+      e = v(e, n, () => a);
     });
   }
   if ($(r)) {
     const [i, s] = r;
     i.forEach((a) => {
-      e = H(e, B(a), () => e);
-    }), s && O(s, t);
+      e = v(e, O(a), () => e);
+    }), s && z(s, t);
   } else
-    O(r, t);
+    z(r, t);
   return e;
 }
-const pt = (e, r) => P(e) || $(e) || k(e) || I(e) || xe(e, r);
-function yt(e, r, t) {
+const dt = (e, r) => B(e) || $(e) || P(e) || k(e) || Ae(e, r);
+function mt(e, r, t) {
   const i = t.get(e);
   i ? i.push(r) : t.set(e, [r]);
 }
-function mt(e, r) {
+function pt(e, r) {
   const t = {};
   let i;
   return e.forEach((s) => {
@@ -385,50 +385,50 @@ function mt(e, r) {
       return;
     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(W) : t[W(a)] = n.map(W);
+    a.length === 0 ? i = n.map(j) : t[j(a)] = n.map(j);
   }), i ? Y(t) ? [i] : [i, t] : Y(t) ? void 0 : t;
 }
 const Re = (e, r, t, i, s = [], a = [], n = /* @__PURE__ */ new Map()) => {
-  var b;
-  const o = tt(e);
+  var y;
+  const o = rt(e);
   if (!o) {
-    yt(e, s, r);
-    const f = n.get(e);
-    if (f)
+    mt(e, s, r);
+    const d = n.get(e);
+    if (d)
       return i ? {
         transformedValue: null
-      } : f;
+      } : d;
   }
-  if (!pt(e, t)) {
-    const f = pe(e, t), p = f ? {
-      transformedValue: f.value,
-      annotations: [f.type]
+  if (!dt(e, t)) {
+    const d = pe(e, t), g = d ? {
+      transformedValue: d.value,
+      annotations: [d.type]
     } : {
       transformedValue: e
     };
-    return o || n.set(e, p), p;
+    return o || n.set(e, g), g;
   }
-  if (L(a, e))
+  if (V(a, e))
     return {
       transformedValue: null
     };
-  const u = pe(e, t), c = (b = u == null ? void 0 : u.value) != null ? b : e, d = $(c) ? [] : {}, g = {};
-  O(c, (f, p) => {
-    if (p === "__proto__" || p === "constructor" || p === "prototype")
-      throw new Error(`Detected property ${p}. This is a prototype pollution risk, please remove it from your object.`);
-    const C = Re(f, r, t, i, [...s, p], [...a, e], n);
-    d[p] = C.transformedValue, $(C.annotations) ? g[p] = C.annotations : P(C.annotations) && O(C.annotations, (T, N) => {
-      g[qe(p) + "." + N] = T;
+  const u = pe(e, t), c = (y = u == null ? void 0 : u.value) != null ? y : e, p = $(c) ? [] : {}, f = {};
+  z(c, (d, g) => {
+    if (g === "__proto__" || g === "constructor" || g === "prototype")
+      throw new Error(`Detected property ${g}. This is a prototype pollution risk, please remove it from your object.`);
+    const C = Re(d, r, t, i, [...s, g], [...a, e], n);
+    p[g] = C.transformedValue, $(C.annotations) ? f[g] = C.annotations : B(C.annotations) && z(C.annotations, (I, N) => {
+      f[we(g) + "." + N] = I;
     });
   });
-  const y = Y(g) ? {
-    transformedValue: d,
+  const m = Y(f) ? {
+    transformedValue: p,
     annotations: u ? [u.type] : void 0
   } : {
-    transformedValue: d,
-    annotations: u ? [u.type, g] : g
+    transformedValue: p,
+    annotations: u ? [u.type, f] : f
   };
-  return o || n.set(e, y), y;
+  return o || n.set(e, m), m;
 };
 function Ne(e) {
   return Object.prototype.toString.call(e).slice(8, -1);
@@ -436,13 +436,13 @@ function Ne(e) {
 function ye(e) {
   return Ne(e) === "Array";
 }
-function gt(e) {
+function yt(e) {
   if (Ne(e) !== "Object")
     return !1;
   const r = Object.getPrototypeOf(e);
   return !!r && r.constructor === Object && r === Object.prototype;
 }
-function bt(e, r, t, i, s) {
+function gt(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,
@@ -451,17 +451,17 @@ function bt(e, r, t, i, s) {
     configurable: !0
   });
 }
-function Z(e, r = {}) {
+function G(e, r = {}) {
   if (ye(e))
-    return e.map((s) => Z(s, r));
-  if (!gt(e))
+    return e.map((s) => G(s, r));
+  if (!yt(e))
     return e;
   const t = Object.getOwnPropertyNames(e), i = Object.getOwnPropertySymbols(e);
   return [...t, ...i].reduce((s, a) => {
     if (ye(r.props) && !r.props.includes(a))
       return s;
-    const n = e[a], o = Z(n, r);
-    return bt(s, a, o, e, r.nonenumerable), s;
+    const n = e[a], o = G(n, r);
+    return gt(s, a, o, e, r.nonenumerable), s;
   }, {});
 }
 class l {
@@ -469,27 +469,27 @@ class l {
    * @param dedupeReferentialEqualities  If true, SuperJSON will make sure only one instance of referentially equal objects are serialized and the rest are replaced with `null`.
    */
   constructor({ dedupe: r = !1 } = {}) {
-    this.classRegistry = new jr(), this.symbolRegistry = new be((t) => {
+    this.classRegistry = new Wr(), this.symbolRegistry = new he((t) => {
       var i;
       return (i = t.description) != null ? i : "";
-    }), this.customTransformerRegistry = new Qr(), this.allowedErrorProps = [], this.dedupe = r;
+    }), this.customTransformerRegistry = new Kr(), this.allowedErrorProps = [], this.dedupe = r;
   }
   serialize(r) {
     const t = /* @__PURE__ */ new Map(), i = Re(r, t, this, this.dedupe), s = {
       json: i.transformedValue
     };
-    i.annotations && (s.meta = q(h({}, s.meta), {
+    i.annotations && (s.meta = q(b({}, s.meta), {
       values: i.annotations
     }));
-    const a = mt(t, this.dedupe);
-    return a && (s.meta = q(h({}, s.meta), {
+    const a = pt(t, this.dedupe);
+    return a && (s.meta = q(b({}, s.meta), {
       referentialEqualities: a
     })), s;
   }
   deserialize(r) {
     const { json: t, meta: i } = r;
-    let s = Z(t);
-    return i != null && i.values && (s = ft(s, i.values, this)), i != null && i.referentialEqualities && (s = dt(s, i.referentialEqualities)), s;
+    let s = G(t);
+    return i != null && i.values && (s = ct(s, i.values, this)), i != null && i.referentialEqualities && (s = ft(s, i.referentialEqualities)), s;
   }
   stringify(r) {
     return JSON.stringify(this.serialize(r));
@@ -504,7 +504,7 @@ class l {
     this.symbolRegistry.register(r, t);
   }
   registerCustom(r, t) {
-    this.customTransformerRegistry.register(h({
+    this.customTransformerRegistry.register(b({
       name: t
     }, r));
   }
@@ -521,7 +521,7 @@ 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 R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem, e.type), v = (e) => new cr(
+const R = (e) => e === void 0 ? $r.None : e, ht = (e) => new Ke(e.metadataItem, e.type), ee = (e) => new lr(
   e.name,
   e.expression,
   e.type,
@@ -529,7 +529,7 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
   R(e.sort),
   e.dataSource,
   e.composeCode
-), ee = (e) => new fr(
+), re = (e) => new cr(
   e.name,
   e.expression,
   e.granularity,
@@ -538,71 +538,71 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
   R(e.sort),
   e.dataSource,
   e.composeCode
-), F = (e) => {
+), w = (e) => {
   switch (e.__serializable) {
     case "DimensionalAttribute":
-      return v(e);
-    case "DimensionalLevelAttribute":
       return ee(e);
+    case "DimensionalLevelAttribute":
+      return re(e);
     default:
       return e;
   }
-}, Se = (e) => new Lr(
+}, Te = (e) => new Lr(
   e.name,
   e.expression,
-  e.attributes.map(F),
-  e.dimensions.map(Ft),
+  e.attributes.map(w),
+  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 Vr(
+  e.defaultAttribute ? w(e.defaultAttribute) : void 0
+), Se = (e) => new _r(
   e.name,
   e.expression,
   e.description,
   R(e.sort),
   e.dataSource,
   e.composeCode
-), Ft = (e) => {
+), bt = (e) => {
   switch (e.__serializable) {
     case "DimensionalDimension":
-      return Se(e);
+      return Te(e);
     case "DimensionalDateDimension":
-      return ze(e);
+      return Se(e);
     default:
       return e;
   }
-}, re = (e) => new dr(
+}, te = (e) => new fr(
   e.name,
-  F(e.attribute),
+  w(e.attribute),
   e.aggregation,
   e.format,
   e.description,
   R(e.sort),
   e.dataSource,
   e.composeCode
-), te = (e) => {
+), 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 [t, v(i)];
-          case "DimensionalLevelAttribute":
             return [t, ee(i)];
-          case "DimensionalBaseMeasure":
+          case "DimensionalLevelAttribute":
             return [t, re(i)];
-          case "DimensionalCalculatedMeasure":
+          case "DimensionalBaseMeasure":
             return [t, te(i)];
+          case "DimensionalCalculatedMeasure":
+            return [t, ie(i)];
           default:
             return [t, i];
         }
       return [t, i];
     })
   );
-  return new pr(
+  return new dr(
     e.name,
     e.expression,
     r,
@@ -612,9 +612,9 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
     e.dataSource,
     e.composeCode
   );
-}, Oe = (e) => new yr(
+}, ze = (e) => new mr(
   e.name,
-  F(e.attribute),
+  w(e.attribute),
   e.format,
   e.description,
   R(e.sort),
@@ -623,46 +623,46 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
 ), K = (e) => {
   switch (e.__serializable) {
     case "DimensionalBaseMeasure":
-      return re(e);
-    case "DimensionalCalculatedMeasure":
       return te(e);
+    case "DimensionalCalculatedMeasure":
+      return ie(e);
     case "DimensionalMeasureTemplate":
-      return Oe(e);
+      return ze(e);
     default:
       return e;
   }
-}, m = (e) => {
+}, h = (e) => {
   switch (e.__serializable) {
     case "MembersFilter":
-      return new $r(
-        F(e.attribute),
+      return new Cr(
+        w(e.attribute),
         e.members,
-        e.config.backgroundFilter ? q(h({}, e.config), { backgroundFilter: m(e.config.backgroundFilter) }) : e.config,
+        e.config.backgroundFilter ? q(b({}, e.config), { backgroundFilter: h(e.config.backgroundFilter) }) : e.config,
         e.composeCode
       );
     case "LogicalAttributeFilter":
-      return new Cr(
-        e.filters.map((t) => m(t)),
+      return new Ar(
+        e.filters.map((t) => h(t)),
         e.operator,
         e.config,
         e.composeCode
       );
     case "CascadingFilter":
       return new xr(
-        e._filters.map((t) => m(t)),
+        e._filters.map((t) => h(t)),
         e.config,
         e.composeCode
       );
     case "ExcludeFilter":
-      return new Ar(
-        m(e.filter),
-        e.input ? m(e.input) : void 0,
+      return new Er(
+        h(e.filter),
+        e.input ? h(e.input) : void 0,
         e.config,
         e.composeCode
       );
     case "MeasureFilter":
-      return new Er(
-        F(e.attribute),
+      return new qr(
+        w(e.attribute),
         K(e.measure),
         e.operatorA,
         e.valueA,
@@ -673,7 +673,7 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
       );
     case "RankingFilter":
       return new wr(
-        F(e.attribute),
+        w(e.attribute),
         K(e.measure),
         e.operator,
         e.count,
@@ -681,7 +681,7 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
         e.composeCode
       );
     case "MeasureRankingFilter":
-      return new qr(
+      return new Fr(
         K(e.measure),
         e.operator,
         e.count,
@@ -689,8 +689,8 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
         e.composeCode
       );
     case "NumericFilter":
-      return new Fr(
-        F(e.attribute),
+      return new br(
+        w(e.attribute),
         e.operatorA,
         e.valueA,
         e.operatorB,
@@ -700,7 +700,7 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
       );
     case "TextFilter":
       return new hr(
-        F(e.attribute),
+        w(e.attribute),
         e.operatorA,
         e.valueA,
         e.config,
@@ -708,8 +708,8 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
       );
     case "DateRangeFilter": {
       const { valueA: t, valueB: i } = e;
-      return new br(
-        F(e.attribute),
+      return new gr(
+        w(e.attribute),
         t,
         i,
         e.config,
@@ -717,8 +717,8 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
       );
     }
     case "RelativeDateFilter":
-      return new gr(
-        F(e.attribute),
+      return new yr(
+        w(e.attribute),
         e.offset,
         e.count,
         e.operator,
@@ -727,8 +727,8 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
         e.composeCode
       );
     case "CustomFilter":
-      return new mr(
-        F(e.attribute),
+      return new pr(
+        w(e.attribute),
         e.jaqlExpression,
         e.config,
         e.composeCode
@@ -739,7 +739,7 @@ const R = (e) => e === void 0 ? Dr.None : e, ht = (e) => new Qe(e.metadataItem,
 };
 l.registerCustom(
   {
-    isApplicable: Ke,
+    isApplicable: je,
     serialize: (e) => e.serialize(),
     deserialize: (e) => ht(e)
   },
@@ -747,49 +747,49 @@ l.registerCustom(
 );
 l.registerCustom(
   {
-    isApplicable: Ye,
+    isApplicable: Qe,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => v(e)
+    deserialize: (e) => ee(e)
   },
   "DimensionalAttribute"
 );
 l.registerCustom(
   {
-    isApplicable: He,
+    isApplicable: Ye,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ee(e)
+    deserialize: (e) => re(e)
   },
   "DimensionalLevelAttribute"
 );
 l.registerCustom(
   {
-    isApplicable: Ir,
+    isApplicable: Pr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Se(e)
+    deserialize: (e) => Te(e)
   },
   "DimensionalDimension"
 );
 l.registerCustom(
   {
-    isApplicable: _r,
+    isApplicable: kr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => ze(e)
+    deserialize: (e) => Se(e)
   },
   "DimensionalDateDimension"
 );
 l.registerCustom(
   {
-    isApplicable: Xe,
+    isApplicable: ve,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => re(e)
+    deserialize: (e) => te(e)
   },
   "DimensionalBaseMeasure"
 );
 l.registerCustom(
   {
-    isApplicable: Ze,
+    isApplicable: He,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => te(e)
+    deserialize: (e) => ie(e)
   },
   "DimensionalCalculatedMeasure"
 );
@@ -797,189 +797,251 @@ l.registerCustom(
   {
     isApplicable: Ge,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => Oe(e)
+    deserialize: (e) => ze(e)
   },
   "DimensionalMeasureTemplate"
 );
 l.registerCustom(
   {
-    isApplicable: G,
+    isApplicable: X,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "MembersFilter"
 );
 l.registerCustom(
   {
-    isApplicable: ve,
+    isApplicable: Xe,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "LogicalAttributeFilter"
 );
 l.registerCustom(
   {
-    isApplicable: er,
+    isApplicable: Ze,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "CascadingFilter"
 );
 l.registerCustom(
   {
-    isApplicable: rr,
+    isApplicable: er,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "ExcludeFilter"
 );
 l.registerCustom(
   {
-    isApplicable: tr,
+    isApplicable: rr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "MeasureFilter"
 );
 l.registerCustom(
   {
-    isApplicable: ir,
+    isApplicable: tr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "RankingFilter"
 );
 l.registerCustom(
   {
-    isApplicable: sr,
+    isApplicable: ir,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "MeasureRankingFilter"
 );
 l.registerCustom(
   {
-    isApplicable: nr,
+    isApplicable: sr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "NumericFilter"
 );
 l.registerCustom(
   {
-    isApplicable: ar,
+    isApplicable: nr,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "TextFilter"
 );
 l.registerCustom(
   {
-    isApplicable: or,
+    isApplicable: ar,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "DateRangeFilter"
 );
 l.registerCustom(
   {
-    isApplicable: ur,
+    isApplicable: or,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "RelativeDateFilter"
 );
 l.registerCustom(
   {
-    isApplicable: lr,
+    isApplicable: ur,
     serialize: (e) => e.serialize(),
-    deserialize: (e) => m(e)
+    deserialize: (e) => h(e)
   },
   "CustomFilter"
 );
-const ti = l, x = "DM.";
+const ti = l, F = "DM.";
 function A(e) {
   return typeof e == "object" && e !== null && "function" in e && "args" in e;
 }
-function ie(e) {
+function se(e) {
   return e.every(A);
 }
-function U(e) {
+function W(e) {
   return "attribute" in e && "config" in e;
 }
-function _(e) {
+function L(e) {
   return "left" in e && "right" in e && "operator" in e;
 }
-function Te(e) {
-  return !U(e) && !_(e);
+function Ie(e) {
+  return !W(e) && !L(e);
 }
-function qt(e) {
+function Ft(e) {
   return e.every((r) => typeof r == "string");
 }
-function Be(e) {
-  const r = e.split(".");
-  if (r.length < 3 || `${r[0]}.` !== x)
+function wt(e) {
+  const r = [...e].sort((a, n) => n.name.length - a.name.length), t = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map();
+  for (const a of e) {
+    t.set(a.name, a);
+    const n = [...a.columns].sort((u, c) => c.name.length - u.name.length);
+    s.set(a.name, n);
+    const o = /* @__PURE__ */ new Map();
+    for (const u of a.columns)
+      o.set(u.name, u);
+    i.set(a.name, o);
+  }
+  return {
+    sortedTables: r,
+    tableColumnMap: s,
+    tableMap: t,
+    columnMap: i
+  };
+}
+function Oe(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: "${x}TableName.ColumnName[.Level]"`
+      `Invalid dimensional element name format: "${e}". Expected format: "${F}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 };
+  let i, s;
+  for (const f of r.sortedTables)
+    if (t.startsWith(f.name + ".")) {
+      const m = t.slice(f.name.length + 1);
+      if (!m)
+        throw new Error(
+          `Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`
+        );
+      i = f, s = m;
+      break;
+    }
+  if (!i) {
+    const f = t.indexOf(".");
+    if (f === -1)
+      throw new Error(
+        `Invalid dimensional element name format: "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`
+      );
+    const m = t.slice(0, f);
+    throw new Error(`Table "${m}" not found in the data model`);
+  }
+  const a = r.tableColumnMap.get(i.name);
+  if (!a)
+    throw new Error(`Table "${i.name}" found but has no columns`);
+  let n, o;
+  const u = _.all;
+  for (const f of a) {
+    if (s === f.name)
+      return { table: i, column: f };
+    if (!s.startsWith(f.name + "."))
+      continue;
+    const m = s.slice(f.name.length + 1);
+    if (!m)
+      continue;
+    const y = u.includes(m), d = Z(f.dataType);
+    if (y) {
+      if (d)
+        return { table: i, column: f, level: m };
+      n || (n = f, o = m);
+      continue;
+    }
+    d && !n && (n = f, o = m);
+  }
+  if (n && o)
+    throw u.includes(o) ? new Error(
+      `Invalid date level "${o}" in dimensional element "${e}". Column "${i.name}.${n.name}" is not a datetime column`
+    ) : new Error(
+      `Invalid date level "${o}" in dimensional element "${e}". Valid levels are: ${u.join(
+        ", "
+      )}`
+    );
+  const c = s.indexOf("."), p = c === -1 ? s : s.slice(0, c);
+  throw new Error(`Column "${p}" not found in table "${i.name}"`);
 }
-function Pe(e, r, t) {
-  const i = t.find((a) => a.name === e);
-  if (!i)
-    throw new Error(`Table "${e}" not found in the data model`);
-  const s = i.columns.find((a) => a.name === r);
-  if (!s)
-    throw new Error(`Column "${r}" not found in table "${e}"`);
-  return { table: i, column: s };
-}
-function wt(e, r) {
-  const { tableName: t, columnName: i, level: s } = Be(e), { column: a } = Pe(t, i, r);
+function qt(e, r) {
+  const { table: t, column: i, level: s } = Oe(e, r);
   if (s) {
-    if (!ge(a.dataType))
+    if (!Z(i.dataType))
       throw new Error(
-        `Invalid date level "${s}" in dimensional element "${e}". Column "${t}.${i}" is not a datetime column`
+        `Invalid date level "${s}" in dimensional element "${e}". Column "${t.name}.${i.name}" is not a datetime column`
       );
-    const n = j.all;
-    if (!n.includes(s))
+    const a = _.all;
+    if (!a.includes(s))
       throw new Error(
-        `Invalid date level "${s}" in dimensional element "${e}". Valid levels are: ${n.join(
+        `Invalid date level "${s}" in dimensional element "${e}". Valid levels are: ${a.join(
           ", "
         )}`
       );
-    const o = j.dateOnly;
-    if (a.dataType === "date" && !o.includes(s))
+    const n = _.dateOnly;
+    if (i.dataType === "date" && !n.includes(s))
       throw new Error(
-        `Invalid level "${s}" in dimensional element "${e}". Column "${t}.${i}" is only a date column, not a datetime column`
+        `Invalid level "${s}" in dimensional element "${e}". Column "${t.name}.${i.name}" is only a date column, not a datetime column`
       );
-    const u = j.timeOnly;
-    if (a.dataType === "time" && !u.includes(s))
+    const o = _.timeOnly;
+    if (i.dataType === "time" && !o.includes(s))
       throw new Error(
-        `Invalid level "${s}" in dimensional element "${e}". Column "${t}.${i}" is only a time column, not a date column`
+        `Invalid level "${s}" in dimensional element "${e}". Column "${t.name}.${i.name}" is only a time column, not a date column`
       );
   }
-  return { column: a, level: s };
+  return { column: i, level: s };
 }
-function ke(e) {
-  return e.type === z.TextAttribute;
+function Be(e) {
+  return e.type === S.TextAttribute;
 }
-function Ie(e) {
-  return e.type === z.NumericAttribute;
+function Pe(e) {
+  return e.type === S.NumericAttribute;
 }
 function Et(e) {
-  return e.type === z.DateLevel;
+  return e.type === S.DateLevel;
 }
-function At(e) {
-  return ke(e) || Ie(e);
+function xt(e) {
+  return Be(e) || Pe(e);
 }
 function J(e) {
-  return e.type === z.TextAttribute ? "text" : e.type === z.NumericAttribute ? "numeric" : e.type === z.DateLevel ? "date/datetime" : "unknown";
+  return e.type === S.TextAttribute ? "text" : e.type === S.NumericAttribute ? "numeric" : e.type === S.DateLevel ? "date/datetime" : "unknown";
 }
-function se(e, r, t) {
-  const { column: i, level: s } = wt(e, t);
-  return Mr({
+function ne(e, r, t) {
+  const { column: i, level: s } = qt(e, t);
+  return Dr({
     expression: i.expression,
     dataType: i.dataType,
     granularity: s,
@@ -988,28 +1050,27 @@ function se(e, r, t) {
     dataSource: r
   });
 }
-function xt(e, r, t) {
-  const { tableName: i, columnName: s, level: a } = Be(e);
-  if (a)
+function At(e, r, t) {
+  const { column: i, level: s } = Oe(e, t);
+  if (s)
     throw new Error(
-      `Invalid DateDimension name format: "${e}". Expected format: "${x}TableName.ColumnName"`
+      `Invalid DateDimension name format: "${e}". Expected format: "${F}TableName.ColumnName"`
     );
-  const { column: n } = Pe(i, s, t);
-  if (!ge(n.dataType))
+  if (!Z(i.dataType))
     throw new Error(
-      `Invalid DateDimension name "${e}". Column "${i}.${s}" is not a datetime column (got ${n.dataType}).`
+      `Invalid DateDimension name "${e}". Column "${i.name}" is not a datetime column (got ${i.dataType}).`
     );
-  return Ur({
-    name: s,
-    expression: n.expression,
+  return Vr({
+    name: i.name,
+    expression: i.expression,
     dataSource: r
   });
 }
 const Ct = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context;
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context;
   if (!r)
     return { success: !0, data: [] };
-  if (!qt(r))
+  if (!Ft(r))
     return {
       success: !1,
       errors: [
@@ -1029,37 +1090,37 @@ const Ct = (e) => {
       input: n
     };
     try {
-      const c = se(n, t, i);
+      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 }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(b({}, u), { message: p }));
     }
   }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: s };
 };
-function ne(e, r) {
+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 $t(e, r) {
-  const t = e.replace("measureFactory.", ""), s = ne(Rr, t)(...r);
-  if (!Te(s))
+  const t = e.replace("measureFactory.", ""), s = ae(Mr, t)(...r);
+  if (!Ie(s))
     throw new Error(`Function "${e}" did not return a valid Measure`);
   return s;
 }
 function Dt(e, r) {
-  const t = e.replace("filterFactory.logic.", ""), s = ne(Nr, t)(...r);
-  if (!_(s))
+  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 Mt(e, r) {
   if (e.startsWith("filterFactory.logic."))
     return Dt(e, r);
-  const t = e.replace("filterFactory.", ""), s = ne(Sr, t)(...r);
-  if (!U(s) && !_(s))
+  const t = e.replace("filterFactory.", ""), s = ae(Nr, t)(...r);
+  if (!W(s) && !L(s))
     throw new Error(`Function "${e}" did not return a valid Filter or FilterRelations`);
   return s;
 }
@@ -1074,7 +1135,7 @@ function Rt(e, r) {
   );
 }
 const Nt = /\[([a-zA-Z_][a-zA-Z0-9_.-]*)\]/g;
-function St(e, r, t = {}) {
+function Tt(e, r, t = {}) {
   const {
     warnUnusedContext: i = !0,
     errorOnUnusedContext: s = !0,
@@ -1094,46 +1155,46 @@ function St(e, r, t = {}) {
     return o.errors.push(
       `${n}args[2]: Context cannot be empty - custom formulas require context definitions`
     ), o.isValid = !1, o;
-  const c = Nt, d = /* @__PURE__ */ new Set();
-  let g;
-  for (; (g = c.exec(e)) !== null; ) {
-    const b = g[1];
-    d.add(b);
+  const c = Nt, p = /* @__PURE__ */ new Set();
+  let f;
+  for (; (f = c.exec(e)) !== null; ) {
+    const y = f[1];
+    p.add(y);
   }
-  o.references = Array.from(d), o.references.length === 0 && o.warnings.push(
+  o.references = Array.from(p), o.references.length === 0 && o.warnings.push(
     `${n}args[1]: No bracket references found in formula - ensure this is intentional`
   );
-  const y = [];
-  for (const b of o.references)
-    u.includes(b) || y.push(b);
-  if (y.length > 0 && (o.isValid = !1, y.length === 1 ? o.errors.push(
-    `${n}args[1]: Reference [${y[0]}] not found in context. Available keys: ${u.join(", ")}`
+  const m = [];
+  for (const y of o.references)
+    u.includes(y) || m.push(y);
+  if (m.length > 0 && (o.isValid = !1, m.length === 1 ? o.errors.push(
+    `${n}args[1]: Reference [${m[0]}] not found in context. Available keys: ${u.join(", ")}`
   ) : o.errors.push(
-    `${n}args[1]: References [${y.join(
+    `${n}args[1]: References [${m.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(
+    const y = u.filter((d) => !o.references.includes(d));
+    if (o.unusedContextKeys = y, y.length > 0) {
+      const d = `${n}args[2]: Context keys [${y.join(
         ", "
       )}] are defined but not used in formula`;
-      s ? (o.errors.push(f), o.isValid = !1) : i && o.warnings.push(f);
+      s ? (o.errors.push(d), o.isValid = !1) : i && o.warnings.push(d);
     }
   }
   return o;
 }
-function zt(e, r, t = {}) {
-  const i = St(e, r, t);
+function St(e, r, t = {}) {
+  const i = Tt(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 Ot(e, r) {
+function zt(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];
-  zt(t, i, {
+  St(t, i, {
     errorPrefix: `${r.pathPrefix}`,
     errorOnUnusedContext: !0,
     // Strict validation: all context keys must be used
@@ -1144,20 +1205,20 @@ function Ot(e, r) {
   for (const [a, n] of Object.entries(i)) {
     const o = `args[2].${a}`;
     if (A(n))
-      s[`${a}`] = w({
+      s[`${a}`] = E({
         data: n,
         context: {
           dataSource: r.dataSource,
-          tables: r.tables,
+          schemaIndex: r.schemaIndex,
           pathPrefix: o
         }
       });
-    else if (typeof n == "string" && n.startsWith(x))
+    else if (typeof n == "string" && n.startsWith(F))
       try {
-        s[`${a}`] = se(
+        s[`${a}`] = ne(
           n,
           r.dataSource,
-          r.tables
+          r.schemaIndex
         );
       } catch (u) {
         const c = u instanceof Error ? u.message : "Unknown error";
@@ -1167,20 +1228,20 @@ function Ot(e, r) {
       s[`${a}`] = n;
     else
       throw new Error(
-        `${o}: Invalid context value for key '${a}'. Expected a function call or attribute reference (${x}...), but got: ${typeof n}`
+        `${o}: Invalid context value for key '${a}'. Expected a function call or attribute reference (${F}...), but got: ${typeof n}`
       );
   }
   e[2] = s;
 }
-function ae(e, r) {
+function oe(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 = ae(e, r);
-  if (!At(t))
+function ge(e, r) {
+  const t = oe(e, r);
+  if (!xt(t))
     throw new Error(
       `${r.pathPrefix}args[0]: Attribute must be string or numeric type, got ${J(
         t
@@ -1188,8 +1249,8 @@ function me(e, r) {
     );
 }
 function D(e, r) {
-  const t = ae(e, r);
-  if (!Ie(t))
+  const t = oe(e, r);
+  if (!Pe(t))
     throw new Error(
       `${r.pathPrefix}args[0]: Attribute must be numeric type, got ${J(
         t
@@ -1197,32 +1258,32 @@ function D(e, r) {
     );
 }
 function M(e, r) {
-  const t = ae(e, r);
-  if (!ke(t))
+  const t = oe(e, r);
+  if (!Be(t))
     throw new Error(
       `${r.pathPrefix}args[0]: Attribute must be string type, got ${J(
         t
       )} attribute`
     );
 }
-function Tt(e, r) {
+function It(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 Bt(e, r) {
-  const t = Tt(e, r);
-  if (!G(t))
+function Ot(e, r) {
+  const t = It(e, r);
+  if (!X(t))
     throw new Error(
       `${r.pathPrefix}args[0]: exclude filter only accepts members filter, got ${t.__serializable || "unknown"} filter`
     );
 }
-const Pt = {
-  "measureFactory.customFormula": Ot,
+const Bt = {
+  "measureFactory.customFormula": zt,
   // String | Number filters
-  "filterFactory.equals": me,
-  "filterFactory.doesntEqual": me,
+  "filterFactory.equals": ge,
+  "filterFactory.doesntEqual": ge,
   // Numeric filters
   "filterFactory.greaterThan": D,
   "filterFactory.greaterThanOrEqual": D,
@@ -1240,12 +1301,12 @@ const Pt = {
   "filterFactory.doesntEndWith": M,
   "filterFactory.like": M,
   // Exclude filter
-  "filterFactory.exclude": Bt
+  "filterFactory.exclude": Ot
 };
-function kt(e) {
-  return Pt[`${e}`];
+function Pt(e) {
+  return Bt[`${e}`];
 }
-const It = {
+const kt = {
   // ==================== MEASURE FACTORY FUNCTIONS ====================
   // Basic aggregations
   "measureFactory.sum": [
@@ -1768,15 +1829,15 @@ const It = {
     { type: "FilterRelationsNode", required: !0 }
   ]
 };
-function oe(e) {
-  return It[`${e}`];
+function ue(e) {
+  return kt[`${e}`];
 }
-function _t(e) {
-  const r = oe(e);
+function Lt(e) {
+  const r = ue(e);
   return r ? r.filter((t) => t.required).length : 0;
 }
-function Lt(e) {
-  const r = oe(e);
+function _t(e) {
+  const r = ue(e);
   return r ? r.length : 0;
 }
 function Vt(e) {
@@ -1789,31 +1850,31 @@ function Vt(e) {
   return !isNaN(i.getTime());
 }
 function Q(e, r, t, i) {
-  if (e.startsWith(x))
+  if (e.startsWith(F))
     try {
-      return se(e, r, t);
+      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: "${x}TableName.ColumnName[.Level]"`
+    `${i}: Invalid attribute "${e}". Expected format: "${F}TableName.ColumnName[.Level]"`
   );
 }
 function Ut(e, r, t, i) {
-  if (e.startsWith(x))
+  if (e.startsWith(F))
     try {
-      return xt(e, r, t);
+      return At(e, r, t);
     } catch (s) {
       const a = s instanceof Error ? s.message : "Unknown error";
       throw new Error(`${i}: ${a}`);
     }
   throw new Error(
-    `${i}: Invalid date dimension string "${e}". Expected format: "${x}TableName.ColumnName"`
+    `${i}: Invalid date dimension string "${e}". Expected format: "${F}TableName.ColumnName"`
   );
 }
-function Jt(e) {
-  const r = e.data, { argSchema: t, dataSource: i, tables: s, pathPrefix: a } = e.context, n = a;
+function Wt(e) {
+  const r = e.data, { argSchema: t, dataSource: i, schemaIndex: 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})`);
@@ -1874,9 +1935,9 @@ function Jt(e) {
         throw new Error(
           `${n}: Expected measure function call, got ${typeof r}. Example: {"function": "measureFactory.sum", "args": ["DM.Commerce.Revenue"]}`
         );
-      return w({
+      return E({
         data: r,
-        context: { dataSource: i, tables: s, pathPrefix: n }
+        context: { dataSource: i, schemaIndex: s, pathPrefix: n }
       });
     case "Measure[]":
       if (!Array.isArray(r))
@@ -1888,9 +1949,9 @@ function Jt(e) {
           throw new Error(
             `${n}[${u}]: Expected measure function call, got ${typeof o}`
           );
-        return w({
+        return E({
           data: o,
-          context: { dataSource: i, tables: s, pathPrefix: `${n}[${u}]: ` }
+          context: { dataSource: i, schemaIndex: s, pathPrefix: `${n}[${u}]: ` }
         });
       });
     case "Filter":
@@ -1898,9 +1959,9 @@ function Jt(e) {
         throw new Error(
           `${n}: Expected filter function call, got ${typeof r}. Example: {"function": "filterFactory.contains", "args": ["DM.Brand.Brand", "Apple"]}`
         );
-      return w({
+      return E({
         data: r,
-        context: { dataSource: i, tables: s, pathPrefix: n }
+        context: { dataSource: i, schemaIndex: s, pathPrefix: n }
       });
     case "Filter[]":
       if (!Array.isArray(r))
@@ -1912,9 +1973,9 @@ function Jt(e) {
           throw new Error(
             `${n}[${u}]: Expected filter function call, got ${typeof o}`
           );
-        return w({
+        return E({
           data: o,
-          context: { dataSource: i, tables: s, pathPrefix: `${n}[${u}]: ` }
+          context: { dataSource: i, schemaIndex: s, pathPrefix: `${n}[${u}]: ` }
         });
       });
     case "FilterRelationsNode":
@@ -1924,15 +1985,15 @@ function Jt(e) {
             throw new Error(
               `${n}[${u}]: Expected filter function call, got ${typeof o}`
             );
-          return w({
+          return E({
             data: o,
-            context: { dataSource: i, tables: s, pathPrefix: `${n}[${u}]: ` }
+            context: { dataSource: i, schemaIndex: s, pathPrefix: `${n}[${u}]: ` }
           });
         });
       if (A(r))
-        return w({
+        return E({
           data: r,
-          context: { dataSource: i, tables: s, pathPrefix: n }
+          context: { dataSource: i, schemaIndex: s, pathPrefix: n }
         });
       throw new Error(
         `${n}: Expected filter function call or array of filters, got ${typeof r}`
@@ -1966,9 +2027,9 @@ function Jt(e) {
       if (typeof r == "number")
         return r;
       if (A(r))
-        return w({
+        return E({
           data: r,
-          context: { dataSource: i, tables: s, pathPrefix: n }
+          context: { dataSource: i, schemaIndex: s, pathPrefix: n }
         });
       throw new Error(
         `${n}: Expected measure function call or number, got ${typeof r}`
@@ -2002,69 +2063,69 @@ function Jt(e) {
       return r;
   }
 }
-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);
+function E(e) {
+  const { data: r } = e, { dataSource: t, schemaIndex: i, pathPrefix: s } = e.context, { function: a, args: n } = r, o = s ? `${s}.` : "", u = ue(a);
   if (!u)
     throw new Error(`${o}function: Unknown function "${a}"`);
-  const c = _t(a), d = Lt(a);
+  const c = Lt(a), p = _t(a);
   if (n.length < c)
     throw new Error(
       `${o}function: Expected at least ${c} arguments, got ${n.length}`
     );
-  if (n.length > d)
+  if (n.length > p)
     throw new Error(
-      `${o}function: Expected at most ${d} arguments, got ${n.length}`
+      `${o}function: Expected at most ${p} arguments, got ${n.length}`
     );
-  const g = [], y = [];
-  for (let f = 0; f < Math.max(n.length, u.length); f++) {
-    const p = u[`${f}`], C = n[`${f}`], T = o ? `${o}args[${f}]` : `args[${f}]`;
+  const f = [], m = [];
+  for (let d = 0; d < Math.max(n.length, u.length); d++) {
+    const g = u[`${d}`], C = n[`${d}`], I = o ? `${o}args[${d}]` : `args[${d}]`;
     if (C === void 0) {
-      p != null && p.required && y.push(`${T}: Missing required argument (expected ${p.type})`);
+      g != null && g.required && m.push(`${I}: Missing required argument (expected ${g.type})`);
       continue;
     }
-    if (!p) {
-      y.push(`${T}: Unexpected argument`);
+    if (!g) {
+      m.push(`${I}: Unexpected argument`);
       continue;
     }
     try {
-      const N = Jt({
+      const N = Wt({
         data: C,
         context: {
           dataSource: t,
-          tables: i,
-          pathPrefix: T,
-          argSchema: p
+          schemaIndex: i,
+          pathPrefix: I,
+          argSchema: g
         }
       });
-      g.push(N);
+      f.push(N);
     } catch (N) {
       const Le = N instanceof Error ? N.message : "Unknown error";
-      y.push(Le);
+      m.push(Le);
     }
   }
-  if (y.length > 0) {
-    const f = y.join("; ");
-    throw new Error(f);
+  if (m.length > 0) {
+    const d = m.join("; ");
+    throw new Error(d);
   }
-  const b = kt(a);
-  if (b)
+  const y = Pt(a);
+  if (y)
     try {
-      b(g, {
+      y(f, {
         dataSource: t,
-        tables: i,
+        schemaIndex: i,
         pathPrefix: o
       });
-    } catch (f) {
-      const p = f instanceof Error ? f.message : "Unknown validation error";
-      throw new Error(p);
+    } catch (d) {
+      const g = d instanceof Error ? d.message : "Unknown validation error";
+      throw new Error(g);
     }
-  return Rt(a, g);
+  return Rt(a, f);
 }
-function _e(e) {
+function ke(e) {
   const { attribute: r, config: t } = e;
-  if (G(e) && zr(r)) {
+  if (X(e) && Tr(r)) {
     const { granularity: i } = r;
-    return Or(
+    return Sr(
       r,
       e.members.map((s) => i === "Years" && !isNaN(Number(s)) ? `${s}-01-01T00:00:00` : s),
       t
@@ -2072,14 +2133,14 @@ function _e(e) {
   }
   return e;
 }
-function jt(e) {
+function Jt(e) {
   let r = [];
   for (const t of e)
-    _(t) ? r = ce(t, r) : r = ce([_e(t)], r);
+    L(t) ? r = fe(t, r) : r = fe([ke(t)], r);
   return r != null ? r : [];
 }
-const Wt = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+const jt = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context, s = [], a = [];
   return r.forEach((n, o) => {
     const u = {
       category: "filters",
@@ -2087,21 +2148,21 @@ const Wt = (e) => {
       input: n
     };
     try {
-      const c = w({
+      const c = E({
         data: n,
-        context: { dataSource: t, tables: i, pathPrefix: "" }
+        context: { dataSource: t, schemaIndex: i, pathPrefix: "" }
       });
-      !_(c) && !U(c) ? a.push(q(h({}, u), { message: "Invalid filter JSON" })) : s.push(c);
+      !L(c) && !W(c) ? a.push(q(b({}, 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 }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(b({}, u), { message: p }));
     }
-  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: jt(s) };
+  }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: Jt(s) };
 }, Kt = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context;
-  return r ? ie(r) ? Wt({
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context;
+  return r ? se(r) ? jt({
     data: r,
-    context: { dataSource: t, tables: i }
+    context: { dataSource: t, schemaIndex: i }
   }) : {
     success: !1,
     errors: [
@@ -2114,7 +2175,7 @@ const Wt = (e) => {
     ]
   } : { success: !0, data: [] };
 }, Qt = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context, s = [], a = [];
   return r.forEach((n, o) => {
     const u = {
       category: "highlights",
@@ -2122,21 +2183,21 @@ const Wt = (e) => {
       input: n
     };
     try {
-      const c = w({
+      const c = E({
         data: n,
-        context: { dataSource: t, tables: i, pathPrefix: "" }
+        context: { dataSource: t, schemaIndex: i, pathPrefix: "" }
       });
-      U(c) ? s.push(_e(c)) : a.push(q(h({}, u), { message: "Invalid filter JSON" }));
+      W(c) ? s.push(ke(c)) : a.push(q(b({}, u), { message: "Invalid filter JSON" }));
     } catch (c) {
-      const d = c instanceof Error ? c.message : "Unknown error";
-      a.push(q(h({}, u), { message: d }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(b({}, u), { message: p }));
     }
   }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: s };
 }, Yt = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context;
-  return r ? ie(r) ? Qt({
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context;
+  return r ? se(r) ? Qt({
     data: r,
-    context: { dataSource: t, tables: i }
+    context: { dataSource: t, schemaIndex: i }
   }) : {
     success: !1,
     errors: [
@@ -2148,8 +2209,8 @@ const Wt = (e) => {
       }
     ]
   } : { success: !0, data: [] };
-}, Ht = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = [];
+}, vt = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context, s = [], a = [];
   return r.forEach((n, o) => {
     const u = {
       category: "measures",
@@ -2157,21 +2218,21 @@ const Wt = (e) => {
       input: n
     };
     try {
-      const c = w({
+      const c = E({
         data: n,
-        context: { dataSource: t, tables: i, pathPrefix: "" }
+        context: { dataSource: t, schemaIndex: i, pathPrefix: "" }
       });
-      Te(c) ? s.push(c) : a.push(q(h({}, u), { message: "Invalid measure JSON" }));
+      Ie(c) ? s.push(c) : a.push(q(b({}, u), { message: "Invalid measure JSON" }));
     } catch (c) {
-      const d = c instanceof Error ? c.message : "Unknown error";
-      a.push(q(h({}, u), { message: d }));
+      const p = c instanceof Error ? c.message : "Unknown error";
+      a.push(q(b({}, u), { message: p }));
     }
   }), a.length > 0 ? { success: !1, errors: a } : { success: !0, data: s };
-}, Xt = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context;
-  return r ? ie(r) ? Ht({
+}, Ht = (e) => {
+  const { data: r } = e, { dataSource: t, schemaIndex: i } = e.context;
+  return r ? se(r) ? vt({
     data: r,
-    context: { dataSource: t, tables: i }
+    context: { dataSource: t, schemaIndex: i }
   }) : {
     success: !1,
     errors: [
@@ -2184,46 +2245,46 @@ const Wt = (e) => {
     ]
   } : { success: !0, data: [] };
 }, ii = (e) => {
-  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = [], a = (g) => {
-    const y = g();
-    return y.success ? y.data : (s.push(...y.errors), null);
-  }, n = a(
+  const { data: r } = e, { dataSource: t, tables: i } = e.context, s = wt(i), a = [], n = (m) => {
+    const y = m();
+    return y.success ? y.data : (a.push(...y.errors), null);
+  }, o = n(
     () => Ct({
       data: r.dimensions || [],
-      context: { dataSource: t, tables: i }
+      context: { dataSource: t, schemaIndex: s }
     })
-  ), o = a(
-    () => Xt({
+  ), u = n(
+    () => Ht({
       data: r.measures || [],
-      context: { dataSource: t, tables: i }
+      context: { dataSource: t, schemaIndex: s }
     })
-  ), u = a(
+  ), c = n(
     () => Kt({
       data: r.filters || [],
-      context: { dataSource: t, tables: i }
+      context: { dataSource: t, schemaIndex: s }
     })
   );
-  let c = null;
-  return r.highlights && (c = a(
+  let p = null;
+  return r.highlights && (p = n(
     () => Yt({
       data: r.highlights || [],
-      context: { dataSource: t, tables: i }
+      context: { dataSource: t, schemaIndex: s }
     })
-  )), s.length > 0 ? {
+  )), a.length > 0 ? {
     success: !1,
-    errors: s
+    errors: a
   } : {
     success: !0,
-    data: h({
-      dataSource: Tr(t),
-      dimensions: n || [],
-      measures: o || [],
-      filters: u || []
-    }, c && { highlights: c })
+    data: b({
+      dataSource: zr(t),
+      dimensions: o || [],
+      measures: u || [],
+      filters: c || []
+    }, p && { highlights: p })
   };
 };
-function Zt(e) {
-  const { filters: r, relations: t } = kr(
+function Gt(e) {
+  const { filters: r, relations: t } = Br(
     e.filters || []
   );
   return {
@@ -2237,8 +2298,8 @@ function Zt(e) {
   };
 }
 function si(e, r, t = !1) {
-  const i = Zt(e), s = Br(i, r);
-  return Pr(s, t);
+  const i = Gt(e), s = Ir(i, r);
+  return Or(s, t);
 }
 export {
   ti as CustomSuperJSON,