@sisense/sdk-ui 2.15.0 → 2.16.1

package/dist/{execute-query-D1JOjJ8n.js → execute-query-CFK2R_1S.js}

@@ -1,15 +1,15 @@
-var _s = Object.defineProperty, Ms = Object.defineProperties;
-var Ds = Object.getOwnPropertyDescriptors;
+var Ms = Object.defineProperty, Ds = Object.defineProperties;
+var Rs = Object.getOwnPropertyDescriptors;
 var $n = Object.getOwnPropertySymbols;
-var Rs = Object.prototype.hasOwnProperty, Ls = Object.prototype.propertyIsEnumerable;
-var Bn = (e, t, n) => t in e ? _s(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, y = (e, t) => {
+var Ls = Object.prototype.hasOwnProperty, Fs = Object.prototype.propertyIsEnumerable;
+var Bn = (e, t, n) => t in e ? Ms(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, y = (e, t) => {
   for (var n in t || (t = {}))
-    Rs.call(t, n) && Bn(e, n, t[n]);
+    Ls.call(t, n) && Bn(e, n, t[n]);
   if ($n)
     for (var n of $n(t))
-      Ls.call(t, n) && Bn(e, n, t[n]);
+      Fs.call(t, n) && Bn(e, n, t[n]);
   return e;
-}, U = (e, t) => Ms(e, Ds(t));
+}, U = (e, t) => Ds(e, Rs(t));
 var Un = (e, t, n) => new Promise((r, i) => {
   var s = (u) => {
     try {
@@ -26,7 +26,7 @@ var Un = (e, t, n) => new Promise((r, i) => {
   }, o = (u) => u.done ? r(u.value) : Promise.resolve(u.value).then(s, a);
   o((n = n.apply(e, t)).next());
 });
-const Fs = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g, Is = {
+const Is = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g, Ps = {
   "&": "&",
   "&": "&",
   "&lt;": "<",
@@ -47,7 +47,7 @@ const Fs = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|
   "&#8230;": "…",
   "&#x2F;": "/",
   "&#47;": "/"
-}, Ps = (e) => Is[e], js = (e) => e.replace(Fs, Ps);
+}, js = (e) => Ps[e], $s = (e) => e.replace(Is, js);
 let jt = {
   bindI18n: "languageChanged",
   bindI18nStore: "",
@@ -56,9 +56,9 @@ let jt = {
   transWrapTextNodes: "",
   transKeepBasicHtmlNodesFor: ["br", "strong", "i", "p"],
   useSuspense: !0,
-  unescape: js
+  unescape: $s
 };
-function $s() {
+function Bs() {
   let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   jt = y(y({}, jt), e);
 }
@@ -66,18 +66,18 @@ function Bp() {
   return jt;
 }
 let Br;
-function Bs(e) {
+function Us(e) {
   Br = e;
 }
 function Up() {
   return Br;
 }
-const Us = {
+const Ws = {
   type: "3rdParty",
   init(e) {
-    $s(e.options.react), Bs(e);
+    Bs(e.options.react), Us(e);
   }
-}, Ws = {
+}, qs = {
   type: "logger",
   log(e) {
     this.output("log", e);
@@ -99,7 +99,7 @@ class st {
   }
   init(t) {
     let n = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    this.prefix = n.prefix || "i18next:", this.logger = t || Ws, this.options = n, this.debug = n.debug;
+    this.prefix = n.prefix || "i18next:", this.logger = t || qs, this.options = n, this.debug = n.debug;
   }
   log() {
     for (var t = arguments.length, n = new Array(t), r = 0; r < t; r++)
@@ -172,7 +172,7 @@ function _e() {
 function Wn(e) {
   return e == null ? "" : "" + e;
 }
-function qs(e, t, n) {
+function zs(e, t, n) {
   e.forEach((r) => {
     t[r] && (n[r] = t[r]);
   });
@@ -202,7 +202,7 @@ function qn(e, t, n) {
   } = Zt(e, t, Object);
   r[i] = n;
 }
-function zs(e, t, n, r) {
+function Hs(e, t, n, r) {
   const {
     obj: i,
     k: s
@@ -217,7 +217,7 @@ function at(e, t) {
   if (n)
     return n[r];
 }
-function Hs(e, t, n) {
+function ks(e, t, n) {
   const r = at(e, n);
   return r !== void 0 ? r : at(t, n);
 }
@@ -229,7 +229,7 @@ function Ur(e, t, n) {
 function ge(e) {
   return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
 }
-var ks = {
+var Gs = {
   "&": "&amp;",
   "<": "&lt;",
   ">": "&gt;",
@@ -237,13 +237,13 @@ var ks = {
   "'": "&#39;",
   "/": "&#x2F;"
 };
-function Gs(e) {
-  return typeof e == "string" ? e.replace(/[&<>"'\/]/g, (t) => ks[t]) : e;
+function Vs(e) {
+  return typeof e == "string" ? e.replace(/[&<>"'\/]/g, (t) => Gs[t]) : e;
 }
-const Vs = [" ", ",", "?", "!", ";"];
-function Qs(e, t, n) {
+const Qs = [" ", ",", "?", "!", ";"];
+function Ks(e, t, n) {
   t = t || "", n = n || "";
-  const r = Vs.filter((a) => t.indexOf(a) < 0 && n.indexOf(a) < 0);
+  const r = Qs.filter((a) => t.indexOf(a) < 0 && n.indexOf(a) < 0);
   if (r.length === 0) return !0;
   const i = new RegExp(`(${r.map((a) => a === "?" ? "\\?" : a).join("|")})`);
   let s = !i.test(e);
@@ -366,7 +366,7 @@ const Hn = {};
 class lt extends gt {
   constructor(t) {
     let n = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    super(), qs(["resourceStore", "languageUtils", "pluralResolver", "interpolator", "backendConnector", "i18nFormat", "utils"], t, this), this.options = n, this.options.keySeparator === void 0 && (this.options.keySeparator = "."), this.logger = Q.create("translator");
+    super(), zs(["resourceStore", "languageUtils", "pluralResolver", "interpolator", "backendConnector", "i18nFormat", "utils"], t, this), this.options = n, this.options.keySeparator === void 0 && (this.options.keySeparator = "."), this.logger = Q.create("translator");
   }
   changeLanguage(t) {
     t && (this.language = t);
@@ -385,7 +385,7 @@ class lt extends gt {
     r === void 0 && (r = ":");
     const i = n.keySeparator !== void 0 ? n.keySeparator : this.options.keySeparator;
     let s = n.ns || this.options.defaultNS || [];
-    const a = r && t.indexOf(r) > -1, o = !this.options.userDefinedKeySeparator && !n.keySeparator && !this.options.userDefinedNsSeparator && !n.nsSeparator && !Qs(t, r, i);
+    const a = r && t.indexOf(r) > -1, o = !this.options.userDefinedKeySeparator && !n.keySeparator && !this.options.userDefinedNsSeparator && !n.nsSeparator && !Ks(t, r, i);
     if (a && !o) {
       const u = t.match(this.interpolator.nestingRegexp);
       if (u && u.length > 0)
@@ -454,11 +454,11 @@ class lt extends gt {
       c = c.join(x), c && (c = this.extendTranslation(c, t, n, r));
     else {
       let O = !1, L = !1;
-      const G = n.count !== void 0 && typeof n.count != "string", P = lt.hasDefaultValue(n), Ke = G ? this.pluralResolver.getSuffix(l, n.count, n) : "", Ns = n.ordinal && G ? this.pluralResolver.getSuffix(l, n.count, {
+      const G = n.count !== void 0 && typeof n.count != "string", P = lt.hasDefaultValue(n), Ke = G ? this.pluralResolver.getSuffix(l, n.count, n) : "", Cs = n.ordinal && G ? this.pluralResolver.getSuffix(l, n.count, {
         ordinal: !1
-      }) : "", Oe = n[`defaultValue${Ke}`] || n[`defaultValue${Ns}`] || n.defaultValue;
+      }) : "", Oe = n[`defaultValue${Ke}`] || n[`defaultValue${Cs}`] || n.defaultValue;
       !this.isValidLookup(c) && P && (O = !0, c = Oe), this.isValidLookup(c) || (L = !0, c = a);
-      const Cs = (n.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey) && L ? void 0 : c, Ne = P && Oe !== c && this.options.updateMissing;
+      const _s = (n.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey) && L ? void 0 : c, Ne = P && Oe !== c && this.options.updateMissing;
       if (L || O || Ne) {
         if (this.logger.log(Ne ? "updateKey" : "missingKey", l, u, a, Ne ? Oe : c), s) {
           const B = this.resolve(a, U(y({}, n), {
@@ -473,7 +473,7 @@ class lt extends gt {
             Ce.push(Je[B]);
         else this.options.saveMissingTo === "all" ? Ce = this.languageUtils.toResolveHierarchy(n.lng || this.language) : Ce.push(n.lng || this.language);
         const In = (B, pe, Pn) => {
-          const jn = P && Pn !== c ? Pn : Cs;
+          const jn = P && Pn !== c ? Pn : _s;
           this.options.missingKeyHandler ? this.options.missingKeyHandler(B, u, pe, jn, Ne, n) : this.backendConnector && this.backendConnector.saveMissing && this.backendConnector.saveMissing(B, u, pe, jn, Ne, n), this.emit("missingKey", B, u, pe, c);
         };
         this.options.saveMissing && (this.options.saveMissingPlurals && G ? Ce.forEach((B) => {
@@ -633,7 +633,7 @@ class kn {
     }), i;
   }
 }
-let Ks = [{
+let Js = [{
   lngs: ["ach", "ak", "am", "arn", "br", "fil", "gun", "ln", "mfe", "mg", "mi", "oc", "pt", "pt-BR", "tg", "tl", "ti", "tr", "uz", "wa"],
   nr: [1, 2],
   fc: 1
@@ -725,7 +725,7 @@ let Ks = [{
   lngs: ["he", "iw"],
   nr: [1, 2, 20, 21],
   fc: 22
-}], Js = {
+}], Ys = {
   1: function(e) {
     return +(e > 1);
   },
@@ -793,7 +793,7 @@ let Ks = [{
     return e == 1 ? 0 : e == 2 ? 1 : (e < 0 || e > 10) && e % 10 == 0 ? 2 : 3;
   }
 };
-const Ys = ["v1", "v2", "v3"], Xs = ["v4"], Gn = {
+const Xs = ["v1", "v2", "v3"], Zs = ["v4"], Gn = {
   zero: 0,
   one: 1,
   two: 2,
@@ -801,21 +801,21 @@ const Ys = ["v1", "v2", "v3"], Xs = ["v4"], Gn = {
   many: 4,
   other: 5
 };
-function Zs() {
+function ea() {
   const e = {};
-  return Ks.forEach((t) => {
+  return Js.forEach((t) => {
     t.lngs.forEach((n) => {
       e[n] = {
         numbers: t.nr,
-        plurals: Js[t.fc]
+        plurals: Ys[t.fc]
       };
     });
   }), e;
 }
-class ea {
+class ta {
   constructor(t) {
     let n = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    this.languageUtils = t, this.options = n, this.logger = Q.create("pluralResolver"), (!this.options.compatibilityJSON || Xs.includes(this.options.compatibilityJSON)) && (typeof Intl == "undefined" || !Intl.PluralRules) && (this.options.compatibilityJSON = "v3", this.logger.error("Your environment seems not to be Intl API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.")), this.rules = Zs();
+    this.languageUtils = t, this.options = n, this.logger = Q.create("pluralResolver"), (!this.options.compatibilityJSON || Zs.includes(this.options.compatibilityJSON)) && (typeof Intl == "undefined" || !Intl.PluralRules) && (this.options.compatibilityJSON = "v3", this.logger.error("Your environment seems not to be Intl API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.")), this.rules = ea();
   }
   addRule(t, n) {
     this.rules[t] = n;
@@ -859,14 +859,14 @@ class ea {
     return this.options.compatibilityJSON === "v1" ? i === 1 ? "" : typeof i == "number" ? `_plural_${i.toString()}` : s() : this.options.compatibilityJSON === "v2" || this.options.simplifyPluralSuffix && t.numbers.length === 2 && t.numbers[0] === 1 ? s() : this.options.prepend && r.toString() ? this.options.prepend + r.toString() : r.toString();
   }
   shouldUseIntlApi() {
-    return !Ys.includes(this.options.compatibilityJSON);
+    return !Xs.includes(this.options.compatibilityJSON);
   }
 }
 function Vn(e, t, n) {
-  let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : ".", i = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, s = Hs(e, t, n);
+  let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : ".", i = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, s = ks(e, t, n);
   return !s && i && typeof n == "string" && (s = ot(e, n, r), s === void 0 && (s = ot(t, n, r))), s;
 }
-class ta {
+class na {
   constructor() {
     let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     this.logger = Q.create("interpolator"), this.options = t, this.format = t.interpolation && t.interpolation.format || ((n) => n), this.init(t);
@@ -877,7 +877,7 @@ class ta {
       escapeValue: !0
     });
     const n = t.interpolation;
-    this.escape = n.escape !== void 0 ? n.escape : Gs, this.escapeValue = n.escapeValue !== void 0 ? n.escapeValue : !0, this.useRawValueToEscape = n.useRawValueToEscape !== void 0 ? n.useRawValueToEscape : !1, this.prefix = n.prefix ? ge(n.prefix) : n.prefixEscaped || "{{", this.suffix = n.suffix ? ge(n.suffix) : n.suffixEscaped || "}}", this.formatSeparator = n.formatSeparator ? n.formatSeparator : n.formatSeparator || ",", this.unescapePrefix = n.unescapeSuffix ? "" : n.unescapePrefix || "-", this.unescapeSuffix = this.unescapePrefix ? "" : n.unescapeSuffix || "", this.nestingPrefix = n.nestingPrefix ? ge(n.nestingPrefix) : n.nestingPrefixEscaped || ge("$t("), this.nestingSuffix = n.nestingSuffix ? ge(n.nestingSuffix) : n.nestingSuffixEscaped || ge(")"), this.nestingOptionsSeparator = n.nestingOptionsSeparator ? n.nestingOptionsSeparator : n.nestingOptionsSeparator || ",", this.maxReplaces = n.maxReplaces ? n.maxReplaces : 1e3, this.alwaysFormat = n.alwaysFormat !== void 0 ? n.alwaysFormat : !1, this.resetRegExp();
+    this.escape = n.escape !== void 0 ? n.escape : Vs, this.escapeValue = n.escapeValue !== void 0 ? n.escapeValue : !0, this.useRawValueToEscape = n.useRawValueToEscape !== void 0 ? n.useRawValueToEscape : !1, this.prefix = n.prefix ? ge(n.prefix) : n.prefixEscaped || "{{", this.suffix = n.suffix ? ge(n.suffix) : n.suffixEscaped || "}}", this.formatSeparator = n.formatSeparator ? n.formatSeparator : n.formatSeparator || ",", this.unescapePrefix = n.unescapeSuffix ? "" : n.unescapePrefix || "-", this.unescapeSuffix = this.unescapePrefix ? "" : n.unescapeSuffix || "", this.nestingPrefix = n.nestingPrefix ? ge(n.nestingPrefix) : n.nestingPrefixEscaped || ge("$t("), this.nestingSuffix = n.nestingSuffix ? ge(n.nestingSuffix) : n.nestingSuffixEscaped || ge(")"), this.nestingOptionsSeparator = n.nestingOptionsSeparator ? n.nestingOptionsSeparator : n.nestingOptionsSeparator || ",", this.maxReplaces = n.maxReplaces ? n.maxReplaces : 1e3, this.alwaysFormat = n.alwaysFormat !== void 0 ? n.alwaysFormat : !1, this.resetRegExp();
   }
   reset() {
     this.options && this.init(this.options);
@@ -970,7 +970,7 @@ class ta {
     return t;
   }
 }
-function na(e) {
+function ra(e) {
   let t = e.toLowerCase().trim();
   const n = {};
   if (e.indexOf("(") > -1) {
@@ -996,7 +996,7 @@ function me(e) {
     return o || (o = e(ut(i), s), t[a] = o), o(r);
   };
 }
-class ra {
+class ia {
   constructor() {
     let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     this.logger = Q.create("formatter"), this.options = t, this.formats = {
@@ -1042,7 +1042,7 @@ class ra {
       const {
         formatName: l,
         formatOptions: d
-      } = na(u);
+      } = ra(u);
       if (this.formats[l]) {
         let f = o;
         try {
@@ -1058,10 +1058,10 @@ class ra {
     }, t);
   }
 }
-function ia(e, t) {
+function sa(e, t) {
   e.pending[t] !== void 0 && (delete e.pending[t], e.pendingCount--);
 }
-class sa extends gt {
+class aa extends gt {
   constructor(t, n, r) {
     let i = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
     super(), this.backend = t, this.store = n, this.services = r, this.languageUtils = r.languageUtils, this.options = i, this.logger = Q.create("backendConnector"), this.waitingReads = [], this.maxParallelReads = i.maxParallelReads || 10, this.readingCalls = 0, this.maxRetries = i.maxRetries >= 0 ? i.maxRetries : 5, this.retryTimeout = i.retryTimeout >= 1 ? i.retryTimeout : 350, this.state = {}, this.queue = [], this.backend && this.backend.init && this.backend.init(r, i.backend, i);
@@ -1092,7 +1092,7 @@ class sa extends gt {
     n && this.emit("failedLoading", s, a, n), r && this.store.addResourceBundle(s, a, r), this.state[t] = n ? -1 : 2;
     const o = {};
     this.queue.forEach((u) => {
-      zs(u.loaded, [s], a), ia(u, t), n && u.errors.push(n), u.pendingCount === 0 && !u.done && (Object.keys(u.loaded).forEach((l) => {
+      Hs(u.loaded, [s], a), sa(u, t), n && u.errors.push(n), u.pendingCount === 0 && !u.done && (Object.keys(u.loaded).forEach((l) => {
         o[l] || (o[l] = {});
         const d = u.loaded[l];
         d.length && d.forEach((f) => {
@@ -1257,7 +1257,7 @@ function Kn(e) {
 }
 function Ye() {
 }
-function aa(e) {
+function oa(e) {
   Object.getOwnPropertyNames(Object.getPrototypeOf(e)).forEach((n) => {
     typeof e[n] == "function" && (e[n] = e[n].bind(e));
   });
@@ -1267,7 +1267,7 @@ class Ie extends gt {
     let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, n = arguments.length > 1 ? arguments[1] : void 0;
     if (super(), this.options = Kn(t), this.services = {}, this.logger = Q, this.modules = {
       external: []
-    }, aa(this), n && !this.isInitialized && !t.isClone) {
+    }, oa(this), n && !this.isInitialized && !t.isClone) {
       if (!this.options.initImmediate)
         return this.init(t, n), this;
       setTimeout(() => {
@@ -1287,17 +1287,17 @@ class Ie extends gt {
     if (!this.options.isClone) {
       this.modules.logger ? Q.init(s(this.modules.logger), this.options) : Q.init(null, this.options);
       let d;
-      this.modules.formatter ? d = this.modules.formatter : typeof Intl != "undefined" && (d = ra);
+      this.modules.formatter ? d = this.modules.formatter : typeof Intl != "undefined" && (d = ia);
       const f = new kn(this.options);
       this.store = new zn(this.options.resources, this.options);
       const c = this.services;
-      c.logger = Q, c.resourceStore = this.store, c.languageUtils = f, c.pluralResolver = new ea(f, {
+      c.logger = Q, c.resourceStore = this.store, c.languageUtils = f, c.pluralResolver = new ta(f, {
         prepend: this.options.pluralSeparator,
         compatibilityJSON: this.options.compatibilityJSON,
         simplifyPluralSuffix: this.options.simplifyPluralSuffix
-      }), d && (!this.options.interpolation.format || this.options.interpolation.format === i.interpolation.format) && (c.formatter = s(d), c.formatter.init(c, this.options), this.options.interpolation.format = c.formatter.format.bind(c.formatter)), c.interpolator = new ta(this.options), c.utils = {
+      }), d && (!this.options.interpolation.format || this.options.interpolation.format === i.interpolation.format) && (c.formatter = s(d), c.formatter.init(c, this.options), this.options.interpolation.format = c.formatter.format.bind(c.formatter)), c.interpolator = new na(this.options), c.utils = {
         hasLoadedNamespace: this.hasLoadedNamespace.bind(this)
-      }, c.backendConnector = new sa(s(this.modules.backend), c.resourceStore, c, this.options), c.backendConnector.on("*", function(m) {
+      }, c.backendConnector = new aa(s(this.modules.backend), c.resourceStore, c, this.options), c.backendConnector.on("*", function(m) {
         for (var g = arguments.length, S = new Array(g > 1 ? g - 1 : 0), b = 1; b < g; b++)
           S[b - 1] = arguments[b];
         t.emit(m, ...S);
@@ -1491,16 +1491,16 @@ class Ie extends gt {
 }
 const qr = Ie.createInstance();
 qr.createInstance = Ie.createInstance;
-const oa = {
+const ua = {
   error: "Error"
-}, ua = {
+}, la = {
   error: "Помилка"
-}, Jn = "common", la = {
-  en: oa,
-  uk: ua
+}, Jn = "common", ca = {
+  en: ua,
+  uk: la
 }, V = qr.createInstance({
   defaultNS: Jn,
-  resources: ca(la, Jn),
+  resources: da(ca, Jn),
   lng: "en",
   fallbackLng: "en"
 }), en = {
@@ -1531,7 +1531,7 @@ const zr = (e) => {
   const i = { initPromise: n, i18nextInstance: t };
   return et.set(e.namespace, i), i;
 };
-function ca(e, t) {
+function da(e, t) {
   return Object.keys(e).reduce((n, r) => (n[r] = {
     [t]: e[r]
   }, n), {});
@@ -1542,10 +1542,10 @@ class Hr extends Error {
     super(u), this.key = i, this.namespace = t, this.interpolationOptions = o;
   }
 }
-function da(e) {
+function fa(e) {
   return e && e.replace(new RegExp("(?<!\\\\)'", "g"), "\\'");
 }
-const fa = {
+const ha = {
   errors: {
     noSisenseContext: "Sisense context is not initialized",
     restApiNotReady: "Rest API is not initialized",
@@ -1942,7 +1942,7 @@ const fa = {
       nextGroup: "Next Group"
     }
   }
-}, ha = {
+}, pa = {
   errors: {
     noSisenseContext: "Контекст Sisense не ініціалізовано",
     restApiNotReady: "Rest API не ініціалізовано",
@@ -2339,21 +2339,19 @@ const fa = {
       nextGroup: "Наступна група"
     }
   }
-}, kr = "sdkUi", pa = {
-  en: fa,
-  uk: ha
+}, kr = "sdkUi", ga = {
+  en: ha,
+  uk: pa
 };
-function ga() {
+function ma() {
   return zr({
-    resource: pa,
-    plugins: [
-      Us
-    ],
+    resource: ga,
+    plugins: [Ws],
     language: "en",
     namespace: kr
   });
 }
-const { i18nextInstance: ma } = ga(), ba = {
+const { i18nextInstance: ba } = ma(), ya = {
   errors: {
     measure: {
       unsupportedType: "Unsupported measure type",
@@ -2379,7 +2377,7 @@ const { i18nextInstance: ma } = ga(), ba = {
     },
     unsupportedDimensionalElement: "Unsupported dimensional element type"
   }
-}, ya = {
+}, va = {
   errors: {
     measure: {
       unsupportedType: "Непідтримуваний тип measure",
@@ -2405,19 +2403,19 @@ const { i18nextInstance: ma } = ga(), ba = {
     },
     unsupportedDimensionalElement: "Непідтримуваний тип елемента"
   }
-}, Gr = "sdkData", va = {
-  en: ba,
-  uk: ya
+}, Gr = "sdkData", Sa = {
+  en: ya,
+  uk: va
 };
-function Sa() {
+function Ta() {
   return zr({
-    resource: va,
+    resource: Sa,
     language: "en",
     namespace: Gr
   });
 }
-const { i18nextInstance: Ta } = Sa();
-function Aa() {
+const { i18nextInstance: Aa } = Ta();
+function wa() {
   this.__data__ = [], this.size = 0;
 }
 function ze(e, t) {
@@ -2429,22 +2427,22 @@ function mt(e, t) {
       return n;
   return -1;
 }
-var wa = Array.prototype, xa = wa.splice;
-function Ea(e) {
+var xa = Array.prototype, Ea = xa.splice;
+function Oa(e) {
   var t = this.__data__, n = mt(t, e);
   if (n < 0)
     return !1;
   var r = t.length - 1;
-  return n == r ? t.pop() : xa.call(t, n, 1), --this.size, !0;
+  return n == r ? t.pop() : Ea.call(t, n, 1), --this.size, !0;
 }
-function Oa(e) {
+function Na(e) {
   var t = this.__data__, n = mt(t, e);
   return n < 0 ? void 0 : t[n][1];
 }
-function Na(e) {
+function Ca(e) {
   return mt(this.__data__, e) > -1;
 }
-function Ca(e, t) {
+function _a(e, t) {
   var n = this.__data__, r = mt(n, e);
   return r < 0 ? (++this.size, n.push([e, t])) : n[r][1] = t, this;
 }
@@ -2455,66 +2453,66 @@ function Z(e) {
     this.set(r[0], r[1]);
   }
 }
-Z.prototype.clear = Aa;
-Z.prototype.delete = Ea;
-Z.prototype.get = Oa;
-Z.prototype.has = Na;
-Z.prototype.set = Ca;
-function _a() {
+Z.prototype.clear = wa;
+Z.prototype.delete = Oa;
+Z.prototype.get = Na;
+Z.prototype.has = Ca;
+Z.prototype.set = _a;
+function Ma() {
   this.__data__ = new Z(), this.size = 0;
 }
-function Ma(e) {
+function Da(e) {
   var t = this.__data__, n = t.delete(e);
   return this.size = t.size, n;
 }
-function Da(e) {
+function Ra(e) {
   return this.__data__.get(e);
 }
-function Ra(e) {
+function La(e) {
   return this.__data__.has(e);
 }
-var Vr = typeof global == "object" && global && global.Object === Object && global, La = typeof self == "object" && self && self.Object === Object && self, J = Vr || La || Function("return this")(), W = J.Symbol, Qr = Object.prototype, Fa = Qr.hasOwnProperty, Ia = Qr.toString, Me = W ? W.toStringTag : void 0;
-function Pa(e) {
-  var t = Fa.call(e, Me), n = e[Me];
+var Vr = typeof global == "object" && global && global.Object === Object && global, Fa = typeof self == "object" && self && self.Object === Object && self, J = Vr || Fa || Function("return this")(), W = J.Symbol, Qr = Object.prototype, Ia = Qr.hasOwnProperty, Pa = Qr.toString, Me = W ? W.toStringTag : void 0;
+function ja(e) {
+  var t = Ia.call(e, Me), n = e[Me];
   try {
     e[Me] = void 0;
     var r = !0;
   } catch (s) {
   }
-  var i = Ia.call(e);
+  var i = Pa.call(e);
   return r && (t ? e[Me] = n : delete e[Me]), i;
 }
-var ja = Object.prototype, $a = ja.toString;
-function Ba(e) {
-  return $a.call(e);
+var $a = Object.prototype, Ba = $a.toString;
+function Ua(e) {
+  return Ba.call(e);
 }
-var Ua = "[object Null]", Wa = "[object Undefined]", Yn = W ? W.toStringTag : void 0;
+var Wa = "[object Null]", qa = "[object Undefined]", Yn = W ? W.toStringTag : void 0;
 function de(e) {
-  return e == null ? e === void 0 ? Wa : Ua : Yn && Yn in Object(e) ? Pa(e) : Ba(e);
+  return e == null ? e === void 0 ? qa : Wa : Yn && Yn in Object(e) ? ja(e) : Ua(e);
 }
 function ee(e) {
   var t = typeof e;
   return e != null && (t == "object" || t == "function");
 }
-var qa = "[object AsyncFunction]", za = "[object Function]", Ha = "[object GeneratorFunction]", ka = "[object Proxy]";
+var za = "[object AsyncFunction]", Ha = "[object Function]", ka = "[object GeneratorFunction]", Ga = "[object Proxy]";
 function tn(e) {
   if (!ee(e))
     return !1;
   var t = de(e);
-  return t == za || t == Ha || t == qa || t == ka;
+  return t == Ha || t == ka || t == za || t == Ga;
 }
 var Rt = J["__core-js_shared__"], Xn = function() {
   var e = /[^.]+$/.exec(Rt && Rt.keys && Rt.keys.IE_PROTO || "");
   return e ? "Symbol(src)_1." + e : "";
 }();
-function Ga(e) {
+function Va(e) {
   return !!Xn && Xn in e;
 }
-var Va = Function.prototype, Qa = Va.toString;
+var Qa = Function.prototype, Ka = Qa.toString;
 function fe(e) {
   if (e != null) {
     try {
-      return Qa.call(e);
+      return Ka.call(e);
     } catch (t) {
     }
     try {
@@ -2524,48 +2522,48 @@ function fe(e) {
   }
   return "";
 }
-var Ka = /[\\^$.*+?()[\]{}|]/g, Ja = /^\[object .+?Constructor\]$/, Ya = Function.prototype, Xa = Object.prototype, Za = Ya.toString, eo = Xa.hasOwnProperty, to = RegExp(
-  "^" + Za.call(eo).replace(Ka, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
+var Ja = /[\\^$.*+?()[\]{}|]/g, Ya = /^\[object .+?Constructor\]$/, Xa = Function.prototype, Za = Object.prototype, eo = Xa.toString, to = Za.hasOwnProperty, no = RegExp(
+  "^" + eo.call(to).replace(Ja, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
 );
-function no(e) {
-  if (!ee(e) || Ga(e))
+function ro(e) {
+  if (!ee(e) || Va(e))
     return !1;
-  var t = tn(e) ? to : Ja;
+  var t = tn(e) ? no : Ya;
   return t.test(fe(e));
 }
-function ro(e, t) {
+function io(e, t) {
   return e == null ? void 0 : e[t];
 }
 function he(e, t) {
-  var n = ro(e, t);
-  return no(n) ? n : void 0;
+  var n = io(e, t);
+  return ro(n) ? n : void 0;
 }
 var Pe = he(J, "Map"), je = he(Object, "create");
-function io() {
+function so() {
   this.__data__ = je ? je(null) : {}, this.size = 0;
 }
-function so(e) {
+function ao(e) {
   var t = this.has(e) && delete this.__data__[e];
   return this.size -= t ? 1 : 0, t;
 }
-var ao = "__lodash_hash_undefined__", oo = Object.prototype, uo = oo.hasOwnProperty;
-function lo(e) {
+var oo = "__lodash_hash_undefined__", uo = Object.prototype, lo = uo.hasOwnProperty;
+function co(e) {
   var t = this.__data__;
   if (je) {
     var n = t[e];
-    return n === ao ? void 0 : n;
+    return n === oo ? void 0 : n;
   }
-  return uo.call(t, e) ? t[e] : void 0;
+  return lo.call(t, e) ? t[e] : void 0;
 }
-var co = Object.prototype, fo = co.hasOwnProperty;
-function ho(e) {
+var fo = Object.prototype, ho = fo.hasOwnProperty;
+function po(e) {
   var t = this.__data__;
-  return je ? t[e] !== void 0 : fo.call(t, e);
+  return je ? t[e] !== void 0 : ho.call(t, e);
 }
-var po = "__lodash_hash_undefined__";
-function go(e, t) {
+var go = "__lodash_hash_undefined__";
+function mo(e, t) {
   var n = this.__data__;
-  return this.size += this.has(e) ? 0 : 1, n[e] = je && t === void 0 ? po : t, this;
+  return this.size += this.has(e) ? 0 : 1, n[e] = je && t === void 0 ? go : t, this;
 }
 function le(e) {
   var t = -1, n = e == null ? 0 : e.length;
@@ -2574,37 +2572,37 @@ function le(e) {
     this.set(r[0], r[1]);
   }
 }
-le.prototype.clear = io;
-le.prototype.delete = so;
-le.prototype.get = lo;
-le.prototype.has = ho;
-le.prototype.set = go;
-function mo() {
+le.prototype.clear = so;
+le.prototype.delete = ao;
+le.prototype.get = co;
+le.prototype.has = po;
+le.prototype.set = mo;
+function bo() {
   this.size = 0, this.__data__ = {
     hash: new le(),
     map: new (Pe || Z)(),
     string: new le()
   };
 }
-function bo(e) {
+function yo(e) {
   var t = typeof e;
   return t == "string" || t == "number" || t == "symbol" || t == "boolean" ? e !== "__proto__" : e === null;
 }
 function bt(e, t) {
   var n = e.__data__;
-  return bo(t) ? n[typeof t == "string" ? "string" : "hash"] : n.map;
+  return yo(t) ? n[typeof t == "string" ? "string" : "hash"] : n.map;
 }
-function yo(e) {
+function vo(e) {
   var t = bt(this, e).delete(e);
   return this.size -= t ? 1 : 0, t;
 }
-function vo(e) {
+function So(e) {
   return bt(this, e).get(e);
 }
-function So(e) {
+function To(e) {
   return bt(this, e).has(e);
 }
-function To(e, t) {
+function Ao(e, t) {
   var n = bt(this, e), r = n.size;
   return n.set(e, t), this.size += n.size == r ? 0 : 1, this;
 }
@@ -2615,17 +2613,17 @@ function te(e) {
     this.set(r[0], r[1]);
   }
 }
-te.prototype.clear = mo;
-te.prototype.delete = yo;
-te.prototype.get = vo;
-te.prototype.has = So;
-te.prototype.set = To;
-var Ao = 200;
-function wo(e, t) {
+te.prototype.clear = bo;
+te.prototype.delete = vo;
+te.prototype.get = So;
+te.prototype.has = To;
+te.prototype.set = Ao;
+var wo = 200;
+function xo(e, t) {
   var n = this.__data__;
   if (n instanceof Z) {
     var r = n.__data__;
-    if (!Pe || r.length < Ao - 1)
+    if (!Pe || r.length < wo - 1)
       return r.push([e, t]), this.size = ++n.size, this;
     n = this.__data__ = new te(r);
   }
@@ -2635,12 +2633,12 @@ function H(e) {
   var t = this.__data__ = new Z(e);
   this.size = t.size;
 }
-H.prototype.clear = _a;
-H.prototype.delete = Ma;
-H.prototype.get = Da;
-H.prototype.has = Ra;
-H.prototype.set = wo;
-function xo(e, t) {
+H.prototype.clear = Ma;
+H.prototype.delete = Da;
+H.prototype.get = Ra;
+H.prototype.has = La;
+H.prototype.set = xo;
+function Eo(e, t) {
   for (var n = -1, r = e == null ? 0 : e.length; ++n < r && t(e[n], n, e) !== !1; )
     ;
   return e;
@@ -2660,10 +2658,10 @@ function yt(e, t, n) {
     writable: !0
   }) : e[t] = n;
 }
-var Eo = Object.prototype, Oo = Eo.hasOwnProperty;
+var Oo = Object.prototype, No = Oo.hasOwnProperty;
 function Kr(e, t, n) {
   var r = e[t];
-  (!(Oo.call(e, t) && ze(r, n)) || n === void 0 && !(t in e)) && yt(e, t, n);
+  (!(No.call(e, t) && ze(r, n)) || n === void 0 && !(t in e)) && yt(e, t, n);
 }
 function we(e, t, n, r) {
   var i = !n;
@@ -2674,7 +2672,7 @@ function we(e, t, n, r) {
   }
   return n;
 }
-function No(e, t) {
+function Co(e, t) {
   for (var n = -1, r = Array(e); ++n < e; )
     r[n] = t(n);
   return r;
@@ -2682,31 +2680,31 @@ function No(e, t) {
 function K(e) {
   return e != null && typeof e == "object";
 }
-var Co = "[object Arguments]";
+var _o = "[object Arguments]";
 function Zn(e) {
-  return K(e) && de(e) == Co;
+  return K(e) && de(e) == _o;
 }
-var Jr = Object.prototype, _o = Jr.hasOwnProperty, Mo = Jr.propertyIsEnumerable, $e = Zn(/* @__PURE__ */ function() {
+var Jr = Object.prototype, Mo = Jr.hasOwnProperty, Do = Jr.propertyIsEnumerable, $e = Zn(/* @__PURE__ */ function() {
   return arguments;
 }()) ? Zn : function(e) {
-  return K(e) && _o.call(e, "callee") && !Mo.call(e, "callee");
+  return K(e) && Mo.call(e, "callee") && !Do.call(e, "callee");
 }, j = Array.isArray;
-function Do() {
+function Ro() {
   return !1;
 }
-var Yr = typeof exports == "object" && exports && !exports.nodeType && exports, er = Yr && typeof module == "object" && module && !module.nodeType && module, Ro = er && er.exports === Yr, tr = Ro ? J.Buffer : void 0, Lo = tr ? tr.isBuffer : void 0, Be = Lo || Do, Fo = 9007199254740991, Io = /^(?:0|[1-9]\d*)$/;
+var Yr = typeof exports == "object" && exports && !exports.nodeType && exports, er = Yr && typeof module == "object" && module && !module.nodeType && module, Lo = er && er.exports === Yr, tr = Lo ? J.Buffer : void 0, Fo = tr ? tr.isBuffer : void 0, Be = Fo || Ro, Io = 9007199254740991, Po = /^(?:0|[1-9]\d*)$/;
 function nn(e, t) {
   var n = typeof e;
-  return t = t == null ? Fo : t, !!t && (n == "number" || n != "symbol" && Io.test(e)) && e > -1 && e % 1 == 0 && e < t;
+  return t = t == null ? Io : t, !!t && (n == "number" || n != "symbol" && Po.test(e)) && e > -1 && e % 1 == 0 && e < t;
 }
-var Po = 9007199254740991;
+var jo = 9007199254740991;
 function rn(e) {
-  return typeof e == "number" && e > -1 && e % 1 == 0 && e <= Po;
+  return typeof e == "number" && e > -1 && e % 1 == 0 && e <= jo;
 }
-var jo = "[object Arguments]", $o = "[object Array]", Bo = "[object Boolean]", Uo = "[object Date]", Wo = "[object Error]", qo = "[object Function]", zo = "[object Map]", Ho = "[object Number]", ko = "[object Object]", Go = "[object RegExp]", Vo = "[object Set]", Qo = "[object String]", Ko = "[object WeakMap]", Jo = "[object ArrayBuffer]", Yo = "[object DataView]", Xo = "[object Float32Array]", Zo = "[object Float64Array]", eu = "[object Int8Array]", tu = "[object Int16Array]", nu = "[object Int32Array]", ru = "[object Uint8Array]", iu = "[object Uint8ClampedArray]", su = "[object Uint16Array]", au = "[object Uint32Array]", C = {};
-C[Xo] = C[Zo] = C[eu] = C[tu] = C[nu] = C[ru] = C[iu] = C[su] = C[au] = !0;
-C[jo] = C[$o] = C[Jo] = C[Bo] = C[Yo] = C[Uo] = C[Wo] = C[qo] = C[zo] = C[Ho] = C[ko] = C[Go] = C[Vo] = C[Qo] = C[Ko] = !1;
-function ou(e) {
+var $o = "[object Arguments]", Bo = "[object Array]", Uo = "[object Boolean]", Wo = "[object Date]", qo = "[object Error]", zo = "[object Function]", Ho = "[object Map]", ko = "[object Number]", Go = "[object Object]", Vo = "[object RegExp]", Qo = "[object Set]", Ko = "[object String]", Jo = "[object WeakMap]", Yo = "[object ArrayBuffer]", Xo = "[object DataView]", Zo = "[object Float32Array]", eu = "[object Float64Array]", tu = "[object Int8Array]", nu = "[object Int16Array]", ru = "[object Int32Array]", iu = "[object Uint8Array]", su = "[object Uint8ClampedArray]", au = "[object Uint16Array]", ou = "[object Uint32Array]", C = {};
+C[Zo] = C[eu] = C[tu] = C[nu] = C[ru] = C[iu] = C[su] = C[au] = C[ou] = !0;
+C[$o] = C[Bo] = C[Yo] = C[Uo] = C[Xo] = C[Wo] = C[qo] = C[zo] = C[Ho] = C[ko] = C[Go] = C[Vo] = C[Qo] = C[Ko] = C[Jo] = !1;
+function uu(e) {
   return K(e) && rn(e.length) && !!C[de(e)];
 }
 function sn(e) {
@@ -2714,26 +2712,26 @@ function sn(e) {
     return e(t);
   };
 }
-var Xr = typeof exports == "object" && exports && !exports.nodeType && exports, Re = Xr && typeof module == "object" && module && !module.nodeType && module, uu = Re && Re.exports === Xr, Lt = uu && Vr.process, Te = function() {
+var Xr = typeof exports == "object" && exports && !exports.nodeType && exports, Re = Xr && typeof module == "object" && module && !module.nodeType && module, lu = Re && Re.exports === Xr, Lt = lu && Vr.process, Te = function() {
   try {
     var e = Re && Re.require && Re.require("util").types;
     return e || Lt && Lt.binding && Lt.binding("util");
   } catch (t) {
   }
-}(), nr = Te && Te.isTypedArray, an = nr ? sn(nr) : ou, lu = Object.prototype, cu = lu.hasOwnProperty;
+}(), nr = Te && Te.isTypedArray, an = nr ? sn(nr) : uu, cu = Object.prototype, du = cu.hasOwnProperty;
 function Zr(e, t) {
-  var n = j(e), r = !n && $e(e), i = !n && !r && Be(e), s = !n && !r && !i && an(e), a = n || r || i || s, o = a ? No(e.length, String) : [], u = o.length;
+  var n = j(e), r = !n && $e(e), i = !n && !r && Be(e), s = !n && !r && !i && an(e), a = n || r || i || s, o = a ? Co(e.length, String) : [], u = o.length;
   for (var l in e)
-    (t || cu.call(e, l)) && !(a && // Safari 9 has enumerable `arguments.length` in strict mode.
+    (t || du.call(e, l)) && !(a && // Safari 9 has enumerable `arguments.length` in strict mode.
     (l == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
     i && (l == "offset" || l == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
     s && (l == "buffer" || l == "byteLength" || l == "byteOffset") || // Skip index properties.
     nn(l, u))) && o.push(l);
   return o;
 }
-var du = Object.prototype;
+var fu = Object.prototype;
 function on(e) {
-  var t = e && e.constructor, n = typeof t == "function" && t.prototype || du;
+  var t = e && e.constructor, n = typeof t == "function" && t.prototype || fu;
   return e === n;
 }
 function ei(e, t) {
@@ -2741,47 +2739,47 @@ function ei(e, t) {
     return e(t(n));
   };
 }
-var fu = ei(Object.keys, Object), hu = Object.prototype, pu = hu.hasOwnProperty;
-function gu(e) {
+var hu = ei(Object.keys, Object), pu = Object.prototype, gu = pu.hasOwnProperty;
+function mu(e) {
   if (!on(e))
-    return fu(e);
+    return hu(e);
   var t = [];
   for (var n in Object(e))
-    pu.call(e, n) && n != "constructor" && t.push(n);
+    gu.call(e, n) && n != "constructor" && t.push(n);
   return t;
 }
 function vt(e) {
   return e != null && rn(e.length) && !tn(e);
 }
 function He(e) {
-  return vt(e) ? Zr(e) : gu(e);
+  return vt(e) ? Zr(e) : mu(e);
 }
-function mu(e, t) {
+function bu(e, t) {
   return e && we(t, He(t), e);
 }
-function bu(e) {
+function yu(e) {
   var t = [];
   if (e != null)
     for (var n in Object(e))
       t.push(n);
   return t;
 }
-var yu = Object.prototype, vu = yu.hasOwnProperty;
-function Su(e) {
+var vu = Object.prototype, Su = vu.hasOwnProperty;
+function Tu(e) {
   if (!ee(e))
-    return bu(e);
+    return yu(e);
   var t = on(e), n = [];
   for (var r in e)
-    r == "constructor" && (t || !vu.call(e, r)) || n.push(r);
+    r == "constructor" && (t || !Su.call(e, r)) || n.push(r);
   return n;
 }
 function ke(e) {
-  return vt(e) ? Zr(e, !0) : Su(e);
+  return vt(e) ? Zr(e, !0) : Tu(e);
 }
-function Tu(e, t) {
+function Au(e, t) {
   return e && we(t, ke(t), e);
 }
-var ti = typeof exports == "object" && exports && !exports.nodeType && exports, rr = ti && typeof module == "object" && module && !module.nodeType && module, Au = rr && rr.exports === ti, ir = Au ? J.Buffer : void 0, sr = ir ? ir.allocUnsafe : void 0;
+var ti = typeof exports == "object" && exports && !exports.nodeType && exports, rr = ti && typeof module == "object" && module && !module.nodeType && module, wu = rr && rr.exports === ti, ir = wu ? J.Buffer : void 0, sr = ir ? ir.allocUnsafe : void 0;
 function ni(e, t) {
   if (t)
     return e.slice();
@@ -2794,7 +2792,7 @@ function ri(e, t) {
     t[n] = e[n];
   return t;
 }
-function wu(e, t) {
+function xu(e, t) {
   for (var n = -1, r = e == null ? 0 : e.length, i = 0, s = []; ++n < r; ) {
     var a = e[n];
     t(a, n, e) && (s[i++] = a);
@@ -2804,12 +2802,12 @@ function wu(e, t) {
 function ii() {
   return [];
 }
-var xu = Object.prototype, Eu = xu.propertyIsEnumerable, ar = Object.getOwnPropertySymbols, un = ar ? function(e) {
-  return e == null ? [] : (e = Object(e), wu(ar(e), function(t) {
-    return Eu.call(e, t);
+var Eu = Object.prototype, Ou = Eu.propertyIsEnumerable, ar = Object.getOwnPropertySymbols, un = ar ? function(e) {
+  return e == null ? [] : (e = Object(e), xu(ar(e), function(t) {
+    return Ou.call(e, t);
   }));
 } : ii;
-function Ou(e, t) {
+function Nu(e, t) {
   return we(e, un(e), t);
 }
 function ln(e, t) {
@@ -2817,12 +2815,12 @@ function ln(e, t) {
     e[i + n] = t[n];
   return e;
 }
-var cn = ei(Object.getPrototypeOf, Object), Nu = Object.getOwnPropertySymbols, si = Nu ? function(e) {
+var cn = ei(Object.getPrototypeOf, Object), Cu = Object.getOwnPropertySymbols, si = Cu ? function(e) {
   for (var t = []; e; )
     ln(t, un(e)), e = cn(e);
   return t;
 } : ii;
-function Cu(e, t) {
+function _u(e, t) {
   return we(e, si(e), t);
 }
 function ai(e, t, n) {
@@ -2835,63 +2833,62 @@ function $t(e) {
 function oi(e) {
   return ai(e, ke, si);
 }
-var Bt = he(J, "DataView"), Ut = he(J, "Promise"), Wt = he(J, "Set"), qt = he(J, "WeakMap"), or = "[object Map]", _u = "[object Object]", ur = "[object Promise]", lr = "[object Set]", cr = "[object WeakMap]", dr = "[object DataView]", Mu = fe(Bt), Du = fe(Pe), Ru = fe(Ut), Lu = fe(Wt), Fu = fe(qt), z = de;
+var Bt = he(J, "DataView"), Ut = he(J, "Promise"), Wt = he(J, "Set"), qt = he(J, "WeakMap"), or = "[object Map]", Mu = "[object Object]", ur = "[object Promise]", lr = "[object Set]", cr = "[object WeakMap]", dr = "[object DataView]", Du = fe(Bt), Ru = fe(Pe), Lu = fe(Ut), Fu = fe(Wt), Iu = fe(qt), z = de;
 (Bt && z(new Bt(new ArrayBuffer(1))) != dr || Pe && z(new Pe()) != or || Ut && z(Ut.resolve()) != ur || Wt && z(new Wt()) != lr || qt && z(new qt()) != cr) && (z = function(e) {
-  var t = de(e), n = t == _u ? e.constructor : void 0, r = n ? fe(n) : "";
+  var t = de(e), n = t == Mu ? e.constructor : void 0, r = n ? fe(n) : "";
   if (r)
     switch (r) {
-      case Mu:
-        return dr;
       case Du:
-        return or;
+        return dr;
       case Ru:
-        return ur;
+        return or;
       case Lu:
-        return lr;
+        return ur;
       case Fu:
+        return lr;
+      case Iu:
         return cr;
     }
   return t;
 });
-var Iu = Object.prototype, Pu = Iu.hasOwnProperty;
-function ju(e) {
+var Pu = Object.prototype, ju = Pu.hasOwnProperty;
+function $u(e) {
   var t = e.length, n = new e.constructor(t);
-  return t && typeof e[0] == "string" && Pu.call(e, "index") && (n.index = e.index, n.input = e.input), n;
+  return t && typeof e[0] == "string" && ju.call(e, "index") && (n.index = e.index, n.input = e.input), n;
 }
 var dt = J.Uint8Array;
 function dn(e) {
   var t = new e.constructor(e.byteLength);
   return new dt(t).set(new dt(e)), t;
 }
-function $u(e, t) {
+function Bu(e, t) {
   var n = t ? dn(e.buffer) : e.buffer;
   return new e.constructor(n, e.byteOffset, e.byteLength);
 }
-var Bu = /\w*$/;
-function Uu(e) {
-  var t = new e.constructor(e.source, Bu.exec(e));
+var Uu = /\w*$/;
+function Wu(e) {
+  var t = new e.constructor(e.source, Uu.exec(e));
   return t.lastIndex = e.lastIndex, t;
 }
 var fr = W ? W.prototype : void 0, hr = fr ? fr.valueOf : void 0;
-function Wu(e) {
+function qu(e) {
   return hr ? Object(hr.call(e)) : {};
 }
 function ui(e, t) {
   var n = t ? dn(e.buffer) : e.buffer;
   return new e.constructor(n, e.byteOffset, e.length);
 }
-var qu = "[object Boolean]", zu = "[object Date]", Hu = "[object Map]", ku = "[object Number]", Gu = "[object RegExp]", Vu = "[object Set]", Qu = "[object String]", Ku = "[object Symbol]", Ju = "[object ArrayBuffer]", Yu = "[object DataView]", Xu = "[object Float32Array]", Zu = "[object Float64Array]", el = "[object Int8Array]", tl = "[object Int16Array]", nl = "[object Int32Array]", rl = "[object Uint8Array]", il = "[object Uint8ClampedArray]", sl = "[object Uint16Array]", al = "[object Uint32Array]";
-function ol(e, t, n) {
+var zu = "[object Boolean]", Hu = "[object Date]", ku = "[object Map]", Gu = "[object Number]", Vu = "[object RegExp]", Qu = "[object Set]", Ku = "[object String]", Ju = "[object Symbol]", Yu = "[object ArrayBuffer]", Xu = "[object DataView]", Zu = "[object Float32Array]", el = "[object Float64Array]", tl = "[object Int8Array]", nl = "[object Int16Array]", rl = "[object Int32Array]", il = "[object Uint8Array]", sl = "[object Uint8ClampedArray]", al = "[object Uint16Array]", ol = "[object Uint32Array]";
+function ul(e, t, n) {
   var r = e.constructor;
   switch (t) {
-    case Ju:
+    case Yu:
       return dn(e);
-    case qu:
     case zu:
+    case Hu:
       return new r(+e);
-    case Yu:
-      return $u(e, n);
     case Xu:
+      return Bu(e, n);
     case Zu:
     case el:
     case tl:
@@ -2900,21 +2897,22 @@ function ol(e, t, n) {
     case il:
     case sl:
     case al:
+    case ol:
       return ui(e, n);
-    case Hu:
-      return new r();
     case ku:
-    case Qu:
-      return new r(e);
-    case Gu:
-      return Uu(e);
-    case Vu:
       return new r();
+    case Gu:
     case Ku:
+      return new r(e);
+    case Vu:
       return Wu(e);
+    case Qu:
+      return new r();
+    case Ju:
+      return qu(e);
   }
 }
-var pr = Object.create, ul = /* @__PURE__ */ function() {
+var pr = Object.create, ll = /* @__PURE__ */ function() {
   function e() {
   }
   return function(t) {
@@ -2928,61 +2926,61 @@ var pr = Object.create, ul = /* @__PURE__ */ function() {
   };
 }();
 function li(e) {
-  return typeof e.constructor == "function" && !on(e) ? ul(cn(e)) : {};
+  return typeof e.constructor == "function" && !on(e) ? ll(cn(e)) : {};
 }
-var ll = "[object Map]";
-function cl(e) {
-  return K(e) && z(e) == ll;
+var cl = "[object Map]";
+function dl(e) {
+  return K(e) && z(e) == cl;
 }
-var gr = Te && Te.isMap, dl = gr ? sn(gr) : cl, fl = "[object Set]";
-function hl(e) {
-  return K(e) && z(e) == fl;
+var gr = Te && Te.isMap, fl = gr ? sn(gr) : dl, hl = "[object Set]";
+function pl(e) {
+  return K(e) && z(e) == hl;
 }
-var mr = Te && Te.isSet, pl = mr ? sn(mr) : hl, gl = 1, ml = 2, bl = 4, ci = "[object Arguments]", yl = "[object Array]", vl = "[object Boolean]", Sl = "[object Date]", Tl = "[object Error]", di = "[object Function]", Al = "[object GeneratorFunction]", wl = "[object Map]", xl = "[object Number]", fi = "[object Object]", El = "[object RegExp]", Ol = "[object Set]", Nl = "[object String]", Cl = "[object Symbol]", _l = "[object WeakMap]", Ml = "[object ArrayBuffer]", Dl = "[object DataView]", Rl = "[object Float32Array]", Ll = "[object Float64Array]", Fl = "[object Int8Array]", Il = "[object Int16Array]", Pl = "[object Int32Array]", jl = "[object Uint8Array]", $l = "[object Uint8ClampedArray]", Bl = "[object Uint16Array]", Ul = "[object Uint32Array]", N = {};
-N[ci] = N[yl] = N[Ml] = N[Dl] = N[vl] = N[Sl] = N[Rl] = N[Ll] = N[Fl] = N[Il] = N[Pl] = N[wl] = N[xl] = N[fi] = N[El] = N[Ol] = N[Nl] = N[Cl] = N[jl] = N[$l] = N[Bl] = N[Ul] = !0;
-N[Tl] = N[di] = N[_l] = !1;
+var mr = Te && Te.isSet, gl = mr ? sn(mr) : pl, ml = 1, bl = 2, yl = 4, ci = "[object Arguments]", vl = "[object Array]", Sl = "[object Boolean]", Tl = "[object Date]", Al = "[object Error]", di = "[object Function]", wl = "[object GeneratorFunction]", xl = "[object Map]", El = "[object Number]", fi = "[object Object]", Ol = "[object RegExp]", Nl = "[object Set]", Cl = "[object String]", _l = "[object Symbol]", Ml = "[object WeakMap]", Dl = "[object ArrayBuffer]", Rl = "[object DataView]", Ll = "[object Float32Array]", Fl = "[object Float64Array]", Il = "[object Int8Array]", Pl = "[object Int16Array]", jl = "[object Int32Array]", $l = "[object Uint8Array]", Bl = "[object Uint8ClampedArray]", Ul = "[object Uint16Array]", Wl = "[object Uint32Array]", N = {};
+N[ci] = N[vl] = N[Dl] = N[Rl] = N[Sl] = N[Tl] = N[Ll] = N[Fl] = N[Il] = N[Pl] = N[jl] = N[xl] = N[El] = N[fi] = N[Ol] = N[Nl] = N[Cl] = N[_l] = N[$l] = N[Bl] = N[Ul] = N[Wl] = !0;
+N[Al] = N[di] = N[Ml] = !1;
 function Le(e, t, n, r, i, s) {
-  var a, o = t & gl, u = t & ml, l = t & bl;
+  var a, o = t & ml, u = t & bl, l = t & yl;
   if (n && (a = i ? n(e, r, i, s) : n(e)), a !== void 0)
     return a;
   if (!ee(e))
     return e;
   var d = j(e);
   if (d) {
-    if (a = ju(e), !o)
+    if (a = $u(e), !o)
       return ri(e, a);
   } else {
-    var f = z(e), c = f == di || f == Al;
+    var f = z(e), c = f == di || f == wl;
     if (Be(e))
       return ni(e, o);
     if (f == fi || f == ci || c && !i) {
       if (a = u || c ? {} : li(e), !o)
-        return u ? Cu(e, Tu(a, e)) : Ou(e, mu(a, e));
+        return u ? _u(e, Au(a, e)) : Nu(e, bu(a, e));
     } else {
       if (!N[f])
         return i ? e : {};
-      a = ol(e, f, o);
+      a = ul(e, f, o);
     }
   }
   s || (s = new H());
   var m = s.get(e);
   if (m)
     return m;
-  s.set(e, a), pl(e) ? e.forEach(function(b) {
+  s.set(e, a), gl(e) ? e.forEach(function(b) {
     a.add(Le(b, t, n, b, e, s));
-  }) : dl(e) && e.forEach(function(b, x) {
+  }) : fl(e) && e.forEach(function(b, x) {
     a.set(x, Le(b, t, n, x, e, s));
   });
   var g = l ? u ? oi : $t : u ? ke : He, S = d ? void 0 : g(e);
-  return xo(S || e, function(b, x) {
+  return Eo(S || e, function(b, x) {
     S && (x = b, b = e[x]), Kr(a, x, Le(b, t, n, x, e, s));
   }), a;
 }
-var Wl = 1, ql = 4;
+var ql = 1, zl = 4;
 function hi(e) {
-  return Le(e, Wl | ql);
+  return Le(e, ql | zl);
 }
-function zl(e) {
+function Hl(e) {
   return function(t, n, r) {
     for (var i = -1, s = Object(t), a = r(t), o = a.length; o--; ) {
       var u = a[++i];
@@ -2992,15 +2990,15 @@ function zl(e) {
     return t;
   };
 }
-var pi = zl();
-function Hl(e, t) {
+var pi = Hl();
+function kl(e, t) {
   return e && pi(e, t, He);
 }
-var kl = "__lodash_hash_undefined__";
-function Gl(e) {
-  return this.__data__.set(e, kl), this;
-}
+var Gl = "__lodash_hash_undefined__";
 function Vl(e) {
+  return this.__data__.set(e, Gl), this;
+}
+function Ql(e) {
   return this.__data__.has(e);
 }
 function ft(e) {
@@ -3008,26 +3006,26 @@ function ft(e) {
   for (this.__data__ = new te(); ++t < n; )
     this.add(e[t]);
 }
-ft.prototype.add = ft.prototype.push = Gl;
-ft.prototype.has = Vl;
-function Ql(e, t) {
+ft.prototype.add = ft.prototype.push = Vl;
+ft.prototype.has = Ql;
+function Kl(e, t) {
   for (var n = -1, r = e == null ? 0 : e.length; ++n < r; )
     if (t(e[n], n, e))
       return !0;
   return !1;
 }
-function Kl(e, t) {
+function Jl(e, t) {
   return e.has(t);
 }
-var Jl = 1, Yl = 2;
+var Yl = 1, Xl = 2;
 function gi(e, t, n, r, i, s) {
-  var a = n & Jl, o = e.length, u = t.length;
+  var a = n & Yl, o = e.length, u = t.length;
   if (o != u && !(a && u > o))
     return !1;
   var l = s.get(e), d = s.get(t);
   if (l && d)
     return l == t && d == e;
-  var f = -1, c = !0, m = n & Yl ? new ft() : void 0;
+  var f = -1, c = !0, m = n & Xl ? new ft() : void 0;
   for (s.set(e, t), s.set(t, e); ++f < o; ) {
     var g = e[f], S = t[f];
     if (r)
@@ -3039,8 +3037,8 @@ function gi(e, t, n, r, i, s) {
       break;
     }
     if (m) {
-      if (!Ql(t, function(x, M) {
-        if (!Kl(m, M) && (g === x || i(g, x, n, r, s)))
+      if (!Kl(t, function(x, M) {
+        if (!Jl(m, M) && (g === x || i(g, x, n, r, s)))
           return m.push(M);
       })) {
         c = !1;
@@ -3053,62 +3051,62 @@ function gi(e, t, n, r, i, s) {
   }
   return s.delete(e), s.delete(t), c;
 }
-function Xl(e) {
+function Zl(e) {
   var t = -1, n = Array(e.size);
   return e.forEach(function(r, i) {
     n[++t] = [i, r];
   }), n;
 }
-function Zl(e) {
+function ec(e) {
   var t = -1, n = Array(e.size);
   return e.forEach(function(r) {
     n[++t] = r;
   }), n;
 }
-var ec = 1, tc = 2, nc = "[object Boolean]", rc = "[object Date]", ic = "[object Error]", sc = "[object Map]", ac = "[object Number]", oc = "[object RegExp]", uc = "[object Set]", lc = "[object String]", cc = "[object Symbol]", dc = "[object ArrayBuffer]", fc = "[object DataView]", br = W ? W.prototype : void 0, Ft = br ? br.valueOf : void 0;
-function hc(e, t, n, r, i, s, a) {
+var tc = 1, nc = 2, rc = "[object Boolean]", ic = "[object Date]", sc = "[object Error]", ac = "[object Map]", oc = "[object Number]", uc = "[object RegExp]", lc = "[object Set]", cc = "[object String]", dc = "[object Symbol]", fc = "[object ArrayBuffer]", hc = "[object DataView]", br = W ? W.prototype : void 0, Ft = br ? br.valueOf : void 0;
+function pc(e, t, n, r, i, s, a) {
   switch (n) {
-    case fc:
+    case hc:
       if (e.byteLength != t.byteLength || e.byteOffset != t.byteOffset)
         return !1;
       e = e.buffer, t = t.buffer;
-    case dc:
+    case fc:
       return !(e.byteLength != t.byteLength || !s(new dt(e), new dt(t)));
-    case nc:
     case rc:
-    case ac:
-      return ze(+e, +t);
     case ic:
-      return e.name == t.name && e.message == t.message;
     case oc:
-    case lc:
-      return e == t + "";
+      return ze(+e, +t);
     case sc:
-      var o = Xl;
+      return e.name == t.name && e.message == t.message;
     case uc:
-      var u = r & ec;
-      if (o || (o = Zl), e.size != t.size && !u)
+    case cc:
+      return e == t + "";
+    case ac:
+      var o = Zl;
+    case lc:
+      var u = r & tc;
+      if (o || (o = ec), e.size != t.size && !u)
         return !1;
       var l = a.get(e);
       if (l)
         return l == t;
-      r |= tc, a.set(e, t);
+      r |= nc, a.set(e, t);
       var d = gi(o(e), o(t), r, i, s, a);
       return a.delete(e), d;
-    case cc:
+    case dc:
       if (Ft)
         return Ft.call(e) == Ft.call(t);
   }
   return !1;
 }
-var pc = 1, gc = Object.prototype, mc = gc.hasOwnProperty;
-function bc(e, t, n, r, i, s) {
-  var a = n & pc, o = $t(e), u = o.length, l = $t(t), d = l.length;
+var gc = 1, mc = Object.prototype, bc = mc.hasOwnProperty;
+function yc(e, t, n, r, i, s) {
+  var a = n & gc, o = $t(e), u = o.length, l = $t(t), d = l.length;
   if (u != d && !a)
     return !1;
   for (var f = u; f--; ) {
     var c = o[f];
-    if (!(a ? c in t : mc.call(t, c)))
+    if (!(a ? c in t : bc.call(t, c)))
       return !1;
   }
   var m = s.get(e), g = s.get(t);
@@ -3133,8 +3131,8 @@ function bc(e, t, n, r, i, s) {
   }
   return s.delete(e), s.delete(t), S;
 }
-var yc = 1, yr = "[object Arguments]", vr = "[object Array]", Xe = "[object Object]", vc = Object.prototype, Sr = vc.hasOwnProperty;
-function Sc(e, t, n, r, i, s) {
+var vc = 1, yr = "[object Arguments]", vr = "[object Array]", Xe = "[object Object]", Sc = Object.prototype, Sr = Sc.hasOwnProperty;
+function Tc(e, t, n, r, i, s) {
   var a = j(e), o = j(t), u = a ? vr : z(e), l = o ? vr : z(t);
   u = u == yr ? Xe : u, l = l == yr ? Xe : l;
   var d = u == Xe, f = l == Xe, c = u == l;
@@ -3144,21 +3142,21 @@ function Sc(e, t, n, r, i, s) {
     a = !0, d = !1;
   }
   if (c && !d)
-    return s || (s = new H()), a || an(e) ? gi(e, t, n, r, i, s) : hc(e, t, u, n, r, i, s);
-  if (!(n & yc)) {
+    return s || (s = new H()), a || an(e) ? gi(e, t, n, r, i, s) : pc(e, t, u, n, r, i, s);
+  if (!(n & vc)) {
     var m = d && Sr.call(e, "__wrapped__"), g = f && Sr.call(t, "__wrapped__");
     if (m || g) {
       var S = m ? e.value() : e, b = g ? t.value() : t;
       return s || (s = new H()), i(S, b, n, r, s);
     }
   }
-  return c ? (s || (s = new H()), bc(e, t, n, r, i, s)) : !1;
+  return c ? (s || (s = new H()), yc(e, t, n, r, i, s)) : !1;
 }
 function St(e, t, n, r, i) {
-  return e === t ? !0 : e == null || t == null || !K(e) && !K(t) ? e !== e && t !== t : Sc(e, t, n, r, St, i);
+  return e === t ? !0 : e == null || t == null || !K(e) && !K(t) ? e !== e && t !== t : Tc(e, t, n, r, St, i);
 }
-var Tc = 1, Ac = 2;
-function wc(e, t, n, r) {
+var Ac = 1, wc = 2;
+function xc(e, t, n, r) {
   var i = n.length, s = i;
   if (e == null)
     return !s;
@@ -3175,7 +3173,7 @@ function wc(e, t, n, r) {
         return !1;
     } else {
       var d = new H(), f;
-      if (!(f === void 0 ? St(l, u, Tc | Ac, r, d) : f))
+      if (!(f === void 0 ? St(l, u, Ac | wc, r, d) : f))
         return !1;
     }
   }
@@ -3184,7 +3182,7 @@ function wc(e, t, n, r) {
 function mi(e) {
   return e === e && !ee(e);
 }
-function xc(e) {
+function Ec(e) {
   for (var t = He(e), n = t.length; n--; ) {
     var r = t[n], i = e[r];
     t[n] = [r, i, mi(i)];
@@ -3196,27 +3194,27 @@ function bi(e, t) {
     return n == null ? !1 : n[e] === t && (t !== void 0 || e in Object(n));
   };
 }
-function Ec(e) {
-  var t = xc(e);
+function Oc(e) {
+  var t = Ec(e);
   return t.length == 1 && t[0][2] ? bi(t[0][0], t[0][1]) : function(n) {
-    return n === e || wc(n, e, t);
+    return n === e || xc(n, e, t);
   };
 }
-var Oc = "[object Symbol]";
+var Nc = "[object Symbol]";
 function fn(e) {
-  return typeof e == "symbol" || K(e) && de(e) == Oc;
+  return typeof e == "symbol" || K(e) && de(e) == Nc;
 }
-var Nc = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, Cc = /^\w*$/;
+var Cc = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, _c = /^\w*$/;
 function hn(e, t) {
   if (j(e))
     return !1;
   var n = typeof e;
-  return n == "number" || n == "symbol" || n == "boolean" || e == null || fn(e) ? !0 : Cc.test(e) || !Nc.test(e) || t != null && e in Object(t);
+  return n == "number" || n == "symbol" || n == "boolean" || e == null || fn(e) ? !0 : _c.test(e) || !Cc.test(e) || t != null && e in Object(t);
 }
-var _c = "Expected a function";
+var Mc = "Expected a function";
 function pn(e, t) {
   if (typeof e != "function" || t != null && typeof t != "function")
-    throw new TypeError(_c);
+    throw new TypeError(Mc);
   var n = function() {
     var r = arguments, i = t ? t.apply(this, r) : r[0], s = n.cache;
     if (s.has(i))
@@ -3227,17 +3225,17 @@ function pn(e, t) {
   return n.cache = new (pn.Cache || te)(), n;
 }
 pn.Cache = te;
-var Mc = 500;
-function Dc(e) {
+var Dc = 500;
+function Rc(e) {
   var t = pn(e, function(r) {
-    return n.size === Mc && n.clear(), r;
+    return n.size === Dc && n.clear(), r;
   }), n = t.cache;
   return t;
 }
-var Rc = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g, Lc = /\\(\\)?/g, Fc = Dc(function(e) {
+var Lc = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g, Fc = /\\(\\)?/g, Ic = Rc(function(e) {
   var t = [];
-  return e.charCodeAt(0) === 46 && t.push(""), e.replace(Rc, function(n, r, i, s) {
-    t.push(i ? s.replace(Lc, "$1") : r || n);
+  return e.charCodeAt(0) === 46 && t.push(""), e.replace(Lc, function(n, r, i, s) {
+    t.push(i ? s.replace(Fc, "$1") : r || n);
   }), t;
 });
 function yi(e, t) {
@@ -3245,7 +3243,7 @@ function yi(e, t) {
     i[n] = t(e[n], n, e);
   return i;
 }
-var Ic = 1 / 0, Tr = W ? W.prototype : void 0, Ar = Tr ? Tr.toString : void 0;
+var Pc = 1 / 0, Tr = W ? W.prototype : void 0, Ar = Tr ? Tr.toString : void 0;
 function vi(e) {
   if (typeof e == "string")
     return e;
@@ -3254,20 +3252,20 @@ function vi(e) {
   if (fn(e))
     return Ar ? Ar.call(e) : "";
   var t = e + "";
-  return t == "0" && 1 / e == -Ic ? "-0" : t;
+  return t == "0" && 1 / e == -Pc ? "-0" : t;
 }
-function Pc(e) {
+function jc(e) {
   return e == null ? "" : vi(e);
 }
 function Tt(e, t) {
-  return j(e) ? e : hn(e, t) ? [e] : Fc(Pc(e));
+  return j(e) ? e : hn(e, t) ? [e] : Ic(jc(e));
 }
-var jc = 1 / 0;
+var $c = 1 / 0;
 function Ge(e) {
   if (typeof e == "string" || fn(e))
     return e;
   var t = e + "";
-  return t == "0" && 1 / e == -jc ? "-0" : t;
+  return t == "0" && 1 / e == -$c ? "-0" : t;
 }
 function gn(e, t) {
   t = Tt(t, e);
@@ -3275,14 +3273,14 @@ function gn(e, t) {
     e = e[Ge(t[n++])];
   return n && n == r ? e : void 0;
 }
-function $c(e, t, n) {
+function Bc(e, t, n) {
   var r = e == null ? void 0 : gn(e, t);
   return r === void 0 ? n : r;
 }
-function Bc(e, t) {
+function Uc(e, t) {
   return e != null && t in Object(e);
 }
-function Uc(e, t, n) {
+function Wc(e, t, n) {
   t = Tt(t, e);
   for (var r = -1, i = t.length, s = !1; ++r < i; ) {
     var a = Ge(t[r]);
@@ -3292,47 +3290,47 @@ function Uc(e, t, n) {
   }
   return s || ++r != i ? s : (i = e == null ? 0 : e.length, !!i && rn(i) && nn(a, i) && (j(e) || $e(e)));
 }
-function Wc(e, t) {
-  return e != null && Uc(e, t, Bc);
+function qc(e, t) {
+  return e != null && Wc(e, t, Uc);
 }
-var qc = 1, zc = 2;
-function Hc(e, t) {
+var zc = 1, Hc = 2;
+function kc(e, t) {
   return hn(e) && mi(t) ? bi(Ge(e), t) : function(n) {
-    var r = $c(n, e);
-    return r === void 0 && r === t ? Wc(n, e) : St(t, r, qc | zc);
+    var r = Bc(n, e);
+    return r === void 0 && r === t ? qc(n, e) : St(t, r, zc | Hc);
   };
 }
 function mn(e) {
   return e;
 }
-function kc(e) {
+function Gc(e) {
   return function(t) {
     return t == null ? void 0 : t[e];
   };
 }
-function Gc(e) {
+function Vc(e) {
   return function(t) {
     return gn(t, e);
   };
 }
-function Vc(e) {
-  return hn(e) ? kc(Ge(e)) : Gc(e);
-}
 function Qc(e) {
-  return typeof e == "function" ? e : e == null ? mn : typeof e == "object" ? j(e) ? Hc(e[0], e[1]) : Ec(e) : Vc(e);
+  return hn(e) ? Gc(Ge(e)) : Vc(e);
 }
-function Kc(e, t) {
+function Kc(e) {
+  return typeof e == "function" ? e : e == null ? mn : typeof e == "object" ? j(e) ? kc(e[0], e[1]) : Oc(e) : Qc(e);
+}
+function Jc(e, t) {
   var n = {};
-  return t = Qc(t), Hl(e, function(r, i, s) {
+  return t = Kc(t), kl(e, function(r, i, s) {
     yt(n, i, t(r, i, s));
   }), n;
 }
-function Jc(e) {
+function Yc(e) {
   for (var t = e.length, n = 5381, r = 52711, i; t--; )
     i = e.charCodeAt(t), n = n * 33 ^ i, r = r * 33 ^ i;
   return (n >>> 0) * 4096 + (r >>> 0);
 }
-var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
+var Ue = "|", Xc = /\[object ([HTML|SVG](.*)Element)\]/, Zc = {
   "[object Arguments]": 0,
   "[object Array]": 1,
   "[object ArrayBuffer]": 2,
@@ -3371,7 +3369,7 @@ var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
   "[object WeakSet]": 35,
   CUSTOM: 36,
   ELEMENT: 37
-}, Zc = {
+}, ed = {
   "[object Arguments]": 1,
   "[object Array]": 2
 }, Si = {
@@ -3380,7 +3378,7 @@ var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
   "[object WeakMap]": 3,
   "[object WeakRef]": 4,
   "[object WeakSet]": 5
-}, ed = {
+}, td = {
   "[object AsyncFunction]": 1,
   "[object AsyncGeneratorFunction]": 2,
   "[object Boolean]": 3,
@@ -3388,7 +3386,7 @@ var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
   "[object GeneratorFunction]": 5,
   "[object Number]": 6,
   "[object String]": 7
-}, td = {
+}, nd = {
   "[object BigInt64Array]": 1,
   "[object BigUint64Array]": 2,
   "[object Float32Array]": 3,
@@ -3399,7 +3397,7 @@ var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
   "[object Uint8ClampedArray]": 8,
   "[object Uint16Array]": 9,
   "[object Uint32Array]": 10
-}, nd = {
+}, rd = {
   "[object Arguments]": 1,
   "[object Array]": 2,
   "[object ArrayBuffer]": 3,
@@ -3429,7 +3427,7 @@ var Ue = "|", Yc = /\[object ([HTML|SVG](.*)Element)\]/, Xc = {
   string: "s",
   symbol: "s"
 };
-function rd(e, t) {
+function id(e, t) {
   return e[0] > t[0];
 }
 function Ti(e, t) {
@@ -3444,19 +3442,19 @@ function bn(e, t) {
   return e;
 }
 function I(e, t) {
-  return De.object + Ue + Xc[e] + Ue + t;
+  return De.object + Ue + Zc[e] + Ue + t;
 }
-var wr = /* @__PURE__ */ new WeakMap(), id = 0;
+var wr = /* @__PURE__ */ new WeakMap(), sd = 0;
 function zt(e, t) {
   var n = wr.get(e);
   if (n)
     return n;
-  var r = I(t, "NOT_ENUMERABLE" + Ue + id++);
+  var r = I(t, "NOT_ENUMERABLE" + Ue + sd++);
   return wr.set(e, r), r;
 }
-var sd = Object.prototype.toString;
-function ad(e, t, n) {
-  if (nd[t])
+var ad = Object.prototype.toString;
+function od(e, t, n) {
+  if (rd[t])
     return xr(t, e, n);
   if (t === "[object Date]")
     return I(t, e.getTime());
@@ -3479,39 +3477,39 @@ function ad(e, t, n) {
   if (t === "[object Error]")
     return I(t, e.message + Ue + e.stack);
   if (t === "[object DocumentFragment]")
-    return I(t, dd(e));
-  var r = t.match(Yc);
-  return r ? I("ELEMENT", r[1] + Ue + e.outerHTML) : Si[t] ? zt(e, t) : ed[t] ? I(t, e.toString()) : xr("CUSTOM", e, n);
+    return I(t, fd(e));
+  var r = t.match(Xc);
+  return r ? I("ELEMENT", r[1] + Ue + e.outerHTML) : Si[t] ? zt(e, t) : td[t] ? I(t, e.toString()) : xr("CUSTOM", e, n);
 }
 function xr(e, t, n) {
   var r = n.cache.get(t);
-  return r ? I(e, "RECURSIVE~" + r) : (n.cache.set(t, ++n.id), e === "[object Object]" ? t[Symbol.iterator] ? zt(t, e) : I(e, Or(t, n)) : Zc[e] ? I(e, od(t, n)) : e === "[object Map]" ? I(e, fd(t, n)) : e === "[object Set]" ? I(e, hd(t, n)) : td[e] ? I(e, t.join()) : e === "[object ArrayBuffer]" ? I(e, Er(t)) : e === "[object DataView]" ? I(e, Er(t.buffer)) : Si[e] ? zt(t, e) : I("CUSTOM", Or(t, n)));
+  return r ? I(e, "RECURSIVE~" + r) : (n.cache.set(t, ++n.id), e === "[object Object]" ? t[Symbol.iterator] ? zt(t, e) : I(e, Or(t, n)) : ed[e] ? I(e, ud(t, n)) : e === "[object Map]" ? I(e, hd(t, n)) : e === "[object Set]" ? I(e, pd(t, n)) : nd[e] ? I(e, t.join()) : e === "[object ArrayBuffer]" ? I(e, Er(t)) : e === "[object DataView]" ? I(e, Er(t.buffer)) : Si[e] ? zt(t, e) : I("CUSTOM", Or(t, n)));
 }
-function od(e, t) {
+function ud(e, t) {
   for (var n = e.length, r = new Array(n); --n >= 0; )
     r[n] = Ae(e[n], t);
   return r.join();
 }
-function ud(e) {
+function ld(e) {
   return Buffer.from(e).toString("utf8");
 }
-function ld(e) {
+function cd(e) {
   return String.fromCharCode.apply(null, new Uint16Array(e));
 }
-function cd() {
+function dd() {
   return "UNSUPPORTED";
 }
-function dd(e) {
+function fd(e) {
   for (var t = e.children, n = t.length, r = new Array(n); --n >= 0; )
     r[n] = t[n].outerHTML;
   return r.join();
 }
-var Er = typeof Buffer != "undefined" && typeof Buffer.from == "function" ? ud : typeof Uint16Array == "function" ? ld : cd;
-function fd(e, t) {
+var Er = typeof Buffer != "undefined" && typeof Buffer.from == "function" ? ld : typeof Uint16Array == "function" ? cd : dd;
+function hd(e, t) {
   var n = new Array(e.size), r = 0;
   for (e.forEach(function(i, s) {
     n[r++] = [Ae(s, t), Ae(i, t)];
-  }), bn(n, rd); --r >= 0; )
+  }), bn(n, id); --r >= 0; )
     n[r] = "[" + n[r][0] + "," + n[r][1] + "]";
   return "[" + n.join() + "]";
 }
@@ -3520,7 +3518,7 @@ function Or(e, t) {
     i[s] = n[s] + ":" + Ae(e[n[s]], t);
   return "{" + i.join() + "}";
 }
-function hd(e, t) {
+function pd(e, t) {
   var n = new Array(e.size), r = 0;
   return e.forEach(function(i) {
     n[r++] = Ae(i, t);
@@ -3528,35 +3526,35 @@ function hd(e, t) {
 }
 function Ae(e, t) {
   var n = typeof e;
-  return e == null || n === "undefined" ? De.empty + e : n === "object" ? ad(e, sd.call(e), t || { cache: /* @__PURE__ */ new WeakMap(), id: 1 }) : n === "function" || n === "symbol" ? De[n] + e.toString() : n === "boolean" ? De.boolean + +e : De[n] + e;
+  return e == null || n === "undefined" ? De.empty + e : n === "object" ? od(e, ad.call(e), t || { cache: /* @__PURE__ */ new WeakMap(), id: 1 }) : n === "function" || n === "symbol" ? De[n] + e.toString() : n === "boolean" ? De.boolean + +e : De[n] + e;
 }
 function Ai(e) {
-  return Jc(Ae(e, void 0));
+  return Yc(Ae(e, void 0));
 }
 function Ht(e, t, n) {
   (n !== void 0 && !ze(e[t], n) || n === void 0 && !(t in e)) && yt(e, t, n);
 }
-function pd(e) {
+function gd(e) {
   return K(e) && vt(e);
 }
-var gd = "[object Object]", md = Function.prototype, bd = Object.prototype, wi = md.toString, yd = bd.hasOwnProperty, vd = wi.call(Object);
+var md = "[object Object]", bd = Function.prototype, yd = Object.prototype, wi = bd.toString, vd = yd.hasOwnProperty, Sd = wi.call(Object);
 function xi(e) {
-  if (!K(e) || de(e) != gd)
+  if (!K(e) || de(e) != md)
     return !1;
   var t = cn(e);
   if (t === null)
     return !0;
-  var n = yd.call(t, "constructor") && t.constructor;
-  return typeof n == "function" && n instanceof n && wi.call(n) == vd;
+  var n = vd.call(t, "constructor") && t.constructor;
+  return typeof n == "function" && n instanceof n && wi.call(n) == Sd;
 }
 function kt(e, t) {
   if (!(t === "constructor" && typeof e[t] == "function") && t != "__proto__")
     return e[t];
 }
-function Sd(e) {
+function Td(e) {
   return we(e, ke(e));
 }
-function Td(e, t, n, r, i, s, a) {
+function Ad(e, t, n, r, i, s, a) {
   var o = kt(e, n), u = kt(t, n), l = a.get(u);
   if (l) {
     Ht(e, n, l);
@@ -3565,21 +3563,21 @@ function Td(e, t, n, r, i, s, a) {
   var d = s ? s(o, u, n + "", e, t, a) : void 0, f = d === void 0;
   if (f) {
     var c = j(u), m = !c && Be(u), g = !c && !m && an(u);
-    d = u, c || m || g ? j(o) ? d = o : pd(o) ? d = ri(o) : m ? (f = !1, d = ni(u, !0)) : g ? (f = !1, d = ui(u, !0)) : d = [] : xi(u) || $e(u) ? (d = o, $e(o) ? d = Sd(o) : (!ee(o) || tn(o)) && (d = li(u))) : f = !1;
+    d = u, c || m || g ? j(o) ? d = o : gd(o) ? d = ri(o) : m ? (f = !1, d = ni(u, !0)) : g ? (f = !1, d = ui(u, !0)) : d = [] : xi(u) || $e(u) ? (d = o, $e(o) ? d = Td(o) : (!ee(o) || tn(o)) && (d = li(u))) : f = !1;
   }
   f && (a.set(u, d), i(d, u, r, s, a), a.delete(u)), Ht(e, n, d);
 }
 function Ei(e, t, n, r, i) {
   e !== t && pi(t, function(s, a) {
     if (i || (i = new H()), ee(s))
-      Td(e, t, a, n, Ei, r, i);
+      Ad(e, t, a, n, Ei, r, i);
     else {
       var o = r ? r(kt(e, a), s, a + "", e, t, i) : void 0;
       o === void 0 && (o = s), Ht(e, a, o);
     }
   }, ke);
 }
-function Ad(e, t, n) {
+function wd(e, t, n) {
   switch (n.length) {
     case 0:
       return e.call(t);
@@ -3600,106 +3598,106 @@ function Oi(e, t, n) {
     i = -1;
     for (var o = Array(t + 1); ++i < t; )
       o[i] = r[i];
-    return o[t] = n(a), Ad(e, this, o);
+    return o[t] = n(a), wd(e, this, o);
   };
 }
-function wd(e) {
+function xd(e) {
   return function() {
     return e;
   };
 }
-var xd = ct ? function(e, t) {
+var Ed = ct ? function(e, t) {
   return ct(e, "toString", {
     configurable: !0,
     enumerable: !1,
-    value: wd(t),
+    value: xd(t),
     writable: !0
   });
-} : mn, Ed = 800, Od = 16, Nd = Date.now;
-function Cd(e) {
+} : mn, Od = 800, Nd = 16, Cd = Date.now;
+function _d(e) {
   var t = 0, n = 0;
   return function() {
-    var r = Nd(), i = Od - (r - n);
+    var r = Cd(), i = Nd - (r - n);
     if (n = r, i > 0) {
-      if (++t >= Ed)
+      if (++t >= Od)
         return arguments[0];
     } else
       t = 0;
     return e.apply(void 0, arguments);
   };
 }
-var Ni = Cd(xd);
-function _d(e, t) {
+var Ni = _d(Ed);
+function Md(e, t) {
   return Ni(Oi(e, t, mn), e + "");
 }
-function Md(e, t, n) {
+function Dd(e, t, n) {
   if (!ee(n))
     return !1;
   var r = typeof t;
   return (r == "number" ? vt(n) && nn(t, n.length) : r == "string" && t in n) ? ze(n[t], e) : !1;
 }
-function Dd(e) {
-  return _d(function(t, n) {
+function Rd(e) {
+  return Md(function(t, n) {
     var r = -1, i = n.length, s = i > 1 ? n[i - 1] : void 0, a = i > 2 ? n[2] : void 0;
-    for (s = e.length > 3 && typeof s == "function" ? (i--, s) : void 0, a && Md(n[0], n[1], a) && (s = i < 3 ? void 0 : s, i = 1), t = Object(t); ++r < i; ) {
+    for (s = e.length > 3 && typeof s == "function" ? (i--, s) : void 0, a && Dd(n[0], n[1], a) && (s = i < 3 ? void 0 : s, i = 1), t = Object(t); ++r < i; ) {
       var o = n[r];
       o && e(t, o, r, s);
     }
     return t;
   });
 }
-var Ci = Dd(function(e, t, n) {
+var Ci = Rd(function(e, t, n) {
   Ei(e, t, n);
 });
-function Rd(e) {
+function Ld(e) {
   var t = e == null ? 0 : e.length;
   return t ? e[t - 1] : void 0;
 }
-function Ld(e, t, n) {
+function Fd(e, t, n) {
   var r = -1, i = e.length;
   t < 0 && (t = -t > i ? 0 : i + t), n = n > i ? i : n, n < 0 && (n += i), i = t > n ? 0 : n - t >>> 0, t >>>= 0;
   for (var s = Array(i); ++r < i; )
     s[r] = e[r + t];
   return s;
 }
-function Fd(e, t) {
-  return t.length < 2 ? e : gn(e, Ld(t, 0, -1));
-}
 function Id(e, t) {
-  return t = Tt(t, e), e = Fd(e, t), e == null || delete e[Ge(Rd(t))];
+  return t.length < 2 ? e : gn(e, Fd(t, 0, -1));
 }
-function Pd(e) {
+function Pd(e, t) {
+  return t = Tt(t, e), e = Id(e, t), e == null || delete e[Ge(Ld(t))];
+}
+function jd(e) {
   return xi(e) ? void 0 : e;
 }
 var Cr = W ? W.isConcatSpreadable : void 0;
-function jd(e) {
+function $d(e) {
   return j(e) || $e(e) || !!(Cr && e && e[Cr]);
 }
-function $d(e, t, n, r, i) {
+function Bd(e, t, n, r, i) {
   var s = -1, a = e.length;
-  for (n || (n = jd), i || (i = []); ++s < a; ) {
+  for (n || (n = $d), i || (i = []); ++s < a; ) {
     var o = e[s];
     n(o) ? ln(i, o) : r || (i[i.length] = o);
   }
   return i;
 }
-function Bd(e) {
+function Ud(e) {
   var t = e == null ? 0 : e.length;
-  return t ? $d(e) : [];
+  return t ? Bd(e) : [];
 }
-function Ud(e) {
-  return Ni(Oi(e, void 0, Bd), e + "");
+function Wd(e) {
+  return Ni(Oi(e, void 0, Ud), e + "");
 }
-var Wd = 1, qd = 2, zd = 4, Hd = Ud(function(e, t) {
+var qd = 1, zd = 2, Hd = 4, kd = Wd(function(e, t) {
   var n = {};
   if (e == null)
     return n;
   var r = !1;
   t = yi(t, function(s) {
     return s = Tt(s, e), r || (r = s.length > 1), s;
-  }), we(e, oi(e), n), r && (n = Le(n, Wd | qd | zd, Pd));
+  }), we(e, oi(e), n), r && (n = Le(n, qd | zd | Hd, jd));
   for (var i = t.length; i--; )
-    Id(n, t[i]);
+    Pd(n, t[i]);
   return n;
 });
 let Ve = class extends Hr {
@@ -3707,12 +3705,12 @@ let Ve = class extends Hr {
     super(Gr, {
       key: t,
       interpolationOptions: n
-    }, Ta.t);
+    }, Aa.t);
   }
 };
 class yn {
   constructor(t, n, r, i, s) {
-    this.__serializable = "DimensionalElement", this._name = t, this.type = n, this.description = r || "", i && (this._dataSource = i), s && (this.composeCode = s);
+    this.__serializable = "DimensionalElement", this._name = t, this._title = t, this.type = n, this.description = r || "", i && (this._dataSource = i), s && (this.composeCode = s);
   }
   /**
    * Defines the element's name
@@ -3723,6 +3721,20 @@ class yn {
   set name(t) {
     this._name = t;
   }
+  /**
+   * Gets the element's title
+   * @internal
+   */
+  get title() {
+    return this._title;
+  }
+  /**
+   * Sets the element's title
+   * @internal
+   */
+  set title(t) {
+    this._title = t;
+  }
   /**
    * Defines the element's data source
    */
@@ -3986,12 +3998,12 @@ var Pt;
 })(Pt = Pt || (Pt = {}));
 function Gt(e, t = []) {
   try {
-    return e == null ? String(e) : typeof e == "string" ? `'${da(e)}'` : typeof e == "number" || typeof e == "boolean" ? String(e) : e instanceof Date ? `new Date('${e.toISOString()}')` : Array.isArray(e) ? `[${e.map((n) => Gt(n, t)).join(", ")}]` : typeof e == "object" && e !== null ? "composeCode" in e ? e.composeCode : `{ ${Object.entries(e).filter(([r]) => !t.includes(r)).map(([r, i]) => `${/[^a-zA-Z0-9_$]/.test(r) ? `'${r}'` : r}: ${Gt(i, t)}`).join(", ")} }` : JSON.stringify(e);
+    return e == null ? String(e) : typeof e == "string" ? `'${fa(e)}'` : typeof e == "number" || typeof e == "boolean" ? String(e) : e instanceof Date ? `new Date('${e.toISOString()}')` : Array.isArray(e) ? `[${e.map((n) => Gt(n, t)).join(", ")}]` : typeof e == "object" && e !== null ? "composeCode" in e ? e.composeCode : `{ ${Object.entries(e).filter(([r]) => !t.includes(r)).map(([r, i]) => `${/[^a-zA-Z0-9_$]/.test(r) ? `'${r}'` : r}: ${Gt(i, t)}`).join(", ")} }` : JSON.stringify(e);
   } catch (n) {
     return console.error(n, JSON.stringify(e, null, 2)), JSON.stringify(e);
   }
 }
-function kd(e) {
+function Gd(e) {
   let t = e.length;
   for (; t > 0 && e[t - 1] === void 0; )
     t--;
@@ -4000,7 +4012,7 @@ function kd(e) {
 function At(e, t) {
   return function(n) {
     return function(...r) {
-      const i = kd(r), s = i.length, a = i.map((l) => Gt(l, ["guid"])).filter((l, d) => !(["", "{  }", "{}", "undefined", "null"].includes(l) && d === s - 1)).join(", "), o = `${e}.${t != null ? t : n.name}(${a})`, u = n(...r);
+      const i = Gd(r), s = i.length, a = i.map((l) => Gt(l, ["guid"])).filter((l, d) => !(["", "{  }", "{}", "undefined", "null"].includes(l) && d === s - 1)).join(", "), o = `${e}.${t != null ? t : n.name}(${a})`, u = n(...r);
       return u.composeCode = o, u;
     };
   };
@@ -4070,18 +4082,18 @@ function wt(e, t, n, r, i) {
   const o = s.join("");
   return new X(r != null ? r : o, o, a);
 }
-const k = T((e, t, n, r) => new ye(n != null ? n : `${t.toString()} ${e.name}`, e, t, r), "aggregate"), Gd = T((e) => new X(`${e}`, `${e}`, {}), "constant"), ht = T((e, t, n) => k(e, A.Sum, t, n), "sum"), Li = T((e, t, n) => k(e, A.Average, t, n), "average"), Fi = T((e, t, n) => k(e, A.Average, t, n), "avg"), vn = T((e, t, n) => k(e, A.Min, t, n), "min"), Sn = T((e, t, n) => k(e, A.Max, t, n), "max"), Tn = T((e, t, n) => k(e, A.Median, t, n), "median"), An = T((e, t, n) => k(e, A.Count, t, n), "count"), wn = T((e, t, n) => k(e, A.CountDistinct, t, n), "countDistinct"), Vd = T((e, t, n, r) => {
+const k = T((e, t, n, r) => new ye(n != null ? n : `${t.toString()} ${e.name}`, e, t, r), "aggregate"), Vd = T((e) => new X(`${e}`, `${e}`, {}), "constant"), ht = T((e, t, n) => k(e, A.Sum, t, n), "sum"), Li = T((e, t, n) => k(e, A.Average, t, n), "average"), Fi = T((e, t, n) => k(e, A.Average, t, n), "avg"), vn = T((e, t, n) => k(e, A.Min, t, n), "min"), Sn = T((e, t, n) => k(e, A.Max, t, n), "max"), Tn = T((e, t, n) => k(e, A.Median, t, n), "median"), An = T((e, t, n) => k(e, A.Count, t, n), "count"), wn = T((e, t, n) => k(e, A.CountDistinct, t, n), "countDistinct"), Qd = T((e, t, n, r) => {
   const i = [], s = {};
   i.push("("), ce(i, s, e), t.forEach((o) => {
     i.push(","), ce(i, s, o);
   }), i.push(")");
   const a = i.join("");
   return new X(n != null ? n : a, a, s, r);
-}, "measuredValue"), Qd = T((e, t, n, r) => wt(e, "+", t, n, r), "add"), Kd = T((e, t, n, r) => wt(e, "-", t, n, r), "subtract"), Jd = T((e, t, n, r) => wt(e, "*", t, n, r), "multiply"), Yd = T((e, t, n, r) => wt(e, "/", t, n, r), "divide"), Xd = T((e, t) => _(e, t != null ? t : "YTD " + e.name, "YTDSum"), "yearToDateSum"), Zd = T((e, t) => _(e, t != null ? t : "QTD " + t, "QTDSum"), "quarterToDateSum"), ef = T((e, t) => _(e, t != null ? t : "MTD " + e.name, "MTDSum"), "monthToDateSum"), tf = T((e, t) => _(e, t != null ? t : "MTD " + e.name, "WTDSum"), "weekToDateSum"), nf = T((e, t, n) => _(e, n != null ? n : "Running Sum " + e.name, "RSum"), "runningSum"), rf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growth"), "growth"), sf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthrate"), "growthRate"), af = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastweek"), "growthPastWeek"), of = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastmonth"), "growthPastMonth"), uf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastquarter"), "growthPastQuarter"), lf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastyear"), "growthPastYear"), cf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastperiod"), "difference"), df = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastweek"), "diffPastWeek"), ff = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastmonth"), "diffPastMonth"), hf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastquarter"), "diffPastQuarter"), pf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastyear"), "diffPastYear"), gf = T((e, t) => _(e, t != null ? t : e.name + "  Past Day", "pastday"), "pastDay"), mf = T((e, t) => _(e, t != null ? t : e.name + "  Past Week", "pastweek"), "pastWeek"), bf = T((e, t) => _(e, t != null ? t : e.name + "  Past Month", "pastmonth"), "pastMonth"), yf = T((e, t) => _(e, t != null ? t : e.name + "  Past Quarter", "pastquarter"), "pastQuarter"), vf = T((e, t) => _(e, t != null ? t : e.name + "  Past Year", "pastyear"), "pastYear"), Sf = T((e, t) => _(e, t != null ? t : e.name + " Contribution", "contribution"), "contribution"), Tf = T((e, t, n) => {
+}, "measuredValue"), Kd = T((e, t, n, r) => wt(e, "+", t, n, r), "add"), Jd = T((e, t, n, r) => wt(e, "-", t, n, r), "subtract"), Yd = T((e, t, n, r) => wt(e, "*", t, n, r), "multiply"), Xd = T((e, t, n, r) => wt(e, "/", t, n, r), "divide"), Zd = T((e, t) => _(e, t != null ? t : "YTD " + e.name, "YTDSum"), "yearToDateSum"), ef = T((e, t) => _(e, t != null ? t : "QTD " + t, "QTDSum"), "quarterToDateSum"), tf = T((e, t) => _(e, t != null ? t : "MTD " + e.name, "MTDSum"), "monthToDateSum"), nf = T((e, t) => _(e, t != null ? t : "MTD " + e.name, "WTDSum"), "weekToDateSum"), rf = T((e, t, n) => _(e, n != null ? n : "Running Sum " + e.name, "RSum"), "runningSum"), sf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growth"), "growth"), af = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthrate"), "growthRate"), of = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastweek"), "growthPastWeek"), uf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastmonth"), "growthPastMonth"), lf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastquarter"), "growthPastQuarter"), cf = T((e, t) => _(e, t != null ? t : e.name + "  Growth", "growthpastyear"), "growthPastYear"), df = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastperiod"), "difference"), ff = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastweek"), "diffPastWeek"), hf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastmonth"), "diffPastMonth"), pf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastquarter"), "diffPastQuarter"), gf = T((e, t) => _(e, t != null ? t : e.name + "  Difference", "diffpastyear"), "diffPastYear"), mf = T((e, t) => _(e, t != null ? t : e.name + "  Past Day", "pastday"), "pastDay"), bf = T((e, t) => _(e, t != null ? t : e.name + "  Past Week", "pastweek"), "pastWeek"), yf = T((e, t) => _(e, t != null ? t : e.name + "  Past Month", "pastmonth"), "pastMonth"), vf = T((e, t) => _(e, t != null ? t : e.name + "  Past Quarter", "pastquarter"), "pastQuarter"), Sf = T((e, t) => _(e, t != null ? t : e.name + "  Past Year", "pastyear"), "pastYear"), Tf = T((e, t) => _(e, t != null ? t : e.name + " Contribution", "contribution"), "contribution"), Af = T((e, t, n) => {
   let r;
   const i = (s) => s.replace("advancedSmoothing", "smooth").replace("localEstimates", "local");
   return n && (r = Object.entries(n).map((s) => i(`"${s[0]}=${s[1]}"`)).join(",")), _(e, t != null ? t : e.name + " Trend", "trend", r);
-}, "trend"), Af = T((e, t, n) => {
+}, "trend"), wf = T((e, t, n) => {
   let r;
   if (n) {
     const i = Object.assign({ forecastHorizon: 3 }, n);
@@ -4097,7 +4109,7 @@ const k = T((e, t, n, r) => new ye(n != null ? n : `${t.toString()} ${e.name}`,
   } else
     r = '"forecastHorizon=3"';
   return _(e, t != null ? t : e.name + " Forecast", "forecast", r);
-}, "forecast"), wf = T((e, t, n = Di.Descending, r = Mi.StandardCompetition, i = []) => {
+}, "forecast"), xf = T((e, t, n = Di.Descending, r = Mi.StandardCompetition, i = []) => {
   const s = [], a = {};
   s.push("rank("), ce(s, a, e), s.push(`,${n},${r}`), i.forEach((u) => {
     s.push(","), ce(s, a, u);
@@ -4108,47 +4120,47 @@ const k = T((e, t, n, r) => new ye(n != null ? n : `${t.toString()} ${e.name}`,
   __proto__: null,
   RankingSortTypes: Di,
   RankingTypes: Mi,
-  add: Qd,
+  add: Kd,
   aggregate: k,
   average: Li,
   avg: Fi,
-  constant: Gd,
-  contribution: Sf,
+  constant: Vd,
+  contribution: Tf,
   count: An,
   countDistinct: wn,
   customFormula: Ri,
-  diffPastMonth: ff,
-  diffPastQuarter: hf,
-  diffPastWeek: df,
-  diffPastYear: pf,
-  difference: cf,
-  divide: Yd,
-  forecast: Af,
-  growth: rf,
-  growthPastMonth: of,
-  growthPastQuarter: uf,
-  growthPastWeek: af,
-  growthPastYear: lf,
-  growthRate: sf,
+  diffPastMonth: hf,
+  diffPastQuarter: pf,
+  diffPastWeek: ff,
+  diffPastYear: gf,
+  difference: df,
+  divide: Xd,
+  forecast: wf,
+  growth: sf,
+  growthPastMonth: uf,
+  growthPastQuarter: lf,
+  growthPastWeek: of,
+  growthPastYear: cf,
+  growthRate: af,
   max: Sn,
-  measuredValue: Vd,
+  measuredValue: Qd,
   median: Tn,
   min: vn,
-  monthToDateSum: ef,
-  multiply: Jd,
-  pastDay: gf,
-  pastMonth: bf,
-  pastQuarter: yf,
-  pastWeek: mf,
-  pastYear: vf,
-  quarterToDateSum: Zd,
-  rank: wf,
-  runningSum: nf,
-  subtract: Kd,
+  monthToDateSum: tf,
+  multiply: Yd,
+  pastDay: mf,
+  pastMonth: yf,
+  pastQuarter: vf,
+  pastWeek: bf,
+  pastYear: Sf,
+  quarterToDateSum: ef,
+  rank: xf,
+  runningSum: rf,
+  subtract: Jd,
   sum: ht,
-  trend: Tf,
-  weekToDateSum: tf,
-  yearToDateSum: Xd
+  trend: Af,
+  weekToDateSum: nf,
+  yearToDateSum: Zd
 }, Symbol.toStringTag, { value: "Module" }));
 class xn extends yn {
   constructor(t, n, r, i, s, a, o) {
@@ -4421,7 +4433,7 @@ class Vt extends xn {
   }
 }
 const kp = (e) => !!(e && e.__serializable === "DimensionalMeasureTemplate");
-function xf(e, t) {
+function Ef(e, t) {
   return St(e, t);
 }
 const xt = () => ({
@@ -4429,12 +4441,12 @@ const xt = () => ({
   disabled: !1,
   locked: !1
 }), Pi = () => Object.assign(Object.assign({}, xt()), { excludeMembers: !1, enableMultiSelection: !0, deactivatedMembers: [] });
-function Ef(e) {
+function Of(e) {
   return "excludeMembers" in e;
 }
 const ji = (e) => {
-  const t = Ef(e) ? Pi() : xt();
-  return Object.fromEntries(Object.entries(e).filter(([n, r]) => !xf(r, t[n])));
+  const t = Of(e) ? Pi() : xt();
+  return Object.fromEntries(Object.entries(e).filter(([n, r]) => !Ef(r, t[n])));
 }, ne = {
   Contains: "contains",
   StartsWith: "startsWith",
@@ -4546,7 +4558,7 @@ class Bi extends $ {
     return t[this.operator] = this.filters.map((n) => n.filterJaql()), t;
   }
 }
-class Of extends $ {
+class Nf extends $ {
   constructor(t, n, r, i) {
     if (super(t, q.members, void 0, i), this.__serializable = "MembersFilter", this.members = n != null ? n : [], this.members.filter((s) => s == null).length > 0)
       throw new Ve("errors.filter.membersFilterNullMember", {
@@ -4561,7 +4573,7 @@ class Of extends $ {
     return `${this.attribute.id}_${this.members.map((t) => t.toString()).join()}`;
   }
   get name() {
-    return Ai([this.jaql(), Hd(this.config, ["guid", "originalFilterJaql"])]).toString(16);
+    return Ai([this.jaql(), kd(this.config, ["guid", "originalFilterJaql"])]).toString(16);
   }
   /**
    * Gets a serializable representation of the element
@@ -4582,7 +4594,7 @@ class Of extends $ {
     } : n;
   }
 }
-class Nf extends $ {
+class Cf extends $ {
   constructor(t, n, r) {
     super(t[0].attribute, q.cascading, n, r), this.__serializable = "CascadingFilter", this._filters = t;
   }
@@ -4616,7 +4628,7 @@ class Nf extends $ {
     return this.config.disabled ? $.disabledJaql(t) : this.filters.map((n) => (n.isScope = !0, n.jaql(t)));
   }
 }
-class Cf extends $ {
+class _f extends $ {
   constructor(t, n, r, i) {
     super(t.attribute, q.exclude, r, i), this.__serializable = "ExcludeFilter", this.input = n, this.filter = t;
   }
@@ -4668,7 +4680,7 @@ class Ot extends $ {
     return this.operatorA && this.valueA !== void 0 && (t[this.operatorA] = this.valueA), this.operatorB && this.valueB !== void 0 && (t[this.operatorB] = this.valueB), t;
   }
 }
-class _f extends Ot {
+class Mf extends Ot {
   constructor(t, n, r, i, s, a, o, u) {
     super(t, q.measure, r, i, s, a, o, u), this.__serializable = "MeasureFilter", this.measure = n;
   }
@@ -4753,7 +4765,7 @@ class Wi extends $ {
     }), n.jaql.type = "measure", n;
   }
 }
-class Mf extends Ot {
+class Df extends Ot {
   constructor(t, n, r, i, s, a, o) {
     super(t, q.numeric, n, r, i, s, a, o), this.__serializable = "NumericFilter";
   }
@@ -4775,7 +4787,7 @@ class re extends Ot {
     return super.serialize();
   }
 }
-class Df extends Ot {
+class Rf extends Ot {
   constructor(t, n, r, i, s) {
     super(t, q.dateRange, We.From, n, We.To, r, i, s), this.__serializable = "DateRangeFilter", typeof n == "object" && (this.valueA = n.toISOString()), typeof r == "object" && (this.valueB = r.toISOString());
   }
@@ -4834,7 +4846,7 @@ class En extends $ {
     }, this.anchor && (typeof this.anchor == "string" ? t[this.operator].anchor = this.anchor : typeof this.anchor == "object" && (t[this.operator].anchor = this.anchor.toISOString())), t;
   }
 }
-class Rf extends $ {
+class Lf extends $ {
   constructor(t, n, r, i) {
     super(t, q.advanced, r, i), this.__serializable = "CustomFilter", delete n.filterType, this.jaqlExpression = n;
   }
@@ -4895,11 +4907,11 @@ function tg(e) {
 function ng(e) {
   return e && e.__serializable === "DateRangeFilter";
 }
-const qi = v((e, t) => new Bi(e, $i.Union, t), "union"), zi = v((e, t) => new Bi(e, $i.Intersection, t), "intersection"), On = v((e, t, n) => new Cf(e, t, n), "exclude"), Hi = v((e, t, n) => new re(e, ne.DoesntContain, t, n), "doesntContain"), ki = v((e, t, n) => new re(e, ne.DoesntEndWith, t, n), "doesntEndWith"), Gi = v((e, t, n) => new re(e, ne.DoesntStartWith, t, n), "doesntStartWith"), Vi = v((e, t, n) => new re(e, ne.Contains, t, n), "contains"), Qi = v((e, t, n) => new re(e, ne.EndsWith, t, n), "endsWith"), Ki = v((e, t, n) => new re(e, ne.StartsWith, t, n), "startsWith"), Lf = v((e, t, n) => new re(e, ne.Like, t, n), "like"), Ji = v((e, t, n) => typeof t == "string" ? new re(e, ne.DoesntEqual, t, n) : ie(e, R.DoesntEqual, t, void 0, void 0, n), "doesntEqual"), Yi = v((e, t, n) => typeof t == "string" ? new re(e, ne.Equals, t, n) : ie(e, R.Equals, t, void 0, void 0, n), "equals"), Xi = v((e, t, n) => ie(e, R.FromNotEqual, t, void 0, void 0, n), "greaterThan"), Zi = v((e, t, n) => ie(e, R.From, t, void 0, void 0, n), "greaterThanOrEqual"), es = v((e, t, n) => ie(e, R.ToNotEqual, t, void 0, void 0, n), "lessThan"), ts = v((e, t, n) => ie(e, R.To, t, void 0, void 0, n), "lessThanOrEqual"), pt = v((e, t, n, r) => ie(e, R.From, t, R.To, n, r), "between"), Ff = v((e, t, n, r) => ie(e, R.FromNotEqual, t, R.ToNotEqual, n, r), "betweenNotEqual"), ie = v((e, t, n, r, i, s) => new Mf(e, t, n, r, i, s), "numeric"), Ct = v((e, t, n) => new Of(e, t, n), "members"), If = v((e, t, n) => _t(e, t, void 0, n), "dateFrom"), Pf = v((e, t, n) => _t(e, void 0, t, n), "dateTo"), _t = v((e, t, n, r) => new Df(e, t, n, r), "dateRange"), jf = v((e, t, n, r, i) => new En(e, t, n, void 0, r, i), "dateRelative"), ns = v((e, t, n, r, i) => new En(e, t, n, We.Next, r, i), "dateRelativeFrom"), xe = v((e, t, n, r, i) => new En(e, t, n, We.Last, r, i), "dateRelativeTo"), $f = v((e, t) => xe(e.Years, 0, 1, void 0, t), "thisYear"), Bf = v((e, t) => xe(e.Months, 0, 1, void 0, t), "thisMonth"), Uf = v((e, t) => xe(e.Quarters, 0, 1, void 0, t), "thisQuarter"), Wf = v((e, t) => xe(e.Days, 0, 1, void 0, t), "today");
+const qi = v((e, t) => new Bi(e, $i.Union, t), "union"), zi = v((e, t) => new Bi(e, $i.Intersection, t), "intersection"), On = v((e, t, n) => new _f(e, t, n), "exclude"), Hi = v((e, t, n) => new re(e, ne.DoesntContain, t, n), "doesntContain"), ki = v((e, t, n) => new re(e, ne.DoesntEndWith, t, n), "doesntEndWith"), Gi = v((e, t, n) => new re(e, ne.DoesntStartWith, t, n), "doesntStartWith"), Vi = v((e, t, n) => new re(e, ne.Contains, t, n), "contains"), Qi = v((e, t, n) => new re(e, ne.EndsWith, t, n), "endsWith"), Ki = v((e, t, n) => new re(e, ne.StartsWith, t, n), "startsWith"), Ff = v((e, t, n) => new re(e, ne.Like, t, n), "like"), Ji = v((e, t, n) => typeof t == "string" ? new re(e, ne.DoesntEqual, t, n) : ie(e, R.DoesntEqual, t, void 0, void 0, n), "doesntEqual"), Yi = v((e, t, n) => typeof t == "string" ? new re(e, ne.Equals, t, n) : ie(e, R.Equals, t, void 0, void 0, n), "equals"), Xi = v((e, t, n) => ie(e, R.FromNotEqual, t, void 0, void 0, n), "greaterThan"), Zi = v((e, t, n) => ie(e, R.From, t, void 0, void 0, n), "greaterThanOrEqual"), es = v((e, t, n) => ie(e, R.ToNotEqual, t, void 0, void 0, n), "lessThan"), ts = v((e, t, n) => ie(e, R.To, t, void 0, void 0, n), "lessThanOrEqual"), pt = v((e, t, n, r) => ie(e, R.From, t, R.To, n, r), "between"), If = v((e, t, n, r) => ie(e, R.FromNotEqual, t, R.ToNotEqual, n, r), "betweenNotEqual"), ie = v((e, t, n, r, i, s) => new Df(e, t, n, r, i, s), "numeric"), Ct = v((e, t, n) => new Nf(e, t, n), "members"), Pf = v((e, t, n) => _t(e, t, void 0, n), "dateFrom"), jf = v((e, t, n) => _t(e, void 0, t, n), "dateTo"), _t = v((e, t, n, r) => new Rf(e, t, n, r), "dateRange"), $f = v((e, t, n, r, i) => new En(e, t, n, void 0, r, i), "dateRelative"), ns = v((e, t, n, r, i) => new En(e, t, n, We.Next, r, i), "dateRelativeFrom"), xe = v((e, t, n, r, i) => new En(e, t, n, We.Last, r, i), "dateRelativeTo"), Bf = v((e, t) => xe(e.Years, 0, 1, void 0, t), "thisYear"), Uf = v((e, t) => xe(e.Months, 0, 1, void 0, t), "thisMonth"), Wf = v((e, t) => xe(e.Quarters, 0, 1, void 0, t), "thisQuarter"), qf = v((e, t) => xe(e.Days, 0, 1, void 0, t), "today");
 function oe(e, t, n, r, i, s, a) {
-  return new _f(e, t, n, r, i, s, a);
+  return new Mf(e, t, n, r, i, s, a);
 }
-const rs = v((e, t, n) => oe(e.attribute, e, R.Equals, t, void 0, void 0, n), "measureEquals"), is = v((e, t, n) => oe(e.attribute, e, R.FromNotEqual, t, void 0, void 0, n), "measureGreaterThan"), ss = v((e, t, n) => oe(e.attribute, e, R.From, t, void 0, void 0, n), "measureGreaterThanOrEqual"), as = v((e, t, n) => oe(e.attribute, e, R.To, t, void 0, void 0, n), "measureLessThanOrEqual"), os = v((e, t, n) => oe(e.attribute, e, R.ToNotEqual, t, void 0, void 0, n), "measureLessThan"), Qt = v((e, t, n, r) => oe(e.attribute, e, R.From, t, R.To, n, r), "measureBetween"), qf = v((e, t, n, r) => oe(e.attribute, e, R.FromNotEqual, t, R.ToNotEqual, n, r), "measureBetweenNotEqual"), us = v((e, t, n, r) => new Ui(e, t, Et.Top, n, r), "topRanking"), ls = v((e, t, n, r) => new Ui(e, t, Et.Bottom, n, r), "bottomRanking"), cs = v((e, t, n) => new Wi(e, Et.Top, t, n), "measureTopRanking"), ds = v((e, t, n) => new Wi(e, Et.Bottom, t, n), "measureBottomRanking"), zf = v((e, t) => new Nf(e, t), "cascading");
+const rs = v((e, t, n) => oe(e.attribute, e, R.Equals, t, void 0, void 0, n), "measureEquals"), is = v((e, t, n) => oe(e.attribute, e, R.FromNotEqual, t, void 0, void 0, n), "measureGreaterThan"), ss = v((e, t, n) => oe(e.attribute, e, R.From, t, void 0, void 0, n), "measureGreaterThanOrEqual"), as = v((e, t, n) => oe(e.attribute, e, R.To, t, void 0, void 0, n), "measureLessThanOrEqual"), os = v((e, t, n) => oe(e.attribute, e, R.ToNotEqual, t, void 0, void 0, n), "measureLessThan"), Qt = v((e, t, n, r) => oe(e.attribute, e, R.From, t, R.To, n, r), "measureBetween"), zf = v((e, t, n, r) => oe(e.attribute, e, R.FromNotEqual, t, R.ToNotEqual, n, r), "measureBetweenNotEqual"), us = v((e, t, n, r) => new Ui(e, t, Et.Top, n, r), "topRanking"), ls = v((e, t, n, r) => new Ui(e, t, Et.Bottom, n, r), "bottomRanking"), cs = v((e, t, n) => new Wi(e, Et.Top, t, n), "measureTopRanking"), ds = v((e, t, n) => new Wi(e, Et.Bottom, t, n), "measureBottomRanking"), Hf = v((e, t) => new Cf(e, t), "cascading");
 var ve;
 (function(e) {
   const t = (n) => {
@@ -4923,20 +4935,20 @@ var ve;
     right: t(r)
   }), "or");
 })(ve = ve || (ve = {}));
-const fs = v((e, t, n) => new Rf(e, t, n), "customFilter"), rg = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const fs = v((e, t, n) => new Lf(e, t, n), "customFilter"), rg = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   between: pt,
-  betweenNotEqual: Ff,
+  betweenNotEqual: If,
   bottomRanking: ls,
-  cascading: zf,
+  cascading: Hf,
   contains: Vi,
   customFilter: fs,
-  dateFrom: If,
+  dateFrom: Pf,
   dateRange: _t,
-  dateRelative: jf,
+  dateRelative: $f,
   dateRelativeFrom: ns,
   dateRelativeTo: xe,
-  dateTo: Pf,
+  dateTo: jf,
   doesntContain: Hi,
   doesntEndWith: ki,
   doesntEqual: Ji,
@@ -4949,13 +4961,13 @@ const fs = v((e, t, n) => new Rf(e, t, n), "customFilter"), rg = /* @__PURE__ */
   intersection: zi,
   lessThan: es,
   lessThanOrEqual: ts,
-  like: Lf,
+  like: Ff,
   get logic() {
     return ve;
   },
   measureBase: oe,
   measureBetween: Qt,
-  measureBetweenNotEqual: qf,
+  measureBetweenNotEqual: zf,
   measureBottomRanking: ds,
   measureEquals: rs,
   measureGreaterThan: is,
@@ -4966,13 +4978,13 @@ const fs = v((e, t, n) => new Rf(e, t, n), "customFilter"), rg = /* @__PURE__ */
   members: Ct,
   numeric: ie,
   startsWith: Ki,
-  thisMonth: Bf,
-  thisQuarter: Uf,
-  thisYear: $f,
-  today: Wf,
+  thisMonth: Uf,
+  thisQuarter: Wf,
+  thisYear: Bf,
+  today: qf,
   topRanking: us,
   union: qi
-}, Symbol.toStringTag, { value: "Module" })), Hf = (e) => {
+}, Symbol.toStringTag, { value: "Module" })), kf = (e) => {
   const { dim: t, datatype: n, title: r, datasource: i } = e;
   return _n({
     expression: t,
@@ -4981,7 +4993,7 @@ const fs = v((e, t, n) => new Rf(e, t, n), "customFilter"), rg = /* @__PURE__ */
     title: r,
     dataSource: i
   });
-}, kf = (e) => {
+}, Gf = (e) => {
   const { dim: t, title: n, datatype: r, agg: i, datasource: s } = e;
   if (i)
     return Mn({
@@ -4996,7 +5008,7 @@ const fs = v((e, t, n) => new Rf(e, t, n), "customFilter"), rg = /* @__PURE__ */
     });
 }, Mr = (e, t) => {
   if ("formula" in e)
-    return bs(e);
+    return ys(e);
   const { dim: n, datatype: r, agg: i } = e;
   return Mn({
     expression: n,
@@ -5028,7 +5040,7 @@ var Se;
 (function(e) {
   e.DATE_TIME = "datetime", e.NUMERIC = "numeric", e.TEXT = "text";
 })(Se = Se || (Se = {}));
-const Gf = ["1", "30"], E = Object.assign(Object.assign(Object.assign({}, tt), nt), rt), Vf = {
+const Vf = ["1", "30"], E = Object.assign(Object.assign(Object.assign({}, tt), nt), rt), Qf = {
   [E.INCLUDE_ALL]: {
     all: !0,
     filterType: E.INCLUDE_ALL
@@ -5056,24 +5068,24 @@ const Gf = ["1", "30"], E = Object.assign(Object.assign(Object.assign({}, tt), n
     members: [],
     filterType: E.SPECIFIC_ITEMS
   }
-}, Qf = {
-  filter: Vf.INCLUDE_ALL,
+}, Kf = {
+  filter: Qf.INCLUDE_ALL,
   level: ae.YEARS
 };
 var p;
 (function(e) {
   e.IS = "members", e.IS_NOT = "exclude", e.IS_WITHIN = "isWithin", e.TOP = "top", e.BOTTOM = "bottom", e.AFTER = "after", e.BEFORE = "before", e.STARTS_WITH = "startsWith", e.DOESNT_START_WITH = "doesntStartWith", e.ENDS_WITH = "endsWith", e.DOESNT_END_WITH = "doesntEndWith", e.CONTAINS = "contains", e.DOESNT_CONTAIN = "doesntContain", e.EQUALS = "equals", e.DOESNT_EQUAL = "doesntEqual", e.IS_EMPTY = "isEmpty", e.IS_NOT_EMPTY = "isNotEmpty", e.GREATER_THAN = "fromNotEqual", e.GREATER_THAN_OR_EQUAL = "from", e.LESS_THAN = "toNotEqual", e.LESS_THAN_OR_EQUAL = "to", e.BETWEEN = "between", e.IS_NOT_BETWEEN = "isNotBetween", e.MULTIPLE_CONDITION = "multipleCondition", e.NONE = "none";
 })(p = p || (p = {}));
-const Kf = (e) => e.top !== void 0, Jf = (e) => e.bottom !== void 0, Yf = (e) => {
+const Jf = (e) => e.top !== void 0, Yf = (e) => e.bottom !== void 0, Xf = (e) => {
   var t;
   return !!(!((t = e.exclude) === null || t === void 0) && t.members);
-}, Xf = (e) => !!e.members && !!e.isCondition, Zf = (e) => {
+}, Zf = (e) => !!e.members && !!e.isCondition, eh = (e) => {
   var t, n;
   return ((t = e.last) === null || t === void 0 ? void 0 : t.anchor) !== void 0 || ((n = e.next) === null || n === void 0 ? void 0 : n.anchor) !== void 0;
-}, eh = (e) => e.fromNotEqual !== void 0, th = (e) => e.from !== void 0 && !e.isBetween, nh = (e) => e.toNotEqual !== void 0, rh = (e) => e.to !== void 0 && !e.isBetween, ih = (e) => e.equals !== void 0, sh = (e) => e.doesntEqual !== void 0, ah = (e) => !!(e.equals === "" && e.isEmpty), oh = (e) => !!(e.doesntEqual === "" && e.isEmpty), uh = (e) => e.contains !== void 0, lh = (e) => e.doesntContain !== void 0, ch = (e) => e.startsWith !== void 0, dh = (e) => e.doesntStartWith !== void 0, fh = (e) => e.endsWith !== void 0, hh = (e) => e.doesntEndWith !== void 0, ph = (e) => e.from !== void 0 && e.to !== void 0, gh = (e) => {
+}, th = (e) => e.fromNotEqual !== void 0, nh = (e) => e.from !== void 0 && !e.isBetween, rh = (e) => e.toNotEqual !== void 0, ih = (e) => e.to !== void 0 && !e.isBetween, sh = (e) => e.equals !== void 0, ah = (e) => e.doesntEqual !== void 0, oh = (e) => !!(e.equals === "" && e.isEmpty), uh = (e) => !!(e.doesntEqual === "" && e.isEmpty), lh = (e) => e.contains !== void 0, ch = (e) => e.doesntContain !== void 0, dh = (e) => e.startsWith !== void 0, fh = (e) => e.doesntStartWith !== void 0, hh = (e) => e.endsWith !== void 0, ph = (e) => e.doesntEndWith !== void 0, gh = (e) => e.from !== void 0 && e.to !== void 0, mh = (e) => {
   var t, n;
   return ((t = e.exclude) === null || t === void 0 ? void 0 : t.from) !== void 0 && ((n = e.exclude) === null || n === void 0 ? void 0 : n.to) !== void 0;
-}, mh = (e) => !!(e.or || e.and), Nn = (e) => Jf(e) ? p.BOTTOM : Kf(e) ? p.TOP : Yf(e) ? p.IS_NOT : Zf(e) ? p.IS_WITHIN : eh(e) ? p.GREATER_THAN : nh(e) ? p.LESS_THAN : ih(e) ? p.EQUALS : sh(e) ? p.DOESNT_EQUAL : ah(e) ? p.IS_EMPTY : oh(e) ? p.IS_NOT_EMPTY : uh(e) ? p.CONTAINS : lh(e) ? p.DOESNT_CONTAIN : hh(e) ? p.DOESNT_END_WITH : dh(e) ? p.DOESNT_START_WITH : fh(e) ? p.ENDS_WITH : ch(e) ? p.STARTS_WITH : gh(e) ? p.IS_NOT_BETWEEN : Xf(e) ? p.IS : mh(e) ? p.MULTIPLE_CONDITION : ph(e) ? p.BETWEEN : th(e) ? p.GREATER_THAN_OR_EQUAL : rh(e) ? p.LESS_THAN_OR_EQUAL : p.NONE, Kt = (e, t, n) => {
+}, bh = (e) => !!(e.or || e.and), Nn = (e) => Yf(e) ? p.BOTTOM : Jf(e) ? p.TOP : Xf(e) ? p.IS_NOT : eh(e) ? p.IS_WITHIN : th(e) ? p.GREATER_THAN : rh(e) ? p.LESS_THAN : sh(e) ? p.EQUALS : ah(e) ? p.DOESNT_EQUAL : oh(e) ? p.IS_EMPTY : uh(e) ? p.IS_NOT_EMPTY : lh(e) ? p.CONTAINS : ch(e) ? p.DOESNT_CONTAIN : ph(e) ? p.DOESNT_END_WITH : fh(e) ? p.DOESNT_START_WITH : hh(e) ? p.ENDS_WITH : dh(e) ? p.STARTS_WITH : mh(e) ? p.IS_NOT_BETWEEN : Zf(e) ? p.IS : bh(e) ? p.MULTIPLE_CONDITION : gh(e) ? p.BETWEEN : nh(e) ? p.GREATER_THAN_OR_EQUAL : ih(e) ? p.LESS_THAN_OR_EQUAL : p.NONE, Kt = (e, t, n) => {
   var r, i, s, a, o, u, l;
   switch (Nn(t)) {
     case p.BOTTOM:
@@ -5131,7 +5143,7 @@ const Kf = (e) => e.top !== void 0, Jf = (e) => e.bottom !== void 0, Yf = (e) =>
   throw new Ve("errors.filter.unsupportedConditionFilter", {
     filter: JSON.stringify(t)
   });
-}, bh = (e, t, n) => {
+}, yh = (e, t, n) => {
   var r, i;
   switch (Nn(t)) {
     case p.EQUALS:
@@ -5156,28 +5168,28 @@ const Kf = (e) => e.top !== void 0, Jf = (e) => e.bottom !== void 0, Yf = (e) =>
   throw new Ve("errors.filter.unsupportedConditionFilter", {
     filter: JSON.stringify(t)
   });
-}, yh = (e, t) => {
+}, vh = (e, t) => {
   let n = e ? e.toLocaleLowerCase() : ae.YEARS;
   return n === ae.MINUTES && t === "60" && (n = ae.HOURS), n;
-}, vh = (e) => e == null ? void 0 : e.all, Sh = (e) => e.last ? e.last : e.next, Th = (e) => {
+}, Sh = (e) => e == null ? void 0 : e.all, Th = (e) => e.last ? e.last : e.next, Ah = (e) => {
   var t;
-  return ((t = Sh(e)) === null || t === void 0 ? void 0 : t.offset) < 2;
-}, Ah = (e) => {
+  return ((t = Th(e)) === null || t === void 0 ? void 0 : t.offset) < 2;
+}, wh = (e) => {
   var t;
   return ((t = e == null ? void 0 : e.members) === null || t === void 0 ? void 0 : t.length) >= 0;
-}, wh = (e, t) => e && typeof e == "string" || t && typeof t == "string", xh = (e, t) => e === "" && t === "", Eh = (e, t) => {
+}, xh = (e, t) => e && typeof e == "string" || t && typeof t == "string", Eh = (e, t) => e === "" && t === "", Oh = (e, t) => {
   const { from: n, to: r } = e;
-  return t !== Se.DATE_TIME ? !1 : wh(n, r) ? !0 : xh(n, r);
-}, Oh = (e) => {
+  return t !== Se.DATE_TIME ? !1 : xh(n, r) ? !0 : Eh(n, r);
+}, Nh = (e) => {
   const { from: t, to: n } = e;
   return t !== void 0 && n !== void 0 && !e.isBetween;
-}, Nh = (e) => Nn(e) !== p.NONE, Ch = (e) => Object.keys(e).includes("isAdvanced"), _h = (e) => !!(e.level && e.bucket && e.level === ae.MINUTES && Gf.includes(e.bucket)), Mh = (e) => e.filterType === E.INVALID, Dr = (e, t = Se.DATE_TIME, n) => n && _h(n) || Ch(e) ? E.ADVANCED : vh(e) ? E.INCLUDE_ALL : Th(e) ? E.PERIOD : Ah(e) ? E.SPECIFIC_ITEMS : Eh(e, t) ? E.DATE_RANGE : Oh(e) ? E.NUMERIC_RANGE : Nh(e) ? E.CONDITION : (Mh(e), E.INVALID), Dh = (e, t) => {
-  const { level: n, filter: r, bucket: i } = e, s = r || Qf.filter, a = {
+}, Ch = (e) => Nn(e) !== p.NONE, _h = (e) => Object.keys(e).includes("isAdvanced"), Mh = (e) => !!(e.level && e.bucket && e.level === ae.MINUTES && Vf.includes(e.bucket)), Dh = (e) => e.filterType === E.INVALID, Dr = (e, t = Se.DATE_TIME, n) => n && Mh(n) || _h(e) ? E.ADVANCED : Sh(e) ? E.INCLUDE_ALL : Ah(e) ? E.PERIOD : wh(e) ? E.SPECIFIC_ITEMS : Oh(e, t) ? E.DATE_RANGE : Nh(e) ? E.NUMERIC_RANGE : Ch(e) ? E.CONDITION : (Dh(e), E.INVALID), Rh = (e, t) => {
+  const { level: n, filter: r, bucket: i } = e, s = r || Kf.filter, a = {
     filter: Object.assign(Object.assign({}, s), { filterType: Dr(s, t) })
   };
   if (t === Se.DATE_TIME) {
     const o = s, u = (o == null ? void 0 : o.level) || n;
-    a.level = yh(u, i), a.filter.filterType = Dr(s, t, { level: u, bucket: i });
+    a.level = vh(u, i), a.filter.filterType = Dr(s, t, { level: u, bucket: i });
   }
   return a;
 }, Rr = (e, t) => {
@@ -5193,8 +5205,8 @@ const Kf = (e) => e.top !== void 0, Jf = (e) => e.bottom !== void 0, Yf = (e) =>
     type: "filter"
   };
   return Object.assign({}, n);
-}, Rh = (e, t) => Ct(e, [], { guid: t }), Lh = (e, t, n, r) => {
-  const i = Fh(t), s = Ih(t, i), a = ji({
+}, Lh = (e, t) => Ct(e, [], { guid: t }), Fh = (e, t, n, r) => {
+  const i = Ih(t), s = Ph(t, i), a = ji({
     guid: n,
     excludeMembers: !1,
     enableMultiSelection: r != null ? r : !0,
@@ -5202,15 +5214,15 @@ const Kf = (e) => e.top !== void 0, Jf = (e) => e.bottom !== void 0, Yf = (e) =>
   });
   return Ct(e, s, a);
 };
-function Fh(e) {
+function Ih(e) {
   var t, n, r, i;
   return !((t = e.filter) === null || t === void 0) && t.turnedOff ? (i = (r = (n = e.filter) === null || n === void 0 ? void 0 : n.exclude) === null || r === void 0 ? void 0 : r.members) !== null && i !== void 0 ? i : [] : [];
 }
-function Ih(e, t) {
+function Ph(e, t) {
   const n = e.members;
   return t ? n.filter((r) => !t.includes(r)) : n;
 }
-const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e, t.from, t.to, { guid: n }), $h = (e, t, n) => t.last ? xe(e, t.last.offset, t.last.count, t.last.anchor, { guid: n }) : ns(e, t.next.offset, t.next.count, t.next.anchor, { guid: n }), Bh = (e, t, n) => fs(e, t, {
+const jh = (e, t, n) => _t(e, t.from, t.to, { guid: n }), $h = (e, t, n) => pt(e, t.from, t.to, { guid: n }), Bh = (e, t, n) => t.last ? xe(e, t.last.offset, t.last.count, t.last.anchor, { guid: n }) : ns(e, t.next.offset, t.next.count, t.next.anchor, { guid: n }), Uh = (e, t, n) => fs(e, t, {
   guid: n
 }), Lr = (e, t) => {
   try {
@@ -5218,22 +5230,22 @@ const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e
       throw new Ve("errors.filter.formulaFiltersNotSupported", {
         filter: JSON.stringify(e)
       });
-    const n = Dh(e, e.datatype), { filter: r } = n, { filterType: i } = r, s = Hf(e), a = kf(e);
+    const n = Rh(e, e.datatype), { filter: r } = n, { filterType: i } = r, s = kf(e), a = Gf(e);
     switch (i) {
       case E.INCLUDE_ALL:
-        return Rh(s, t);
+        return Lh(s, t);
       case E.SPECIFIC_ITEMS:
-        return Lh(s, r, t, r.multiSelection);
+        return Fh(s, r, t, r.multiSelection);
       case E.CONDITION:
-        return a ? bh(a, r, t) : Kt(s, r, t);
+        return a ? yh(a, r, t) : Kt(s, r, t);
       case E.DATE_RANGE:
-        return Ph(s, r, t);
+        return jh(s, r, t);
       case E.PERIOD:
-        return $h(s, r, t);
+        return Bh(s, r, t);
       case E.NUMERIC_RANGE:
-        return jh(s, r, t);
+        return $h(s, r, t);
       case E.ADVANCED:
-        return Bh(s, r, t);
+        return Uh(s, r, t);
       case E.INVALID:
         return Rr(e, t);
     }
@@ -5241,7 +5253,7 @@ const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e
     console.debug("Fall back to generic pass-through JAQL filter due to filter translation error:", n);
   }
   return Rr(e, t);
-}, Uh = (e) => [
+}, Wh = (e) => [
   "__int4",
   "__int8",
   "int",
@@ -5256,7 +5268,7 @@ const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e
   "integer",
   "byteint",
   "int64"
-].includes(e.toLowerCase()), Wh = (e) => [
+].includes(e.toLowerCase()), qh = (e) => [
   "basemeasure",
   "calculatedmeasure",
   "float",
@@ -5269,7 +5281,7 @@ const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e
   "real",
   "number",
   "float64"
-].includes(e.toLowerCase()), hs = (e) => Uh(e) || Wh(e) || e === "numeric-attribute", qh = (e) => [
+].includes(e.toLowerCase()), hs = (e) => Wh(e) || qh(e) || e === "numeric-attribute", zh = (e) => [
   "textdimension",
   "string",
   "varchar",
@@ -5304,8 +5316,8 @@ const Ph = (e, t, n) => _t(e, t.from, t.to, { guid: n }), jh = (e, t, n) => pt(e
   "timewithtimezone",
   "timestampwithtimezone",
   "timestamp_with_timezone"
-].includes(e.toLowerCase()), zh = (e) => ["bool", "boolean", "bit", "logical"].includes(e.toLowerCase()), Hh = (e) => hs(e) ? "number" : Cn(e) ? "datetime" : qh(e) ? "text" : zh(e) ? "boolean" : "text";
-function kh() {
+].includes(e.toLowerCase()), Hh = (e) => ["bool", "boolean", "bit", "logical"].includes(e.toLowerCase()), kh = (e) => hs(e) ? "number" : Cn(e) ? "datetime" : zh(e) ? "text" : Hh(e) ? "boolean" : "text";
+function Gh() {
   const e = new Uint32Array(1);
   return crypto.getRandomValues(e), e[0] / 4294967296;
 }
@@ -5318,7 +5330,7 @@ const ps = function(e) {
       n[s] = "-";
       continue;
     }
-    r <= 2 && (r = 33554432 + kh() * 16777216 | 0), i = r & 15, r = r >> 4, n[s] = t[s == 19 ? i & 3 | 8 : i];
+    r <= 2 && (r = 33554432 + Gh() * 16777216 | 0), i = r & 15, r = r >> 4, n[s] = t[s == 19 ? i & 3 | 8 : i];
   }
   return n.join("");
 }, ig = (e) => {
@@ -5335,12 +5347,12 @@ const ps = function(e) {
     return { left: l, right: d, operator: "AND" };
   }
   function r(a) {
-    return a && (Gh(a) ? Nt(a) ? n(a.filters) : (t.add(a), { instanceid: a.config.guid }) : ("left" in a && (a.left = r(a.left)), "right" in a && (a.right = r(a.right)), "composeCode" in a && delete a.composeCode, a));
+    return a && (Vh(a) ? Nt(a) ? n(a.filters) : (t.add(a), { instanceid: a.config.guid }) : ("left" in a && (a.left = r(a.left)), "right" in a && (a.right = r(a.right)), "composeCode" in a && delete a.composeCode, a));
   }
   const i = hi(e), s = r(i);
   return { filters: Array.from(t), relations: s };
 };
-function Gh(e) {
+function Vh(e) {
   return "config" in e && "guid" in e.config;
 }
 function sg(e) {
@@ -5378,7 +5390,7 @@ function og(e) {
     id: ""
   };
 }
-function Vh(e) {
+function bs(e) {
   return e ? e === "asc" ? D.Ascending : D.Descending : D.None;
 }
 function ug(e) {
@@ -5423,7 +5435,7 @@ function dg(e) {
   }
 }
 const _n = ({ expression: e, dataType: t, granularity: n, format: r, sort: i, title: s, panel: a, dataSource: o }) => {
-  const u = Ee(e).column, l = Vh(i);
+  const u = Ee(e).column, l = bs(i);
   if (t !== void 0 && Cn(t))
     return new Y(s != null ? s : u, e, n || h.Years, r || Y.getDefaultFormatForGranularity(n || h.Years), void 0, l, o, void 0, a);
   const f = !t || hs(t) ? w.NumericAttribute : w.TextAttribute;
@@ -5460,16 +5472,20 @@ const _n = ({ expression: e, dataType: t, granularity: n, format: r, sort: i, ti
     default:
       return ht(u, f, i);
   }
-}, bs = (e) => {
+}, ys = (e) => {
   var t;
-  const n = Kc((t = e.context) !== null && t !== void 0 ? t : {}, (r) => typeof r == "string" ? r : r && Kh(r));
-  return Ri(e.title, e.formula, n);
+  const n = Jc((t = e.context) !== null && t !== void 0 ? t : {}, (i) => typeof i == "string" ? i : i && Kh(i)), r = Ri(e.title, e.formula, n);
+  if (e.sort) {
+    const i = bs(e.sort);
+    return r.sort(i);
+  }
+  return r;
 };
 function Kh(e, t, n) {
   if ("filter" in e)
     return Qh(e);
   if ("formula" in e)
-    return bs(e);
+    return ys(e);
   const s = "datasource" in e ? e.datasource : void 0;
   return e.agg ? Mn({
     expression: e.dim,
@@ -5494,12 +5510,12 @@ function Kh(e, t, n) {
 function qe(e) {
   return e != null && e.datatype && Cn(e.datatype) ? Y.translateJaqlToGranularity(e) : void 0;
 }
-const ys = (e) => Hh(e).replace("number", "numeric");
+const vs = (e) => kh(e).replace("number", "numeric");
 class Qe extends yn {
   constructor(t, n, r, i, s, a, o, u) {
     if (super(t, r || w.Attribute, i, a, o), this.__serializable = "DimensionalAttribute", this._sort = D.None, this.expression = n, !o && n) {
       const { table: l, column: d } = Ee(n);
-      this.composeCode = vs(l, d, "", _i);
+      this.composeCode = Ss(l, d, "", _i);
     }
     u === "columns" && (this.panel = u), this._sort = s || D.None;
   }
@@ -5536,7 +5552,7 @@ class Qe extends yn {
       jaql: {
         title: this.name,
         dim: this.expression,
-        datatype: ys(this.type)
+        datatype: vs(this.type)
       }
     };
     return this.panel && (n.panel = this.panel), this._sort != D.None && (n.jaql.sort = this._sort == D.Ascending ? "asc" : "desc"), t === !0 ? n.jaql : n;
@@ -5554,7 +5570,7 @@ class Y extends Qe {
   constructor(t, n, r, i, s, a, o, u, l) {
     if (super(t, n, w.DateLevel, s, a, o, u), this.__serializable = "DimensionalLevelAttribute", this._format = i, this.granularity = r, !u && n) {
       const { table: d, column: f } = Ee(n);
-      this.composeCode = vs(d, f, r, _i);
+      this.composeCode = Ss(d, f, r, _i);
     }
     l === "columns" && (this.panel = l);
   }
@@ -5623,7 +5639,7 @@ class Y extends Qe {
    */
   jaql(t) {
     const n = {
-      jaql: Object.assign({ title: this.name, dim: this.expression, datatype: ys(this.type) }, this.translateGranularityToJaql())
+      jaql: Object.assign({ title: this.name, dim: this.expression, datatype: vs(this.type) }, this.translateGranularityToJaql())
     };
     if (this.panel && (n.panel = this.panel), this._format !== void 0) {
       const r = n.jaql.dateTimeLevel || n.jaql.level;
@@ -5782,7 +5798,7 @@ function pg(e) {
 function Jh(e) {
   return new Y(e.name || e.title, e.attribute || e.expression || e.dim, e.granularity, e.format, e.desc || e.description, e.sort, e.dataSource);
 }
-function vs(e, t, n, r) {
+function Ss(e, t, n, r) {
   return (r.length > 0 ? r + "." : "") + be(e) + "." + be(t) + (n && n.length > 0 ? "." + n : "");
 }
 function gg(e) {
@@ -5804,17 +5820,17 @@ function Jt(e) {
 function mg(e = [], t = []) {
   if (!Jt(e) && !Jt(t))
     return Ir(e, t);
-  const { filters: n, relations: r } = Ss(e), i = ep(t), s = Ir(n, i), a = np(n, r, s);
+  const { filters: n, relations: r } = Ts(e), i = ep(t), s = Ir(n, i), a = np(n, r, s);
   return tp(s, a);
 }
-function Ss(e) {
+function Ts(e) {
   if (!e)
     return { filters: [], relations: null };
   if (j(e))
     return { filters: e, relations: null };
   const t = /* @__PURE__ */ new Set();
   function n(i) {
-    if (As(i))
+    if (ws(i))
       return t.add(i), { instanceid: i.config.guid };
     if (Jt(i)) {
       const s = n(i.left), a = n(i.right);
@@ -5829,13 +5845,13 @@ function Ss(e) {
   };
 }
 function ep(e) {
-  return e ? Ss(e).filters : [];
+  return e ? Ts(e).filters : [];
 }
 function tp(e, t) {
-  if (!t || Ts(t))
+  if (!t || As(t))
     return e;
   const n = r(t);
-  return As(n) ? [n] : n;
+  return ws(n) ? [n] : n;
   function r(i) {
     if (Dn(i))
       return e.find((s) => s.config.guid === i.instanceid);
@@ -5844,7 +5860,7 @@ function tp(e, t) {
     throw new Ln();
   }
 }
-function Ts(e) {
+function As(e) {
   return !!e && "instanceid" in e;
 }
 function np(e, t, n) {
@@ -5897,7 +5913,7 @@ function ip(e, t) {
 function Yt(e, t) {
   if (!t)
     return null;
-  if (Ts(t))
+  if (As(t))
     return t.instanceid === e.config.guid ? null : t;
   const n = Yt(e, t.left), r = Yt(e, t.right);
   return n === null && r ? r : r === null && n ? n : n === null && r === null ? null : {
@@ -5953,7 +5969,7 @@ function Dn(e) {
 function Rn(e) {
   return "operator" in e;
 }
-function As(e) {
+function ws(e) {
   return "config" in e && "guid" in e.config;
 }
 function vg(e, t) {
@@ -6050,14 +6066,14 @@ const Pr = (e) => {
   return Object.keys(n).forEach((r) => {
     ["__proto__", "constructor", "prototype"].includes(r) || (Array.isArray(t[r]) && Array.isArray(n[r]) ? t[r] = se.options.mergeArrays ? Array.from(new Set(t[r].concat(n[r]))) : n[r] : Pr(t[r]) && Pr(n[r]) ? t[r] = se(t[r], n[r]) : t[r] = n[r]);
   }), t;
-}, {}), ws = {
+}, {}), xs = {
   mergeArrays: !0
 };
-se.options = ws;
+se.options = xs;
 se.withOptions = (e, ...t) => {
   se.options = Object.assign({ mergeArrays: !0 }, e);
   const n = se(...t);
-  return se.options = ws, n;
+  return se.options = xs, n;
 };
 let Ze;
 const lp = new Uint8Array(16);
@@ -6075,7 +6091,7 @@ function dp(e, t = 0) {
 const fp = typeof crypto != "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto), jr = {
   randomUUID: fp
 };
-function xs(e, t, n) {
+function Es(e, t, n) {
   if (jr.randomUUID && !t && !e)
     return jr.randomUUID();
   e = e || {};
@@ -6083,7 +6099,7 @@ function xs(e, t, n) {
   return r[6] = r[6] & 15 | 64, r[8] = r[8] & 63 | 128, dp(r);
 }
 function hp(e, t) {
-  const n = t == null ? void 0 : t.find((r) => Es(e) === r.attribute.id);
+  const n = t == null ? void 0 : t.find((r) => Os(e) === r.attribute.id);
   return n && !n.config.disabled && (n.isScope && (n.isScope = !1), e.jaql.in = {
     selected: n.jaql()
   }), e;
@@ -6091,10 +6107,10 @@ function hp(e, t) {
 function pp(e, t) {
   const n = [], r = [];
   return t.forEach((i) => {
-    e.some((a) => Es(a) === i.attribute.id) ? n.push(i) : r.push(i);
+    e.some((a) => Os(a) === i.attribute.id) ? n.push(i) : r.push(i);
   }), [n, r];
 }
-function Es(e) {
+function Os(e) {
   const { dim: t, level: n, dateTimeLevel: r, bucket: i } = e.jaql;
   let s = `${t}`;
   return (n || r) && (s += `_${n || r}`), i && (s += `_${i}`), s;
@@ -6149,7 +6165,7 @@ function Sp(e, t) {
   const { attributes: n, measures: r, filters: i, filterRelations: s, highlights: a, dataSource: o, count: u, offset: l, ungroup: d } = e, f = d && r.length === 0, c = Object.assign({ metadata: Ap({ attributes: n, measures: r, filters: i, filterRelations: s, highlights: a }, t) }, wp(o, u, l, f));
   return s ? Object.assign(Object.assign({}, c), { filterRelations: s }) : c;
 }
-function Os(e, t, n, r, i) {
+function Ns(e, t, n, r, i) {
   const [s, a] = pp(e, r);
   e.forEach((l) => hp(l, s));
   const o = (l) => {
@@ -6172,11 +6188,11 @@ function Tp(e) {
   return i;
 }
 function Ap(e, t) {
-  const { attributes: n, measures: r, filters: i, filterRelations: s, highlights: a } = e, o = n.map((d) => d.jaql()), u = r.map((d) => Tp(d.jaql())), l = Os(o, i, s, a, t);
+  const { attributes: n, measures: r, filters: i, filterRelations: s, highlights: a } = e, o = n.map((d) => d.jaql()), u = r.map((d) => Tp(d.jaql())), l = Ns(o, i, s, a, t);
   return [...o, ...u, ...l];
 }
 function wp(e, t, n, r) {
-  return Object.assign(Object.assign(Object.assign({ datasource: ms(e), by: it, queryGuid: xs() }, r ? { ungroup: !0 } : {}), t ? { count: t } : {}), n ? { offset: n } : {});
+  return Object.assign(Object.assign(Object.assign({ datasource: ms(e), by: it, queryGuid: Es() }, r ? { ungroup: !0 } : {}), t ? { count: t } : {}), n ? { offset: n } : {});
 }
 function Og(e, t) {
   const { rowsAttributes: n, columnsAttributes: r, measures: i, filters: s, filterRelations: a, grandTotals: o, highlights: u, dataSource: l, count: d, offset: f } = e, c = Object.assign({ metadata: Ep({ rowsAttributes: n, columnsAttributes: r, measures: i, filters: s, highlights: u, filterRelations: a }, t) }, Op(l, o, d, f));
@@ -6217,18 +6233,22 @@ function Ep(e, t) {
   const c = [
     ...d,
     ...f
-  ], m = i.map((b, x) => xp(b, "measures", x + l)), g = Os(c, s, a, o, t), S = [...c, ...m, ...g];
+  ], m = i.map((b, x) => xp(b, "measures", x + l)), g = Ns(c, s, a, o, t), S = [...c, ...m, ...g];
   return vp(S, u), S;
 }
 function Op(e, t, n, r) {
-  return Object.assign(Object.assign(Object.assign({ datasource: ms(e), by: it, queryGuid: xs(), dashboard: it, widget: it, format: "pivot" }, n ? { count: n } : {}), r ? { offset: r } : {}), { grandTotals: Object.assign(Object.assign({}, Zh), t) });
+  return Object.assign(Object.assign(Object.assign({ datasource: ms(e), by: it, queryGuid: Es(), dashboard: it, widget: it, format: "pivot" }, n ? { count: n } : {}), r ? { offset: r } : {}), { grandTotals: Object.assign(Object.assign({}, Zh), t) });
 }
 class Mt extends Hr {
   constructor(t, n) {
-    super(kr, {
-      key: t,
-      interpolationOptions: n
-    }, ma.t);
+    super(
+      kr,
+      {
+        key: t,
+        interpolationOptions: n
+      },
+      ba.t
+    );
   }
 }
 function Np(e) {
@@ -6239,35 +6259,26 @@ function Cp(e) {
 }
 const _p = (e, t) => {
   const n = /* @__PURE__ */ new Map();
-  return {
-    withCache: (s) => (...a) => Un(void 0, null, function* () {
-      const o = e(...a);
-      if (n.has(o)) {
-        const u = n.get(o);
-        if (Np(u))
-          return u.value;
-        if (Cp(u))
-          return u.valuePromise;
-        throw new Mt("errors.unexpectedCacheValue");
-      } else {
-        const u = s(...a);
-        return n.set(o, {
-          valuePromise: u,
-          createdAt: /* @__PURE__ */ new Date()
-        }), u.then((l) => (n.set(o, {
-          value: l,
-          createdAt: /* @__PURE__ */ new Date()
-        }), t != null && t.cacheMaxSize && n.size > t.cacheMaxSize && Mp(n), l));
-      }
-    }),
-    clearCache: (s) => {
-      if (s) {
-        n.delete(s);
-        return;
-      }
-      n.clear();
+  return { withCache: (s) => (...a) => Un(void 0, null, function* () {
+    const o = e(...a);
+    if (n.has(o)) {
+      const u = n.get(o);
+      if (Np(u))
+        return u.value;
+      if (Cp(u))
+        return u.valuePromise;
+      throw new Mt("errors.unexpectedCacheValue");
+    } else {
+      const u = s(...a);
+      return n.set(o, { valuePromise: u, createdAt: /* @__PURE__ */ new Date() }), u.then((l) => (n.set(o, { value: l, createdAt: /* @__PURE__ */ new Date() }), t != null && t.cacheMaxSize && n.size > t.cacheMaxSize && Mp(n), l));
     }
-  };
+  }), clearCache: (s) => {
+    if (s) {
+      n.delete(s);
+      return;
+    }
+    n.clear();
+  } };
 };
 function Mp(e) {
   const t = Array.from(e.keys()), n = t.reduce((r, i) => {
@@ -6277,7 +6288,17 @@ function Mp(e) {
   e.delete(n);
 }
 const Fn = (e, t) => {
-  const { dataSource: n, dimensions: r = [], measures: i = [], filters: s = [], filterRelations: a, highlights: o = [], count: u, offset: l, ungroup: d } = e;
+  const {
+    dataSource: n,
+    dimensions: r = [],
+    measures: i = [],
+    filters: s = [],
+    filterRelations: a,
+    highlights: o = [],
+    count: u,
+    offset: l,
+    ungroup: d
+  } = e;
   s && s.forEach((c) => c.isScope = !0), o && o.forEach((c) => c.isScope = !0);
   const f = n || t;
   if (!f)
@@ -6285,6 +6306,7 @@ const Fn = (e, t) => {
   return {
     dataSource: f,
     attributes: r,
+    // internally, dimensions are represented by attributes
     measures: i,
     filters: s,
     filterRelations: a,
@@ -6297,33 +6319,49 @@ const Fn = (e, t) => {
 function Dp(e, t, n) {
   const r = Fn(e, t == null ? void 0 : t.defaultDataSource);
   return t.queryClient.executeQuery(r, n).resultPromise.catch((i) => {
-    throw i.message.includes("SecondsLevelIsNotSupportedException") ? new Mt("errors.secondsDateTimeLevelSupportedOnlyForLive") : i;
+    throw i.message.includes(
+      "SecondsLevelIsNotSupportedException"
+    ) ? new Mt("errors.secondsDateTimeLevelSupportedOnlyForLive") : i;
   });
 }
 const Ng = (e, t, n) => {
   const r = Fn(e, t == null ? void 0 : t.defaultDataSource);
   return t.queryClient.executeCsvQuery(r, n).resultPromise;
 }, Cg = (e, t, n) => {
-  const { dataSource: r, rows: i = [], columns: s = [], values: a = [], grandTotals: o = {}, filters: u = [], filterRelations: l, highlights: d = [], count: f, offset: c } = e;
+  const {
+    dataSource: r,
+    rows: i = [],
+    columns: s = [],
+    values: a = [],
+    grandTotals: o = {},
+    filters: u = [],
+    filterRelations: l,
+    highlights: d = [],
+    count: f,
+    offset: c
+  } = e;
   u && u.forEach((g) => g.isScope = !0), d && d.forEach((g) => g.isScope = !0);
   const m = r || (t == null ? void 0 : t.defaultDataSource);
   if (!m)
     throw new Mt("errors.executeQueryNoDataSource");
-  return t.queryClient.executePivotQuery({
-    dataSource: m,
-    // internally, for clarity, dimensions for "rows" and "columns"
-    // are represented by "rowsAttributes" and "columnsAttributes"
-    rowsAttributes: i,
-    columnsAttributes: s,
-    // internally, "values" is represented by "measures", which is used in JAQL
-    measures: a,
-    grandTotals: o,
-    filters: u,
-    filterRelations: l,
-    highlights: d,
-    count: f,
-    offset: c
-  }, n).resultPromise;
+  return t.queryClient.executePivotQuery(
+    {
+      dataSource: m,
+      // internally, for clarity, dimensions for "rows" and "columns"
+      // are represented by "rowsAttributes" and "columnsAttributes"
+      rowsAttributes: i,
+      columnsAttributes: s,
+      // internally, "values" is represented by "measures", which is used in JAQL
+      measures: a,
+      grandTotals: o,
+      filters: u,
+      filterRelations: l,
+      highlights: d,
+      count: f,
+      offset: c
+    },
+    n
+  ).resultPromise;
 }, Rp = (e) => JSON.stringify(U(y({}, Sp(e, !1)), {
   queryGuid: ""
 })), Lp = (e, t) => {
@@ -6341,42 +6379,42 @@ export {
   fn as E,
   ee as F,
   hs as G,
-  Pc as H,
+  jc as H,
   J as I,
-  ma as J,
-  ul as K,
+  ba as J,
+  ll as K,
   ri as L,
   w as M,
   K as N,
   j as O,
-  Ud as P,
-  Tf as Q,
-  Af as R,
+  Wd as P,
+  Af as Q,
+  wf as R,
   D as S,
   Mt as T,
   de as U,
   yi as V,
   qt as W,
   sn as X,
-  _d as Y,
-  Ad as Z,
-  Qc as _,
+  Md as Y,
+  wd as Z,
+  Kc as _,
   be as a,
   Hi as a$,
   zr as a0,
   pg as a1,
   gs as a2,
-  Ah as a3,
-  Nh as a4,
+  wh as a3,
+  Ch as a4,
   Nn as a5,
   p as a6,
   Jt as a7,
-  Ss as a8,
+  Ts as a8,
   tp as a9,
   Lp as aA,
   _g as aB,
   Dp as aC,
-  $c as aD,
+  Bc as aD,
   Ct as aE,
   _t as aF,
   vn as aG,
@@ -6404,13 +6442,13 @@ export {
   np as ab,
   Hr as ac,
   sg as ad,
-  Hh as ae,
+  kh as ae,
   Og as af,
   Mg as ag,
   Cg as ah,
-  Hl as ai,
+  kl as ai,
   Kh as aj,
-  Hd as ak,
+  kd as ak,
   ag as al,
   mg as am,
   Dn as an,
@@ -6418,8 +6456,8 @@ export {
   Rn as ap,
   Ln as aq,
   yg as ar,
-  Ts as as,
-  Nf as at,
+  As as as,
+  Cf as at,
   Nt as au,
   Vp as av,
   Kp as aw,
@@ -6432,7 +6470,7 @@ export {
   Gi as b1,
   Qi as b2,
   ki as b3,
-  Lf as b4,
+  Ff as b4,
   eg as b5,
   Yp as b6,
   tg as b7,
@@ -6440,25 +6478,25 @@ export {
   Qp as b9,
   Te as bA,
   hg as bB,
-  wd as bC,
+  xd as bC,
   mn as bD,
-  Cd as bE,
-  xo as bF,
+  _d as bE,
+  Eo as bF,
   Ni as bG,
   ug as bH,
-  Ld as bI,
+  Fd as bI,
   vi as bJ,
   Wt as bK,
-  Zl as bL,
+  ec as bL,
   ft as bM,
-  Kl as bN,
-  $d as bO,
-  pd as bP,
-  zh as bQ,
+  Jl as bN,
+  Bd as bO,
+  gd as bP,
+  Hh as bQ,
   St as bR,
   vt as bS,
   yt as bT,
-  Rd as bU,
+  Ld as bU,
   Xt as bV,
   fg as bW,
   Ii as bX,
@@ -6470,12 +6508,12 @@ export {
   wg as bc,
   xg as bd,
   Le as be,
-  qh as bf,
+  zh as bf,
   wn as bg,
-  jf as bh,
-  zf as bi,
+  $f as bh,
+  Hf as bi,
   Ir as bj,
-  Dd as bk,
+  Rd as bk,
   Ei as bl,
   oi as bm,
   Ng as bn,
@@ -6483,29 +6521,29 @@ export {
   kr as bp,
   Ri as bq,
   qp as br,
-  Md as bs,
+  Dd as bs,
   Tt as bt,
   Ge as bu,
   Kr as bv,
   nn as bw,
   gn as bx,
-  Wc as by,
-  ga as bz,
+  qc as by,
+  ma as bz,
   h as c,
   Jp as c0,
   X as c1,
   Vt as c2,
-  Rf as c3,
+  Lf as c3,
   En as c4,
-  Df as c5,
+  Rf as c5,
   re as c6,
-  Mf as c7,
+  Df as c7,
   Wi as c8,
   Ui as c9,
-  _f as ca,
-  Cf as cb,
+  Mf as ca,
+  _f as cb,
   Bi as cc,
-  Of as cd,
+  Nf as cd,
   zp as ce,
   ve as cf,
   rg as cg,
@@ -6513,19 +6551,19 @@ export {
   Fn as ci,
   Y as d,
   Qe as e,
-  bs as f,
+  ys as f,
   qe as g,
   Mn as h,
   _n as i,
-  ys as j,
+  vs as j,
   dg as k,
   ye as l,
   hi as m,
-  vs as n,
+  Ss as n,
   Ci as o,
   Ee as p,
-  da as q,
-  xf as r,
+  fa as q,
+  Ef as r,
   Cn as s,
   se as t,
   Qh as u,