@arcgis/charts-components 5.2.0-next.27 → 5.2.0-next.29

package/dist/chunks/index2.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import { isEqual as at, sortBy as Ai, cloneDeep as He, memoize as Et, isArray as ui, isNil as hr, isEmpty as Sr } from "lodash-es";
+import { isEqual as at, sortBy as Ai, cloneDeep as He, memoize as qt, isArray as ui, isNil as hr, isEmpty as Sr } from "lodash-es";
 import { u as h, k as Fr, r as D, v as Ke, m as Se, p as ye, n as De, q as Te, g as Z, j as br, s as R, t as ee, d as he, a as Xi, G as xr } from "./chart-object-literals.js";
 import wi from "@arcgis/core/layers/support/FeatureFilter.js";
 import Cr from "@arcgis/core/smartMapping/statistics/histogram.js";
@@ -18,13 +18,13 @@ import * as ea from "@arcgis/core/renderers/support/jsonUtils.js";
 import Lt from "@arcgis/core/request.js";
 import ta from "@arcgis/core/rest/support/FeatureSet.js";
 import { g as _ } from "./series-types.js";
-import { F as C, q as oe, C as F, e as Zt, z as ia, l as ci, o as Pi, v as aa, d as Xt, x as Mr, g as ra, s as zt, w as Dr, i as Or, r as Ae, t as qt } from "./index3.js";
+import { F as C, q as oe, C as F, e as Xt, z as ia, l as ci, o as Pi, v as aa, d as Jt, x as Mr, g as ra, s as Wt, w as Dr, i as Or, r as Ae, t as Vt } from "./index3.js";
 import Ir from "@arcgis/core/Graphic.js";
-import * as Wt from "@arcgis/core/symbols/support/symbolUtils.js";
-import { f as Jt, h as et, i as _e, e as se, R as U } from "./rest-js-object-literals.js";
+import * as Gt from "@arcgis/core/symbols/support/symbolUtils.js";
+import { f as Kt, h as et, i as _e, e as se, R as U } from "./rest-js-object-literals.js";
 import Er from "@arcgis/core/AttributeBinsGraphic.js";
 import { substitute as Be } from "@arcgis/core/intl.js";
-import { g as Vt, L as lt, az as W, j as Q, r as ut, o as Oe, ax as Kt, am as na, aB as sa, aq as qr, s as Rt, ay as Vr, b as Rr, a as $r } from "./index.js";
+import { g as Rt, L as lt, az as W, j as Q, r as ut, o as Oe, ax as ei, am as na, aB as sa, aq as qr, s as $t, ay as Vr, b as Rr, a as $r } from "./index.js";
 import { unsafeGetElementDirection as kr } from "@arcgis/toolkit/dom";
 import { fetchT9nStringsBundle as mt, getElementLocale as ze, supportedLocales as oa } from "@arcgis/toolkit/intl";
 import { i as la, b as ua, c as ie, a as yt, f as Qr, e as _r } from "./type-guards.js";
