@arcgis/charts-components 5.1.0-next.82 → 5.1.0-next.83

package/dist/chunks/index.js

@@ -2,7 +2,7 @@
 import { computeStatisticsHistograms as ea, fetchPixelFeatureSet as ta, computeRasterAttributeTable as ia } from "@arcgis/core/applications/Components/imageryUtils.js";
 import gr from "@arcgis/core/geometry/Extent.js";
 import "@arcgis/toolkit/type";
-import { u as y, r as I, t as re, p as ne, n as ve, k as li, m as Ce, s as $, q as Ie, a as di, S as ra, g as ee, l as na, w as q, j as aa, d as Te, v as dt, G as sa } from "./series-types.js";
+import { u as y, r as I, t as re, p as ne, n as ve, k as li, m as Ce, s as $, q as Ie, a as $i, S as ra, g as ee, l as na, w as q, j as aa, d as Te, v as dt, G as sa } from "./series-types.js";
 import { g as pt, i as X, d as K, f as He, h as Ve, k as te, e as fe, j as xt, R as H } from "./rest-js-object-literals.js";
 import * as br from "@arcgis/core/geometry/support/jsonUtils.js";
 import oa from "@arcgis/core/rest/support/AttributeBinsQuery.js";
@@ -21,7 +21,7 @@ import { isEmpty as Cr, isEqual as Re, memoize as qi, cloneDeep as wt, sortBy as
 import { fetchT9nStringsBundle as $e, getElementLocale as Ae, supportedLocales as Fr } from "@arcgis/toolkit/intl";
 import { DateTime as xe } from "luxon";
 import ma from "@arcgis/core/Graphic.js";
-import * as vi from "@arcgis/core/symbols/support/symbolUtils.js";
+import * as xi from "@arcgis/core/symbols/support/symbolUtils.js";
 import ga from "@esri/arcgis-html-sanitizer";
 import Ki from "@arcgis/core/layers/support/FeatureFilter.js";
 import ba from "@arcgis/core/smartMapping/statistics/histogram.js";
@@ -149,7 +149,7 @@ const Va = {
 }, rt = {
   Reject: "reject",
   RenderUpToTheLimit: "renderUpToTheLimit"
-}, z = {
+}, j = {
   AxisLabels: "axisLabels",
   GuideLabel: "guideLabel",
   AxisTitle: "axisTitle",
@@ -165,7 +165,7 @@ const Va = {
   maxRecords: 2e3,
   orderByJSAPIDelimiter: " ",
   outStatistics: {
-    statisticType: di.statisticType,
+    statisticType: $i.statisticType,
     onStatisticField: "OBJECTID",
     outStatisticFieldName: "arcgis_charts_outStatisticFieldName_default_key"
   },
@@ -178,7 +178,7 @@ const Va = {
   undefinedSliceId: "arcgis-charts-slice-id-undefined",
   nullSliceId: "arcgis-charts-slice-id-null",
   emptySliceId: "arcgis-charts-slice-id-empty"
-}, Nt = "arcgis_charts_box_plot_category", j = {
+}, Nt = "arcgis_charts_box_plot_category", V = {
   valueField: "arcgis_charts_heat_chart_value",
   xField: "arcgis_charts_heat_chart_x",
   yField: "arcgis_charts_heat_chart_y"
@@ -252,7 +252,7 @@ function Bp() {
     }
   };
 }
-function ci(t = 1) {
+function di(t = 1) {
   return [
     Math.floor(Math.random() * 256),
     Math.floor(Math.random() * 256),
@@ -266,19 +266,19 @@ function Y(t) {
     size: 10
   };
   switch (t) {
-    case z.ChartTitle:
+    case j.ChartTitle:
       e.size = 18;
       break;
-    case z.AxisTitle:
+    case j.AxisTitle:
       e.size = 14;
       break;
-    case z.LegendText:
+    case j.LegendText:
       e.size = 12;
       break;
-    case z.LegendTitle:
+    case j.LegendTitle:
       e.size = 13;
       break;
-    case z.DescriptionText:
+    case j.DescriptionText:
       e.size = 11;
       break;
   }
@@ -286,7 +286,7 @@ function Y(t) {
 }
 function Br(t = "", e = Y(), i) {
   let r = K.Center;
-  return (i === z.DataLabels || i === z.GuideLabel) && (r = void 0), {
+  return (i === j.DataLabels || i === j.GuideLabel) && (r = void 0), {
     type: X.TS,
     color: Ar(),
     text: t,
@@ -294,7 +294,7 @@ function Br(t = "", e = Y(), i) {
     horizontalAlignment: r
   };
 }
-function G(t) {
+function _(t) {
   const { text: e, visible: i, font: r, type: n } = t ?? {
     text: "",
     visible: !0,
@@ -309,7 +309,7 @@ function G(t) {
 function Wt(t) {
   const e = t?.useRandomColor ?? !1, i = t?.useRampColor, r = t?.width ?? 1, n = t?.isHistogramOverlay;
   let a = t?.color ?? Ar(1);
-  return e ? a = ci() : i !== void 0 && (n === !0 ? a = Be({
+  return e ? a = di() : i !== void 0 && (n === !0 ? a = Be({
     colorIndex: i.colorIndex,
     histogramOverlays: n
   }) : a = Be({ colorIndex: i.colorIndex })), t?.opacity !== void 0 && (a[3] = t.opacity), {
@@ -331,7 +331,7 @@ function Lp() {
     intlOptions: {}
   };
 }
-function Ti() {
+function wi() {
   return {
     type: y.NumberAxisFormat,
     intlOptions: {
@@ -363,16 +363,16 @@ function Np() {
   };
 }
 function Xt(t = "Category Axis") {
-  const e = G({
+  const e = _({
     text: t,
     visible: !0,
-    font: Y(z.AxisTitle)
+    font: Y(j.AxisTitle)
   });
   e.content.horizontalAlignment = K.Center, e.content.verticalAlignment = te.Middle;
-  const i = G({
+  const i = _({
     text: t,
     visible: !0,
-    font: Y(z.AxisLabels)
+    font: Y(j.AxisLabels)
   });
   return {
     type: y.Axis,
@@ -384,21 +384,21 @@ function Xt(t = "Category Axis") {
   };
 }
 function Zt(t = "Value Axis") {
-  const e = G({
+  const e = _({
     text: t,
     visible: !0,
-    font: Y(z.AxisTitle)
-  }), i = G({
+    font: Y(j.AxisTitle)
+  }), i = _({
     text: t,
     visible: !0,
-    font: Y(z.AxisLabels)
+    font: Y(j.AxisLabels)
   });
   return e.content.verticalAlignment = te.Middle, e.content.horizontalAlignment = K.Center, {
     type: y.Axis,
     visible: !0,
     title: e,
     labels: i,
-    valueFormat: Ti(),
+    valueFormat: wi(),
     lineSymbol: Wt({ color: Ir })
   };
 }
@@ -406,12 +406,12 @@ function nt() {
   return {
     type: y.Legend,
     visible: !0,
-    title: G({
+    title: _({
       text: "",
       visible: !0,
-      font: Y(z.LegendTitle)
+      font: Y(j.LegendTitle)
     }),
-    body: Br("", Y(z.LegendText)),
+    body: Br("", Y(j.LegendText)),
     position: li.Right
   };
 }
@@ -439,7 +439,7 @@ function Op(t, e = !1) {
   return {
     type: X.SFS,
     style: He.Solid,
-    color: e ? ci(ge) : Be({
+    color: e ? di(ge) : Be({
       colorIndex: t ?? 0,
       opacity: ge
     })
@@ -471,7 +471,7 @@ function Ja(t = !1) {
   return {
     type: X.SMS,
     style: Ve.Circle,
-    color: t ? ci(ge) : Be({ colorIndex: 0, opacity: ge }),
+    color: t ? di(ge) : Be({ colorIndex: 0, opacity: ge }),
     size: 7
   };
 }
@@ -494,7 +494,7 @@ function Ka(t = !1) {
       symbol: {
         type: X.SLS,
         style: pt.Solid,
-        color: t ? ci() : Be({ colorIndex: 1 }),
+        color: t ? di() : Be({ colorIndex: 1 }),
         width: 2
       }
     }
@@ -508,10 +508,10 @@ function Xa(t, e) {
     name: i,
     y: "",
     x: "",
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels)
+      font: Y(j.DataLabels)
     }),
     query: {
       outStatistics: [
@@ -542,10 +542,10 @@ function Za() {
     y: "",
     markerSymbol: Ja(),
     overlays: Ka(),
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels)
+      font: Y(j.DataLabels)
     })
   };
 }
@@ -611,10 +611,10 @@ function is(t) {
     y: r,
     lineSymbol: Ya(t.seriesIndex),
     markerSymbol: Qa(t.seriesIndex),
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels)
+      font: Y(j.DataLabels)
     }),
     temporalBinning: {
       unit: $.Day,
@@ -657,11 +657,11 @@ function Rp(t) {
     x: "",
     y: r,
     fillSymbol: rs(t.seriesIndex),
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels),
-      type: z.DataLabels
+      font: Y(j.DataLabels),
+      type: j.DataLabels
     })
   };
 }
@@ -719,11 +719,11 @@ function qp(t, e) {
     x: "",
     y: i,
     fillSymbol: as(),
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels),
-      type: z.DataLabels
+      font: Y(j.DataLabels),
+      type: j.DataLabels
     }),
     startAngle: -90,
     endAngle: 270,
@@ -732,14 +732,14 @@ function qp(t, e) {
     displayNumericValueOnDataLabel: !1,
     displayPercentageOnDataLabel: !0,
     numericValueFormat: {
-      ...Ti(),
+      ...wi(),
       intlOptions: {
         minimumFractionDigits: 1,
         maximumFractionDigits: 1
       }
     },
     percentValueFormat: {
-      ...Ti(),
+      ...wi(),
       intlOptions: {
         minimumFractionDigits: 1,
         maximumFractionDigits: 1
@@ -782,16 +782,16 @@ function kp(t, e = We()) {
         orderBy: ne.Ascending
       }
     },
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     axes: ft(t, y.BarSeries),
@@ -812,16 +812,16 @@ function Wp(t, e = We()) {
         orderBy: ne.Ascending
       }
     },
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     series: [],
@@ -844,16 +844,16 @@ function Vp(t, e = We()) {
         orderBy: ne.Ascending
       }
     },
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     axes: ft(t, y.LineSeries),
@@ -873,16 +873,16 @@ function jp(t, e = We()) {
         orderBy: ne.Ascending
       }
     },
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     axes: ft(t, y.RadarSeries),
@@ -902,16 +902,16 @@ function zp(t, e = We()) {
         orderBy: ne.Descending
       }
     },
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     series: [],
@@ -928,10 +928,10 @@ function _p(t, e = We()) {
     type: y.Chart,
     id: e,
     colorMatch: !0,
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
     series: [],
     axes: ts(t)
@@ -943,16 +943,16 @@ function Gp(t, e = We()) {
     type: y.Chart,
     id: e,
     colorMatch: !0,
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     axes: ft(t, y.ScatterSeries),
@@ -965,10 +965,10 @@ function Up(t, e) {
     version: Ye,
     type: y.Chart,
     id: We(),
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
     background: at(),
     axes: ft(t, y.HeatSeries),
@@ -1006,10 +1006,10 @@ function ls() {
     overlays: ss(),
     dataTransformationType: ee.None,
     fillSymbol: os(),
-    dataLabels: G({
+    dataLabels: _({
       text: "",
       visible: !1,
-      font: Y(z.DataLabels)
+      font: Y(j.DataLabels)
     })
   };
 }
@@ -1019,16 +1019,16 @@ function Hp(t, e = We()) {
     type: y.Chart,
     id: e,
     colorMatch: !0,
-    title: G({
+    title: _({
       text: Je(t),
       visible: !0,
-      font: Y(z.ChartTitle)
+      font: Y(j.ChartTitle)
     }),
-    subtitle: G(),
-    footer: G({
+    subtitle: _(),
+    footer: _({
       text: "",
       visible: !0,
-      font: Y(z.DescriptionText)
+      font: Y(j.DescriptionText)
     }),
     background: at(),
     axes: ft(t, y.HistogramSeries),
@@ -1101,7 +1101,7 @@ function yt(t) {
     e[r] = t[r] ?? Qt[r];
   }), e;
 }
-function pi() {
+function ci() {
   return {
     /* Specifies the size of the queries on an aggregated scatterplot, counting the number of cells per query.
     A bigger number implies fewer but slower queries. A smaller number implies more but faster queries.
@@ -1643,7 +1643,9 @@ const cs = 0, ps = "_arcgis_charts_outliers", us = "_arcgis_charts_z_score", Kp
   lastTemporalBin: "is_arcgis_charts_last_bin",
   options: {
     hideEmptySeries: !0,
+    showEmptySeries: !1,
     replaceNoValueCategoryWithZero: !0,
+    hideZeroCountCategories: !1,
     autoInverseDataLabelTextColor: !1
   },
   nullCategory: {
@@ -1890,11 +1892,11 @@ function gs(t) {
   const { arrayToSort: e, orderBy: i, sortingField: r, fieldList: n, isByFieldsChart: a, preferLabel: s } = t;
   e !== void 0 && e.length > 1 && !ae(r) && i !== void 0 && i.length > 0 && e.sort((o, d) => {
     let l = o[r];
-    s && a && typeof l == "string" && (l = Li(n, l));
+    s && a && typeof l == "string" && (l = Bi(n, l));
     let c = i.indexOf(l?.toString() ?? "");
     c === -1 && (c = i.length);
     let p = d[r];
-    s && a && typeof p == "string" && (p = Li(n, p));
+    s && a && typeof p == "string" && (p = Bi(n, p));
     let u = i.indexOf(p?.toString() ?? "");
     return u === -1 && (u = i.length), c - u;
   });
@@ -1962,7 +1964,7 @@ function ri(t) {
     Object.entries(e).forEach(([o]) => {
       if (o !== "" && o !== _e && o in e) {
         const d = {
-          [i]: Li(n, o),
+          [i]: Bi(n, o),
           [r]: e[o],
           [C.xAxisField]: o,
           [C.originalCategoryValue]: o
@@ -2007,29 +2009,29 @@ function Dr(t, e) {
     maxLineThreePlusSeriesCountTotal: h,
     maxPieChartSliceCountTotal: m,
     maxGaugeByFeaturesLimit: b
-  } = yt(e), x = q(t.series), S = t.series.length === 0 ? 1 : t.series.length, v = E(t.series);
-  switch (x) {
+  } = yt(e), S = q(t.series), x = t.series.length === 0 ? 1 : t.series.length, v = E(t.series);
+  switch (S) {
     case y.ComboLineAndBarSeries:
     case y.BarSeries:
-      S <= r && (S === 1 ? i = n : S === 2 ? i = Yt({
+      x <= r && (x === 1 ? i = n : x === 2 ? i = Yt({
         countTotal: s,
         countPerSeries: a,
-        numberOfSeries: S
-      }) : S > 2 && (i = Yt({
+        numberOfSeries: x
+      }) : x > 2 && (i = Yt({
         countTotal: d,
         countPerSeries: o,
-        numberOfSeries: S
+        numberOfSeries: x
       })));
       break;
     case y.LineSeries:
-      S <= l && (S === 1 ? i = c : S === 2 ? i = Yt({
+      x <= l && (x === 1 ? i = c : x === 2 ? i = Yt({
         countTotal: u,
         countPerSeries: p,
-        numberOfSeries: S
-      }) : S > 2 && (i = Yt({
+        numberOfSeries: x
+      }) : x > 2 && (i = Yt({
         countTotal: h,
         countPerSeries: f,
-        numberOfSeries: S
+        numberOfSeries: x
       })));
       break;
     case y.PieSeries:
@@ -2044,7 +2046,7 @@ function Dr(t, e) {
     // handled through the number of bins
     case y.BoxPlotSeries:
   }
-  return (v === g.BarAndLineNoAggregation || v === g.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / S)), i;
+  return (v === g.BarAndLineNoAggregation || v === g.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / x)), i;
 }
 function er(t, e) {
   let i = t;
@@ -2134,7 +2136,7 @@ function yu(t) {
     const { series: n } = e, a = q(n), s = E(n), o = Ke(e), d = st({
       seriesConfig: o,
       queryObject: i
-    }), c = W(i)?.renderer;
+    }), c = k(i)?.renderer;
     switch (c?.type) {
       case fe.Simple:
         r = a === y.HistogramSeries || a === y.ScatterSeries || s === g.BarAndLineMonoField || s === g.BoxPlotMonoField || s === g.BoxPlotMultiFields || s === g.BoxPlotMonoFieldAndCategory || s === g.BarAndLineNoAggregation && n.length === 1 && !d;
@@ -2198,15 +2200,15 @@ function Os(t) {
       const { color: f, label: h } = p;
       let m;
       Array.isArray(f) && f?.length === 4 ? m = f : f && "toRgba" in f && (m = f.toRgba());
-      let b = !1, x = !0;
+      let b = !1, S = !0;
       switch (d) {
         case y.BarSeries:
         case y.LineSeries:
         case y.ComboLineAndBarSeries:
         case y.RadarSeries:
           if (r !== g.BarAndLineFromFields) {
-            const S = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === u);
-            S !== void 0 && "y" in S ? u = [S.y].flat()[0] : u = "";
+            const x = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === u);
+            x !== void 0 && "y" in x ? u = [x.y].flat()[0] : u = "";
           }
           b = r !== g.BarAndLineFromFields || u === n[C.originalCategoryValue];
           break;
@@ -2214,13 +2216,13 @@ function Os(t) {
           b = r === g.PieFromFields && u === n[C.originalCategoryValue];
           break;
         case y.BoxPlotSeries:
-          r === g.BoxPlotMonoField || r === g.BoxPlotMonoFieldAndCategory ? b = u === i[0].y : u && (r === g.BoxPlotMultiFields || r === g.BoxPlotMultiFieldsAndCategory) && (b = i.map((v) => v.y).flat().includes(u)), x = !1;
+          r === g.BoxPlotMonoField || r === g.BoxPlotMonoFieldAndCategory ? b = u === i[0].y : u && (r === g.BoxPlotMultiFields || r === g.BoxPlotMultiFieldsAndCategory) && (b = i.map((v) => v.y).flat().includes(u)), S = !1;
           break;
       }
       b && m && (s = {
         type: X.SMS,
         color: m,
-        label: x && h ? h : void 0
+        label: S && h ? h : void 0
       }, l != null && (s.outline = l), Nr({
         dataItem: n,
         symbolField: r === g.BarAndLineFromFields || r === g.PieFromFields ? C.rendererSymbolField : `${C.rendererSymbolField}_${u}`,
@@ -2270,9 +2272,9 @@ function Ms(t) {
   const { chartRenderer: e, queryObject: i } = t, r = e !== void 0 ? {
     // TODO: find a better way to copy the layer. For now it's all right as the information we need are not lost with the spread operator
     // eslint-disable-next-line @typescript-eslint/no-misused-spread
-    ...W(i),
+    ...k(i),
     renderer: xr.fromJSON(e)
-  } : W(i);
+  } : k(i);
   return new ma({
     layer: r
   });
@@ -2309,7 +2311,7 @@ async function Rs(t) {
           chartSubType: s,
           rendererType: n,
           dataItem: i
-        }), x = be({
+        }), S = be({
           where: m.query?.where,
           normalize: !0,
           keepSurroundingQuotes: !1,
@@ -2317,11 +2319,11 @@ async function Rs(t) {
         });
         h.set(b, {
           ...i,
-          [o]: x
+          [o]: S
         });
       }
     }) : e[0].type === y.HeatSeries && n === fe.ClassBreaks ? h.set(C.rendererSymbolField, {
-      [j.valueField]: i[j.valueField]
+      [V.valueField]: i[V.valueField]
     }) : h.set(
       q(e) === y.HistogramSeries ? C.rendererSymbolFieldForHistogram : C.rendererSymbolField,
       {
@@ -2332,26 +2334,26 @@ async function Rs(t) {
     try {
       const m = Array.from(h.entries()), b = d.clone();
       b.layer = d.layer;
-      const x = r?.uniqueValueInfos;
-      for (let S = 0; S < m.length; S += 1) {
-        const [v, F] = m[S];
+      const S = r?.uniqueValueInfos;
+      for (let x = 0; x < m.length; x += 1) {
+        const [v, F] = m[x];
         if (tr({
           mode: "encode",
           x: f,
           splitByField: o,
           attributes: F
-        }), l && l.length > 0 && Object.keys(F).forEach((T) => {
-          l.includes(T) || delete F[T];
+        }), l && l.length > 0 && Object.keys(F).forEach((w) => {
+          l.includes(w) || delete F[w];
         }), b.attributes = F, c?.has(JSON.stringify(F)))
           p = c.get(JSON.stringify(F));
         else {
-          if (p = (await vi.getDisplayedSymbol(b))?.toJSON(), p != null) {
+          if (p = (await xi.getDisplayedSymbol(b))?.toJSON(), p != null) {
             if (p.color === void 0) {
-              const A = (await vi.getDisplayedColor(b))?.toJSON();
+              const A = (await xi.getDisplayedColor(b))?.toJSON();
               A && (p.color = A.length === 4 ? A : [...A, 255]);
             }
-            const T = await vi.getLegendLabel(b);
-            T != null && T !== "" && (p.label = T, p.uniqueValue = x?.find((A) => A.label === T)?.value ?? void 0);
+            const w = await xi.getLegendLabel(b);
+            w != null && w !== "" && (p.label = w, p.uniqueValue = S?.find((A) => A.label === w)?.value ?? void 0);
           }
           c?.set(JSON.stringify(F), p);
         }
@@ -2455,13 +2457,13 @@ function gu(t, e) {
   const r = q(t?.series), n = q(e?.series);
   return r && r !== n && (i = r === y.ComboLineAndBarSeries && (n === y.BarSeries || n === y.LineSeries) || n === y.ComboLineAndBarSeries && (r === y.BarSeries || r === y.LineSeries) || r === y.BarSeries && n === y.LineSeries || r === y.LineSeries && n === y.BarSeries), i;
 }
-function Ii(t, e) {
+function Ti(t, e) {
   return t !== void 0 && e !== void 0 && e > 0;
 }
 function bu(t) {
   const { chartConfig: e, queryObject: i, chartData: r } = t;
   let n = [];
-  const a = E(e.series), s = Pr(e), o = W(i), d = e.chartRenderer ?? o?.renderer?.toJSON();
+  const a = E(e.series), s = Pr(e), o = k(i), d = e.chartRenderer ?? o?.renderer?.toJSON();
   return n = e.series.map((l, c) => {
     const p = q([l]);
     let u;
@@ -2474,7 +2476,7 @@ function bu(t) {
     })?.color : u === void 0 && (u = Be({ colorIndex: c }))), u;
   }).filter((l) => l !== void 0), n;
 }
-function Ai(t) {
+function Ii(t) {
   return t !== g.PieNoAggregation && t !== g.BarAndLineNoAggregation && t !== g.BarAndLineSplitByNoAggregation;
 }
 function Vs(t) {
@@ -2490,7 +2492,7 @@ function js(t) {
 function Su() {
   return `{name} {${C.originalCategoryValue}} {dateY} {valueX} {dateX} {valueY}`;
 }
-const P = {
+const O = {
   Min: "min",
   FirstQuartile: "first_quartile",
   Median: "median",
@@ -2595,7 +2597,7 @@ function _s(t) {
   }
   return e;
 }
-function Bi(t) {
+function Ai(t) {
   let e = t, i = "";
   t.startsWith("'") && t.endsWith("'") && (e = t.slice(1, -1), i = "'"), e = e.replace(/'/gu, "''");
   let r = "";
@@ -2625,31 +2627,31 @@ function Ge(t) {
       maxLineUniqueSeriesCountTotal: h,
       maxLineTwoSeriesCountPerSeries: m,
       maxLineTwoSeriesCountTotal: b,
-      maxLineThreePlusSeriesCountPerSeries: x,
-      maxLineThreePlusSeriesCountTotal: S,
+      maxLineThreePlusSeriesCountPerSeries: S,
+      maxLineThreePlusSeriesCountTotal: x,
       maxPieChartSliceCountTotal: v,
       maxGaugeByFeaturesLimit: F,
-      maxBoxPlotSeriesCount: w,
-      maxBoxUniqueSeriesCountTotal: T,
+      maxBoxPlotSeriesCount: T,
+      maxBoxUniqueSeriesCountTotal: w,
       maxBoxTwoSeriesCountTotal: A,
-      maxBoxTwoSeriesCountPerSeries: O,
-      maxBoxThreePlusSeriesCountTotal: L,
-      maxBoxThreePlusSeriesCountPerSeries: M,
-      maxHeatChartCellLimit: B
+      maxBoxTwoSeriesCountPerSeries: P,
+      maxBoxThreePlusSeriesCountTotal: D,
+      maxBoxThreePlusSeriesCountPerSeries: B,
+      maxHeatChartCellLimit: M
     } = yt(n);
     switch (r) {
       case y.BarSeries:
       case y.ComboLineAndBarSeries:
         {
-          const N = e / i;
-          i <= o ? i === 0 ? s = !0 : i === 1 ? s = e <= d : i === 2 ? s = e <= c && N <= l : i > 2 && (s = e <= u && N <= p) : s = !1;
+          const L = e / i;
+          i <= o ? i === 0 ? s = !0 : i === 1 ? s = e <= d : i === 2 ? s = e <= c && L <= l : i > 2 && (s = e <= u && L <= p) : s = !1;
         }
         break;
       case y.LineSeries:
       case y.RadarSeries:
         {
-          const N = e / i;
-          i <= f ? i === 0 ? s = !0 : i === 1 ? s = e <= h : i === 2 ? s = e <= b && N <= m : i > 2 && (s = e <= S && N <= x) : s = !1;
+          const L = e / i;
+          i <= f ? i === 0 ? s = !0 : i === 1 ? s = e <= h : i === 2 ? s = e <= b && L <= m : i > 2 && (s = e <= x && L <= S) : s = !1;
         }
         break;
       case y.PieSeries:
@@ -2657,12 +2659,12 @@ function Ge(t) {
         break;
       case y.BoxPlotSeries:
         {
-          const N = e / i;
-          i <= w ? i === 0 ? s = !0 : i === 1 ? s = e <= T : i === 2 ? s = e <= A && N <= O : i > 2 && (s = e <= L && N <= M) : s = !1;
+          const L = e / i;
+          i <= T ? i === 0 ? s = !0 : i === 1 ? s = e <= w : i === 2 ? s = e <= A && L <= P : i > 2 && (s = e <= D && L <= B) : s = !1;
         }
         break;
       case y.HeatSeries:
-        s = e <= B;
+        s = e <= M;
         break;
       case y.GaugeSeries:
         s = e <= F;
@@ -2671,7 +2673,7 @@ function Ge(t) {
   }
   return s;
 }
-function Li(t = [], e) {
+function Bi(t = [], e) {
   const i = t.find((r) => r.name === e)?.alias;
   return i !== "" ? i ?? e : e;
 }
@@ -2738,7 +2740,7 @@ function ei(t, e) {
   const i = e.find((n) => n in t);
   return { isInItem: i !== void 0, expr: i };
 }
-function ui(t) {
+function pi(t) {
   return ei(t, Tr);
 }
 function wu(t, e) {
@@ -2984,12 +2986,12 @@ function qt(t, e) {
 }
 function $u(t) {
   return ue(
-    W(t)
+    k(t)
   )?.sourceJSON?.advancedQueryCapabilities.supportedOperationsWithCacheHint.includes("queryBins");
 }
 function io(t) {
   let e = !1;
-  const r = ue(W(t))?.sourceJSON;
+  const r = ue(k(t))?.sourceJSON;
   if (r) {
     const n = r.queryBinsCapabilities?.supportsFixedIntervalBin, a = r.queryBinsCapabilities?.supportedStatisticTypes, s = [I.Maximum, I.Count].every(
       (o) => a?.includes(o.toUpperCase()) || a?.includes(o.toLowerCase())
@@ -3002,7 +3004,7 @@ function qu(t) {
   let e;
   return Ee(t) ? e = t.layer : e = t, e;
 }
-function W(t) {
+function k(t) {
   let e;
   return Ee(t) ? e = t.layer : e = t, e;
 }
@@ -3015,7 +3017,7 @@ function Eu(t) {
   const { chartConfig: e, queryObject: i } = t;
   let r;
   if (i) {
-    const n = W(i);
+    const n = k(i);
     Js(n) ? r = {
       id: n.id,
       layerType: "ArcGISImageServiceLayer"
@@ -3056,17 +3058,17 @@ function no(t) {
 async function ao(t) {
   const { queryObject: e, queryConfig: i, outputFormat: r, dataFormat: n, outAnalytics: a } = t, { where: s, geometry: o, distance: d, units: l, timeExtent: c } = i;
   let p;
-  const u = W(e), f = ue(u);
+  const u = k(e), f = ue(u);
   if (f) {
-    const m = { where: Z([s, f.definitionExpression]) }, b = { query: m }, x = Ot(o)?.extent?.toJSON();
-    if (x !== void 0) {
-      const v = no(l), { xmin: F, ymin: w, xmax: T, ymax: A } = x;
-      m.geometryType = "esriGeometryEnvelope", m.geometry = `${F},${w},${T},${A}`, d !== void 0 && (m.distance = d.toString()), v !== void 0 && (m.units = v, o?.spatialReference?.wkid != null && (m.inSR = o.spatialReference.wkid.toString()));
+    const m = { where: Z([s, f.definitionExpression]) }, b = { query: m }, S = Ot(o)?.extent?.toJSON();
+    if (S !== void 0) {
+      const v = no(l), { xmin: F, ymin: T, xmax: w, ymax: A } = S;
+      m.geometryType = "esriGeometryEnvelope", m.geometry = `${F},${T},${w},${A}`, d !== void 0 && (m.distance = d.toString()), v !== void 0 && (m.units = v, o?.spatialReference?.wkid != null && (m.inSR = o.spatialReference.wkid.toString()));
     }
     c && (m.time = `${c[0]},${c[1]}`);
-    const S = `${f.url}/${f.layerId}/queryAnalytic?f=${r}&dataFormat=${n}&outAnalytics=${a}`;
+    const x = `${f.url}/${f.layerId}/queryAnalytic?f=${r}&dataFormat=${n}&outAnalytics=${a}`;
     try {
-      p = (await ti(S, b)).data?.features?.[0]?.attributes;
+      p = (await ti(x, b)).data?.features?.[0]?.attributes;
     } catch (v) {
       const F = (await $e(
         Ae(document.documentElement).t9nLocale,
@@ -3088,7 +3090,7 @@ function _r(t, e) {
 async function so(t) {
   const { chartConfig: e, queryObject: i, queryConfig: r, errorStrings: n, options: a } = t;
   let s;
-  const o = W(i), d = to(o);
+  const o = k(i), d = to(o);
   if (d && i && "queryAttributeBins" in i) {
     const { x: l, y: c, xTemporalBinning: p, yTemporalBinning: u } = e.series[0], { outTimeZone: f, firstDayOfWeek: h, includeLeapDay: m } = e, b = xo({
       queryObject: i,
@@ -3104,8 +3106,8 @@ async function so(t) {
     });
     try {
       s = await i.queryAttributeBins(b);
-    } catch (x) {
-      throw new pe(oe.QueryFeaturesError, n.errors.queryError, x);
+    } catch (S) {
+      throw new pe(oe.QueryFeaturesError, n.errors.queryError, S);
     }
   }
   if (!d)
@@ -3157,7 +3159,7 @@ async function lo(t) {
 async function co(t) {
   const { queryConfig: e, x: i, queryObject: r, chartSubType: n, isGaugeByFeature: a } = t;
   let s;
-  const o = W(r), { idField: d, isTraditionalTypeOID: l } = Oe(o), c = Vi({ queryObject: r, queryConfig: e });
+  const o = k(r), { idField: d, isTraditionalTypeOID: l } = Oe(o), c = Vi({ queryObject: r, queryConfig: e });
   c.outFields = a || n === g.PieNoAggregation || n === g.BarAndLineNoAggregation || n === g.BarAndLineSplitByNoAggregation ? [l ? d : "*"] : [i], c.outFields?.[0] === i && (c.returnDistinctValues = !0);
   try {
     s = await r.queryFeatureCount(c);
@@ -3211,7 +3213,7 @@ async function Vt(t) {
 async function Gr(t) {
   const { queryObject: e, queryConfig: i, returnUniqueIdsOnly: r, abortKey: n } = t;
   let a = [];
-  const s = W(e), o = Co(s), d = Vi({
+  const s = k(e), o = Co(s), d = Vi({
     queryObject: e,
     queryConfig: i,
     maxRecordCountFactor: o
@@ -3258,13 +3260,13 @@ async function po(t) {
 async function Le(t) {
   const { queryObject: e, queryConfig: i, returnUniqueIdsOnly: r, featureCount: n, noBatch: a, abortKey: s } = t;
   let o = [];
-  const d = W(e), l = n ?? 1, c = Hr(d);
+  const d = k(e), l = n ?? 1, c = Hr(d);
   if (a !== !0 && l > c && d?.capabilities?.query.supportsPagination) {
     let p = 0, u = 0;
     const f = Math.ceil(l / c), h = Math.ceil(f / Q.maxParallelRequests), m = [];
     for (; u < h; ) {
       p = u * Q.maxParallelRequests * c;
-      const x = po({
+      const S = po({
         queryConfig: { ...i, start: p },
         queryObject: e,
         maxRecords: c,
@@ -3272,7 +3274,7 @@ async function Le(t) {
         returnUniqueIdsOnly: r,
         abortKey: s
       });
-      m.push(x), u += 1;
+      m.push(S), u += 1;
     }
     o = (await Promise.all(m)).flat();
   } else (Number.isNaN(l) || l >= 0) && (o = await Gr({
@@ -3313,7 +3315,7 @@ async function fo(t) {
     const { unit: d } = a;
     try {
       if (d) {
-        const l = ue(W(e)) ?? void 0;
+        const l = ue(k(e)) ?? void 0;
         if (o = qt(l, r), o && e && "queryAttributeBins" in e) {
           const c = bo({
             queryObject: e,
@@ -3373,7 +3375,7 @@ function Z(t, e) {
 function ho(t, e) {
   let i = e;
   if (t !== void 0) {
-    const r = W(t), n = ue(r)?.timeExtent;
+    const r = k(t), n = ue(r)?.timeExtent;
     n?.start != null && n?.end != null && (i = [n.start.valueOf(), n.end.valueOf()]);
   }
   return i;
@@ -3401,15 +3403,15 @@ function Ot(t) {
 function Qr(t) {
   return t === void 0 ? ["*"] : Array.from(new Set(t));
 }
-function fi(t) {
-  const { queryType: e, queryObject: i, queryConfig: r } = t, { where: n, outStatistics: a, geometry: s, distance: o, units: d, timeExtent: l, returnDistinctValues: c } = r ?? {}, p = W(i);
+function ui(t) {
+  const { queryType: e, queryObject: i, queryConfig: r } = t, { where: n, outStatistics: a, geometry: s, distance: o, units: d, timeExtent: l, returnDistinctValues: c } = r ?? {}, p = k(i);
   let f = ue(p)?.createQuery() ?? new la(), h;
-  const m = yi(p).idFields;
+  const m = fi(p).idFields;
   if (e === "AttributeBinsQuery" && r?.objectIds?.[0] !== void 0 && m && (h = `${m} IN (${r.objectIds.join(",")})`), e === "AttributeBinsQuery" && (f = new oa(f.toJSON())), f.where = Z([f.where, n, h]), "returnDistinctValues" in f && (f.returnDistinctValues = c ?? !1), a !== void 0) {
-    const x = ro(p);
+    const S = ro(p);
     f.outStatistics = a.filter(
-      (S) => S.statisticType !== I.EnvelopeAggregate || x
-    ).map((S) => da.fromJSON(S));
+      (x) => x.statisticType !== I.EnvelopeAggregate || S
+    ).map((x) => da.fromJSON(x));
   }
   const b = Ot(s);
   return b !== void 0 && (f.geometry = b, r?.spatialRelationship && (f.spatialRelationship = r.spatialRelationship), zr(p) && (o !== void 0 && (f.distance = o), d !== void 0 && (f.units = d))), l && (f.timeExtent = new Sr({
@@ -3430,12 +3432,12 @@ function go(t) {
   return e;
 }
 function bo(t) {
-  const { queryObject: e, queryConfig: i, temporalBinning: r, dateField: n, splitByField: a } = t, s = W(e), d = Fe(e).find((S) => S.name === n)?.type, l = fi({
+  const { queryObject: e, queryConfig: i, temporalBinning: r, dateField: n, splitByField: a } = t, s = k(e), d = Fe(e).find((x) => x.name === n)?.type, l = ui({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i
-  }), { unit: c, size: p, timeAggregationType: u, start: f, end: h, offset: m, outTimeZone: b } = r, x = Ur(n);
-  if (l.lowerBoundaryAlias = x.lowerBoundaryAlias, l.upperBoundaryAlias = x.upperBoundaryAlias, d !== H.DateOnly && (l.outTimeZone = b ?? Intl.DateTimeFormat().resolvedOptions().timeZone), l.binParameters = {
+  }), { unit: c, size: p, timeAggregationType: u, start: f, end: h, offset: m, outTimeZone: b } = r, S = Ur(n);
+  if (l.lowerBoundaryAlias = S.lowerBoundaryAlias, l.upperBoundaryAlias = S.upperBoundaryAlias, d !== H.DateOnly && (l.outTimeZone = b ?? Intl.DateTimeFormat().resolvedOptions().timeZone), l.binParameters = {
     type: "date",
     field: n,
     interval: { unit: c, value: p },
@@ -3545,7 +3547,7 @@ function xo(t) {
     includeLeapDay: d,
     configTimeZone: l,
     options: c
-  } = t, p = Fe(e), u = p.find((w) => w.name === r)?.type, f = p.find((w) => w.name === n)?.type, h = fi({
+  } = t, p = Fe(e), u = p.find((T) => T.name === r)?.type, f = p.find((T) => T.name === n)?.type, h = ui({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i
@@ -3554,9 +3556,9 @@ function xo(t) {
     type: "fixed-interval",
     interval: 1
   }, h.lowerBoundaryAlias = Q.heatChartLowerBoundaryAlias, h.upperBoundaryAlias = Q.heatChartUpperBoundaryAlias, u !== H.DateOnly) {
-    const w = Intl.DateTimeFormat().resolvedOptions().timeZone, T = c?.view && "timeZone" in c?.view ? c.view.timeZone : void 0;
-    let A = l ?? T ?? w;
-    A === "unknown" ? A = "Etc/UTC" : A === "system" && (A = w), h.outTimeZone = A;
+    const T = Intl.DateTimeFormat().resolvedOptions().timeZone, w = c?.view && "timeZone" in c?.view ? c.view.timeZone : void 0;
+    let A = l ?? w ?? T;
+    A === "unknown" ? A = "Etc/UTC" : A === "system" && (A = T), h.outTimeZone = A;
   }
   o !== void 0 && (h.binParameters.firstDayOfWeek = o);
   const m = rr({
@@ -3565,8 +3567,8 @@ function xo(t) {
     xOrYFieldType: u,
     addIntervalStatement: !1,
     includeLeapDay: d
-  }), { field: b, expression: x, start: S, end: v } = m;
-  b ? h.binParameters.field = b : x && (h.binParameters.expression = x, h.binParameters.expressionValueType = "integer", h.binParameters.type === "fixed-interval" && (S !== void 0 && (h.binParameters.start = S), v !== void 0 && (h.binParameters.end = v)));
+  }), { field: b, expression: S, start: x, end: v } = m;
+  b ? h.binParameters.field = b : S && (h.binParameters.expression = S, h.binParameters.expressionValueType = "integer", h.binParameters.type === "fixed-interval" && (x !== void 0 && (h.binParameters.start = x), v !== void 0 && (h.binParameters.end = v)));
   const F = rr({
     temporalBinning: s,
     xOrY: n,
@@ -3582,7 +3584,7 @@ function xo(t) {
   }), h;
 }
 function vo(t) {
-  const { queryObject: e, queryConfig: i, xStep: r, xMin: n, xMax: a, x: s, y: o, yStep: d } = t, l = fi({
+  const { queryObject: e, queryConfig: i, xStep: r, xMin: n, xMax: a, x: s, y: o, yStep: d } = t, l = ui({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i
@@ -3602,9 +3604,9 @@ function vo(t) {
   }, l;
 }
 function Vi(t) {
-  const { queryObject: e, queryConfig: i, maxRecordCountFactor: r } = t, { groupByFieldsForStatistics: n, orderByFields: a, gdbVersion: s, start: o, num: d, outFields: l } = i ?? {}, c = fi({ queryType: "Query", queryObject: e, queryConfig: i });
+  const { queryObject: e, queryConfig: i, maxRecordCountFactor: r } = t, { groupByFieldsForStatistics: n, orderByFields: a, gdbVersion: s, start: o, num: d, outFields: l } = i ?? {}, c = ui({ queryType: "Query", queryObject: e, queryConfig: i });
   c.returnGeometry = !1;
-  const p = W(e);
+  const p = k(e);
   return c.outFields = Qr(l), c.groupByFieldsForStatistics = n ?? c.groupByFieldsForStatistics, c.orderByFields = a ?? [], c.objectIds = i?.objectIds, r !== void 0 && (c.maxRecordCountFactor = r), s !== void 0 && s !== "" && (c.gdbVersion = s), d !== void 0 && (c.num = d), o !== void 0 && (c.start = o, c.num = c.num ?? Hr(p)), c;
 }
 function Co(t) {
@@ -3624,7 +3626,7 @@ const Vu = {
   AdditionalProperties: "additionalProperties",
   Enum: "enum",
   AnyOf: "anyOf"
-}, V = {
+}, W = {
   BadData: "badData",
   EmptyDataSet: "emptyDataSet",
   InvalidConfig: "invalidConfig",
@@ -3659,43 +3661,43 @@ function wo(t) {
   return e;
 }
 async function To(t) {
-  const { queryConfig: e, chartConfig: i, queryObject: r, options: n, abortKey: a } = t, s = i.series[0], { x: o, dataTransformationType: d, binCount: l } = s, c = W(r);
+  const { queryConfig: e, chartConfig: i, queryObject: r, options: n, abortKey: a } = t, s = i.series[0], { x: o, dataTransformationType: d, binCount: l } = s, c = k(r);
   if (!de(c))
     throw new pe(oe.LayerNotSupported);
   c.loaded || await c.load();
-  const p = await c.generateRasterInfo(c.rasterFunction), u = n?.view, f = Ot(e.geometry) ?? c.fullExtent, h = p.bandCount === 1 ? 0 : p.bandInfos.findIndex((x) => x.name === o);
+  const p = await c.generateRasterInfo(c.rasterFunction), u = n?.view, f = Ot(e.geometry) ?? c.fullExtent, h = p.bandCount === 1 ? 0 : p.bandInfos.findIndex((S) => S.name === o);
   let m, b;
   if (u === void 0 && (d === void 0 || d === ee.None) && l && Array.isArray(p.histograms) && p.histograms.length > h && p.histograms[h].size % l === 0 && Array.isArray(p.statistics) && p?.statistics?.length > h)
     m = p.histograms[h], b = p.statistics[h];
   else {
-    let x, S, v;
+    let S, x, v;
     if (u)
-      x = u.resolution, S = u.resolution, v = u.spatialReference;
+      S = u.resolution, x = u.resolution, v = u.spatialReference;
     else {
-      const A = Fo, O = 2, L = p.width, M = p.height, B = Math.max(
+      const A = Fo, P = 2, D = p.width, B = p.height, M = Math.max(
         0,
-        Math.ceil(Math.log(Math.max(L, M) / A) / Math.log(O))
-      ), N = O ** B;
-      x = p.pixelSize.x * N, S = p.pixelSize.y * N, v = c.spatialReference;
+        Math.ceil(Math.log(Math.max(D, B) / A) / Math.log(P))
+      ), L = P ** M;
+      S = p.pixelSize.x * L, x = p.pixelSize.y * L, v = c.spatialReference;
     }
     const F = new Aa({
-      x,
-      y: S,
+      x: S,
+      y: x,
       spatialReference: v
-    }), w = wo(d), T = await ea(
+    }), T = wo(d), w = await ea(
       c,
       {
         bandIds: [h],
         geometry: f,
         histogramSize: l ?? void 0,
         pixelSize: F,
-        transformType: w
+        transformType: T
       },
       {
         signal: a !== void 0 ? et.get(a)?.signal : void 0
       }
     );
-    b = T.statistics[0], m = T.histograms[0];
+    b = w.statistics[0], m = w.histograms[0];
   }
   return { histogram: m, statistics: b };
 }
@@ -3756,18 +3758,18 @@ async function Ao(t) {
       }
     } : s = {
       valid: !1,
-      invalidType: V.EmptyDataSet
+      invalidType: W.EmptyDataSet
     };
   } else
     s = {
       valid: !1,
-      invalidType: V.BadData
+      invalidType: W.BadData
     };
   return s;
 }
 const Bo = (t) => t.series[0].x;
 function Lo(t) {
-  const { chartConfig: e, layer: i, selectionDataItems: r } = t, n = Di(i, Bo(e)), s = r.map((l) => [
+  const { chartConfig: e, layer: i, selectionDataItems: r } = t, n = Li(i, Bo(e)), s = r.map((l) => [
     l.minValue,
     l.maxValue
   ]).reduce((l, c, p) => {
@@ -3847,7 +3849,7 @@ async function Po(t) {
   const { queryObject: e } = t;
   let i = !1;
   if (!de(e)) {
-    const r = eo(e), n = W(e), a = ue(n);
+    const r = eo(e), n = k(e), a = ue(n);
     if (r && a?.url !== void 0 && a.url !== null) {
       const s = `${a.url}/${a.layerId}?f=json`;
       try {
@@ -3886,25 +3888,25 @@ async function $o(t) {
     fieldValue: h,
     slopePropertyList: m,
     interceptPropertyList: b,
-    r2PropertyList: x
-  } = Do, S = `[{"${u}": "${f}", "${h}":"${s},${o}"}]`, v = await ao({
+    r2PropertyList: S
+  } = Do, x = `[{"${u}": "${f}", "${h}":"${s},${o}"}]`, v = await ao({
     queryObject: i,
     queryConfig: n,
     outputFormat: p,
     dataFormat: c,
-    outAnalytics: S
+    outAnalytics: x
   });
   if (v !== void 0) {
-    let F = Number.NaN, w = Number.NaN;
-    const { expr: T } = ei(v, m), { expr: A } = ei(v, b), { expr: O } = ei(v, x);
-    T !== void 0 && Number.isFinite(v[T]) && (F = v[T]), A !== void 0 && Number.isFinite(v[A]) && (w = v[A]), O !== void 0 && Number.isFinite(v[O]) && (d = v[O]);
-    const { dataContextXMinField: L, dataContextXMaxField: M, dataContextYMinField: B, dataContextYMaxField: N } = C.scatterplotAggregationFields, R = e.get(L) ?? Number.NaN, k = e.get(M) ?? Number.NaN, _ = e.get(B) ?? Number.NaN, D = e.get(N) ?? Number.NaN, we = (k - R) / 100;
+    let F = Number.NaN, T = Number.NaN;
+    const { expr: w } = ei(v, m), { expr: A } = ei(v, b), { expr: P } = ei(v, S);
+    w !== void 0 && Number.isFinite(v[w]) && (F = v[w]), A !== void 0 && Number.isFinite(v[A]) && (T = v[A]), P !== void 0 && Number.isFinite(v[P]) && (d = v[P]);
+    const { dataContextXMinField: D, dataContextXMaxField: B, dataContextYMinField: M, dataContextYMaxField: L } = C.scatterplotAggregationFields, R = e.get(D) ?? Number.NaN, G = e.get(B) ?? Number.NaN, z = e.get(M) ?? Number.NaN, N = e.get(L) ?? Number.NaN, we = (G - R) / 100;
     let Pe = R - we, U = Number.NaN;
-    for (; !(U >= _ && U <= D) && Pe <= k; )
-      Pe += we, U = F * Pe + w;
-    let Me = k + we, Se = Number.NaN;
-    for (; !(Se >= _ && Se <= D) && Me >= R; )
-      Me -= we, Se = F * Me + w;
+    for (; !(U >= z && U <= N) && Pe <= G; )
+      Pe += we, U = F * Pe + T;
+    let Me = G + we, Se = Number.NaN;
+    for (; !(Se >= z && Se <= N) && Me >= R; )
+      Me -= we, Se = F * Me + T;
     l = [
       { [s]: Pe, [o]: U },
       { [s]: Me, [o]: Se }
@@ -3996,7 +3998,7 @@ function zo(t) {
   const { chartConfig: e, layer: i, selectionDataItems: r } = t;
   let n;
   if (r.length > 0) {
-    const { x: a, y: s } = jo(e), o = Di(i, a), d = Di(i, s);
+    const { x: a, y: s } = jo(e), o = Li(i, a), d = Li(i, s);
     if (o !== void 0 && d !== void 0) {
       let l = r[0]?.[a], c = r[0]?.[s], p = l, u = c;
       r.forEach((f) => {
@@ -4110,7 +4112,7 @@ const tn = qi(
   },
   (t) => JSON.stringify(t, Object.keys(t).sort())
   // stringify with sorted keys
-), Di = (t, e) => {
+), Li = (t, e) => {
   let i;
   const r = t.serviceRasterInfo?.bandInfos;
   if (e && r && r.length > 0) {
@@ -4147,7 +4149,7 @@ async function Ho(t) {
   let s = [];
   if (e !== void 0)
     try {
-      const o = W(e);
+      const o = k(e);
       o.loaded || await o.load();
       const l = {
         geometry: Ot(i.geometry) ?? o.fullExtent,
@@ -4246,13 +4248,13 @@ async function Hu(t) {
   if (s)
     o = await Go(t);
   else {
-    const d = W(e), l = ue(d);
+    const d = k(e), l = ue(d);
     l !== void 0 ? n && i !== void 0 && !l.isTable ? (l.outFields = ["*"], o = await i.whenLayerView(l)) : o = e : r?.iLayer && r.iLayer?.layerType === "ArcGISFeatureLayer" && (o = await ji(r.iLayer, a));
   }
   return o;
 }
 function Fe(t, e) {
-  const i = W(t);
+  const i = k(t);
   let r = [];
   if (i !== void 0) {
     const n = e === !0 && i?.popupTemplate?.fieldInfos !== void 0;
@@ -4272,7 +4274,7 @@ function Fe(t, e) {
 function nn(t, e = []) {
   return e.find((i) => i.name === t);
 }
-function yi(t) {
+function fi(t) {
   let e, i = !1;
   if (de(t))
     e = [Zr(t)];
@@ -4287,7 +4289,7 @@ function Oe(t) {
   if (de(t))
     e = Zr(t);
   else if (t) {
-    const r = yi(t);
+    const r = fi(t);
     i = r.isTraditionalTypeOID, r.idFields && (e = r.idFields[0]);
   }
   return { idField: e, isTraditionalTypeOID: i };
@@ -4325,21 +4327,21 @@ function Ko(t) {
 function Ku(t) {
   return t.filter((e) => Lt(e)).map((e) => e.name);
 }
-function Ni(t, e) {
+function Di(t, e) {
   let i;
   if (e) {
-    const n = W(t).getFieldDomain(e);
+    const n = k(t).getFieldDomain(e);
     n instanceof pa && (i = n);
   }
   return i;
 }
-function Oi(t, e) {
+function Ni(t, e) {
   let i = e?.getName(t?.toString()) ?? e?.getName(t) ?? e?.getName(Number(t));
   return i === null && (i = void 0), i;
 }
 function nr(t) {
   const { queryObject: e, fieldName: i, fieldValue: r } = t;
-  return de(e) ? void 0 : Oi(r, Ni(e, i));
+  return de(e) ? void 0 : Ni(r, Di(e, i));
 }
 async function an(t) {
   let e = [];
@@ -4397,15 +4399,15 @@ function on(t) {
     spatialRelationship: m
   } = o ?? {}, {
     where: b,
-    gdbVersion: x,
-    timeExtent: S,
+    gdbVersion: S,
+    timeExtent: x,
     geometry: v,
     distance: F,
-    units: w,
-    objectIds: T,
+    units: T,
+    objectIds: w,
     spatialRelationship: A
-  } = r ?? {}, O = s[0], { query: L } = O, { where: M } = L ?? {}, B = E(s), N = { ...L };
-  return N.where = Z([d, b]), B !== g.BarAndLineSplitBy && B !== g.BoxPlotMonoFieldAndSplitBy && B !== g.BoxPlotMonoFieldAndCategoryAndSplitBy && B !== g.BoxPlotMultiFieldsAndSplitBy && B !== g.BarAndLineSplitByNoAggregation && (N.where = Z([N.where, M])), i.orderOptions?.orderByFields !== void 0 && (N.orderByFields = i.orderOptions.orderByFields), N.gdbVersion = x ?? l, N.timeExtent = ho(e, S ?? c), N.geometry = de(e) ? Qo({
+  } = r ?? {}, P = s[0], { query: D } = P, { where: B } = D ?? {}, M = E(s), L = { ...D };
+  return L.where = Z([d, b]), M !== g.BarAndLineSplitBy && M !== g.BoxPlotMonoFieldAndSplitBy && M !== g.BoxPlotMonoFieldAndCategoryAndSplitBy && M !== g.BoxPlotMultiFieldsAndSplitBy && M !== g.BarAndLineSplitByNoAggregation && (L.where = Z([L.where, B])), i.orderOptions?.orderByFields !== void 0 && (L.orderByFields = i.orderOptions.orderByFields), L.gdbVersion = S ?? l, L.timeExtent = ho(e, x ?? c), L.geometry = de(e) ? Qo({
     queryObject: e,
     defaultGeometry: v ?? p,
     ignoreViewExtent: n,
@@ -4414,7 +4416,7 @@ function on(t) {
     queryObject: e,
     defaultGeometry: v ?? p,
     ignoreViewExtent: n
-  }), N.distance = F ?? u, N.units = w ?? f, N.objectIds = T ?? h, N.spatialRelationship = A ?? m, L?.outStatistics?.[0]?.statisticType === I.Count && (N.returnDistinctValues = L?.returnDistinctValues ?? !1), N;
+  }), L.distance = F ?? u, L.units = T ?? f, L.objectIds = w ?? h, L.spatialRelationship = A ?? m, D?.outStatistics?.[0]?.statisticType === I.Count && (L.returnDistinctValues = D?.returnDistinctValues ?? !1), L;
 }
 async function Xu(t) {
   let e = [];
@@ -4561,7 +4563,7 @@ const ef = {
   y.ComboLineAndBarSeries,
   y.RadarSeries
 ];
-function Ci(t, e) {
+function vi(t, e) {
   let i = 0;
   if (t !== e) {
     const r = t.split("."), n = e.split(".");
@@ -4585,13 +4587,13 @@ function ll(t) {
 function dl(t) {
   let e = dt.Same, i = [];
   if (ll(t) && t !== void 0) {
-    lt.sort(Ci);
-    const n = Ci(t, lt[lt.length - 1]);
+    lt.sort(vi);
+    const n = vi(t, lt[lt.length - 1]);
     if (n === 1 ? e = dt.Newer : n === -1 && (e = dt.Older), e === dt.Newer || e === dt.Same)
       i.push(t);
     else {
       for (let a = lt.length - 2; a >= 0; a -= 1)
-        if (Ci(t, lt[a]) >= 0) {
+        if (vi(t, lt[a]) >= 0) {
           i = lt.slice(a, lt.length);
           break;
         }
@@ -4617,7 +4619,7 @@ function le(t, e) {
 function be(t) {
   const { where: e, normalize: i, keepSurroundingQuotes: r, escape: n } = t;
   let a = "";
-  return e !== void 0 && e.includes("=") && (a = e.split("=").slice(1).join("=").trim(), a === "null" ? a = null : a.trim() !== "" && !Number.isNaN(Number(a)) ? a = Number(a) : i === !1 ? n === !0 && (a = Bi(a)) : a = Mr({ value: a, keepSurroundingQuotes: r, escape: n })), a;
+  return e !== void 0 && e.includes("=") && (a = e.split("=").slice(1).join("=").trim(), a === "null" ? a = null : a.trim() !== "" && !Number.isNaN(Number(a)) ? a = Number(a) : i === !1 ? n === !0 && (a = Ai(a)) : a = Mr({ value: a, keepSurroundingQuotes: r, escape: n })), a;
 }
 function Ue(t) {
   let e = !1;
@@ -4675,7 +4677,7 @@ function E(t) {
 function st(t) {
   const { seriesConfig: e, xAxisValueFormatType: i, setTimeBinningInfoWhenNotProvided: r, queryObject: n } = t;
   let a = !1;
-  if (!de(n) && !(W(n)?.fields?.find((o) => o.name === e.x)?.type === "time-only") && Ne(e) && e.binTemporalData !== !1 && i === y.DateAxisFormat) {
+  if (!de(n) && !(k(n)?.fields?.find((o) => o.name === e.x)?.type === "time-only") && Ne(e) && e.binTemporalData !== !1 && i === y.DateAxisFormat) {
     const o = E([e]);
     if (e.temporalBinning && o !== g.BarAndLineNoAggregation && o !== g.BarAndLineSplitByNoAggregation) {
       const { unit: d, size: l } = e.temporalBinning;
@@ -4831,7 +4833,7 @@ function pf(t, e) {
 }
 function uf(t, e) {
   let i, r, n, a;
-  return Ne(t.series[0]) && (i = t.series[0].temporalBinning?.unit, n = t.series[0].temporalBinning?.size), Ne(e.series[0]) && (r = e.series[0].temporalBinning?.unit, a = e.series[0].temporalBinning?.size), Ii(i, n) && !Ii(r, a);
+  return Ne(t.series[0]) && (i = t.series[0].temporalBinning?.unit, n = t.series[0].temporalBinning?.size), Ne(e.series[0]) && (r = e.series[0].temporalBinning?.unit, a = e.series[0].temporalBinning?.size), Ti(i, n) && !Ti(r, a);
 }
 function ff(t, e) {
   return t.axes?.length === 3 && e.axes?.length === 2 || t.axes?.length === 2 && e.axes?.length === 3;
@@ -4994,10 +4996,10 @@ function gn(t) {
   let e;
   const i = t?.orderOptions?.data;
   return t.series?.length > 0 && i?.orderType === ve.MultiAxes && (e = [], e.push({
-    sortingField: j.xField,
+    sortingField: V.xField,
     orderBy: i.orderByX ?? ne.Ascending
   }), e.push({
-    sortingField: i.orderByY !== void 0 ? j.yField : "",
+    sortingField: i.orderByY !== void 0 ? V.yField : "",
     orderBy: i.orderByY
   })), e;
 }
@@ -5009,7 +5011,7 @@ function bn(t) {
     if (r === ve.Category)
       r = t.series[0].x;
     else {
-      r === ve.Mean ? r = P.Average : r === ve.Median && (r = P.Median);
+      r === ve.Mean ? r = O.Average : r === ve.Median && (r = O.Median);
       const a = e === g.BoxPlotMultiFieldsAndCategory && typeof t.series[0].y == "string" ? t.series[0].y : void 0, s = le(t.series[0].query?.where), o = be({
         where: t.series[0].query?.where
       });
@@ -5061,7 +5063,7 @@ function Sn(t) {
   }));
   return s;
 }
-function Pi(t) {
+function Oi(t) {
   let e;
   const i = q(t.series);
   if (t.series?.length > 0) {
@@ -5088,7 +5090,7 @@ function wf(t) {
   const { oldConfig: e, newConfig: i, dataWasUpdated: r } = t, n = q(i.series), a = E(i.series);
   let s = !1, o = !1;
   if (a !== g.BoxPlotMonoField && a !== g.BoxPlotMonoFieldAndSplitBy && i.orderOptions?.data !== void 0) {
-    const d = Pi(e), l = Pi(i);
+    const d = Oi(e), l = Oi(i);
     if (n === y.HeatSeries) {
       const c = d ? d[0] : void 0, p = l ? l[0] : void 0, u = d ? d[1] : void 0, f = l ? l[1] : void 0;
       o = e.orderOptions?.data?.orderType !== i.orderOptions?.data?.orderType || c?.sortingField !== p?.sortingField || c?.orderBy !== p?.orderBy || u?.sortingField !== f?.sortingField || u?.orderBy !== f?.orderBy, s = o || r;
@@ -5118,7 +5120,7 @@ function Sl(t = ee.None, e) {
 }
 function xn(t, e) {
   const i = { valid: !1 };
-  return e === !0 ? i.invalidType = V.HistogramEmptyField : t === ee.Log ? i.invalidType = V.NegativeValueInLogCalculation : t === ee.Sqrt && (i.invalidType = V.NegativeValueInSqrtCalculation), i;
+  return e === !0 ? i.invalidType = W.HistogramEmptyField : t === ee.Log ? i.invalidType = W.NegativeValueInLogCalculation : t === ee.Sqrt && (i.invalidType = W.NegativeValueInSqrtCalculation), i;
 }
 function xl(t, e) {
   let i = t;
@@ -5157,7 +5159,7 @@ function vn(t) {
   return e;
 }
 async function Cl(t) {
-  const { queryObject: e, fieldName: i, queryConfig: r, abortKey: n } = t, a = W(e), { idField: s, isTraditionalTypeOID: o } = Oe(a), d = o ? s : "*", l = `${I.Count}_${s}`, c = `${I.Count}_${i}`, p = `${I.Minimum}_${i}`, u = `${I.Maximum}_${i}`, f = {
+  const { queryObject: e, fieldName: i, queryConfig: r, abortKey: n } = t, a = k(e), { idField: s, isTraditionalTypeOID: o } = Oe(a), d = o ? s : "*", l = `${I.Count}_${s}`, c = `${I.Count}_${i}`, p = `${I.Minimum}_${i}`, u = `${I.Maximum}_${i}`, f = {
     ...r,
     outStatistics: [
       {
@@ -5185,8 +5187,8 @@ async function Cl(t) {
     queryObject: e,
     queryConfig: f,
     abortKey: n
-  }), m = h.get(l) ?? Number.NaN, b = h.get(c) ?? Number.NaN, x = h.get(p) ?? Number.NaN, S = h.get(u) ?? Number.NaN;
-  return { countExcludingNulls: b, countIncludingNulls: m, min: x, max: S };
+  }), m = h.get(l) ?? Number.NaN, b = h.get(c) ?? Number.NaN, S = h.get(p) ?? Number.NaN, x = h.get(u) ?? Number.NaN;
+  return { countExcludingNulls: b, countIncludingNulls: m, min: S, max: x };
 }
 async function Fl(t) {
   const { queryConfig: e, chartConfig: i, queryObject: r, abortKey: n } = t, a = i.series[0], { x: s, dataTransformationType: o } = a;
@@ -5258,7 +5260,7 @@ async function Bl(t) {
     errorStrings: o
   } = t, d = e.series[0], { dataTransformationType: l } = d;
   let c = { valid: !0 };
-  const p = W(r), f = Ot(i?.geometry)?.extent?.toJSON() !== void 0, h = s?.view, m = Tl({
+  const p = k(r), f = Ot(i?.geometry)?.extent?.toJSON() !== void 0, h = s?.view, m = Tl({
     seriesConfig: d,
     layer: p,
     view: h,
@@ -5269,61 +5271,61 @@ async function Bl(t) {
   if (h !== void 0 && (b = new Ki({
     geometry: h.extent
   }), h.extent !== void 0 && zr(p))) {
-    const { distance: L, units: M } = i;
-    L !== void 0 && (b.distance = L), M !== void 0 && (b.units = M);
+    const { distance: D, units: B } = i;
+    D !== void 0 && (b.distance = D), B !== void 0 && (b.units = B);
   }
   if (i.timeExtent) {
-    const L = { start: i.timeExtent[0], end: i.timeExtent[1] };
-    b === void 0 ? b = new Ki({ timeExtent: L }) : b.timeExtent = L;
+    const D = { start: i.timeExtent[0], end: i.timeExtent[1] };
+    b === void 0 ? b = new Ki({ timeExtent: D }) : b.timeExtent = D;
   }
   m.filter = b;
-  let x;
+  let S;
   m.outStatisticTypes = { exclude: ["median"] };
   try {
-    x = await Xi(m);
-  } catch (L) {
-    throw new pe(oe.QueryFeaturesError, o.errors.queryError, L);
+    S = await Xi(m);
+  } catch (D) {
+    throw new pe(oe.QueryFeaturesError, o.errors.queryError, D);
   }
   m.outStatisticTypes = { include: ["median"] };
   try {
-    const L = await Xi(m);
-    L?.median && (x.median = L.median);
+    const D = await Xi(m);
+    D?.median && (S.median = D.median);
   } catch {
   }
-  x = wl(x);
-  const { avg: S, count: v, stddev: F, min: w, max: T, sum: A, median: O } = x;
+  S = wl(S);
+  const { avg: x, count: v, stddev: F, min: T, max: w, sum: A, median: P } = S;
   if (v === 0)
     c = {
       ...xn(l)
     };
   else {
-    const L = Il({
+    const D = Il({
       seriesConfig: d,
       layer: p,
       view: h,
       useFeaturesInView: f,
-      minValue: vl(w),
-      maxValue: T,
+      minValue: vl(T),
+      maxValue: w,
       valueExpression: m.valueExpression,
       queryConfig: i
     });
-    L.filter = b;
-    let M;
+    D.filter = b;
+    let B;
     try {
-      M = await ba(L);
-    } catch (N) {
-      throw new pe(oe.QueryFeaturesError, o.errors.queryError, N);
+      B = await ba(D);
+    } catch (L) {
+      throw new pe(oe.QueryFeaturesError, o.errors.queryError, L);
     }
-    const B = Al(a, n);
+    const M = Al(a, n);
     c.data = {
-      mean: S,
+      mean: x,
       stddev: F,
-      min: w,
-      max: T,
-      median: Number(O),
-      bins: M?.bins,
+      min: T,
+      max: w,
+      median: Number(P),
+      bins: B?.bins,
       count: n,
-      nulls: B,
+      nulls: M,
       sum: A ?? void 0
     }, c.data.bins.length > 0 && (c.data.bins[c.data.bins.length - 1].isLastBin = !0);
   }
@@ -5411,22 +5413,22 @@ function si(t) {
   switch (e.valid = !1, i) {
     case y.BarSeries:
     case y.ComboLineAndBarSeries:
-      e.invalidType = V.BarElementExceedsLimit;
+      e.invalidType = W.BarElementExceedsLimit;
       break;
     case y.LineSeries:
-      e.invalidType = V.LineChartExceedsLimit;
+      e.invalidType = W.LineChartExceedsLimit;
       break;
     case y.PieSeries:
-      e.invalidType = V.PieChartExceedsLimit;
+      e.invalidType = W.PieChartExceedsLimit;
       break;
     case y.GaugeSeries:
-      e.invalidType = V.GaugeExceedsLimit;
+      e.invalidType = W.GaugeExceedsLimit;
       break;
     case y.BoxPlotSeries:
-      r?.outlierLimit === !0 ? e.invalidType = V.BoxPlotOutliersExceedsLimit : e.invalidType = V.BoxPlotExceedsLimit;
+      r?.outlierLimit === !0 ? e.invalidType = W.BoxPlotOutliersExceedsLimit : e.invalidType = W.BoxPlotExceedsLimit;
       break;
     case y.HeatSeries:
-      e.invalidType = V.HeatChartExceedsLimit;
+      e.invalidType = W.HeatChartExceedsLimit;
       break;
   }
 }
@@ -5449,136 +5451,136 @@ function Lf(t) {
   const u = new Intl.NumberFormat(o), f = yt(i), { maxCategoryCount: h } = f;
   let m = l.modalHeaders.invalidChart;
   switch (e) {
-    case V.BarElementExceedsLimit: {
+    case W.BarElementExceedsLimit: {
       m = l.modalHeaders.tooManyFeatures;
-      let x = Number.NaN, S = Number.NaN, v = "";
-      n !== void 0 && (n <= f.maxBarChartSeriesCount ? n === 1 ? (v = l.errors.uniqueSeriesBarCountCannotExceedLimit, x = f.maxBarUniqueSeriesCountTotal) : n === 2 ? (v = l.errors.twoSeriesBarCountCannotExceedLimit, x = f.maxBarTwoSeriesCountTotal, S = f.maxBarTwoSeriesCountPerSeries) : n > 2 && (v = l.errors.threePlusSeriesBarCountCannotExceedLimit, x = f.maxBarThreePlusSeriesCountTotal, S = f.maxBarThreePlusSeriesCountPerSeries) : (v = l.errors.barSeriesCountCannotExceedLimit, S = f.maxBarChartSeriesCount));
-      const F = u.format(x), w = u.format(S), T = r !== void 0 ? u.format(r) : "";
+      let S = Number.NaN, x = Number.NaN, v = "";
+      n !== void 0 && (n <= f.maxBarChartSeriesCount ? n === 1 ? (v = l.errors.uniqueSeriesBarCountCannotExceedLimit, S = f.maxBarUniqueSeriesCountTotal) : n === 2 ? (v = l.errors.twoSeriesBarCountCannotExceedLimit, S = f.maxBarTwoSeriesCountTotal, x = f.maxBarTwoSeriesCountPerSeries) : n > 2 && (v = l.errors.threePlusSeriesBarCountCannotExceedLimit, S = f.maxBarThreePlusSeriesCountTotal, x = f.maxBarThreePlusSeriesCountPerSeries) : (v = l.errors.barSeriesCountCannotExceedLimit, x = f.maxBarChartSeriesCount));
+      const F = u.format(S), T = u.format(x), w = r !== void 0 ? u.format(r) : "";
       c = ie(v, {
         totalLimit: F,
-        seriesLimit: w,
-        elementCount: T
+        seriesLimit: T,
+        elementCount: w
       }), p = {
         actualCount: r ?? Number.NaN,
-        totalLimit: x,
-        seriesLimit: S
+        totalLimit: S,
+        seriesLimit: x
       };
       break;
     }
-    case V.LineChartExceedsLimit:
+    case W.LineChartExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        let x = Number.NaN, S = Number.NaN, v = "";
-        n !== void 0 && (n <= f.maxLineChartSeriesCount ? n === 1 ? (v = d ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, x = f.maxLineUniqueSeriesCountTotal) : n === 2 ? (v = d ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, x = f.maxLineTwoSeriesCountTotal, S = f.maxLineTwoSeriesCountPerSeries) : n > 2 && (v = d ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, x = f.maxLineThreePlusSeriesCountTotal, S = f.maxLineThreePlusSeriesCountPerSeries) : (v = l.errors.lineSeriesCountCannotExceedLimit, S = f.maxLineChartSeriesCount));
-        const F = u.format(x), w = u.format(S), T = r !== void 0 ? u.format(r) : "";
+        let S = Number.NaN, x = Number.NaN, v = "";
+        n !== void 0 && (n <= f.maxLineChartSeriesCount ? n === 1 ? (v = d ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, S = f.maxLineUniqueSeriesCountTotal) : n === 2 ? (v = d ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, S = f.maxLineTwoSeriesCountTotal, x = f.maxLineTwoSeriesCountPerSeries) : n > 2 && (v = d ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, S = f.maxLineThreePlusSeriesCountTotal, x = f.maxLineThreePlusSeriesCountPerSeries) : (v = l.errors.lineSeriesCountCannotExceedLimit, x = f.maxLineChartSeriesCount));
+        const F = u.format(S), T = u.format(x), w = r !== void 0 ? u.format(r) : "";
         c = ie(v, {
-          elementCount: T,
-          seriesLimit: w,
+          elementCount: w,
+          seriesLimit: T,
           totalLimit: F
         }), p = {
           actualCount: r ?? Number.NaN,
-          totalLimit: x,
-          seriesLimit: S
+          totalLimit: S,
+          seriesLimit: x
         };
       }
       break;
-    case V.BoxPlotExceedsLimit:
+    case W.BoxPlotExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        let x = Number.NaN, S = Number.NaN, v = "";
-        n !== void 0 && (n <= f.maxBoxPlotSeriesCount ? n === 1 ? (v = l.errors.uniqueSeriesBoxCountCannotExceedLimit, x = f.maxBoxUniqueSeriesCountTotal) : n === 2 ? (v = l.errors.twoSeriesBoxCountCannotExceedLimit, x = f.maxBoxTwoSeriesCountTotal, S = f.maxBoxTwoSeriesCountPerSeries) : n > 2 && (v = l.errors.threePlusBoxLineCountCannotExceedLimit, x = f.maxBoxThreePlusSeriesCountTotal, S = f.maxBoxThreePlusSeriesCountPerSeries) : (v = l.errors.boxSeriesCountCannotExceedLimit, S = f.maxBoxPlotSeriesCount));
-        const F = u.format(x), w = u.format(S), T = r !== void 0 ? u.format(r) : "";
+        let S = Number.NaN, x = Number.NaN, v = "";
+        n !== void 0 && (n <= f.maxBoxPlotSeriesCount ? n === 1 ? (v = l.errors.uniqueSeriesBoxCountCannotExceedLimit, S = f.maxBoxUniqueSeriesCountTotal) : n === 2 ? (v = l.errors.twoSeriesBoxCountCannotExceedLimit, S = f.maxBoxTwoSeriesCountTotal, x = f.maxBoxTwoSeriesCountPerSeries) : n > 2 && (v = l.errors.threePlusBoxLineCountCannotExceedLimit, S = f.maxBoxThreePlusSeriesCountTotal, x = f.maxBoxThreePlusSeriesCountPerSeries) : (v = l.errors.boxSeriesCountCannotExceedLimit, x = f.maxBoxPlotSeriesCount));
+        const F = u.format(S), T = u.format(x), w = r !== void 0 ? u.format(r) : "";
         c = ie(v, {
-          elementCount: T,
-          seriesLimit: w,
+          elementCount: w,
+          seriesLimit: T,
           totalLimit: F
         }), p = {
           actualCount: r ?? Number.NaN,
-          totalLimit: x,
-          seriesLimit: S
+          totalLimit: S,
+          seriesLimit: x
         };
       }
       break;
-    case V.BoxPlotOutliersExceedsLimit:
+    case W.BoxPlotOutliersExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.boxSeriesOutlierCannotExceedLimit, S = f.maxBoxPlotOutlierLimit, v = u.format(S);
-        c = ie(x, {
+        const S = l.errors.boxSeriesOutlierCannotExceedLimit, x = f.maxBoxPlotOutlierLimit, v = u.format(x);
+        c = ie(S, {
           totalLimit: v
-        }), p = { actualCount: r ?? Number.NaN, totalLimit: S };
+        }), p = { actualCount: r ?? Number.NaN, totalLimit: x };
       }
       break;
-    case V.HeatChartExceedsLimit:
+    case W.HeatChartExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.heatChartCannotExceedLimit, S = f.maxHeatChartCellLimit, v = u.format(S), F = r !== void 0 ? u.format(r) : "";
-        c = ie(x, {
+        const S = l.errors.heatChartCannotExceedLimit, x = f.maxHeatChartCellLimit, v = u.format(x), F = r !== void 0 ? u.format(r) : "";
+        c = ie(S, {
           featureCount: F,
           totalLimit: v
         }), p = {
           actualCount: r ?? Number.NaN,
-          totalLimit: S
+          totalLimit: x
         };
       }
       break;
-    case V.PieChartExceedsLimit:
+    case W.PieChartExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.pieChartSlicesCannotExceedLimit, S = f.maxPieChartSliceCountTotal, v = u.format(S), F = r !== void 0 ? u.format(r) : "";
-        c = ie(x, {
+        const S = l.errors.pieChartSlicesCannotExceedLimit, x = f.maxPieChartSliceCountTotal, v = u.format(x), F = r !== void 0 ? u.format(r) : "";
+        c = ie(S, {
           sliceCount: F,
           totalLimit: v
         }), p = {
           actualCount: r ?? Number.NaN,
-          totalLimit: S
+          totalLimit: x
         };
       }
       break;
-    case V.GaugeExceedsLimit:
+    case W.GaugeExceedsLimit:
       {
         m = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.gaugeCannotExceedLimit, S = f.maxGaugeByFeaturesLimit, v = u.format(S), F = r !== void 0 ? u.format(r) : "";
-        c = ie(x, {
+        const S = l.errors.gaugeCannotExceedLimit, x = f.maxGaugeByFeaturesLimit, v = u.format(x), F = r !== void 0 ? u.format(r) : "";
+        c = ie(S, {
           featureCount: F,
           totalLimit: v
         }), p = {
           actualCount: r ?? Number.NaN,
-          totalLimit: S
+          totalLimit: x
         };
       }
       break;
-    case V.PieChartMixOfNegativePositiveSlices:
+    case W.PieChartMixOfNegativePositiveSlices:
       m = l.modalHeaders.cannotCombineNegativeAndPositiveSlices, c = l.errors.pieChartCannotHaveMixtureOfPositiveAndNegativeSlices;
       break;
-    case V.NegativeValueInSqrtCalculation:
+    case W.NegativeValueInSqrtCalculation:
       m = l.modalHeaders.invalidData, c = l.errors.negativeValueInDataForSqrtTransformation;
       break;
-    case V.NegativeValueInLogCalculation:
+    case W.NegativeValueInLogCalculation:
       m = l.modalHeaders.invalidData, c = l.errors.negativeValueInDataForLogTransformation;
       break;
-    case V.HistogramEmptyField:
+    case W.HistogramEmptyField:
       s === !0 ? (m = l.modalHeaders.noDataAvailable, c = l.errors.noDataFBSMessage) : Ee(a) ? (m = l.modalHeaders.noDataAvailable, c = l.errors.noDataFBEMessage) : (m = l.modalHeaders.invalidChart, c = l.errors.histogramEmptyField);
       break;
-    case V.EmptyDataSet:
+    case W.EmptyDataSet:
       m = l.modalHeaders.noDataAvailable, s === !0 ? c = l.errors.noDataFBSMessage : Ee(a) ? c = l.errors.noDataFBEMessage : c = l.errors.noDataMessage;
       break;
-    case V.NegativeValueInXAxisLogScale:
+    case W.NegativeValueInXAxisLogScale:
       c = l.errors.logarithmicXAxisNotPossible;
       break;
-    case V.NegativeValueInYAxisLogScale:
+    case W.NegativeValueInYAxisLogScale:
       c = l.errors.logarithmicYAxisNotPossible;
       break;
-    case V.BadData:
+    case W.BadData:
   }
-  if (c === l.errors.defaultInvalidChart && (e === V.BarElementExceedsLimit || e === V.LineChartExceedsLimit || e === V.HeatChartExceedsLimit || e === V.PieChartExceedsLimit || e === V.GaugeExceedsLimit || e === V.BoxPlotExceedsLimit) && typeof r == "number" && typeof n == "number" && r / n > h) {
-    const x = r / n;
+  if (c === l.errors.defaultInvalidChart && (e === W.BarElementExceedsLimit || e === W.LineChartExceedsLimit || e === W.HeatChartExceedsLimit || e === W.PieChartExceedsLimit || e === W.GaugeExceedsLimit || e === W.BoxPlotExceedsLimit) && typeof r == "number" && typeof n == "number" && r / n > h) {
+    const S = r / n;
     c = ie(l.errors.categoryCountCannotExceedLimit, {
-      categoryCount: u.format(x),
+      categoryCount: u.format(S),
       maxCategoryCount: u.format(h)
     });
   }
   return {
-    keyword: e ?? V.BadData,
+    keyword: e ?? W.BadData,
     header: m,
     message: c,
     params: p
@@ -5587,7 +5589,7 @@ function Lf(t) {
 function Dt(t, e) {
   return `${e}_${t}`;
 }
-function Mi(t) {
+function Pi(t) {
   const { value: e, mean: i, stdDev: r } = t;
   return (e - i) / r;
 }
@@ -5600,12 +5602,12 @@ function zi(t) {
   };
   const l = se({
     ...d,
-    key: P.Average
+    key: O.Average
   }), c = se({
     ...d,
-    key: P.StandardDeviation
+    key: O.StandardDeviation
   }), p = a ?? Number(e[l]), u = s ?? Number(e[c]);
-  return Number.isFinite(p) && Number.isFinite(u) && Object.values(P).forEach((f) => {
+  return Number.isFinite(p) && Number.isFinite(u) && Object.values(O).forEach((f) => {
     const h = se({
       key: f,
       y: r,
@@ -5621,20 +5623,20 @@ function zi(t) {
           showOutliers: !1,
           standardizeValues: !0
         };
-        let x = se(d);
-        if (o[x] = Mi({ mean: p, stdDev: u, value: b }), f === P.Min || f === P.Max) {
+        let S = se(d);
+        if (o[S] = Pi({ mean: p, stdDev: u, value: b }), f === O.Min || f === O.Max) {
           d = {
             ...d,
             key: f,
             showOutliers: !0,
             standardizeValues: !0
-          }, x = se(d), d = {
+          }, S = se(d), d = {
             ...d,
             standardizeValues: !1,
             splitByValue: n
           };
-          const S = se(d);
-          b = Number(e[S]), Number.isFinite(b) && (o[x] = Mi({
+          const x = se(d);
+          b = Number(e[x]), Number.isFinite(b) && (o[S] = Pi({
             mean: p,
             stdDev: u,
             value: b
@@ -5740,19 +5742,19 @@ function ql(t, e) {
       s.splitByValue = l;
       const c = se({
         ...s,
-        key: P.Min,
+        key: O.Min,
         showOutliers: !0
       }), p = se({
         ...s,
-        key: P.Min,
+        key: O.Min,
         showOutliers: !1
       }), u = se({
         ...s,
-        key: P.Max,
+        key: O.Max,
         showOutliers: !0
       }), f = se({
         ...s,
-        key: P.Max,
+        key: O.Max,
         showOutliers: !1
       });
       d[u] === void 0 && d[f] !== void 0 && (d[u] = d[f]), d[c] === void 0 && d[p] !== void 0 && (d[c] = d[p]);
@@ -5761,40 +5763,40 @@ function ql(t, e) {
 }
 function El(t, e) {
   let i, r;
-  const n = t[e[P.IQR]], a = t[e[P.FirstQuartile]], s = t[e[P.ThirdQuartile]];
+  const n = t[e[O.IQR]], a = t[e[O.FirstQuartile]], s = t[e[O.ThirdQuartile]];
   return Number.isFinite(n) && Number.isFinite(a) && Number.isFinite(s) && (i = a - n * 1.5, r = s + n * 1.5), { outlierMinThreshold: i, outlierMaxThreshold: r };
 }
 function sr(t) {
   const { yField: e, xField: i, xValue: r, splitByField: n, splitByValue: a, outlierMaxThreshold: s, outlierMinThreshold: o, target: d } = t;
   let l;
   if (i !== void 0 && r !== void 0) {
-    const f = typeof r != "string" ? r : `'${Bi(r)}'`;
+    const f = typeof r != "string" ? r : `'${Ai(r)}'`;
     l = `${i}=${f.toString()}`;
   }
   let c;
   if (n !== void 0 && a !== void 0) {
-    const f = typeof a != "string" ? a : `'${Bi(a)}'`;
+    const f = typeof a != "string" ? a : `'${Ai(a)}'`;
     c = `${n}=${f.toString()}`;
   }
   let p;
   return d === "outliers" && o !== s ? p = `(${e}<${o} OR ${e}>${s})` : d === "alternativeData" && (o === s ? p = `(${e}=${o})` : p = `(${e}>=${o} AND ${e}<=${s})`), [l, c, p].filter((f) => f !== void 0).join(" AND ");
 }
 function wn(t) {
-  const { data: e, yField: i, x: r, chartSubType: n, splitByField: a } = t, s = n === g.BoxPlotMonoField || n === g.BoxPlotMonoFieldAndCategory || n === g.BoxPlotMonoFieldAndSplitBy || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy ? void 0 : i, o = Ft(s), d = [], l = [], { maxOperandsPerWhereClause: c } = pi();
+  const { data: e, yField: i, x: r, chartSubType: n, splitByField: a } = t, s = n === g.BoxPlotMonoField || n === g.BoxPlotMonoFieldAndCategory || n === g.BoxPlotMonoFieldAndSplitBy || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy ? void 0 : i, o = Ft(s), d = [], l = [], { maxOperandsPerWhereClause: c } = ci();
   let p = [], u = [], f = 1;
   return e.forEach((h, m) => {
-    const { outlierMinThreshold: b, outlierMaxThreshold: x } = El(h, o);
-    if (typeof b == "number" && typeof x == "number") {
-      const S = {
+    const { outlierMinThreshold: b, outlierMaxThreshold: S } = El(h, o);
+    if (typeof b == "number" && typeof S == "number") {
+      const x = {
         yField: i,
         outlierMinThreshold: b,
-        outlierMaxThreshold: x
+        outlierMaxThreshold: S
       };
-      (n === g.BoxPlotMonoFieldAndCategory || n === g.BoxPlotMultiFieldsAndCategory || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy) && r !== void 0 && r in h && (S.xField = r, S.xValue = Rt({
+      (n === g.BoxPlotMonoFieldAndCategory || n === g.BoxPlotMultiFieldsAndCategory || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy) && r !== void 0 && r in h && (x.xField = r, x.xValue = Rt({
         value: h[r],
         dataContext: h,
         keepNullValues: !0
-      })), (n === g.BoxPlotMonoFieldAndSplitBy || n === g.BoxPlotMultiFieldsAndSplitBy || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in h && (S.splitByField = a, S.splitByValue = h[a]), p.push(sr({ ...S, target: "outliers" })), u.push(sr({ ...S, target: "alternativeData" })), (f % c === 0 || m === e.length - 1) && (d.push(Z(p, "OR")), l.push(Z(u, "OR")), p = [], u = []);
+      })), (n === g.BoxPlotMonoFieldAndSplitBy || n === g.BoxPlotMultiFieldsAndSplitBy || n === g.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in h && (x.splitByField = a, x.splitByValue = h[a]), p.push(sr({ ...x, target: "outliers" })), u.push(sr({ ...x, target: "alternativeData" })), (f % c === 0 || m === e.length - 1) && (d.push(Z(p, "OR")), l.push(Z(u, "OR")), p = [], u = []);
     }
     f += 1;
   }), { outliersFilterBatches: d, dataWithoutOutliersFilterBatches: l };
@@ -5806,14 +5808,14 @@ function kl(t) {
     switch (r) {
       case g.BoxPlotMultiFields: {
         const c = Ft(a), p = e[0];
-        d = Number(p[c[P.Average]]), l = Number(p[c[P.StandardDeviation]]);
+        d = Number(p[c[O.Average]]), l = Number(p[c[O.StandardDeviation]]);
         break;
       }
       case g.BoxPlotMultiFieldsAndCategory: {
         const c = e.find((p) => p[n] === i[n]);
         if (c !== void 0) {
           const p = Ft(a);
-          d = Number(c[p[P.Average]]), l = Number(c[p[P.StandardDeviation]]);
+          d = Number(c[p[O.Average]]), l = Number(c[p[O.StandardDeviation]]);
         }
         break;
       }
@@ -5821,7 +5823,7 @@ function kl(t) {
         const c = e.find((p) => p[o] === i[o]);
         if (c !== void 0) {
           const p = Ft(a);
-          d = Number(c[p[P.Average]]), l = Number(c[p[P.StandardDeviation]]);
+          d = Number(c[p[O.Average]]), l = Number(c[p[O.StandardDeviation]]);
         }
         break;
       }
@@ -5829,28 +5831,28 @@ function kl(t) {
   return { mean: d, stdDev: l };
 }
 async function Wl(t) {
-  const { seriesConfig: e, data: i, uniqueQuery: r, queryObject: n, meanAndStdDevPerField: a, abortKey: s } = t, o = E(e), d = e[0], { x: l } = d, c = le(d.query?.where), p = W(n), u = Oe(p).idField, f = he(e), h = [];
-  for (let x = 0; x < f.length; x += 1) {
-    const S = f[x], { outliersFilterBatches: v } = wn({
+  const { seriesConfig: e, data: i, uniqueQuery: r, queryObject: n, meanAndStdDevPerField: a, abortKey: s } = t, o = E(e), d = e[0], { x: l } = d, c = le(d.query?.where), p = k(n), u = Oe(p).idField, f = he(e), h = [];
+  for (let S = 0; S < f.length; S += 1) {
+    const x = f[S], { outliersFilterBatches: v } = wn({
       data: i,
-      yField: S,
+      yField: x,
       x: l,
       chartSubType: o,
       splitByField: c
     });
     for (let F = 0; F < v.length; F += 1) {
-      const w = v[F];
-      if (w !== "") {
-        const T = [];
-        l !== C.boxPlot.boxPlotCategory && T.push(l), T.push(S), c !== "" && T.push(c), T.push(u);
+      const T = v[F];
+      if (T !== "") {
+        const w = [];
+        l !== C.boxPlot.boxPlotCategory && w.push(l), w.push(x), c !== "" && w.push(c), w.push(u);
         const A = {
           ...r,
-          where: Z([r.where, w]),
+          where: Z([r.where, T]),
           groupByFieldsForStatistics: void 0,
           outStatistics: void 0,
           orderByFields: void 0,
           num: void 0,
-          outFields: T
+          outFields: w
         };
         h.push(
           Le({
@@ -5865,58 +5867,58 @@ async function Wl(t) {
     }
   }
   const m = await Promise.all(h), b = /* @__PURE__ */ new Map();
-  for (let x = 0; x < m.length; x += 1) {
-    const S = m[x], v = f[x];
-    S.forEach((F) => {
-      const w = { ...F.attributes };
-      if (w[v] !== void 0) {
-        l === C.boxPlot.boxPlotCategory && (w[C.boxPlot.boxPlotCategory] = v);
-        let T = {
-          key: P.Outlier,
+  for (let S = 0; S < m.length; S += 1) {
+    const x = m[S], v = f[S];
+    x.forEach((F) => {
+      const T = { ...F.attributes };
+      if (T[v] !== void 0) {
+        l === C.boxPlot.boxPlotCategory && (T[C.boxPlot.boxPlotCategory] = v);
+        let w = {
+          key: O.Outlier,
           chartSubType: o
         };
         switch (o) {
           case g.BoxPlotMonoFieldAndSplitBy:
           case g.BoxPlotMultiFieldsAndSplitBy:
           case g.BoxPlotMonoFieldAndCategoryAndSplitBy:
-            T = {
-              ...T,
-              splitByValue: w[c]
+            w = {
+              ...w,
+              splitByValue: T[c]
             };
             break;
           case g.BoxPlotMultiFieldsAndCategory:
-            T = {
-              ...T,
+            w = {
+              ...w,
               y: v
             };
             break;
         }
-        const A = se(T), O = w[v];
-        w[A] = O;
-        const L = `${w[l]}-${w[c]}-${O}`, M = b.get(L);
-        if (w[Q.uniqueIdsName] = [
-          ...M?.[Q.uniqueIdsName] ?? [],
-          w[u]
-        ], delete w[u], Wn(o)) {
-          const B = se({
-            ...T,
+        const A = se(w), P = T[v];
+        T[A] = P;
+        const D = `${T[l]}-${T[c]}-${P}`, B = b.get(D);
+        if (T[Q.uniqueIdsName] = [
+          ...B?.[Q.uniqueIdsName] ?? [],
+          T[u]
+        ], delete T[u], Wn(o)) {
+          const M = se({
+            ...w,
             standardizeValues: !0
-          }), { mean: N, stdDev: R } = kl({
+          }), { mean: L, stdDev: R } = kl({
             data: i,
-            outlierDataItem: w,
+            outlierDataItem: T,
             chartSubType: o,
             x: l,
             y: v,
             splitByField: c,
             meanAndStdDevPerField: a
           });
-          N !== void 0 && R !== void 0 && (w[B] = Mi({
-            value: O,
-            mean: N,
+          L !== void 0 && R !== void 0 && (T[M] = Pi({
+            value: P,
+            mean: L,
             stdDev: R
           }));
         }
-        delete w[v], w[C.boxPlot.boxPlotOutlierId] = !0, b.set(L, w);
+        delete T[v], T[C.boxPlot.boxPlotOutlierId] = !0, b.set(D, T);
       }
     });
   }
@@ -5925,27 +5927,27 @@ async function Wl(t) {
 async function Vl(t) {
   const { data: e, queryObject: i, uniqueQuery: r, elementCount: n, chartConfig: a, chartLimits: s, abortKey: o } = t;
   let d = [];
-  const { series: l, showMean: c } = a, p = mi({ showMean: c, seriesConfig: l }), u = E(l), f = Ke(a), { x: h } = f, m = le(f.query?.where), b = [];
-  for (let S = 0; S < p.length; S += 1) {
-    const v = p[S], { dataWithoutOutliersFilterBatches: F } = wn({
+  const { series: l, showMean: c } = a, p = hi({ showMean: c, seriesConfig: l }), u = E(l), f = Ke(a), { x: h } = f, m = le(f.query?.where), b = [];
+  for (let x = 0; x < p.length; x += 1) {
+    const v = p[x], { dataWithoutOutliersFilterBatches: F } = wn({
       data: e,
       yField: v,
       x: h,
       chartSubType: u,
       splitByField: m
     });
-    for (let w = 0; w < F.length; w += 1) {
-      const T = F[w], A = {
+    for (let T = 0; T < F.length; T += 1) {
+      const w = F[T], A = {
         ...r,
-        where: Z([r.where, T])
+        where: Z([r.where, w])
       };
       A.outStatistics !== void 0 && (A.outStatistics = A.outStatistics?.filter(
-        (O) => (O.statisticType === I.Minimum || O.statisticType === I.Maximum) && O.onStatisticField === v
-      ).map((O) => ({
-        ...O,
-        outStatisticFieldName: `${O.outStatisticFieldName}${C.boxPlot.boxPlotOutliersSuffix}`
+        (P) => (P.statisticType === I.Minimum || P.statisticType === I.Maximum) && P.onStatisticField === v
+      ).map((P) => ({
+        ...P,
+        outStatisticFieldName: `${P.outStatisticFieldName}${C.boxPlot.boxPlotOutliersSuffix}`
       }))), b.push(
-        hi({
+        yi({
           queryObject: i,
           uniqueQuery: A,
           chartConfig: a,
@@ -5958,9 +5960,9 @@ async function Vl(t) {
       );
     }
   }
-  const x = await Promise.all(b);
-  for (let S = 0; S < x.length; S += 1)
-    d.push(...x[S]);
+  const S = await Promise.all(b);
+  for (let x = 0; x < S.length; x += 1)
+    d.push(...S[x]);
   return u !== g.BoxPlotMonoFieldAndCategoryAndSplitBy && (d = kt({
     data: d,
     x: m !== void 0 && m !== "" ? m : h
@@ -5971,7 +5973,7 @@ async function jl(t) {
   let a;
   const { series: s, showMean: o } = r, d = E(s);
   if (d === g.BoxPlotMultiFieldsAndCategory || d === g.BoxPlotMultiFieldsAndSplitBy) {
-    const l = mi({ showMean: o, seriesConfig: s }), c = {
+    const l = hi({ showMean: o, seriesConfig: s }), c = {
       ...i
     };
     delete c.outStatistics, delete c.groupByFieldsForStatistics, delete c.orderByFields;
@@ -6013,7 +6015,7 @@ function zl(t) {
   });
 }
 function Tn(t) {
-  const { chartConfig: e, data: i, calculateZScore: r = !1, meanAndStdDevPerField: n } = t, { series: a, showMean: s } = e, o = Ke(e), d = E(e.series), { x: l } = o, c = mi({ showMean: s, seriesConfig: a });
+  const { chartConfig: e, data: i, calculateZScore: r = !1, meanAndStdDevPerField: n } = t, { series: a, showMean: s } = e, o = Ke(e), d = E(e.series), { x: l } = o, c = hi({ showMean: s, seriesConfig: a });
   let p = i;
   if (i?.[0] !== void 0) {
     const u = le(o.query?.where);
@@ -6163,7 +6165,7 @@ function Ql(t) {
       });
     }
   } else {
-    const c = W(n), { idField: p, isTraditionalTypeOID: u } = Oe(c), f = u ? p : "*";
+    const c = k(n), { idField: p, isTraditionalTypeOID: u } = Oe(c), f = u ? p : "*";
     e.outStatistics = [
       {
         statisticType: l.statisticType,
@@ -6177,28 +6179,28 @@ function Ql(t) {
 function Yl(t) {
   const { chartConfig: e, fetchFullBoxPlotData: i } = t, { series: r } = e, n = Bt(e);
   let a = [
-    { statisticType: I.Average, suffix: P.Average }
+    { statisticType: I.Average, suffix: O.Average }
   ];
   i === !0 && (a = [
     ...a,
-    { statisticType: I.Minimum, suffix: P.Min },
+    { statisticType: I.Minimum, suffix: O.Min },
     {
       statisticType: I.ContinuousPercentile,
       statisticParameters: { value: 0.25 },
-      suffix: P.FirstQuartile
+      suffix: O.FirstQuartile
     },
     {
       statisticType: I.ContinuousPercentile,
       statisticParameters: { value: 0.5 },
-      suffix: P.Median
+      suffix: O.Median
     },
     {
       statisticType: I.ContinuousPercentile,
       statisticParameters: { value: 0.75 },
-      suffix: P.ThirdQuartile
+      suffix: O.ThirdQuartile
     },
-    { statisticType: I.Maximum, suffix: P.Max },
-    { statisticType: I.StandardDeviation, suffix: P.StandardDeviation }
+    { statisticType: I.Maximum, suffix: O.Max },
+    { statisticType: I.StandardDeviation, suffix: O.StandardDeviation }
   ]);
   const s = /* @__PURE__ */ new Set();
   return n && "y" in r[0] ? [r[0].y].flat().forEach((d) => s.add(d)) : r.forEach((d) => {
@@ -6260,59 +6262,59 @@ function _i(t) {
     seriesConfig: p,
     queryObject: n
   });
-  let b = /* @__PURE__ */ new Map(), x = !1, S = !1, v = !1, F = !1, w = !1, T = {};
+  let b = /* @__PURE__ */ new Map(), S = !1, x = !1, v = !1, F = !1, T = !1, w = {};
   if (u !== void 0) {
-    T = wt(u);
-    const _ = le(u.where);
-    let D = "";
-    switch (i.fetchNullValues !== !0 && (f !== C.boxPlot.boxPlotCategory && (D = `${f} IS NOT NULL`), _.trim() !== "" && _ !== f && !Ue(u.where) && (D = Z([D, `${_} IS NOT NULL`]))), c) {
+    w = wt(u);
+    const z = le(u.where);
+    let N = "";
+    switch (i.fetchNullValues !== !0 && (f !== C.boxPlot.boxPlotCategory && (N = `${f} IS NOT NULL`), z.trim() !== "" && z !== f && !Ue(u.where) && (N = Z([N, `${z} IS NOT NULL`]))), c) {
       case g.BarAndLineSplitBy: {
-        b = Ul(l), F = !0, x = !0, S = !0;
+        b = Ul(l), F = !0, S = !0, x = !0;
         break;
       }
       case g.BarAndLineMultiFields:
-        Jl(T, l), S = !0;
+        Jl(w, l), x = !0;
         break;
       case g.PieFromFields:
       case g.BarAndLineFromFields:
-        D = "", v = !0, S = !0;
+        N = "", v = !0, x = !0;
         break;
       case g.BarAndLineMonoField:
       case g.PieFromCategory:
-        S = !0;
+        x = !0;
         break;
       case g.BoxPlotMonoField:
       case g.BoxPlotMultiFields:
-        v = !0, w = !0;
+        v = !0, T = !0;
         break;
       case g.BoxPlotMonoFieldAndCategory:
       case g.BoxPlotMultiFieldsAndCategory:
       case g.BoxPlotMonoFieldAndSplitBy:
       case g.BoxPlotMonoFieldAndCategoryAndSplitBy:
       case g.BoxPlotMultiFieldsAndSplitBy: {
-        w = !0, F = !0, v = !0;
+        T = !0, F = !0, v = !0;
         break;
       }
       case g.PieNoAggregation:
       case g.BarAndLineNoAggregation:
       case g.BarAndLineSplitByNoAggregation:
     }
-    if (S && Ql({
-      uniqueQuery: T,
+    if (x && Ql({
+      uniqueQuery: w,
       y: h,
-      useGenericOutStatFieldName: x,
+      useGenericOutStatFieldName: S,
       queryObject: n,
       chartSubType: c,
       isTimeBinningSeries: m,
       returnFeaturesExtent: d,
-      splitByField: _
-    }), F && Hl({ uniqueQuery: T, splitByField: _, x: f }), ye(e) && w && (T.outStatistics = Yl({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete T.orderByFields : i.orderByFields !== void 0 && (T.orderByFields = i.orderByFields.filter((J) => {
+      splitByField: z
+    }), F && Hl({ uniqueQuery: w, splitByField: z, x: f }), ye(e) && T && (w.outStatistics = Yl({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete w.orderByFields : i.orderByFields !== void 0 && (w.orderByFields = i.orderByFields.filter((J) => {
       const we = J.split(" ");
       return !ae(we[0]);
     })), m && Ne(l[0])) {
-      const J = W(n), { idFields: we } = yi(J);
+      const J = k(n), { idFields: we } = fi(J);
       Fe(n).find((Me) => Me.name === f)?.type !== H.DateOnly && we && Kl({
-        uniqueQuery: T,
+        uniqueQuery: w,
         x: f,
         splitByField: le(u.where),
         unit: a?.unit ?? l[0].temporalBinning?.unit,
@@ -6321,11 +6323,11 @@ function _i(t) {
         runsOnClientQueryEngine: Ee(n)
       });
     }
-    T.where = D;
+    w.where = N;
   }
-  An({ chartConfig: e, options: r, uniqueQuery: T });
-  const { gdbVersion: A, geometry: O, distance: L, units: M, timeExtent: B, where: N, objectIds: R, spatialRelationship: k } = i;
-  return A !== void 0 && (T.gdbVersion = A), O !== void 0 && (T.geometry = O), L !== void 0 && (T.distance = L), M !== void 0 && (T.units = M), B !== void 0 && (T.timeExtent = B), R !== void 0 && (T.objectIds = R), k !== void 0 && (T.spatialRelationship = k), N !== void 0 && (T.where = Z([T.where, N])), { uniqueQuery: T, mapToStatField: b };
+  An({ chartConfig: e, options: r, uniqueQuery: w });
+  const { gdbVersion: A, geometry: P, distance: D, units: B, timeExtent: M, where: L, objectIds: R, spatialRelationship: G } = i;
+  return A !== void 0 && (w.gdbVersion = A), P !== void 0 && (w.geometry = P), D !== void 0 && (w.distance = D), B !== void 0 && (w.units = B), M !== void 0 && (w.timeExtent = M), R !== void 0 && (w.objectIds = R), G !== void 0 && (w.spatialRelationship = G), L !== void 0 && (w.where = Z([w.where, L])), { uniqueQuery: w, mapToStatField: b };
 }
 async function Xl(t) {
   const { queryObject: e, queryConfig: i, chartConfig: r, abortKey: n } = t, a = r.series[0], { x: s, valueConversion: o } = a, d = Qi(r), l = await Le({
@@ -6455,7 +6457,7 @@ function ed(t) {
 function oi(t) {
   const { arrayToSort: e, chartConfig: i, fieldList: r, isTimeBinningSeries: n } = t;
   if (n !== !0 && e[0] !== void 0) {
-    const { series: a } = i, s = E(a), o = q(a), d = ke(i), l = Pi(i);
+    const { series: a } = i, s = E(a), o = q(a), d = ke(i), l = Oi(i);
     if (At(i) && e !== void 0)
       ed({ arrayToSort: e, chartConfig: i, dataOrderParameters: l });
     else if (l?.[0] !== void 0 && e !== void 0 && e.length > 1) {
@@ -6472,12 +6474,12 @@ function oi(t) {
           preferLabel: f
         });
       else {
-        const x = d === y.DateAxisFormat && u;
+        const S = d === y.DateAxisFormat && u;
         $t({
           arrayToSort: e,
           orderBy: c,
           sortingField: p,
-          forceAscendingOrder: x,
+          forceAscendingOrder: S,
           isNonAggregated: b,
           sortByCategory: u,
           preferLabel: f,
@@ -6555,28 +6557,28 @@ async function Pf(t) {
   const { data: e, queryObject: i, chartConfig: r, allowColorMatch: n } = t;
   let a = !1, s = [];
   if (n && !de(i)) {
-    const { series: o, chartRenderer: d } = r, l = td(d), c = l ? Ct.ChartRenderer : Ct.LayerRenderer, p = i ? W(i) : void 0, u = l ?? p?.renderer;
+    const { series: o, chartRenderer: d } = r, l = td(d), c = l ? Ct.ChartRenderer : Ct.LayerRenderer, p = i ? k(i) : void 0, u = l ?? p?.renderer;
     let f;
     p && c === Ct.LayerRenderer ? s = await an(p) : c === Ct.ChartRenderer && (s = Es(u));
     const h = Ls(l, p?.renderer), m = Ms({
       chartRenderer: d,
       queryObject: i
-    }), b = q(o), x = E(o), S = Ke(r), v = le(S.query?.where);
+    }), b = q(o), S = E(o), x = Ke(r), v = le(x.query?.where);
     f = /* @__PURE__ */ new Map();
     for (let F = 0; F < (b === y.HistogramSeries && e.length > 0 ? 1 : e.length); F += 1) {
-      const w = e[F], T = await Rs({
+      const T = e[F], w = await Rs({
         seriesConfig: r.series,
-        dataItem: w,
+        dataItem: T,
         renderer: u,
         rendererType: h,
         rendererOrigin: c,
-        chartSubType: x,
+        chartSubType: S,
         splitByField: v,
         graphicTemplate: m,
         mapAttributesToSymbol: f,
         rendererFieldNames: s
       });
-      a = a || T.colorMatchApplied;
+      a = a || w.colorMatchApplied;
     }
   }
   return { dataItems: e, colorMatchApplied: a, rendererFieldNames: s };
@@ -6601,13 +6603,13 @@ function id(t) {
       C.lastTemporalBin,
       C.technicalFieldSplitByField,
       Q.uniqueIdsName,
-      j.valueField,
+      V.valueField,
       ...Tr
     ], p = (m, b) => {
-      const x = b[C.originalCategoryValue];
-      x !== void 0 && n && (b[n] = x);
-      const S = b[C.originalYCategoryValue];
-      S !== void 0 && a && (b[a] = S), n && b[j.xField] !== void 0 && (b[n] = b[C.originalCategoryValue] !== void 0 ? b[C.originalCategoryValue] : b[j.xField], delete b[j.xField]), a && b[j.yField] !== void 0 && (b[a] = b[C.originalYCategoryValue] !== void 0 ? b[C.originalYCategoryValue] : b[j.yField], delete b[j.yField]), s && b[j.valueField] !== void 0 && (b[s] = b[j.valueField], delete b[j.valueField]);
+      const S = b[C.originalCategoryValue];
+      S !== void 0 && n && (b[n] = S);
+      const x = b[C.originalYCategoryValue];
+      x !== void 0 && a && (b[a] = x), n && b[V.xField] !== void 0 && (b[n] = b[C.originalCategoryValue] !== void 0 ? b[C.originalCategoryValue] : b[V.xField], delete b[V.xField]), a && b[V.yField] !== void 0 && (b[a] = b[C.originalYCategoryValue] !== void 0 ? b[C.originalYCategoryValue] : b[V.yField], delete b[V.yField]), s && b[V.valueField] !== void 0 && (b[s] = b[V.valueField], delete b[V.valueField]);
       const v = {};
       return Object.keys(b).forEach((F) => {
         !c.includes(F) && !F.includes(C.rendererSymbolField) && (v[F] = b[F]);
@@ -6681,7 +6683,7 @@ function Bn(t) {
     let [s, o] = a, d = !0;
     const l = Ee(r);
     if (l) {
-      const c = W(r), { fieldsIndex: p } = c;
+      const c = k(r), { fieldsIndex: p } = c;
       s = dr({ fieldsIndex: p, fieldName: e, inputDate: s }), o = dr({ fieldsIndex: p, fieldName: e, inputDate: o });
     } else
       typeof s == "number" && typeof o == "number" ? Number.isFinite(s) && Number.isFinite(o) ? (s = It(s), o = It(o)) : d = !1 : typeof s == "string" && typeof o == "string" && (s = new Date(s).toISOString(), o = new Date(o).toISOString());
@@ -6719,12 +6721,12 @@ function Dn(t) {
   let l = "";
   if (js(s)) {
     const p = E(s.series) === g.BoxPlotMultiFieldsAndCategory ? i : void 0, u = se({
-      key: P.Min,
+      key: O.Min,
       showOutliers: !0,
       splitBy: r,
       y: p
     }), f = se({
-      key: P.Max,
+      key: O.Max,
       showOutliers: !0,
       splitBy: r,
       y: p
@@ -6792,7 +6794,7 @@ function od(t) {
   let l = "";
   if (d.type === y.HeatSeries) {
     let c, p;
-    const u = r[j.xField], f = r[C.originalCategoryValue], h = r[j.yField], m = r[C.originalYCategoryValue], b = n.axes?.[0]?.valueFormat?.type, x = n.axes?.[1]?.valueFormat?.type;
+    const u = r[V.xField], f = r[C.originalCategoryValue], h = r[V.yField], m = r[C.originalYCategoryValue], b = n.axes?.[0]?.valueFormat?.type, S = n.axes?.[1]?.valueFormat?.type;
     b === y.CategoryAxisFormat ? c = Qe({
       where: tt(d.x, f ?? u),
       normalize: !1,
@@ -6805,7 +6807,7 @@ function od(t) {
       outTimeZone: a,
       dataTimeZone: s,
       runsOnClientQueryEngine: o
-    }), x === y.CategoryAxisFormat ? p = Qe({
+    }), S === y.CategoryAxisFormat ? p = Qe({
       where: tt(d.y, m ?? h),
       normalize: !1,
       escape: !0
@@ -6867,53 +6869,53 @@ async function dd(t) {
   let l = { valid: !0, data: { dataItems: [] } };
   if (n !== void 0 && n.length > 0) {
     const c = Ke(r), { x: p } = c, u = "y" in c ? c.y : "", h = Fe(e).find((F) => F.name === p)?.type, m = [], b = n.reduce(
-      (F, w) => {
-        const T = [];
-        if (Q.uniqueIdsName in w)
-          m.push(w[Q.uniqueIdsName]);
+      (F, T) => {
+        const w = [];
+        if (Q.uniqueIdsName in T)
+          m.push(T[Q.uniqueIdsName]);
         else {
           switch (d) {
             case g.BoxPlotMonoFieldAndSplitBy:
             case g.BoxPlotMultiFieldsAndSplitBy:
             case g.BoxPlotMonoFieldAndCategoryAndSplitBy: {
-              const L = le(c.query?.where ?? ""), M = `_${P.Average}`;
-              Object.keys(w).forEach((B) => {
-                if (B.includes(M)) {
-                  const N = B.replace(M, "");
-                  N.trim() !== "" && T.push(tt(L, N));
+              const D = le(c.query?.where ?? ""), B = `_${O.Average}`;
+              Object.keys(T).forEach((M) => {
+                if (M.includes(B)) {
+                  const L = M.replace(B, "");
+                  L.trim() !== "" && w.push(tt(D, L));
                 }
               });
               break;
             }
           }
           const A = [u].flat();
-          let O = A.length === 1 ? A[0] : "";
+          let P = A.length === 1 ? A[0] : "";
           if (d === g.BoxPlotMultiFieldsAndCategory) {
-            const L = `_${P.FirstQuartile}`, M = Object.keys(w).find((B) => B.includes(L));
-            M !== void 0 && (O = M.replace(L, ""));
+            const D = `_${O.FirstQuartile}`, B = Object.keys(T).find((M) => M.includes(D));
+            B !== void 0 && (P = B.replace(D, ""));
           }
-          T.length === 0 && T.push(""), T.forEach((L) => {
-            const M = Dn({
+          w.length === 0 && w.push(""), w.forEach((D) => {
+            const B = Dn({
               chartConfig: r,
               xAxisField: p,
-              yAxisField: O,
-              splitBy: L,
-              dataContext: w,
+              yAxisField: P,
+              splitBy: D,
+              dataContext: T,
               xAxisFieldType: h
             });
-            F.push(M);
+            F.push(B);
           });
         }
         return F;
       },
       []
-    ), x = W(e);
-    if (x !== void 0 && m.length > 0) {
-      const F = Oe(x).idField;
+    ), S = k(e);
+    if (S !== void 0 && m.length > 0) {
+      const F = Oe(S).idField;
       b.push(`${F} IN (${m.join(",")})`);
     }
-    const S = b.join(" OR "), v = { ...i };
-    v.where = Z([v.where, S]), l = await Gi({
+    const x = b.join(" OR "), v = { ...i };
+    v.where = Z([v.where, x]), l = await Gi({
       queryObject: e,
       chartConfig: r,
       queryConfig: v,
@@ -6946,10 +6948,10 @@ async function cd(t) {
       break;
     case y.PieSeries:
       if (E(r.series) === g.PieFromFields) {
-        const { x: m, y: b } = r.series[0], x = wt(f);
-        x.forEach((S) => {
-          m in S && (S[me] = S[m], delete S[m]), b in S && (S[De] = S[b], delete S[b]);
-        }), u.data = { dataItems: x };
+        const { x: m, y: b } = r.series[0], S = wt(f);
+        S.forEach((x) => {
+          m in x && (x[me] = x[m], delete x[m]), b in x && (x[De] = x[b], delete x[b]);
+        }), u.data = { dataItems: S };
       } else
         u.data = { dataItems: f };
       u.count = f.length, h = !0;
@@ -6979,14 +6981,14 @@ async function cd(t) {
       else {
         const m = { ...i };
         if (n !== void 0 && n.length > 0) {
-          const x = n.map(
+          const S = n.map(
             (v) => Bn({
               xAxisField: l[0].x,
               dataContext: v,
               queryObject: e
             })
-          ), S = Z(x, "OR");
-          m.where = Z([m.where, S]);
+          ), x = Z(S, "OR");
+          m.where = Z([m.where, x]);
         }
         u = await Hi({
           queryObject: e,
@@ -7008,13 +7010,13 @@ async function cd(t) {
         }, u.count = 0;
       else {
         const { x: m } = l[0], b = f.map((v, F) => {
-          const { minValue: w, maxValue: T } = v, A = F === f.length - 1 ? "<=" : "<";
-          return `${m} >= ${w} AND ${m} ${A} ${T}`;
-        }), x = Z(b, "OR"), S = { ...i };
-        S.where = Z([S.where, x]), u = await Cn({
+          const { minValue: T, maxValue: w } = v, A = F === f.length - 1 ? "<=" : "<";
+          return `${m} >= ${T} AND ${m} ${A} ${w}`;
+        }), S = Z(b, "OR"), x = { ...i };
+        x.where = Z([x.where, S]), u = await Cn({
           queryObject: e,
           chartConfig: r,
-          queryConfig: S,
+          queryConfig: x,
           options: s,
           errorStrings: o,
           abortKey: d
@@ -7044,7 +7046,7 @@ async function cd(t) {
 async function Gi(t) {
   const { queryObject: e, chartConfig: i, queryConfig: r, options: n, errorStrings: a, abortKey: s } = t;
   let o = { valid: !0 };
-  const d = Bt(i), l = await Ri({
+  const d = Bt(i), l = await Mi({
     queryObject: e,
     queryConfig: r,
     fetchFullBoxPlotData: !d,
@@ -7057,7 +7059,7 @@ async function Gi(t) {
   else {
     const c = { dataItems: [] };
     c.meanLines = l.data.dataItems;
-    const p = Dl(i), u = (await Ri({
+    const p = Dl(i), u = (await Mi({
       queryObject: e,
       queryConfig: r,
       fetchFullBoxPlotData: !0,
@@ -7137,7 +7139,7 @@ async function pd(t) {
           setTimeBinningInfoWhenNotProvided: n?.setTimeBinningInfoWhenNotProvided,
           seriesConfig: p[0],
           queryObject: e
-        }) ? h = await Hi(m) : h = await Ri(m);
+        }) ? h = await Hi(m) : h = await Mi(m);
         break;
       }
       case y.ScatterSeries:
@@ -7374,32 +7376,32 @@ function Sd(t) {
   const { unit: o } = r, d = r.size ?? 1, l = i[0], { x: c } = l;
   let p, u;
   if (Ne(l) && (u = l.temporalBinning?.nullPolicy, p = l.temporalBinning?.timeAggregationType), d > 1 || o === $.Week || o === $.Month || o === $.Year) {
-    const { query: f } = i[0], h = he(i), { statisticType: m } = f?.outStatistics?.[0] ?? di;
-    let b = !1, x = p === re.End ? e.length - 1 : 0;
-    const S = {
-      binFirstOrLastIndex: x,
+    const { query: f } = i[0], h = he(i), { statisticType: m } = f?.outStatistics?.[0] ?? $i;
+    let b = !1, S = p === re.End ? e.length - 1 : 0;
+    const x = {
+      binFirstOrLastIndex: S,
       data: e,
       x: c,
       timeIntervalInfo: r
     };
     for (; !b; ) {
       let v = {};
-      const { binStartDate: F, binEndDate: w, last: T, nextBinFirstOrLastIndex: A, sliceStartIndex: O, sliceEndIndex: L } = p === re.End ? (
+      const { binStartDate: F, binEndDate: T, last: w, nextBinFirstOrLastIndex: A, sliceStartIndex: P, sliceEndIndex: D } = p === re.End ? (
         // When grouping from the end we'll start from the last date and move backward to create the bins
-        gd(S)
+        gd(x)
       ) : (
         // When grouping from the start we'll start from the first date and move forward to create the bins
-        md(S)
+        md(x)
       );
-      if (b = T, v = p === re.End ? v = e[L - 1] : v = e[x], w > a && F < a || F < n && w > n || F >= n && w <= a) {
-        const M = e.slice(O, L).filter((R) => !(C.dateBinModel in R));
+      if (b = w, v = p === re.End ? v = e[D - 1] : v = e[S], T > a && F < a || F < n && T > n || F >= n && T <= a) {
+        const B = e.slice(P, D).filter((R) => !(C.dateBinModel in R));
         h.forEach((R) => {
-          v[R] = bd({ binsToRegroup: M, statisticType: m, y: R, nullPolicy: u });
+          v[R] = bd({ binsToRegroup: B, statisticType: m, y: R, nullPolicy: u });
         });
-        const B = M.map((R) => R[_e]).filter((R) => R !== void 0), N = hs(B);
-        N !== void 0 && (v[_e] = N), v[c] = F, v[C.xAxisField] = F, v[C.dateBinningRange] = [F, w], delete v[C.dateBinModel], s.push(v);
-      } else T && p !== re.End && s.length > 0 && (s[s.length - 1][C.dateBinningRange][1] = s[s.length - 1][C.dateBinningRange][1] + 1);
-      x = A, S.binFirstOrLastIndex = A;
+        const M = B.map((R) => R[_e]).filter((R) => R !== void 0), L = hs(M);
+        L !== void 0 && (v[_e] = L), v[c] = F, v[C.xAxisField] = F, v[C.dateBinningRange] = [F, T], delete v[C.dateBinModel], s.push(v);
+      } else w && p !== re.End && s.length > 0 && (s[s.length - 1][C.dateBinningRange][1] = s[s.length - 1][C.dateBinningRange][1] + 1);
+      S = A, x.binFirstOrLastIndex = A;
     }
     p === re.End && (s = s.reverse());
   } else d === 1 ? s = e.map((f, h) => {
@@ -7473,7 +7475,7 @@ function xd(t) {
     const m = Mn(a);
     if (c === re.End) {
       let b = n[0][l];
-      for (let x = 0; x < h; x += 1)
+      for (let S = 0; S < h; S += 1)
         b = it({
           date: b,
           unit: d,
@@ -7487,7 +7489,7 @@ function xd(t) {
       h > 0 && (p = n[n.length - 1][l]);
     } else {
       let b = n[n.length - 1][l];
-      for (let x = 0; x < h; x += 1)
+      for (let S = 0; S < h; S += 1)
         b = it({
           date: b,
           unit: d,
@@ -7612,10 +7614,10 @@ function* Id(t) {
     ];
     let u = ut.groupByCaseBegin;
     for (let h = 0; h < n.length; h += 1) {
-      const m = n[h], [b, x] = m[C.dateBinningRange], S = It(b), v = It(x);
+      const m = n[h], [b, S] = m[C.dateBinningRange], x = It(b), v = It(S);
       u = Td({
         groupByFieldsForStatistics: u,
-        queryStartDate: S,
+        queryStartDate: x,
         queryEndDate: v,
         dateField: d,
         y: [l].flat()[0],
@@ -7638,7 +7640,7 @@ function* Id(t) {
   }
 }
 async function Ad(t) {
-  const { queryObject: e, data: i, seriesConfig: r, queryConfig: n } = t, a = i, { statisticType: s } = r[0].query?.outStatistics?.[0] ?? di;
+  const { queryObject: e, data: i, seriesConfig: r, queryConfig: n } = t, a = i, { statisticType: s } = r[0].query?.outStatistics?.[0] ?? $i;
   if (s === I.ContinuousPercentile && a.length > 0) {
     const o = Id({
       queryObject: e,
@@ -7647,7 +7649,7 @@ async function Ad(t) {
       queryConfig: n
     }), d = (await Promise.all(o)).flat();
     if (d.length > 0) {
-      const { isInItem: l, expr: c } = ui(d[0].attributes);
+      const { isInItem: l, expr: c } = pi(d[0].attributes);
       l && d.forEach((p) => {
         const u = p.attributes[`${c}`];
         if (u !== void 0) {
@@ -7663,10 +7665,10 @@ async function Ad(t) {
   return a;
 }
 function pr(t) {
-  const { dataItem: e, nullPolicy: i, statField: r, aggregationType: n } = t;
+  const { dataItem: e, nullPolicy: i, statField: r } = t;
   if (r) {
-    const a = e[r];
-    if (n === I.Count && a === 0 || a === void 0 || a === null)
+    const n = e[r];
+    if (n == null)
       switch (!0) {
         case i === Ce.Zero:
           e[r] = 0;
@@ -7682,39 +7684,37 @@ function pr(t) {
 }
 function Bd(t) {
   const { chartConfig: e, queryResults: i, mapToStatField: r, splitByField: n, x: a, y: s, nullPolicy: o, queryObject: d } = t, l = Ur(a), p = Fe(d).find((b) => b.name === a)?.type, u = [], f = e.series[0], h = "temporalBinning" in f ? f.temporalBinning?.trimIncompleteTimeInterval : !1, m = "temporalBinning" in f ? f.temporalBinning?.timeAggregationType : !1;
-  return i.forEach((b, x) => {
-    if (!(h && (x === 0 && m === re.End || x === i.length - 1 && m === re.Start))) {
+  return i.forEach((b, S) => {
+    if (!(h && (S === 0 && m === re.End || S === i.length - 1 && m === re.Start))) {
       const { attributes: v, stackedAttributes: F } = b;
-      let w = v[l.lowerBoundaryAlias], T = v[l.upperBoundaryAlias];
-      const A = w, O = T, L = (B, N) => {
-        let R = B;
-        if (N === H.DateOnly && (typeof B == "string" && B.length === 10 || typeof B == "number"))
+      let T = v[l.lowerBoundaryAlias], w = v[l.upperBoundaryAlias];
+      const A = T, P = w, D = (B, M) => {
+        let L = B;
+        if (M === H.DateOnly && (typeof B == "string" && B.length === 10 || typeof B == "number"))
           if (typeof B == "string") {
-            const k = B.split("-");
-            k.length === 3 && (R = xe.local(Number(k[0]), Number(k[1]), Number(k[2])).valueOf());
+            const R = B.split("-");
+            R.length === 3 && (L = xe.local(Number(R[0]), Number(R[1]), Number(R[2])).valueOf());
           } else
-            R = new Date(B), R = new Date(R.valueOf() + R.getTimezoneOffset() * 6e4), R = xe.local(R.getFullYear(), R.getMonth() + 1, R.getDate()).valueOf();
-        else typeof B == "string" && ["+", "-"].forEach((k) => {
-          k && B.lastIndexOf(k) === B.length - 6 && (R = new Date(B.slice(0, B.lastIndexOf(k))).valueOf());
+            L = new Date(B), L = new Date(L.valueOf() + L.getTimezoneOffset() * 6e4), L = xe.local(L.getFullYear(), L.getMonth() + 1, L.getDate()).valueOf();
+        else typeof B == "string" && ["+", "-"].forEach((R) => {
+          R && B.lastIndexOf(R) === B.length - 6 && (L = new Date(B.slice(0, B.lastIndexOf(R))).valueOf());
         });
-        return R;
+        return L;
       };
-      w = L(w, p), T = L(T, p);
-      const M = f.query?.outStatistics?.[0].statisticType ?? di.statisticType;
-      if (typeof w == "number" && typeof T == "number") {
+      if (T = D(T, p), w = D(w, p), typeof T == "number" && typeof w == "number") {
         const B = { ...v };
-        B[C.originalServerBinningRange] = [A, O], B[a] = w, B[C.xAxisField] = w, B[C.dateBinningRange] = [w, T], delete B[l.lowerBoundaryAlias], delete B[l.upperBoundaryAlias], F && n && !ae(n) && r ? F.forEach((k) => {
-          const _ = k[n];
-          if (_ === null || typeof _ == "string" || typeof _ == "number") {
-            const D = r?.get(_);
-            D !== void 0 && (B[D] = k[Q.outStatistics?.outStatisticFieldName ?? ""], pr({ dataItem: B, statField: D, nullPolicy: o, aggregationType: M }));
+        B[C.originalServerBinningRange] = [A, P], B[a] = T, B[C.xAxisField] = T, B[C.dateBinningRange] = [T, w], delete B[l.lowerBoundaryAlias], delete B[l.upperBoundaryAlias], F && n && !ae(n) && r ? F.forEach((R) => {
+          const G = R[n];
+          if (G === null || typeof G == "string" || typeof G == "number") {
+            const z = r?.get(G);
+            z !== void 0 && (B[z] = R[Q.outStatistics?.outStatisticFieldName ?? ""], pr({ dataItem: B, statField: z, nullPolicy: o }));
           }
-        }) : typeof s == "string" && pr({ dataItem: B, statField: s, nullPolicy: o, aggregationType: M });
-        const { featureExtent: N, featureExtentKey: R } = Rn({
+        }) : typeof s == "string" && pr({ dataItem: B, statField: s, nullPolicy: o });
+        const { featureExtent: M, featureExtentKey: L } = Rn({
           feature: b,
           splitByField: n
         });
-        N && (B[R] = N), u.push(B);
+        M && (B[L] = M), u.push(B);
       }
     }
   }), u;
@@ -7776,10 +7776,10 @@ function Nd(t) {
   let r, n, { dateMinTimestamp: a, dateMaxTimestamp: s } = e;
   if (a && s) {
     typeof a == "string" && (a = new Date(a).valueOf()), typeof s == "string" && (s = new Date(s).valueOf());
-    const o = Dd(i), d = (s - a) / o, l = hr.findIndex((x) => x.threshold > d), c = hr[l], { unitMs: p, preferredIntervalSize: u } = c;
+    const o = Dd(i), d = (s - a) / o, l = hr.findIndex((S) => S.threshold > d), c = hr[l], { unitMs: p, preferredIntervalSize: u } = c;
     ({ unit: r } = c);
     const f = d / p, h = u.findIndex(
-      (x) => x >= f
+      (S) => S >= f
     ), m = u[h], b = h === 0 ? u[0] : u[h - 1];
     n = m - f < f - b ? m : b;
   }
@@ -7790,7 +7790,7 @@ function Od(t) {
   let n = !1;
   if (Ne(e) && i) {
     const { unit: a, size: s } = e.temporalBinning ?? {};
-    n = !Ii(a, s) && r === !0;
+    n = !Ti(a, s) && r === !0;
   }
   return n;
 }
@@ -7865,17 +7865,17 @@ function Rd(t, e) {
 function $d(t, e) {
   const i = e, r = he(t), n = r.length === 1;
   return r.forEach((a) => {
-    const s = Ft(n ? void 0 : a), o = i[s[P.FirstQuartile]], d = i[s[P.ThirdQuartile]];
-    Number.isFinite(o) && Number.isFinite(d) && d >= o && (i[s[P.IQR]] = d - o);
+    const s = Ft(n ? void 0 : a), o = i[s[O.FirstQuartile]], d = i[s[O.ThirdQuartile]];
+    Number.isFinite(o) && Number.isFinite(d) && d >= o && (i[s[O.IQR]] = d - o);
   }), i;
 }
 function qd(t, e) {
   const i = e.series[0], r = t;
   if (i.type === y.HeatSeries) {
     const { x: n, y: a } = i;
-    r[j.xField] = r[n]?.toString(), delete r[n], r[j.yField] = r[a]?.toString(), delete r[a];
+    r[V.xField] = r[n]?.toString(), delete r[n], r[V.yField] = r[a]?.toString(), delete r[a];
     const s = i.query?.outStatistics?.[0]?.outStatisticFieldName;
-    s && (r[j.valueField] = r[s], delete r[s]);
+    s && (r[V.valueField] = r[s], delete r[s]);
   }
   return r;
 }
@@ -7980,7 +7980,7 @@ function Ud(t) {
     yAxisValueFormat: p
   } = t;
   let u, f;
-  l !== g.PieFromFields && (s && (typeof i == "string" || typeof i == "number") && (u = Oi(i, s)), o && d === y.HeatSeries && typeof a == "string" && (typeof r == "string" || typeof r == "number") && (f = Oi(r, o)), u !== void 0 && u !== i && (typeof u != "string" || !ce(c)) && (e[C.originalCategoryValue] = e[n], e[n] = u), typeof a == "string" && !ce(p) && f !== void 0 && f !== r && (e[C.originalYCategoryValue] = e[a], e[a] = f));
+  l !== g.PieFromFields && (s && (typeof i == "string" || typeof i == "number") && (u = Ni(i, s)), o && d === y.HeatSeries && typeof a == "string" && (typeof r == "string" || typeof r == "number") && (f = Ni(r, o)), u !== void 0 && u !== i && (typeof u != "string" || !ce(c)) && (e[C.originalCategoryValue] = e[n], e[n] = u), typeof a == "string" && !ce(p) && f !== void 0 && f !== r && (e[C.originalYCategoryValue] = e[a], e[a] = f));
 }
 function Hd(t) {
   let e;
@@ -7999,50 +7999,50 @@ function $n(t) {
     showMean: d,
     chartLimits: l,
     fieldList: c
-  } = t, { series: p } = r, u = E(p), f = q(p), { x: h } = p[0], m = "y" in p[0] ? p[0].y : void 0, b = p[0].query?.outStatistics ?? [], x = ze(r?.axes?.[0]?.valueFormat), { originalYCategoryValue: S, originalCategoryValue: v, originalDateValue: F } = C, w = Ni(e, h), T = typeof m == "string" ? Ni(e, m) : void 0, O = Ko(c ?? []).includes(h), L = [];
-  let M = 0;
-  const B = /* @__PURE__ */ new Set(), { maxCategoryCount: N } = yt(l), R = _d({ queryResponse: i, chartConfig: r, maxCategoryCount: N });
-  for (let k = 0; R[k] && k < R.length && !(o !== void 0 && M >= o); k += 1) {
-    M += jd(u, r);
-    const _ = R[k];
-    let D = { ..._.attributes };
-    if (Gd({ attributes: D, uniqueCategoryList: B, maxCategoryCount: N, x: h, chartSubType: u }))
+  } = t, { series: p } = r, u = E(p), f = q(p), { x: h } = p[0], m = "y" in p[0] ? p[0].y : void 0, b = p[0].query?.outStatistics ?? [], S = ze(r?.axes?.[0]?.valueFormat), { originalYCategoryValue: x, originalCategoryValue: v, originalDateValue: F } = C, T = Di(e, h), w = typeof m == "string" ? Di(e, m) : void 0, P = Ko(c ?? []).includes(h), D = [];
+  let B = 0;
+  const M = /* @__PURE__ */ new Set(), { maxCategoryCount: L } = yt(l), R = _d({ queryResponse: i, chartConfig: r, maxCategoryCount: L });
+  for (let G = 0; R[G] && G < R.length && !(o !== void 0 && B >= o); G += 1) {
+    B += jd(u, r);
+    const z = R[G];
+    let N = { ...z.attributes };
+    if (Gd({ attributes: N, uniqueCategoryList: M, maxCategoryCount: L, x: h, chartSubType: u }))
       continue;
-    if (Ed(D, p), u === g.PieFromFields || u === g.BarAndLineFromFields)
-      D = kd(D, b);
+    if (Ed(N, p), u === g.PieFromFields || u === g.BarAndLineFromFields)
+      N = kd(N, b);
     else if (typeof m == "string" && u === g.BarAndLineSplitByNoAggregation) {
-      const Se = W(e), { idField: gt, isTraditionalTypeOID: gi } = Oe(Se);
-      Wd({ dataItem: D, splitByField: a, y: m, fieldOID: gi ? gt : void 0 });
+      const Se = k(e), { idField: gt, isTraditionalTypeOID: mi } = Oe(Se);
+      Wd({ dataItem: N, splitByField: a, y: m, fieldOID: mi ? gt : void 0 });
     } else m && (u === g.BoxPlotMonoField || u === g.BoxPlotMonoFieldAndCategory || u === g.BoxPlotMonoFieldAndSplitBy || u === g.BoxPlotMonoFieldAndCategoryAndSplitBy) && Vd(
-      D,
+      N,
       typeof m == "string" ? m : m[0]
     );
-    zd({ attributes: D, showMean: d, chartSubType: u });
-    let J = D[h];
-    const we = typeof m == "string" ? D[m] : void 0;
-    J === null && p[0]?.query?.fetchNullValues === !0 && u !== g.PieFromFields && (D[v] = null, J = C.nullValue), x || (O && typeof J == "string" ? J = new Date(J).valueOf() : s && (J = Pd(D))), typeof J == "string" && c?.find((Se) => Se.name === h)?.type === H.TimeOnly && (D[v] = J, J = Hd(J));
-    const { outStatisticFieldName: Pe } = Q.outStatistics ?? {}, { featureExtent: U, featureExtentKey: Me } = Rn({ feature: _, splitByField: a, chartSubType: u });
-    if (U && (D[Me] = U), u === g.BarAndLineSplitBy && Pe !== void 0) {
-      const Se = D[a], gt = n?.get(Se);
-      gt !== void 0 && (Se === a && (D[C.technicalFieldSplitByField] = D[gt]), D[gt] = D[Pe]), delete D[Pe];
-    } else (u === g.PieNoAggregation || u === g.BarAndLineNoAggregation || u === g.BarAndLineSplitByNoAggregation) && (O ? D[F] = J : J !== C.nullValue && (D[v] = J), Wa({ isXAxis: !0, chartType: f, valueFormat: r.axes?.[0]?.valueFormat }) && (D[C.xAxisField] = `${J}-${k}`), D[Q.uniqueIdsName] = _.getObjectId());
-    f === y.BoxPlotSeries && (D = $d(p, D)), f === y.PieSeries && typeof J == "number" && (D[v] === void 0 && (D[v] = D[h]), J = `${J}`), J !== void 0 && (D[v] === void 0 && (D[v] = D[h]), D[h] === null ? D[h] = f === y.HeatSeries ? "null" : C.nullValue : D[h] = J, Ud({
-      attributes: D,
+    zd({ attributes: N, showMean: d, chartSubType: u });
+    let J = N[h];
+    const we = typeof m == "string" ? N[m] : void 0;
+    J === null && p[0]?.query?.fetchNullValues === !0 && u !== g.PieFromFields && (N[v] = null, J = C.nullValue), S || (P && typeof J == "string" ? J = new Date(J).valueOf() : s && (J = Pd(N))), typeof J == "string" && c?.find((Se) => Se.name === h)?.type === H.TimeOnly && (N[v] = J, J = Hd(J));
+    const { outStatisticFieldName: Pe } = Q.outStatistics ?? {}, { featureExtent: U, featureExtentKey: Me } = Rn({ feature: z, splitByField: a, chartSubType: u });
+    if (U && (N[Me] = U), u === g.BarAndLineSplitBy && Pe !== void 0) {
+      const Se = N[a], gt = n?.get(Se);
+      gt !== void 0 && (Se === a && (N[C.technicalFieldSplitByField] = N[gt]), N[gt] = N[Pe]), delete N[Pe];
+    } else (u === g.PieNoAggregation || u === g.BarAndLineNoAggregation || u === g.BarAndLineSplitByNoAggregation) && (P ? N[F] = J : J !== C.nullValue && (N[v] = J), Wa({ isXAxis: !0, chartType: f, valueFormat: r.axes?.[0]?.valueFormat }) && (N[C.xAxisField] = `${J}-${G}`), N[Q.uniqueIdsName] = z.getObjectId());
+    f === y.BoxPlotSeries && (N = $d(p, N)), f === y.PieSeries && typeof J == "number" && (N[v] === void 0 && (N[v] = N[h]), J = `${J}`), J !== void 0 && (N[v] === void 0 && (N[v] = N[h]), N[h] === null ? N[h] = f === y.HeatSeries ? "null" : C.nullValue : N[h] = J, Ud({
+      attributes: N,
       xValue: J,
       yValue: we,
       x: h,
       y: m,
-      xFieldDomain: w,
-      yFieldDomain: T,
+      xFieldDomain: T,
+      yFieldDomain: w,
       chartType: f,
       chartSubType: u,
       xAxisValueFormat: r.axes?.[0].valueFormat,
       yAxisValueFormat: r.axes?.[1]?.valueFormat
-    }), f === y.HeatSeries && typeof m == "string" && D[m] === null && (D[m] = "null", D[S] = null), D[C.xAxisField] === void 0 && (D[C.xAxisField] = D[h])), D = qd(D, r), L.push(D);
+    }), f === y.HeatSeries && typeof m == "string" && N[m] === null && (N[m] = "null", N[x] = null), N[C.xAxisField] === void 0 && (N[C.xAxisField] = N[h])), N = qd(N, r), D.push(N);
   }
-  return L;
+  return D;
 }
-async function hi(t) {
+async function yi(t) {
   const {
     queryObject: e,
     uniqueQuery: i,
@@ -8062,7 +8062,7 @@ async function hi(t) {
     queryConfig: i,
     featureCount: s,
     abortKey: a
-  }), x = Fe(e, c), { x: S } = u[0];
+  }), S = Fe(e, c), { x } = u[0];
   return h = $n({
     queryObject: e,
     queryResponse: b,
@@ -8070,11 +8070,11 @@ async function hi(t) {
     mapToStatField: n,
     splitByField: m,
     isTimeBinningSeries: o,
-    fieldList: x,
+    fieldList: S,
     resultLimit: i.num,
     showMean: d,
     chartLimits: l
-  }), f !== g.BarAndLineSplitByNoAggregation && f !== g.BarAndLineFromFields && (m !== "" && (h = kt({ data: h, x: S, splitByField: m })), h = Rd(
+  }), f !== g.BarAndLineSplitByNoAggregation && f !== g.BarAndLineFromFields && (m !== "" && (h = kt({ data: h, x, splitByField: m })), h = Rd(
     h,
     u
   )), h;
@@ -8086,11 +8086,11 @@ async function qn(t) {
     (f) => f.statisticType !== I.EnvelopeAggregate
   ).length ?? 0, p = u) : p = await co({ queryObject: i, x: l, chartSubType: d, queryConfig: r, isGaugeByFeature: s }), p !== void 0) {
     const f = d === g.BoxPlotMonoField || d === g.BoxPlotMonoFieldAndCategory || d === g.BoxPlotMonoFieldAndSplitBy;
-    u = Ai(d) && !f ? p * c : p;
+    u = Ii(d) && !f ? p * c : p;
   }
   return a === rt.RenderUpToTheLimit && u !== void 0 && n !== void 0 && n < u && (u = n, p = Math.ceil(u / c)), { categoryOrDateCount: p, elementCount: u };
 }
-async function Ri(t) {
+async function Mi(t) {
   const {
     chartConfig: e,
     queryConfig: i,
@@ -8100,109 +8100,109 @@ async function Ri(t) {
     abortKey: s,
     fieldList: o,
     preFetchedQueryResponse: d
-  } = t, l = Bt(e), { chartLimits: c, usePopupTemplateFieldsInfo: p } = n ?? {}, u = n?.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, { behaviorAfterLimit: f } = c ?? {};
-  let h;
-  const m = { valid: !0 };
-  let b, x = !1;
-  const S = e.series, v = S[0], F = E(e.series);
+  } = t, l = Bt(e), { chartLimits: c, usePopupTemplateFieldsInfo: p } = n ?? {}, u = n?.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, f = !(n?.hideZeroCountCategories ?? !u), { behaviorAfterLimit: h } = c ?? {};
+  let m;
+  const b = { valid: !0 };
+  let S, x = !1;
+  const v = e.series, F = v[0], T = E(e.series);
   if (de(a))
-    h = q(S) === y.BarSeries ? await Dc(t) : m;
+    m = q(v) === y.BarSeries ? await Dc(t) : b;
   else {
-    if (v !== void 0) {
-      const w = q(S), { uniqueQuery: T, mapToStatField: A } = _i({
+    if (F !== void 0) {
+      const w = q(v), { uniqueQuery: A, mapToStatField: P } = _i({
         chartConfig: e,
         queryObject: a,
         queryConfig: i,
         fetchFullBoxPlotData: r,
         options: n
       });
-      let { categoryOrDateCount: O, elementCount: L } = await qn({
+      let { categoryOrDateCount: D, elementCount: B } = await qn({
         chartConfig: e,
         queryObject: a,
         queryConfig: i,
-        behaviorAfterLimit: f,
-        numberMaxOfFeaturesToFetch: T.num
+        behaviorAfterLimit: h,
+        numberMaxOfFeaturesToFetch: A.num
       });
-      const M = !Number.isFinite(L);
-      let B = M || Ge({
-        count: L ?? 0,
-        seriesCount: S.length,
+      const M = !Number.isFinite(B);
+      let L = M || Ge({
+        count: B ?? 0,
+        seriesCount: v.length,
         chartType: w,
         chartLimits: c
       });
-      if (B && (b = await hi({
+      if (L && (S = await yi({
         queryObject: a,
-        uniqueQuery: T,
+        uniqueQuery: A,
         chartConfig: e,
         preFetchedQueryResponse: d,
-        mapToStatField: A,
-        elementCount: L,
+        mapToStatField: P,
+        elementCount: B,
         isTimeBinningSeries: !1,
         showMean: l,
         chartLimits: c,
         usePopupTemplateFieldsInfo: p,
         abortKey: s
-      }), ye(e) && b !== void 0 && (m.data = await _l({
-        data: b,
+      }), ye(e) && S !== void 0 && (b.data = await _l({
+        data: S,
         queryObject: a,
         fetchFullBoxPlotData: r,
-        uniqueQuery: T,
+        uniqueQuery: A,
         chartConfig: e,
-        elementCount: L,
+        elementCount: B,
         chartLimits: c,
         abortKey: s
-      }), c?.maxBoxPlotOutlierLimit !== void 0 && (B = (m.data.outliers ?? []).length <= c.maxBoxPlotOutlierLimit, x = !B)), M && (O = b.length, L = Ai(F) ? O * S.length : O, B = Ge({
-        count: L,
-        seriesCount: S.length,
+      }), c?.maxBoxPlotOutlierLimit !== void 0 && (L = (b.data.outliers ?? []).length <= c.maxBoxPlotOutlierLimit, x = !L)), M && (D = S.length, B = Ii(T) ? D * v.length : D, L = Ge({
+        count: B,
+        seriesCount: v.length,
         chartType: w,
         chartLimits: c
-      })), B)) {
+      })), L)) {
         if (w === y.PieSeries) {
-          F === g.PieFromFields && (b = ri({
-            dataToConvert: b[0],
+          T === g.PieFromFields && (S = ri({
+            dataToConvert: S[0],
             x: me,
             y: De,
             fieldList: o
           }));
-          let N = "";
-          F === g.PieFromFields ? N = De : "y" in v && typeof v.y == "string" && (N = v.y), Cs(b, N) ? m.data = { dataItems: b } : Nl(m, V.PieChartMixOfNegativePositiveSlices);
-        } else if ((w === y.RadarSeries || w === y.BarSeries || w === y.LineSeries || w === y.ComboLineAndBarSeries) && (F === g.BarAndLineFromFields && "y" in v && typeof v.y == "string" ? b = ri({
-          dataToConvert: b[0],
-          x: v.x,
-          y: v.y,
+          let R = "";
+          T === g.PieFromFields ? R = De : "y" in F && typeof F.y == "string" && (R = F.y), Cs(S, R) ? b.data = { dataItems: S } : Nl(b, W.PieChartMixOfNegativePositiveSlices);
+        } else if ((w === y.RadarSeries || w === y.BarSeries || w === y.LineSeries || w === y.ComboLineAndBarSeries) && (T === g.BarAndLineFromFields && "y" in F && typeof F.y == "string" ? S = ri({
+          dataToConvert: S[0],
+          x: F.x,
+          y: F.y,
           fieldList: o
-        }) : b = await fd({
+        }) : S = await fd({
           queryObject: a,
-          seriesData: b,
+          seriesData: S,
           chartConfig: e,
           queryConfig: i,
-          categoryOrDateCount: O,
-          behaviorAfterLimit: f,
+          categoryOrDateCount: D,
+          behaviorAfterLimit: h,
           abortKey: s
-        }), L = Ai(F) ? b.length * S.length : b.length, B = Ge({
-          count: L,
-          seriesCount: S.length,
+        }), B = Ii(T) ? S.length * v.length : S.length, L = Ge({
+          count: B,
+          seriesCount: v.length,
           chartType: w,
           chartLimits: c
-        }), B)) {
-          u && (b = yd(b, e));
-          let N = {};
-          if (Ne(v)) {
-            const { size: R, unit: k } = v.temporalBinning ?? {};
-            R !== void 0 && k !== void 0 && (N = { size: R, unit: k });
+        }), L)) {
+          f && (S = yd(S, e));
+          let R = {};
+          if (Ne(F)) {
+            const { size: G, unit: z } = F.temporalBinning ?? {};
+            G !== void 0 && z !== void 0 && (R = { size: G, unit: z });
           }
-          m.data = { dataItems: b, timeIntervalInfo: N };
+          b.data = { dataItems: S, timeIntervalInfo: R };
         }
       }
-      B || si({
-        dataInfo: m,
+      L || si({
+        dataInfo: b,
         chartType: w,
         subError: { outlierLimit: x }
-      }), m.count = L;
+      }), b.count = B;
     }
-    h = m;
+    m = b;
   }
-  return h;
+  return m;
 }
 function Qd(t) {
   let e;
@@ -8220,18 +8220,18 @@ function Jd(t) {
   const { dataItems: e, valueField: i, filterOutZero: r } = t, n = [null];
   r && n.push(0);
   const a = new Set(
-    e.filter((o) => !n.includes(o[i])).map((o) => o[j.xField])
+    e.filter((o) => !n.includes(o[i])).map((o) => o[V.xField])
   ), s = new Set(
-    e.filter((o) => !n.includes(o[i])).map((o) => o[j.yField])
+    e.filter((o) => !n.includes(o[i])).map((o) => o[V.yField])
   );
   return e.filter(
-    (o) => a.has(o[j.xField]) && s.has(o[j.yField])
+    (o) => a.has(o[V.xField]) && s.has(o[V.yField])
   );
 }
 function Kd(t) {
   const { dataItems: e, xUniqueValues: i, yUniqueValues: r, valueField: n, emptyCellValue: a, x: s, y: o, queryObject: d } = t, l = [], c = /* @__PURE__ */ new Set();
   for (const p of e) {
-    const u = p[C.originalCategoryValue] !== void 0 ? p[C.originalCategoryValue] : p[j.xField], f = p[C.originalYCategoryValue] !== void 0 ? p[C.originalYCategoryValue] : p[j.yField];
+    const u = p[C.originalCategoryValue] !== void 0 ? p[C.originalCategoryValue] : p[V.xField], f = p[C.originalYCategoryValue] !== void 0 ? p[C.originalYCategoryValue] : p[V.yField];
     c.add(`${u}|${f}`);
   }
   for (const p of i) {
@@ -8251,8 +8251,8 @@ function Kd(t) {
         l.push({
           [C.originalCategoryValue]: p === null ? null : p,
           [C.originalYCategoryValue]: f === null ? null : f,
-          [j.xField]: p === null ? "null" : m,
-          [j.yField]: f === null ? "null" : b,
+          [V.xField]: p === null ? "null" : m,
+          [V.yField]: f === null ? "null" : b,
           [n]: a
         });
       }
@@ -8276,13 +8276,13 @@ async function En(t) {
   } = t, d = { valid: !0 };
   let l;
   if (At(e)) {
-    const { nullPolicy: c } = e, p = e.series[0], { x: u, y: f, query: h, xTemporalBinning: m, yTemporalBinning: b } = p, x = h?.outStatistics?.[0]?.outStatisticFieldName ?? "", S = h?.outStatistics?.[0]?.statisticType ?? I.Count;
+    const { nullPolicy: c } = e, p = e.series[0], { x: u, y: f, query: h, xTemporalBinning: m, yTemporalBinning: b } = p, S = h?.outStatistics?.[0]?.outStatisticFieldName ?? "", x = h?.outStatistics?.[0]?.statisticType ?? I.Count;
     i?.outStatistics?.[0] && In(i.outStatistics[0]) && !("statisticParameters" in i?.outStatistics[0]) && (i.outStatistics[0].statisticParameters = {
       value: C.defaultStatParameterValue
     });
-    const v = Yd(e), F = j.valueField, w = c === Ce.Zero ? 0 : null;
+    const v = Yd(e), F = V.valueField, T = c === Ce.Zero ? 0 : null;
     if (Fn(e)) {
-      const T = await oo({
+      const w = await oo({
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
@@ -8291,17 +8291,17 @@ async function En(t) {
         abortKey: o
       });
       if (!Ge({
-        count: T?.length ?? 0,
+        count: w?.length ?? 0,
         seriesCount: 1,
         chartType: y.HeatSeries,
         chartLimits: s?.chartLimits
       }))
         si({ dataInfo: d, chartType: y.HeatSeries });
-      else if (typeof T?.[0] == "object") {
+      else if (typeof w?.[0] == "object") {
         const A = Fe(r, s?.usePopupTemplateFieldsInfo);
         l = $n({
           queryObject: r,
-          queryResponse: T,
+          queryResponse: w,
           chartConfig: e,
           splitByField: "",
           isTimeBinningSeries: !1,
@@ -8309,15 +8309,15 @@ async function En(t) {
           resultLimit: i.num,
           fieldList: A
         });
-        const O = await wi({ queryObject: r, queryConfig: i, category: u, abortKey: o }), L = await wi({ queryObject: r, queryConfig: i, category: f, abortKey: o });
-        l.length !== O?.length * L?.length && (l = [
+        const P = await Fi({ queryObject: r, queryConfig: i, category: u, abortKey: o }), D = await Fi({ queryObject: r, queryConfig: i, category: f, abortKey: o });
+        l.length !== P?.length * D?.length && (l = [
           ...l,
           ...Kd({
             dataItems: l,
-            xUniqueValues: O,
-            yUniqueValues: L,
+            xUniqueValues: P,
+            yUniqueValues: D,
             valueField: F,
-            emptyCellValue: w,
+            emptyCellValue: T,
             x: u,
             y: f,
             queryObject: r
@@ -8325,48 +8325,48 @@ async function En(t) {
         ], v && (l = Jd({
           dataItems: l,
           valueField: F,
-          filterOutZero: S === I.Count
+          filterOutZero: x === I.Count
         })));
       }
     } else {
-      const T = await so({
+      const w = await so({
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
         options: s,
         errorStrings: a
-      }), A = b ? Qd(b.unit) : await wi({ queryObject: r, queryConfig: i, category: f, abortKey: o });
-      let O = 0;
-      l = T?.features.flatMap((L) => {
-        const M = [], { attributes: B, stackedAttributes: N } = L, R = [];
-        if (N?.forEach((k) => {
-          const _ = `${k[f]}`;
-          R.push(_), M.push({
-            [j.xField]: `${B[Q.heatChartLowerBoundaryAlias]}`,
-            [j.yField]: _,
-            [F]: k[x]
+      }), A = b ? Qd(b.unit) : await Fi({ queryObject: r, queryConfig: i, category: f, abortKey: o });
+      let P = 0;
+      l = w?.features.flatMap((D) => {
+        const B = [], { attributes: M, stackedAttributes: L } = D, R = [];
+        if (L?.forEach((G) => {
+          const z = `${G[f]}`;
+          R.push(z), B.push({
+            [V.xField]: `${M[Q.heatChartLowerBoundaryAlias]}`,
+            [V.yField]: z,
+            [F]: G[S]
           });
         }), n && A && R.length !== A?.length) {
-          const k = A.filter((_) => !R.includes(_.toString()));
-          v && (k.length !== A.length || R.length === 0) || k.forEach((_) => {
-            Number.isFinite(Number(B[Q.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(_)) && (m?.unit === Te.DayOfMonth && b?.unit === Te.MonthOfYear && ur({
-              day: Number(B[Q.heatChartLowerBoundaryAlias]),
-              month: Number(_),
+          const G = A.filter((z) => !R.includes(z.toString()));
+          v && (G.length !== A.length || R.length === 0) || G.forEach((z) => {
+            Number.isFinite(Number(M[Q.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(z)) && (m?.unit === Te.DayOfMonth && b?.unit === Te.MonthOfYear && ur({
+              day: Number(M[Q.heatChartLowerBoundaryAlias]),
+              month: Number(z),
               includeLeapDay: e.includeLeapDay
             }) || b?.unit === Te.DayOfMonth && m?.unit === Te.MonthOfYear && ur({
-              day: Number(_),
-              month: Number(B[Q.heatChartLowerBoundaryAlias]),
+              day: Number(z),
+              month: Number(M[Q.heatChartLowerBoundaryAlias]),
               includeLeapDay: e.includeLeapDay
-            })) || M.push({
-              [j.xField]: `${B[Q.heatChartLowerBoundaryAlias]}`,
-              [j.yField]: _,
+            })) || B.push({
+              [V.xField]: `${M[Q.heatChartLowerBoundaryAlias]}`,
+              [V.yField]: z,
               [F]: c === Ce.Zero ? 0 : null
             });
           });
         }
-        return O += M.length, M;
+        return P += B.length, B;
       }), Ge({
-        count: O,
+        count: P,
         seriesCount: 1,
         chartType: y.HeatSeries,
         chartLimits: s?.chartLimits
@@ -8408,47 +8408,47 @@ async function Hi(t) {
   if (Ne(p)) {
     const { temporalBinning: b } = p;
     if (r && b) {
-      const { unit: x, size: S } = b;
-      let v = 1, F = { unit: x, size: S }, w = !1;
-      const T = Od({
+      const { unit: S, size: x } = b;
+      let v = 1, F = { unit: S, size: x }, T = !1;
+      const w = Od({
         series: p,
         isTimeBinningSeries: !0,
         setTimeBinningInfoWhenNotProvided: a?.setTimeBinningInfoWhenNotProvided
-      }), A = !qt(r) || T ? await Cd({ queryObject: r, queryConfig: i, x: u }) : void 0;
-      T && A && A.numberOfFeatures > 0 && A.dateRange.dateMaxTimestamp !== void 0 && A.dateRange.dateMinTimestamp !== void 0 && (F = Nd(A), Fe(r).find((R) => R.name === u)?.type === H.DateOnly && F.unit !== void 0 && [
+      }), A = !qt(r) || w ? await Cd({ queryObject: r, queryConfig: i, x: u }) : void 0;
+      w && A && A.numberOfFeatures > 0 && A.dateRange.dateMaxTimestamp !== void 0 && A.dateRange.dateMinTimestamp !== void 0 && (F = Nd(A), Fe(r).find((R) => R.name === u)?.type === H.DateOnly && F.unit !== void 0 && [
         $.Hour,
         $.Minute,
         $.Second
       ].includes(F.unit) && (F.unit = $.Day, F.size = 1), b.size = F.size, b.unit = F.unit);
-      const { uniqueQuery: O, mapToStatField: L } = _i({
+      const { uniqueQuery: P, mapToStatField: D } = _i({
         chartConfig: e,
         queryConfig: i,
         queryObject: r,
         timeIntervalInfo: F,
         options: a
       });
-      let M = Ge({
+      let B = Ge({
         count: v ?? 0,
         seriesCount: c.length,
         chartType: y.LineSeries,
         chartLimits: o
       });
-      if (M) {
+      if (B) {
         if (qt(r)) {
-          const B = s?.[0] instanceof Sa ? s : await fo({
+          const M = s?.[0] instanceof Sa ? s : await fo({
             queryObject: r,
             dateField: u,
             splitByField: f,
-            queryConfig: O,
+            queryConfig: P,
             temporalBinning: b
-          }), N = "y" in p && typeof p.y == "string" ? p.y : void 0;
+          }), L = "y" in p && typeof p.y == "string" ? p.y : void 0;
           if (m = Bd({
             chartConfig: e,
-            queryResults: B,
-            mapToStatField: L,
+            queryResults: M,
+            mapToStatField: D,
             splitByField: f,
             x: u,
-            y: N,
+            y: L,
             nullPolicy: b.nullPolicy,
             queryObject: r
           }), !Ge({
@@ -8457,27 +8457,27 @@ async function Hi(t) {
             chartType: y.LineSeries,
             chartLimits: o
           })) {
-            const R = he(c), k = m.filter(
-              (_) => R.some((D) => D in _ && Number.isFinite(_[D]))
+            const R = he(c), G = m.filter(
+              (z) => R.some((N) => N in z && Number.isFinite(z[N]))
             ).length;
             Ge({
-              count: k,
+              count: G,
               seriesCount: c.length,
               chartType: y.LineSeries,
               chartLimits: o
-            }) || (M = !1);
+            }) || (B = !1);
           }
         } else if (A?.dateRange.dateMinTimestamp && A.dateRange.dateMaxTimestamp) {
-          const { numberOfFinalBinsWithinDataRange: B } = Pn({
+          const { numberOfFinalBinsWithinDataRange: M } = Pn({
             dateMinTimestamp: A.dateRange.dateMinTimestamp,
             dateMaxTimestamp: A.dateRange.dateMaxTimestamp,
             timeIntervalInfo: F
           });
-          v = B * c.length, v = On(v, F.unit), m = await hi({
+          v = M * c.length, v = On(v, F.unit), m = await yi({
             queryObject: r,
-            uniqueQuery: O,
+            uniqueQuery: P,
             chartConfig: e,
-            mapToStatField: L,
+            mapToStatField: D,
             elementCount: v,
             chartLimits: o,
             isTimeBinningSeries: !0,
@@ -8493,9 +8493,9 @@ async function Hi(t) {
             timeIntervalInfo: F
           });
         }
-        Vr(r) && m && m?.length === hd && (w = !0), l === rt.RenderUpToTheLimit && m && (m = Xd({ chartConfig: e, options: a, data: m }));
+        Vr(r) && m && m?.length === hd && (T = !0), l === rt.RenderUpToTheLimit && m && (m = Xd({ chartConfig: e, options: a, data: m }));
       }
-      M || (h.valid = !1, h.invalidType = V.LineChartExceedsLimit), m && m.length > 0 && (m[m.length - 1][C.lastTemporalBin] = !0), h.data = { dataItems: m, timeIntervalInfo: F, serverLimitReached: w }, h.count = v;
+      B || (h.valid = !1, h.invalidType = W.LineChartExceedsLimit), m && m.length > 0 && (m[m.length - 1][C.lastTemporalBin] = !0), h.data = { dataItems: m, timeIntervalInfo: F, serverLimitReached: T }, h.count = v;
     }
   }
   return h;
@@ -8513,7 +8513,7 @@ async function Zd(t) {
     fetchFullBoxPlotData: !s,
     options: a
   });
-  let m = await hi({
+  let m = await yi({
     queryObject: r,
     uniqueQuery: f,
     elementCount: 1,
@@ -8578,16 +8578,16 @@ async function rc(t) {
     dataContextCountDistinctX: p,
     dataContextCountDistinctY: u
   } = C.scatterplotAggregationFields;
-  let f, h, m, b, x;
-  const S = e.get(o), v = e.get(d), F = e.get(l), w = e.get(c);
-  if (S != null && F !== void 0 && F !== null && v !== void 0 && v !== null && w !== void 0 && w !== null && !Number.isNaN(S + v + F + w)) {
-    const { maxScatterPointsAfterAggregation: T } = yt(n?.chartLimits), O = Math.floor(Math.sqrt(T)), L = await ic({
+  let f, h, m, b, S;
+  const x = e.get(o), v = e.get(d), F = e.get(l), T = e.get(c);
+  if (x != null && F !== void 0 && F !== null && v !== void 0 && v !== null && T !== void 0 && T !== null && !Number.isNaN(x + v + F + T)) {
+    const { maxScatterPointsAfterAggregation: w } = yt(n?.chartLimits), P = Math.floor(Math.sqrt(w)), D = await ic({
       queryObject: r,
       chartConfig: i,
       queryConfig: a,
       abortKey: s
     });
-    m = Math.min(L.get(u) ?? Number.NaN, O), b = Math.min(L.get(p) ?? Number.NaN, O), x = b * m, f = v === S ? 0 : (v - S) / (b - 1), h = w === F ? 0 : (w - F) / (m - 1), e.set(C.scatterplotAggregationFields.xStep, f), e.set(C.scatterplotAggregationFields.yStep, h), e.set(C.scatterplotAggregationFields.rowCount, m), e.set(C.scatterplotAggregationFields.columnCount, b), e.set(C.scatterplotAggregationFields.realGridSize, x);
+    m = Math.min(D.get(u) ?? Number.NaN, P), b = Math.min(D.get(p) ?? Number.NaN, P), S = b * m, f = v === x ? 0 : (v - x) / (b - 1), h = T === F ? 0 : (T - F) / (m - 1), e.set(C.scatterplotAggregationFields.xStep, f), e.set(C.scatterplotAggregationFields.yStep, h), e.set(C.scatterplotAggregationFields.rowCount, m), e.set(C.scatterplotAggregationFields.columnCount, b), e.set(C.scatterplotAggregationFields.realGridSize, S);
   }
 }
 function nc(t) {
@@ -8631,33 +8631,33 @@ async function sc(t) {
     queryNumberOfFeatures: m,
     queryNumberOfAggregatedFeatures: b
   } = C.scatterplotAggregationFields;
-  let x;
-  const S = e?.get(p) ?? Number.NaN, v = e?.get(u) ?? Number.NaN, F = e?.get(m) ?? Number.NaN, w = e?.get(f) ?? S, T = e?.get(h) ?? v;
-  if (S != null && w !== void 0 && w !== null && v !== void 0 && v !== null && T !== void 0 && T !== null && !Number.isNaN(S + v + w + T)) {
-    const A = W(r), { idField: O, isTraditionalTypeOID: L } = Oe(A), M = L ? O : "*", B = e?.get(C.scatterplotAggregationFields.xStep), N = e?.get(C.scatterplotAggregationFields.yStep), R = e?.get(C.scatterplotAggregationFields.realGridSize), k = e?.get(C.scatterplotAggregationFields.rowCount), _ = e?.get(C.scatterplotAggregationFields.columnCount), D = /* @__PURE__ */ new Map(), J = Fe(r);
+  let S;
+  const x = e?.get(p) ?? Number.NaN, v = e?.get(u) ?? Number.NaN, F = e?.get(m) ?? Number.NaN, T = e?.get(f) ?? x, w = e?.get(h) ?? v;
+  if (x != null && T !== void 0 && T !== null && v !== void 0 && v !== null && w !== void 0 && w !== null && !Number.isNaN(x + v + T + w)) {
+    const A = k(r), { idField: P, isTraditionalTypeOID: D } = Oe(A), B = D ? P : "*", M = e?.get(C.scatterplotAggregationFields.xStep), L = e?.get(C.scatterplotAggregationFields.yStep), R = e?.get(C.scatterplotAggregationFields.realGridSize), G = e?.get(C.scatterplotAggregationFields.rowCount), z = e?.get(C.scatterplotAggregationFields.columnCount), N = /* @__PURE__ */ new Map(), J = Fe(r);
     if (J?.forEach((U) => {
-      Lt(U) && D.set(U.name, {
+      Lt(U) && N.set(U.name, {
         onStatisticField: U.name,
         outStatisticFieldName: U.name,
         statisticType: I.Maximum
       });
     }), (J.filter((U) => d?.additionalTooltipFields?.includes(U.name)) ?? [])?.forEach((U) => {
-      Lt(U) || D.set(U.name, {
+      Lt(U) || N.set(U.name, {
         onStatisticField: U.name,
         outStatisticFieldName: U.name,
         statisticType: I.Maximum
       });
     }), (await an(A)).forEach((U) => {
-      D.set(U, {
+      N.set(U, {
         onStatisticField: U,
         outStatisticFieldName: U,
         statisticType: I.Maximum
       });
-    }), O !== "" && D.set(O, {
-      onStatisticField: M,
+    }), P !== "" && N.set(P, {
+      onStatisticField: B,
       outStatisticFieldName: b,
       statisticType: I.Count
-    }), D.set(l, {
+    }), N.set(l, {
       onStatisticField: l,
       outStatisticFieldName: l,
       statisticType: I.Maximum
@@ -8665,47 +8665,47 @@ async function sc(t) {
       onStatisticField: c,
       outStatisticFieldName: c,
       statisticType: I.Maximum
-    }), B !== void 0 && N !== void 0) {
+    }), M !== void 0 && L !== void 0) {
       if (a) {
         const U = {
           ...n,
-          outStatistics: [...D.values()]
+          outStatistics: [...N.values()]
         };
-        x = await lo({
+        S = await lo({
           queryObject: r,
           queryConfig: U,
-          xStep: B,
-          xMin: S,
+          xStep: M,
+          xMin: x,
           xMax: v,
           x: l,
           y: c,
-          yStep: N,
+          yStep: L,
           errorStrings: s
         });
-      } else if (k !== void 0 && _ !== void 0) {
+      } else if (G !== void 0 && z !== void 0) {
         let U = 0;
-        const { maxScatterCellsPerQuery: Me, maxScatterCellsPerQueryForStandard: Se } = pi(), gi = await Xo(A) ? Se : Me, bi = [];
-        let Si = !0, bt = S, ot = w, St = "", jt = 1, xi = 1, zt = Number.MAX_SAFE_INTEGER, _t = Number.MIN_SAFE_INTEGER, Gt = Number.MAX_SAFE_INTEGER, Ut = Number.MIN_SAFE_INTEGER;
-        for (; xi <= _ && Si; ) {
-          for (ot = w, jt = 1; jt <= k && Si; ) {
+        const { maxScatterCellsPerQuery: Me, maxScatterCellsPerQueryForStandard: Se } = ci(), mi = await Xo(A) ? Se : Me, gi = [];
+        let bi = !0, bt = x, ot = T, St = "", jt = 1, Si = 1, zt = Number.MAX_SAFE_INTEGER, _t = Number.MIN_SAFE_INTEGER, Gt = Number.MAX_SAFE_INTEGER, Ut = Number.MIN_SAFE_INTEGER;
+        for (; Si <= z && bi; ) {
+          for (ot = T, jt = 1; jt <= G && bi; ) {
             if (St = nc({
               groupByFieldsForStatistics: St,
               x: l,
               y: c,
               xValue: bt,
               yValue: ot,
-              xStep: B,
-              yStep: N,
-              endOfRow: jt === k,
-              endOfColumn: xi === _
-            }), bt < zt && (zt = bt), bt + B > _t && (_t = bt + B), ot < Gt && (Gt = ot), ot + B > Ut && (Ut = ot + N), U += 1, U % gi === 0 || U === R || U === F) {
+              xStep: M,
+              yStep: L,
+              endOfRow: jt === G,
+              endOfColumn: Si === z
+            }), bt < zt && (zt = bt), bt + M > _t && (_t = bt + M), ot < Gt && (Gt = ot), ot + M > Ut && (Ut = ot + L), U += 1, U % mi === 0 || U === R || U === F) {
               St = `${St} ${ut.groupByCaseEnd}`;
               const Zn = {
                 ...n,
                 groupByFieldsForStatistics: [St],
-                outStatistics: [...D.values()]
+                outStatistics: [...N.values()]
               };
-              bi.push(
+              gi.push(
                 ac({
                   chartConfig: i,
                   queryConfig: Zn,
@@ -8716,17 +8716,17 @@ async function sc(t) {
                   yMax: Ut,
                   abortKey: o
                 })
-              ), zt = Number.MAX_SAFE_INTEGER, _t = Number.MIN_SAFE_INTEGER, Gt = Number.MAX_SAFE_INTEGER, Ut = Number.MIN_SAFE_INTEGER, St = "", U === R && (Si = !1);
+              ), zt = Number.MAX_SAFE_INTEGER, _t = Number.MIN_SAFE_INTEGER, Gt = Number.MAX_SAFE_INTEGER, Ut = Number.MIN_SAFE_INTEGER, St = "", U === R && (bi = !1);
             }
-            ot += N, jt += 1;
+            ot += L, jt += 1;
           }
-          bt += B, xi += 1;
+          bt += M, Si += 1;
         }
-        x = (await Promise.all(bi)).flat();
+        S = (await Promise.all(gi)).flat();
       }
     }
   }
-  return x;
+  return S;
 }
 async function oc(t) {
   const { chartConfig: e, queryConfig: i, queryObject: r, abortKey: n } = t, a = e.series[0], { x: s, y: o } = a;
@@ -8737,7 +8737,7 @@ async function oc(t) {
     dataContextYMinField: p,
     dataContextYMaxField: u,
     queryNumberOfFeatures: f
-  } = C.scatterplotAggregationFields, { idField: h, isTraditionalTypeOID: m } = Oe(W(r)), b = m ? h : "*", x = [
+  } = C.scatterplotAggregationFields, { idField: h, isTraditionalTypeOID: m } = Oe(k(r)), b = m ? h : "*", S = [
     {
       statisticType: I.Count,
       onStatisticField: b,
@@ -8754,7 +8754,7 @@ async function oc(t) {
       onStatisticField: s
     }
   ];
-  s !== o && x.push(
+  s !== o && S.push(
     {
       statisticType: I.Minimum,
       outStatisticFieldName: p,
@@ -8766,10 +8766,10 @@ async function oc(t) {
       onStatisticField: o
     }
   );
-  const S = { ...i };
-  return S.outStatistics = x, d = await Vt({
+  const x = { ...i };
+  return x.outStatistics = S, d = await Vt({
     queryObject: r,
-    queryConfig: S,
+    queryConfig: x,
     abortKey: n
   }), s === o && (d.set(p, d.get(l) ?? Number.NaN), d.set(u, d.get(c) ?? Number.NaN)), d;
 }
@@ -8783,40 +8783,40 @@ function lc(t) {
   if (e && "stackedAttributes" in i && i.stackedAttributes) {
     const u = _r(r, n), f = i.attributes[u.lowerBoundaryAlias], h = i.attributes[u.upperBoundaryAlias];
     i.stackedAttributes.forEach((m) => {
-      let b = m[u.stackAlias], x;
-      typeof b == "number" && typeof a == "number" && (b *= a), typeof b == "number" && typeof a == "number" && (x = b + a);
-      const S = m[r], v = m[n];
-      typeof b == "number" && typeof x == "number" && typeof S == "number" && typeof v == "number" && p.push({
+      let b = m[u.stackAlias], S;
+      typeof b == "number" && typeof a == "number" && (b *= a), typeof b == "number" && typeof a == "number" && (S = b + a);
+      const x = m[r], v = m[n];
+      typeof b == "number" && typeof S == "number" && typeof x == "number" && typeof v == "number" && p.push({
         ...m,
-        [r]: Jt({ value: S, valueMin: f, valueMax: h }),
-        [n]: Jt({ value: v, valueMin: b, valueMax: x }),
+        [r]: Jt({ value: x, valueMin: f, valueMax: h }),
+        [n]: Jt({ value: v, valueMin: b, valueMax: S }),
         [o]: Math.min(f, h),
         [d]: Math.max(f, h),
         [l]: b,
-        [c]: x
+        [c]: S
       });
     });
   } else {
-    const { expr: u, isInItem: f } = ui(i.attributes);
+    const { expr: u, isInItem: f } = pi(i.attributes);
     if (f && u && i.attributes[u] !== s) {
-      let [h, m, b, x] = i.attributes[u].split("|");
-      h = Math.min(h, m), m = Math.max(h, m), b = Math.min(b, x), x = Math.max(b, x);
-      const S = {
+      let [h, m, b, S] = i.attributes[u].split("|");
+      h = Math.min(h, m), m = Math.max(h, m), b = Math.min(b, S), S = Math.max(b, S);
+      const x = {
         ...i.attributes,
         [o]: h,
         [d]: m,
         [l]: b,
-        [c]: x
+        [c]: S
       };
-      S[r] = Jt({
-        value: S[r],
+      x[r] = Jt({
+        value: x[r],
         valueMin: h,
         valueMax: m
-      }), S[n] = Jt({
-        value: S[n],
+      }), x[n] = Jt({
+        value: x[n],
         valueMin: b,
-        valueMax: x
-      }), p = [S];
+        valueMax: S
+      }), p = [x];
     }
   }
   return p;
@@ -8834,30 +8834,30 @@ function dc(t) {
     }) : u[0][Q.uniqueIdsName] = p.getObjectId(), u;
   });
   return c = c?.filter((p) => {
-    const { expr: u } = ui(p);
+    const { expr: u } = pi(p);
     return Number.isFinite(p[o]) && Number.isFinite(p[d]) && (u === void 0 || p[u] !== ut.groupByOutKeyword);
   }), c ?? [];
 }
 async function cc(t) {
-  const { queryObject: e, queryConfig: i, chartConfig: r, featureCount: n, abortKey: a } = t, s = r.series[0], { x: o, y: d } = s, l = W(e);
+  const { queryObject: e, queryConfig: i, chartConfig: r, featureCount: n, abortKey: a } = t, s = r.series[0], { x: o, y: d } = s, l = k(e);
   let c = [];
-  const p = Fe(e), u = yi(l).idFields, f = (p?.filter((S) => Lt(S) && S.name !== o && S.name !== d) ?? []).map(
-    (S) => S.name
+  const p = Fe(e), u = fi(l).idFields, f = (p?.filter((x) => Lt(x) && x.name !== o && x.name !== d) ?? []).map(
+    (x) => x.name
   ) ?? [], h = s?.additionalTooltipFields ?? [], m = Array.from(
     /* @__PURE__ */ new Set([o, d, ...u ?? [], ...f, ...h])
   ), b = ue(l);
   if (b && !b.isTable) {
-    const { rendererField: S, rendererNormalizationField: v } = Yo(l?.renderer ?? void 0);
-    ae(S) || m.push(S), ae(v) || m.push(v);
+    const { rendererField: x, rendererNormalizationField: v } = Yo(l?.renderer ?? void 0);
+    ae(x) || m.push(x), ae(v) || m.push(v);
   }
-  const x = {
+  const S = {
     ...i,
     orderByFields: [`${o} ${ne.Ascending}`],
     outFields: m
   };
   return c = await Le({
     queryObject: e,
-    queryConfig: x,
+    queryConfig: S,
     featureCount: n,
     abortKey: a
   }), c;
@@ -8922,7 +8922,7 @@ async function kn(t) {
       numberOfFeatures: f,
       isAggregationMode: h,
       useQueryAttributeBins: m
-    }), x = dc({
+    }), S = dc({
       chartConfig: e,
       rawData: b,
       isAggregationMode: h,
@@ -8930,34 +8930,34 @@ async function kn(t) {
       useQueryAttributeBins: m
     });
     n !== !1 && $t({
-      arrayToSort: x,
+      arrayToSort: S,
       sortingField: e.series[0].x,
       orderBy: ne.Ascending
     });
-    const { r2: S, trendLinePoints: v } = a !== !1 ? await Kr({
-      data: x,
+    const { r2: x, trendLinePoints: v } = a !== !1 ? await Kr({
+      data: S,
       statsMap: l,
       queryConfig: i,
       options: s,
       queryObject: r,
       chartConfig: e
     }) : C.scatterplotSeries;
-    d = { dataItems: x, r2: S, trendLinePoints: v, aggregated: h };
+    d = { dataItems: S, r2: x, trendLinePoints: v, aggregated: h };
   }
   return d;
 }
 function Ft(t) {
   const e = t === void 0 || t === "";
   return {
-    [P.Average]: `${e ? "" : `${t}_`}${P.Average}`,
-    [P.Min]: `${e ? "" : `${t}_`}${P.Min}`,
-    [P.Max]: `${e ? "" : `${t}_`}${P.Max}`,
-    [P.FirstQuartile]: `${e ? "" : `${t}_`}${P.FirstQuartile}`,
-    [P.Median]: `${e ? "" : `${t}_`}${P.Median}`,
-    [P.ThirdQuartile]: `${e ? "" : `${t}_`}${P.ThirdQuartile}`,
-    [P.IQR]: `${e ? "" : `${t}_`}${P.IQR}`,
-    [P.Outlier]: `${e ? "" : `${t}_`}${P.Outlier}`,
-    [P.StandardDeviation]: `${e ? "" : `${t}_`}${P.StandardDeviation}`
+    [O.Average]: `${e ? "" : `${t}_`}${O.Average}`,
+    [O.Min]: `${e ? "" : `${t}_`}${O.Min}`,
+    [O.Max]: `${e ? "" : `${t}_`}${O.Max}`,
+    [O.FirstQuartile]: `${e ? "" : `${t}_`}${O.FirstQuartile}`,
+    [O.Median]: `${e ? "" : `${t}_`}${O.Median}`,
+    [O.ThirdQuartile]: `${e ? "" : `${t}_`}${O.ThirdQuartile}`,
+    [O.IQR]: `${e ? "" : `${t}_`}${O.IQR}`,
+    [O.Outlier]: `${e ? "" : `${t}_`}${O.Outlier}`,
+    [O.StandardDeviation]: `${e ? "" : `${t}_`}${O.StandardDeviation}`
   };
 }
 function Qi(t) {
@@ -8973,10 +8973,10 @@ function Wn(t) {
 function se(t) {
   const { key: e, y: i, chartSubType: r, splitBy: n, splitByValue: a, showOutliers: s, standardizeValues: o } = t;
   let d = a, c = Ft(i)[e];
-  return s === !0 && (e === P.Min || e === P.Max) && (c = `${c}${ps}`), o === !0 && (Wn(r) || e === P.Outlier) && (c = `${c}${us}`), (a === void 0 || `${a}`.trim() === "") && (d = be({ where: n, normalize: !0, escape: !1 })), d !== void 0 && `${d}`.trim() !== "" && (c = `${d}${c !== "" ? `_${c}` : ""}`), c;
+  return s === !0 && (e === O.Min || e === O.Max) && (c = `${c}${ps}`), o === !0 && (Wn(r) || e === O.Outlier) && (c = `${c}${us}`), (a === void 0 || `${a}`.trim() === "") && (d = be({ where: n, normalize: !0, escape: !1 })), d !== void 0 && `${d}`.trim() !== "" && (c = `${d}${c !== "" ? `_${c}` : ""}`), c;
 }
-function Fi(t) {
-  const { dataItem: e, y: i, splitBy: r, showOutliers: n } = t, a = se({ key: P.FirstQuartile, y: i, splitBy: r, showOutliers: n }), s = se({ key: P.ThirdQuartile, y: i, splitBy: r, showOutliers: n });
+function Ci(t) {
+  const { dataItem: e, y: i, splitBy: r, showOutliers: n } = t, a = se({ key: O.FirstQuartile, y: i, splitBy: r, showOutliers: n }), s = se({ key: O.ThirdQuartile, y: i, splitBy: r, showOutliers: n });
   return Number.isFinite(e[a]) || Number.isFinite(e[s]);
 }
 function uc(t) {
@@ -8986,18 +8986,18 @@ function uc(t) {
     case g.BoxPlotMonoField:
     case g.BoxPlotMultiFields:
     case g.BoxPlotMonoFieldAndCategory:
-      s = Fi({ dataItem: i, showOutliers: n });
+      s = Ci({ dataItem: i, showOutliers: n });
       break;
     case g.BoxPlotMultiFieldsAndCategory:
       s = r.some(
-        (o) => Fi({ dataItem: i, y: o, showOutliers: n })
+        (o) => Ci({ dataItem: i, y: o, showOutliers: n })
       );
       break;
     case g.BoxPlotMonoFieldAndSplitBy:
     case g.BoxPlotMultiFieldsAndSplitBy:
     case g.BoxPlotMonoFieldAndCategoryAndSplitBy:
       s = e.some(
-        (o) => Fi({
+        (o) => Ci({
           dataItem: i,
           splitBy: o.query?.where,
           showOutliers: n
@@ -9021,7 +9021,7 @@ function he(t, e) {
     return s !== void 0 && n === g.BarAndLineSplitByNoAggregation && (s = `${s.toString()}_${be({ where: a.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), s;
   }).filter((a) => a !== void 0), Array.from(new Set(i.flat()));
 }
-function mi(t) {
+function hi(t) {
   const { seriesConfig: e, filteredSeriesIds: i, showMean: r } = t;
   let n = [];
   if (r === !0) {
@@ -9101,7 +9101,7 @@ function $f(t) {
             break;
           case y.HeatSeries:
             d = r.some(
-              (l) => Ze(l[j.valueField], i)
+              (l) => Ze(l[V.valueField], i)
             );
             break;
         }
@@ -9146,7 +9146,7 @@ function hc(t) {
   }), { stackedMinY: o, stackedMaxY: s, dataHasNegativeValues: d };
 }
 function mc(t) {
-  const { dataItem: e, ...i } = t, r = se({ key: P.Min, ...i }), n = se({ key: P.Max, ...i }), a = e[r], s = e[n];
+  const { dataItem: e, ...i } = t, r = se({ key: O.Min, ...i }), n = se({ key: O.Max, ...i }), a = e[r], s = e[n];
   return { min: a, max: s };
 }
 function fr(t) {
@@ -9162,21 +9162,21 @@ function fr(t) {
       if ({ min: r, max: n } = Et(p, (f) => f[l]), a.axes?.[0]?.valueFormat.type === y.DateAxisFormat && r !== void 0 && n !== void 0 && ([r, n] = [new Date(r).valueOf(), new Date(n).valueOf()]), c === y.BoxPlotSeries) {
         e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER;
         const f = he(d, o), h = E(d), m = "standardizeValues" in a ? a.standardizeValues === !0 : void 0, b = a.series.map(
-          (x) => x.visible !== !1 ? be({ where: x.query?.where }) : ""
+          (S) => S.visible !== !1 ? be({ where: S.query?.where }) : ""
         );
-        b.length === 0 && b.push(" "), p.forEach((x) => {
-          f.forEach((S) => {
-            const v = h === g.BoxPlotMultiFieldsAndCategory ? S : void 0;
+        b.length === 0 && b.push(" "), p.forEach((S) => {
+          f.forEach((x) => {
+            const v = h === g.BoxPlotMultiFieldsAndCategory ? x : void 0;
             b.forEach((F) => {
-              const { min: w, max: T } = mc({
+              const { min: T, max: w } = mc({
                 y: v,
                 splitByValue: F,
                 chartSubType: h,
                 showOutliers: !1,
                 standardizeValues: m,
-                dataItem: x
+                dataItem: S
               });
-              w != null && w < e && (e = w), T != null && T > i && (i = T);
+              T != null && T < e && (e = T), w != null && w > i && (i = w);
             });
           });
         });
@@ -9196,11 +9196,11 @@ function fr(t) {
           case Ie.Side:
           default: {
             e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER, he(d, o).forEach((m) => {
-              const { min: b, max: x } = Et(
+              const { min: b, max: S } = Et(
                 p,
-                (S) => S[m]
+                (x) => x[m]
               );
-              b !== void 0 && b < e && (e = b), x !== void 0 && x > i && (i = x);
+              b !== void 0 && b < e && (e = b), S !== void 0 && S > i && (i = S);
             });
             break;
           }
@@ -9225,7 +9225,7 @@ function jn(t) {
   }
   return e;
 }
-function $i(t, e) {
+function Ri(t, e) {
   let i = !1;
   return Number.isFinite(t) && t !== Number.MAX_SAFE_INTEGER && Number.isFinite(e) && e !== Number.MIN_SAFE_INTEGER && (i = t <= 0 || e <= 0), i;
 }
@@ -9238,7 +9238,7 @@ function zn(t) {
         chartConfig: e,
         chartData: i
       });
-      n = $i(a, s);
+      n = Ri(a, s);
     }
   } else {
     const a = gc({
@@ -9249,7 +9249,7 @@ function zn(t) {
       chartData: i,
       filteredSeriesIds: a
     });
-    n = $i(s, o);
+    n = Ri(s, o);
   }
   return n;
 }
@@ -9275,7 +9275,7 @@ function Sc(t, e) {
     const a = Ei(t);
     let s = a ? t : t.dataItems;
     if (t !== void 0) {
-      const { originalCategoryValue: o, originalYCategoryValue: d, originalDateValue: l, xAxisField: c } = C, p = i === y.HeatSeries ? j.xField : n.x, u = i === y.HeatSeries ? j.yField : void 0;
+      const { originalCategoryValue: o, originalYCategoryValue: d, originalDateValue: l, xAxisField: c } = C, p = i === y.HeatSeries ? V.xField : n.x, u = i === y.HeatSeries ? V.yField : void 0;
       s = s.map((f) => {
         let h = f[p];
         f[l] !== void 0 ? h = f[l] : f[o] !== void 0 && (h = f[o]);
@@ -9295,7 +9295,7 @@ function yr(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[Q.uniqueIdsName], Object.keys(e).filter(
     (n) => n.includes(C.rendererSymbolField)
   ).forEach((n) => delete e[n]);
-  const r = ui(e);
+  const r = pi(e);
   return r.isInItem && delete e[r.expr ?? ""], e;
 }
 function xc(t, e) {
@@ -9351,7 +9351,7 @@ function vc(t) {
         if (r[0].type === y.HeatSeries)
           i > 0 && c.forEach((p) => {
             o.set(
-              `${p[j.xField]}-${p[j.yField]}`,
+              `${p[V.xField]}-${p[V.yField]}`,
               p
             );
           });
@@ -9377,17 +9377,17 @@ function vc(t) {
   return o.size > 0 && (s = Array.from(o.values())), s;
 }
 async function Cc(t) {
-  const { numberOfQueries: e, selectionOIDs: i, chartConfig: r, queryConfig: n, options: a, errorStrings: s, queryObject: o } = t, { setTimeBinningInfoWhenNotProvided: d } = a ?? {}, { series: l } = r, c = q(l), p = [], { maxOIDsPerSelectionQuery: u } = pi();
+  const { numberOfQueries: e, selectionOIDs: i, chartConfig: r, queryConfig: n, options: a, errorStrings: s, queryObject: o } = t, { setTimeBinningInfoWhenNotProvided: d } = a ?? {}, { series: l } = r, c = q(l), p = [], { maxOIDsPerSelectionQuery: u } = ci();
   for (let h = 0; h < e; h += 1) {
-    const m = h * u, b = (h + 1) * u - 1, x = i.slice(m === 0 ? 0 : m - 1, b), S = { ...n };
-    switch (S.objectIds = x, c) {
+    const m = h * u, b = (h + 1) * u - 1, S = i.slice(m === 0 ? 0 : m - 1, b), x = { ...n };
+    switch (x.objectIds = S, c) {
       case y.HeatSeries:
         p.push(
           En({
             completeHeatChartDataset: !1,
             // we do not want the empty bins to be added for the selection
             chartConfig: r,
-            queryConfig: S,
+            queryConfig: x,
             queryObject: o,
             errorStrings: s,
             options: a
@@ -9409,7 +9409,7 @@ async function Cc(t) {
           "temporalBinning" in v.series[0] && v.series[0].temporalBinning && (v.series[0].temporalBinning.trimIncompleteTimeInterval = !1, qt(o) && (delete v.series[0].temporalBinning.start, delete v.series[0].temporalBinning.end)), p.push(
             Hi({
               chartConfig: v,
-              queryConfig: S,
+              queryConfig: x,
               queryObject: o,
               options: a
             })
@@ -9420,7 +9420,7 @@ async function Cc(t) {
               queryObject: o,
               chartConfig: r,
               options: a,
-              queryConfig: S
+              queryConfig: x
             })
           );
         break;
@@ -9431,7 +9431,7 @@ async function Cc(t) {
             chartConfig: r,
             options: a,
             errorStrings: s,
-            queryConfig: S
+            queryConfig: x
           })
         );
         break;
@@ -9440,7 +9440,7 @@ async function Cc(t) {
           kn({
             queryObject: o,
             chartConfig: r,
-            queryConfig: S,
+            queryConfig: x,
             options: a,
             errorStrings: s,
             sortData: !1,
@@ -9454,7 +9454,7 @@ async function Cc(t) {
         p.push(
           Ll({
             queryObject: o,
-            queryConfig: S,
+            queryConfig: x,
             chartConfig: r,
             x: l[0].x
           })
@@ -9468,14 +9468,14 @@ async function Wf(t) {
   const { updatedPropsSnapshot: e, chartConfig: i, chartData: r, dataWasUpdated: n, queryObject: a, options: s, errorStrings: o } = t, { series: d } = i, { selectionData: l, viewExtentUpdated: c, returnSelectionOIDs: p, chartLimits: u } = s ?? {}, { selectionItems: f, selectionOIDs: h } = l ?? {};
   let m;
   const b = q(d);
-  let x = !1;
+  let S = !1;
   if (e.has("selectionData")) {
-    const { oldValue: F, newValue: w } = e.get("selectionData");
-    x = !Re(F?.selectionOIDs, w?.selectionOIDs);
+    const { oldValue: F, newValue: T } = e.get("selectionData");
+    S = !Re(F?.selectionOIDs, T?.selectionOIDs);
   }
-  const S = b !== y.HistogramSeries && b !== y.HeatSeries && f !== void 0 && f.length > 0 && !(d[0].x in f[0]) && !(me in f[0]) && !(C.boxPlot.boxPlotCategory in f[0]);
-  if (c !== !0 && p !== !1 && h !== void 0 && h.length > 0 && (n === !0 || S || x)) {
-    const F = Yi(r), w = on({
+  const x = b !== y.HistogramSeries && b !== y.HeatSeries && f !== void 0 && f.length > 0 && !(d[0].x in f[0]) && !(me in f[0]) && !(C.boxPlot.boxPlotCategory in f[0]);
+  if (c !== !0 && p !== !1 && h !== void 0 && h.length > 0 && (n === !0 || x || S)) {
+    const F = Yi(r), T = on({
       queryObject: a,
       chartConfig: i,
       runtimeDataFilters: s?.runtimeDataFilters,
@@ -9483,22 +9483,22 @@ async function Wf(t) {
       viewExtent: s?.view?.extent
     });
     if (F !== void 0 && !xs({ dataContext: F[0], chartConfig: i, chartLimits: u }))
-      m = F.filter((T) => {
-        const A = T[Q.uniqueIdsName];
+      m = F.filter((w) => {
+        const A = w[Q.uniqueIdsName];
         return typeof A == "number" || typeof A == "string" ? h?.includes(A) : !1;
       });
-    else if (h?.[0] !== void 0 && w !== void 0) {
-      const { maxOIDsPerSelectionQuery: T } = pi(), A = Math.ceil(h.length / T), O = await Cc({
+    else if (h?.[0] !== void 0 && T !== void 0) {
+      const { maxOIDsPerSelectionQuery: w } = ci(), A = Math.ceil(h.length / w), P = await Cc({
         numberOfQueries: A,
         selectionOIDs: h,
-        queryConfig: w,
+        queryConfig: T,
         queryObject: a,
         options: s,
         errorStrings: o,
         chartConfig: i
       });
       m = vc({
-        dataFetchingResults: O,
+        dataFetchingResults: P,
         numberOfQueries: A,
         series: d
       });
@@ -9508,7 +9508,7 @@ async function Wf(t) {
 }
 const Vf = {
   shouldCheckDataMinMaxForLogScaleOnXAxis: jn,
-  minMaxHasZeroOrNegativeValues: $i,
+  minMaxHasZeroOrNegativeValues: Ri,
   isChartWithZeroOrNegativeValues: zn
 }, vt = {
   $schema: "http://json-schema.org/draft-07/schema#",
@@ -19745,7 +19745,7 @@ async function Un(t) {
     Ae(document.documentElement).t9nLocale,
     qe("./assets/common/t9n"),
     "messages."
-  )).errorStrings, r = W(t);
+  )).errorStrings, r = k(t);
   try {
     await r.load();
   } catch {
@@ -19853,7 +19853,7 @@ function Yn(t) {
       Q.outStatistics.outStatisticFieldName ?? ""
     ];
     let l = [];
-    ye(t) ? l = mi({
+    ye(t) ? l = hi({
       showMean: t.showMean,
       seriesConfig: t.series
     }) : l = t.series.map((p) => "y" in p ? p.y : void 0).filter((p) => p !== void 0).flat(), o ? l.forEach((p) => e.add(p)) : d.push(...l), t.series.forEach((p) => {
@@ -19985,10 +19985,10 @@ const _f = {
   getRequiredFieldNamesFromChartConfig: Yn,
   customizeValidationErrors: Gn
 };
-async function wi(t) {
+async function Fi(t) {
   const { queryObject: e, queryConfig: i, category: r, splitByField: n, chartLimits: a, abortKey: s } = t, o = n !== void 0, d = r !== Nt ? [r] : [];
   o && d.push(n);
-  const l = W(e), { idField: c, isTraditionalTypeOID: p } = Oe(l), u = p ? c : "*", f = {
+  const l = k(e), { idField: c, isTraditionalTypeOID: p } = Oe(l), u = p ? c : "*", f = {
     ...i,
     groupByFieldsForStatistics: Array.from(new Set(d)),
     outStatistics: [
@@ -20017,7 +20017,7 @@ async function wi(t) {
     new Set(
       h.map((b) => b.attributes[o ? n : r])
     )
-  ).sort((b, x) => typeof b == "string" && typeof x == "string" ? b.localeCompare(x) : Number(b) - Number(x));
+  ).sort((b, S) => typeof b == "string" && typeof S == "string" ? b.localeCompare(S) : Number(b) - Number(S));
 }
 const hr = [
   {
@@ -20184,7 +20184,7 @@ async function Dc(t) {
   let a;
   if (r === void 0)
     throw new Error("QueryObject is undefined!");
-  const s = W(r);
+  const s = k(r);
   if (!de(s))
     throw new pe(oe.LayerNotSupported);
   const o = await Lc({
@@ -20195,7 +20195,7 @@ async function Dc(t) {
   if (!o || !d)
     a = {
       valid: !1,
-      invalidType: V.BadData
+      invalidType: W.BadData
     };
   else {
     const l = e.series;
@@ -20211,22 +20211,22 @@ async function Dc(t) {
       }
       const f = [];
       u.forEach((h) => {
-        const m = {}, b = h[0][c], { display: x, original: S } = mr(b, p);
-        m[c] = x, m[C.xAxisField] = x, m[C.originalCategoryValue] = S, l.forEach((v) => {
+        const m = {}, b = h[0][c], { display: S, original: x } = mr(b, p);
+        m[c] = S, m[C.xAxisField] = S, m[C.originalCategoryValue] = x, l.forEach((v) => {
           const F = v.query?.outStatistics?.[0];
           if (!F) {
-            const { name: M } = v;
-            m[M] = h[0][M];
+            const { name: B } = v;
+            m[B] = h[0][B];
             return;
           }
-          let w = h;
-          const T = v.query?.where;
-          T && (w = h.filter((M) => Ac(M, T)));
-          const A = F.statisticType, O = F.onStatisticField, L = F.outStatisticFieldName;
-          m[L] = Bc({
-            features: w,
+          let T = h;
+          const w = v.query?.where;
+          w && (T = h.filter((B) => Ac(B, w)));
+          const A = F.statisticType, P = F.onStatisticField, D = F.outStatisticFieldName;
+          m[D] = Bc({
+            features: T,
             aggregationType: A,
-            onField: O
+            onField: P
           });
         }), f.push(m);
       }), a = {
@@ -20304,13 +20304,13 @@ function Xn(t) {
 export {
   Ne as $,
   Va as A,
-  P as B,
+  O as B,
   g as C,
-  V as D,
+  W as D,
   oe as E,
   Kp as F,
   za as G,
-  j as H,
+  V as H,
   xp as I,
   bp as J,
   Sp as K,
@@ -20320,9 +20320,9 @@ export {
   je as O,
   _a as P,
   Cf as Q,
-  Fi as R,
+  Ci as R,
   xu as S,
-  z as T,
+  j as T,
   bl as U,
   zr as V,
   Ye as W,
@@ -20332,7 +20332,7 @@ export {
   qt as _,
   pe as a,
   Jp as a$,
-  Bi as a0,
+  Ai as a0,
   Yi as a1,
   rl as a2,
   il as a3,
@@ -20350,7 +20350,7 @@ export {
   $p as aF,
   Ha as aG,
   Mt as aH,
-  G as aI,
+  _ as aI,
   Ar as aJ,
   Bp as aK,
   Lp as aL,
@@ -20376,28 +20376,28 @@ export {
   Zu as ae,
   al as af,
   gp as ag,
-  ci as ah,
+  di as ah,
   gc as ai,
   cl as aj,
   Ft as ak,
-  mi as al,
+  hi as al,
   se as am,
   Wi as an,
   yt as ao,
   E as ap,
-  pi as aq,
+  ci as aq,
   dl as ar,
   Pr as as,
   fr as at,
   hc as au,
-  Pi as av,
+  Oi as av,
   Qf as aw,
   Qp as ax,
   ft as ay,
   at as az,
   Xe as b,
   Yo as b$,
-  Ti as b0,
+  wi as b0,
   Ht as b1,
   Np as b2,
   zp as b3,
@@ -20407,10 +20407,10 @@ export {
   jp as b7,
   Mp as b8,
   Gp as b9,
-  W as bA,
+  k as bA,
   Ku as bB,
   ro as bC,
-  yi as bD,
+  fi as bD,
   Uf as bE,
   ue as bF,
   Co as bG,
@@ -20425,7 +20425,7 @@ export {
   mo as bP,
   Hu as bQ,
   ho as bR,
-  Di as bS,
+  Li as bS,
   Lo as bT,
   en as bU,
   Zr as bV,
@@ -20446,9 +20446,9 @@ export {
   Nu as bj,
   Xn as bk,
   ji as bl,
-  Li as bm,
-  Ni as bn,
-  Oi as bo,
+  Bi as bm,
+  Di as bn,
+  Ni as bo,
   nr as bp,
   nn as bq,
   Cu as br,
@@ -20495,7 +20495,7 @@ export {
   zf as cU,
   ei as cV,
   yo as cW,
-  ui as cX,
+  pi as cX,
   zu as cY,
   Lu as cZ,
   st as c_,
@@ -20559,7 +20559,7 @@ export {
   _o as dT,
   hr as dU,
   Gf as dV,
-  wi as dW,
+  Fi as dW,
   sl as dX,
   Iu as dY,
   Zp as dZ,
@@ -20620,7 +20620,7 @@ export {
   Bf as eQ,
   hp as eR,
   bu as eS,
-  Ai as eT,
+  Ii as eT,
   Tt as eU,
   ys as eV,
   ju as eW,