@@ -146,7 +146,7 @@ function de(t) {
   return _(t?.series) === h.BoxPlotSeries;
 }
 function dn(t) {
-  return t !== void 0 && t !== Jt.Solid && t !== Jt.Null;
+  return t !== void 0 && t !== Kt.Solid && t !== Kt.Null;
 }
 function cc(t, e) {
   let i = "";
@@ -248,7 +248,7 @@ const ce = "arcgis_charts_pie_from_fields_name", Ne = "arcgis_charts_pie_from_fi
     emptyCells: {
       symbol: {
         type: _e.SFS,
-        style: Jt.Solid,
+        style: Kt.Solid,
         color: C.grayColor
       },
       text: "null"
@@ -508,7 +508,7 @@ const Qe = [
   h.ComboLineAndBarSeries,
   h.RadarSeries
 ];
-function Gt(t, e) {
+function Ut(t, e) {
   let i = 0;
   if (t !== e) {
     const a = t.split("."), r = e.split(".");
@@ -532,13 +532,13 @@ function bn(t) {
 function Nc(t) {
   let e = Ke.Same, i = [];
   if (bn(t) && t !== void 0) {
-    Qe.sort(Gt);
-    const r = Gt(t, Qe[Qe.length - 1]);
+    Qe.sort(Ut);
+    const r = Ut(t, Qe[Qe.length - 1]);
     if (r === 1 ? e = Ke.Newer : r === -1 && (e = Ke.Older), e === Ke.Newer || e === Ke.Same)
       i.push(t);
     else {
       for (let n = Qe.length - 2; n >= 0; n -= 1)
-        if (Gt(t, Qe[n]) >= 0) {
+        if (Ut(t, Qe[n]) >= 0) {
           i = Qe.slice(n, Qe.length);
           break;
         }
@@ -564,7 +564,7 @@ function te(t, e) {
 function fe(t) {
   const { where: e, normalize: i, keepSurroundingQuotes: a, escape: r = !1 } = t;
   let n = "";
-  return e?.includes("=") && (n = e.split("=").slice(1).join("=").trim(), n === "null" ? n = null : n.trim() !== "" && !Number.isNaN(Number(n)) ? n = Number(n) : i === !1 ? r && (n = Zt(n)) : n = ia({ value: n, keepSurroundingQuotes: a, escape: r })), n;
+  return e?.includes("=") && (n = e.split("=").slice(1).join("=").trim(), n === "null" ? n = null : n.trim() !== "" && !Number.isNaN(Number(n)) ? n = Number(n) : i === !1 ? r && (n = Xt(n)) : n = ia({ value: n, keepSurroundingQuotes: a, escape: r })), n;
 }
 function Ie(t) {
   let e = !1;
@@ -598,7 +598,7 @@ function pa(t) {
 function xn(t) {
   let e = F.BoxPlotMonoField;
   const i = t.length === 1, a = t.find((o) => o.type === h.LineSeries) ?? t[0], { x: r } = a, n = "y" in a ? a.y : "", s = a.query?.where;
-  return r === Vt ? typeof n == "object" && n.length > 1 ? Ie(s) ? i && (e = F.BoxPlotMultiFields) : e = F.BoxPlotMultiFieldsAndSplitBy : i ? e = F.BoxPlotMonoField : Ie(s) || (e = F.BoxPlotMonoFieldAndSplitBy) : i ? e = F.BoxPlotMonoFieldAndCategory : Ie(s) ? e = F.BoxPlotMultiFieldsAndCategory : e = F.BoxPlotMonoFieldAndCategoryAndSplitBy, e;
+  return r === Rt ? typeof n == "object" && n.length > 1 ? Ie(s) ? i && (e = F.BoxPlotMultiFields) : e = F.BoxPlotMultiFieldsAndSplitBy : i ? e = F.BoxPlotMonoField : Ie(s) || (e = F.BoxPlotMonoFieldAndSplitBy) : i ? e = F.BoxPlotMonoFieldAndCategory : Ie(s) ? e = F.BoxPlotMultiFieldsAndCategory : e = F.BoxPlotMonoFieldAndCategoryAndSplitBy, e;
 }
 function k(t) {
   let e = F.NonSpecific;
@@ -791,14 +791,14 @@ function Oc(t) {
   let a = !1;
   const r = e?.series[0], n = i.series[0], s = _(e?.series), o = _(i.series);
   if (s === h.PieSeries && o === h.PieSeries) {
-    const { slices: u, sliceGrouping: c } = r, { slices: l, sliceGrouping: d } = n, f = u?.map((g) => ({
-      sliceId: g.sliceId,
-      label: g.label
-    })), m = l?.map((g) => ({
-      sliceId: g.sliceId,
-      label: g.label
-    })), y = c?.label, p = d?.label;
-    a = JSON.stringify(f) !== JSON.stringify(m) || JSON.stringify(y) !== JSON.stringify(p);
+    const { slices: u, sliceGrouping: c } = r, { slices: l, sliceGrouping: d } = n, f = u?.map((p) => ({
+      sliceId: p.sliceId,
+      label: p.label
+    })), m = l?.map((p) => ({
+      sliceId: p.sliceId,
+      label: p.label
+    })), y = c?.label, g = d?.label;
+    a = JSON.stringify(f) !== JSON.stringify(m) || JSON.stringify(y) !== JSON.stringify(g);
   }
   return a;
 }
@@ -819,7 +819,7 @@ function Ec(t, e) {
 }
 function qc(t, e) {
   let i, a, r, n;
-  return be(t.series[0]) && (i = t.series[0].temporalBinning?.unit, r = t.series[0].temporalBinning?.size), be(e.series[0]) && (a = e.series[0].temporalBinning?.unit, n = e.series[0].temporalBinning?.size), ei(i, r) && !ei(a, n);
+  return be(t.series[0]) && (i = t.series[0].temporalBinning?.unit, r = t.series[0].temporalBinning?.size), be(e.series[0]) && (a = e.series[0].temporalBinning?.unit, n = e.series[0].temporalBinning?.size), ti(i, r) && !ti(a, n);
 }
 function Vc(t, e) {
   return t.axes?.length === 3 && e.axes?.length === 2 || t.axes?.length === 2 && e.axes?.length === 3;
@@ -878,7 +878,7 @@ function Gc(t) {
     setTimeBinningInfoWhenNotProvided: c,
     chartLimits: l
   } = t, { series: d } = i, { series: f } = e, m = _(d);
-  let y = !1, p = !1, g = !1;
+  let y = !1, g = !1, p = !1;
   const S = {
     common: {
       layerChanged: !1,
@@ -959,7 +959,7 @@ function Gc(t) {
       });
       break;
   }
-  return p = Object.values(S.common).some((b) => b), (S.gauge.valueConversionChanged || S.histogram.dataPropsChanged || S.boxPlot.showMeanChanged || S.heatChart.binningChanged || S.heatChart.hideEmptyRowsAndColumnsChanged || S.heatChart.includeLeapDay || S.scatterPlot.tooltipFieldsChanged) && (g = !0), y = p || g, { dataUpdateNeeded: y, dataUpdateDetails: S };
+  return g = Object.values(S.common).some((x) => x), (S.gauge.valueConversionChanged || S.histogram.dataPropsChanged || S.boxPlot.showMeanChanged || S.heatChart.binningChanged || S.heatChart.hideEmptyRowsAndColumnsChanged || S.heatChart.includeLeapDay || S.scatterPlot.tooltipFieldsChanged) && (p = !0), y = g || p, { dataUpdateNeeded: y, dataUpdateDetails: S };
 }
 function Uc(t, e) {
   const i = He(t);
@@ -1172,7 +1172,7 @@ function ht(t) {
         value: `${d[a]?.toString()}`,
         dataContext: d,
         specificField: o ? C.xAxisField : C.originalCategoryValue
-      })), n === !0 && c && s === !0 && (m = Number.isNaN(Number.parseFloat(`${m?.toString()}`)) ? m : Number.parseFloat(m), y = Number.isNaN(Number.parseFloat(`${y?.toString()}`)) ? y : Number.parseFloat(y)), s === !0 && (l[C.originalCategoryValue] === null || m === null) || l[Kt.defaultGroupOfSlicesId] === !0 ? f = 1 : s === !0 && (d[C.originalCategoryValue] === null || y === null) || d[Kt.defaultGroupOfSlicesId] === !0 ? f = -1 : typeof m == "string" && typeof y == "string" ? (f = m.localeCompare(y, void 0, { numeric: !0 }), c && (f *= -1)) : m === void 0 ? f = c ? -1 : 1 : y === void 0 ? f = c ? 1 : -1 : m !== null && y !== null && (m > y ? f = c ? -1 : 1 : m < y && (f = c ? 1 : -1)), f;
+      })), n === !0 && c && s === !0 && (m = Number.isNaN(Number.parseFloat(`${m?.toString()}`)) ? m : Number.parseFloat(m), y = Number.isNaN(Number.parseFloat(`${y?.toString()}`)) ? y : Number.parseFloat(y)), s === !0 && (l[C.originalCategoryValue] === null || m === null) || l[ei.defaultGroupOfSlicesId] === !0 ? f = 1 : s === !0 && (d[C.originalCategoryValue] === null || y === null) || d[ei.defaultGroupOfSlicesId] === !0 ? f = -1 : typeof m == "string" && typeof y == "string" ? (f = m.localeCompare(y, void 0, { numeric: !0 }), c && (f *= -1)) : m === void 0 ? f = c ? -1 : 1 : y === void 0 ? f = c ? 1 : -1 : m !== null && y !== null && (m > y ? f = c ? -1 : 1 : m < y && (f = c ? 1 : -1)), f;
     });
   }
 }
@@ -1180,11 +1180,11 @@ function En(t) {
   const { arrayToSort: e, orderBy: i, sortingField: a, fieldList: r, isByFieldsChart: n, preferLabel: s } = t;
   e !== void 0 && e.length > 1 && !oe(a) && i !== void 0 && i.length > 0 && e.sort((o, u) => {
     let c = o[a];
-    s && n && typeof c == "string" && (c = Xt(r, c));
+    s && n && typeof c == "string" && (c = Jt(r, c));
     let l = i.indexOf(c?.toString() ?? "");
     l === -1 && (l = i.length);
     let d = u[a];
-    s && n && typeof d == "string" && (d = Xt(r, d));
+    s && n && typeof d == "string" && (d = Jt(r, d));
     let f = i.indexOf(d?.toString() ?? "");
     return f === -1 && (f = i.length), l - f;
   });
@@ -1212,7 +1212,7 @@ function Dt(t) {
     Object.entries(e).forEach(([o]) => {
       if (o !== "" && o !== Oe && o in e) {
         const u = {
-          [i]: Xt(r, o),
+          [i]: Jt(r, o),
           [a]: e[o],
           [C.xAxisField]: o,
           [C.originalCategoryValue]: o
@@ -1255,38 +1255,38 @@ function Aa(t, e) {
     maxLineTwoSeriesCountTotal: f,
     maxLineThreePlusSeriesCountPerSeries: m,
     maxLineThreePlusSeriesCountTotal: y,
-    maxPieChartSliceCountTotal: p,
-    maxGaugeByFeaturesLimit: g
-  } = ut(e), S = _(t.series), b = t.series.length === 0 ? 1 : t.series.length, v = k(t.series);
+    maxPieChartSliceCountTotal: g,
+    maxGaugeByFeaturesLimit: p
+  } = ut(e), S = _(t.series), x = t.series.length === 0 ? 1 : t.series.length, v = k(t.series);
   switch (S) {
     case h.ComboLineAndBarSeries:
     case h.BarSeries:
-      b <= a && (b === 1 ? i = r : b === 2 ? i = At({
+      x <= a && (x === 1 ? i = r : x === 2 ? i = At({
         countTotal: s,
         countPerSeries: n,
-        numberOfSeries: b
-      }) : b > 2 && (i = At({
+        numberOfSeries: x
+      }) : x > 2 && (i = At({
         countTotal: u,
         countPerSeries: o,
-        numberOfSeries: b
+        numberOfSeries: x
       })));
       break;
     case h.LineSeries:
-      b <= c && (b === 1 ? i = l : b === 2 ? i = At({
+      x <= c && (x === 1 ? i = l : x === 2 ? i = At({
         countTotal: f,
         countPerSeries: d,
-        numberOfSeries: b
-      }) : b > 2 && (i = At({
+        numberOfSeries: x
+      }) : x > 2 && (i = At({
         countTotal: y,
         countPerSeries: m,
-        numberOfSeries: b
+        numberOfSeries: x
       })));
       break;
     case h.PieSeries:
-      i = p;
+      i = g;
       break;
     case h.GaugeSeries:
-      i = g;
+      i = p;
       break;
     case h.ScatterSeries:
     // handled through the aggregation feature
@@ -1294,7 +1294,7 @@ function Aa(t, e) {
     // handled through the number of bins
     case h.BoxPlotSeries:
   }
-  return (v === F.BarAndLineNoAggregation || v === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / b)), i;
+  return (v === F.BarAndLineNoAggregation || v === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / x)), i;
 }
 function Oi(t, e) {
   let i = t;
@@ -1460,30 +1460,30 @@ function Wn(t) {
     (d) => {
       let { field: f } = d;
       const { color: m, label: y } = d;
-      let p;
-      Array.isArray(m) && m?.length === 4 ? p = m : m && "toRgba" in m && (p = m.toRgba());
-      let g = !1, S = !0;
+      let g;
+      Array.isArray(m) && m?.length === 4 ? g = m : m && "toRgba" in m && (g = m.toRgba());
+      let p = !1, S = !0;
       switch (u) {
         case h.BarSeries:
         case h.LineSeries:
         case h.ComboLineAndBarSeries:
         case h.RadarSeries:
           if (a !== F.BarAndLineFromFields) {
-            const b = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === f);
-            b !== void 0 && "y" in b ? f = [b.y].flat()[0] : f = "";
+            const x = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === f);
+            x !== void 0 && "y" in x ? f = [x.y].flat()[0] : f = "";
           }
-          g = a !== F.BarAndLineFromFields || f === r[C.originalCategoryValue];
+          p = a !== F.BarAndLineFromFields || f === r[C.originalCategoryValue];
           break;
         case h.PieSeries:
-          g = a === F.PieFromFields && f === r[C.originalCategoryValue];
+          p = a === F.PieFromFields && f === r[C.originalCategoryValue];
           break;
         case h.BoxPlotSeries:
-          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? g = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (g = i.map((v) => v.y).flat().includes(f)), S = !1;
+          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? p = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (p = i.map((v) => v.y).flat().includes(f)), S = !1;
           break;
       }
-      g && p && (s = {
+      p && g && (s = {
         type: _e.SMS,
-        color: p,
+        color: g,
         label: S && y ? y : void 0
       }, c != null && (s.outline = c), La({
         dataItem: r,
@@ -1528,7 +1528,7 @@ function Pa(t) {
     chartSubType: i,
     rendererType: a
   });
-  return n instanceof Array && e.type === h.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[Vt]) ?? n[0]), n = n !== C.rendererSymbolField ? `${C.rendererSymbolField}_${n.toString()}` : n, n;
+  return n instanceof Array && e.type === h.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[Rt]) ?? n[0]), n = n !== C.rendererSymbolField ? `${C.rendererSymbolField}_${n.toString()}` : n, n;
 }
 function Un(t) {
   const { chartRenderer: e, queryObject: i } = t, a = e !== void 0 ? {
@@ -1564,22 +1564,22 @@ async function Yn(t) {
       rendererOrigin: n
     });
     d = m.rendererSymbol, f = m.colorMatchApplied;
-  } else if (i?.[Kt.defaultGroupOfSlicesId] !== !0) {
+  } else if (i?.[ei.defaultGroupOfSlicesId] !== !0) {
     const { x: m } = e[0], y = /* @__PURE__ */ new Map();
-    o && o.trim() !== "" ? e.forEach((p) => {
-      if (p.type === h.BarSeries || p.type === h.LineSeries || p.type === h.BoxPlotSeries || p.type === h.RadarSeries) {
-        const g = Pa({
-          seriesConfig: p,
+    o && o.trim() !== "" ? e.forEach((g) => {
+      if (g.type === h.BarSeries || g.type === h.LineSeries || g.type === h.BoxPlotSeries || g.type === h.RadarSeries) {
+        const p = Pa({
+          seriesConfig: g,
           chartSubType: s,
           rendererType: r,
           dataItem: i
         }), S = fe({
-          where: p.query?.where,
+          where: g.query?.where,
           normalize: !0,
           keepSurroundingQuotes: !1,
           escape: !1
         });
-        y.set(g, {
+        y.set(p, {
           ...i,
           [o]: S
         });
@@ -1594,30 +1594,30 @@ async function Yn(t) {
       }
     );
     try {
-      const p = Array.from(y.entries()), g = u.clone();
-      g.layer = u.layer;
+      const g = Array.from(y.entries()), p = u.clone();
+      p.layer = u.layer;
       const S = a?.uniqueValueInfos;
-      for (let b = 0; b < p.length; b += 1) {
-        const [v, x] = p[b];
+      for (let x = 0; x < g.length; x += 1) {
+        const [v, b] = g[x];
         if (Ii({
           mode: "encode",
           x: m,
           splitByField: o,
-          attributes: x
-        }), c && c.length > 0 && Object.keys(x).forEach((N) => {
-          c.includes(N) || delete x[N];
-        }), g.attributes = x, l?.has(JSON.stringify(x)))
-          d = l.get(JSON.stringify(x));
+          attributes: b
+        }), c && c.length > 0 && Object.keys(b).forEach((N) => {
+          c.includes(N) || delete b[N];
+        }), p.attributes = b, l?.has(JSON.stringify(b)))
+          d = l.get(JSON.stringify(b));
         else {
-          if (d = (await Wt.getDisplayedSymbol(g))?.toJSON(), d != null) {
+          if (d = (await Gt.getDisplayedSymbol(p))?.toJSON(), d != null) {
             if (d.color === void 0) {
-              const T = (await Wt.getDisplayedColor(g))?.toJSON();
+              const T = (await Gt.getDisplayedColor(p))?.toJSON();
               T && (d.color = T.length === 4 ? T : [...T, 255]);
             }
-            const N = await Wt.getLegendLabel(g);
+            const N = await Gt.getLegendLabel(p);
             N != null && N !== "" && (d.label = N, d.uniqueValue = S?.find((T) => T.label === N)?.value ?? void 0);
           }
-          l?.set(JSON.stringify(x), d);
+          l?.set(JSON.stringify(b), d);
         }
         Ii({
           mode: "revert",
@@ -1713,7 +1713,7 @@ function ld(t, e) {
   const a = _(t?.series), r = _(e?.series);
   return a && a !== r && (i = a === h.ComboLineAndBarSeries && (r === h.BarSeries || r === h.LineSeries) || r === h.ComboLineAndBarSeries && (a === h.BarSeries || a === h.LineSeries) || a === h.BarSeries && r === h.LineSeries || a === h.LineSeries && r === h.BarSeries), i;
 }
-function ei(t, e) {
+function ti(t, e) {
   return t !== void 0 && e !== void 0 && e > 0;
 }
 function ud(t) {
@@ -1732,7 +1732,7 @@ function ud(t) {
     })?.color : f === void 0 && (f = na({ colorIndex: l }))), f;
   }).filter((c) => c !== void 0), r;
 }
-function ti(t) {
+function ii(t) {
   return t !== F.PieNoAggregation && t !== F.BarAndLineNoAggregation && t !== F.BarAndLineSplitByNoAggregation;
 }
 function ts(t) {
@@ -1815,7 +1815,7 @@ function ss(t) {
 }
 function os(t) {
   const { uniqueQuery: e, splitByField: i, x: a } = t, r = [...e.groupByFieldsForStatistics ?? [], a, i].filter(
-    (n) => n !== void 0 && n.trim() !== "" && n !== Vt
+    (n) => n !== void 0 && n.trim() !== "" && n !== Rt
   );
   e.groupByFieldsForStatistics = Array.from(new Set(r));
 }
@@ -1946,32 +1946,32 @@ function yi(t) {
     fetchFullBoxPlotData: s,
     returnFeaturesExtent: o,
     chartLimits: u
-  } = t, c = e.series, l = k(c), d = Re(e), { query: f, x: m } = d, y = "y" in d ? d.y : void 0, p = Pe({
+  } = t, c = e.series, l = k(c), d = Re(e), { query: f, x: m } = d, y = "y" in d ? d.y : void 0, g = Pe({
     xAxisValueFormatType: xe(e),
     setTimeBinningInfoWhenNotProvided: n,
     seriesConfig: d,
     queryObject: a
   });
-  let g = /* @__PURE__ */ new Map(), S = !1, b = !1, v = !1, x = !1, B = !1, N = {};
+  let p = /* @__PURE__ */ new Map(), S = !1, x = !1, v = !1, b = !1, B = !1, N = {};
   if (f !== void 0) {
     N = He(f);
     const $ = te(f.where);
     let M = "";
     switch (i.fetchNullValues !== !0 && (m !== C.boxPlot.boxPlotCategory && (M = `${m} IS NOT NULL`), $.trim() !== "" && $ !== m && !Ie(f.where) && (M = Y([M, `${$} IS NOT NULL`]))), l) {
       case F.BarAndLineSplitBy: {
-        g = ss(c), x = !0, S = !0, b = !0;
+        p = ss(c), b = !0, S = !0, x = !0;
         break;
       }
       case F.BarAndLineMultiFields:
-        cs(N, c), b = !0;
+        cs(N, c), x = !0;
         break;
       case F.PieFromFields:
       case F.BarAndLineFromFields:
-        M = "", v = !0, b = !0;
+        M = "", v = !0, x = !0;
         break;
       case F.BarAndLineMonoField:
       case F.PieFromCategory:
-        b = !0;
+        x = !0;
         break;
       case F.BoxPlotMonoField:
       case F.BoxPlotMultiFields:
@@ -1982,27 +1982,27 @@ function yi(t) {
       case F.BoxPlotMonoFieldAndSplitBy:
       case F.BoxPlotMonoFieldAndCategoryAndSplitBy:
       case F.BoxPlotMultiFieldsAndSplitBy: {
-        B = !0, x = !0, v = !0;
+        B = !0, b = !0, v = !0;
         break;
       }
       case F.PieNoAggregation:
       case F.BarAndLineNoAggregation:
       case F.BarAndLineSplitByNoAggregation:
     }
-    if (b && ls({
+    if (x && ls({
       uniqueQuery: N,
       y,
       useGenericOutStatFieldName: S,
       queryObject: a,
       chartSubType: l,
-      isTimeBinningSeries: p,
+      isTimeBinningSeries: g,
       returnFeaturesExtent: o,
       splitByField: $
-    }), x && os({ uniqueQuery: N, splitByField: $, x: m }), de(e) && B && (N.outStatistics = us({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
+    }), b && os({ uniqueQuery: N, splitByField: $, x: m }), de(e) && B && (N.outStatistics = us({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
       const G = q.split(" ");
       return !oe(G[0]);
-    })), p && be(c[0])) {
-      const q = z(a), { idFields: G } = $t(q);
+    })), g && be(c[0])) {
+      const q = z(a), { idFields: G } = kt(q);
       Ce(a).find((H) => H.name === m)?.type !== U.DateOnly && G && ds({
         uniqueQuery: N,
         x: m,
@@ -2017,7 +2017,7 @@ function yi(t) {
   }
   Da({ chartConfig: e, uniqueQuery: N, chartLimits: u });
   const { gdbVersion: T, geometry: w, distance: L, units: A, timeExtent: I, where: P, objectIds: O, spatialRelationship: V } = i;
-  return T !== void 0 && (N.gdbVersion = T), w !== void 0 && (N.geometry = w), L !== void 0 && (N.distance = L), A !== void 0 && (N.units = A), I !== void 0 && (N.timeExtent = I), O !== void 0 && (N.objectIds = O), V !== void 0 && (N.spatialRelationship = V), P !== void 0 && (N.where = Y([N.where, P])), { uniqueQuery: N, mapToStatField: g };
+  return T !== void 0 && (N.gdbVersion = T), w !== void 0 && (N.geometry = w), L !== void 0 && (N.distance = L), A !== void 0 && (N.units = A), I !== void 0 && (N.timeExtent = I), O !== void 0 && (N.objectIds = O), V !== void 0 && (N.spatialRelationship = V), P !== void 0 && (N.where = Y([N.where, P])), { uniqueQuery: N, mapToStatField: p };
 }
 const le = {
   Default: "defaultError",
@@ -2074,36 +2074,38 @@ function ms(t) {
   return e;
 }
 async function ys(t) {
-  const { queryConfig: e, chartConfig: i, queryObject: a, abortKey: r, abortSignal: n, filterByViewExtent: s, view: o } = t, u = i.series[0], { x: c, dataTransformationType: l, binCount: d } = u, f = z(a);
+  const { chartConfig: e, queryConfig: i, queryObject: a, filterByViewExtent: r, view: n, abortKey: s, abortSignal: o } = t, u = e.series[0], { x: c, dataTransformationType: l, binCount: d } = u, f = z(a);
   if (!ie(f))
     throw new re(le.LayerNotSupported);
-  f.loaded || await f.load({ signal: n });
-  const m = await dt(f, n);
+  f.loaded || await f.load({ signal: o });
+  const m = await dt(f, o);
   if (!m)
     throw new Error("Raster info is not available for the layer.");
-  const y = ft(e.geometry) ?? f.fullExtent, p = m.bandCount === 1 ? 0 : m.bandInfos.findIndex((b) => b.name === c);
-  let g, S;
-  if (s !== !0 && (l === void 0 || l === Z.None) && d && Array.isArray(m.histograms) && m.histograms.length > p && m.histograms[p].size % d === 0 && Array.isArray(m.statistics) && m?.statistics?.length > p)
-    g = m.histograms[p], S = m.statistics[p];
+  const y = ft(i.geometry) ?? f.fullExtent, g = Ot(f, c);
+  if (g < 0)
+    throw new Error("Band ID not found for `${x}`.");
+  let p, S;
+  if (!r && (l === void 0 || l === Z.None) && d && Array.isArray(m.histograms) && m.histograms.length > g && m.histograms[g].size % d === 0 && Array.isArray(m.statistics) && m?.statistics?.length > g)
+    p = m.histograms[g], S = m.statistics[g];
   else {
-    let b, v, x;
-    if (o)
-      b = o.resolution, v = o.resolution, x = o.spatialReference;
+    let x, v, b;
+    if (r && n)
+      x = n.resolution, v = n.resolution, b = n.spatialReference;
     else {
       const w = fs, L = 2, A = m.width, I = m.height, P = Math.max(
         0,
         Math.ceil(Math.log(Math.max(A, I) / w) / Math.log(L))
       ), O = L ** P;
-      b = m.pixelSize.x * O, v = m.pixelSize.y * O, x = f.spatialReference;
+      x = m.pixelSize.x * O, v = m.pixelSize.y * O, b = f.spatialReference;
     }
     const B = new da({
-      x: b,
+      x,
       y: v,
-      spatialReference: x
+      spatialReference: b
     }), N = ms(l), T = await Gr(
       f,
       {
-        bandIds: [p],
+        bandIds: [g],
         geometry: y,
         histogramSize: d ?? void 0,
         pixelSize: B,
@@ -2111,12 +2113,12 @@ async function ys(t) {
         downsampleOnly: !0
       },
       {
-        signal: n ?? (r !== void 0 ? Ge.get(r)?.signal : void 0)
+        signal: o ?? (s !== void 0 ? Ge.get(s)?.signal : void 0)
       }
     );
-    S = T.statistics[0], g = T.histograms[0];
+    S = T.statistics[0], p = T.histograms[0];
   }
-  return { histogram: g, statistics: S };
+  return { histogram: p, statistics: S };
 }
 function gs(t, e) {
   const i = [], a = (t.max - t.min) / t.size;
@@ -2146,47 +2148,48 @@ function gs(t, e) {
   return i;
 }
 async function ps(t) {
-  const { chartConfig: e, queryConfig: i, queryObject: a, abortKey: r, abortSignal: n, view: s } = t;
+  const { chartConfig: e, queryConfig: i, queryObject: a, filterByViewExtent: r, abortKey: n, abortSignal: s, view: o } = t;
   if (a === void 0)
     throw new Error("QueryObject is undefined!");
-  let o;
-  const { statistics: u, histogram: c } = await ys({
+  let u;
+  const { statistics: c, histogram: l } = await ys({
     queryObject: a,
     chartConfig: e,
     queryConfig: i,
-    view: s,
-    abortKey: r,
-    abortSignal: n
+    filterByViewExtent: r,
+    view: o,
+    abortKey: n,
+    abortSignal: s
   });
-  if (u && c) {
-    const l = e.series[0].binCount ?? void 0, d = gs(c, l);
-    d.length > 0 ? o = {
+  if (c && l) {
+    const d = e.series[0].binCount ?? void 0, f = gs(l, d);
+    f.length > 0 ? u = {
       valid: !0,
-      count: d.length,
+      count: f.length,
       data: {
-        bins: d,
-        min: u.min,
-        max: u.max,
-        mean: u.avg,
-        median: u.median,
-        stddev: u.stddev,
-        sum: u.sum ?? u.avg * u.count,
-        count: u.count
+        bins: f,
+        min: c.min,
+        max: c.max,
+        mean: c.avg,
+        median: c.median,
+        stddev: c.stddev,
+        sum: c.sum ?? c.avg * c.count,
+        count: c.count
       }
-    } : o = {
+    } : u = {
       valid: !1,
       invalidType: j.EmptyDataSet
     };
   } else
-    o = {
+    u = {
       valid: !1,
       invalidType: j.BadData
     };
-  return o;
+  return u;
 }
 const hs = (t) => t.series[0].x;
 function Ss(t) {
-  const { chartConfig: e, layer: i, selectionDataItems: a } = t, r = ai(i, hs(e)), s = a.map((c) => [
+  const { chartConfig: e, layer: i, selectionDataItems: a } = t, r = Ot(i, hs(e)), s = a.map((c) => [
     c.minValue,
     c.maxValue
   ]).reduce((c, l, d) => {
@@ -2289,17 +2292,17 @@ function Cs(t) {
 async function vs(t) {
   const { queryObject: e, queryConfig: i, outputFormat: a, dataFormat: r, outAnalytics: n, errorStrings: s, abortSignal: o } = t, { where: u, geometry: c, distance: l, units: d, timeExtent: f } = i;
   let m;
-  const y = z(e), p = ge(y);
-  if (p) {
-    const S = { where: Y([u, p.definitionExpression]) }, b = { query: S, signal: o }, v = ft(c)?.extent?.toJSON();
+  const y = z(e), g = ge(y);
+  if (g) {
+    const S = { where: Y([u, g.definitionExpression]) }, x = { query: S, signal: o }, v = ft(c)?.extent?.toJSON();
     if (v !== void 0) {
       const B = Cs(d), { xmin: N, ymin: T, xmax: w, ymax: L } = v;
       S.geometryType = "esriGeometryEnvelope", S.geometry = `${N},${T},${w},${L}`, l !== void 0 && (S.distance = l.toString()), B !== void 0 && (S.units = B, c?.spatialReference?.wkid != null && (S.inSR = c.spatialReference.wkid.toString()));
     }
     f && (S.time = `${f[0]},${f[1]}`);
-    const x = `${p.url}/${p.layerId}/queryAnalytic?f=${a}&dataFormat=${r}&outAnalytics=${n}`;
+    const b = `${g.url}/${g.layerId}/queryAnalytic?f=${a}&dataFormat=${r}&outAnalytics=${n}`;
     try {
-      m = (await Lt(x, b)).data?.features?.[0]?.attributes;
+      m = (await Lt(b, x)).data?.features?.[0]?.attributes;
     } catch (B) {
       const N = s ?? (await mt(
         ze(document.documentElement).t9nLocale,
@@ -2323,21 +2326,21 @@ async function Bs(t) {
   let u;
   const c = z(i), l = yn(c);
   if (l && i && "queryAttributeBins" in i) {
-    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: p, firstDayOfWeek: g, includeLeapDay: S } = e, b = Fo({
+    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: g, firstDayOfWeek: p, includeLeapDay: S } = e, x = Fo({
       queryObject: i,
       queryConfig: a,
       x: d,
       y: f,
       xTemporalBinning: m,
       yTemporalBinning: y,
-      configTimeZone: p,
-      firstDayOfWeek: g,
+      configTimeZone: g,
+      firstDayOfWeek: p,
       includeLeapDay: S,
       view: r,
       syncViewTimeZone: n
     });
     try {
-      u = await i.queryAttributeBins(b, { signal: o });
+      u = await i.queryAttributeBins(x, { signal: o });
     } catch (v) {
       throw new re(le.QueryFeaturesError, s.errors.queryError, v);
     }
@@ -2404,11 +2407,11 @@ async function xt(t) {
   const { queryObject: e, queryConfig: i, abortKey: a, errorStrings: r, abortSignal: n } = t, { outStatistics: s } = i, o = /* @__PURE__ */ new Map();
   if (s !== void 0 && s.length > 0) {
     const u = s.map((f) => {
-      const { statisticType: m, onStatisticField: y, outStatisticFieldName: p } = f;
+      const { statisticType: m, onStatisticField: y, outStatisticFieldName: g } = f;
       return {
         statisticType: m,
         onStatisticField: y,
-        outStatisticFieldName: p?.toUpperCase()
+        outStatisticFieldName: g?.toUpperCase()
       };
     });
     i.outStatistics = u, delete i.num, delete i.orderByFields;
@@ -2458,7 +2461,7 @@ async function Ia(t) {
         const { idField: f, isTraditionalTypeOID: m } = ve(u), y = m ? f : "*";
         d.outFields = [y], o = (await e.queryFeatures(d, {
           signal: c
-        })).features.map((g) => g.getObjectId());
+        })).features.map((p) => p.getObjectId());
       }
     else
       o = (await e.queryFeatures(d, { signal: c })).features;
@@ -2493,8 +2496,8 @@ async function Fe(t) {
   const l = z(e), d = r ?? 1, f = za(l);
   if (n !== !0 && d > f && l?.capabilities?.query.supportsPagination) {
     let m = 0, y = 0;
-    const p = Math.ceil(d / f), g = Math.ceil(p / W.maxParallelRequests), S = [];
-    for (; y < g; ) {
+    const g = Math.ceil(d / f), p = Math.ceil(g / W.maxParallelRequests), S = [];
+    for (; y < p; ) {
       m = y * W.maxParallelRequests * f;
       const v = ws({
         queryConfig: { ...i, start: m },
@@ -2574,12 +2577,12 @@ async function Ps(t) {
         d = (await e.queryAttributeBins(y, { signal: l })).features;
       }
     } catch (y) {
-      const p = o ?? (await mt(
+      const g = o ?? (await mt(
         ze(document.documentElement).t9nLocale,
         gt("./assets/common/t9n"),
         "messages."
       )).errorStrings;
-      throw new re(le.QueryFeaturesError, p.errors.queryError, y);
+      throw new re(le.QueryFeaturesError, g.errors.queryError, y);
     }
   }
   if (f === !1) {
@@ -2636,23 +2639,23 @@ async function Is(t) {
     dataFormat: f,
     outputFormat: m,
     typeKey: y,
-    typeValue: p,
-    fieldValue: g,
+    typeValue: g,
+    fieldValue: p,
     slopePropertyList: S,
-    interceptPropertyList: b,
+    interceptPropertyList: x,
     r2PropertyList: v
-  } = xs, x = `[{"${y}": "${p}", "${g}":"${u},${c}"}]`, B = await vs({
+  } = xs, b = `[{"${y}": "${g}", "${p}":"${u},${c}"}]`, B = await vs({
     queryObject: i,
     queryConfig: r,
     outputFormat: m,
     dataFormat: f,
-    outAnalytics: x,
+    outAnalytics: b,
     errorStrings: n,
     abortSignal: s
   });
   if (B !== void 0) {
     let N = Number.NaN, T = Number.NaN;
-    const { expr: w } = zt(B, S), { expr: L } = zt(B, b), { expr: A } = zt(B, v);
+    const { expr: w } = Wt(B, S), { expr: L } = Wt(B, x), { expr: A } = Wt(B, v);
     w !== void 0 && Number.isFinite(B[w]) && (N = B[w]), L !== void 0 && Number.isFinite(B[L]) && (T = B[L]), A !== void 0 && Number.isFinite(B[A]) && (l = B[A]);
     const { dataContextXMinField: I, dataContextXMaxField: P, dataContextYMinField: O, dataContextYMaxField: V } = C.scatterplotAggregationFields, $ = e.get(I) ?? Number.NaN, M = e.get(P) ?? Number.NaN, q = e.get(O) ?? Number.NaN, G = e.get(V) ?? Number.NaN, X = (M - $) / 100;
     let H = $ - X, ae = Number.NaN;
@@ -2758,12 +2761,12 @@ function Qs(t) {
   const { chartConfig: e, layer: i, selectionDataItems: a } = t;
   let r;
   if (a.length > 0) {
-    const { x: n, y: s } = ks(e), o = ai(i, n), u = ai(i, s);
+    const { x: n, y: s } = ks(e), o = Ot(i, n), u = Ot(i, s);
     if (o !== void 0 && u !== void 0 && o !== u) {
       let c = Number.MAX_SAFE_INTEGER, l = Number.MIN_SAFE_INTEGER, d = Number.MAX_SAFE_INTEGER, f = Number.MIN_SAFE_INTEGER;
       a.forEach((m) => {
-        const y = m[n], p = m[s];
-        typeof y == "number" && (y < c && (c = y), y > l && (l = y)), typeof p == "number" && (p < d && (d = p), p > f && (f = p));
+        const y = m[n], g = m[s];
+        typeof y == "number" && (y < c && (c = y), y > l && (l = y)), typeof g == "number" && (g < d && (d = g), g > f && (f = g));
       }), c !== Number.MAX_SAFE_INTEGER && l !== Number.MIN_SAFE_INTEGER && d !== Number.MAX_SAFE_INTEGER && f !== Number.MIN_SAFE_INTEGER && (r = {
         xBandId: o,
         yBandId: u,
@@ -2936,35 +2939,35 @@ async function zs(t) {
         valid: !0
       };
     else {
-      const m = i.groupByFieldsForStatistics?.[0] ?? "", y = f.some((S) => S.query?.fetchNullValues), p = /* @__PURE__ */ new Map();
+      const m = i.groupByFieldsForStatistics?.[0] ?? "", y = f.some((S) => S.query?.fetchNullValues), g = /* @__PURE__ */ new Map();
       for (const S of d) {
-        const { groupKey: b } = Ei(S.attributes[m], y);
-        b === C.nullValue && !y || (p.has(b) || p.set(b, []), p.get(b).push(S.attributes));
+        const { groupKey: x } = Ei(S.attributes[m], y);
+        x === C.nullValue && !y || (g.has(x) || g.set(x, []), g.get(x).push(S.attributes));
       }
-      const g = [];
-      p.forEach((S) => {
-        const b = {}, v = S[0][m], { display: x, original: B } = Ei(v, y);
-        b[m] = x, b[C.xAxisField] = x, b[C.originalCategoryValue] = B, f.forEach((N) => {
+      const p = [];
+      g.forEach((S) => {
+        const x = {}, v = S[0][m], { display: b, original: B } = Ei(v, y);
+        x[m] = b, x[C.xAxisField] = b, x[C.originalCategoryValue] = B, f.forEach((N) => {
           const T = N.query?.outStatistics?.[0];
           if (!T) {
             const { name: O } = N;
-            b[O] = S[0][O];
+            x[O] = S[0][O];
             return;
           }
           let w = S;
           const L = N.query?.where;
           L && (w = S.filter((O) => _s(O, L)));
           const A = T.statisticType, I = T.onStatisticField, P = T.outStatisticFieldName;
-          b[P] = js({
+          x[P] = js({
             features: w,
             aggregationType: A,
             onField: I
           });
-        }), g.push(b);
+        }), p.push(x);
       }), u = {
         valid: !0,
         data: {
-          dataItems: g
+          dataItems: p
         }
       };
     }
@@ -3027,7 +3030,7 @@ function Us(t) {
   }
   return r;
 }
-const ii = "PixelID", Ys = "Pixel ID", Zs = [
+const ai = "PixelID", Ys = "Pixel ID", Zs = [
   h.BarSeries,
   h.HistogramSeries,
   h.ScatterSeries
@@ -3076,8 +3079,8 @@ function Ra(t) {
     const a = i.attributeTable.fields, r = a.find((n) => n.type === "oid")?.name;
     r ? e = r : e = a.find((s) => s.name.toLowerCase() === "value")?.name;
   } else
-    e = ii;
-  return e ?? ii;
+    e = ai;
+  return e ?? ai;
 }
 function $a(t) {
   const { layer: e, chartType: i, rasterInfo: a, popupTemplateFieldInfosEnabled: r } = t;
@@ -3109,7 +3112,7 @@ function qi(t) {
       )?.label;
       return d && d !== l.name && (l.alias = d), l;
     }), n = [{
-      name: ii,
+      name: ai,
       alias: Ys,
       type: U.OID
     }, ...o];
@@ -3126,34 +3129,34 @@ async function hd(t, e) {
   const i = await dt(t);
   return $a({ layer: t, rasterInfo: i, popupTemplateFieldInfosEnabled: e });
 }
-const ka = Et(
+const ka = qt(
   async (t, e) => {
     const i = {}, a = t.layerDefinition;
     i.definitionExpression = a?.definitionExpression, i.id = t.id, t.url !== void 0 && (i.url = t.url), t.itemId !== void 0 && t.layerDefinition?.id !== void 0 && (i.portalItem = { id: t.itemId });
     const r = new Xr(i);
-    return await kt(r, e), r;
+    return await Qt(r, e), r;
   },
   (t) => JSON.stringify(t, Object.keys(t).sort())
   // stringify with sorted keys
-), Qa = Et(
+), Qa = qt(
   async (t, e) => {
     const i = {};
     i.id = t.id, t.url !== void 0 && (i.url = t.url), t.itemId !== void 0 && (i.portalItem = { id: t.itemId });
     const a = new Jr(i);
-    return await kt(a, e), a;
+    return await Qt(a, e), a;
   },
   (t) => JSON.stringify(t, Object.keys(t).sort())
   // stringify with sorted keys
-), Ks = Et(
+), Ks = qt(
   async (t, e) => {
     const i = {};
     i.id = t.id, t.url !== void 0 && (i.url = t.url), t.itemId !== void 0 && (i.portalItem = { id: t.itemId });
     const a = new Kr(i);
-    return await kt(a, e), a;
+    return await Qt(a, e), a;
   },
   (t) => JSON.stringify(t, Object.keys(t).sort())
   // stringify with sorted keys
-), ai = (t, e) => {
+), Ot = (t, e) => {
   let i = -1;
   if (!t.loaded)
     throw new Error("Raster layer must be loaded to get its band ID by name");
@@ -3202,7 +3205,7 @@ async function eo(t) {
   if (e !== void 0)
     try {
       const o = n && Ge.get(n)?.signal || void 0, u = z(e);
-      u.loaded || await kt(u, o);
+      u.loaded || await Qt(u, o);
       const l = {
         geometry: ft(i.geometry) ?? u.fullExtent,
         autoResample: !0,
@@ -3247,7 +3250,7 @@ function io(t) {
   let e, i, a;
   return t !== void 0 && (e = t.type, (e === se.UniqueValue || e === se.ClassBreaks) && (i = t.field ?? void 0, e === se.ClassBreaks && (a = t.normalizationField ?? void 0))), { rendererType: e, rendererField: i, rendererNormalizationField: a };
 }
-const gi = Et(
+const gi = qt(
   async (t, e) => {
     const i = t.featureCollection;
     let a, r;
@@ -3329,7 +3332,7 @@ function Ce(t, e) {
 function xd(t, e = []) {
   return e.find((i) => i.name === t);
 }
-function $t(t) {
+function kt(t) {
   let e, i = !1;
   if (ie(t))
     e = [Ra(t)];
@@ -3344,7 +3347,7 @@ function ve(t) {
   if (ie(t))
     e = Ra(t);
   else if (t) {
-    const a = $t(t);
+    const a = kt(t);
     i = a.isTraditionalTypeOID, a.idFields && (e = a.idFields[0]);
   }
   return { idField: e, isTraditionalTypeOID: i };
@@ -3452,18 +3455,18 @@ function Ha(t) {
     distance: f,
     units: m,
     objectIds: y,
-    spatialRelationship: p
+    spatialRelationship: g
   } = o ?? {}, {
-    where: g,
+    where: p,
     gdbVersion: S,
-    timeExtent: b,
+    timeExtent: x,
     geometry: v,
-    distance: x,
+    distance: b,
     units: B,
     objectIds: N,
     spatialRelationship: T
   } = a ?? {}, w = s[0], { query: L } = w, { where: A } = L ?? {}, I = k(s), P = { ...L };
-  return P.where = Y([u, g]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (P.where = Y([P.where, A])), i.orderOptions?.orderByFields !== void 0 && (P.orderByFields = i.orderOptions.orderByFields), P.gdbVersion = S ?? c, P.timeExtent = yo(n?.timeExtent, b ?? l), P.geometry = ie(e) ? to({
+  return P.where = Y([u, p]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (P.where = Y([P.where, A])), i.orderOptions?.orderByFields !== void 0 && (P.orderByFields = i.orderOptions.orderByFields), P.gdbVersion = S ?? c, P.timeExtent = yo(n?.timeExtent, x ?? l), P.geometry = ie(e) ? to({
     queryObject: e,
     defaultGeometry: v ?? d,
     ignoreViewExtent: r,
@@ -3472,7 +3475,7 @@ function Ha(t) {
     queryObject: e,
     defaultGeometry: v ?? d,
     ignoreViewExtent: r
-  }), P.distance = x ?? f, P.units = B ?? m, P.objectIds = N ?? y, P.spatialRelationship = T ?? p, L?.outStatistics?.[0]?.statisticType === D.Count && (P.returnDistinctValues = L?.returnDistinctValues ?? !1), P?.outStatistics?.forEach((O) => {
+  }), P.distance = b ?? f, P.units = B ?? m, P.objectIds = N ?? y, P.spatialRelationship = T ?? g, L?.outStatistics?.[0]?.statisticType === D.Count && (P.returnDistinctValues = L?.returnDistinctValues ?? !1), P?.outStatistics?.forEach((O) => {
     mi(O) && !("statisticParameters" in O) && (O.statisticParameters = {
       value: W.defaultStatParameterValue
     });
@@ -3529,7 +3532,7 @@ function Ad(t) {
 const wd = {
   getServerRestInfo: ja
 };
-async function kt(t, e) {
+async function Qt(t, e) {
   await t.load({ signal: e }), (la(t) || ua(t)) && await t.generateRasterInfo(t.rasterFunction, {
     signal: e
   });
@@ -3582,23 +3585,23 @@ function ft(t) {
 function Wa(t) {
   return t === void 0 ? ["*"] : Array.from(new Set(t));
 }
-function Qt(t) {
-  const { queryType: e, queryObject: i, queryConfig: a, view: r, configTimeZone: n, dateField: s, useViewTimeZone: o } = t, { where: u, outStatistics: c, geometry: l, distance: d, units: f, timeExtent: m, returnDistinctValues: y } = a ?? {}, p = z(i);
-  let S = ge(p)?.createQuery() ?? new Br(), b;
-  const v = $t(p).idFields;
-  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && v && (b = `${v} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (S = new vr(S.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
+function _t(t) {
+  const { queryType: e, queryObject: i, queryConfig: a, view: r, configTimeZone: n, dateField: s, useViewTimeZone: o } = t, { where: u, outStatistics: c, geometry: l, distance: d, units: f, timeExtent: m, returnDistinctValues: y } = a ?? {}, g = z(i);
+  let S = ge(g)?.createQuery() ?? new Br(), x;
+  const v = kt(g).idFields;
+  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && v && (x = `${v} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (S = new vr(S.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
     const T = Intl.DateTimeFormat().resolvedOptions().timeZone, w = o && r && "timeZone" in r ? r.timeZone : void 0;
     let L = n ?? w ?? T;
     L === "unknown" ? L = "Etc/UTC" : L === "system" && (L = T), S.outTimeZone = L;
   }
-  if (S.where = Y([S.where, u, b]), "returnDistinctValues" in S && (S.returnDistinctValues = y ?? !1), c !== void 0) {
-    const B = pn(p);
+  if (S.where = Y([S.where, u, x]), "returnDistinctValues" in S && (S.returnDistinctValues = y ?? !1), c !== void 0) {
+    const B = pn(g);
     S.outStatistics = c.filter(
       (N) => N.statisticType !== D.EnvelopeAggregate || B
     ).map((N) => Nr.fromJSON(N));
   }
-  const x = ft(l);
-  return x !== void 0 && (S.geometry = x, a?.spatialRelationship && (S.spatialRelationship = a.spatialRelationship), ya(p) && (d !== void 0 && (S.distance = d), f !== void 0 && (S.units = f))), m && (S.timeExtent = new Ki({
+  const b = ft(l);
+  return b !== void 0 && (S.geometry = b, a?.spatialRelationship && (S.spatialRelationship = a.spatialRelationship), ya(g) && (d !== void 0 && (S.distance = d), f !== void 0 && (S.units = f))), m && (S.timeExtent = new Ki({
     start: m?.[0],
     end: m?.[1]
   })), mo(S) && (S.cacheHint = !0), S;
@@ -3616,29 +3619,29 @@ function po(t) {
   return e;
 }
 function ho(t) {
-  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: p } = a, g = z(e), S = Qt({
+  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: g } = a, p = z(e), S = _t({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i,
     // we look first into the outTimeZone defined at the series level (deprecated), then the tz coming from the axis config
-    configTimeZone: p ?? s,
+    configTimeZone: g ?? s,
     view: o,
     dateField: r,
     useViewTimeZone: u ?? !1
-  }), b = Ea(r);
-  if (S.lowerBoundaryAlias = b.lowerBoundaryAlias, S.upperBoundaryAlias = b.upperBoundaryAlias, S.binParameters = {
+  }), x = Ea(r);
+  if (S.lowerBoundaryAlias = x.lowerBoundaryAlias, S.upperBoundaryAlias = x.upperBoundaryAlias, S.binParameters = {
     type: "date",
     field: r,
     interval: { unit: c, value: l },
     start: f,
     end: m,
     offset: y ? { unit: y.unit, value: y.size } : null
-  }, S.binParameters.type === "date" && (g?.capabilities?.queryAttributeBins?.supportsSnapToData && (S.binParameters.snapToData = po(d)), g?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (S.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
-    const x = ge(g)?.fields.find((B) => B.name === n)?.type;
-    (!x || x === "string" || x === "integer" || x === "small-integer" || x === "big-integer" || x === "double") && (S.binParameters.stackBy = {
+  }, S.binParameters.type === "date" && (p?.capabilities?.queryAttributeBins?.supportsSnapToData && (S.binParameters.snapToData = po(d)), p?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (S.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
+    const b = ge(p)?.fields.find((B) => B.name === n)?.type;
+    (!b || b === "string" || b === "integer" || b === "small-integer" || b === "big-integer" || b === "double") && (S.binParameters.stackBy = {
       type: "field",
       value: n,
-      valueType: x === "string" ? "string" : "integer"
+      valueType: b === "string" ? "string" : "integer"
     });
   }
   return S;
@@ -3737,7 +3740,7 @@ function Fo(t) {
     configTimeZone: c,
     view: l,
     syncViewTimeZone: d
-  } = t, f = Ce(e), m = f.find((N) => N.name === a)?.type, y = f.find((N) => N.name === r)?.type, p = Qt({
+  } = t, f = Ce(e), m = f.find((N) => N.name === a)?.type, y = f.find((N) => N.name === r)?.type, g = _t({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i,
@@ -3746,18 +3749,18 @@ function Fo(t) {
     dateField: a,
     useViewTimeZone: d ?? !1
   });
-  p.binParameters = {
+  g.binParameters = {
     type: "fixed-interval",
     interval: 1
-  }, p.lowerBoundaryAlias = W.heatChartLowerBoundaryAlias, p.upperBoundaryAlias = W.heatChartUpperBoundaryAlias, o !== void 0 && (p.binParameters.firstDayOfWeek = o);
-  const g = Ri({
+  }, g.lowerBoundaryAlias = W.heatChartLowerBoundaryAlias, g.upperBoundaryAlias = W.heatChartUpperBoundaryAlias, o !== void 0 && (g.binParameters.firstDayOfWeek = o);
+  const p = Ri({
     temporalBinning: n,
     xOrY: a,
     xOrYFieldType: m,
     addIntervalStatement: !1,
     includeLeapDay: u
-  }), { field: S, expression: b, start: v, end: x } = g;
-  S ? p.binParameters.field = S : b && (p.binParameters.expression = b, p.binParameters.expressionValueType = "integer", p.binParameters.type === "fixed-interval" && (v !== void 0 && (p.binParameters.start = v), x !== void 0 && (p.binParameters.end = x)));
+  }), { field: S, expression: x, start: v, end: b } = p;
+  S ? g.binParameters.field = S : x && (g.binParameters.expression = x, g.binParameters.expressionValueType = "integer", g.binParameters.type === "fixed-interval" && (v !== void 0 && (g.binParameters.start = v), b !== void 0 && (g.binParameters.end = b)));
   const B = Ri({
     temporalBinning: s,
     xOrY: r,
@@ -3765,15 +3768,15 @@ function Fo(t) {
     addIntervalStatement: !1,
     includeLeapDay: u
   });
-  return B.field ? p.binParameters.stackBy = { type: "field", value: B.field } : B.expression && (p.binParameters.stackBy = {
+  return B.field ? g.binParameters.stackBy = { type: "field", value: B.field } : B.expression && (g.binParameters.stackBy = {
     type: "expression",
     value: B.expression,
     valueType: "integer",
     alias: r
-  }), p;
+  }), g;
 }
 function bo(t) {
-  const { queryObject: e, queryConfig: i, xStep: a, xMin: r, xMax: n, x: s, y: o, yStep: u } = t, c = Qt({
+  const { queryObject: e, queryConfig: i, xStep: a, xMin: r, xMax: n, x: s, y: o, yStep: u } = t, c = _t({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i,
@@ -3794,7 +3797,7 @@ function bo(t) {
   }, c;
 }
 function hi(t) {
-  const { queryObject: e, queryConfig: i, maxRecordCountFactor: a } = t, { groupByFieldsForStatistics: r, orderByFields: n, gdbVersion: s, start: o, num: u, outFields: c } = i ?? {}, l = Qt({
+  const { queryObject: e, queryConfig: i, maxRecordCountFactor: a } = t, { groupByFieldsForStatistics: r, orderByFields: n, gdbVersion: s, start: o, num: u, outFields: c } = i ?? {}, l = _t({
     queryType: "Query",
     queryObject: e,
     queryConfig: i,
@@ -3854,7 +3857,7 @@ function Ua(t) {
   return e;
 }
 async function No(t) {
-  const { queryObject: e, fieldName: i, queryConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = z(e), { idField: u, isTraditionalTypeOID: c } = ve(o), l = c ? u : "*", d = `${D.Count}_${u}`, f = `${D.Count}_${i}`, m = `${D.Minimum}_${i}`, y = `${D.Maximum}_${i}`, p = {
+  const { queryObject: e, fieldName: i, queryConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = z(e), { idField: u, isTraditionalTypeOID: c } = ve(o), l = c ? u : "*", d = `${D.Count}_${u}`, f = `${D.Count}_${i}`, m = `${D.Minimum}_${i}`, y = `${D.Maximum}_${i}`, g = {
     ...a,
     outStatistics: [
       {
@@ -3878,14 +3881,14 @@ async function No(t) {
         outStatisticFieldName: y
       }
     ]
-  }, g = await xt({
+  }, p = await xt({
     queryObject: e,
-    queryConfig: p,
+    queryConfig: g,
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), S = g.get(d) ?? Number.NaN, b = g.get(f) ?? Number.NaN, v = g.get(m) ?? Number.NaN, x = g.get(y) ?? Number.NaN;
-  return { countExcludingNulls: b, countIncludingNulls: S, min: v, max: x };
+  }), S = p.get(d) ?? Number.NaN, x = p.get(f) ?? Number.NaN, v = p.get(m) ?? Number.NaN, b = p.get(y) ?? Number.NaN;
+  return { countExcludingNulls: x, countIncludingNulls: S, min: v, max: b };
 }
 async function To(t) {
   const { queryConfig: e, chartConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = i.series[0], { x: u, dataTransformationType: c } = o;
@@ -3897,11 +3900,11 @@ async function To(t) {
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), p = Co(c, m), g = f < 2 || m === y, S = { ...e };
+  }), g = Co(c, m), p = f < 2 || m === y, S = { ...e };
   return S.where = Y([S.where, `${u} is not null`]), {
     rawData: l,
-    dataCompatibleWithTransformation: p,
-    dataCountIncompatible: g,
+    dataCompatibleWithTransformation: g,
+    dataCountIncompatible: p,
     countExcludingNulls: f,
     countIncludingNulls: d
   };
@@ -3971,18 +3974,18 @@ async function Mo(t) {
     abortSignal: u
   } = t, c = e.series[0], { dataTransformationType: l } = c;
   let d = { valid: !0 };
-  const f = z(a), y = ft(i?.geometry)?.extent?.toJSON() !== void 0, p = s, g = wo({
+  const f = z(a), y = ft(i?.geometry)?.extent?.toJSON() !== void 0, g = s, p = wo({
     seriesConfig: c,
     layer: f,
-    view: p,
+    view: g,
     useFeaturesInView: y,
     queryConfig: i,
     abortSignal: u
   });
   let S;
-  if (p !== void 0 && (S = new wi({
-    geometry: p.extent
-  }), p.extent !== void 0 && ya(f))) {
+  if (g !== void 0 && (S = new wi({
+    geometry: g.extent
+  }), g.extent !== void 0 && ya(f))) {
     const { distance: A, units: I } = i;
     A !== void 0 && (S.distance = A), I !== void 0 && (S.units = I);
   }
@@ -3990,23 +3993,23 @@ async function Mo(t) {
     const A = { start: i.timeExtent[0], end: i.timeExtent[1] };
     S === void 0 ? S = new wi({ timeExtent: A }) : S.timeExtent = A;
   }
-  g.filter = S;
-  let b;
-  g.outStatisticTypes = { exclude: ["median"] };
+  p.filter = S;
+  let x;
+  p.outStatisticTypes = { exclude: ["median"] };
   try {
-    b = await Li(g);
+    x = await Li(p);
   } catch (A) {
     throw new re(le.QueryFeaturesError, o.errors.queryError, A);
   }
-  g.outStatisticTypes = { include: ["median"] };
+  p.outStatisticTypes = { include: ["median"] };
   try {
-    const A = await Li(g);
-    A?.median && (b.median = A.median);
+    const A = await Li(p);
+    A?.median && (x.median = A.median);
   } catch {
   }
-  b = Ao(b);
-  const { avg: v, count: x, stddev: B, min: N, max: T, sum: w, median: L } = b;
-  if (x === 0)
+  x = Ao(x);
+  const { avg: v, count: b, stddev: B, min: N, max: T, sum: w, median: L } = x;
+  if (b === 0)
     d = {
       ...Ga(l)
     };
@@ -4014,11 +4017,11 @@ async function Mo(t) {
     const A = Lo({
       seriesConfig: c,
       layer: f,
-      view: p,
+      view: g,
       useFeaturesInView: y,
       minValue: Bo(N),
       maxValue: T,
-      valueExpression: g.valueExpression,
+      valueExpression: p.valueExpression,
       queryConfig: i,
       abortSignal: u
     });
@@ -4055,7 +4058,7 @@ async function Ya(t) {
       dataCompatibleWithTransformation: f,
       dataCountIncompatible: m,
       countIncludingNulls: y,
-      countExcludingNulls: p
+      countExcludingNulls: g
     } = await To({
       queryObject: a,
       chartConfig: e,
@@ -4069,7 +4072,7 @@ async function Ya(t) {
       queryObject: a,
       queryConfig: i,
       countIncludingNulls: y,
-      countExcludingNulls: p,
+      countExcludingNulls: g,
       view: o,
       abortSignal: n,
       errorStrings: s
@@ -4181,7 +4184,7 @@ function Za(t) {
   const { lang: e, t9nLocale: i } = ze(t);
   return qo(e) ? e : i;
 }
-function Ot(t) {
+function It(t) {
   const { dataInfo: e, chartType: i, subError: a } = t;
   switch (e.valid = !1, i) {
     case h.BarSeries:
@@ -4222,75 +4225,75 @@ function $d(t) {
     errorStrings: l
   } = t;
   let d = l.errors.defaultInvalidChart, f;
-  const m = new Intl.NumberFormat(o), y = ut(i), { maxCategoryCount: p } = y;
-  let g = l.modalHeaders.invalidChart;
+  const m = new Intl.NumberFormat(o), y = ut(i), { maxCategoryCount: g } = y;
+  let p = l.modalHeaders.invalidChart;
   switch (e) {
     case j.BarElementExceedsLimit: {
-      g = l.modalHeaders.tooManyFeatures;
-      let b = Number.NaN, v = Number.NaN, x = "";
-      r !== void 0 && (r <= y.maxBarChartSeriesCount ? r === 1 ? (x = l.errors.uniqueSeriesBarCountCannotExceedLimit, b = y.maxBarUniqueSeriesCountTotal) : r === 2 ? (x = l.errors.twoSeriesBarCountCannotExceedLimit, b = y.maxBarTwoSeriesCountTotal, v = y.maxBarTwoSeriesCountPerSeries) : r > 2 && (x = l.errors.threePlusSeriesBarCountCannotExceedLimit, b = y.maxBarThreePlusSeriesCountTotal, v = y.maxBarThreePlusSeriesCountPerSeries) : (x = l.errors.barSeriesCountCannotExceedLimit, v = y.maxBarChartSeriesCount));
-      const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-      d = Be(x, {
+      p = l.modalHeaders.tooManyFeatures;
+      let x = Number.NaN, v = Number.NaN, b = "";
+      r !== void 0 && (r <= y.maxBarChartSeriesCount ? r === 1 ? (b = l.errors.uniqueSeriesBarCountCannotExceedLimit, x = y.maxBarUniqueSeriesCountTotal) : r === 2 ? (b = l.errors.twoSeriesBarCountCannotExceedLimit, x = y.maxBarTwoSeriesCountTotal, v = y.maxBarTwoSeriesCountPerSeries) : r > 2 && (b = l.errors.threePlusSeriesBarCountCannotExceedLimit, x = y.maxBarThreePlusSeriesCountTotal, v = y.maxBarThreePlusSeriesCountPerSeries) : (b = l.errors.barSeriesCountCannotExceedLimit, v = y.maxBarChartSeriesCount));
+      const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+      d = Be(b, {
         totalLimit: B,
         seriesLimit: N,
         elementCount: T
       }), f = {
         actualCount: a ?? Number.NaN,
-        totalLimit: b,
+        totalLimit: x,
         seriesLimit: v
       };
       break;
     }
     case j.LineChartExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        let b = Number.NaN, v = Number.NaN, x = "";
-        r !== void 0 && (r <= y.maxLineChartSeriesCount ? r === 1 ? (x = u ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, b = y.maxLineUniqueSeriesCountTotal) : r === 2 ? (x = u ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, b = y.maxLineTwoSeriesCountTotal, v = y.maxLineTwoSeriesCountPerSeries) : r > 2 && (x = u ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, b = y.maxLineThreePlusSeriesCountTotal, v = y.maxLineThreePlusSeriesCountPerSeries) : (x = l.errors.lineSeriesCountCannotExceedLimit, v = y.maxLineChartSeriesCount));
-        const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-        d = Be(x, {
+        p = l.modalHeaders.tooManyFeatures;
+        let x = Number.NaN, v = Number.NaN, b = "";
+        r !== void 0 && (r <= y.maxLineChartSeriesCount ? r === 1 ? (b = u ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, x = y.maxLineUniqueSeriesCountTotal) : r === 2 ? (b = u ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, x = y.maxLineTwoSeriesCountTotal, v = y.maxLineTwoSeriesCountPerSeries) : r > 2 && (b = u ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, x = y.maxLineThreePlusSeriesCountTotal, v = y.maxLineThreePlusSeriesCountPerSeries) : (b = l.errors.lineSeriesCountCannotExceedLimit, v = y.maxLineChartSeriesCount));
+        const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+        d = Be(b, {
           elementCount: T,
           seriesLimit: N,
           totalLimit: B
         }), f = {
           actualCount: a ?? Number.NaN,
-          totalLimit: b,
+          totalLimit: x,
           seriesLimit: v
         };
       }
       break;
     case j.BoxPlotExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        let b = Number.NaN, v = Number.NaN, x = "";
-        r !== void 0 && (r <= y.maxBoxPlotSeriesCount ? r === 1 ? (x = l.errors.uniqueSeriesBoxCountCannotExceedLimit, b = y.maxBoxUniqueSeriesCountTotal) : r === 2 ? (x = l.errors.twoSeriesBoxCountCannotExceedLimit, b = y.maxBoxTwoSeriesCountTotal, v = y.maxBoxTwoSeriesCountPerSeries) : r > 2 && (x = l.errors.threePlusBoxLineCountCannotExceedLimit, b = y.maxBoxThreePlusSeriesCountTotal, v = y.maxBoxThreePlusSeriesCountPerSeries) : (x = l.errors.boxSeriesCountCannotExceedLimit, v = y.maxBoxPlotSeriesCount));
-        const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-        d = Be(x, {
+        p = l.modalHeaders.tooManyFeatures;
+        let x = Number.NaN, v = Number.NaN, b = "";
+        r !== void 0 && (r <= y.maxBoxPlotSeriesCount ? r === 1 ? (b = l.errors.uniqueSeriesBoxCountCannotExceedLimit, x = y.maxBoxUniqueSeriesCountTotal) : r === 2 ? (b = l.errors.twoSeriesBoxCountCannotExceedLimit, x = y.maxBoxTwoSeriesCountTotal, v = y.maxBoxTwoSeriesCountPerSeries) : r > 2 && (b = l.errors.threePlusBoxLineCountCannotExceedLimit, x = y.maxBoxThreePlusSeriesCountTotal, v = y.maxBoxThreePlusSeriesCountPerSeries) : (b = l.errors.boxSeriesCountCannotExceedLimit, v = y.maxBoxPlotSeriesCount));
+        const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+        d = Be(b, {
           elementCount: T,
           seriesLimit: N,
           totalLimit: B
         }), f = {
           actualCount: a ?? Number.NaN,
-          totalLimit: b,
+          totalLimit: x,
           seriesLimit: v
         };
       }
       break;
     case j.BoxPlotOutliersExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        const b = l.errors.boxSeriesOutlierCannotExceedLimit, v = y.maxBoxPlotOutlierLimit, x = m.format(v);
-        d = Be(b, {
-          totalLimit: x
+        p = l.modalHeaders.tooManyFeatures;
+        const x = l.errors.boxSeriesOutlierCannotExceedLimit, v = y.maxBoxPlotOutlierLimit, b = m.format(v);
+        d = Be(x, {
+          totalLimit: b
         }), f = { actualCount: a ?? Number.NaN, totalLimit: v };
       }
       break;
     case j.HeatChartExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        const b = l.errors.heatChartCannotExceedLimit, v = y.maxHeatChartCellLimit, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(b, {
+        p = l.modalHeaders.tooManyFeatures;
+        const x = l.errors.heatChartCannotExceedLimit, v = y.maxHeatChartCellLimit, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(x, {
           featureCount: B,
-          totalLimit: x
+          totalLimit: b
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4299,11 +4302,11 @@ function $d(t) {
       break;
     case j.PieChartExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        const b = l.errors.pieChartSlicesCannotExceedLimit, v = y.maxPieChartSliceCountTotal, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(b, {
+        p = l.modalHeaders.tooManyFeatures;
+        const x = l.errors.pieChartSlicesCannotExceedLimit, v = y.maxPieChartSliceCountTotal, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(x, {
           sliceCount: B,
-          totalLimit: x
+          totalLimit: b
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4312,11 +4315,11 @@ function $d(t) {
       break;
     case j.GaugeExceedsLimit:
       {
-        g = l.modalHeaders.tooManyFeatures;
-        const b = l.errors.gaugeCannotExceedLimit, v = y.maxGaugeByFeaturesLimit, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(b, {
+        p = l.modalHeaders.tooManyFeatures;
+        const x = l.errors.gaugeCannotExceedLimit, v = y.maxGaugeByFeaturesLimit, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(x, {
           featureCount: B,
-          totalLimit: x
+          totalLimit: b
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4324,22 +4327,22 @@ function $d(t) {
       }
       break;
     case j.PieChartMixOfNegativePositiveSlices:
-      g = l.modalHeaders.cannotCombineNegativeAndPositiveSlices, d = l.errors.pieChartCannotHaveMixtureOfPositiveAndNegativeSlices;
+      p = l.modalHeaders.cannotCombineNegativeAndPositiveSlices, d = l.errors.pieChartCannotHaveMixtureOfPositiveAndNegativeSlices;
       break;
     case j.NegativeValueInSqrtCalculation:
-      g = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForSqrtTransformation;
+      p = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForSqrtTransformation;
       break;
     case j.NegativeValueInLogCalculation:
-      g = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForLogTransformation;
+      p = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForLogTransformation;
       break;
     case j.HistogramEmptyField:
-      s === !0 ? (g = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBSMessage) : Ee(n) ? (g = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBEMessage) : (g = l.modalHeaders.invalidChart, d = l.errors.histogramEmptyField);
+      s === !0 ? (p = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBSMessage) : Ee(n) ? (p = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBEMessage) : (p = l.modalHeaders.invalidChart, d = l.errors.histogramEmptyField);
       break;
     case j.EmptyDataSet:
-      g = l.modalHeaders.noDataAvailable, s === !0 ? d = l.errors.noDataFBSMessage : Ee(n) ? d = l.errors.noDataFBEMessage : d = l.errors.noDataMessage;
+      p = l.modalHeaders.noDataAvailable, s === !0 ? d = l.errors.noDataFBSMessage : Ee(n) ? d = l.errors.noDataFBEMessage : d = l.errors.noDataMessage;
       break;
     case j.NoValue:
-      c && a && (g = void 0, d = l.errors.noValue);
+      c && a && (p = void 0, d = l.errors.noValue);
       break;
     case j.NegativeValueInXAxisLogScale:
       d = l.errors.logarithmicXAxisNotPossible;
@@ -4349,16 +4352,16 @@ function $d(t) {
       break;
     case j.BadData:
   }
-  if (d === l.errors.defaultInvalidChart && (e === j.BarElementExceedsLimit || e === j.LineChartExceedsLimit || e === j.HeatChartExceedsLimit || e === j.PieChartExceedsLimit || e === j.GaugeExceedsLimit || e === j.BoxPlotExceedsLimit) && typeof a == "number" && typeof r == "number" && a / r > p) {
-    const b = a / r;
+  if (d === l.errors.defaultInvalidChart && (e === j.BarElementExceedsLimit || e === j.LineChartExceedsLimit || e === j.HeatChartExceedsLimit || e === j.PieChartExceedsLimit || e === j.GaugeExceedsLimit || e === j.BoxPlotExceedsLimit) && typeof a == "number" && typeof r == "number" && a / r > g) {
+    const x = a / r;
     d = Be(l.errors.categoryCountCannotExceedLimit, {
-      categoryCount: m.format(b),
-      maxCategoryCount: m.format(p)
+      categoryCount: m.format(x),
+      maxCategoryCount: m.format(g)
     });
   }
   return {
     keyword: e ?? j.BadData,
-    header: g,
+    header: p,
     message: d,
     params: f
   };
@@ -4390,10 +4393,10 @@ function Si(t) {
       y: a,
       chartSubType: i,
       splitByValue: r
-    }), p = e[y];
-    if (p != null) {
-      let g = Number(p);
-      if (Number.isFinite(g)) {
+    }), g = e[y];
+    if (g != null) {
+      let p = Number(g);
+      if (Number.isFinite(p)) {
         u = {
           ...u,
           key: m,
@@ -4401,7 +4404,7 @@ function Si(t) {
           standardizeValues: !0
         };
         let S = K(u);
-        if (o[S] = si({ mean: d, stdDev: f, value: g }), m === E.Min || m === E.Max) {
+        if (o[S] = si({ mean: d, stdDev: f, value: p }), m === E.Min || m === E.Max) {
           u = {
             ...u,
             key: m,
@@ -4412,11 +4415,11 @@ function Si(t) {
             standardizeValues: !1,
             splitByValue: r
           };
-          const b = K(u);
-          g = Number(e[b]), Number.isFinite(g) && (o[S] = si({
+          const x = K(u);
+          p = Number(e[x]), Number.isFinite(p) && (o[S] = si({
             mean: d,
             stdDev: f,
-            value: g
+            value: p
           }));
         }
       }
@@ -4547,32 +4550,32 @@ function ki(t) {
   const { yField: e, xField: i, xValue: a, splitByField: r, splitByValue: n, outlierMaxThreshold: s, outlierMinThreshold: o, target: u } = t;
   let c;
   if (i !== void 0 && a !== void 0) {
-    const m = typeof a != "string" ? a : `'${Zt(a)}'`;
+    const m = typeof a != "string" ? a : `'${Xt(a)}'`;
     c = `${i}=${m.toString()}`;
   }
   let l;
   if (r !== void 0 && n !== void 0) {
-    const m = typeof n != "string" ? n : `'${Zt(n)}'`;
+    const m = typeof n != "string" ? n : `'${Xt(n)}'`;
     l = `${r}=${m.toString()}`;
   }
   let d;
   return u === "outliers" && o !== s ? d = `(${e}<${o} OR ${e}>${s})` : u === "alternativeData" && (o === s ? d = `(${e}=${o})` : d = `(${e}>=${o} AND ${e}<=${s})`), [c, l, d].filter((m) => m !== void 0).join(" AND ");
 }
 function Xa(t) {
-  const { data: e, yField: i, x: a, chartSubType: r, splitByField: n } = t, s = r === F.BoxPlotMonoField || r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy ? void 0 : i, o = it(s), u = [], c = [], { maxOperandsPerWhereClause: l } = Rt();
+  const { data: e, yField: i, x: a, chartSubType: r, splitByField: n } = t, s = r === F.BoxPlotMonoField || r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy ? void 0 : i, o = it(s), u = [], c = [], { maxOperandsPerWhereClause: l } = $t();
   let d = [], f = [], m = 1;
-  return e.forEach((y, p) => {
-    const { outlierMinThreshold: g, outlierMaxThreshold: S } = Ho(y, o);
-    if (typeof g == "number" && typeof S == "number") {
-      const b = {
+  return e.forEach((y, g) => {
+    const { outlierMinThreshold: p, outlierMaxThreshold: S } = Ho(y, o);
+    if (typeof p == "number" && typeof S == "number") {
+      const x = {
         yField: i,
-        outlierMinThreshold: g,
+        outlierMinThreshold: p,
         outlierMaxThreshold: S
       };
-      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (b.xField = a, b.xValue = fi({
+      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (x.xField = a, x.xValue = fi({
         value: y[a],
         dataContext: y
-      })), (r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMultiFieldsAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && n !== void 0 && n in y && (b.splitByField = n, b.splitByValue = y[n]), d.push(ki({ ...b, target: "outliers" })), f.push(ki({ ...b, target: "alternativeData" })), (m % l === 0 || p === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
+      })), (r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMultiFieldsAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && n !== void 0 && n in y && (x.splitByField = n, x.splitByValue = y[n]), d.push(ki({ ...x, target: "outliers" })), f.push(ki({ ...x, target: "alternativeData" })), (m % l === 0 || g === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
     }
     m += 1;
   }), { outliersFilterBatches: u, dataWithoutOutliersFilterBatches: c };
@@ -4607,11 +4610,11 @@ function zo(t) {
   return { mean: u, stdDev: c };
 }
 async function Wo(t) {
-  const { seriesConfig: e, data: i, uniqueQuery: a, queryObject: r, meanAndStdDevPerField: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = k(e), l = e[0], { x: d } = l, f = te(l.query?.where), m = z(r), y = ve(m).idField, p = ue(e), g = [];
-  for (let v = 0; v < p.length; v += 1) {
-    const x = p[v], { outliersFilterBatches: B } = Xa({
+  const { seriesConfig: e, data: i, uniqueQuery: a, queryObject: r, meanAndStdDevPerField: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = k(e), l = e[0], { x: d } = l, f = te(l.query?.where), m = z(r), y = ve(m).idField, g = ue(e), p = [];
+  for (let v = 0; v < g.length; v += 1) {
+    const b = g[v], { outliersFilterBatches: B } = Xa({
       data: i,
-      yField: x,
+      yField: b,
       x: d,
       chartSubType: c,
       splitByField: f
@@ -4620,7 +4623,7 @@ async function Wo(t) {
       const T = B[N];
       if (T !== "") {
         const w = [];
-        d !== C.boxPlot.boxPlotCategory && w.push(d), w.push(x), f !== "" && w.push(f), w.push(y);
+        d !== C.boxPlot.boxPlotCategory && w.push(d), w.push(b), f !== "" && w.push(f), w.push(y);
         const L = {
           ...a,
           where: Y([a.where, T]),
@@ -4630,7 +4633,7 @@ async function Wo(t) {
           num: void 0,
           outFields: w
         };
-        g.push(
+        p.push(
           Fe({
             queryObject: r,
             queryConfig: L,
@@ -4644,10 +4647,10 @@ async function Wo(t) {
       }
     }
   }
-  const S = await Promise.all(g), b = /* @__PURE__ */ new Map();
+  const S = await Promise.all(p), x = /* @__PURE__ */ new Map();
   for (let v = 0; v < S.length; v += 1) {
-    const x = S[v], B = p[v];
-    x.forEach((N) => {
+    const b = S[v], B = g[v];
+    b.forEach((N) => {
       const T = { ...N.attributes };
       if (T[B] !== void 0) {
         d === C.boxPlot.boxPlotCategory && (T[C.boxPlot.boxPlotCategory] = B);
@@ -4673,7 +4676,7 @@ async function Wo(t) {
         }
         const L = K(w), A = T[B];
         T[L] = A;
-        const I = `${T[d]}-${T[f]}-${A}`, P = b.get(I);
+        const I = `${T[d]}-${T[f]}-${A}`, P = x.get(I);
         if (T[W.uniqueIdsName] = [
           ...P?.[W.uniqueIdsName] ?? [],
           T[y]
@@ -4696,11 +4699,11 @@ async function Wo(t) {
             stdDev: $
           }));
         }
-        delete T[B], T[C.boxPlot.boxPlotOutlierId] = !0, b.set(I, T);
+        delete T[B], T[C.boxPlot.boxPlotOutlierId] = !0, x.set(I, T);
       }
     });
   }
-  return Array.from(b.values());
+  return Array.from(x.values());
 }
 async function Go(t) {
   const {
@@ -4715,12 +4718,12 @@ async function Go(t) {
     abortSignal: c
   } = t;
   let l = [];
-  const { series: d, showMean: f } = n, m = Bi({ showMean: f, seriesConfig: d }), y = k(d), p = Re(n), { x: g } = p, S = te(p.query?.where), b = [];
-  for (let x = 0; x < m.length; x += 1) {
-    const B = m[x], { dataWithoutOutliersFilterBatches: N } = Xa({
+  const { series: d, showMean: f } = n, m = Bi({ showMean: f, seriesConfig: d }), y = k(d), g = Re(n), { x: p } = g, S = te(g.query?.where), x = [];
+  for (let b = 0; b < m.length; b += 1) {
+    const B = m[b], { dataWithoutOutliersFilterBatches: N } = Xa({
       data: e,
       yField: B,
-      x: g,
+      x: p,
       chartSubType: y,
       splitByField: S
     });
@@ -4734,8 +4737,8 @@ async function Go(t) {
       ).map((A) => ({
         ...A,
         outStatisticFieldName: `${A.outStatisticFieldName}${C.boxPlot.boxPlotOutliersSuffix}`
-      }))), b.push(
-        _t({
+      }))), x.push(
+        jt({
           queryObject: i,
           uniqueQuery: L,
           chartConfig: n,
@@ -4750,12 +4753,12 @@ async function Go(t) {
       );
     }
   }
-  const v = await Promise.all(b);
-  for (let x = 0; x < v.length; x += 1)
-    l.push(...v[x]);
+  const v = await Promise.all(x);
+  for (let b = 0; b < v.length; b += 1)
+    l.push(...v[b]);
   return y !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && y !== F.BoxPlotMonoField && (l = bt({
     data: l,
-    x: S !== void 0 && S !== "" ? S : g
+    x: S !== void 0 && S !== "" ? S : p
   })), l;
 }
 async function Uo(t) {
@@ -4768,18 +4771,18 @@ async function Uo(t) {
     };
     delete f.outStatistics, delete f.groupByFieldsForStatistics, delete f.orderByFields;
     const m = [];
-    for (let p = 0; p < d.length; p += 1) {
-      const g = d[p];
+    for (let g = 0; g < d.length; g += 1) {
+      const p = d[g];
       m.push(
         {
           statisticType: D.Average,
-          onStatisticField: g,
-          outStatisticFieldName: `${D.Average}_${g}`
+          onStatisticField: p,
+          outStatisticFieldName: `${D.Average}_${p}`
         },
         {
           statisticType: D.StandardDeviation,
-          onStatisticField: g,
-          outStatisticFieldName: `${D.StandardDeviation}_${g}`
+          onStatisticField: p,
+          outStatisticFieldName: `${D.StandardDeviation}_${p}`
         }
       );
     }
@@ -4892,7 +4895,7 @@ async function Zo(t) {
         abortKey: c,
         abortSignal: l
       });
-      const p = await Go({
+      const g = await Go({
         queryObject: i,
         uniqueQuery: a,
         elementCount: s,
@@ -4905,7 +4908,7 @@ async function Zo(t) {
       });
       d = Yo({
         data: d,
-        additionalData: p,
+        additionalData: g,
         chartConfig: n
       });
     }
@@ -4990,7 +4993,7 @@ function Ko(t) {
     chartData: i.dataItems
   });
 }
-function It(t) {
+function Et(t) {
   const { arrayToSort: e, chartConfig: i, fieldList: a, isTimeBinningSeries: r } = t;
   if (r !== !0 && e[0] !== void 0) {
     const { series: n } = i, s = k(n), o = _(n), u = xe(i), c = Mt(i);
@@ -5003,8 +5006,8 @@ function It(t) {
     else if (c?.[0] !== void 0 && e !== void 0 && e.length > 1) {
       const { orderBy: l } = c[0];
       let { sortingField: d } = c[0];
-      const f = i.orderOptions?.data?.orderType === De.Category, m = c[0].preferLabel !== !1, y = s === F.BarAndLineFromFields || s === F.PieFromFields || s === F.BoxPlotMultiFields || s === F.BoxPlotMultiFieldsAndSplitBy, p = y || o === h.PieSeries, g = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
-      if (f && p && (!m || (o === h.LineSeries || o === h.RadarSeries) && u === h.NumberAxisFormat) && (d = C.originalCategoryValue), Array.isArray(l))
+      const f = i.orderOptions?.data?.orderType === De.Category, m = c[0].preferLabel !== !1, y = s === F.BarAndLineFromFields || s === F.PieFromFields || s === F.BoxPlotMultiFields || s === F.BoxPlotMultiFieldsAndSplitBy, g = y || o === h.PieSeries, p = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
+      if (f && g && (!m || (o === h.LineSeries || o === h.RadarSeries) && u === h.NumberAxisFormat) && (d = C.originalCategoryValue), Array.isArray(l))
         En({
           arrayToSort: e,
           orderBy: l,
@@ -5020,10 +5023,10 @@ function It(t) {
           orderBy: l,
           sortingField: d,
           forceAscendingOrder: S,
-          isNonAggregated: g,
+          isNonAggregated: p,
           sortByCategory: f,
           preferLabel: m,
-          isPieOrByFieldsChart: p
+          isPieOrByFieldsChart: g
         });
       }
     }
@@ -5031,7 +5034,7 @@ function It(t) {
 }
 function kd(t) {
   const { alteredConfig: e, dataInfo: i, fieldList: a, options: r, queryObject: n } = t, s = Ci(i.data);
-  if (s && It({
+  if (s && Et({
     arrayToSort: s,
     chartConfig: e,
     fieldList: a,
@@ -5043,7 +5046,7 @@ function kd(t) {
     })
   }), de(e)) {
     const o = i?.data && "meanLines" in i.data ? i.data.meanLines : void 0;
-    o && It({
+    o && Et({
       arrayToSort: o,
       chartConfig: e
     });
@@ -5063,13 +5066,13 @@ async function Qd(t) {
     const { series: o, chartRenderer: u } = a, c = el(u), l = c ? tt.ChartRenderer : tt.LayerRenderer, d = i ? z(i) : void 0, f = c ?? d?.renderer;
     let m;
     d && l === tt.LayerRenderer ? s = await _a(d) : l === tt.ChartRenderer && (s = Jn(f));
-    const y = jn(c, d?.renderer), p = Un({
+    const y = jn(c, d?.renderer), g = Un({
       chartRenderer: u,
       queryObject: i
-    }), g = _(o), S = k(o), b = Re(a), v = te(b.query?.where);
+    }), p = _(o), S = k(o), x = Re(a), v = te(x.query?.where);
     m = /* @__PURE__ */ new Map();
-    for (let x = 0; x < (g === h.HistogramSeries && e.length > 0 ? 1 : e.length); x += 1) {
-      const B = e[x], N = await Yn({
+    for (let b = 0; b < (p === h.HistogramSeries && e.length > 0 ? 1 : e.length); b += 1) {
+      const B = e[b], N = await Yn({
         seriesConfig: a.series,
         dataItem: B,
         renderer: f,
@@ -5077,7 +5080,7 @@ async function Qd(t) {
         rendererOrigin: l,
         chartSubType: S,
         splitByField: v,
-        graphicTemplate: p,
+        graphicTemplate: g,
         mapAttributesToSymbol: m,
         rendererFieldNames: s
       });
@@ -5127,11 +5130,11 @@ async function il(t) {
     chartLimits: r
   })), r && (Number.isFinite(l) || Number.isFinite(m)))) {
     const y = Math.min(l ?? Number.NaN, m ?? Number.NaN);
-    let p = r;
-    Number.isFinite(y) && (p = {
+    let g = r;
+    Number.isFinite(y) && (g = {
       ...r,
       maxGaugeByFeaturesLimit: y
-    }), Da({ chartConfig: i, chartLimits: p, uniqueQuery: a });
+    }), Da({ chartConfig: i, chartLimits: g, uniqueQuery: a });
   }
   if (Number.isNaN(f) || f) {
     const y = await tl({
@@ -5144,7 +5147,7 @@ async function il(t) {
     });
     u.data = { dataItems: y }, u.count = y.length;
   } else
-    u.count = m, Ot({
+    u.count = m, It({
       dataInfo: u,
       chartType: h.GaugeSeries
     });
@@ -5207,16 +5210,16 @@ function al(t) {
       W.uniqueIdsName,
       Q.valueField,
       ...Vr
-    ], d = (p, g) => {
-      const S = g[C.originalCategoryValue];
-      S !== void 0 && r && (g[r] = S);
-      const b = g[C.originalYCategoryValue];
-      b !== void 0 && n && (g[n] = b), r && g[Q.xField] !== void 0 && (g[r] = g[C.originalCategoryValue] !== void 0 ? g[C.originalCategoryValue] : g[Q.xField], delete g[Q.xField]), n && g[Q.yField] !== void 0 && (g[n] = g[C.originalYCategoryValue] !== void 0 ? g[C.originalYCategoryValue] : g[Q.yField], delete g[Q.yField]), s && g[Q.valueField] !== void 0 && (g[s] = g[Q.valueField], delete g[Q.valueField]);
+    ], d = (g, p) => {
+      const S = p[C.originalCategoryValue];
+      S !== void 0 && r && (p[r] = S);
+      const x = p[C.originalYCategoryValue];
+      x !== void 0 && n && (p[n] = x), r && p[Q.xField] !== void 0 && (p[r] = p[C.originalCategoryValue] !== void 0 ? p[C.originalCategoryValue] : p[Q.xField], delete p[Q.xField]), n && p[Q.yField] !== void 0 && (p[n] = p[C.originalYCategoryValue] !== void 0 ? p[C.originalYCategoryValue] : p[Q.yField], delete p[Q.yField]), s && p[Q.valueField] !== void 0 && (p[s] = p[Q.valueField], delete p[Q.valueField]);
       const v = {};
-      return Object.keys(g).forEach((x) => {
-        !l.includes(x) && !x.includes(C.rendererSymbolField) && (v[x] = g[x]);
-      }), p.push(v), p;
-    }, f = (p, g) => JSON.stringify(p).localeCompare(JSON.stringify(g));
+      return Object.keys(p).forEach((b) => {
+        !l.includes(b) && !b.includes(C.rendererSymbolField) && (v[b] = p[b]);
+      }), g.push(v), g;
+    }, f = (g, p) => JSON.stringify(g).localeCompare(JSON.stringify(p));
     let m = o?.reduce(d, [])?.sort(f), y = u?.reduce(d, [])?.sort(f);
     m && y && r && m.length !== y.length && (m = bt({ data: m, x: r }), y = bt({ data: y, x: r })), c = m?.length !== y?.length || !at(m, y);
   }
@@ -5238,7 +5241,7 @@ function rl(t) {
       const u = te(n[0].query?.where);
       r = bt({ data: r, x: n[0].x, splitByField: u });
     }
-    It({
+    Et({
       arrayToSort: r,
       chartConfig: e
     });
@@ -5333,8 +5336,8 @@ function ir(t) {
       y: d
     }), y = e === C.boxPlot.boxPlotCategory ? r[e] : i;
     if (!oe(y)) {
-      const p = r[f], g = r[m];
-      Number.isFinite(p) && Number.isFinite(g) && (c = `${y?.toString()}>=${p?.toString()} AND ${y?.toString()}<=${g?.toString()}`);
+      const g = r[f], p = r[m];
+      Number.isFinite(g) && Number.isFinite(p) && (c = `${y?.toString()}>=${g?.toString()} AND ${y?.toString()}<=${p?.toString()}`);
     }
   }
   return Y([o, u, c]);
@@ -5394,8 +5397,8 @@ function ll(t) {
   let c = "";
   if (u.type === h.HeatSeries) {
     let l, d;
-    const f = a[Q.xField], m = a[C.originalCategoryValue], y = a[Q.yField], p = a[C.originalYCategoryValue], g = r.axes?.[0]?.valueFormat?.type, S = r.axes?.[1]?.valueFormat?.type;
-    g === h.CategoryAxisFormat ? l = Le({
+    const f = a[Q.xField], m = a[C.originalCategoryValue], y = a[Q.yField], g = a[C.originalYCategoryValue], p = r.axes?.[0]?.valueFormat?.type, S = r.axes?.[1]?.valueFormat?.type;
+    p === h.CategoryAxisFormat ? l = Le({
       where: qe(u.x, m ?? f),
       normalize: !1,
       escape: !0
@@ -5408,7 +5411,7 @@ function ll(t) {
       dataTimeZone: s,
       runsOnClientQueryEngine: o
     }), S === h.CategoryAxisFormat ? d = Le({
-      where: qe(u.y, p ?? y),
+      where: qe(u.y, g ?? y),
       normalize: !1,
       escape: !0
     }) : d = zi({
@@ -5480,16 +5483,16 @@ async function cl(t) {
     errorStrings: f,
     abortKey: m,
     abortSignal: y
-  } = t, p = k(a.series);
-  let g = { valid: !0, data: { dataItems: [] } };
+  } = t, g = k(a.series);
+  let p = { valid: !0, data: { dataItems: [] } };
   if (r !== void 0 && r.length > 0) {
-    const S = Re(a), { x: b } = S, v = "y" in S ? S.y : "", B = Ce(e).find((I) => I.name === b)?.type, N = [], T = r.reduce(
+    const S = Re(a), { x } = S, v = "y" in S ? S.y : "", B = Ce(e).find((I) => I.name === x)?.type, N = [], T = r.reduce(
       (I, P) => {
         const O = [];
         if (W.uniqueIdsName in P)
           N.push(P[W.uniqueIdsName]);
         else {
-          switch (p) {
+          switch (g) {
             case F.BoxPlotMonoFieldAndSplitBy:
             case F.BoxPlotMultiFieldsAndSplitBy:
             case F.BoxPlotMonoFieldAndCategoryAndSplitBy: {
@@ -5505,14 +5508,14 @@ async function cl(t) {
           }
           const V = [v].flat();
           let $ = V.length === 1 ? V[0] : "";
-          if (p === F.BoxPlotMultiFieldsAndCategory) {
+          if (g === F.BoxPlotMultiFieldsAndCategory) {
             const M = `_${E.FirstQuartile}`, q = Object.keys(P).find((G) => G.includes(M));
             q !== void 0 && ($ = q.replace(M, ""));
           }
           O.length === 0 && O.push(""), O.forEach((M) => {
             const q = ir({
               chartConfig: a,
-              xAxisField: b,
+              xAxisField: x,
               yAxisField: $,
               splitBy: M,
               dataContext: P,
@@ -5530,7 +5533,7 @@ async function cl(t) {
       T.push(`${I} IN (${N.join(",")})`);
     }
     const L = T.join(" OR "), A = { ...i };
-    A.where = Y([A.where, L]), g = await Fi({
+    A.where = Y([A.where, L]), p = await Fi({
       queryObject: e,
       chartConfig: a,
       queryConfig: A,
@@ -5546,7 +5549,7 @@ async function cl(t) {
       abortSignal: y
     });
   }
-  return g;
+  return p;
 }
 async function dl(t) {
   const {
@@ -5564,30 +5567,30 @@ async function dl(t) {
     replaceNoValueCategoryWithZero: f,
     view: m,
     errorStrings: y,
-    abortKey: p,
-    abortSignal: g
+    abortKey: g,
+    abortSignal: p
   } = t;
   yt(e);
-  const { series: S } = a, b = _(S), v = xe(a);
-  let x = { valid: !0 }, B = s?.selectionItems ?? [];
+  const { series: S } = a, x = _(S), v = xe(a);
+  let b = { valid: !0 }, B = s?.selectionItems ?? [];
   n || (B = rl({ chartConfig: a, currentSelectionDataItems: r, selectionData: s }));
   let N = !1;
-  switch (b) {
+  switch (x) {
     case h.HeatSeries:
-      x.data = { dataItems: B };
+      b.data = { dataItems: B };
       break;
     case h.PieSeries:
       if (k(a.series) === F.PieFromFields) {
         const { x: T, y: w } = a.series[0], L = He(B);
         L.forEach((A) => {
           T in A && (A[ce] = A[T], delete A[T]), w in A && (A[Ne] = A[w], delete A[w]);
-        }), x.data = { dataItems: L };
+        }), b.data = { dataItems: L };
       } else
-        x.data = { dataItems: B };
-      x.count = B.length, N = !0;
+        b.data = { dataItems: B };
+      b.count = B.length, N = !0;
       break;
     case h.BoxPlotSeries:
-      de(a) && (x = await cl({
+      de(a) && (b = await cl({
         queryObject: e,
         queryConfig: i,
         chartConfig: a,
@@ -5600,8 +5603,8 @@ async function dl(t) {
         replaceNoValueCategoryWithZero: f,
         view: m,
         errorStrings: y,
-        abortKey: p,
-        abortSignal: g
+        abortKey: g,
+        abortSignal: p
       }));
       break;
     case h.BarSeries:
@@ -5614,7 +5617,7 @@ async function dl(t) {
         seriesConfig: S[0],
         queryObject: e
       }))
-        x.data = { dataItems: B }, x.count = B.length * S.length, N = !0;
+        b.data = { dataItems: B }, b.count = B.length * S.length, N = !0;
       else {
         const T = { ...i };
         if (r !== void 0 && r.length > 0) {
@@ -5627,7 +5630,7 @@ async function dl(t) {
           ), A = Y(L, "OR");
           T.where = Y([T.where, A]);
         }
-        x = await xi({
+        b = await xi({
           queryObject: e,
           queryConfig: T,
           chartConfig: a,
@@ -5637,33 +5640,33 @@ async function dl(t) {
           chartLimits: c,
           popupTemplateFieldInfosEnabled: l,
           view: m,
-          abortSignal: g
+          abortSignal: p
         });
       }
       break;
     case h.HistogramSeries: {
       if (B.length === 0)
-        x.data = {
+        b.data = {
           mean: Number.NaN,
           median: Number.NaN,
           stddev: Number.NaN,
           max: Number.NaN,
           min: Number.NaN,
           bins: []
-        }, x.count = 0;
+        }, b.count = 0;
       else {
         const { x: T } = S[0], w = B.map((I, P) => {
           const { minValue: O, maxValue: V } = I, $ = P === B.length - 1 ? "<=" : "<";
           return `${T} >= ${O} AND ${T} ${$} ${V}`;
         }), L = Y(w, "OR"), A = { ...i };
-        A.where = Y([A.where, L]), x = await Ya({
+        A.where = Y([A.where, L]), b = await Ya({
           queryObject: e,
           chartConfig: a,
           queryConfig: A,
           view: m,
           errorStrings: y,
-          abortKey: p,
-          abortSignal: g
+          abortKey: g,
+          abortSignal: p
         });
       }
       break;
@@ -5671,21 +5674,21 @@ async function dl(t) {
     case h.ScatterSeries: {
       if (B.length === 0) {
         const { r2: T, trendLinePoints: w } = C.scatterplotSeries;
-        x.data = { dataItems: [], r2: T, trendLinePoints: w, count: 0 }, x.count = 0;
+        b.data = { dataItems: [], r2: T, trendLinePoints: w, count: 0 }, b.count = 0;
       } else {
         const { r2: T, trendLinePoints: w } = qa({
           data: B,
           chartConfig: a
         });
-        x.data = { dataItems: B, r2: T, trendLinePoints: w }, x.count = B.length;
+        b.data = { dataItems: B, r2: T, trendLinePoints: w }, b.count = B.length;
       }
       break;
     }
   }
-  return N && x.data !== void 0 && It({
-    arrayToSort: "dataItems" in x.data ? x.data.dataItems : x.data,
+  return N && b.data !== void 0 && Et({
+    arrayToSort: "dataItems" in b.data ? b.data.dataItems : b.data,
     chartConfig: a
-  }), x;
+  }), b;
 }
 async function Fi(t) {
   const {
@@ -5704,10 +5707,10 @@ async function Fi(t) {
     view: m
   } = t;
   let y = { valid: !0 };
-  const p = st(i), g = await oi({
+  const g = st(i), p = await oi({
     queryObject: e,
     queryConfig: a,
-    fetchFullBoxPlotData: !p,
+    fetchFullBoxPlotData: !g,
     chartConfig: i,
     errorStrings: r,
     abortKey: n,
@@ -5720,12 +5723,12 @@ async function Fi(t) {
     replaceNoValueCategoryWithZero: f,
     view: m
   });
-  if (!p)
-    y = g;
+  if (!g)
+    y = p;
   else {
     const S = { dataItems: [] };
-    S.meanLines = g.data.dataItems;
-    const b = Oo(i), v = (await oi({
+    S.meanLines = p.data.dataItems;
+    const x = Oo(i), v = (await oi({
       queryObject: e,
       queryConfig: a,
       fetchFullBoxPlotData: !0,
@@ -5737,7 +5740,7 @@ async function Fi(t) {
       replaceNoValueCategoryWithZero: f,
       view: m,
       errorStrings: r,
-      chartConfig: b,
+      chartConfig: x,
       abortKey: n,
       abortSignal: s
     })).data;
@@ -5761,12 +5764,12 @@ async function fl(t) {
     view: f,
     syncViewTimeZone: m,
     errorStrings: y,
-    abortKey: p,
-    abortSignal: g,
+    abortKey: g,
+    abortSignal: p,
     fieldList: S,
-    currentSelectionDataItems: b,
+    currentSelectionDataItems: x,
     dataForFilterBySelectionChanged: v,
-    filterByViewExtent: x,
+    filterByViewExtent: b,
     preFetchedQueryResponse: B
   } = t, { series: N } = i, T = _(N);
   let w = { valid: !0 };
@@ -5775,7 +5778,7 @@ async function fl(t) {
       queryObject: e,
       queryConfig: a,
       chartConfig: i,
-      currentSelectionDataItems: b,
+      currentSelectionDataItems: x,
       dataForFilterBySelectionChanged: v,
       selectionData: n,
       setTimeBinningInfoWhenNotProvided: s,
@@ -5786,8 +5789,8 @@ async function fl(t) {
       replaceNoValueCategoryWithZero: d,
       view: f,
       errorStrings: y,
-      abortKey: p,
-      abortSignal: g
+      abortKey: g,
+      abortSignal: p
     });
   else
     switch (T) {
@@ -5802,8 +5805,8 @@ async function fl(t) {
           popupTemplateFieldInfosEnabled: c,
           view: f,
           syncViewTimeZone: m,
-          abortKey: p,
-          abortSignal: g
+          abortKey: g,
+          abortSignal: p
         });
         break;
       case h.BoxPlotSeries:
@@ -5820,8 +5823,8 @@ async function fl(t) {
           replaceNoValueCategoryWithZero: d,
           view: f,
           errorStrings: y,
-          abortKey: p,
-          abortSignal: g
+          abortKey: g,
+          abortSignal: p
         }));
         break;
       case h.BarSeries:
@@ -5834,7 +5837,7 @@ async function fl(t) {
           // @REV: temporary
           queryConfig: a,
           chartConfig: i,
-          filterByViewExtent: x,
+          filterByViewExtent: b,
           errorStrings: y,
           setTimeBinningInfoWhenNotProvided: s,
           returnFeaturesExtent: o,
@@ -5843,8 +5846,8 @@ async function fl(t) {
           hideZeroCountCategories: l,
           replaceNoValueCategoryWithZero: d,
           view: f,
-          abortKey: p,
-          abortSignal: g,
+          abortKey: g,
+          abortSignal: p,
           fieldList: S,
           preFetchedQueryResponse: B
         };
@@ -5860,7 +5863,7 @@ async function fl(t) {
         w.data = await dr({
           queryObject: e,
           queryConfig: a,
-          filterByViewExtent: x,
+          filterByViewExtent: b,
           setTimeBinningInfoWhenNotProvided: s,
           returnFeaturesExtent: o,
           chartLimits: u,
@@ -5870,8 +5873,8 @@ async function fl(t) {
           view: f,
           chartConfig: i,
           errorStrings: y,
-          abortKey: p,
-          abortSignal: g
+          abortKey: g,
+          abortSignal: p
         });
         break;
       case h.HistogramSeries:
@@ -5879,9 +5882,10 @@ async function fl(t) {
           queryObject: e,
           queryConfig: a,
           chartConfig: i,
+          filterByViewExtent: b,
           view: f,
-          abortKey: p,
-          abortSignal: g,
+          abortKey: g,
+          abortSignal: p,
           errorStrings: y
         });
         break;
@@ -5892,8 +5896,8 @@ async function fl(t) {
           queryConfig: a,
           chartLimits: u,
           errorStrings: y,
-          abortKey: p,
-          abortSignal: g
+          abortKey: g,
+          abortSignal: p
         });
         break;
     }
@@ -5915,12 +5919,12 @@ async function Hd(t) {
     setTimeBinningInfoWhenNotProvided: f,
     returnFeaturesExtent: m,
     chartLimits: y,
-    popupTemplateFieldInfosEnabled: p,
-    hideZeroCountCategories: g,
+    popupTemplateFieldInfosEnabled: g,
+    hideZeroCountCategories: p,
     replaceNoValueCategoryWithZero: S,
-    view: b,
+    view: x,
     syncViewTimeZone: v,
-    errorStrings: x,
+    errorStrings: b,
     fieldList: B,
     preFetchedQueryResponse: N
   } = t;
@@ -5930,7 +5934,7 @@ async function Hd(t) {
     chartConfig: i,
     runtimeDataFilters: u,
     ignoreViewExtent: c,
-    view: b
+    view: x
   });
   return Ls(a), T = await fl({
     chartConfig: i,
@@ -5944,14 +5948,14 @@ async function Hd(t) {
     setTimeBinningInfoWhenNotProvided: f,
     returnFeaturesExtent: m,
     chartLimits: y,
-    popupTemplateFieldInfosEnabled: p,
-    hideZeroCountCategories: g,
+    popupTemplateFieldInfosEnabled: g,
+    hideZeroCountCategories: p,
     replaceNoValueCategoryWithZero: S,
-    view: b,
+    view: x,
     syncViewTimeZone: v,
     abortKey: a,
     abortSignal: r,
-    errorStrings: x,
+    errorStrings: b,
     fieldList: B,
     preFetchedQueryResponse: N
   }), T.queryConfig = w, T;
@@ -5983,20 +5987,20 @@ async function yl(t) {
   let d = e;
   const f = k(l), m = xe(i);
   if (s !== lt.RenderUpToTheLimit && n !== void 0 && n > e.length && f !== F.BarAndLineFromFields && f !== F.BarAndLineNoAggregation && f !== F.PieNoAggregation && m === h.CategoryAxisFormat) {
-    const { x: y } = l[0], p = {
+    const { x: y } = l[0], g = {
       ...a,
       returnDistinctValues: !0,
       outFields: [y]
     };
-    delete p.outStatistics, delete p.orderByFields, delete p.groupByFieldsForStatistics;
+    delete g.outStatistics, delete g.orderByFields, delete g.groupByFieldsForStatistics;
     const S = (await Fe({
       queryObject: r,
-      queryConfig: p,
+      queryConfig: g,
       featureCount: n,
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    })).map((b) => b.attributes[y]).filter((b) => b != null);
+    })).map((x) => x.attributes[y]).filter((x) => x != null);
     S.length > e.length && (d = ml(S, e, y));
   }
   return d;
@@ -6182,45 +6186,45 @@ function xl(t) {
   const { unit: o } = a, u = a.size ?? 1, c = i[0], { x: l } = c;
   let d, f;
   if (be(c) && (f = c.temporalBinning?.nullPolicy, d = c.temporalBinning?.timeAggregationType), u > 1 || o === R.Week || o === R.Month || o === R.Year) {
-    const { query: m } = i[0], y = ue(i), { statisticType: p } = m?.outStatistics?.[0] ?? Xi;
-    let g = !1, S = d === ee.End ? e.length - 1 : 0;
-    const b = {
+    const { query: m } = i[0], y = ue(i), { statisticType: g } = m?.outStatistics?.[0] ?? Xi;
+    let p = !1, S = d === ee.End ? e.length - 1 : 0;
+    const x = {
       binFirstOrLastIndex: S,
       data: e,
       x: l,
       timeIntervalInfo: a
     };
-    for (; !g; ) {
+    for (; !p; ) {
       let v = {};
-      const { binStartDate: x, binEndDate: B, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: L } = d === ee.End ? (
+      const { binStartDate: b, binEndDate: B, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: L } = d === ee.End ? (
         // When grouping from the end we'll start from the last date and move backward to create the bins
-        Fl(b)
+        Fl(x)
       ) : (
         // When grouping from the start we'll start from the first date and move forward to create the bins
-        Sl(b)
+        Sl(x)
       );
-      if (g = N, v = d === ee.End ? v = e[L - 1] : v = e[S], B > n && x < n || x < r && B > r || x >= r && B <= n) {
+      if (p = N, v = d === ee.End ? v = e[L - 1] : v = e[S], B > n && b < n || b < r && B > r || b >= r && B <= n) {
         const A = e.slice(w, L).filter((O) => !(C.dateBinModel in O));
         y.forEach((O) => {
-          v[O] = bl({ binsToRegroup: A, statisticType: p, y: O, nullPolicy: f });
+          v[O] = bl({ binsToRegroup: A, statisticType: g, y: O, nullPolicy: f });
         });
         const I = A.map((O) => O[Oe]).filter((O) => O !== void 0), P = On(I);
-        P !== void 0 && (v[Oe] = P), v[l] = x, v[C.xAxisField] = x, v[C.dateBinningRange] = [x, B], delete v[C.dateBinModel], s.push(v);
+        P !== void 0 && (v[Oe] = P), v[l] = b, v[C.xAxisField] = b, v[C.dateBinningRange] = [b, B], delete v[C.dateBinModel], s.push(v);
       } else N && d !== ee.End && s.length > 0 && (s[s.length - 1][C.dateBinningRange][1] = s[s.length - 1][C.dateBinningRange][1] + 1);
-      S = T, b.binFirstOrLastIndex = T;
+      S = T, x.binFirstOrLastIndex = T;
     }
     d === ee.End && (s = s.reverse());
   } else u === 1 ? s = e.map((m, y) => {
-    const p = m[l];
-    let g = e[y + 1]?.[l];
-    return g = typeof g == "number" ? g - 1 : Ve({
-      date: p,
+    const g = m[l];
+    let p = e[y + 1]?.[l];
+    return p = typeof p == "number" ? p - 1 : Ve({
+      date: g,
       unit: o,
       size: u,
       nextOrPrevious: "next"
     }), {
       ...m,
-      [C.dateBinningRange]: [p, g]
+      [C.dateBinningRange]: [g, p]
     };
   }) : s = e;
   return s;
@@ -6278,33 +6282,33 @@ function Cl(t) {
   if (o !== void 0 && Number.isFinite(o) && a / i !== o) {
     let y = Math.ceil(a / i) * i - a;
     u === R.Week && (y *= 7);
-    const p = sr(n);
+    const g = sr(n);
     if (l === ee.End) {
-      let g = r[0][c];
+      let p = r[0][c];
       for (let S = 0; S < y; S += 1)
-        g = Ve({
-          date: g,
+        p = Ve({
+          date: p,
           unit: u,
           size: 1,
           nextOrPrevious: "previous"
         }), r.push({
-          ...p,
-          [c]: g,
-          [C.xAxisField]: g
+          ...g,
+          [c]: p,
+          [C.xAxisField]: p
         });
       y > 0 && (d = r[r.length - 1][c]);
     } else {
-      let g = r[r.length - 1][c];
+      let p = r[r.length - 1][c];
       for (let S = 0; S < y; S += 1)
-        g = Ve({
-          date: g,
+        p = Ve({
+          date: p,
           unit: u,
           size: 1,
           nextOrPrevious: "next"
         }), r.push({
-          ...p,
-          [c]: g,
-          [C.xAxisField]: g
+          ...g,
+          [c]: p,
+          [C.xAxisField]: p
         });
       f = r[r.length - 1][c];
     }
@@ -6363,14 +6367,14 @@ function Nl(t) {
     unit: u
   })) {
     const { x: d } = a[0], f = a[0].temporalBinning?.timeAggregationType, m = sr(a);
-    let p = f === ee.End ? i : e, g = f === ee.End ? r.length - 1 : 0;
-    for (; g < r.length && (f === ee.End && p > e || f !== ee.End && p < i); )
-      p !== r[g][d] ? c.push({
+    let g = f === ee.End ? i : e, p = f === ee.End ? r.length - 1 : 0;
+    for (; p < r.length && (f === ee.End && g > e || f !== ee.End && g < i); )
+      g !== r[p][d] ? c.push({
         ...m,
-        [d]: p,
-        [C.xAxisField]: p
-      }) : g = f === ee.End ? g - 1 : g + 1, p = Ve({
-        date: p,
+        [d]: g,
+        [C.xAxisField]: g
+      }) : p = f === ee.End ? p - 1 : p + 1, g = Ve({
+        date: g,
         unit: u === R.Month || u === R.Year ? R.Day : u,
         size: 1,
         nextOrPrevious: f === ee.End ? "previous" : "next"
@@ -6421,20 +6425,20 @@ function* wl(t) {
       }
     ];
     let y = Ue.groupByCaseBegin;
-    for (let g = 0; g < r.length; g += 1) {
-      const S = r[g], [b, v] = S[C.dateBinningRange], x = nt(b), B = nt(v);
+    for (let p = 0; p < r.length; p += 1) {
+      const S = r[p], [x, v] = S[C.dateBinningRange], b = nt(x), B = nt(v);
       y = Al({
         groupByFieldsForStatistics: y,
-        queryStartDate: x,
+        queryStartDate: b,
         queryEndDate: B,
         dateField: l,
         y: [d].flat()[0],
-        binIndex: g,
-        lastBin: g === r.length - 1
+        binIndex: p,
+        lastBin: p === r.length - 1
       });
     }
     y = `${y} ${Ue.groupByCaseEnd}`;
-    const p = {
+    const g = {
       ...a,
       groupByFieldsForStatistics: [y],
       outStatistics: m,
@@ -6442,7 +6446,7 @@ function* wl(t) {
     };
     yield Fe({
       queryObject: e,
-      queryConfig: p,
+      queryConfig: g,
       noBatch: !0,
       errorStrings: n,
       abortSignal: s
@@ -6461,14 +6465,14 @@ async function Ll(t) {
       abortSignal: s
     }), l = (await Promise.all(c)).flat();
     if (l.length > 0) {
-      const { isInItem: d, expr: f } = qt(l[0].attributes);
+      const { isInItem: d, expr: f } = Vt(l[0].attributes);
       d && l.forEach((m) => {
         const y = m.attributes[`${f}`];
         if (y !== void 0) {
-          const [p, g] = y.split("|");
-          if (g !== void 0) {
+          const [g, p] = y.split("|");
+          if (p !== void 0) {
             const S = m.attributes[D.ContinuousPercentile];
-            o[g][`${p}`] = S;
+            o[p][`${g}`] = S;
           }
         }
       });
@@ -6495,10 +6499,10 @@ function Gi(t) {
   }
 }
 function Pl(t) {
-  const { chartConfig: e, queryResults: i, mapToStatField: a, splitByField: r, x: n, y: s, nullPolicy: o, queryObject: u } = t, c = Ea(n), d = Ce(u).find((g) => g.name === n)?.type, f = [], m = e.series[0], y = "temporalBinning" in m ? m.temporalBinning?.trimIncompleteTimeInterval : !1, p = "temporalBinning" in m ? m.temporalBinning?.timeAggregationType : !1;
-  return i.forEach((g, S) => {
-    if (!(y && (S === 0 && p === ee.End || S === i.length - 1 && p === ee.Start))) {
-      const { attributes: v, stackedAttributes: x } = g;
+  const { chartConfig: e, queryResults: i, mapToStatField: a, splitByField: r, x: n, y: s, nullPolicy: o, queryObject: u } = t, c = Ea(n), d = Ce(u).find((p) => p.name === n)?.type, f = [], m = e.series[0], y = "temporalBinning" in m ? m.temporalBinning?.trimIncompleteTimeInterval : !1, g = "temporalBinning" in m ? m.temporalBinning?.timeAggregationType : !1;
+  return i.forEach((p, S) => {
+    if (!(y && (S === 0 && g === ee.End || S === i.length - 1 && g === ee.Start))) {
+      const { attributes: v, stackedAttributes: b } = p;
       let B = v[c.lowerBoundaryAlias], N = v[c.upperBoundaryAlias];
       const T = B, w = N, L = (A, I) => {
         let P = A;
@@ -6515,7 +6519,7 @@ function Pl(t) {
       };
       if (B = L(B, d), N = L(N, d), typeof B == "number" && typeof N == "number") {
         const A = { ...v };
-        A[C.originalServerBinningRange] = [T, w], A[n] = B, A[C.xAxisField] = B, A[C.dateBinningRange] = [B, N], delete A[c.lowerBoundaryAlias], delete A[c.upperBoundaryAlias], x && r && !oe(r) && a ? x.forEach((O) => {
+        A[C.originalServerBinningRange] = [T, w], A[n] = B, A[C.xAxisField] = B, A[C.dateBinningRange] = [B, N], delete A[c.lowerBoundaryAlias], delete A[c.upperBoundaryAlias], b && r && !oe(r) && a ? b.forEach((O) => {
           const V = O[r];
           if (V === null || typeof V == "string" || typeof V == "number") {
             const $ = a?.get(V);
@@ -6523,7 +6527,7 @@ function Pl(t) {
           }
         }) : typeof s == "string" && Gi({ dataItem: A, statField: s, nullPolicy: o });
         const { featureExtent: I, featureExtentKey: P } = or({
-          feature: g,
+          feature: p,
           splitByField: r
         });
         I && (A[P] = I), f.push(A);
@@ -6551,25 +6555,25 @@ async function Ml(t) {
       arrayToSort: l,
       sortingField: a
     }), m > 1) {
-      const { numberOfFinalBinsWithinDataRange: y, numberOfSingleBinsWithinDataRange: p } = nr({
+      const { numberOfFinalBinsWithinDataRange: y, numberOfSingleBinsWithinDataRange: g } = nr({
         dateMinTimestamp: d,
         dateMaxTimestamp: f,
         timeIntervalInfo: o
-      }), { newDateMin: g, newDateMax: S } = Cl({
+      }), { newDateMin: p, newDateMax: S } = Cl({
         dateMaxTimestamp: f,
         data: l,
         numberOfFinalBinsWithinDataRange: y,
-        numberOfSingleBinsWithinDataRange: p,
+        numberOfSingleBinsWithinDataRange: g,
         seriesConfig: n,
         timeIntervalInfo: o
       });
       l = Nl({
-        newDateMin: g,
+        newDateMin: p,
         newDateMax: S,
         seriesConfig: n,
         data: l,
         initialNumberOfBins: m,
-        numberOfSingleBinsWithinDataRange: p,
+        numberOfSingleBinsWithinDataRange: g,
         timeIntervalInfo: o
       }), ht({
         arrayToSort: l,
@@ -6609,8 +6613,8 @@ function Ol(t) {
     ({ unit: a } = l);
     const m = u / d, y = f.findIndex(
       (S) => S >= m
-    ), p = f[y], g = y === 0 ? f[0] : f[y - 1];
-    r = p - m < m - g ? p : g;
+    ), g = f[y], p = y === 0 ? f[0] : f[y - 1];
+    r = g - m < m - p ? g : p;
   }
   return { size: r, unit: a };
 }
@@ -6619,7 +6623,7 @@ function Il(t) {
   let r = !1;
   if (be(e) && i) {
     const { unit: n, size: s } = e.temporalBinning ?? {};
-    r = !ei(n, s) && a === !0;
+    r = !ti(n, s) && a === !0;
   }
   return r;
 }
@@ -6638,10 +6642,10 @@ function El(t) {
     Number(e[5] ?? 0)
   ).valueOf();
 }
-async function Ut(t) {
-  const { queryObject: e, queryConfig: i, category: a, splitByField: r, chartLimits: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = r !== void 0, l = a !== Vt ? [a] : [];
+async function Yt(t) {
+  const { queryObject: e, queryConfig: i, category: a, splitByField: r, chartLimits: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = r !== void 0, l = a !== Rt ? [a] : [];
   c && l.push(r);
-  const d = z(e), { idField: f, isTraditionalTypeOID: m } = ve(d), y = m ? f : "*", p = {
+  const d = z(e), { idField: f, isTraditionalTypeOID: m } = ve(d), y = m ? f : "*", g = {
     ...i,
     groupByFieldsForStatistics: Array.from(new Set(l)),
     outStatistics: [
@@ -6659,20 +6663,20 @@ async function Ut(t) {
     // state, using the `returnDistinctValues` on a specific field.
     // Refer to: https://devtopia.esri.com/WebGIS/arcgis-charts/issues/8208
     num: n?.maxBarThreePlusSeriesCountTotal
-  }, g = await Fe({
+  }, p = await Fe({
     queryObject: e,
     featureCount: 1,
     // skipping the count
-    queryConfig: p,
+    queryConfig: g,
     errorStrings: s,
     abortKey: o,
     abortSignal: u
   });
   return Array.from(
     new Set(
-      g.map((b) => b.attributes[c ? r : a])
+      p.map((x) => x.attributes[c ? r : a])
     )
-  ).sort((b, v) => typeof b == "string" && typeof v == "string" ? b.localeCompare(v) : Number(b) - Number(v));
+  ).sort((x, v) => typeof x == "string" && typeof v == "string" ? x.localeCompare(v) : Number(x) - Number(v));
 }
 function or(t) {
   const { feature: e, splitByField: i, chartSubType: a } = t;
@@ -6861,7 +6865,7 @@ function lr(t) {
     showMean: u,
     chartLimits: c,
     fieldList: l
-  } = t, { series: d } = a, f = k(d), m = _(d), { x: y } = d[0], p = "y" in d[0] ? d[0].y : void 0, g = d[0].query?.outStatistics ?? [], S = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: b, originalCategoryValue: v, originalDateValue: x } = C, B = ri(e, y), N = typeof p == "string" ? ri(e, p) : void 0, w = ro(l ?? []).includes(y), L = [];
+  } = t, { series: d } = a, f = k(d), m = _(d), { x: y } = d[0], g = "y" in d[0] ? d[0].y : void 0, p = d[0].query?.outStatistics ?? [], S = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: x, originalCategoryValue: v, originalDateValue: b } = C, B = ri(e, y), N = typeof g == "string" ? ri(e, g) : void 0, w = ro(l ?? []).includes(y), L = [];
   let A = 0;
   const I = /* @__PURE__ */ new Set(), { maxCategoryCount: P } = ut(c), O = Wl({ queryResponse: i, chartConfig: a, maxCategoryCount: P });
   for (let V = 0; O[V] && V < O.length && !(o !== void 0 && A >= o); V += 1) {
@@ -6871,40 +6875,40 @@ function lr(t) {
     if (Gl({ attributes: M, uniqueCategoryList: I, maxCategoryCount: P, x: y, chartSubType: f }))
       continue;
     if (kl(M, d), f === F.PieFromFields || f === F.BarAndLineFromFields)
-      M = Ql(M, g);
-    else if (typeof p == "string" && f === F.BarAndLineSplitByNoAggregation) {
+      M = Ql(M, p);
+    else if (typeof g == "string" && f === F.BarAndLineSplitByNoAggregation) {
       const ae = z(e), { idField: pe, isTraditionalTypeOID: $e } = ve(ae);
-      _l({ dataItem: M, splitByField: n, y: p, fieldOID: $e ? pe : void 0 });
-    } else p && (f === F.BoxPlotMonoField || f === F.BoxPlotMonoFieldAndCategory || f === F.BoxPlotMonoFieldAndSplitBy || f === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && jl(
+      _l({ dataItem: M, splitByField: n, y: g, fieldOID: $e ? pe : void 0 });
+    } else g && (f === F.BoxPlotMonoField || f === F.BoxPlotMonoFieldAndCategory || f === F.BoxPlotMonoFieldAndSplitBy || f === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && jl(
       M,
-      typeof p == "string" ? p : p[0]
+      typeof g == "string" ? g : g[0]
     );
     zl({ attributes: M, showMean: u, chartSubType: f });
     let q = M[y];
-    const G = typeof p == "string" ? M[p] : void 0;
+    const G = typeof g == "string" ? M[g] : void 0;
     q === null && d[0]?.query?.fetchNullValues === !0 && f !== F.PieFromFields && (M[v] = null, q = C.nullValue), S || (w && typeof q == "string" ? q = new Date(q).valueOf() : s && (q = El(M))), typeof q == "string" && l?.find((ae) => ae.name === y)?.type === U.TimeOnly && (M[v] = q, q = Yl(q));
     const { outStatisticFieldName: J } = W.outStatistics ?? {}, { featureExtent: X, featureExtentKey: H } = or({ feature: $, splitByField: n, chartSubType: f });
     if (X && (M[H] = X), f === F.BarAndLineSplitBy && J !== void 0) {
       const ae = M[n], pe = r?.get(ae);
       pe !== void 0 && (ae === n && (M[C.technicalFieldSplitByField] = M[pe]), M[pe] = M[J]), delete M[J];
-    } else (f === F.PieNoAggregation || f === F.BarAndLineNoAggregation || f === F.BarAndLineSplitByNoAggregation) && (w ? M[x] = q : q !== C.nullValue && (M[v] = q), cn({ isXAxis: !0, chartType: m, valueFormat: a.axes?.[0]?.valueFormat }) && (M[C.xAxisField] = `${q}-${V}`, M[C.xAxisDisplayField] = q), M[W.uniqueIdsName] = $.getObjectId());
+    } else (f === F.PieNoAggregation || f === F.BarAndLineNoAggregation || f === F.BarAndLineSplitByNoAggregation) && (w ? M[b] = q : q !== C.nullValue && (M[v] = q), cn({ isXAxis: !0, chartType: m, valueFormat: a.axes?.[0]?.valueFormat }) && (M[C.xAxisField] = `${q}-${V}`, M[C.xAxisDisplayField] = q), M[W.uniqueIdsName] = $.getObjectId());
     m === h.BoxPlotSeries && (M = Rl(d, M)), m === h.PieSeries && typeof q == "number" && (M[v] === void 0 && (M[v] = M[y]), q = `${q}`), q !== void 0 && (M[v] === void 0 && (M[v] = M[y]), M[y] === null ? M[y] = m === h.HeatSeries ? "null" : C.nullValue : M[y] = q, Ul({
       attributes: M,
       xValue: q,
       yValue: G,
       x: y,
-      y: p,
+      y: g,
       xFieldDomain: B,
       yFieldDomain: N,
       chartType: m,
       chartSubType: f,
       xAxisValueFormat: a.axes?.[0].valueFormat,
       yAxisValueFormat: a.axes?.[1]?.valueFormat
-    }), m === h.HeatSeries && typeof p == "string" && M[p] === null && (M[p] = "null", M[b] = null), M[C.xAxisField] === void 0 && (M[C.xAxisField] = M[y])), M = $l(M, a), L.push(M);
+    }), m === h.HeatSeries && typeof g == "string" && M[g] === null && (M[g] = "null", M[x] = null), M[C.xAxisField] === void 0 && (M[C.xAxisField] = M[y])), M = $l(M, a), L.push(M);
   }
   return L;
 }
-async function _t(t) {
+async function jt(t) {
   const {
     queryObject: e,
     uniqueQuery: i,
@@ -6919,19 +6923,19 @@ async function _t(t) {
     popupTemplateFieldInfosEnabled: d,
     preFetchedQueryResponse: f,
     errorStrings: m
-  } = t, { series: y } = a, p = k(y);
-  let g = [];
-  const S = p === F.BarAndLineSplitBy || p === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", b = f ?? await Fe({
+  } = t, { series: y } = a, g = k(y);
+  let p = [];
+  const S = g === F.BarAndLineSplitBy || g === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", x = f ?? await Fe({
     queryObject: e,
     queryConfig: i,
     featureCount: o,
     abortKey: n,
     errorStrings: m,
     abortSignal: s
-  }), v = Ce(e, d), { x } = y[0];
-  return g = lr({
+  }), v = Ce(e, d), { x: b } = y[0];
+  return p = lr({
     queryObject: e,
-    queryResponse: b,
+    queryResponse: x,
     chartConfig: a,
     mapToStatField: r,
     splitByField: S,
@@ -6940,10 +6944,10 @@ async function _t(t) {
     resultLimit: i.num,
     showMean: c,
     chartLimits: l
-  }), p !== F.BarAndLineSplitByNoAggregation && p !== F.BarAndLineFromFields && (S !== "" && (g = bt({ data: g, x, splitByField: S })), g = Vl(
-    g,
+  }), g !== F.BarAndLineSplitByNoAggregation && g !== F.BarAndLineFromFields && (S !== "" && (p = bt({ data: p, x: b, splitByField: S })), p = Vl(
+    p,
     y
-  )), g;
+  )), p;
 }
 async function ur(t) {
   const {
@@ -6967,7 +6971,7 @@ async function ur(t) {
     abortSignal: o
   }), f !== void 0) {
     const y = c === F.BoxPlotMonoField || c === F.BoxPlotMonoFieldAndCategory || c === F.BoxPlotMonoFieldAndSplitBy;
-    m = ti(c) && !y ? f * d : f;
+    m = ii(c) && !y ? f * d : f;
   }
   return n === lt.RenderUpToTheLimit && m !== void 0 && r !== void 0 && r < m && (m = r, f = Math.ceil(m / d)), { categoryOrDateCount: f, elementCount: m };
 }
@@ -6987,13 +6991,13 @@ async function oi(t) {
     chartLimits: f,
     popupTemplateFieldInfosEnabled: m,
     hideZeroCountCategories: y
-  } = t, p = st(e), g = t.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, S = !(y ?? !g), { behaviorAfterLimit: b } = f ?? {};
+  } = t, g = st(e), p = t.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, S = !(y ?? !p), { behaviorAfterLimit: x } = f ?? {};
   let v;
-  const x = { valid: !0 };
+  const b = { valid: !0 };
   let B, N = !1;
   const T = e.series, w = T[0], L = k(e.series);
   if (ie(r))
-    v = _(T) === h.BarSeries ? await zs(t) : x;
+    v = _(T) === h.BarSeries ? await zs(t) : b;
   else {
     if (w !== void 0) {
       const A = _(T), { uniqueQuery: I, mapToStatField: P } = yi({
@@ -7009,7 +7013,7 @@ async function oi(t) {
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
-        behaviorAfterLimit: b,
+        behaviorAfterLimit: x,
         numberMaxOfFeaturesToFetch: I.num,
         abortSignal: c
       });
@@ -7020,7 +7024,7 @@ async function oi(t) {
         chartType: A,
         chartLimits: f
       });
-      if (M && (B = await _t({
+      if (M && (B = await jt({
         queryObject: r,
         uniqueQuery: I,
         chartConfig: e,
@@ -7028,13 +7032,13 @@ async function oi(t) {
         mapToStatField: P,
         elementCount: V,
         isTimeBinningSeries: !1,
-        showMean: p,
+        showMean: g,
         chartLimits: f,
         popupTemplateFieldInfosEnabled: m,
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), de(e) && B !== void 0 && (x.data = await Zo({
+      }), de(e) && B !== void 0 && (b.data = await Zo({
         data: B,
         queryObject: r,
         fetchFullBoxPlotData: a,
@@ -7045,7 +7049,7 @@ async function oi(t) {
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (x.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = B.length, V = ti(L) ? O * T.length : O, M = Ae({
+      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (b.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = B.length, V = ii(L) ? O * T.length : O, M = Ae({
         count: V,
         seriesCount: T.length,
         chartType: A,
@@ -7059,7 +7063,7 @@ async function oi(t) {
             fieldList: s
           }));
           let q = "";
-          L === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), Vn(B, q) ? x.data = { dataItems: B } : Vo(x, j.PieChartMixOfNegativePositiveSlices);
+          L === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), Vn(B, q) ? b.data = { dataItems: B } : Vo(b, j.PieChartMixOfNegativePositiveSlices);
         } else if ((A === h.RadarSeries || A === h.BarSeries || A === h.LineSeries || A === h.ComboLineAndBarSeries) && (L === F.BarAndLineFromFields && "y" in w && typeof w.y == "string" ? B = Dt({
           dataToConvert: B[0],
           x: w.x,
@@ -7071,11 +7075,11 @@ async function oi(t) {
           chartConfig: e,
           queryConfig: i,
           categoryOrDateCount: O,
-          behaviorAfterLimit: b,
+          behaviorAfterLimit: x,
           errorStrings: u,
           abortKey: n,
           abortSignal: c
-        }), V = ti(L) ? B.length * T.length : B.length, M = Ae({
+        }), V = ii(L) ? B.length * T.length : B.length, M = Ae({
           count: V,
           seriesCount: T.length,
           chartType: A,
@@ -7087,16 +7091,16 @@ async function oi(t) {
             const { size: G, unit: J } = w.temporalBinning ?? {};
             G !== void 0 && J !== void 0 && (q = { size: G, unit: J });
           }
-          x.data = { dataItems: B, timeIntervalInfo: q };
+          b.data = { dataItems: B, timeIntervalInfo: q };
         }
       }
-      M || Ot({
-        dataInfo: x,
+      M || It({
+        dataInfo: b,
         chartType: A,
         subError: { outlierLimit: N }
-      }), x.count = V;
+      }), b.count = V;
     }
-    v = x;
+    v = b;
   }
   return v;
 }
@@ -7135,11 +7139,11 @@ function Kl(t) {
     for (const m of a) {
       const y = String(m);
       if (!l.has(`${f}|${y}`)) {
-        const p = u ? Vi({
+        const g = u ? Vi({
           queryObject: u,
           fieldName: s,
           fieldValue: f
-        }) ?? d : d, g = u ? Vi({
+        }) ?? d : d, p = u ? Vi({
           queryObject: u,
           fieldName: o,
           fieldValue: y
@@ -7147,8 +7151,8 @@ function Kl(t) {
         c.push({
           [C.originalCategoryValue]: d === null ? null : d,
           [C.originalYCategoryValue]: m === null ? null : m,
-          [Q.xField]: d === null ? "null" : p,
-          [Q.yField]: m === null ? "null" : g,
+          [Q.xField]: d === null ? "null" : g,
+          [Q.yField]: m === null ? "null" : p,
           [r]: n
         });
       }
@@ -7177,7 +7181,7 @@ async function cr(t) {
   } = t, m = { valid: !0 };
   let y;
   if (We(e)) {
-    const { nullPolicy: p } = e, g = e.series[0], { x: S, y: b, query: v, xTemporalBinning: x, yTemporalBinning: B } = g, N = v?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = v?.outStatistics?.[0]?.statisticType ?? D.Count, w = Xl(e), L = Q.valueField, A = p === Se.Zero ? 0 : null;
+    const { nullPolicy: g } = e, p = e.series[0], { x: S, y: x, query: v, xTemporalBinning: b, yTemporalBinning: B } = p, N = v?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = v?.outStatistics?.[0]?.statisticType ?? D.Count, w = Xl(e), L = Q.valueField, A = g === Se.Zero ? 0 : null;
     if (Io(e)) {
       const I = await Ns({
         chartConfig: e,
@@ -7194,7 +7198,7 @@ async function cr(t) {
         chartType: h.HeatSeries,
         chartLimits: o
       }))
-        Ot({ dataInfo: m, chartType: h.HeatSeries });
+        It({ dataInfo: m, chartType: h.HeatSeries });
       else if (typeof I?.[0] == "object") {
         const P = Ce(a, u);
         y = lr({
@@ -7207,17 +7211,17 @@ async function cr(t) {
           resultLimit: i.num,
           fieldList: P
         });
-        const O = await Ut({
+        const O = await Yt({
           queryObject: a,
           queryConfig: i,
           category: S,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
-        }), V = await Ut({
+        }), V = await Yt({
           queryObject: a,
           queryConfig: i,
-          category: b,
+          category: x,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
@@ -7231,7 +7235,7 @@ async function cr(t) {
             valueField: L,
             emptyCellValue: A,
             x: S,
-            y: b,
+            y: x,
             queryObject: a
           })
         ], w && (y = Jl({
@@ -7249,12 +7253,12 @@ async function cr(t) {
         syncViewTimeZone: l,
         errorStrings: n,
         abortSignal: f
-      }), P = B ? Zl(B.unit) : await Ut({ queryObject: a, queryConfig: i, category: b, errorStrings: n, abortKey: d, abortSignal: f });
+      }), P = B ? Zl(B.unit) : await Yt({ queryObject: a, queryConfig: i, category: x, errorStrings: n, abortKey: d, abortSignal: f });
       let O = 0;
       y = I?.features.flatMap((V) => {
         const $ = [], { attributes: M, stackedAttributes: q } = V, G = [];
         if (q?.forEach((J) => {
-          const X = `${J[b]}`;
+          const X = `${J[x]}`;
           G.push(X), $.push({
             [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
             [Q.yField]: X,
@@ -7263,18 +7267,18 @@ async function cr(t) {
         }), r && P && G.length !== P?.length) {
           const J = P.filter((X) => !G.includes(X.toString()));
           w && (J.length !== P.length || G.length === 0) || J.forEach((X) => {
-            Number.isFinite(Number(M[W.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(X)) && (x?.unit === he.DayOfMonth && B?.unit === he.MonthOfYear && Ui({
+            Number.isFinite(Number(M[W.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(X)) && (b?.unit === he.DayOfMonth && B?.unit === he.MonthOfYear && Ui({
               day: Number(M[W.heatChartLowerBoundaryAlias]),
               month: Number(X),
               includeLeapDay: e.includeLeapDay
-            }) || B?.unit === he.DayOfMonth && x?.unit === he.MonthOfYear && Ui({
+            }) || B?.unit === he.DayOfMonth && b?.unit === he.MonthOfYear && Ui({
               day: Number(X),
               month: Number(M[W.heatChartLowerBoundaryAlias]),
               includeLeapDay: e.includeLeapDay
             })) || $.push({
               [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
               [Q.yField]: X,
-              [L]: p === Se.Zero ? 0 : null
+              [L]: g === Se.Zero ? 0 : null
             });
           });
         }
@@ -7284,7 +7288,7 @@ async function cr(t) {
         seriesCount: 1,
         chartType: h.HeatSeries,
         chartLimits: o
-      }) || Ot({ dataInfo: m, chartType: h.HeatSeries });
+      }) || It({ dataInfo: m, chartType: h.HeatSeries });
     }
     y && (m.data = {
       dataItems: y,
@@ -7335,18 +7339,18 @@ async function xi(t) {
     popupTemplateFieldInfosEnabled: d,
     view: f,
     syncViewTimeZone: m
-  } = t, { behaviorAfterLimit: y } = l ?? {}, p = e.series, g = p[0], { x: S } = g, b = te(g.query?.where), v = { valid: !0 };
-  let x;
-  if (be(g)) {
-    const { temporalBinning: B } = g;
+  } = t, { behaviorAfterLimit: y } = l ?? {}, g = e.series, p = g[0], { x: S } = p, x = te(p.query?.where), v = { valid: !0 };
+  let b;
+  if (be(p)) {
+    const { temporalBinning: B } = p;
     if (a && B) {
       const { unit: N, size: T } = B;
       let w = 1, L = { unit: N, size: T }, A = !1;
       const I = Il({
-        series: g,
+        series: p,
         isTimeBinningSeries: !0,
         setTimeBinningInfoWhenNotProvided: u
-      }), P = !rt(b, a) || I ? await Bl({ queryObject: a, queryConfig: i, x: S, errorStrings: o, abortSignal: n }) : void 0;
+      }), P = !rt(x, a) || I ? await Bl({ queryObject: a, queryConfig: i, x: S, errorStrings: o, abortSignal: n }) : void 0;
       I && P && P.numberOfFeatures > 0 && P.dateRange.dateMaxTimestamp !== void 0 && P.dateRange.dateMinTimestamp !== void 0 && (L = Ol(P), Ce(a).find((G) => G.name === S)?.type === U.DateOnly && L.unit !== void 0 && [
         R.Hour,
         R.Minute,
@@ -7363,16 +7367,16 @@ async function xi(t) {
       });
       let $ = Ae({
         count: w ?? 0,
-        seriesCount: p.length,
+        seriesCount: g.length,
         chartType: h.LineSeries,
         chartLimits: l
       });
       if ($) {
-        if (rt(b, a)) {
+        if (rt(x, a)) {
           const M = e.axes?.[0].valueFormat.type === h.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0, q = s?.[0] instanceof Er ? s : await Ps({
             queryObject: a,
             dateField: S,
-            splitByField: b,
+            splitByField: x,
             queryConfig: O,
             axisTimeZone: M,
             temporalBinning: B,
@@ -7380,28 +7384,28 @@ async function xi(t) {
             view: f,
             syncViewTimeZone: m,
             abortSignal: n
-          }), G = "y" in g && typeof g.y == "string" ? g.y : void 0;
-          if (x = Pl({
+          }), G = "y" in p && typeof p.y == "string" ? p.y : void 0;
+          if (b = Pl({
             chartConfig: e,
             queryResults: q,
             mapToStatField: V,
-            splitByField: b,
+            splitByField: x,
             x: S,
             y: G,
             nullPolicy: B.nullPolicy,
             queryObject: a
           }), !Ae({
-            count: x.length,
-            seriesCount: p.length,
+            count: b.length,
+            seriesCount: g.length,
             chartType: h.LineSeries,
             chartLimits: l
           })) {
-            const J = ue(p), X = x.filter(
+            const J = ue(g), X = b.filter(
               (H) => J.some((ae) => ae in H && Number.isFinite(H[ae]))
             ).length;
             Ae({
               count: X,
-              seriesCount: p.length,
+              seriesCount: g.length,
               chartType: h.LineSeries,
               chartLimits: l
             }) || ($ = !1);
@@ -7412,7 +7416,7 @@ async function xi(t) {
             dateMaxTimestamp: P.dateRange.dateMaxTimestamp,
             timeIntervalInfo: L
           });
-          w = M * p.length, w = rr(w, L.unit), x = await _t({
+          w = M * g.length, w = rr(w, L.unit), b = await jt({
             queryObject: a,
             uniqueQuery: O,
             chartConfig: e,
@@ -7424,21 +7428,21 @@ async function xi(t) {
             errorStrings: o,
             abortKey: r,
             abortSignal: n
-          }), x = await Ml({
+          }), b = await Ml({
             queryObject: a,
             queryConfig: i,
-            queryResults: x,
+            queryResults: b,
             x: S,
-            seriesConfig: p,
+            seriesConfig: g,
             dateRange: P.dateRange,
             timeIntervalInfo: L,
             errorStrings: o,
             abortSignal: n
           });
         }
-        fa(a) && x && x?.length === pl && (A = !0), y === lt.RenderUpToTheLimit && x && (x = eu({ chartConfig: e, chartLimits: l, data: x }));
+        fa(a) && b && b?.length === pl && (A = !0), y === lt.RenderUpToTheLimit && b && (b = eu({ chartConfig: e, chartLimits: l, data: b }));
       }
-      $ || (v.valid = !1, v.invalidType = j.LineChartExceedsLimit), x && x.length > 0 && (x[x.length - 1][C.lastTemporalBin] = !0), v.data = { dataItems: x, timeIntervalInfo: L, serverLimitReached: A }, v.count = w;
+      $ || (v.valid = !1, v.invalidType = j.LineChartExceedsLimit), b && b.length > 0 && (b[b.length - 1][C.lastTemporalBin] = !0), v.data = { dataItems: b, timeIntervalInfo: L, serverLimitReached: A }, v.count = w;
     }
   }
   return v;
@@ -7459,7 +7463,7 @@ async function tu(t) {
     xAxisValueFormatType: xe(e),
     setTimeBinningInfoWhenNotProvided: n,
     queryObject: a
-  }), { uniqueQuery: y, mapToStatField: p } = yi({
+  }), { uniqueQuery: y, mapToStatField: g } = yi({
     chartConfig: e,
     queryObject: a,
     queryConfig: i,
@@ -7468,13 +7472,13 @@ async function tu(t) {
     returnFeaturesExtent: s,
     chartLimits: o
   });
-  let g = await _t({
+  let p = await jt({
     queryObject: a,
     uniqueQuery: y,
     elementCount: 1,
     // this will skip the query counting the number of features, not needed for selection
     chartConfig: e,
-    mapToStatField: p,
+    mapToStatField: g,
     isTimeBinningSeries: m,
     showMean: l,
     chartLimits: o,
@@ -7482,7 +7486,7 @@ async function tu(t) {
     errorStrings: c,
     abortKey: r
   });
-  return de(e) && (g = Ja({ chartConfig: e, data: g, calculateZScore: !1 })), d.data = { dataItems: g }, d;
+  return de(e) && (p = Ja({ chartConfig: e, data: p, calculateZScore: !1 })), d.data = { dataItems: p }, d;
 }
 async function iu(t) {
   const {
@@ -7555,9 +7559,9 @@ async function nu(t) {
     dataContextCountDistinctX: m,
     dataContextCountDistinctY: y
   } = C.scatterplotAggregationFields;
-  let p, g, S, b, v;
-  const x = e.get(c), B = e.get(l), N = e.get(d), T = e.get(f);
-  if (x != null && N !== void 0 && N !== null && B !== void 0 && B !== null && T !== void 0 && T !== null && !Number.isNaN(x + B + N + T)) {
+  let g, p, S, x, v;
+  const b = e.get(c), B = e.get(l), N = e.get(d), T = e.get(f);
+  if (b != null && N !== void 0 && N !== null && B !== void 0 && B !== null && T !== void 0 && T !== null && !Number.isNaN(b + B + N + T)) {
     const { maxScatterPointsAfterAggregation: w } = ut(r), A = Math.floor(Math.sqrt(w)), I = await ru({
       queryObject: a,
       chartConfig: i,
@@ -7566,7 +7570,7 @@ async function nu(t) {
       abortKey: o,
       abortSignal: u
     });
-    S = Math.min(I.get(y) ?? Number.NaN, A), b = Math.min(I.get(m) ?? Number.NaN, A), v = b * S, p = B === x ? 0 : (B - x) / (b - 1), g = T === N ? 0 : (T - N) / (S - 1), e.set(C.scatterplotAggregationFields.xStep, p), e.set(C.scatterplotAggregationFields.yStep, g), e.set(C.scatterplotAggregationFields.rowCount, S), e.set(C.scatterplotAggregationFields.columnCount, b), e.set(C.scatterplotAggregationFields.realGridSize, v);
+    S = Math.min(I.get(y) ?? Number.NaN, A), x = Math.min(I.get(m) ?? Number.NaN, A), v = x * S, g = B === b ? 0 : (B - b) / (x - 1), p = T === N ? 0 : (T - N) / (S - 1), e.set(C.scatterplotAggregationFields.xStep, g), e.set(C.scatterplotAggregationFields.yStep, p), e.set(C.scatterplotAggregationFields.rowCount, S), e.set(C.scatterplotAggregationFields.columnCount, x), e.set(C.scatterplotAggregationFields.realGridSize, v);
   }
 }
 function su(t) {
@@ -7617,13 +7621,13 @@ async function lu(t) {
     dataContextXMinField: f,
     dataContextXMaxField: m,
     dataContextYMinField: y,
-    dataContextYMaxField: p,
-    queryNumberOfFeatures: g,
+    dataContextYMaxField: g,
+    queryNumberOfFeatures: p,
     queryNumberOfAggregatedFeatures: S
   } = C.scatterplotAggregationFields;
-  let b;
-  const v = e?.get(f) ?? Number.NaN, x = e?.get(m) ?? Number.NaN, B = e?.get(g) ?? Number.NaN, N = e?.get(y) ?? v, T = e?.get(p) ?? x;
-  if (v != null && N !== void 0 && N !== null && x !== void 0 && x !== null && T !== void 0 && T !== null && !Number.isNaN(v + x + N + T)) {
+  let x;
+  const v = e?.get(f) ?? Number.NaN, b = e?.get(m) ?? Number.NaN, B = e?.get(p) ?? Number.NaN, N = e?.get(y) ?? v, T = e?.get(g) ?? b;
+  if (v != null && N !== void 0 && N !== null && b !== void 0 && b !== null && T !== void 0 && T !== null && !Number.isNaN(v + b + N + T)) {
     const w = z(a), { idField: L, isTraditionalTypeOID: A } = ve(w), I = A ? L : "*", P = e?.get(C.scatterplotAggregationFields.xStep), O = e?.get(C.scatterplotAggregationFields.yStep), V = e?.get(C.scatterplotAggregationFields.realGridSize), $ = e?.get(C.scatterplotAggregationFields.rowCount), M = e?.get(C.scatterplotAggregationFields.columnCount), q = /* @__PURE__ */ new Map(), G = Ce(a);
     if (G?.forEach((H) => {
       Ft(H) && q.set(H.name, {
@@ -7661,12 +7665,12 @@ async function lu(t) {
           ...r,
           outStatistics: [...q.values()]
         };
-        b = await Ts({
+        x = await Ts({
           queryObject: a,
           queryConfig: H,
           xStep: P,
           xMin: v,
-          xMax: x,
+          xMax: b,
           x: l,
           y: d,
           yStep: O,
@@ -7675,10 +7679,10 @@ async function lu(t) {
         });
       } else if ($ !== void 0 && M !== void 0) {
         let H = 0;
-        const { maxScatterCellsPerQuery: ae, maxScatterCellsPerQueryForStandard: pe } = Rt(), Ni = await no(w, u) ? pe : ae, Ti = [];
-        let jt = !0, Xe = v, ke = N, Je = "", Ct = 1, Ht = 1, vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER;
-        for (; Ht <= M && jt; ) {
-          for (ke = N, Ct = 1; Ct <= $ && jt; ) {
+        const { maxScatterCellsPerQuery: ae, maxScatterCellsPerQueryForStandard: pe } = $t(), Ni = await no(w, u) ? pe : ae, Ti = [];
+        let Ht = !0, Xe = v, ke = N, Je = "", Ct = 1, zt = 1, vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER;
+        for (; zt <= M && Ht; ) {
+          for (ke = N, Ct = 1; Ct <= $ && Ht; ) {
             if (Je = su({
               groupByFieldsForStatistics: Je,
               x: l,
@@ -7688,7 +7692,7 @@ async function lu(t) {
               xStep: P,
               yStep: O,
               endOfRow: Ct === $,
-              endOfColumn: Ht === M
+              endOfColumn: zt === M
             }), Xe < vt && (vt = Xe), Xe + P > Bt && (Bt = Xe + P), ke < Nt && (Nt = ke), ke + P > Tt && (Tt = ke + O), H += 1, H % Ni === 0 || H === V || H === B) {
               Je = `${Je} ${Ue.groupByCaseEnd}`;
               const pr = {
@@ -7709,17 +7713,17 @@ async function lu(t) {
                   abortKey: o,
                   abortSignal: u
                 })
-              ), vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER, Je = "", H === V && (jt = !1);
+              ), vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER, Je = "", H === V && (Ht = !1);
             }
             ke += O, Ct += 1;
           }
-          Xe += P, Ht += 1;
+          Xe += P, zt += 1;
         }
-        b = (await Promise.all(Ti)).flat();
+        x = (await Promise.all(Ti)).flat();
       }
     }
   }
-  return b;
+  return x;
 }
 async function uu(t) {
   const { chartConfig: e, queryConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = e.series[0], { x: u, y: c } = o;
@@ -7729,12 +7733,12 @@ async function uu(t) {
     dataContextXMaxField: f,
     dataContextYMinField: m,
     dataContextYMaxField: y,
-    queryNumberOfFeatures: p
-  } = C.scatterplotAggregationFields, { idField: g, isTraditionalTypeOID: S } = ve(z(a)), b = S ? g : "*", v = [
+    queryNumberOfFeatures: g
+  } = C.scatterplotAggregationFields, { idField: p, isTraditionalTypeOID: S } = ve(z(a)), x = S ? p : "*", v = [
     {
       statisticType: D.Count,
-      onStatisticField: b,
-      outStatisticFieldName: p
+      onStatisticField: x,
+      outStatisticFieldName: g
     },
     {
       statisticType: D.Minimum,
@@ -7759,10 +7763,10 @@ async function uu(t) {
       onStatisticField: c
     }
   );
-  const x = { ...i };
-  return x.outStatistics = v, l = await xt({
+  const b = { ...i };
+  return b.outStatistics = v, l = await xt({
     queryObject: a,
-    queryConfig: x,
+    queryConfig: b,
     errorStrings: r,
     abortKey: n,
     abortSignal: s
@@ -7777,41 +7781,41 @@ function cu(t) {
   let d = [];
   if (e && "stackedAttributes" in i && i.stackedAttributes) {
     const f = Oa(a, r), m = i.attributes[f.lowerBoundaryAlias], y = i.attributes[f.upperBoundaryAlias];
-    i.stackedAttributes.forEach((p) => {
-      let g = p[f.stackAlias], S;
-      typeof g == "number" && typeof n == "number" && (g *= n), typeof g == "number" && typeof n == "number" && (S = g + n);
-      const b = p[a], v = p[r];
-      typeof g == "number" && typeof S == "number" && typeof b == "number" && typeof v == "number" && d.push({
-        ...p,
-        [a]: wt({ value: b, valueMin: m, valueMax: y }),
-        [r]: wt({ value: v, valueMin: g, valueMax: S }),
+    i.stackedAttributes.forEach((g) => {
+      let p = g[f.stackAlias], S;
+      typeof p == "number" && typeof n == "number" && (p *= n), typeof p == "number" && typeof n == "number" && (S = p + n);
+      const x = g[a], v = g[r];
+      typeof p == "number" && typeof S == "number" && typeof x == "number" && typeof v == "number" && d.push({
+        ...g,
+        [a]: wt({ value: x, valueMin: m, valueMax: y }),
+        [r]: wt({ value: v, valueMin: p, valueMax: S }),
         [o]: Math.min(m, y),
         [u]: Math.max(m, y),
-        [c]: g,
+        [c]: p,
         [l]: S
       });
     });
   } else {
-    const { expr: f, isInItem: m } = qt(i.attributes);
+    const { expr: f, isInItem: m } = Vt(i.attributes);
     if (m && f && i.attributes[f] !== s) {
-      let [y, p, g, S] = i.attributes[f].split("|");
-      y = Math.min(y, p), p = Math.max(y, p), g = Math.min(g, S), S = Math.max(g, S);
-      const b = {
+      let [y, g, p, S] = i.attributes[f].split("|");
+      y = Math.min(y, g), g = Math.max(y, g), p = Math.min(p, S), S = Math.max(p, S);
+      const x = {
         ...i.attributes,
         [o]: y,
-        [u]: p,
-        [c]: g,
+        [u]: g,
+        [c]: p,
         [l]: S
       };
-      b[a] = wt({
-        value: b[a],
+      x[a] = wt({
+        value: x[a],
         valueMin: y,
-        valueMax: p
-      }), b[r] = wt({
-        value: b[r],
-        valueMin: g,
+        valueMax: g
+      }), x[r] = wt({
+        value: x[r],
+        valueMin: p,
         valueMax: S
-      }), d = [b];
+      }), d = [x];
     }
   }
   return d;
@@ -7829,21 +7833,21 @@ function du(t) {
     }) : f[0][W.uniqueIdsName] = d.getObjectId(), f;
   });
   return l = l?.filter((d) => {
-    const { expr: f } = qt(d);
+    const { expr: f } = Vt(d);
     return Number.isFinite(d[o]) && Number.isFinite(d[u]) && (f === void 0 || d[f] !== Ue.groupByOutKeyword);
   }), l ?? [];
 }
 async function fu(t) {
   const { queryObject: e, queryConfig: i, chartConfig: a, featureCount: r, errorStrings: n, abortKey: s, abortSignal: o } = t, u = a.series[0], { x: c, y: l } = u, d = z(e);
   let f = [];
-  const m = Ce(e), y = $t(d).idFields, p = (m?.filter((x) => Ft(x) && x.name !== c && x.name !== l) ?? []).map(
-    (x) => x.name
-  ) ?? [], g = u?.additionalTooltipFields ?? [], S = Array.from(
-    /* @__PURE__ */ new Set([c, l, ...y ?? [], ...p, ...g])
-  ), b = ge(d);
-  if (b && !b.isTable) {
-    const { rendererField: x, rendererNormalizationField: B } = io(d?.renderer ?? void 0);
-    oe(x) || S.push(x), oe(B) || S.push(B);
+  const m = Ce(e), y = kt(d).idFields, g = (m?.filter((b) => Ft(b) && b.name !== c && b.name !== l) ?? []).map(
+    (b) => b.name
+  ) ?? [], p = u?.additionalTooltipFields ?? [], S = Array.from(
+    /* @__PURE__ */ new Set([c, l, ...y ?? [], ...g, ...p])
+  ), x = ge(d);
+  if (x && !x.isTable) {
+    const { rendererField: b, rendererNormalizationField: B } = io(d?.renderer ?? void 0);
+    oe(b) || S.push(b), oe(B) || S.push(B);
   }
   const v = {
     ...i,
@@ -7874,11 +7878,11 @@ async function mu(t) {
     abortSignal: d
   } = t, f = i.series[0], { x: m, y } = f;
   if (!Number.isNaN(s) && s > 0) {
-    const p = { ...a };
-    p.where = Y([p.where, `${m} IS NOT NULL`, `${y} IS NOT NULL`]), o ? e = await lu({
+    const g = { ...a };
+    g.where = Y([g.where, `${m} IS NOT NULL`, `${y} IS NOT NULL`]), o ? e = await lu({
       chartConfig: i,
       queryObject: r,
-      queryConfig: p,
+      queryConfig: g,
       statsMap: n,
       useQueryAttributeBins: u,
       errorStrings: c,
@@ -7887,7 +7891,7 @@ async function mu(t) {
     }) : e = await fu({
       queryObject: r,
       chartConfig: i,
-      queryConfig: p,
+      queryConfig: g,
       featureCount: s,
       errorStrings: c,
       abortKey: l,
@@ -7919,8 +7923,8 @@ async function dr(t) {
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    }), { queryNumberOfFeatures: f, yStep: m } = C.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), p = d?.get(f) ?? Number.NaN, g = p >= y, S = gn(a);
-    g && await nu({
+    }), { queryNumberOfFeatures: f, yStep: m } = C.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), g = d?.get(f) ?? Number.NaN, p = g >= y, S = gn(a);
+    p && await nu({
       statsMap: d,
       chartConfig: e,
       queryObject: a,
@@ -7930,17 +7934,17 @@ async function dr(t) {
       abortKey: u,
       abortSignal: c
     });
-    const b = await mu({
+    const x = await mu({
       ...t,
       queryObject: a,
       statsMap: d,
-      numberOfFeatures: p,
-      isAggregationMode: g,
+      numberOfFeatures: g,
+      isAggregationMode: p,
       useQueryAttributeBins: S
     }), v = du({
       chartConfig: e,
-      rawData: b,
-      isAggregationMode: g,
+      rawData: x,
+      isAggregationMode: p,
       yStep: d.get(m),
       useQueryAttributeBins: S
     });
@@ -7949,7 +7953,7 @@ async function dr(t) {
       sortingField: e.series[0].x,
       orderBy: ye.Ascending
     });
-    const { r2: x, trendLinePoints: B } = n !== !1 ? await Va({
+    const { r2: b, trendLinePoints: B } = n !== !1 ? await Va({
       data: v,
       statsMap: d,
       queryConfig: i,
@@ -7958,7 +7962,7 @@ async function dr(t) {
       errorStrings: o,
       abortSignal: c
     }) : C.scatterplotSeries;
-    l = { dataItems: v, r2: x, trendLinePoints: B, aggregated: g };
+    l = { dataItems: v, r2: b, trendLinePoints: B, aggregated: p };
   }
   return l;
 }
@@ -7991,7 +7995,7 @@ function K(t) {
   let u = n, l = it(i)[e];
   return s === !0 && (e === E.Min || e === E.Max) && (l = `${l}${Rr}`), o === !0 && (mr(a) || e === E.Outlier) && (l = `${l}${$r}`), (n === void 0 || `${n}`.trim() === "") && (u = fe({ where: r, normalize: !0, escape: !1 })), u !== void 0 && `${u}`.trim() !== "" && (l = `${u}${l !== "" ? `_${l}` : ""}`), l;
 }
-function Yt(t) {
+function Zt(t) {
   const { dataItem: e, y: i, splitBy: a, showOutliers: r } = t, n = K({ key: E.FirstQuartile, y: i, splitBy: a, showOutliers: r }), s = K({ key: E.ThirdQuartile, y: i, splitBy: a, showOutliers: r });
   return Number.isFinite(e[n]) || Number.isFinite(e[s]);
 }
@@ -8002,18 +8006,18 @@ function yu(t) {
     case F.BoxPlotMonoField:
     case F.BoxPlotMultiFields:
     case F.BoxPlotMonoFieldAndCategory:
-      s = Yt({ dataItem: i, showOutliers: r });
+      s = Zt({ dataItem: i, showOutliers: r });
       break;
     case F.BoxPlotMultiFieldsAndCategory:
       s = a.some(
-        (o) => Yt({ dataItem: i, y: o, showOutliers: r })
+        (o) => Zt({ dataItem: i, y: o, showOutliers: r })
       );
       break;
     case F.BoxPlotMonoFieldAndSplitBy:
     case F.BoxPlotMultiFieldsAndSplitBy:
     case F.BoxPlotMonoFieldAndCategoryAndSplitBy:
       s = e.some(
-        (o) => Yt({
+        (o) => Zt({
           dataItem: i,
           splitBy: o.query?.where,
           showOutliers: r
@@ -8151,9 +8155,9 @@ function hu(t) {
     r.forEach((l) => {
       if (n) {
         let d = 0, f = 0, m = !1, y = !1;
-        for (let p = 0; p < l.length; p += 1) {
-          const g = c[l[p]];
-          Number.isFinite(g) && (g < 0 ? (f += g, y = !0, u = !0) : (d += g, m = !0));
+        for (let g = 0; g < l.length; g += 1) {
+          const p = c[l[g]];
+          Number.isFinite(p) && (p < 0 ? (f += p, y = !0, u = !0) : (d += p, m = !0));
         }
         s = m ? Math.max(s, d) : s, o = y ? Math.min(o, f) : o, m && !y && (o = Math.min(o, d)), !m && y && (s = Math.max(s, f)), m && d <= 0 && (u = !0);
       } else {
@@ -8183,19 +8187,19 @@ function Yi(t) {
       const d = s.filter((m) => m[c] !== null);
       if ({ min: a, max: r } = St(d, (m) => m[c]), n.axes?.[0]?.valueFormat.type === h.DateAxisFormat && a !== void 0 && r !== void 0 && ([a, r] = [new Date(a).valueOf(), new Date(r).valueOf()]), l === h.BoxPlotSeries) {
         e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER;
-        const m = ue(u, o), y = k(u), p = "standardizeValues" in n ? n.standardizeValues === !0 : void 0, g = n.series.map(
+        const m = ue(u, o), y = k(u), g = "standardizeValues" in n ? n.standardizeValues === !0 : void 0, p = n.series.map(
           (S) => S.visible !== !1 ? fe({ where: S.query?.where }) : ""
         );
-        g.length === 0 && g.push(" "), d.forEach((S) => {
-          m.forEach((b) => {
-            const v = y === F.BoxPlotMultiFieldsAndCategory ? b : void 0;
-            g.forEach((x) => {
+        p.length === 0 && p.push(" "), d.forEach((S) => {
+          m.forEach((x) => {
+            const v = y === F.BoxPlotMultiFieldsAndCategory ? x : void 0;
+            p.forEach((b) => {
               const { min: B, max: N } = Su({
                 y: v,
-                splitByValue: x,
+                splitByValue: b,
                 chartSubType: y,
                 showOutliers: !1,
-                standardizeValues: p,
+                standardizeValues: g,
                 dataItem: S
               });
               B != null && B < e && (e = B), N != null && N > i && (i = N);
@@ -8207,22 +8211,22 @@ function Yi(t) {
           // we should keep the intention of the function purely as it is, meaning retrieving the min/max values from the stacked series.
           case Te.Stacked100:
           case Te.Stacked: {
-            const { stackedMinY: y, stackedMaxY: p } = hu({
+            const { stackedMinY: y, stackedMaxY: g } = hu({
               seriesConfig: u,
               filteredData: d,
               filteredSeriesIds: o
             });
-            e = y, i = p;
+            e = y, i = g;
             break;
           }
           case Te.Side:
           default: {
-            e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER, ue(u, o).forEach((p) => {
-              const { min: g, max: S } = St(
+            e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER, ue(u, o).forEach((g) => {
+              const { min: p, max: S } = St(
                 d,
-                (b) => b[p]
+                (x) => x[g]
               );
-              g !== void 0 && g < e && (e = g), S !== void 0 && S > i && (i = S);
+              p !== void 0 && p < e && (e = p), S !== void 0 && S > i && (i = S);
             });
             break;
           }
@@ -8301,12 +8305,12 @@ function xu(t, e) {
       s = s.map((m) => {
         let y = m[d];
         m[c] !== void 0 ? y = m[c] : m[o] !== void 0 && (y = m[o]);
-        let p = { ...m, [d]: y };
-        if (delete p[c], delete p[o], delete p[l], f) {
-          let g = m[f];
-          m[u] !== void 0 && (g = m[u]), p = { ...p, [f]: g }, delete p[u];
+        let g = { ...m, [d]: y };
+        if (delete g[c], delete g[o], delete g[l], f) {
+          let p = m[f];
+          m[u] !== void 0 && (p = m[u]), g = { ...g, [f]: p }, delete g[u];
         }
-        return p;
+        return g;
       }), n ? a = s : "dataItems" in a && (a.dataItems = s);
     }
   }
@@ -8317,7 +8321,7 @@ function Zi(t) {
   delete e[C.technicalSortingFieldBySum], delete e[C.technicalSortingFieldByPercent], delete e[C.pieChart.technicalFieldSlicePercent], delete e[C.pieChart.technicalFieldGroupedSlices], delete e[C.lastTemporalBin], delete e[C.originalServerBinningRange], delete e[C.technicalFieldSplitByField], delete e[W.uniqueIdsName], Object.keys(e).filter(
     (r) => r.includes(C.rendererSymbolField)
   ).forEach((r) => delete e[r]);
-  const a = qt(e);
+  const a = Vt(e);
   return a.isInItem && delete e[a.expr ?? ""], e;
 }
 function Cu(t, e) {
@@ -8414,10 +8418,10 @@ async function Bu(t) {
     returnFeaturesExtent: f,
     popupTemplateFieldInfosEnabled: m,
     view: y
-  } = t, { series: p } = a, g = _(p), S = [], { maxOIDsPerSelectionQuery: b } = Rt();
-  for (let x = 0; x < e; x += 1) {
-    const B = x * b, N = (x + 1) * b - 1, T = i.slice(B === 0 ? 0 : B - 1, N), w = { ...r };
-    switch (w.objectIds = T, g) {
+  } = t, { series: g } = a, p = _(g), S = [], { maxOIDsPerSelectionQuery: x } = $t();
+  for (let b = 0; b < e; b += 1) {
+    const B = b * x, N = (b + 1) * x - 1, T = i.slice(B === 0 ? 0 : B - 1, N), w = { ...r };
+    switch (w.objectIds = T, p) {
       case h.HeatSeries:
         S.push(
           cr({
@@ -8442,7 +8446,7 @@ async function Bu(t) {
         if (Pe({
           xAxisValueFormatType: xe(a),
           setTimeBinningInfoWhenNotProvided: d,
-          seriesConfig: p[0],
+          seriesConfig: g[0],
           queryObject: s
         })) {
           const L = He(a);
@@ -8517,7 +8521,7 @@ async function Bu(t) {
             queryObject: s,
             queryConfig: w,
             chartConfig: a,
-            x: p[0].x,
+            x: g[0].x,
             errorStrings: n
           })
         );
@@ -8542,19 +8546,19 @@ async function Yd(t) {
     popupTemplateFieldInfosEnabled: f,
     view: m,
     viewExtentUpdated: y,
-    runtimeDataFilters: p,
-    ignoreViewExtent: g,
+    runtimeDataFilters: g,
+    ignoreViewExtent: p,
     returnSelectionOIDs: S,
-    selectionData: b
-  } = t, { series: v } = e, { selectionItems: x, selectionOIDs: B } = b ?? {};
+    selectionData: x
+  } = t, { series: v } = e, { selectionItems: b, selectionOIDs: B } = x ?? {};
   let N;
-  const T = _(v), w = T !== h.HistogramSeries && T !== h.HeatSeries && x !== void 0 && x.length > 0 && !(v[0].x in x[0]) && !(ce in x[0]) && !(C.boxPlot.boxPlotCategory in x[0]);
+  const T = _(v), w = T !== h.HistogramSeries && T !== h.HeatSeries && b !== void 0 && b.length > 0 && !(v[0].x in b[0]) && !(ce in b[0]) && !(C.boxPlot.boxPlotCategory in b[0]);
   if (y !== !0 && S !== !1 && B !== void 0 && B.length > 0 && (a === !0 || w || u)) {
     const A = Ci(i), I = Ha({
       queryObject: s,
       chartConfig: e,
-      runtimeDataFilters: p,
-      ignoreViewExtent: g,
+      runtimeDataFilters: g,
+      ignoreViewExtent: p,
       view: m
     });
     if (A !== void 0 && !Bn({ dataContext: A[0], chartConfig: e, chartLimits: c }))
@@ -8563,7 +8567,7 @@ async function Yd(t) {
         return typeof O == "number" || typeof O == "string" ? B?.includes(O) : !1;
       });
     else if (B?.[0] !== void 0 && I !== void 0) {
-      const { maxOIDsPerSelectionQuery: P } = Rt(), O = Math.ceil(B.length / P), V = te(e.series[0]?.query?.where), $ = await Bu({
+      const { maxOIDsPerSelectionQuery: P } = $t(), O = Math.ceil(B.length / P), V = te(e.series[0]?.query?.where), $ = await Bu({
         numberOfQueries: O,
         selectionOIDs: B,
         queryConfig: I,
@@ -8670,7 +8674,7 @@ export {
   z as af,
   Nd as ag,
   pn as ah,
-  $t as ai,
+  kt as ai,
   Id as aj,
   ge as ak,
   xo as al,
@@ -8681,7 +8685,7 @@ export {
   go as aq,
   bd as ar,
   yo as as,
-  ai as at,
+  Ot as at,
   Us as au,
   Ss as av,
   $a as aw,
@@ -8749,13 +8753,13 @@ export {
   mn as bt,
   vd as bu,
   wd as bv,
-  kt as bw,
+  Qt as bw,
   Rd as bx,
   Fo as by,
   bo as bz,
   Ls as c,
   kd as c$,
-  Ut as c0,
+  Yt as c0,
   Sn as c1,
   gu as c2,
   Fn as c3,
@@ -8777,7 +8781,7 @@ export {
   Od as cJ,
   uc as cK,
   ud as cL,
-  ti as cM,
+  ii as cM,
   pt as cN,
   dn as cO,
   Jc as cP,
@@ -8793,7 +8797,7 @@ export {
   xe as cZ,
   $d as c_,
   Zn as ca,
-  It as cb,
+  Et as cb,
   cn as cc,
   je as cd,
   ne as ce,
@@ -8836,7 +8840,7 @@ export {
   ce as m,
   Ne as n,
   Wc as o,
-  Yt as p,
+  Zt as p,
   Gc as q,
   ya as r,
   Cc as s,