@arcgis/charts-components 5.2.0-next.31 → 5.2.0-next.33

package/dist/chunks/index2.js

@@ -1,6 +1,6 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
 import { isEqual as at, sortBy as Ai, cloneDeep as He, memoize as qt, isArray as ui, isNil as hr, isEmpty as Sr } from "lodash-es";
-import { u as h, k as Fr, r as D, v as Ke, m as Se, p as ye, n as De, q as Te, g as Z, j as br, s as R, t as ee, d as he, a as Xi, G as xr } from "./chart-object-literals.js";
+import { u as S, k as Fr, r as D, v as Ke, m as Se, p as ye, n as De, q as Te, g as Z, j as br, s as R, t as ee, d as he, a as Xi, G as xr } from "./chart-object-literals.js";
 import wi from "@arcgis/core/layers/support/FeatureFilter.js";
 import Cr from "@arcgis/core/smartMapping/statistics/histogram.js";
 import Li from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
@@ -17,17 +17,17 @@ import Pr from "@arcgis/core/portal/Portal.js";
 import * as ea from "@arcgis/core/renderers/support/jsonUtils.js";
 import Lt from "@arcgis/core/request.js";
 import ta from "@arcgis/core/rest/support/FeatureSet.js";
-import { g as _ } from "./series-types.js";
-import { F as C, q as oe, C as F, e as Xt, z as ia, l as ci, o as Pi, v as aa, d as Jt, x as Mr, g as ra, s as Wt, w as Dr, i as Or, r as Ae, t as Vt } from "./index3.js";
+import { g as j } from "./series-types.js";
+import { F as x, q as oe, C as F, e as Xt, z as ia, l as ci, o as Pi, v as aa, d as Jt, x as Mr, g as ra, s as Wt, w as Dr, i as Or, r as Ae, t as Vt } from "./index3.js";
 import Ir from "@arcgis/core/Graphic.js";
 import * as Gt from "@arcgis/core/symbols/support/symbolUtils.js";
 import { f as Kt, h as et, i as _e, e as se, R as U } from "./rest-js-object-literals.js";
 import Er from "@arcgis/core/AttributeBinsGraphic.js";
 import { substitute as Be } from "@arcgis/core/intl.js";
-import { g as Rt, L as lt, az as W, j as Q, r as ut, o as Oe, ax as ei, am as na, aB as sa, aq as qr, s as $t, ay as Vr, b as Rr, a as $r } from "./index.js";
+import { g as Rt, L as lt, aA as W, k as _, s as ut, p as Oe, ay as ei, an as na, aC as sa, ar as qr, t as $t, az as Vr, b as Rr, a as $r } from "./index.js";
 import { unsafeGetElementDirection as kr } from "@arcgis/toolkit/dom";
 import { fetchT9nStringsBundle as mt, getElementLocale as ze, supportedLocales as oa } from "@arcgis/toolkit/intl";
-import { i as la, b as ua, c as ie, a as yt, f as Qr, e as _r } from "./type-guards.js";
+import { i as la, b as ua, d as ie, a as yt, g as Qr, c as _r } from "./type-guards.js";
 import * as ca from "@arcgis/core/core/promiseUtils.js";
 import { g as gt } from "./runtime.js";
 import { linearRegression as jr, linearRegressionLine as Hr, rSquared as zr } from "simple-statistics";
@@ -62,16 +62,16 @@ function sc(t) {
   return t.intlOptions;
 }
 function ne(t) {
-  return t?.type === h.NumberAxisFormat;
+  return t?.type === S.NumberAxisFormat;
 }
 function oc(t) {
   return ne(t) && t.intlOptions?.style === "percent";
 }
 function we(t) {
-  return t?.type === h.CategoryAxisFormat;
+  return t?.type === S.CategoryAxisFormat;
 }
 function je(t) {
-  return t?.type === h.DateAxisFormat;
+  return t?.type === S.DateAxisFormat;
 }
 function lc(t) {
   const { oldConfig: e, newConfig: i, rotationChanged: a } = t;
@@ -108,28 +108,28 @@ function uc(t) {
   const { chartType: e, axesConfig: i, errorStrings: a } = t;
   let r, n;
   switch (e) {
-    case h.GaugeSeries:
+    case S.GaugeSeries:
       r = un, n = "invalidValueFormatForGauge";
       break;
-    case h.ScatterSeries:
+    case S.ScatterSeries:
       r = on, n = "invalidValueFormatForScatterplot";
       break;
-    case h.HistogramSeries:
+    case S.HistogramSeries:
       r = ln, n = "invalidValueFormatForHistogram";
       break;
-    case h.LineSeries:
+    case S.LineSeries:
       r = tn, n = "invalidValueFormatForLineChart";
       break;
-    case h.BarSeries:
+    case S.BarSeries:
       r = an, n = "invalidValueFormatForBarChart";
       break;
-    case h.ComboLineAndBarSeries:
+    case S.ComboLineAndBarSeries:
       r = sn, n = "invalidValueFormatForComboBarLineChart";
       break;
-    case h.BoxPlotSeries:
+    case S.BoxPlotSeries:
       r = rn, n = "invalidValueFormatForBoxPlot";
       break;
-    case h.HeatSeries:
+    case S.HeatSeries:
       r = nn, n = "invalidValueFormatForHeatChart";
       break;
   }
@@ -137,13 +137,13 @@ function uc(t) {
 }
 function cn(t) {
   const { isXAxis: e, chartType: i, valueFormat: a, isAxisForHistogramOverlaySeries: r } = t;
-  return e && (we(a) || i === h.HistogramSeries && !r || i === h.BarSeries && ne(a));
+  return e && (we(a) || i === S.HistogramSeries && !r || i === S.BarSeries && ne(a));
 }
 function We(t) {
-  return _(t?.series) === h.HeatSeries;
+  return j(t?.series) === S.HeatSeries;
 }
 function de(t) {
-  return _(t?.series) === h.BoxPlotSeries;
+  return j(t?.series) === S.BoxPlotSeries;
 }
 function dn(t) {
   return t !== void 0 && t !== Kt.Solid && t !== Kt.Null;
@@ -174,24 +174,24 @@ function cc(t, e) {
   return i;
 }
 const ce = "arcgis_charts_pie_from_fields_name", Ne = "arcgis_charts_pie_from_fields_value", dc = "arcgis_charts_bar_line_from_fields_name", fc = "arcgis_charts_bar_line_from_fields_value", pt = {
-  ...C,
+  ...x,
   titleAndSubtitlePaddingBottom: 5,
   chartPadding: 5,
-  footerContainer: { ...C.footerContainer, paddingTop: 0, paddingBottom: 0 },
-  headerContainer: { ...C.headerContainer, paddingBottom: 18 },
-  chartContainer: { ...C.chartContainer },
-  dataLabel: { ...C.dataLabel, verticalCenter: "bottom" },
+  footerContainer: { ...x.footerContainer, paddingTop: 0, paddingBottom: 0 },
+  headerContainer: { ...x.headerContainer, paddingBottom: 18 },
+  chartContainer: { ...x.chartContainer },
+  dataLabel: { ...x.dataLabel, verticalCenter: "bottom" },
   scrollbarPadding: 12,
   zIndexes: {
-    // setting a high z index so guide will be on top when above is set to true
-    guide: 100,
-    // setting a higher z index for scatterplot trend line so it will be above the bullet markers (for scatterplot)
-    scatterplotTrendLine: 2,
-    // setting layer to 1 so the markers are below the trendline (for scatterplot),
-    // but above the axis line (which is at 0 by default) for line and radar charts)
-    lineSeries: 1,
-    // With default layer 0, thick axis strokes sit under the plot; 30 matches XYChartDefaultTheme foreground layers.
-    axisLineLayer: 30
+    // use this for scatterplot trend line so it will be above the markers
+    // use this for heat chart axis line so that it matches the XYChartDefaultTheme foreground layers
+    // use this for data labels for line/radar series so that they are above the markers
+    // use this for guide labels so that they are above the guide fill regardless of whether the guide is above or below the chart.
+    defaultLayer30: 30,
+    // use this for guide lines so that they are above chart elements when guide is above the chart
+    customLayer10: 10,
+    // use this for line/radar series so markers are above the axis line
+    customLayer5: 5
   },
   verticalSurfaceGuideLabels: {
     // The alignments are directly handled by adjustGuideLabelsPositionCallback()
@@ -249,7 +249,7 @@ const ce = "arcgis_charts_pie_from_fields_name", Ne = "arcgis_charts_pie_from_fi
       symbol: {
         type: _e.SFS,
         style: Kt.Solid,
-        color: C.grayColor
+        color: x.grayColor
       },
       text: "null"
     },
@@ -354,8 +354,8 @@ function yn(t) {
   return t?.capabilities?.queryAttributeBins?.supportsFixedInterval === !0 && t?.capabilities?.queryAttributeBins?.supportsStackBy;
 }
 function xc(t) {
-  const { chartConfig: e, queryObject: i, options: a } = t, r = _(e?.series), n = te(e?.series[0]?.query?.where);
-  return !(r === h.HeatSeries || e && Pe({
+  const { chartConfig: e, queryObject: i, options: a } = t, r = j(e?.series), n = te(e?.series[0]?.query?.where);
+  return !(r === S.HeatSeries || e && Pe({
     xAxisValueFormatType: xe(e),
     setTimeBinningInfoWhenNotProvided: a?.setTimeBinningInfoWhenNotProvided,
     seriesConfig: e.series[0],
@@ -503,10 +503,10 @@ const Qe = [
   "25.0.0",
   "25.1.0"
 ], hn = "1.0.0", Sn = "unrecognized.version", Fn = [
-  h.LineSeries,
-  h.BarSeries,
-  h.ComboLineAndBarSeries,
-  h.RadarSeries
+  S.LineSeries,
+  S.BarSeries,
+  S.ComboLineAndBarSeries,
+  S.RadarSeries
 ];
 function Ut(t, e) {
   let i = 0;
@@ -550,7 +550,7 @@ function Nc(t) {
 }
 function Re(t) {
   const { series: e } = t;
-  let a = ("showMean" in t ? t.showMean : !1) === !0 ? e.find((r) => r.type === h.LineSeries) : e[0];
+  let a = ("showMean" in t ? t.showMean : !1) === !0 ? e.find((r) => r.type === S.LineSeries) : e[0];
   return a ??= e[0], a;
 }
 function Tc(t, e) {
@@ -597,23 +597,23 @@ function pa(t) {
 }
 function xn(t) {
   let e = F.BoxPlotMonoField;
-  const i = t.length === 1, a = t.find((o) => o.type === h.LineSeries) ?? t[0], { x: r } = a, n = "y" in a ? a.y : "", s = a.query?.where;
+  const i = t.length === 1, a = t.find((o) => o.type === S.LineSeries) ?? t[0], { x: r } = a, n = "y" in a ? a.y : "", s = a.query?.where;
   return r === Rt ? typeof n == "object" && n.length > 1 ? Ie(s) ? i && (e = F.BoxPlotMultiFields) : e = F.BoxPlotMultiFieldsAndSplitBy : i ? e = F.BoxPlotMonoField : Ie(s) || (e = F.BoxPlotMonoFieldAndSplitBy) : i ? e = F.BoxPlotMonoFieldAndCategory : Ie(s) ? e = F.BoxPlotMultiFieldsAndCategory : e = F.BoxPlotMonoFieldAndCategoryAndSplitBy, e;
 }
 function k(t) {
   let e = F.NonSpecific;
   if (t?.[0] !== void 0)
-    switch (_(t)) {
-      case h.PieSeries:
+    switch (j(t)) {
+      case S.PieSeries:
         e = ga(t);
         break;
-      case h.RadarSeries:
-      case h.BarSeries:
-      case h.LineSeries:
-      case h.ComboLineAndBarSeries:
+      case S.RadarSeries:
+      case S.BarSeries:
+      case S.LineSeries:
+      case S.ComboLineAndBarSeries:
         e = pa(t);
         break;
-      case h.BoxPlotSeries:
+      case S.BoxPlotSeries:
         e = xn(t);
         break;
     }
@@ -624,8 +624,8 @@ function Cn(t) {
 }
 function vn(t) {
   let e = !0;
-  const i = _(t.series);
-  if (i === h.BarSeries || i === h.LineSeries || i === h.ComboLineAndBarSeries) {
+  const i = j(t.series);
+  if (i === S.BarSeries || i === S.LineSeries || i === S.ComboLineAndBarSeries) {
     const a = k(t.series);
     e = a !== F.BarAndLineNoAggregation && a !== F.BarAndLineSplitByNoAggregation;
   }
@@ -635,25 +635,25 @@ function ha(t) {
   const { statsMap: e, dataContext: i, chartLimits: a } = t;
   let r = !1;
   if (e !== void 0) {
-    const { maxScatterPointsBeforeAggregation: n } = ut(a), { queryNumberOfFeatures: s } = C.scatterplotAggregationFields;
+    const { maxScatterPointsBeforeAggregation: n } = ut(a), { queryNumberOfFeatures: s } = x.scatterplotAggregationFields;
     r = (e.get(s) ?? Number.NaN) >= n;
-  } else i !== void 0 && (r = C.scatterplotAggregationFields.dataContextXMinField in i);
+  } else i !== void 0 && (r = x.scatterplotAggregationFields.dataContextXMinField in i);
   return r;
 }
 function Bn(t) {
   const { dataContext: e, chartConfig: i, chartLimits: a } = t;
   let r = !0;
   if (i !== void 0)
-    switch (_(i.series)) {
-      case h.BarSeries:
-      case h.LineSeries:
-      case h.ComboLineAndBarSeries:
+    switch (j(i.series)) {
+      case S.BarSeries:
+      case S.LineSeries:
+      case S.ComboLineAndBarSeries:
         r = vn(i);
         break;
-      case h.ScatterSeries:
+      case S.ScatterSeries:
         r = ha({ dataContext: e, chartLimits: a });
         break;
-      case h.PieSeries:
+      case S.PieSeries:
         r = Cn(i);
         break;
     }
@@ -662,7 +662,7 @@ function Bn(t) {
 function Pe(t) {
   const { seriesConfig: e, xAxisValueFormatType: i, setTimeBinningInfoWhenNotProvided: a, queryObject: r } = t;
   let n = !1;
-  if (!ie(r) && !(z(r)?.fields?.find((o) => o.name === e.x)?.type === "time-only") && be(e) && e.binTemporalData !== !1 && i === h.DateAxisFormat) {
+  if (!ie(r) && !(z(r)?.fields?.find((o) => o.name === e.x)?.type === "time-only") && be(e) && e.binTemporalData !== !1 && i === S.DateAxisFormat) {
     const o = k([e]);
     if (e.temporalBinning && o !== F.BarAndLineNoAggregation && o !== F.BarAndLineSplitByNoAggregation) {
       const { unit: u, size: c } = e.temporalBinning;
@@ -700,8 +700,8 @@ function Tn(t, e) {
     if (e[0].x !== t[0].x)
       i = !0;
     else {
-      const a = _(t);
-      if (a !== h.HistogramSeries && a !== h.GaugeSeries) {
+      const a = j(t);
+      if (a !== S.HistogramSeries && a !== S.GaugeSeries) {
         const r = ue(t).sort(), n = ue(e).sort();
         i = JSON.stringify(r) !== JSON.stringify(n);
       }
@@ -712,10 +712,10 @@ function Fa(t, e) {
   return (t ?? !1) !== (e ?? !1);
 }
 function ba(t, e) {
-  return be(t.series[0]) && be(e.series[0]) && (t.series[0].binTemporalData ?? C.binTemporalData) !== (e.series[0].binTemporalData ?? C.binTemporalData);
+  return be(t.series[0]) && be(e.series[0]) && (t.series[0].binTemporalData ?? x.binTemporalData) !== (e.series[0].binTemporalData ?? x.binTemporalData);
 }
 function xa(t, e) {
-  const i = t.axes?.[0].valueFormat.type, a = e.axes?.[0].valueFormat.type, r = k(e.series), n = r === F.BarAndLineNoAggregation || r === F.BarAndLineSplitByNoAggregation, s = i === h.DateAxisFormat && a === h.NumberAxisFormat, o = i === h.NumberAxisFormat && a === h.DateAxisFormat;
+  const i = t.axes?.[0].valueFormat.type, a = e.axes?.[0].valueFormat.type, r = k(e.series), n = r === F.BarAndLineNoAggregation || r === F.BarAndLineSplitByNoAggregation, s = i === S.DateAxisFormat && a === S.NumberAxisFormat, o = i === S.NumberAxisFormat && a === S.DateAxisFormat;
   return i !== a && (n || s || o);
 }
 function An(t) {
@@ -753,7 +753,7 @@ function Ln(t, e) {
 function Pn(t) {
   const { previousConfig: e, newConfig: i, fieldList: a } = t, r = e.series[0], n = i.series[0];
   let s = !1;
-  if (r.type === h.ScatterSeries && n.type === h.ScatterSeries && a && a.length > 0) {
+  if (r.type === S.ScatterSeries && n.type === S.ScatterSeries && a && a.length > 0) {
     const o = new Set(r.additionalTooltipFields || []), u = new Set(n.additionalTooltipFields || []);
     if (!at(o, u)) {
       const c = Array.from(u).filter((l) => !o.has(l));
@@ -773,11 +773,11 @@ function Pt(t) {
   return e.position === void 0 && (e.position = pt.heatChart.legend.position), e;
 }
 function Lc(t, e) {
-  const i = t.legend ?? { type: h.Legend }, a = e.legend ?? { type: h.Legend }, r = Pt(i), n = Pt(a);
+  const i = t.legend ?? { type: S.Legend }, a = e.legend ?? { type: S.Legend }, r = Pt(i), n = Pt(a);
   return !at(r, n);
 }
 function Pc(t, e) {
-  const i = t.legend ?? { type: h.Legend }, a = e.legend ?? { type: h.Legend }, r = Pt(i), n = Pt(a);
+  const i = t.legend ?? { type: S.Legend }, a = e.legend ?? { type: S.Legend }, r = Pt(i), n = Pt(a);
   return r.position !== n.position;
 }
 function Mc(t, e) {
@@ -789,8 +789,8 @@ function Dc(t, e) {
 function Oc(t) {
   const { oldConfig: e, newConfig: i } = t;
   let a = !1;
-  const r = e?.series[0], n = i.series[0], s = _(e?.series), o = _(i.series);
-  if (s === h.PieSeries && o === h.PieSeries) {
+  const r = e?.series[0], n = i.series[0], s = j(e?.series), o = j(i.series);
+  if (s === S.PieSeries && o === S.PieSeries) {
     const { slices: u, sliceGrouping: c } = r, { slices: l, sliceGrouping: d } = n, f = u?.map((p) => ({
       sliceId: p.sliceId,
       label: p.label
@@ -835,22 +835,22 @@ function kc(t, e) {
   return Pi(t) !== Pi(e);
 }
 function Qc(t, e) {
-  return (t.showOutliers ?? C.boxPlot.boxPlotOutliersVisibility) !== (e.showOutliers ?? C.boxPlot.boxPlotOutliersVisibility);
+  return (t.showOutliers ?? x.boxPlot.boxPlotOutliersVisibility) !== (e.showOutliers ?? x.boxPlot.boxPlotOutliersVisibility);
 }
 function _c(t, e) {
-  return (t.standardizeValues ?? C.boxPlot.boxPlotStandardizeValuesVisibility) !== (e.standardizeValues ?? C.boxPlot.boxPlotStandardizeValuesVisibility);
+  return (t.standardizeValues ?? x.boxPlot.boxPlotStandardizeValuesVisibility) !== (e.standardizeValues ?? x.boxPlot.boxPlotStandardizeValuesVisibility);
 }
 function jc(t, e) {
   return JSON.stringify(t?.chartRenderer) !== JSON.stringify(e?.chartRenderer);
 }
 function Hc(t, e) {
-  const i = t.axes?.[0].valueFormat.type === h.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0, a = e.axes?.[0].valueFormat.type === h.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0;
+  const i = t.axes?.[0].valueFormat.type === S.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0, a = e.axes?.[0].valueFormat.type === S.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0;
   return i !== a;
 }
 function zc(t, e) {
   let i = !1;
   const a = t.series[0], r = e.series[0];
-  if (a.type === h.ScatterSeries && r.type === h.ScatterSeries) {
+  if (a.type === S.ScatterSeries && r.type === S.ScatterSeries) {
     const { sizePolicy: n } = a, { sizePolicy: s } = r;
     i = JSON.stringify(n) !== JSON.stringify(s);
   }
@@ -859,7 +859,7 @@ function zc(t, e) {
 function Wc(t, e) {
   let i = !1;
   const a = t.series[0], r = e.series[0];
-  if (a.type === h.ScatterSeries && r.type === h.ScatterSeries) {
+  if (a.type === S.ScatterSeries && r.type === S.ScatterSeries) {
     const { sizePolicy: n } = a, { sizePolicy: s } = r;
     i = n === void 0 && s !== void 0 || n !== void 0 && s === void 0 || n?.field !== s?.field;
   }
@@ -877,9 +877,9 @@ function Gc(t) {
     selectionData: u,
     setTimeBinningInfoWhenNotProvided: c,
     chartLimits: l
-  } = t, { series: d } = i, { series: f } = e, m = _(d);
+  } = t, { series: d } = i, { series: f } = e, m = j(d);
   let y = !1, g = !1, p = !1;
-  const S = {
+  const h = {
     common: {
       layerChanged: !1,
       queryChanged: !1,
@@ -905,22 +905,22 @@ function Gc(t) {
       tooltipFieldsChanged: !1
     }
   };
-  switch (S.common.queryChanged = Sa({
+  switch (h.common.queryChanged = Sa({
     previousConfig: e,
     newConfig: i,
     behaviorAfterLimit: l?.behaviorAfterLimit
-  }), S.common.configFiltersChanged = Nn(e, i), S.common.xOrYChanged = Tn(f, d), S.common.filterBySelectionChanged = Fa(
+  }), h.common.configFiltersChanged = Nn(e, i), h.common.xOrYChanged = Tn(f, d), h.common.filterBySelectionChanged = Fa(
     a,
     o
-  ), S.common.dataForFilterBySelectionChanged = Mn({
+  ), h.common.dataForFilterBySelectionChanged = Mn({
     previousSelectionOIDs: r,
     selectionData: u,
     filterBySelection: o
-  }), S.common.binTemporalDataChanged = ba(e, i), S.common.valueFormatChangeRequiresNewData = xa(
+  }), h.common.binTemporalDataChanged = ba(e, i), h.common.valueFormatChangeRequiresNewData = xa(
     e,
     i
-  ), S.common = {
-    ...S.common,
+  ), h.common = {
+    ...h.common,
     ...An({
       previousSeries: f,
       newConfig: i,
@@ -928,38 +928,38 @@ function Gc(t) {
       queryObject: s
     })
   }, m) {
-    case h.HistogramSeries:
-      S.histogram.dataPropsChanged = es(f, d) || Kn(
+    case S.HistogramSeries:
+      h.histogram.dataPropsChanged = es(f, d) || Kn(
         f,
         d
       );
       break;
-    case h.LineSeries:
-    case h.BarSeries:
-    case h.ComboLineAndBarSeries:
-      S.common.numberOfSeriesChanged = Mi(f, d);
+    case S.LineSeries:
+    case S.BarSeries:
+    case S.ComboLineAndBarSeries:
+      h.common.numberOfSeriesChanged = Mi(f, d);
       break;
-    case h.BoxPlotSeries:
-      de(e) && de(i) && (S.common.numberOfSeriesChanged = Mi(f, d), S.boxPlot.showMeanChanged = Ca(e, i));
+    case S.BoxPlotSeries:
+      de(e) && de(i) && (h.common.numberOfSeriesChanged = Mi(f, d), h.boxPlot.showMeanChanged = Ca(e, i));
       break;
-    case h.GaugeSeries:
-      S.gauge.valueConversionChanged = va(e, i);
+    case S.GaugeSeries:
+      h.gauge.valueConversionChanged = va(e, i);
       break;
-    case h.HeatSeries:
-      We(e) && We(i) && (S.heatChart.binningChanged = Ba(e, i), S.heatChart.hideEmptyRowsAndColumnsChanged = wn(
+    case S.HeatSeries:
+      We(e) && We(i) && (h.heatChart.binningChanged = Ba(e, i), h.heatChart.hideEmptyRowsAndColumnsChanged = wn(
         e,
         i
-      ), S.heatChart.includeLeapDay = Ln(e, i));
+      ), h.heatChart.includeLeapDay = Ln(e, i));
       break;
-    case h.ScatterSeries:
-      S.scatterPlot.tooltipFieldsChanged = Pn({
+    case S.ScatterSeries:
+      h.scatterPlot.tooltipFieldsChanged = Pn({
         previousConfig: e,
         newConfig: i,
         fieldList: n
       });
       break;
   }
-  return g = Object.values(S.common).some((x) => x), (S.gauge.valueConversionChanged || S.histogram.dataPropsChanged || S.boxPlot.showMeanChanged || S.heatChart.binningChanged || S.heatChart.hideEmptyRowsAndColumnsChanged || S.heatChart.includeLeapDay || S.scatterPlot.tooltipFieldsChanged) && (p = !0), y = g || p, { dataUpdateNeeded: y, dataUpdateDetails: S };
+  return g = Object.values(h.common).some((v) => v), (h.gauge.valueConversionChanged || h.histogram.dataPropsChanged || h.boxPlot.showMeanChanged || h.heatChart.binningChanged || h.heatChart.hideEmptyRowsAndColumnsChanged || h.heatChart.includeLeapDay || h.scatterPlot.tooltipFieldsChanged) && (p = !0), y = g || p, { dataUpdateNeeded: y, dataUpdateDetails: h };
 }
 function Uc(t, e) {
   const i = He(t);
@@ -989,10 +989,10 @@ function di(t) {
   let e;
   const i = t?.orderOptions?.data;
   return t.series?.length > 0 && i?.orderType === De.MultiAxes && (e = [], e.push({
-    sortingField: Q.xField,
+    sortingField: _.xField,
     orderBy: i.orderByX ?? ye.Ascending
   }), e.push({
-    sortingField: i.orderByY !== void 0 ? Q.yField : "",
+    sortingField: i.orderByY !== void 0 ? _.yField : "",
     orderBy: i.orderByY
   })), e;
 }
@@ -1000,7 +1000,7 @@ function Dn(t) {
   const { chartConfig: e, field: i } = t;
   let a;
   const r = di(e);
-  return r?.length === 2 && (a = i === Q.xField ? r[0]?.orderBy : r[1]?.orderBy), a;
+  return r?.length === 2 && (a = i === _.xField ? r[0]?.orderBy : r[1]?.orderBy), a;
 }
 function Na(t) {
   const e = k(t.series);
@@ -1037,13 +1037,13 @@ function Ta(t) {
     const c = t.orderOptions.data && "preferLabel" in t.orderOptions.data ? t.orderOptions.data.preferLabel : !0;
     if (o = t.orderOptions?.data?.orderType ?? De.Category, u = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : void 0, o === De.Category ? r ? o = ce : o = c ? i : pt.originalCategoryValue : o = r ? Ne : [a].flat()[0], o !== void 0 && o !== "") {
       const l = ci(t);
-      if (_(t.series) !== h.PieSeries && o !== i && t.series?.length > 1)
+      if (j(t.series) !== S.PieSeries && o !== i && t.series?.length > 1)
         switch (l) {
           case Te.Stacked:
-            o = C.technicalSortingFieldBySum;
+            o = x.technicalSortingFieldBySum;
             break;
           case Te.Stacked100:
-            o = C.technicalSortingFieldByPercent;
+            o = x.technicalSortingFieldByPercent;
             break;
           case Te.Side:
             typeof a == "string" && (o = a);
@@ -1064,21 +1064,21 @@ function Ta(t) {
 }
 function Mt(t) {
   let e;
-  const i = _(t?.series);
+  const i = j(t?.series);
   if (t?.series && t.series.length > 0) {
     let a;
     switch (i) {
-      case h.HeatSeries:
+      case S.HeatSeries:
         We(t) && (e = di(t));
         break;
-      case h.BoxPlotSeries:
+      case S.BoxPlotSeries:
         de(t) && (a = Na(t));
         break;
-      case h.LineSeries:
-      case h.BarSeries:
-      case h.ComboLineAndBarSeries:
-      case h.RadarSeries:
-      case h.PieSeries:
+      case S.LineSeries:
+      case S.BarSeries:
+      case S.ComboLineAndBarSeries:
+      case S.RadarSeries:
+      case S.PieSeries:
         a = Ta(t);
         break;
     }
@@ -1087,11 +1087,11 @@ function Mt(t) {
   return e;
 }
 function Yc(t) {
-  const { oldConfig: e, newConfig: i, dataWasUpdated: a } = t, r = _(i.series), n = k(i.series);
+  const { oldConfig: e, newConfig: i, dataWasUpdated: a } = t, r = j(i.series), n = k(i.series);
   let s = !1, o = !1;
   if (n !== F.BoxPlotMonoField && n !== F.BoxPlotMonoFieldAndSplitBy && i.orderOptions?.data !== void 0) {
     const u = Mt(e), c = Mt(i);
-    if (r === h.HeatSeries) {
+    if (r === S.HeatSeries) {
       const l = u ? u[0] : void 0, d = c ? c[0] : void 0, f = u ? u[1] : void 0, m = c ? c[1] : void 0;
       o = e?.orderOptions?.data?.orderType !== i.orderOptions?.data?.orderType || l?.sortingField !== d?.sortingField || l?.orderBy !== d?.orderBy || f?.sortingField !== m?.sortingField || f?.orderBy !== m?.orderBy, s = o || a;
     } else {
@@ -1131,21 +1131,21 @@ function On(t) {
 function Di(t) {
   const { value: e, dataContext: i, specificField: a, keepNullValues: r = !1, useRendererLabel: n = !1, config: s } = t;
   let o = e;
-  const { originalCategoryValue: u, originalDateValue: c } = C;
+  const { originalCategoryValue: u, originalDateValue: c } = x;
   if (i !== void 0) {
     const l = n ? Hn(i) : void 0;
-    a !== void 0 && i[a] !== void 0 ? o = i[a] : l !== void 0 ? o = l : i[C.xAxisDisplayField] !== void 0 ? o = i[C.xAxisDisplayField] : i[C.xAxisField] !== void 0 ? o = i[C.xAxisField] : i[C.boxPlot.boxPlotCategory] !== void 0 ? o = i[C.boxPlot.boxPlotCategory] : i[c] !== void 0 ? o = i[c] : i[u] !== void 0 ? o = i[u] : i[ce] !== void 0 && (o = i[ce]), !r && (o === null || o === C.nullValue) && (s?.series?.[0].type === h.BarSeries || s?.series?.[0].type === h.LineSeries ? o = s.series?.[0]?.nullCategory?.text ?? C.nullCategory?.text ?? "null" : o = "null");
+    a !== void 0 && i[a] !== void 0 ? o = i[a] : l !== void 0 ? o = l : i[x.xAxisDisplayField] !== void 0 ? o = i[x.xAxisDisplayField] : i[x.xAxisField] !== void 0 ? o = i[x.xAxisField] : i[x.boxPlot.boxPlotCategory] !== void 0 ? o = i[x.boxPlot.boxPlotCategory] : i[c] !== void 0 ? o = i[c] : i[u] !== void 0 ? o = i[u] : i[ce] !== void 0 && (o = i[ce]), !r && (o === null || o === x.nullValue) && (s?.series?.[0].type === S.BarSeries || s?.series?.[0].type === S.LineSeries ? o = s.series?.[0]?.nullCategory?.text ?? x.nullCategory?.text ?? "null" : o = "null");
   }
   return o;
 }
 function fi(t) {
   const { value: e, dataContext: i } = t;
   let a = e;
-  const { originalCategoryValue: r, originalDateValue: n } = C;
+  const { originalCategoryValue: r, originalDateValue: n } = x;
   return i?.[n] !== void 0 ? a = i[n] : i?.[r] !== void 0 ? a = i[r] : i?.[ce] !== void 0 && (a = i[ce]), a;
 }
 function In(t) {
-  return t?.[C.originalCategoryValue];
+  return t?.[x.originalCategoryValue];
 }
 function ht(t) {
   const {
@@ -1165,14 +1165,14 @@ function ht(t) {
       s === !0 && !u && (m = Di({
         value: `${l[a]?.toString()}`,
         dataContext: l,
-        specificField: o ? C.xAxisField : C.originalCategoryValue
+        specificField: o ? x.xAxisField : x.originalCategoryValue
       }));
       let y = d[a];
       return s === !0 && !u && (y = Di({
         value: `${d[a]?.toString()}`,
         dataContext: d,
-        specificField: o ? C.xAxisField : C.originalCategoryValue
-      })), n === !0 && c && s === !0 && (m = Number.isNaN(Number.parseFloat(`${m?.toString()}`)) ? m : Number.parseFloat(m), y = Number.isNaN(Number.parseFloat(`${y?.toString()}`)) ? y : Number.parseFloat(y)), s === !0 && (l[C.originalCategoryValue] === null || m === null) || l[ei.defaultGroupOfSlicesId] === !0 ? f = 1 : s === !0 && (d[C.originalCategoryValue] === null || y === null) || d[ei.defaultGroupOfSlicesId] === !0 ? f = -1 : typeof m == "string" && typeof y == "string" ? (f = m.localeCompare(y, void 0, { numeric: !0 }), c && (f *= -1)) : m === void 0 ? f = c ? -1 : 1 : y === void 0 ? f = c ? 1 : -1 : m !== null && y !== null && (m > y ? f = c ? -1 : 1 : m < y && (f = c ? 1 : -1)), f;
+        specificField: o ? x.xAxisField : x.originalCategoryValue
+      })), n === !0 && c && s === !0 && (m = Number.isNaN(Number.parseFloat(`${m?.toString()}`)) ? m : Number.parseFloat(m), y = Number.isNaN(Number.parseFloat(`${y?.toString()}`)) ? y : Number.parseFloat(y)), s === !0 && (l[x.originalCategoryValue] === null || m === null) || l[ei.defaultGroupOfSlicesId] === !0 ? f = 1 : s === !0 && (d[x.originalCategoryValue] === null || y === null) || d[ei.defaultGroupOfSlicesId] === !0 ? f = -1 : typeof m == "string" && typeof y == "string" ? (f = m.localeCompare(y, void 0, { numeric: !0 }), c && (f *= -1)) : m === void 0 ? f = c ? -1 : 1 : y === void 0 ? f = c ? 1 : -1 : m !== null && y !== null && (m > y ? f = c ? -1 : 1 : m < y && (f = c ? 1 : -1)), f;
     });
   }
 }
@@ -1203,7 +1203,7 @@ function qn(t, e) {
 }
 function nt(t) {
   let e = new Date(t).valueOf();
-  return Number.isNaN(e) || (e = new Intl.DateTimeFormat("en-US", C.dateFormatUTC).format(t).replace(",", "")), e;
+  return Number.isNaN(e) || (e = new Intl.DateTimeFormat("en-US", x.dateFormatUTC).format(t).replace(",", "")), e;
 }
 function Dt(t) {
   const { dataToConvert: e, x: i, y: a, fieldList: r } = t, n = [];
@@ -1214,10 +1214,10 @@ function Dt(t) {
         const u = {
           [i]: Jt(r, o),
           [a]: e[o],
-          [C.xAxisField]: o,
-          [C.originalCategoryValue]: o
+          [x.xAxisField]: o,
+          [x.originalCategoryValue]: o
         };
-        s !== void 0 && (u[Oe] = s), e[`${C.rendererSymbolField}_${o}`] !== void 0 && (u[C.rendererSymbolField] = e[`${C.rendererSymbolField}_${o}`]), n.push(u);
+        s !== void 0 && (u[Oe] = s), e[`${x.rendererSymbolField}_${o}`] !== void 0 && (u[x.rendererSymbolField] = e[`${x.rendererSymbolField}_${o}`]), n.push(u);
       }
     });
   }
@@ -1257,44 +1257,44 @@ function Aa(t, e) {
     maxLineThreePlusSeriesCountTotal: y,
     maxPieChartSliceCountTotal: g,
     maxGaugeByFeaturesLimit: p
-  } = ut(e), S = _(t.series), x = t.series.length === 0 ? 1 : t.series.length, v = k(t.series);
-  switch (S) {
-    case h.ComboLineAndBarSeries:
-    case h.BarSeries:
-      x <= a && (x === 1 ? i = r : x === 2 ? i = At({
+  } = ut(e), h = j(t.series), v = t.series.length === 0 ? 1 : t.series.length, B = k(t.series);
+  switch (h) {
+    case S.ComboLineAndBarSeries:
+    case S.BarSeries:
+      v <= a && (v === 1 ? i = r : v === 2 ? i = At({
         countTotal: s,
         countPerSeries: n,
-        numberOfSeries: x
-      }) : x > 2 && (i = At({
+        numberOfSeries: v
+      }) : v > 2 && (i = At({
         countTotal: u,
         countPerSeries: o,
-        numberOfSeries: x
+        numberOfSeries: v
       })));
       break;
-    case h.LineSeries:
-      x <= c && (x === 1 ? i = l : x === 2 ? i = At({
+    case S.LineSeries:
+      v <= c && (v === 1 ? i = l : v === 2 ? i = At({
         countTotal: f,
         countPerSeries: d,
-        numberOfSeries: x
-      }) : x > 2 && (i = At({
+        numberOfSeries: v
+      }) : v > 2 && (i = At({
         countTotal: y,
         countPerSeries: m,
-        numberOfSeries: x
+        numberOfSeries: v
       })));
       break;
-    case h.PieSeries:
+    case S.PieSeries:
       i = g;
       break;
-    case h.GaugeSeries:
+    case S.GaugeSeries:
       i = p;
       break;
-    case h.ScatterSeries:
+    case S.ScatterSeries:
     // handled through the aggregation feature
-    case h.HistogramSeries:
+    case S.HistogramSeries:
     // handled through the number of bins
-    case h.BoxPlotSeries:
+    case S.BoxPlotSeries:
   }
-  return (v === F.BarAndLineNoAggregation || v === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / x)), i;
+  return (B === F.BarAndLineNoAggregation || B === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / v)), i;
 }
 function Oi(t, e) {
   let i = t;
@@ -1321,7 +1321,7 @@ function Xc(t) {
   return e;
 }
 function wa(t) {
-  const { stringToTruncate: e, characterLimit: i, ellipsis: a = C.chartEllipsis } = t;
+  const { stringToTruncate: e, characterLimit: i, ellipsis: a = x.chartEllipsis } = t;
   let r = e;
   return typeof i == "number" && Number.isFinite(i) && i > 0 && i < e.length && (r = e.slice(0, i), r = `${r}${a}`), r;
 }
@@ -1345,7 +1345,7 @@ function Kc(t, e = ":") {
 function ed(t) {
   return (i) => {
     let a = typeof i != "string" ? i?.toString() ?? "" : i;
-    return !oe(a) && a !== C.htmlEmptyContent && (a = wa({
+    return !oe(a) && a !== x.htmlEmptyContent && (a = wa({
       stringToTruncate: a,
       characterLimit: t
     })), a;
@@ -1368,7 +1368,7 @@ function td(t) {
   let u = i ?? e?.text ?? "";
   if (a === "html") {
     let { wrap: c, maxWidth: l } = n ?? {};
-    r === br.Wrap && (c = !0, l = l ?? C.xAxisLabelMaxWidth);
+    r === br.Wrap && (c = !0, l = l ?? x.xAxisLabelMaxWidth);
     const d = c === !0 && Number.isFinite(l) ? `max-width: ${l}px; word-break: break-word;` : "";
     u = `<p style="margin:0;${s}${o}${d}">${u}</p>`;
   } else
@@ -1379,41 +1379,41 @@ function _n(t) {
   return t ? t.replace(/[A-Z]/gu, (e) => `-${e.toLowerCase()}`) : void 0;
 }
 const id = [
-  h.BarSeries,
-  h.BoxPlotSeries,
-  h.LineSeries,
-  h.PieSeries,
-  h.HistogramSeries,
-  h.ScatterSeries
-], ad = 1, rd = { PNG: "png" }, tt = {
+  S.BarSeries,
+  S.BoxPlotSeries,
+  S.LineSeries,
+  S.PieSeries,
+  S.HistogramSeries,
+  S.ScatterSeries
+], ad = { PNG: "png" }, tt = {
   ChartRenderer: 1,
   LayerRenderer: 2
 };
-function nd(t) {
+function rd(t) {
   const { chartConfig: e, queryObject: i } = t;
   let a = !1;
   if (e.chartRenderer)
     a = !0;
   else {
-    const { series: r } = e, n = _(r), s = k(r), o = Re(e), u = Pe({
+    const { series: r } = e, n = j(r), s = k(r), o = Re(e), u = Pe({
       seriesConfig: o,
       queryObject: i
     }), l = z(i)?.renderer;
     switch (l?.type) {
       case se.Simple:
-        a = n === h.HistogramSeries || n === h.ScatterSeries || s === F.BarAndLineMonoField || s === F.BoxPlotMonoField || s === F.BoxPlotMultiFields || s === F.BoxPlotMonoFieldAndCategory || s === F.BarAndLineNoAggregation && r.length === 1 && !u;
+        a = n === S.HistogramSeries || n === S.ScatterSeries || s === F.BarAndLineMonoField || s === F.BoxPlotMonoField || s === F.BoxPlotMultiFields || s === F.BoxPlotMonoFieldAndCategory || s === F.BarAndLineNoAggregation && r.length === 1 && !u;
         break;
       case se.UniqueValue:
         {
           const f = l?.field, m = te(o.query?.where), { x: y } = o;
-          a = (s === F.BoxPlotMonoFieldAndSplitBy || s === F.BoxPlotMultiFieldsAndSplitBy || s === F.BoxPlotMonoFieldAndCategoryAndSplitBy || s === F.BarAndLineSplitByNoAggregation || s === F.BarAndLineSplitBy) && f === m || (s === F.BoxPlotMonoFieldAndCategory || s === F.PieFromCategory || s === F.BarAndLineMonoField) && f === y || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation || n === h.ScatterSeries;
+          a = (s === F.BoxPlotMonoFieldAndSplitBy || s === F.BoxPlotMultiFieldsAndSplitBy || s === F.BoxPlotMonoFieldAndCategoryAndSplitBy || s === F.BarAndLineSplitByNoAggregation || s === F.BarAndLineSplitBy) && f === m || (s === F.BoxPlotMonoFieldAndCategory || s === F.PieFromCategory || s === F.BarAndLineMonoField) && f === y || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation || n === S.ScatterSeries;
         }
         break;
       case se.PieChart:
         a = s === F.PieFromFields || s === F.BarAndLineFromFields || s === F.BarAndLineMultiFields || s === F.BarAndLineMonoField || s === F.BoxPlotMonoField || s === F.BoxPlotMultiFields || s === F.BoxPlotMonoFieldAndCategory || s === F.BoxPlotMultiFieldsAndCategory;
         break;
       case se.ClassBreaks:
-        a = n === h.HeatSeries || n === h.ScatterSeries || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation;
+        a = n === S.HeatSeries || n === S.ScatterSeries || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation;
         break;
       case se.Dictionary:
       case se.DotDensity:
@@ -1427,10 +1427,10 @@ function jn(t, e) {
   return _n(t?.type) ?? e?.type;
 }
 function Hn(t) {
-  const e = C.rendererSymbolField;
+  const e = x.rendererSymbolField;
   let i = e in t ? e : void 0;
   if (!i) {
-    const a = t[C.originalCategoryValue];
+    const a = t[x.originalCategoryValue];
     i = Object.keys(t).find((r) => {
       const n = t[r];
       return r.includes(e) && n?.label && n?.uniqueValue === a;
@@ -1455,39 +1455,39 @@ function La(t) {
 function Wn(t) {
   const { renderer: e, seriesConfig: i, chartSubType: a, dataItem: r, rendererOrigin: n } = t;
   let s, o = !1;
-  const u = _(i), { outline: c, attributes: l } = e;
+  const u = j(i), { outline: c, attributes: l } = e;
   return l.forEach(
     (d) => {
       let { field: f } = d;
       const { color: m, label: y } = d;
       let g;
       Array.isArray(m) && m?.length === 4 ? g = m : m && "toRgba" in m && (g = m.toRgba());
-      let p = !1, S = !0;
+      let p = !1, h = !0;
       switch (u) {
-        case h.BarSeries:
-        case h.LineSeries:
-        case h.ComboLineAndBarSeries:
-        case h.RadarSeries:
+        case S.BarSeries:
+        case S.LineSeries:
+        case S.ComboLineAndBarSeries:
+        case S.RadarSeries:
           if (a !== F.BarAndLineFromFields) {
-            const x = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === f);
-            x !== void 0 && "y" in x ? f = [x.y].flat()[0] : f = "";
+            const v = i.find((B) => B.query?.outStatistics?.[0]?.onStatisticField === f);
+            v !== void 0 && "y" in v ? f = [v.y].flat()[0] : f = "";
           }
-          p = a !== F.BarAndLineFromFields || f === r[C.originalCategoryValue];
+          p = a !== F.BarAndLineFromFields || f === r[x.originalCategoryValue];
           break;
-        case h.PieSeries:
-          p = a === F.PieFromFields && f === r[C.originalCategoryValue];
+        case S.PieSeries:
+          p = a === F.PieFromFields && f === r[x.originalCategoryValue];
           break;
-        case h.BoxPlotSeries:
-          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? p = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (p = i.map((v) => v.y).flat().includes(f)), S = !1;
+        case S.BoxPlotSeries:
+          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? p = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (p = i.map((B) => B.y).flat().includes(f)), h = !1;
           break;
       }
       p && g && (s = {
         type: _e.SMS,
         color: g,
-        label: S && y ? y : void 0
+        label: h && y ? y : void 0
       }, c != null && (s.outline = c), La({
         dataItem: r,
-        symbolField: a === F.BarAndLineFromFields || a === F.PieFromFields ? C.rendererSymbolField : `${C.rendererSymbolField}_${f}`,
+        symbolField: a === F.BarAndLineFromFields || a === F.PieFromFields ? x.rendererSymbolField : `${x.rendererSymbolField}_${f}`,
         rendererSymbol: s,
         rendererOrigin: n
       }) && (o = !0));
@@ -1496,7 +1496,7 @@ function Wn(t) {
 }
 function Gn(t) {
   const { seriesConfig: e, chartSubType: i, rendererType: a } = t;
-  let n = C.rendererSymbolField;
+  let n = x.rendererSymbolField;
   if (a === se.UniqueValue) {
     if (aa(i)) {
       const s = fe({
@@ -1504,7 +1504,7 @@ function Gn(t) {
         keepSurroundingQuotes: !1,
         escape: !1
       });
-      s === null ? n = C.nullValue : i === F.BarAndLineSplitBy && typeof e.y == "string" ? n = e.y : i === F.BarAndLineSplitByNoAggregation && typeof e.y == "string" ? n = `${e.y}_${s}` : n = `${s}`;
+      s === null ? n = x.nullValue : i === F.BarAndLineSplitBy && typeof e.y == "string" ? n = e.y : i === F.BarAndLineSplitByNoAggregation && typeof e.y == "string" ? n = `${e.y}_${s}` : n = `${s}`;
     }
   } else if (a === se.PieChart)
     switch (i) {
@@ -1528,7 +1528,7 @@ function Pa(t) {
     chartSubType: i,
     rendererType: a
   });
-  return n instanceof Array && e.type === h.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[Rt]) ?? n[0]), n = n !== C.rendererSymbolField ? `${C.rendererSymbolField}_${n.toString()}` : n, n;
+  return n instanceof Array && e.type === S.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[Rt]) ?? n[0]), n = n !== x.rendererSymbolField ? `${x.rendererSymbolField}_${n.toString()}` : n, n;
 }
 function Un(t) {
   const { chartRenderer: e, queryObject: i } = t, a = e !== void 0 ? {
@@ -1567,13 +1567,13 @@ async function Yn(t) {
   } else if (i?.[ei.defaultGroupOfSlicesId] !== !0) {
     const { x: m } = e[0], y = /* @__PURE__ */ new Map();
     o && o.trim() !== "" ? e.forEach((g) => {
-      if (g.type === h.BarSeries || g.type === h.LineSeries || g.type === h.BoxPlotSeries || g.type === h.RadarSeries) {
+      if (g.type === S.BarSeries || g.type === S.LineSeries || g.type === S.BoxPlotSeries || g.type === S.RadarSeries) {
         const p = Pa({
           seriesConfig: g,
           chartSubType: s,
           rendererType: r,
           dataItem: i
-        }), S = fe({
+        }), h = fe({
           where: g.query?.where,
           normalize: !0,
           keepSurroundingQuotes: !1,
@@ -1581,13 +1581,13 @@ async function Yn(t) {
         });
         y.set(p, {
           ...i,
-          [o]: S
+          [o]: h
         });
       }
-    }) : e[0].type === h.HeatSeries && r === se.ClassBreaks ? y.set(C.rendererSymbolField, {
-      [Q.valueField]: i[Q.valueField]
+    }) : e[0].type === S.HeatSeries && r === se.ClassBreaks ? y.set(x.rendererSymbolField, {
+      [_.valueField]: i[_.valueField]
     }) : y.set(
-      _(e) === h.HistogramSeries ? C.rendererSymbolFieldForHistogram : C.rendererSymbolField,
+      j(e) === S.HistogramSeries ? x.rendererSymbolFieldForHistogram : x.rendererSymbolField,
       {
         ...i,
         [m]: In(i)
@@ -1596,9 +1596,9 @@ async function Yn(t) {
     try {
       const g = Array.from(y.entries()), p = u.clone();
       p.layer = u.layer;
-      const S = a?.uniqueValueInfos;
-      for (let x = 0; x < g.length; x += 1) {
-        const [v, b] = g[x];
+      const h = a?.uniqueValueInfos;
+      for (let v = 0; v < g.length; v += 1) {
+        const [B, b] = g[v];
         if (Ii({
           mode: "encode",
           x: m,
@@ -1615,7 +1615,7 @@ async function Yn(t) {
               T && (d.color = T.length === 4 ? T : [...T, 255]);
             }
             const N = await Gt.getLegendLabel(p);
-            N != null && N !== "" && (d.label = N, d.uniqueValue = S?.find((T) => T.label === N)?.value ?? void 0);
+            N != null && N !== "" && (d.label = N, d.uniqueValue = h?.find((T) => T.label === N)?.value ?? void 0);
           }
           l?.set(JSON.stringify(b), d);
         }
@@ -1626,7 +1626,7 @@ async function Yn(t) {
           attributes: i
         }), La({
           dataItem: i,
-          symbolField: v,
+          symbolField: B,
           rendererSymbol: d,
           rendererOrigin: n
         }) && (f = !0);
@@ -1639,7 +1639,7 @@ async function Yn(t) {
 function Ii(t) {
   const { splitByField: e, attributes: i, x: a, mode: r } = t;
   [a, e ?? ""].forEach((n) => {
-    i[n] === (r === "encode" ? null : C.nullValue) && (i[n] = r === "encode" ? C.nullValue : null);
+    i[n] === (r === "encode" ? null : x.nullValue) && (i[n] = r === "encode" ? x.nullValue : null);
   });
 }
 function Zn(t) {
@@ -1656,7 +1656,7 @@ function Zn(t) {
   }
   return s;
 }
-function sd(t) {
+function nd(t) {
   const { seriesSymbol: e, rendererSymbol: i, colorIndex: a } = t;
   let r = i?.color ?? e.color;
   r = r ?? na({ colorIndex: a, opacity: sa });
@@ -1675,7 +1675,7 @@ function Xn(t) {
   let e = [];
   return t && (e = t.series.flatMap((i) => i.query?.outStatistics?.map((a) => a.onStatisticField)).filter((i) => i !== void 0), e.length === 0 && (e = ue(t.series))), e;
 }
-function od(t, e) {
+function sd(t, e) {
   let i = !1;
   if (t && e && e.length > 0 && ra(t)) {
     const r = ts(t), n = Re(t);
@@ -1708,22 +1708,22 @@ function Kn(t, e) {
 function es(t, e) {
   return t[0].binCount !== e[0].binCount;
 }
-function ld(t, e) {
+function od(t, e) {
   let i = !0;
-  const a = _(t?.series), r = _(e?.series);
-  return a && a !== r && (i = a === h.ComboLineAndBarSeries && (r === h.BarSeries || r === h.LineSeries) || r === h.ComboLineAndBarSeries && (a === h.BarSeries || a === h.LineSeries) || a === h.BarSeries && r === h.LineSeries || a === h.LineSeries && r === h.BarSeries), i;
+  const a = j(t?.series), r = j(e?.series);
+  return a && a !== r && (i = a === S.ComboLineAndBarSeries && (r === S.BarSeries || r === S.LineSeries) || r === S.ComboLineAndBarSeries && (a === S.BarSeries || a === S.LineSeries) || a === S.BarSeries && r === S.LineSeries || a === S.LineSeries && r === S.BarSeries), i;
 }
 function ti(t, e) {
   return t !== void 0 && e !== void 0 && e > 0;
 }
-function ud(t) {
+function ld(t) {
   const { chartConfig: e, queryObject: i, chartData: a } = t;
   let r = [];
   const n = k(e.series), s = ra(e), o = z(i), u = e.chartRenderer ?? o?.renderer?.toJSON();
   return r = e.series.map((c, l) => {
-    const d = _([c]);
+    const d = j([c]);
     let f;
-    return (d === h.BarSeries || d === h.LineSeries || d === h.RadarSeries) && (c.type === h.BarSeries ? f = c.fillSymbol?.color : (c.type === h.RadarSeries || c.type === h.LineSeries) && (f = c.lineSymbol?.color), s ? f = Zn({
+    return (d === S.BarSeries || d === S.LineSeries || d === S.RadarSeries) && (c.type === S.BarSeries ? f = c.fillSymbol?.color : (c.type === S.RadarSeries || c.type === S.LineSeries) && (f = c.lineSymbol?.color), s ? f = Zn({
       dataItem: a[0],
       seriesConfig: c,
       chartSubType: n,
@@ -1745,8 +1745,11 @@ function st(t) {
 function is(t) {
   return de(t) ? t?.showOutliers : void 0;
 }
+function ud() {
+  return `{name} {${x.originalCategoryValue}} {dateY} {valueX} {dateX} {valueY}`;
+}
 function cd() {
-  return `{name} {${C.originalCategoryValue}} {dateY} {valueX} {dateX} {valueY}`;
+  return "{category} {value} {valuePercentTotal.formatNumber('#.#')}%";
 }
 function as(t, e) {
   const i = me.now().offset / 60, a = me.now().setZone(t) ?? i, r = a.offset / 60, n = e ? a.setZone(e).offset / 60 : 0;
@@ -1952,53 +1955,53 @@ function yi(t) {
     seriesConfig: d,
     queryObject: a
   });
-  let p = /* @__PURE__ */ new Map(), S = !1, x = !1, v = !1, b = !1, B = !1, N = {};
+  let p = /* @__PURE__ */ new Map(), h = !1, v = !1, B = !1, b = !1, C = !1, N = {};
   if (f !== void 0) {
     N = He(f);
     const $ = te(f.where);
     let M = "";
-    switch (i.fetchNullValues !== !0 && (m !== C.boxPlot.boxPlotCategory && (M = `${m} IS NOT NULL`), $.trim() !== "" && $ !== m && !Ie(f.where) && (M = Y([M, `${$} IS NOT NULL`]))), l) {
+    switch (i.fetchNullValues !== !0 && (m !== x.boxPlot.boxPlotCategory && (M = `${m} IS NOT NULL`), $.trim() !== "" && $ !== m && !Ie(f.where) && (M = Y([M, `${$} IS NOT NULL`]))), l) {
       case F.BarAndLineSplitBy: {
-        p = ss(c), b = !0, S = !0, x = !0;
+        p = ss(c), b = !0, h = !0, v = !0;
         break;
       }
       case F.BarAndLineMultiFields:
-        cs(N, c), x = !0;
+        cs(N, c), v = !0;
         break;
       case F.PieFromFields:
       case F.BarAndLineFromFields:
-        M = "", v = !0, x = !0;
+        M = "", B = !0, v = !0;
         break;
       case F.BarAndLineMonoField:
       case F.PieFromCategory:
-        x = !0;
+        v = !0;
         break;
       case F.BoxPlotMonoField:
       case F.BoxPlotMultiFields:
-        v = !0, B = !0;
+        B = !0, C = !0;
         break;
       case F.BoxPlotMonoFieldAndCategory:
       case F.BoxPlotMultiFieldsAndCategory:
       case F.BoxPlotMonoFieldAndSplitBy:
       case F.BoxPlotMonoFieldAndCategoryAndSplitBy:
       case F.BoxPlotMultiFieldsAndSplitBy: {
-        B = !0, b = !0, v = !0;
+        C = !0, b = !0, B = !0;
         break;
       }
       case F.PieNoAggregation:
       case F.BarAndLineNoAggregation:
       case F.BarAndLineSplitByNoAggregation:
     }
-    if (x && ls({
+    if (v && ls({
       uniqueQuery: N,
       y,
-      useGenericOutStatFieldName: S,
+      useGenericOutStatFieldName: h,
       queryObject: a,
       chartSubType: l,
       isTimeBinningSeries: g,
       returnFeaturesExtent: o,
       splitByField: $
-    }), b && os({ uniqueQuery: N, splitByField: $, x: m }), de(e) && B && (N.outStatistics = us({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
+    }), b && os({ uniqueQuery: N, splitByField: $, x: m }), de(e) && C && (N.outStatistics = us({ chartConfig: e, fetchFullBoxPlotData: s })), B ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
       const G = q.split(" ");
       return !oe(G[0]);
     })), g && be(c[0])) {
@@ -2038,7 +2041,7 @@ const le = {
   AdditionalProperties: "additionalProperties",
   Enum: "enum",
   AnyOf: "anyOf"
-}, j = {
+}, Q = {
   BadData: "badData",
   EmptyDataSet: "emptyDataSet",
   NoValue: "noValue",
@@ -2084,23 +2087,23 @@ async function ys(t) {
   const y = ft(i.geometry) ?? f.fullExtent, g = Ot(f, c);
   if (g < 0)
     throw new Error("Band ID not found for `${x}`.");
-  let p, S;
+  let p, h;
   if (!r && (l === void 0 || l === Z.None) && d && Array.isArray(m.histograms) && m.histograms.length > g && m.histograms[g].size % d === 0 && Array.isArray(m.statistics) && m?.statistics?.length > g)
-    p = m.histograms[g], S = m.statistics[g];
+    p = m.histograms[g], h = m.statistics[g];
   else {
-    let x, v, b;
+    let v, B, b;
     if (r && n)
-      x = n.resolution, v = n.resolution, b = n.spatialReference;
+      v = n.resolution, B = n.resolution, b = n.spatialReference;
     else {
       const w = fs, L = 2, A = m.width, I = m.height, P = Math.max(
         0,
         Math.ceil(Math.log(Math.max(A, I) / w) / Math.log(L))
       ), O = L ** P;
-      x = m.pixelSize.x * O, v = m.pixelSize.y * O, b = f.spatialReference;
+      v = m.pixelSize.x * O, B = m.pixelSize.y * O, b = f.spatialReference;
     }
-    const B = new da({
-      x,
-      y: v,
+    const C = new da({
+      x: v,
+      y: B,
       spatialReference: b
     }), N = ms(l), T = await Gr(
       f,
@@ -2108,7 +2111,7 @@ async function ys(t) {
         bandIds: [g],
         geometry: y,
         histogramSize: d ?? void 0,
-        pixelSize: B,
+        pixelSize: C,
         transformType: N,
         downsampleOnly: !0
       },
@@ -2116,9 +2119,9 @@ async function ys(t) {
         signal: o ?? (s !== void 0 ? Ge.get(s)?.signal : void 0)
       }
     );
-    S = T.statistics[0], p = T.histograms[0];
+    h = T.statistics[0], p = T.histograms[0];
   }
-  return { histogram: p, statistics: S };
+  return { histogram: p, statistics: h };
 }
 function gs(t, e) {
   const i = [], a = (t.max - t.min) / t.size;
@@ -2178,12 +2181,14 @@ async function ps(t) {
       }
     } : u = {
       valid: !1,
-      invalidType: j.EmptyDataSet
+      invalidType: Q.EmptyDataSet
     };
   } else
     u = {
       valid: !1,
-      invalidType: j.BadData
+      invalidType: Q.NoValue
+      // for #17296
+      // invalidType: DataWarningKeywords.BadData,   // 2DO: review whether to use BadData or NoValue after future enhancement
     };
   return u;
 }
@@ -2294,22 +2299,22 @@ async function vs(t) {
   let m;
   const y = z(e), g = ge(y);
   if (g) {
-    const S = { where: Y([u, g.definitionExpression]) }, x = { query: S, signal: o }, v = ft(c)?.extent?.toJSON();
-    if (v !== void 0) {
-      const B = Cs(d), { xmin: N, ymin: T, xmax: w, ymax: L } = v;
-      S.geometryType = "esriGeometryEnvelope", S.geometry = `${N},${T},${w},${L}`, l !== void 0 && (S.distance = l.toString()), B !== void 0 && (S.units = B, c?.spatialReference?.wkid != null && (S.inSR = c.spatialReference.wkid.toString()));
+    const h = { where: Y([u, g.definitionExpression]) }, v = { query: h, signal: o }, B = ft(c)?.extent?.toJSON();
+    if (B !== void 0) {
+      const C = Cs(d), { xmin: N, ymin: T, xmax: w, ymax: L } = B;
+      h.geometryType = "esriGeometryEnvelope", h.geometry = `${N},${T},${w},${L}`, l !== void 0 && (h.distance = l.toString()), C !== void 0 && (h.units = C, c?.spatialReference?.wkid != null && (h.inSR = c.spatialReference.wkid.toString()));
     }
-    f && (S.time = `${f[0]},${f[1]}`);
+    f && (h.time = `${f[0]},${f[1]}`);
     const b = `${g.url}/${g.layerId}/queryAnalytic?f=${a}&dataFormat=${r}&outAnalytics=${n}`;
     try {
-      m = (await Lt(b, x)).data?.features?.[0]?.attributes;
-    } catch (B) {
+      m = (await Lt(b, v)).data?.features?.[0]?.attributes;
+    } catch (C) {
       const N = s ?? (await mt(
         ze(document.documentElement).t9nLocale,
         gt("./assets/common/t9n"),
         "messages."
       )).errorStrings;
-      throw new re(le.QueryFeaturesError, N.errors.queryError, B);
+      throw new re(le.QueryFeaturesError, N.errors.queryError, C);
     }
   }
   return m;
@@ -2326,7 +2331,7 @@ async function Bs(t) {
   let u;
   const c = z(i), l = yn(c);
   if (l && i && "queryAttributeBins" in i) {
-    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: g, firstDayOfWeek: p, includeLeapDay: S } = e, x = Fo({
+    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: g, firstDayOfWeek: p, includeLeapDay: h } = e, v = Fo({
       queryObject: i,
       queryConfig: a,
       x: d,
@@ -2335,14 +2340,14 @@ async function Bs(t) {
       yTemporalBinning: y,
       configTimeZone: g,
       firstDayOfWeek: p,
-      includeLeapDay: S,
+      includeLeapDay: h,
       view: r,
       syncViewTimeZone: n
     });
     try {
-      u = await i.queryAttributeBins(x, { signal: o });
-    } catch (v) {
-      throw new re(le.QueryFeaturesError, s.errors.queryError, v);
+      u = await i.queryAttributeBins(v, { signal: o });
+    } catch (B) {
+      throw new re(le.QueryFeaturesError, s.errors.queryError, B);
     }
   }
   if (!l)
@@ -2496,10 +2501,10 @@ async function Fe(t) {
   const l = z(e), d = r ?? 1, f = za(l);
   if (n !== !0 && d > f && l?.capabilities?.query.supportsPagination) {
     let m = 0, y = 0;
-    const g = Math.ceil(d / f), p = Math.ceil(g / W.maxParallelRequests), S = [];
+    const g = Math.ceil(d / f), p = Math.ceil(g / W.maxParallelRequests), h = [];
     for (; y < p; ) {
       m = y * W.maxParallelRequests * f;
-      const v = ws({
+      const B = ws({
         queryConfig: { ...i, start: m },
         queryObject: e,
         maxRecords: f,
@@ -2509,9 +2514,9 @@ async function Fe(t) {
         abortKey: o,
         abortSignal: u
       });
-      S.push(v), y += 1;
+      h.push(B), y += 1;
     }
-    c = (await Promise.all(S)).flat();
+    c = (await Promise.all(h)).flat();
   } else (Number.isNaN(d) || d >= 0) && (c = await Ia({
     queryObject: e,
     queryConfig: i,
@@ -2641,10 +2646,10 @@ async function Is(t) {
     typeKey: y,
     typeValue: g,
     fieldValue: p,
-    slopePropertyList: S,
-    interceptPropertyList: x,
-    r2PropertyList: v
-  } = xs, b = `[{"${y}": "${g}", "${p}":"${u},${c}"}]`, B = await vs({
+    slopePropertyList: h,
+    interceptPropertyList: v,
+    r2PropertyList: B
+  } = xs, b = `[{"${y}": "${g}", "${p}":"${u},${c}"}]`, C = await vs({
     queryObject: i,
     queryConfig: r,
     outputFormat: m,
@@ -2653,11 +2658,11 @@ async function Is(t) {
     errorStrings: n,
     abortSignal: s
   });
-  if (B !== void 0) {
+  if (C !== void 0) {
     let N = Number.NaN, T = Number.NaN;
-    const { expr: w } = Wt(B, S), { expr: L } = Wt(B, x), { expr: A } = Wt(B, v);
-    w !== void 0 && Number.isFinite(B[w]) && (N = B[w]), L !== void 0 && Number.isFinite(B[L]) && (T = B[L]), A !== void 0 && Number.isFinite(B[A]) && (l = B[A]);
-    const { dataContextXMinField: I, dataContextXMaxField: P, dataContextYMinField: O, dataContextYMaxField: V } = C.scatterplotAggregationFields, $ = e.get(I) ?? Number.NaN, M = e.get(P) ?? Number.NaN, q = e.get(O) ?? Number.NaN, G = e.get(V) ?? Number.NaN, X = (M - $) / 100;
+    const { expr: w } = Wt(C, h), { expr: L } = Wt(C, v), { expr: A } = Wt(C, B);
+    w !== void 0 && Number.isFinite(C[w]) && (N = C[w]), L !== void 0 && Number.isFinite(C[L]) && (T = C[L]), A !== void 0 && Number.isFinite(C[A]) && (l = C[A]);
+    const { dataContextXMinField: I, dataContextXMaxField: P, dataContextYMinField: O, dataContextYMaxField: V } = x.scatterplotAggregationFields, $ = e.get(I) ?? Number.NaN, M = e.get(P) ?? Number.NaN, q = e.get(O) ?? Number.NaN, G = e.get(V) ?? Number.NaN, X = (M - $) / 100;
     let H = $ - X, ae = Number.NaN;
     for (; !(ae >= q && ae <= G) && H <= M; )
       H += X, ae = N * H + T;
@@ -2673,7 +2678,7 @@ async function Is(t) {
 }
 function qa(t) {
   const { data: e, chartConfig: i } = t, a = i.series[0], { x: r, y: n } = a;
-  let { r2: s, trendLinePoints: o } = C.scatterplotSeries;
+  let { r2: s, trendLinePoints: o } = x.scatterplotSeries;
   const u = Os({ data: e, x: r, y: n });
   if (u !== void 0) {
     const c = jr(u), l = Hr(c);
@@ -2682,7 +2687,7 @@ function qa(t) {
   return { r2: s, trendLinePoints: o };
 }
 async function Va(t) {
-  const e = await Ms(t), { chartConfig: i } = t, a = i.series[0], { x: r, y: n } = a, { r2: s } = C.scatterplotSeries, o = [
+  const e = await Ms(t), { chartConfig: i } = t, a = i.series[0], { x: r, y: n } = a, { r2: s } = x.scatterplotSeries, o = [
     { [r]: Number.NaN, [n]: Number.NaN },
     { [r]: Number.NaN, [n]: Number.NaN }
   ];
@@ -2750,7 +2755,7 @@ async function $s(t) {
     queryObject: a,
     chartConfig: e,
     errorStrings: s
-  }) : C.scatterplotSeries;
+  }) : x.scatterplotSeries;
   return { dataItems: c, r2: d, trendLinePoints: f };
 }
 const ks = (t) => ({
@@ -2881,8 +2886,8 @@ function js(t) {
 function Ei(t, e) {
   let i;
   return t == null && e ? i = {
-    groupKey: C.nullValue,
-    display: C.nullValue,
+    groupKey: x.nullValue,
+    display: x.nullValue,
     original: null
   } : i = { groupKey: t, display: t, original: t }, i;
 }
@@ -2930,40 +2935,50 @@ async function zs(t) {
   if (!l || !d)
     u = {
       valid: !1,
-      invalidType: j.BadData
+      invalidType: Q.NoValue
+      // for #17296
+      // invalidType: DataWarningKeywords.BadData,   // 2DO: review whether to use BadData or NoValue after future enhancement
     };
   else {
     const f = e.series;
-    if (!f || f.length === 0 || d.length === 0)
+    if (!f || f.length === 0)
       u = {
-        valid: !0
+        valid: !1,
+        invalidType: Q.InvalidConfig
+        // for #17296
+      };
+    else if (d.length === 0)
+      u = {
+        valid: !1,
+        invalidType: Q.EmptyDataSet
+        // for #17296
       };
     else {
-      const m = i.groupByFieldsForStatistics?.[0] ?? "", y = f.some((S) => S.query?.fetchNullValues), g = /* @__PURE__ */ new Map();
-      for (const S of d) {
-        const { groupKey: x } = Ei(S.attributes[m], y);
-        x === C.nullValue && !y || (g.has(x) || g.set(x, []), g.get(x).push(S.attributes));
+      const m = i.groupByFieldsForStatistics?.[0] ?? "", y = f.some((h) => h.query?.fetchNullValues), g = /* @__PURE__ */ new Map();
+      for (const h of d) {
+        const { groupKey: v } = Ei(h.attributes[m], y);
+        v === x.nullValue && !y || (g.has(v) || g.set(v, []), g.get(v).push(h.attributes));
       }
       const p = [];
-      g.forEach((S) => {
-        const x = {}, v = S[0][m], { display: b, original: B } = Ei(v, y);
-        x[m] = b, x[C.xAxisField] = b, x[C.originalCategoryValue] = B, f.forEach((N) => {
+      g.forEach((h) => {
+        const v = {}, B = h[0][m], { display: b, original: C } = Ei(B, y);
+        v[m] = b, v[x.xAxisField] = b, v[x.originalCategoryValue] = C, f.forEach((N) => {
           const T = N.query?.outStatistics?.[0];
           if (!T) {
             const { name: O } = N;
-            x[O] = S[0][O];
+            v[O] = h[0][O];
             return;
           }
-          let w = S;
+          let w = h;
           const L = N.query?.where;
-          L && (w = S.filter((O) => _s(O, L)));
+          L && (w = h.filter((O) => _s(O, L)));
           const A = T.statisticType, I = T.onStatisticField, P = T.outStatisticFieldName;
-          x[P] = js({
+          v[P] = js({
             features: w,
             aggregationType: A,
             onField: I
           });
-        }), p.push(x);
+        }), p.push(v);
       }), u = {
         valid: !0,
         data: {
@@ -3031,29 +3046,29 @@ function Us(t) {
   return r;
 }
 const ai = "PixelID", Ys = "Pixel ID", Zs = [
-  h.BarSeries,
-  h.HistogramSeries,
-  h.ScatterSeries
+  S.BarSeries,
+  S.HistogramSeries,
+  S.ScatterSeries
 ];
 async function pd(t) {
   let e = !1;
   const { config: i, layer: a, abortSignal: r } = t;
   if (Dr(Zs, i))
-    switch (_(i?.series)) {
-      case h.BarSeries:
+    switch (j(i?.series)) {
+      case S.BarSeries:
         a.loaded || await a.load({ signal: r }), e = !!(await dt(a, r))?.attributeTable;
         break;
-      case h.HistogramSeries:
-      case h.ScatterSeries:
+      case S.HistogramSeries:
+      case S.ScatterSeries:
         e = !0;
         break;
     }
   return e;
 }
 async function Xs(t) {
-  const { layer: e, chartConfig: i } = t;
+  const { layer: e, iLayer: i } = t;
   let a;
-  return ie(e) ? a = e : i?.iLayer?.layerType === "ArcGISImageServiceLayer" ? a = await ka(i.iLayer) : i?.iLayer?.layerType === "ArcGISTiledImageServiceLayer" && (a = await Qa(i.iLayer)), a;
+  return ie(e) ? a = e : i?.layerType === "ArcGISImageServiceLayer" ? a = await ka(i) : i?.layerType === "ArcGISTiledImageServiceLayer" && (a = await Qa(i)), a;
 }
 function Js(t) {
   let e;
@@ -3090,7 +3105,7 @@ function $a(t) {
   if (!n)
     throw new Error("Raster info must be provided or generated beforehand to get raster layer fields info");
   let s = [];
-  return i !== void 0 ? i !== h.BarSeries ? s = qi({ layer: e, rasterInfo: n, popupTemplateFieldInfosEnabled: r }) : n.attributeTable && (s = n.attributeTable.fields.map((o) => o.toJSON())) : n.attributeTable ? s = n.attributeTable.fields.map((o) => o.toJSON()) : s = qi({ layer: e, rasterInfo: n, popupTemplateFieldInfosEnabled: r }), s;
+  return i !== void 0 ? i !== S.BarSeries ? s = qi({ layer: e, rasterInfo: n, popupTemplateFieldInfosEnabled: r }) : n.attributeTable && (s = n.attributeTable.fields.map((o) => o.toJSON())) : n.attributeTable ? s = n.attributeTable.fields.map((o) => o.toJSON()) : s = qi({ layer: e, rasterInfo: n, popupTemplateFieldInfosEnabled: r }), s;
 }
 function qi(t) {
   const { layer: e, rasterInfo: i, popupTemplateFieldInfosEnabled: a } = t;
@@ -3169,24 +3184,24 @@ const ka = qt(
   }
   return i;
 }, Sd = (t) => {
-  const { chartConfig: e, layer: i, selectionDataItems: a } = t, r = _(e.series);
+  const { chartConfig: e, layer: i, selectionDataItems: a } = t, r = j(e.series);
   let n;
   switch (r) {
-    case h.BarSeries:
+    case S.BarSeries:
       n = Us({
         chartConfig: e,
         layer: i,
         selectionDataItems: a
       });
       break;
-    case h.HistogramSeries:
+    case S.HistogramSeries:
       n = Ss({
         chartConfig: e,
         layer: i,
         selectionDataItems: a
       });
       break;
-    case h.ScatterSeries:
+    case S.ScatterSeries:
       n = Qs({
         chartConfig: e,
         layer: i,
@@ -3301,13 +3316,13 @@ async function Fd(t, e) {
   return i;
 }
 async function bd(t) {
-  const { layer: e, view: i, chartConfig: a, filterByViewExtent: r, abortSignal: n } = t, s = ie(e) || _r(a);
+  const { layer: e, view: i, iLayer: a, filterByViewExtent: r, abortSignal: n } = t, s = ie(e) || _r(a);
   let o;
   if (s)
     o = await Xs(t);
   else {
     const u = z(e), c = ge(u);
-    c !== void 0 ? r && i !== void 0 && !c.isTable ? (c.outFields = ["*"], o = await i.whenLayerView(c)) : o = e : a?.iLayer && a.iLayer?.layerType === "ArcGISFeatureLayer" && (o = await gi(a.iLayer, n));
+    c !== void 0 ? (i !== void 0 && !c.isTable && (c.outFields = ["*"]), r && i !== void 0 && !c.isTable ? o = await i.whenLayerView(c) : o = e) : a?.layerType === "ArcGISFeatureLayer" && (o = await gi(a, n));
   }
   return o;
 }
@@ -3458,24 +3473,24 @@ function Ha(t) {
     spatialRelationship: g
   } = o ?? {}, {
     where: p,
-    gdbVersion: S,
-    timeExtent: x,
-    geometry: v,
+    gdbVersion: h,
+    timeExtent: v,
+    geometry: B,
     distance: b,
-    units: B,
+    units: C,
     objectIds: N,
     spatialRelationship: T
   } = a ?? {}, w = s[0], { query: L } = w, { where: A } = L ?? {}, I = k(s), P = { ...L };
-  return P.where = Y([u, p]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (P.where = Y([P.where, A])), i.orderOptions?.orderByFields !== void 0 && (P.orderByFields = i.orderOptions.orderByFields), P.gdbVersion = S ?? c, P.timeExtent = yo(n?.timeExtent, x ?? l), P.geometry = ie(e) ? to({
+  return P.where = Y([u, p]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (P.where = Y([P.where, A])), i.orderOptions?.orderByFields !== void 0 && (P.orderByFields = i.orderOptions.orderByFields), P.gdbVersion = h ?? c, P.timeExtent = yo(n?.timeExtent, v ?? l), P.geometry = ie(e) ? to({
     queryObject: e,
-    defaultGeometry: v ?? d,
+    defaultGeometry: B ?? d,
     ignoreViewExtent: r,
     viewExtent: n?.extent
   }) : go({
     queryObject: e,
-    defaultGeometry: v ?? d,
+    defaultGeometry: B ?? d,
     ignoreViewExtent: r
-  }), P.distance = b ?? f, P.units = B ?? m, P.objectIds = N ?? y, P.spatialRelationship = T ?? g, L?.outStatistics?.[0]?.statisticType === D.Count && (P.returnDistinctValues = L?.returnDistinctValues ?? !1), P?.outStatistics?.forEach((O) => {
+  }), P.distance = b ?? f, P.units = C ?? m, P.objectIds = N ?? y, P.spatialRelationship = T ?? g, L?.outStatistics?.[0]?.statisticType === D.Count && (P.returnDistinctValues = L?.returnDistinctValues ?? !1), P?.outStatistics?.forEach((O) => {
     mi(O) && !("statisticParameters" in O) && (O.statisticParameters = {
       value: W.defaultStatParameterValue
     });
@@ -3587,24 +3602,24 @@ function Wa(t) {
 }
 function _t(t) {
   const { queryType: e, queryObject: i, queryConfig: a, view: r, configTimeZone: n, dateField: s, useViewTimeZone: o } = t, { where: u, outStatistics: c, geometry: l, distance: d, units: f, timeExtent: m, returnDistinctValues: y } = a ?? {}, g = z(i);
-  let S = ge(g)?.createQuery() ?? new Br(), x;
-  const v = kt(g).idFields;
-  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && v && (x = `${v} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (S = new vr(S.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
+  let h = ge(g)?.createQuery() ?? new Br(), v;
+  const B = kt(g).idFields;
+  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && B && (v = `${B} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (h = new vr(h.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
     const T = Intl.DateTimeFormat().resolvedOptions().timeZone, w = o && r && "timeZone" in r ? r.timeZone : void 0;
     let L = n ?? w ?? T;
-    L === "unknown" ? L = "Etc/UTC" : L === "system" && (L = T), S.outTimeZone = L;
+    L === "unknown" ? L = "Etc/UTC" : L === "system" && (L = T), h.outTimeZone = L;
   }
-  if (S.where = Y([S.where, u, x]), "returnDistinctValues" in S && (S.returnDistinctValues = y ?? !1), c !== void 0) {
-    const B = pn(g);
-    S.outStatistics = c.filter(
-      (N) => N.statisticType !== D.EnvelopeAggregate || B
+  if (h.where = Y([h.where, u, v]), "returnDistinctValues" in h && (h.returnDistinctValues = y ?? !1), c !== void 0) {
+    const C = pn(g);
+    h.outStatistics = c.filter(
+      (N) => N.statisticType !== D.EnvelopeAggregate || C
     ).map((N) => Nr.fromJSON(N));
   }
   const b = ft(l);
-  return b !== void 0 && (S.geometry = b, a?.spatialRelationship && (S.spatialRelationship = a.spatialRelationship), ya(g) && (d !== void 0 && (S.distance = d), f !== void 0 && (S.units = f))), m && (S.timeExtent = new Ki({
+  return b !== void 0 && (h.geometry = b, a?.spatialRelationship && (h.spatialRelationship = a.spatialRelationship), ya(g) && (d !== void 0 && (h.distance = d), f !== void 0 && (h.units = f))), m && (h.timeExtent = new Ki({
     start: m?.[0],
     end: m?.[1]
-  })), mo(S) && (S.cacheHint = !0), S;
+  })), mo(h) && (h.cacheHint = !0), h;
 }
 function po(t) {
   let e;
@@ -3619,7 +3634,7 @@ function po(t) {
   return e;
 }
 function ho(t) {
-  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: g } = a, p = z(e), S = _t({
+  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: g } = a, p = z(e), h = _t({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i,
@@ -3628,23 +3643,23 @@ function ho(t) {
     view: o,
     dateField: r,
     useViewTimeZone: u ?? !1
-  }), x = Ea(r);
-  if (S.lowerBoundaryAlias = x.lowerBoundaryAlias, S.upperBoundaryAlias = x.upperBoundaryAlias, S.binParameters = {
+  }), v = Ea(r);
+  if (h.lowerBoundaryAlias = v.lowerBoundaryAlias, h.upperBoundaryAlias = v.upperBoundaryAlias, h.binParameters = {
     type: "date",
     field: r,
     interval: { unit: c, value: l },
     start: f,
     end: m,
     offset: y ? { unit: y.unit, value: y.size } : null
-  }, S.binParameters.type === "date" && (p?.capabilities?.queryAttributeBins?.supportsSnapToData && (S.binParameters.snapToData = po(d)), p?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (S.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
-    const b = ge(p)?.fields.find((B) => B.name === n)?.type;
-    (!b || b === "string" || b === "integer" || b === "small-integer" || b === "big-integer" || b === "double") && (S.binParameters.stackBy = {
+  }, h.binParameters.type === "date" && (p?.capabilities?.queryAttributeBins?.supportsSnapToData && (h.binParameters.snapToData = po(d)), p?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (h.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
+    const b = ge(p)?.fields.find((C) => C.name === n)?.type;
+    (!b || b === "string" || b === "integer" || b === "small-integer" || b === "big-integer" || b === "double") && (h.binParameters.stackBy = {
       type: "field",
       value: n,
       valueType: b === "string" ? "string" : "integer"
     });
   }
-  return S;
+  return h;
 }
 function pi(t) {
   const {
@@ -3759,18 +3774,18 @@ function Fo(t) {
     xOrYFieldType: m,
     addIntervalStatement: !1,
     includeLeapDay: u
-  }), { field: S, expression: x, start: v, end: b } = p;
-  S ? g.binParameters.field = S : x && (g.binParameters.expression = x, g.binParameters.expressionValueType = "integer", g.binParameters.type === "fixed-interval" && (v !== void 0 && (g.binParameters.start = v), b !== void 0 && (g.binParameters.end = b)));
-  const B = Ri({
+  }), { field: h, expression: v, start: B, end: b } = p;
+  h ? g.binParameters.field = h : v && (g.binParameters.expression = v, g.binParameters.expressionValueType = "integer", g.binParameters.type === "fixed-interval" && (B !== void 0 && (g.binParameters.start = B), b !== void 0 && (g.binParameters.end = b)));
+  const C = Ri({
     temporalBinning: s,
     xOrY: r,
     xOrYFieldType: y,
     addIntervalStatement: !1,
     includeLeapDay: u
   });
-  return B.field ? g.binParameters.stackBy = { type: "field", value: B.field } : B.expression && (g.binParameters.stackBy = {
+  return C.field ? g.binParameters.stackBy = { type: "field", value: C.field } : C.expression && (g.binParameters.stackBy = {
     type: "expression",
-    value: B.expression,
+    value: C.expression,
     valueType: "integer",
     alias: r
   }), g;
@@ -3818,7 +3833,7 @@ function Co(t = Z.None, e) {
 }
 function Ga(t, e) {
   const i = { valid: !1 };
-  return e === !0 ? i.invalidType = j.HistogramEmptyField : t === Z.Log ? i.invalidType = j.NegativeValueInLogCalculation : t === Z.Sqrt && (i.invalidType = j.NegativeValueInSqrtCalculation), i;
+  return e === !0 ? i.invalidType = Q.HistogramEmptyField : t === Z.Log ? i.invalidType = Q.NegativeValueInLogCalculation : t === Z.Sqrt && (i.invalidType = Q.NegativeValueInSqrtCalculation), i;
 }
 function vo(t, e) {
   let i = t;
@@ -3887,8 +3902,8 @@ async function No(t) {
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), S = p.get(d) ?? Number.NaN, x = p.get(f) ?? Number.NaN, v = p.get(m) ?? Number.NaN, b = p.get(y) ?? Number.NaN;
-  return { countExcludingNulls: x, countIncludingNulls: S, min: v, max: b };
+  }), h = p.get(d) ?? Number.NaN, v = p.get(f) ?? Number.NaN, B = p.get(m) ?? Number.NaN, b = p.get(y) ?? Number.NaN;
+  return { countExcludingNulls: v, countIncludingNulls: h, min: B, max: b };
 }
 async function To(t) {
   const { queryConfig: e, chartConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = i.series[0], { x: u, dataTransformationType: c } = o;
@@ -3900,8 +3915,8 @@ async function To(t) {
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), g = Co(c, m), p = f < 2 || m === y, S = { ...e };
-  return S.where = Y([S.where, `${u} is not null`]), {
+  }), g = Co(c, m), p = f < 2 || m === y, h = { ...e };
+  return h.where = Y([h.where, `${u} is not null`]), {
     rawData: l,
     dataCompatibleWithTransformation: g,
     dataCountIncompatible: p,
@@ -3982,33 +3997,33 @@ async function Mo(t) {
     queryConfig: i,
     abortSignal: u
   });
-  let S;
-  if (g !== void 0 && (S = new wi({
+  let h;
+  if (g !== void 0 && (h = new wi({
     geometry: g.extent
   }), g.extent !== void 0 && ya(f))) {
     const { distance: A, units: I } = i;
-    A !== void 0 && (S.distance = A), I !== void 0 && (S.units = I);
+    A !== void 0 && (h.distance = A), I !== void 0 && (h.units = I);
   }
   if (i.timeExtent) {
     const A = { start: i.timeExtent[0], end: i.timeExtent[1] };
-    S === void 0 ? S = new wi({ timeExtent: A }) : S.timeExtent = A;
+    h === void 0 ? h = new wi({ timeExtent: A }) : h.timeExtent = A;
   }
-  p.filter = S;
-  let x;
+  p.filter = h;
+  let v;
   p.outStatisticTypes = { exclude: ["median"] };
   try {
-    x = await Li(p);
+    v = await Li(p);
   } catch (A) {
     throw new re(le.QueryFeaturesError, o.errors.queryError, A);
   }
   p.outStatisticTypes = { include: ["median"] };
   try {
     const A = await Li(p);
-    A?.median && (x.median = A.median);
+    A?.median && (v.median = A.median);
   } catch {
   }
-  x = Ao(x);
-  const { avg: v, count: b, stddev: B, min: N, max: T, sum: w, median: L } = x;
+  v = Ao(v);
+  const { avg: B, count: b, stddev: C, min: N, max: T, sum: w, median: L } = v;
   if (b === 0)
     d = {
       ...Ga(l)
@@ -4025,7 +4040,7 @@ async function Mo(t) {
       queryConfig: i,
       abortSignal: u
     });
-    A.filter = S;
+    A.filter = h;
     let I;
     try {
       I = await Cr(A);
@@ -4034,8 +4049,8 @@ async function Mo(t) {
     }
     const P = Po(n, r);
     d.data = {
-      mean: v,
-      stddev: B,
+      mean: B,
+      stddev: C,
       min: N,
       max: T,
       median: Number(L),
@@ -4107,7 +4122,7 @@ const $i = {
   groupByCaseEnd: "ELSE 'OUT' END"
 };
 function Md(t) {
-  return _(t.series) !== h.BoxPlotSeries ? C.xAxisField : t.series[0].x;
+  return j(t.series) !== S.BoxPlotSeries ? x.xAxisField : t.series[0].x;
 }
 function Dd(t) {
   const e = ci(t);
@@ -4187,24 +4202,24 @@ function Za(t) {
 function It(t) {
   const { dataInfo: e, chartType: i, subError: a } = t;
   switch (e.valid = !1, i) {
-    case h.BarSeries:
-    case h.ComboLineAndBarSeries:
-      e.invalidType = j.BarElementExceedsLimit;
+    case S.BarSeries:
+    case S.ComboLineAndBarSeries:
+      e.invalidType = Q.BarElementExceedsLimit;
       break;
-    case h.LineSeries:
-      e.invalidType = j.LineChartExceedsLimit;
+    case S.LineSeries:
+      e.invalidType = Q.LineChartExceedsLimit;
       break;
-    case h.PieSeries:
-      e.invalidType = j.PieChartExceedsLimit;
+    case S.PieSeries:
+      e.invalidType = Q.PieChartExceedsLimit;
       break;
-    case h.GaugeSeries:
-      e.invalidType = j.GaugeExceedsLimit;
+    case S.GaugeSeries:
+      e.invalidType = Q.GaugeExceedsLimit;
       break;
-    case h.BoxPlotSeries:
-      a?.outlierLimit === !0 ? e.invalidType = j.BoxPlotOutliersExceedsLimit : e.invalidType = j.BoxPlotExceedsLimit;
+    case S.BoxPlotSeries:
+      a?.outlierLimit === !0 ? e.invalidType = Q.BoxPlotOutliersExceedsLimit : e.invalidType = Q.BoxPlotExceedsLimit;
       break;
-    case h.HeatSeries:
-      e.invalidType = j.HeatChartExceedsLimit;
+    case S.HeatSeries:
+      e.invalidType = Q.HeatChartExceedsLimit;
       break;
   }
 }
@@ -4223,147 +4238,147 @@ function $d(t) {
     isTemporalChart: u,
     isGaugeChartByFeature: c,
     errorStrings: l
-  } = t;
-  let d = l.errors.defaultInvalidChart, f;
-  const m = new Intl.NumberFormat(o), y = ut(i), { maxCategoryCount: g } = y;
-  let p = l.modalHeaders.invalidChart;
+  } = t, d = ie(n);
+  let f = l.errors.defaultInvalidChart, m;
+  const y = new Intl.NumberFormat(o), g = ut(i), { maxCategoryCount: p } = g;
+  let h = l.modalHeaders.invalidChart;
   switch (e) {
-    case j.BarElementExceedsLimit: {
-      p = l.modalHeaders.tooManyFeatures;
-      let x = Number.NaN, v = Number.NaN, b = "";
-      r !== void 0 && (r <= y.maxBarChartSeriesCount ? r === 1 ? (b = l.errors.uniqueSeriesBarCountCannotExceedLimit, x = y.maxBarUniqueSeriesCountTotal) : r === 2 ? (b = l.errors.twoSeriesBarCountCannotExceedLimit, x = y.maxBarTwoSeriesCountTotal, v = y.maxBarTwoSeriesCountPerSeries) : r > 2 && (b = l.errors.threePlusSeriesBarCountCannotExceedLimit, x = y.maxBarThreePlusSeriesCountTotal, v = y.maxBarThreePlusSeriesCountPerSeries) : (b = l.errors.barSeriesCountCannotExceedLimit, v = y.maxBarChartSeriesCount));
-      const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-      d = Be(b, {
-        totalLimit: B,
-        seriesLimit: N,
-        elementCount: T
-      }), f = {
+    case Q.BarElementExceedsLimit: {
+      h = l.modalHeaders.tooManyFeatures;
+      let B = Number.NaN, b = Number.NaN, C = "";
+      r !== void 0 && (r <= g.maxBarChartSeriesCount ? r === 1 ? (C = l.errors.uniqueSeriesBarCountCannotExceedLimit, B = g.maxBarUniqueSeriesCountTotal) : r === 2 ? (C = l.errors.twoSeriesBarCountCannotExceedLimit, B = g.maxBarTwoSeriesCountTotal, b = g.maxBarTwoSeriesCountPerSeries) : r > 2 && (C = l.errors.threePlusSeriesBarCountCannotExceedLimit, B = g.maxBarThreePlusSeriesCountTotal, b = g.maxBarThreePlusSeriesCountPerSeries) : (C = l.errors.barSeriesCountCannotExceedLimit, b = g.maxBarChartSeriesCount));
+      const N = y.format(B), T = y.format(b), w = a !== void 0 ? y.format(a) : "";
+      f = Be(C, {
+        totalLimit: N,
+        seriesLimit: T,
+        elementCount: w
+      }), m = {
         actualCount: a ?? Number.NaN,
-        totalLimit: x,
-        seriesLimit: v
+        totalLimit: B,
+        seriesLimit: b
       };
       break;
     }
-    case j.LineChartExceedsLimit:
+    case Q.LineChartExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        let x = Number.NaN, v = Number.NaN, b = "";
-        r !== void 0 && (r <= y.maxLineChartSeriesCount ? r === 1 ? (b = u ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, x = y.maxLineUniqueSeriesCountTotal) : r === 2 ? (b = u ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, x = y.maxLineTwoSeriesCountTotal, v = y.maxLineTwoSeriesCountPerSeries) : r > 2 && (b = u ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, x = y.maxLineThreePlusSeriesCountTotal, v = y.maxLineThreePlusSeriesCountPerSeries) : (b = l.errors.lineSeriesCountCannotExceedLimit, v = y.maxLineChartSeriesCount));
-        const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-        d = Be(b, {
-          elementCount: T,
-          seriesLimit: N,
-          totalLimit: B
-        }), f = {
+        h = l.modalHeaders.tooManyFeatures;
+        let B = Number.NaN, b = Number.NaN, C = "";
+        r !== void 0 && (r <= g.maxLineChartSeriesCount ? r === 1 ? (C = u ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, B = g.maxLineUniqueSeriesCountTotal) : r === 2 ? (C = u ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, B = g.maxLineTwoSeriesCountTotal, b = g.maxLineTwoSeriesCountPerSeries) : r > 2 && (C = u ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, B = g.maxLineThreePlusSeriesCountTotal, b = g.maxLineThreePlusSeriesCountPerSeries) : (C = l.errors.lineSeriesCountCannotExceedLimit, b = g.maxLineChartSeriesCount));
+        const N = y.format(B), T = y.format(b), w = a !== void 0 ? y.format(a) : "";
+        f = Be(C, {
+          elementCount: w,
+          seriesLimit: T,
+          totalLimit: N
+        }), m = {
           actualCount: a ?? Number.NaN,
-          totalLimit: x,
-          seriesLimit: v
+          totalLimit: B,
+          seriesLimit: b
         };
       }
       break;
-    case j.BoxPlotExceedsLimit:
+    case Q.BoxPlotExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        let x = Number.NaN, v = Number.NaN, b = "";
-        r !== void 0 && (r <= y.maxBoxPlotSeriesCount ? r === 1 ? (b = l.errors.uniqueSeriesBoxCountCannotExceedLimit, x = y.maxBoxUniqueSeriesCountTotal) : r === 2 ? (b = l.errors.twoSeriesBoxCountCannotExceedLimit, x = y.maxBoxTwoSeriesCountTotal, v = y.maxBoxTwoSeriesCountPerSeries) : r > 2 && (b = l.errors.threePlusBoxLineCountCannotExceedLimit, x = y.maxBoxThreePlusSeriesCountTotal, v = y.maxBoxThreePlusSeriesCountPerSeries) : (b = l.errors.boxSeriesCountCannotExceedLimit, v = y.maxBoxPlotSeriesCount));
-        const B = m.format(x), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
-        d = Be(b, {
-          elementCount: T,
-          seriesLimit: N,
-          totalLimit: B
-        }), f = {
+        h = l.modalHeaders.tooManyFeatures;
+        let B = Number.NaN, b = Number.NaN, C = "";
+        r !== void 0 && (r <= g.maxBoxPlotSeriesCount ? r === 1 ? (C = l.errors.uniqueSeriesBoxCountCannotExceedLimit, B = g.maxBoxUniqueSeriesCountTotal) : r === 2 ? (C = l.errors.twoSeriesBoxCountCannotExceedLimit, B = g.maxBoxTwoSeriesCountTotal, b = g.maxBoxTwoSeriesCountPerSeries) : r > 2 && (C = l.errors.threePlusBoxLineCountCannotExceedLimit, B = g.maxBoxThreePlusSeriesCountTotal, b = g.maxBoxThreePlusSeriesCountPerSeries) : (C = l.errors.boxSeriesCountCannotExceedLimit, b = g.maxBoxPlotSeriesCount));
+        const N = y.format(B), T = y.format(b), w = a !== void 0 ? y.format(a) : "";
+        f = Be(C, {
+          elementCount: w,
+          seriesLimit: T,
+          totalLimit: N
+        }), m = {
           actualCount: a ?? Number.NaN,
-          totalLimit: x,
-          seriesLimit: v
+          totalLimit: B,
+          seriesLimit: b
         };
       }
       break;
-    case j.BoxPlotOutliersExceedsLimit:
+    case Q.BoxPlotOutliersExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.boxSeriesOutlierCannotExceedLimit, v = y.maxBoxPlotOutlierLimit, b = m.format(v);
-        d = Be(x, {
-          totalLimit: b
-        }), f = { actualCount: a ?? Number.NaN, totalLimit: v };
+        h = l.modalHeaders.tooManyFeatures;
+        const B = l.errors.boxSeriesOutlierCannotExceedLimit, b = g.maxBoxPlotOutlierLimit, C = y.format(b);
+        f = Be(B, {
+          totalLimit: C
+        }), m = { actualCount: a ?? Number.NaN, totalLimit: b };
       }
       break;
-    case j.HeatChartExceedsLimit:
+    case Q.HeatChartExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.heatChartCannotExceedLimit, v = y.maxHeatChartCellLimit, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(x, {
-          featureCount: B,
-          totalLimit: b
-        }), f = {
+        h = l.modalHeaders.tooManyFeatures;
+        const B = l.errors.heatChartCannotExceedLimit, b = g.maxHeatChartCellLimit, C = y.format(b), N = a !== void 0 ? y.format(a) : "";
+        f = Be(B, {
+          featureCount: N,
+          totalLimit: C
+        }), m = {
           actualCount: a ?? Number.NaN,
-          totalLimit: v
+          totalLimit: b
         };
       }
       break;
-    case j.PieChartExceedsLimit:
+    case Q.PieChartExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.pieChartSlicesCannotExceedLimit, v = y.maxPieChartSliceCountTotal, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(x, {
-          sliceCount: B,
-          totalLimit: b
-        }), f = {
+        h = l.modalHeaders.tooManyFeatures;
+        const B = l.errors.pieChartSlicesCannotExceedLimit, b = g.maxPieChartSliceCountTotal, C = y.format(b), N = a !== void 0 ? y.format(a) : "";
+        f = Be(B, {
+          sliceCount: N,
+          totalLimit: C
+        }), m = {
           actualCount: a ?? Number.NaN,
-          totalLimit: v
+          totalLimit: b
         };
       }
       break;
-    case j.GaugeExceedsLimit:
+    case Q.GaugeExceedsLimit:
       {
-        p = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.gaugeCannotExceedLimit, v = y.maxGaugeByFeaturesLimit, b = m.format(v), B = a !== void 0 ? m.format(a) : "";
-        d = Be(x, {
-          featureCount: B,
-          totalLimit: b
-        }), f = {
+        h = l.modalHeaders.tooManyFeatures;
+        const B = l.errors.gaugeCannotExceedLimit, b = g.maxGaugeByFeaturesLimit, C = y.format(b), N = a !== void 0 ? y.format(a) : "";
+        f = Be(B, {
+          featureCount: N,
+          totalLimit: C
+        }), m = {
           actualCount: a ?? Number.NaN,
-          totalLimit: v
+          totalLimit: b
         };
       }
       break;
-    case j.PieChartMixOfNegativePositiveSlices:
-      p = l.modalHeaders.cannotCombineNegativeAndPositiveSlices, d = l.errors.pieChartCannotHaveMixtureOfPositiveAndNegativeSlices;
+    case Q.PieChartMixOfNegativePositiveSlices:
+      h = l.modalHeaders.cannotCombineNegativeAndPositiveSlices, f = l.errors.pieChartCannotHaveMixtureOfPositiveAndNegativeSlices;
       break;
-    case j.NegativeValueInSqrtCalculation:
-      p = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForSqrtTransformation;
+    case Q.NegativeValueInSqrtCalculation:
+      h = l.modalHeaders.invalidData, f = l.errors.negativeValueInDataForSqrtTransformation;
       break;
-    case j.NegativeValueInLogCalculation:
-      p = l.modalHeaders.invalidData, d = l.errors.negativeValueInDataForLogTransformation;
+    case Q.NegativeValueInLogCalculation:
+      h = l.modalHeaders.invalidData, f = l.errors.negativeValueInDataForLogTransformation;
       break;
-    case j.HistogramEmptyField:
-      s === !0 ? (p = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBSMessage) : Ee(n) ? (p = l.modalHeaders.noDataAvailable, d = l.errors.noDataFBEMessage) : (p = l.modalHeaders.invalidChart, d = l.errors.histogramEmptyField);
+    case Q.HistogramEmptyField:
+      s === !0 ? (h = l.modalHeaders.noDataAvailable, f = l.errors.noDataFBSMessage) : Ee(n) ? (h = l.modalHeaders.noDataAvailable, f = l.errors.noDataFBEMessage) : (h = l.modalHeaders.invalidChart, f = l.errors.histogramEmptyField);
       break;
-    case j.EmptyDataSet:
-      p = l.modalHeaders.noDataAvailable, s === !0 ? d = l.errors.noDataFBSMessage : Ee(n) ? d = l.errors.noDataFBEMessage : d = l.errors.noDataMessage;
+    case Q.EmptyDataSet:
+      h = l.modalHeaders.noDataAvailable, s === !0 ? f = l.errors.noDataFBSMessage : Ee(n) ? f = l.errors.noDataFBEMessage : f = l.errors.noDataMessage;
       break;
-    case j.NoValue:
-      c && a && (p = void 0, d = l.errors.noValue);
+    case Q.NoValue:
+      c && a ? (h = void 0, f = l.errors.noValue) : d && (h = l.modalHeaders.noDataAvailable, f = l.errors.noDataMessage);
       break;
-    case j.NegativeValueInXAxisLogScale:
-      d = l.errors.logarithmicXAxisNotPossible;
+    case Q.NegativeValueInXAxisLogScale:
+      f = l.errors.logarithmicXAxisNotPossible;
       break;
-    case j.NegativeValueInYAxisLogScale:
-      d = l.errors.logarithmicYAxisNotPossible;
+    case Q.NegativeValueInYAxisLogScale:
+      f = l.errors.logarithmicYAxisNotPossible;
       break;
-    case j.BadData:
+    case Q.BadData:
   }
-  if (d === l.errors.defaultInvalidChart && (e === j.BarElementExceedsLimit || e === j.LineChartExceedsLimit || e === j.HeatChartExceedsLimit || e === j.PieChartExceedsLimit || e === j.GaugeExceedsLimit || e === j.BoxPlotExceedsLimit) && typeof a == "number" && typeof r == "number" && a / r > g) {
-    const x = a / r;
-    d = Be(l.errors.categoryCountCannotExceedLimit, {
-      categoryCount: m.format(x),
-      maxCategoryCount: m.format(g)
+  if (f === l.errors.defaultInvalidChart && (e === Q.BarElementExceedsLimit || e === Q.LineChartExceedsLimit || e === Q.HeatChartExceedsLimit || e === Q.PieChartExceedsLimit || e === Q.GaugeExceedsLimit || e === Q.BoxPlotExceedsLimit) && typeof a == "number" && typeof r == "number" && a / r > p) {
+    const B = a / r;
+    f = Be(l.errors.categoryCountCannotExceedLimit, {
+      categoryCount: y.format(B),
+      maxCategoryCount: y.format(p)
     });
   }
   return {
-    keyword: e ?? j.BadData,
-    header: p,
-    message: d,
-    params: f
+    keyword: e ?? Q.BadData,
+    header: h,
+    message: f,
+    params: m
   };
 }
 function ot(t, e) {
@@ -4403,20 +4418,20 @@ function Si(t) {
           showOutliers: !1,
           standardizeValues: !0
         };
-        let S = K(u);
-        if (o[S] = si({ mean: d, stdDev: f, value: p }), m === E.Min || m === E.Max) {
+        let h = K(u);
+        if (o[h] = si({ mean: d, stdDev: f, value: p }), m === E.Min || m === E.Max) {
           u = {
             ...u,
             key: m,
             showOutliers: !0,
             standardizeValues: !0
-          }, S = K(u), u = {
+          }, h = K(u), u = {
             ...u,
             standardizeValues: !1,
             splitByValue: r
           };
-          const x = K(u);
-          p = Number(e[x]), Number.isFinite(p) && (o[S] = si({
+          const v = K(u);
+          p = Number(e[v]), Number.isFinite(p) && (o[h] = si({
             mean: d,
             stdDev: f,
             value: p
@@ -4431,7 +4446,7 @@ function Ro(t) {
   return i.forEach((o) => {
     let u = {};
     Object.keys(r).forEach((c) => {
-      c.startsWith(o) ? u[c.replace(`${o}_`, "")] = r[c] : c.includes(C.rendererSymbolField) && (u[c] = r[c]), u[C.boxPlot.boxPlotCategory] = o, a && (u = Si({
+      c.startsWith(o) ? u[c.replace(`${o}_`, "")] = r[c] : c.includes(x.rendererSymbolField) && (u[c] = r[c]), u[x.boxPlot.boxPlotCategory] = o, a && (u = Si({
         dataItem: u,
         chartSubType: F.BoxPlotMultiFields
       }));
@@ -4440,12 +4455,12 @@ function Ro(t) {
 }
 function $o(t) {
   const { data: e, splitByField: i, y: a } = t, r = {
-    [C.boxPlot.boxPlotCategory]: a
+    [x.boxPlot.boxPlotCategory]: a
   };
   return e.forEach((s) => {
     const o = s[i];
     o !== void 0 && Object.keys(s).forEach((u) => {
-      u === C.rendererSymbolField ? r[`${u}_${o?.toString()}`] = s[u] : u === C.boxPlot.boxPlotMeanLineMarkerId ? r[u] = s[u] : r[`${o?.toString()}_${u}`] = s[u];
+      u === x.rendererSymbolField ? r[`${u}_${o?.toString()}`] = s[u] : u === x.boxPlot.boxPlotMeanLineMarkerId ? r[u] = s[u] : r[`${o?.toString()}_${u}`] = s[u];
     });
   }), [r];
 }
@@ -4455,10 +4470,10 @@ function ko(t) {
     const c = u[e];
     a.forEach((l) => {
       let d = {
-        [C.boxPlot.boxPlotCategory]: l
+        [x.boxPlot.boxPlotCategory]: l
       };
       Object.entries(u).forEach(([f, m]) => {
-        f.startsWith(`${l}_`) ? d[`${c}_${f.replace(`${l}_`, "")}`] = m : f.includes(C.rendererSymbolField) ? d[`${f}_${c}`] = m : f === C.boxPlot.boxPlotMeanLineMarkerId && (d[f] = u[f]);
+        f.startsWith(`${l}_`) ? d[`${c}_${f.replace(`${l}_`, "")}`] = m : f.includes(x.rendererSymbolField) ? d[`${f}_${c}`] = m : f === x.boxPlot.boxPlotMeanLineMarkerId && (d[f] = u[f]);
       }), r && (d = Si({
         dataItem: d,
         chartSubType: F.BoxPlotMultiFieldsAndSplitBy,
@@ -4491,12 +4506,12 @@ function _o(t) {
   return a.forEach((s) => {
     const o = s[i], u = { [i]: o }, c = s[e];
     Object.entries(s).forEach(([l, d]) => {
-      if (l.includes(C.rendererSymbolField))
-        u[`${C.rendererSymbolField}_${c?.toString()}`] = d;
-      else if (l === C.boxPlot.boxPlotMeanLineMarkerId)
+      if (l.includes(x.rendererSymbolField))
+        u[`${x.rendererSymbolField}_${c?.toString()}`] = d;
+      else if (l === x.boxPlot.boxPlotMeanLineMarkerId)
         u[l] = s[l];
       else if (l !== e && l !== i) {
-        const f = l !== C.xAxisField && l !== C.originalCategoryValue ? `${c?.toString()}_${l}` : l;
+        const f = l !== x.xAxisField && l !== x.originalCategoryValue ? `${c?.toString()}_${l}` : l;
         u[f] = d;
       }
     }), r.set(o, {
@@ -4565,17 +4580,17 @@ function Xa(t) {
   const { data: e, yField: i, x: a, chartSubType: r, splitByField: n } = t, s = r === F.BoxPlotMonoField || r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy ? void 0 : i, o = it(s), u = [], c = [], { maxOperandsPerWhereClause: l } = $t();
   let d = [], f = [], m = 1;
   return e.forEach((y, g) => {
-    const { outlierMinThreshold: p, outlierMaxThreshold: S } = Ho(y, o);
-    if (typeof p == "number" && typeof S == "number") {
-      const x = {
+    const { outlierMinThreshold: p, outlierMaxThreshold: h } = Ho(y, o);
+    if (typeof p == "number" && typeof h == "number") {
+      const v = {
         yField: i,
         outlierMinThreshold: p,
-        outlierMaxThreshold: S
+        outlierMaxThreshold: h
       };
-      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (x.xField = a, x.xValue = fi({
+      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (v.xField = a, v.xValue = fi({
         value: y[a],
         dataContext: y
-      })), (r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMultiFieldsAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && n !== void 0 && n in y && (x.splitByField = n, x.splitByValue = y[n]), d.push(ki({ ...x, target: "outliers" })), f.push(ki({ ...x, target: "alternativeData" })), (m % l === 0 || g === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
+      })), (r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMultiFieldsAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && n !== void 0 && n in y && (v.splitByField = n, v.splitByValue = y[n]), d.push(ki({ ...v, target: "outliers" })), f.push(ki({ ...v, target: "alternativeData" })), (m % l === 0 || g === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
     }
     m += 1;
   }), { outliersFilterBatches: u, dataWithoutOutliersFilterBatches: c };
@@ -4611,19 +4626,19 @@ function zo(t) {
 }
 async function Wo(t) {
   const { seriesConfig: e, data: i, uniqueQuery: a, queryObject: r, meanAndStdDevPerField: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = k(e), l = e[0], { x: d } = l, f = te(l.query?.where), m = z(r), y = ve(m).idField, g = ue(e), p = [];
-  for (let v = 0; v < g.length; v += 1) {
-    const b = g[v], { outliersFilterBatches: B } = Xa({
+  for (let B = 0; B < g.length; B += 1) {
+    const b = g[B], { outliersFilterBatches: C } = Xa({
       data: i,
       yField: b,
       x: d,
       chartSubType: c,
       splitByField: f
     });
-    for (let N = 0; N < B.length; N += 1) {
-      const T = B[N];
+    for (let N = 0; N < C.length; N += 1) {
+      const T = C[N];
       if (T !== "") {
         const w = [];
-        d !== C.boxPlot.boxPlotCategory && w.push(d), w.push(b), f !== "" && w.push(f), w.push(y);
+        d !== x.boxPlot.boxPlotCategory && w.push(d), w.push(b), f !== "" && w.push(f), w.push(y);
         const L = {
           ...a,
           where: Y([a.where, T]),
@@ -4647,13 +4662,13 @@ async function Wo(t) {
       }
     }
   }
-  const S = await Promise.all(p), x = /* @__PURE__ */ new Map();
-  for (let v = 0; v < S.length; v += 1) {
-    const b = S[v], B = g[v];
+  const h = await Promise.all(p), v = /* @__PURE__ */ new Map();
+  for (let B = 0; B < h.length; B += 1) {
+    const b = h[B], C = g[B];
     b.forEach((N) => {
       const T = { ...N.attributes };
-      if (T[B] !== void 0) {
-        d === C.boxPlot.boxPlotCategory && (T[C.boxPlot.boxPlotCategory] = B);
+      if (T[C] !== void 0) {
+        d === x.boxPlot.boxPlotCategory && (T[x.boxPlot.boxPlotCategory] = C);
         let w = {
           key: E.Outlier,
           chartSubType: c
@@ -4670,13 +4685,13 @@ async function Wo(t) {
           case F.BoxPlotMultiFieldsAndCategory:
             w = {
               ...w,
-              y: B
+              y: C
             };
             break;
         }
-        const L = K(w), A = T[B];
+        const L = K(w), A = T[C];
         T[L] = A;
-        const I = `${T[d]}-${T[f]}-${A}`, P = x.get(I);
+        const I = `${T[d]}-${T[f]}-${A}`, P = v.get(I);
         if (T[W.uniqueIdsName] = [
           ...P?.[W.uniqueIdsName] ?? [],
           T[y]
@@ -4689,7 +4704,7 @@ async function Wo(t) {
             outlierDataItem: T,
             chartSubType: c,
             x: d,
-            y: B,
+            y: C,
             splitByField: f,
             meanAndStdDevPerField: n
           });
@@ -4699,11 +4714,11 @@ async function Wo(t) {
             stdDev: $
           }));
         }
-        delete T[B], T[C.boxPlot.boxPlotOutlierId] = !0, x.set(I, T);
+        delete T[C], T[x.boxPlot.boxPlotOutlierId] = !0, v.set(I, T);
       }
     });
   }
-  return Array.from(x.values());
+  return Array.from(v.values());
 }
 async function Go(t) {
   const {
@@ -4718,14 +4733,14 @@ async function Go(t) {
     abortSignal: c
   } = t;
   let l = [];
-  const { series: d, showMean: f } = n, m = Bi({ showMean: f, seriesConfig: d }), y = k(d), g = Re(n), { x: p } = g, S = te(g.query?.where), x = [];
+  const { series: d, showMean: f } = n, m = Bi({ showMean: f, seriesConfig: d }), y = k(d), g = Re(n), { x: p } = g, h = te(g.query?.where), v = [];
   for (let b = 0; b < m.length; b += 1) {
-    const B = m[b], { dataWithoutOutliersFilterBatches: N } = Xa({
+    const C = m[b], { dataWithoutOutliersFilterBatches: N } = Xa({
       data: e,
-      yField: B,
+      yField: C,
       x: p,
       chartSubType: y,
-      splitByField: S
+      splitByField: h
     });
     for (let T = 0; T < N.length; T += 1) {
       const w = N[T], L = {
@@ -4733,11 +4748,11 @@ async function Go(t) {
         where: Y([a.where, w])
       };
       L.outStatistics !== void 0 && (L.outStatistics = L.outStatistics?.filter(
-        (A) => (A.statisticType === D.Minimum || A.statisticType === D.Maximum) && A.onStatisticField === B
+        (A) => (A.statisticType === D.Minimum || A.statisticType === D.Maximum) && A.onStatisticField === C
       ).map((A) => ({
         ...A,
-        outStatisticFieldName: `${A.outStatisticFieldName}${C.boxPlot.boxPlotOutliersSuffix}`
-      }))), x.push(
+        outStatisticFieldName: `${A.outStatisticFieldName}${x.boxPlot.boxPlotOutliersSuffix}`
+      }))), v.push(
         jt({
           queryObject: i,
           uniqueQuery: L,
@@ -4753,12 +4768,12 @@ async function Go(t) {
       );
     }
   }
-  const v = await Promise.all(x);
-  for (let b = 0; b < v.length; b += 1)
-    l.push(...v[b]);
+  const B = await Promise.all(v);
+  for (let b = 0; b < B.length; b += 1)
+    l.push(...B[b]);
   return y !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && y !== F.BoxPlotMonoField && (l = bt({
     data: l,
-    x: S !== void 0 && S !== "" ? S : p
+    x: h !== void 0 && h !== "" ? h : p
   })), l;
 }
 async function Uo(t) {
@@ -4816,7 +4831,7 @@ function Ja(t) {
     const f = te(o.query?.where);
     switch (u) {
       case F.BoxPlotMonoField:
-        d[0][C.boxPlot.boxPlotCategory] = l[0];
+        d[0][x.boxPlot.boxPlotCategory] = l[0];
         break;
       case F.BoxPlotMultiFields:
         d = Ro({
@@ -4941,19 +4956,19 @@ function Ka(t) {
   return {
     xAxisData: Qi({
       chartConfig: e,
-      field: Q.xField,
+      field: _.xField,
       chartData: i
     }),
     yAxisData: Qi({
       chartConfig: e,
-      field: Q.yField,
+      field: _.yField,
       chartData: i
     })
   };
 }
 function _i(t) {
   const { orderBy: e, axisFormatOptions: i } = t;
-  return e !== void 0 && i !== void 0 && (!Array.isArray(e) || i?.type === h.CategoryAxisFormat);
+  return e !== void 0 && i !== void 0 && (!Array.isArray(e) || i?.type === S.CategoryAxisFormat);
 }
 function ji(t, e, i) {
   let a = 0;
@@ -4996,7 +5011,7 @@ function Ko(t) {
 function Et(t) {
   const { arrayToSort: e, chartConfig: i, fieldList: a, isTimeBinningSeries: r } = t;
   if (r !== !0 && e[0] !== void 0) {
-    const { series: n } = i, s = k(n), o = _(n), u = xe(i), c = Mt(i);
+    const { series: n } = i, s = k(n), o = j(n), u = xe(i), c = Mt(i);
     if (We(i) && e !== void 0)
       Jo({
         arrayToSort: e,
@@ -5006,8 +5021,8 @@ function Et(t) {
     else if (c?.[0] !== void 0 && e !== void 0 && e.length > 1) {
       const { orderBy: l } = c[0];
       let { sortingField: d } = c[0];
-      const f = i.orderOptions?.data?.orderType === De.Category, m = c[0].preferLabel !== !1, y = s === F.BarAndLineFromFields || s === F.PieFromFields || s === F.BoxPlotMultiFields || s === F.BoxPlotMultiFieldsAndSplitBy, g = y || o === h.PieSeries, p = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
-      if (f && g && (!m || (o === h.LineSeries || o === h.RadarSeries) && u === h.NumberAxisFormat) && (d = C.originalCategoryValue), Array.isArray(l))
+      const f = i.orderOptions?.data?.orderType === De.Category, m = c[0].preferLabel !== !1, y = s === F.BarAndLineFromFields || s === F.PieFromFields || s === F.BoxPlotMultiFields || s === F.BoxPlotMultiFieldsAndSplitBy, g = y || o === S.PieSeries, p = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
+      if (f && g && (!m || (o === S.LineSeries || o === S.RadarSeries) && u === S.NumberAxisFormat) && (d = x.originalCategoryValue), Array.isArray(l))
         En({
           arrayToSort: e,
           orderBy: l,
@@ -5017,12 +5032,12 @@ function Et(t) {
           preferLabel: m
         });
       else {
-        const S = u === h.DateAxisFormat && f;
+        const h = u === S.DateAxisFormat && f;
         ht({
           arrayToSort: e,
           orderBy: l,
           sortingField: d,
-          forceAscendingOrder: S,
+          forceAscendingOrder: h,
           isNonAggregated: p,
           sortByCategory: f,
           preferLabel: m,
@@ -5055,7 +5070,7 @@ function kd(t) {
 }
 function el(t) {
   return t?.type === "uniqueValue" && (t.uniqueValueInfos = t.uniqueValueInfos.map((e) => {
-    const i = e.value === null ? C.nullValue : e.value;
+    const i = e.value === null ? x.nullValue : e.value;
     return { ...e, value: i };
   })), t;
 }
@@ -5069,17 +5084,17 @@ async function Qd(t) {
     const y = jn(c, d?.renderer), g = Un({
       chartRenderer: u,
       queryObject: i
-    }), p = _(o), S = k(o), x = Re(a), v = te(x.query?.where);
+    }), p = j(o), h = k(o), v = Re(a), B = te(v.query?.where);
     m = /* @__PURE__ */ new Map();
-    for (let b = 0; b < (p === h.HistogramSeries && e.length > 0 ? 1 : e.length); b += 1) {
-      const B = e[b], N = await Yn({
+    for (let b = 0; b < (p === S.HistogramSeries && e.length > 0 ? 1 : e.length); b += 1) {
+      const C = e[b], N = await Yn({
         seriesConfig: a.series,
-        dataItem: B,
+        dataItem: C,
         renderer: f,
         rendererType: y,
         rendererOrigin: l,
-        chartSubType: S,
-        splitByField: v,
+        chartSubType: h,
+        splitByField: B,
         graphicTemplate: g,
         mapAttributesToSymbol: m,
         rendererFieldNames: s
@@ -5126,7 +5141,7 @@ async function il(t) {
   })).elementCount, r?.behaviorAfterLimit !== lt.RenderUpToTheLimit && (f = Ae({
     count: m ?? 0,
     seriesCount: i.series.length,
-    chartType: h.GaugeSeries,
+    chartType: S.GaugeSeries,
     chartLimits: r
   })), r && (Number.isFinite(l) || Number.isFinite(m)))) {
     const y = Math.min(l ?? Number.NaN, m ?? Number.NaN);
@@ -5149,7 +5164,7 @@ async function il(t) {
   } else
     u.count = m, It({
       dataInfo: u,
-      chartType: h.GaugeSeries
+      chartType: S.GaugeSeries
     });
   return u;
 }
@@ -5195,30 +5210,30 @@ function al(t) {
     c = !0;
   else if (!a) {
     const l = [
-      C.originalCategoryValue,
-      C.originalYCategoryValue,
-      C.originalDateValue,
-      C.xAxisField,
-      C.technicalSortingFieldBySum,
-      C.technicalSortingFieldByPercent,
-      C.pieChart.technicalFieldSlicePercent,
-      C.pieChart.technicalFieldGroupedSlices,
-      C.pieChart.technicalFieldSliceId,
-      C.originalServerBinningRange,
-      C.lastTemporalBin,
-      C.technicalFieldSplitByField,
+      x.originalCategoryValue,
+      x.originalYCategoryValue,
+      x.originalDateValue,
+      x.xAxisField,
+      x.technicalSortingFieldBySum,
+      x.technicalSortingFieldByPercent,
+      x.pieChart.technicalFieldSlicePercent,
+      x.pieChart.technicalFieldGroupedSlices,
+      x.pieChart.technicalFieldSliceId,
+      x.originalServerBinningRange,
+      x.lastTemporalBin,
+      x.technicalFieldSplitByField,
       W.uniqueIdsName,
-      Q.valueField,
+      _.valueField,
       ...Vr
     ], d = (g, p) => {
-      const S = p[C.originalCategoryValue];
-      S !== void 0 && r && (p[r] = S);
-      const x = p[C.originalYCategoryValue];
-      x !== void 0 && n && (p[n] = x), r && p[Q.xField] !== void 0 && (p[r] = p[C.originalCategoryValue] !== void 0 ? p[C.originalCategoryValue] : p[Q.xField], delete p[Q.xField]), n && p[Q.yField] !== void 0 && (p[n] = p[C.originalYCategoryValue] !== void 0 ? p[C.originalYCategoryValue] : p[Q.yField], delete p[Q.yField]), s && p[Q.valueField] !== void 0 && (p[s] = p[Q.valueField], delete p[Q.valueField]);
-      const v = {};
+      const h = p[x.originalCategoryValue];
+      h !== void 0 && r && (p[r] = h);
+      const v = p[x.originalYCategoryValue];
+      v !== void 0 && n && (p[n] = v), r && p[_.xField] !== void 0 && (p[r] = p[x.originalCategoryValue] !== void 0 ? p[x.originalCategoryValue] : p[_.xField], delete p[_.xField]), n && p[_.yField] !== void 0 && (p[n] = p[x.originalYCategoryValue] !== void 0 ? p[x.originalYCategoryValue] : p[_.yField], delete p[_.yField]), s && p[_.valueField] !== void 0 && (p[s] = p[_.valueField], delete p[_.valueField]);
+      const B = {};
       return Object.keys(p).forEach((b) => {
-        !l.includes(b) && !b.includes(C.rendererSymbolField) && (v[b] = p[b]);
-      }), g.push(v), g;
+        !l.includes(b) && !b.includes(x.rendererSymbolField) && (B[b] = p[b]);
+      }), g.push(B), g;
     }, f = (g, p) => JSON.stringify(g).localeCompare(JSON.stringify(p));
     let m = o?.reduce(d, [])?.sort(f), y = u?.reduce(d, [])?.sort(f);
     m && y && r && m.length !== y.length && (m = bt({ data: m, x: r }), y = bt({ data: y, x: r })), c = m?.length !== y?.length || !at(m, y);
@@ -5262,7 +5277,7 @@ function qe(t, e) {
 function nl(t) {
   const { dataContext: e, xAxisField: i, yAxisField: a, options: r } = t;
   let n = "";
-  const { dataContextXMinField: s, dataContextXMaxField: o, dataContextYMinField: u, dataContextYMaxField: c } = C.scatterplotAggregationFields;
+  const { dataContextXMinField: s, dataContextXMaxField: o, dataContextYMinField: u, dataContextYMaxField: c } = x.scatterplotAggregationFields;
   if (ha({ dataContext: e, chartLimits: r?.chartLimits })) {
     const { [s]: l, [o]: d } = e, f = i !== a ? e[u] : l, m = i !== a ? e[c] : d;
     if (!Number.isNaN(l) && !Number.isNaN(d) && !Number.isNaN(f) && !Number.isNaN(m)) {
@@ -5283,7 +5298,7 @@ function Hi(t) {
 function er(t) {
   const { xAxisField: e, dataContext: i, queryObject: a } = t;
   let r = "";
-  const n = i[C.originalServerBinningRange] ?? i[C.dateBinningRange];
+  const n = i[x.originalServerBinningRange] ?? i[x.dateBinningRange];
   if (ui(n) && n.length === 2) {
     let [s, o] = n, u = !0;
     const c = Ee(a);
@@ -5293,7 +5308,7 @@ function er(t) {
     } else
       typeof s == "number" && typeof o == "number" ? Number.isFinite(s) && Number.isFinite(o) ? (s = nt(s), o = nt(o)) : u = !1 : typeof s == "string" && typeof o == "string" && (s = new Date(s).toISOString(), o = new Date(o).toISOString());
     if (u) {
-      const l = c ? "" : "'", d = i[C.lastTemporalBin] === !0 ? "<=" : "<";
+      const l = c ? "" : "'", d = i[x.lastTemporalBin] === !0 ? "<=" : "<";
       r = `${e}>=${l}${s}${l} AND ${e}${d}${l}${o}${l}`;
     }
   }
@@ -5302,7 +5317,7 @@ function er(t) {
 function tr(t, e) {
   let i = "";
   if (Number.isFinite(t)) {
-    const a = 1 / 10 ** C.queryMaxFloatPrecision;
+    const a = 1 / 10 ** x.queryMaxFloatPrecision;
     i = `${e}>=${t - a} AND ${e}<=${t + a}`;
   }
   return i;
@@ -5310,7 +5325,7 @@ function tr(t, e) {
 function ir(t) {
   const { xAxisField: e, yAxisField: i, splitBy: a, dataContext: r, xAxisFieldType: n, chartConfig: s } = t;
   let o = "";
-  if (e !== void 0 && e !== C.boxPlot.boxPlotCategory) {
+  if (e !== void 0 && e !== x.boxPlot.boxPlotCategory) {
     let d = fi({
       value: r[e],
       dataContext: r
@@ -5334,7 +5349,7 @@ function ir(t) {
       showOutliers: !0,
       splitBy: a,
       y: d
-    }), y = e === C.boxPlot.boxPlotCategory ? r[e] : i;
+    }), y = e === x.boxPlot.boxPlotCategory ? r[e] : i;
     if (!oe(y)) {
       const g = r[f], p = r[m];
       Number.isFinite(g) && Number.isFinite(p) && (c = `${y?.toString()}>=${g?.toString()} AND ${y?.toString()}<=${p?.toString()}`);
@@ -5345,7 +5360,7 @@ function ir(t) {
 function sl(t) {
   const { xAxisField: e, splitBy: i, dataContext: a, xAxisFieldType: r, chartConfig: n, queryObject: s } = t;
   let o = "";
-  if (C.dateBinningRange in a)
+  if (x.dateBinningRange in a)
     o = er({ xAxisField: e, dataContext: a, queryObject: s });
   else if (k(n.series) !== F.BarAndLineFromFields) {
     let l = fi({
@@ -5363,7 +5378,7 @@ function sl(t) {
 }
 function ol(t) {
   const { xAxisField: e, dataContext: i, chartConfig: a } = t;
-  let r = i[C.originalCategoryValue];
+  let r = i[x.originalCategoryValue];
   return r === void 0 && (r = i[e]), k(a.series) === F.PieFromFields ? "" : Le({
     where: qe(e, r),
     normalize: !1,
@@ -5395,10 +5410,10 @@ function ll(t) {
     runsOnClientQueryEngine: o
   } = t, u = r.series[0];
   let c = "";
-  if (u.type === h.HeatSeries) {
+  if (u.type === S.HeatSeries) {
     let l, d;
-    const f = a[Q.xField], m = a[C.originalCategoryValue], y = a[Q.yField], g = a[C.originalYCategoryValue], p = r.axes?.[0]?.valueFormat?.type, S = r.axes?.[1]?.valueFormat?.type;
-    p === h.CategoryAxisFormat ? l = Le({
+    const f = a[_.xField], m = a[x.originalCategoryValue], y = a[_.yField], g = a[x.originalYCategoryValue], p = r.axes?.[0]?.valueFormat?.type, h = r.axes?.[1]?.valueFormat?.type;
+    p === S.CategoryAxisFormat ? l = Le({
       where: qe(u.x, m ?? f),
       normalize: !1,
       escape: !0
@@ -5410,7 +5425,7 @@ function ll(t) {
       outTimeZone: n,
       dataTimeZone: s,
       runsOnClientQueryEngine: o
-    }), S === h.CategoryAxisFormat ? d = Le({
+    }), h === S.CategoryAxisFormat ? d = Le({
       where: qe(u.y, g ?? y),
       normalize: !1,
       escape: !0
@@ -5430,7 +5445,7 @@ function ul(t) {
   const { xAxisField: e, dataContext: i, chartConfig: a } = t;
   let r = "";
   const n = a.series[0], { minValue: s, maxValue: o } = i;
-  if (Number.isFinite(s) && Number.isFinite(o) && n.type === h.HistogramSeries) {
+  if (Number.isFinite(s) && Number.isFinite(o) && n.type === S.HistogramSeries) {
     const u = qn(e, n.dataTransformationType), c = i.isLastBin ? "<=" : "<";
     r = Y([
       `${u}>=${s?.toString()}`,
@@ -5440,28 +5455,28 @@ function ul(t) {
   return r;
 }
 function jd(t) {
-  const { chartConfig: e } = t, i = _(e.series);
+  const { chartConfig: e } = t, i = j(e.series);
   let a = "";
   switch (i) {
-    case h.ScatterSeries:
+    case S.ScatterSeries:
       a = nl(t);
       break;
-    case h.HeatSeries:
+    case S.HeatSeries:
       a = ll(t);
       break;
-    case h.RadarSeries:
-    case h.BarSeries:
-    case h.LineSeries:
-    case h.ComboLineAndBarSeries:
+    case S.RadarSeries:
+    case S.BarSeries:
+    case S.LineSeries:
+    case S.ComboLineAndBarSeries:
       a = sl(t);
       break;
-    case h.BoxPlotSeries:
+    case S.BoxPlotSeries:
       a = ir(t);
       break;
-    case h.HistogramSeries:
+    case S.HistogramSeries:
       a = ul(t);
       break;
-    case h.PieSeries:
+    case S.PieSeries:
       a = ol(t);
       break;
   }
@@ -5486,7 +5501,7 @@ async function cl(t) {
   } = t, g = k(a.series);
   let p = { valid: !0, data: { dataItems: [] } };
   if (r !== void 0 && r.length > 0) {
-    const S = Re(a), { x } = S, v = "y" in S ? S.y : "", B = Ce(e).find((I) => I.name === x)?.type, N = [], T = r.reduce(
+    const h = Re(a), { x: v } = h, B = "y" in h ? h.y : "", C = Ce(e).find((I) => I.name === v)?.type, N = [], T = r.reduce(
       (I, P) => {
         const O = [];
         if (W.uniqueIdsName in P)
@@ -5496,7 +5511,7 @@ async function cl(t) {
             case F.BoxPlotMonoFieldAndSplitBy:
             case F.BoxPlotMultiFieldsAndSplitBy:
             case F.BoxPlotMonoFieldAndCategoryAndSplitBy: {
-              const M = te(S.query?.where ?? ""), q = `_${E.Average}`;
+              const M = te(h.query?.where ?? ""), q = `_${E.Average}`;
               Object.keys(P).forEach((G) => {
                 if (G.includes(q)) {
                   const J = G.replace(q, "");
@@ -5506,7 +5521,7 @@ async function cl(t) {
               break;
             }
           }
-          const V = [v].flat();
+          const V = [B].flat();
           let $ = V.length === 1 ? V[0] : "";
           if (g === F.BoxPlotMultiFieldsAndCategory) {
             const M = `_${E.FirstQuartile}`, q = Object.keys(P).find((G) => G.includes(M));
@@ -5515,11 +5530,11 @@ async function cl(t) {
           O.length === 0 && O.push(""), O.forEach((M) => {
             const q = ir({
               chartConfig: a,
-              xAxisField: x,
+              xAxisField: v,
               yAxisField: $,
               splitBy: M,
               dataContext: P,
-              xAxisFieldType: B
+              xAxisFieldType: C
             });
             I.push(q);
           });
@@ -5571,25 +5586,25 @@ async function dl(t) {
     abortSignal: p
   } = t;
   yt(e);
-  const { series: S } = a, x = _(S), v = xe(a);
-  let b = { valid: !0 }, B = s?.selectionItems ?? [];
-  n || (B = rl({ chartConfig: a, currentSelectionDataItems: r, selectionData: s }));
+  const { series: h } = a, v = j(h), B = xe(a);
+  let b = { valid: !0 }, C = s?.selectionItems ?? [];
+  n || (C = rl({ chartConfig: a, currentSelectionDataItems: r, selectionData: s }));
   let N = !1;
-  switch (x) {
-    case h.HeatSeries:
-      b.data = { dataItems: B };
+  switch (v) {
+    case S.HeatSeries:
+      b.data = { dataItems: C };
       break;
-    case h.PieSeries:
+    case S.PieSeries:
       if (k(a.series) === F.PieFromFields) {
-        const { x: T, y: w } = a.series[0], L = He(B);
+        const { x: T, y: w } = a.series[0], L = He(C);
         L.forEach((A) => {
           T in A && (A[ce] = A[T], delete A[T]), w in A && (A[Ne] = A[w], delete A[w]);
         }), b.data = { dataItems: L };
       } else
-        b.data = { dataItems: B };
-      b.count = B.length, N = !0;
+        b.data = { dataItems: C };
+      b.count = C.length, N = !0;
       break;
-    case h.BoxPlotSeries:
+    case S.BoxPlotSeries:
       de(a) && (b = await cl({
         queryObject: e,
         queryConfig: i,
@@ -5607,23 +5622,23 @@ async function dl(t) {
         abortSignal: p
       }));
       break;
-    case h.BarSeries:
-    case h.ComboLineAndBarSeries:
-    case h.RadarSeries:
-    case h.LineSeries:
-      if (B.length === 0 || !Pe({
-        xAxisValueFormatType: v,
+    case S.BarSeries:
+    case S.ComboLineAndBarSeries:
+    case S.RadarSeries:
+    case S.LineSeries:
+      if (C.length === 0 || !Pe({
+        xAxisValueFormatType: B,
         setTimeBinningInfoWhenNotProvided: o,
-        seriesConfig: S[0],
+        seriesConfig: h[0],
         queryObject: e
       }))
-        b.data = { dataItems: B }, b.count = B.length * S.length, N = !0;
+        b.data = { dataItems: C }, b.count = C.length * h.length, N = !0;
       else {
         const T = { ...i };
         if (r !== void 0 && r.length > 0) {
           const L = r.map(
             (I) => er({
-              xAxisField: S[0].x,
+              xAxisField: h[0].x,
               dataContext: I,
               queryObject: e
             })
@@ -5644,8 +5659,8 @@ async function dl(t) {
         });
       }
       break;
-    case h.HistogramSeries: {
-      if (B.length === 0)
+    case S.HistogramSeries: {
+      if (C.length === 0)
         b.data = {
           mean: Number.NaN,
           median: Number.NaN,
@@ -5655,8 +5670,8 @@ async function dl(t) {
           bins: []
         }, b.count = 0;
       else {
-        const { x: T } = S[0], w = B.map((I, P) => {
-          const { minValue: O, maxValue: V } = I, $ = P === B.length - 1 ? "<=" : "<";
+        const { x: T } = h[0], w = C.map((I, P) => {
+          const { minValue: O, maxValue: V } = I, $ = P === C.length - 1 ? "<=" : "<";
           return `${T} >= ${O} AND ${T} ${$} ${V}`;
         }), L = Y(w, "OR"), A = { ...i };
         A.where = Y([A.where, L]), b = await Ya({
@@ -5671,16 +5686,16 @@ async function dl(t) {
       }
       break;
     }
-    case h.ScatterSeries: {
-      if (B.length === 0) {
-        const { r2: T, trendLinePoints: w } = C.scatterplotSeries;
+    case S.ScatterSeries: {
+      if (C.length === 0) {
+        const { r2: T, trendLinePoints: w } = x.scatterplotSeries;
         b.data = { dataItems: [], r2: T, trendLinePoints: w, count: 0 }, b.count = 0;
       } else {
         const { r2: T, trendLinePoints: w } = qa({
-          data: B,
+          data: C,
           chartConfig: a
         });
-        b.data = { dataItems: B, r2: T, trendLinePoints: w }, b.count = B.length;
+        b.data = { dataItems: C, r2: T, trendLinePoints: w }, b.count = C.length;
       }
       break;
     }
@@ -5726,9 +5741,9 @@ async function Fi(t) {
   if (!g)
     y = p;
   else {
-    const S = { dataItems: [] };
-    S.meanLines = p.data.dataItems;
-    const x = Oo(i), v = (await oi({
+    const h = { dataItems: [] };
+    h.meanLines = p.data.dataItems;
+    const v = Oo(i), B = (await oi({
       queryObject: e,
       queryConfig: a,
       fetchFullBoxPlotData: !0,
@@ -5740,11 +5755,11 @@ async function Fi(t) {
       replaceNoValueCategoryWithZero: f,
       view: m,
       errorStrings: r,
-      chartConfig: x,
+      chartConfig: v,
       abortKey: n,
       abortSignal: s
     })).data;
-    S.dataItems = v.dataItems, S.outliers = v.outliers, y.data = S;
+    h.dataItems = B.dataItems, h.outliers = B.outliers, y.data = h;
   }
   return y;
 }
@@ -5766,20 +5781,20 @@ async function fl(t) {
     errorStrings: y,
     abortKey: g,
     abortSignal: p,
-    fieldList: S,
-    currentSelectionDataItems: x,
-    dataForFilterBySelectionChanged: v,
+    fieldList: h,
+    currentSelectionDataItems: v,
+    dataForFilterBySelectionChanged: B,
     filterByViewExtent: b,
-    preFetchedQueryResponse: B
-  } = t, { series: N } = i, T = _(N);
+    preFetchedQueryResponse: C
+  } = t, { series: N } = i, T = j(N);
   let w = { valid: !0 };
   if (r)
     w = await dl({
       queryObject: e,
       queryConfig: a,
       chartConfig: i,
-      currentSelectionDataItems: x,
-      dataForFilterBySelectionChanged: v,
+      currentSelectionDataItems: v,
+      dataForFilterBySelectionChanged: B,
       selectionData: n,
       setTimeBinningInfoWhenNotProvided: s,
       returnFeaturesExtent: o,
@@ -5794,7 +5809,7 @@ async function fl(t) {
     });
   else
     switch (T) {
-      case h.HeatSeries:
+      case S.HeatSeries:
         yt(e), w = await cr({
           chartConfig: i,
           queryConfig: a,
@@ -5809,7 +5824,7 @@ async function fl(t) {
           abortSignal: p
         });
         break;
-      case h.BoxPlotSeries:
+      case S.BoxPlotSeries:
         de(i) && (w = await Fi({
           queryObject: e,
           // @REV: temporary
@@ -5827,11 +5842,11 @@ async function fl(t) {
           abortSignal: p
         }));
         break;
-      case h.BarSeries:
-      case h.ComboLineAndBarSeries:
-      case h.PieSeries:
-      case h.RadarSeries:
-      case h.LineSeries: {
+      case S.BarSeries:
+      case S.ComboLineAndBarSeries:
+      case S.PieSeries:
+      case S.RadarSeries:
+      case S.LineSeries: {
         const L = {
           queryObject: e,
           // @REV: temporary
@@ -5848,8 +5863,8 @@ async function fl(t) {
           view: f,
           abortKey: g,
           abortSignal: p,
-          fieldList: S,
-          preFetchedQueryResponse: B
+          fieldList: h,
+          preFetchedQueryResponse: C
         };
         Pe({
           xAxisValueFormatType: xe(i),
@@ -5859,7 +5874,7 @@ async function fl(t) {
         }) ? w = await xi(L) : w = await oi(L);
         break;
       }
-      case h.ScatterSeries:
+      case S.ScatterSeries:
         w.data = await dr({
           queryObject: e,
           queryConfig: a,
@@ -5877,7 +5892,7 @@ async function fl(t) {
           abortSignal: p
         });
         break;
-      case h.HistogramSeries:
+      case S.HistogramSeries:
         w = await Ya({
           queryObject: e,
           queryConfig: a,
@@ -5889,7 +5904,7 @@ async function fl(t) {
           errorStrings: y
         });
         break;
-      case h.GaugeSeries:
+      case S.GaugeSeries:
         yt(e), w = await il({
           queryObject: e,
           chartConfig: i,
@@ -5921,11 +5936,11 @@ async function Hd(t) {
     chartLimits: y,
     popupTemplateFieldInfosEnabled: g,
     hideZeroCountCategories: p,
-    replaceNoValueCategoryWithZero: S,
-    view: x,
-    syncViewTimeZone: v,
+    replaceNoValueCategoryWithZero: h,
+    view: v,
+    syncViewTimeZone: B,
     errorStrings: b,
-    fieldList: B,
+    fieldList: C,
     preFetchedQueryResponse: N
   } = t;
   let T = { valid: !0 };
@@ -5934,7 +5949,7 @@ async function Hd(t) {
     chartConfig: i,
     runtimeDataFilters: u,
     ignoreViewExtent: c,
-    view: x
+    view: v
   });
   return Ls(a), T = await fl({
     chartConfig: i,
@@ -5950,13 +5965,13 @@ async function Hd(t) {
     chartLimits: y,
     popupTemplateFieldInfosEnabled: g,
     hideZeroCountCategories: p,
-    replaceNoValueCategoryWithZero: S,
-    view: x,
-    syncViewTimeZone: v,
+    replaceNoValueCategoryWithZero: h,
+    view: v,
+    syncViewTimeZone: B,
     abortKey: a,
     abortSignal: r,
     errorStrings: b,
-    fieldList: B,
+    fieldList: C,
     preFetchedQueryResponse: N
   }), T.queryConfig = w, T;
 }
@@ -5964,7 +5979,7 @@ function ml(t, e, i) {
   const a = /* @__PURE__ */ new Map();
   for (let n = 0; n < t.length; n += 1) {
     const s = { [i]: t[n] };
-    C.xAxisField in s || (s[C.xAxisField] = t[n]), a.set(t[n], s);
+    x.xAxisField in s || (s[x.xAxisField] = t[n]), a.set(t[n], s);
   }
   for (let n = 0; n < e.length; n += 1) {
     const s = e[n][i];
@@ -5986,28 +6001,28 @@ async function yl(t) {
   } = t, { series: l } = i;
   let d = e;
   const f = k(l), m = xe(i);
-  if (s !== lt.RenderUpToTheLimit && n !== void 0 && n > e.length && f !== F.BarAndLineFromFields && f !== F.BarAndLineNoAggregation && f !== F.PieNoAggregation && m === h.CategoryAxisFormat) {
+  if (s !== lt.RenderUpToTheLimit && n !== void 0 && n > e.length && f !== F.BarAndLineFromFields && f !== F.BarAndLineNoAggregation && f !== F.PieNoAggregation && m === S.CategoryAxisFormat) {
     const { x: y } = l[0], g = {
       ...a,
       returnDistinctValues: !0,
       outFields: [y]
     };
     delete g.outStatistics, delete g.orderByFields, delete g.groupByFieldsForStatistics;
-    const S = (await Fe({
+    const h = (await Fe({
       queryObject: r,
       queryConfig: g,
       featureCount: n,
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    })).map((x) => x.attributes[y]).filter((x) => x != null);
-    S.length > e.length && (d = ml(S, e, y));
+    })).map((v) => v.attributes[y]).filter((v) => v != null);
+    h.length > e.length && (d = ml(h, e, y));
   }
   return d;
 }
 function gl(t, e) {
   const i = t, { series: a } = e;
-  if (xe(e) === h.CategoryAxisFormat && a[0].query?.outStatistics?.[0].statisticType === D.Count) {
+  if (xe(e) === S.CategoryAxisFormat && a[0].query?.outStatistics?.[0].statisticType === D.Count) {
     const r = a.reduce(
       (n, s) => {
         const o = s.query?.outStatistics?.[0].outStatisticFieldName ?? [s.y].flat()[0];
@@ -6187,31 +6202,31 @@ function xl(t) {
   let d, f;
   if (be(c) && (f = c.temporalBinning?.nullPolicy, d = c.temporalBinning?.timeAggregationType), u > 1 || o === R.Week || o === R.Month || o === R.Year) {
     const { query: m } = i[0], y = ue(i), { statisticType: g } = m?.outStatistics?.[0] ?? Xi;
-    let p = !1, S = d === ee.End ? e.length - 1 : 0;
-    const x = {
-      binFirstOrLastIndex: S,
+    let p = !1, h = d === ee.End ? e.length - 1 : 0;
+    const v = {
+      binFirstOrLastIndex: h,
       data: e,
       x: l,
       timeIntervalInfo: a
     };
     for (; !p; ) {
-      let v = {};
-      const { binStartDate: b, binEndDate: B, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: L } = d === ee.End ? (
+      let B = {};
+      const { binStartDate: b, binEndDate: C, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: L } = d === ee.End ? (
         // When grouping from the end we'll start from the last date and move backward to create the bins
-        Fl(x)
+        Fl(v)
       ) : (
         // When grouping from the start we'll start from the first date and move forward to create the bins
-        Sl(x)
+        Sl(v)
       );
-      if (p = N, v = d === ee.End ? v = e[L - 1] : v = e[S], B > n && b < n || b < r && B > r || b >= r && B <= n) {
-        const A = e.slice(w, L).filter((O) => !(C.dateBinModel in O));
+      if (p = N, B = d === ee.End ? B = e[L - 1] : B = e[h], C > n && b < n || b < r && C > r || b >= r && C <= n) {
+        const A = e.slice(w, L).filter((O) => !(x.dateBinModel in O));
         y.forEach((O) => {
-          v[O] = bl({ binsToRegroup: A, statisticType: g, y: O, nullPolicy: f });
+          B[O] = bl({ binsToRegroup: A, statisticType: g, y: O, nullPolicy: f });
         });
         const I = A.map((O) => O[Oe]).filter((O) => O !== void 0), P = On(I);
-        P !== void 0 && (v[Oe] = P), v[l] = b, v[C.xAxisField] = b, v[C.dateBinningRange] = [b, B], delete v[C.dateBinModel], s.push(v);
-      } else N && d !== ee.End && s.length > 0 && (s[s.length - 1][C.dateBinningRange][1] = s[s.length - 1][C.dateBinningRange][1] + 1);
-      S = T, x.binFirstOrLastIndex = T;
+        P !== void 0 && (B[Oe] = P), B[l] = b, B[x.xAxisField] = b, B[x.dateBinningRange] = [b, C], delete B[x.dateBinModel], s.push(B);
+      } else N && d !== ee.End && s.length > 0 && (s[s.length - 1][x.dateBinningRange][1] = s[s.length - 1][x.dateBinningRange][1] + 1);
+      h = T, v.binFirstOrLastIndex = T;
     }
     d === ee.End && (s = s.reverse());
   } else u === 1 ? s = e.map((m, y) => {
@@ -6224,7 +6239,7 @@ function xl(t) {
       nextOrPrevious: "next"
     }), {
       ...m,
-      [C.dateBinningRange]: [g, p]
+      [x.dateBinningRange]: [g, p]
     };
   }) : s = e;
   return s;
@@ -6262,7 +6277,7 @@ function sr(t) {
   const e = t[0].temporalBinning?.nullPolicy;
   return t.reduce(
     (a, r) => {
-      a[C.dateBinModel] = void 0;
+      a[x.dateBinModel] = void 0;
       const n = r.query?.outStatistics?.[0].outStatisticFieldName ?? [r.y].flat()[0];
       return e !== Se.Interpolate && (a[n] = e === Se.Zero ? 0 : null), a;
     },
@@ -6285,7 +6300,7 @@ function Cl(t) {
     const g = sr(n);
     if (l === ee.End) {
       let p = r[0][c];
-      for (let S = 0; S < y; S += 1)
+      for (let h = 0; h < y; h += 1)
         p = Ve({
           date: p,
           unit: u,
@@ -6294,12 +6309,12 @@ function Cl(t) {
         }), r.push({
           ...g,
           [c]: p,
-          [C.xAxisField]: p
+          [x.xAxisField]: p
         });
       y > 0 && (d = r[r.length - 1][c]);
     } else {
       let p = r[r.length - 1][c];
-      for (let S = 0; S < y; S += 1)
+      for (let h = 0; h < y; h += 1)
         p = Ve({
           date: p,
           unit: u,
@@ -6308,7 +6323,7 @@ function Cl(t) {
         }), r.push({
           ...g,
           [c]: p,
-          [C.xAxisField]: p
+          [x.xAxisField]: p
         });
       f = r[r.length - 1][c];
     }
@@ -6372,7 +6387,7 @@ function Nl(t) {
       g !== r[p][d] ? c.push({
         ...m,
         [d]: g,
-        [C.xAxisField]: g
+        [x.xAxisField]: g
       }) : p = f === ee.End ? p - 1 : p + 1, g = Ve({
         date: g,
         unit: u === R.Month || u === R.Year ? R.Day : u,
@@ -6385,16 +6400,16 @@ function Nl(t) {
 function Tl(t) {
   const { data: e, seriesConfig: i, dateMinTimestamp: a, dateMaxTimestamp: r } = t, n = e;
   if (i[0].temporalBinning?.trimIncompleteTimeInterval !== !1) {
-    const { timeAggregationType: s } = i[0].temporalBinning ?? {}, o = e[0]?.[C.dateBinningRange]?.[0], u = e[e.length - 1]?.[C.dateBinningRange]?.[1];
+    const { timeAggregationType: s } = i[0].temporalBinning ?? {}, o = e[0]?.[x.dateBinningRange]?.[0], u = e[e.length - 1]?.[x.dateBinningRange]?.[1];
     if (s === ee.End ? o < a : u > r)
       if (s === ee.End) {
         let l = o;
         for (; l < a && e.length > 0; )
-          e.shift(), e.length > 0 && (l = e[0][C.dateBinningRange]?.[0]);
+          e.shift(), e.length > 0 && (l = e[0][x.dateBinningRange]?.[0]);
       } else {
         let l = u;
         for (; l > r && e.length > 0; )
-          e.pop(), e.length > 0 && (l = e[e.length - 1][C.dateBinningRange]?.[1]);
+          e.pop(), e.length > 0 && (l = e[e.length - 1][x.dateBinningRange]?.[1]);
       }
   }
   return n;
@@ -6426,11 +6441,11 @@ function* wl(t) {
     ];
     let y = Ue.groupByCaseBegin;
     for (let p = 0; p < r.length; p += 1) {
-      const S = r[p], [x, v] = S[C.dateBinningRange], b = nt(x), B = nt(v);
+      const h = r[p], [v, B] = h[x.dateBinningRange], b = nt(v), C = nt(B);
       y = Al({
         groupByFieldsForStatistics: y,
         queryStartDate: b,
-        queryEndDate: B,
+        queryEndDate: C,
         dateField: l,
         y: [d].flat()[0],
         binIndex: p,
@@ -6471,8 +6486,8 @@ async function Ll(t) {
         if (y !== void 0) {
           const [g, p] = y.split("|");
           if (p !== void 0) {
-            const S = m.attributes[D.ContinuousPercentile];
-            o[p][`${g}`] = S;
+            const h = m.attributes[D.ContinuousPercentile];
+            o[p][`${g}`] = h;
           }
         }
       });
@@ -6500,11 +6515,11 @@ function Gi(t) {
 }
 function Pl(t) {
   const { chartConfig: e, queryResults: i, mapToStatField: a, splitByField: r, x: n, y: s, nullPolicy: o, queryObject: u } = t, c = Ea(n), d = Ce(u).find((p) => p.name === n)?.type, f = [], m = e.series[0], y = "temporalBinning" in m ? m.temporalBinning?.trimIncompleteTimeInterval : !1, g = "temporalBinning" in m ? m.temporalBinning?.timeAggregationType : !1;
-  return i.forEach((p, S) => {
-    if (!(y && (S === 0 && g === ee.End || S === i.length - 1 && g === ee.Start))) {
-      const { attributes: v, stackedAttributes: b } = p;
-      let B = v[c.lowerBoundaryAlias], N = v[c.upperBoundaryAlias];
-      const T = B, w = N, L = (A, I) => {
+  return i.forEach((p, h) => {
+    if (!(y && (h === 0 && g === ee.End || h === i.length - 1 && g === ee.Start))) {
+      const { attributes: B, stackedAttributes: b } = p;
+      let C = B[c.lowerBoundaryAlias], N = B[c.upperBoundaryAlias];
+      const T = C, w = N, L = (A, I) => {
         let P = A;
         if (I === U.DateOnly && (typeof A == "string" && A.length === 10 || typeof A == "number"))
           if (typeof A == "string") {
@@ -6517,9 +6532,9 @@ function Pl(t) {
         });
         return P;
       };
-      if (B = L(B, d), N = L(N, d), typeof B == "number" && typeof N == "number") {
-        const A = { ...v };
-        A[C.originalServerBinningRange] = [T, w], A[n] = B, A[C.xAxisField] = B, A[C.dateBinningRange] = [B, N], delete A[c.lowerBoundaryAlias], delete A[c.upperBoundaryAlias], b && r && !oe(r) && a ? b.forEach((O) => {
+      if (C = L(C, d), N = L(N, d), typeof C == "number" && typeof N == "number") {
+        const A = { ...B };
+        A[x.originalServerBinningRange] = [T, w], A[n] = C, A[x.xAxisField] = C, A[x.dateBinningRange] = [C, N], delete A[c.lowerBoundaryAlias], delete A[c.upperBoundaryAlias], b && r && !oe(r) && a ? b.forEach((O) => {
           const V = O[r];
           if (V === null || typeof V == "string" || typeof V == "number") {
             const $ = a?.get(V);
@@ -6559,7 +6574,7 @@ async function Ml(t) {
         dateMinTimestamp: d,
         dateMaxTimestamp: f,
         timeIntervalInfo: o
-      }), { newDateMin: p, newDateMax: S } = Cl({
+      }), { newDateMin: p, newDateMax: h } = Cl({
         dateMaxTimestamp: f,
         data: l,
         numberOfFinalBinsWithinDataRange: y,
@@ -6569,7 +6584,7 @@ async function Ml(t) {
       });
       l = Nl({
         newDateMin: p,
-        newDateMax: S,
+        newDateMax: h,
         seriesConfig: n,
         data: l,
         initialNumberOfBins: m,
@@ -6609,10 +6624,10 @@ function Ol(t) {
   let a, r, { dateMinTimestamp: n, dateMaxTimestamp: s } = e;
   if (n && s) {
     typeof n == "string" && (n = new Date(n).valueOf()), typeof s == "string" && (s = new Date(s).valueOf());
-    const o = Dl(i), u = (s - n) / o, c = Wi.findIndex((S) => S.threshold > u), l = Wi[c], { unitMs: d, preferredIntervalSize: f } = l;
+    const o = Dl(i), u = (s - n) / o, c = Wi.findIndex((h) => h.threshold > u), l = Wi[c], { unitMs: d, preferredIntervalSize: f } = l;
     ({ unit: a } = l);
     const m = u / d, y = f.findIndex(
-      (S) => S >= m
+      (h) => h >= m
     ), g = f[y], p = y === 0 ? f[0] : f[y - 1];
     r = g - m < m - p ? g : p;
   }
@@ -6674,9 +6689,9 @@ async function Yt(t) {
   });
   return Array.from(
     new Set(
-      p.map((x) => x.attributes[c ? r : a])
+      p.map((v) => v.attributes[c ? r : a])
     )
-  ).sort((x, v) => typeof x == "string" && typeof v == "string" ? x.localeCompare(v) : Number(x) - Number(v));
+  ).sort((v, B) => typeof v == "string" && typeof B == "string" ? v.localeCompare(B) : Number(v) - Number(B));
 }
 function or(t) {
   const { feature: e, splitByField: i, chartSubType: a } = t;
@@ -6693,7 +6708,7 @@ function or(t) {
 }
 function ql(t) {
   const { input: e, x: i, splitByField: a } = t;
-  return e.reduce((n, s) => (a !== void 0 && a !== i && !(C.technicalFieldSplitByField in s) && delete s[a], Object.assign(n, s)), {});
+  return e.reduce((n, s) => (a !== void 0 && a !== i && !(x.technicalFieldSplitByField in s) && delete s[a], Object.assign(n, s)), {});
 }
 function bt(t) {
   const { data: e, x: i, splitByField: a } = t;
@@ -6709,19 +6724,19 @@ function bt(t) {
   return r;
 }
 function Vl(t, e) {
-  const i = t, a = _(e);
-  if (a !== h.PieSeries && a !== h.BoxPlotSeries) {
+  const i = t, a = j(e);
+  if (a !== S.PieSeries && a !== S.BoxPlotSeries) {
     const r = ue(e), n = e[0].y;
     t.forEach((s) => {
       let o = 0;
       if (r.forEach((u) => {
         const c = s[u];
         Number.isFinite(c) && (o += c);
-      }), s[C.technicalSortingFieldBySum] = o, Number.isFinite(o) && o > 0) {
+      }), s[x.technicalSortingFieldBySum] = o, Number.isFinite(o) && o > 0) {
         const u = s[n];
         if (Number.isFinite(u)) {
           const c = u / o;
-          s[C.technicalSortingFieldByPercent] = c;
+          s[x.technicalSortingFieldByPercent] = c;
         }
       }
     });
@@ -6737,11 +6752,11 @@ function Rl(t, e) {
 }
 function $l(t, e) {
   const i = e.series[0], a = t;
-  if (i.type === h.HeatSeries) {
+  if (i.type === S.HeatSeries) {
     const { x: r, y: n } = i;
-    a[Q.xField] = a[r]?.toString(), delete a[r], a[Q.yField] = a[n]?.toString(), delete a[n];
+    a[_.xField] = a[r]?.toString(), delete a[r], a[_.yField] = a[n]?.toString(), delete a[n];
     const s = i.query?.outStatistics?.[0]?.outStatisticFieldName;
-    s && (a[Q.valueField] = a[s], delete a[s]);
+    s && (a[_.valueField] = a[s], delete a[s]);
   }
   return a;
 }
@@ -6811,7 +6826,7 @@ function Hl(t, e) {
 }
 function zl(t) {
   const { attributes: e, showMean: i, chartSubType: a } = t;
-  i && (a === F.BoxPlotMonoFieldAndSplitBy || a === F.BoxPlotMultiFieldsAndSplitBy || a === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && (e[C.boxPlot.boxPlotMeanLineMarkerId] = !0);
+  i && (a === F.BoxPlotMonoFieldAndSplitBy || a === F.BoxPlotMultiFieldsAndSplitBy || a === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && (e[x.boxPlot.boxPlotMeanLineMarkerId] = !0);
 }
 function Wl(t) {
   const { queryResponse: e, chartConfig: i, maxCategoryCount: a } = t, r = k(i.series);
@@ -6846,7 +6861,7 @@ function Ul(t) {
     yAxisValueFormat: d
   } = t;
   let f, m;
-  c !== F.PieFromFields && (s && (typeof i == "string" || typeof i == "number") && (f = ni(i, s)), o && u === h.HeatSeries && typeof n == "string" && (typeof a == "string" || typeof a == "number") && (m = ni(a, o)), f !== void 0 && f !== i && (typeof f != "string" || !ne(l)) && (e[C.originalCategoryValue] = e[r], e[r] = f, e[C.xAxisDisplayField] = f), typeof n == "string" && !ne(d) && m !== void 0 && m !== a && (e[C.originalYCategoryValue] = e[n], e[n] = m));
+  c !== F.PieFromFields && (s && (typeof i == "string" || typeof i == "number") && (f = ni(i, s)), o && u === S.HeatSeries && typeof n == "string" && (typeof a == "string" || typeof a == "number") && (m = ni(a, o)), f !== void 0 && f !== i && (typeof f != "string" || !ne(l)) && (e[x.originalCategoryValue] = e[r], e[r] = f, e[x.xAxisDisplayField] = f), typeof n == "string" && !ne(d) && m !== void 0 && m !== a && (e[x.originalYCategoryValue] = e[n], e[n] = m));
 }
 function Yl(t) {
   let e;
@@ -6865,7 +6880,7 @@ function lr(t) {
     showMean: u,
     chartLimits: c,
     fieldList: l
-  } = t, { series: d } = a, f = k(d), m = _(d), { x: y } = d[0], g = "y" in d[0] ? d[0].y : void 0, p = d[0].query?.outStatistics ?? [], S = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: x, originalCategoryValue: v, originalDateValue: b } = C, B = ri(e, y), N = typeof g == "string" ? ri(e, g) : void 0, w = ro(l ?? []).includes(y), L = [];
+  } = t, { series: d } = a, f = k(d), m = j(d), { x: y } = d[0], g = "y" in d[0] ? d[0].y : void 0, p = d[0].query?.outStatistics ?? [], h = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: v, originalCategoryValue: B, originalDateValue: b } = x, C = ri(e, y), N = typeof g == "string" ? ri(e, g) : void 0, w = ro(l ?? []).includes(y), L = [];
   let A = 0;
   const I = /* @__PURE__ */ new Set(), { maxCategoryCount: P } = ut(c), O = Wl({ queryResponse: i, chartConfig: a, maxCategoryCount: P });
   for (let V = 0; O[V] && V < O.length && !(o !== void 0 && A >= o); V += 1) {
@@ -6886,25 +6901,25 @@ function lr(t) {
     zl({ attributes: M, showMean: u, chartSubType: f });
     let q = M[y];
     const G = typeof g == "string" ? M[g] : void 0;
-    q === null && d[0]?.query?.fetchNullValues === !0 && f !== F.PieFromFields && (M[v] = null, q = C.nullValue), S || (w && typeof q == "string" ? q = new Date(q).valueOf() : s && (q = El(M))), typeof q == "string" && l?.find((ae) => ae.name === y)?.type === U.TimeOnly && (M[v] = q, q = Yl(q));
+    q === null && d[0]?.query?.fetchNullValues === !0 && f !== F.PieFromFields && (M[B] = null, q = x.nullValue), h || (w && typeof q == "string" ? q = new Date(q).valueOf() : s && (q = El(M))), typeof q == "string" && l?.find((ae) => ae.name === y)?.type === U.TimeOnly && (M[B] = q, q = Yl(q));
     const { outStatisticFieldName: J } = W.outStatistics ?? {}, { featureExtent: X, featureExtentKey: H } = or({ feature: $, splitByField: n, chartSubType: f });
     if (X && (M[H] = X), f === F.BarAndLineSplitBy && J !== void 0) {
       const ae = M[n], pe = r?.get(ae);
-      pe !== void 0 && (ae === n && (M[C.technicalFieldSplitByField] = M[pe]), M[pe] = M[J]), delete M[J];
-    } else (f === F.PieNoAggregation || f === F.BarAndLineNoAggregation || f === F.BarAndLineSplitByNoAggregation) && (w ? M[b] = q : q !== C.nullValue && (M[v] = q), cn({ isXAxis: !0, chartType: m, valueFormat: a.axes?.[0]?.valueFormat }) && (M[C.xAxisField] = `${q}-${V}`, M[C.xAxisDisplayField] = q), M[W.uniqueIdsName] = $.getObjectId());
-    m === h.BoxPlotSeries && (M = Rl(d, M)), m === h.PieSeries && typeof q == "number" && (M[v] === void 0 && (M[v] = M[y]), q = `${q}`), q !== void 0 && (M[v] === void 0 && (M[v] = M[y]), M[y] === null ? M[y] = m === h.HeatSeries ? "null" : C.nullValue : M[y] = q, Ul({
+      pe !== void 0 && (ae === n && (M[x.technicalFieldSplitByField] = M[pe]), M[pe] = M[J]), delete M[J];
+    } else (f === F.PieNoAggregation || f === F.BarAndLineNoAggregation || f === F.BarAndLineSplitByNoAggregation) && (w ? M[b] = q : q !== x.nullValue && (M[B] = q), cn({ isXAxis: !0, chartType: m, valueFormat: a.axes?.[0]?.valueFormat }) && (M[x.xAxisField] = `${q}-${V}`, M[x.xAxisDisplayField] = q), M[W.uniqueIdsName] = $.getObjectId());
+    m === S.BoxPlotSeries && (M = Rl(d, M)), m === S.PieSeries && typeof q == "number" && (M[B] === void 0 && (M[B] = M[y]), q = `${q}`), q !== void 0 && (M[B] === void 0 && (M[B] = M[y]), M[y] === null ? M[y] = m === S.HeatSeries ? "null" : x.nullValue : M[y] = q, Ul({
       attributes: M,
       xValue: q,
       yValue: G,
       x: y,
       y: g,
-      xFieldDomain: B,
+      xFieldDomain: C,
       yFieldDomain: N,
       chartType: m,
       chartSubType: f,
       xAxisValueFormat: a.axes?.[0].valueFormat,
       yAxisValueFormat: a.axes?.[1]?.valueFormat
-    }), m === h.HeatSeries && typeof g == "string" && M[g] === null && (M[g] = "null", M[x] = null), M[C.xAxisField] === void 0 && (M[C.xAxisField] = M[y])), M = $l(M, a), L.push(M);
+    }), m === S.HeatSeries && typeof g == "string" && M[g] === null && (M[g] = "null", M[v] = null), M[x.xAxisField] === void 0 && (M[x.xAxisField] = M[y])), M = $l(M, a), L.push(M);
   }
   return L;
 }
@@ -6925,26 +6940,26 @@ async function jt(t) {
     errorStrings: m
   } = t, { series: y } = a, g = k(y);
   let p = [];
-  const S = g === F.BarAndLineSplitBy || g === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", x = f ?? await Fe({
+  const h = g === F.BarAndLineSplitBy || g === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", v = f ?? await Fe({
     queryObject: e,
     queryConfig: i,
     featureCount: o,
     abortKey: n,
     errorStrings: m,
     abortSignal: s
-  }), v = Ce(e, d), { x: b } = y[0];
+  }), B = Ce(e, d), { x: b } = y[0];
   return p = lr({
     queryObject: e,
-    queryResponse: x,
+    queryResponse: v,
     chartConfig: a,
     mapToStatField: r,
-    splitByField: S,
+    splitByField: h,
     isTimeBinningSeries: u,
-    fieldList: v,
+    fieldList: B,
     resultLimit: i.num,
     showMean: c,
     chartLimits: l
-  }), g !== F.BarAndLineSplitByNoAggregation && g !== F.BarAndLineFromFields && (S !== "" && (p = bt({ data: p, x: b, splitByField: S })), p = Vl(
+  }), g !== F.BarAndLineSplitByNoAggregation && g !== F.BarAndLineFromFields && (h !== "" && (p = bt({ data: p, x: b, splitByField: h })), p = Vl(
     p,
     y
   )), p;
@@ -6991,16 +7006,16 @@ async function oi(t) {
     chartLimits: f,
     popupTemplateFieldInfosEnabled: m,
     hideZeroCountCategories: y
-  } = t, g = st(e), p = t.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, S = !(y ?? !p), { behaviorAfterLimit: x } = f ?? {};
-  let v;
+  } = t, g = st(e), p = t.replaceNoValueCategoryWithZero ?? x.options.replaceNoValueCategoryWithZero, h = !(y ?? !p), { behaviorAfterLimit: v } = f ?? {};
+  let B;
   const b = { valid: !0 };
-  let B, N = !1;
+  let C, N = !1;
   const T = e.series, w = T[0], L = k(e.series);
   if (ie(r))
-    v = _(T) === h.BarSeries ? await zs(t) : b;
+    B = j(T) === S.BarSeries ? await zs(t) : b;
   else {
     if (w !== void 0) {
-      const A = _(T), { uniqueQuery: I, mapToStatField: P } = yi({
+      const A = j(T), { uniqueQuery: I, mapToStatField: P } = yi({
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
@@ -7013,7 +7028,7 @@ async function oi(t) {
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
-        behaviorAfterLimit: x,
+        behaviorAfterLimit: v,
         numberMaxOfFeaturesToFetch: I.num,
         abortSignal: c
       });
@@ -7024,7 +7039,7 @@ async function oi(t) {
         chartType: A,
         chartLimits: f
       });
-      if (M && (B = await jt({
+      if (M && (C = await jt({
         queryObject: r,
         uniqueQuery: I,
         chartConfig: e,
@@ -7038,8 +7053,8 @@ async function oi(t) {
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), de(e) && B !== void 0 && (b.data = await Zo({
-        data: B,
+      }), de(e) && C !== void 0 && (b.data = await Zo({
+        data: C,
         queryObject: r,
         fetchFullBoxPlotData: a,
         uniqueQuery: I,
@@ -7049,49 +7064,49 @@ async function oi(t) {
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (b.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = B.length, V = ii(L) ? O * T.length : O, M = Ae({
+      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (b.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = C.length, V = ii(L) ? O * T.length : O, M = Ae({
         count: V,
         seriesCount: T.length,
         chartType: A,
         chartLimits: f
       })), M)) {
-        if (A === h.PieSeries) {
-          L === F.PieFromFields && (B = Dt({
-            dataToConvert: B[0],
+        if (A === S.PieSeries) {
+          L === F.PieFromFields && (C = Dt({
+            dataToConvert: C[0],
             x: ce,
             y: Ne,
             fieldList: s
           }));
           let q = "";
-          L === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), Vn(B, q) ? b.data = { dataItems: B } : Vo(b, j.PieChartMixOfNegativePositiveSlices);
-        } else if ((A === h.RadarSeries || A === h.BarSeries || A === h.LineSeries || A === h.ComboLineAndBarSeries) && (L === F.BarAndLineFromFields && "y" in w && typeof w.y == "string" ? B = Dt({
-          dataToConvert: B[0],
+          L === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), Vn(C, q) ? b.data = { dataItems: C } : Vo(b, Q.PieChartMixOfNegativePositiveSlices);
+        } else if ((A === S.RadarSeries || A === S.BarSeries || A === S.LineSeries || A === S.ComboLineAndBarSeries) && (L === F.BarAndLineFromFields && "y" in w && typeof w.y == "string" ? C = Dt({
+          dataToConvert: C[0],
           x: w.x,
           y: w.y,
           fieldList: s
-        }) : B = await yl({
+        }) : C = await yl({
           queryObject: r,
-          seriesData: B,
+          seriesData: C,
           chartConfig: e,
           queryConfig: i,
           categoryOrDateCount: O,
-          behaviorAfterLimit: x,
+          behaviorAfterLimit: v,
           errorStrings: u,
           abortKey: n,
           abortSignal: c
-        }), V = ii(L) ? B.length * T.length : B.length, M = Ae({
+        }), V = ii(L) ? C.length * T.length : C.length, M = Ae({
           count: V,
           seriesCount: T.length,
           chartType: A,
           chartLimits: f
         }), M)) {
-          S && (B = gl(B, e));
+          h && (C = gl(C, e));
           let q = {};
           if (be(w)) {
             const { size: G, unit: J } = w.temporalBinning ?? {};
             G !== void 0 && J !== void 0 && (q = { size: G, unit: J });
           }
-          b.data = { dataItems: B, timeIntervalInfo: q };
+          b.data = { dataItems: C, timeIntervalInfo: q };
         }
       }
       M || It({
@@ -7100,9 +7115,9 @@ async function oi(t) {
         subError: { outlierLimit: N }
       }), b.count = V;
     }
-    v = b;
+    B = b;
   }
-  return v;
+  return B;
 }
 function Zl(t) {
   let e;
@@ -7120,18 +7135,18 @@ function Jl(t) {
   const { dataItems: e, valueField: i, filterOutZero: a } = t, r = [null];
   a && r.push(0);
   const n = new Set(
-    e.filter((o) => !r.includes(o[i])).map((o) => o[Q.xField])
+    e.filter((o) => !r.includes(o[i])).map((o) => o[_.xField])
   ), s = new Set(
-    e.filter((o) => !r.includes(o[i])).map((o) => o[Q.yField])
+    e.filter((o) => !r.includes(o[i])).map((o) => o[_.yField])
   );
   return e.filter(
-    (o) => n.has(o[Q.xField]) && s.has(o[Q.yField])
+    (o) => n.has(o[_.xField]) && s.has(o[_.yField])
   );
 }
 function Kl(t) {
   const { dataItems: e, xUniqueValues: i, yUniqueValues: a, valueField: r, emptyCellValue: n, x: s, y: o, queryObject: u } = t, c = [], l = /* @__PURE__ */ new Set();
   for (const d of e) {
-    const f = d[C.originalCategoryValue] !== void 0 ? d[C.originalCategoryValue] : d[Q.xField], m = d[C.originalYCategoryValue] !== void 0 ? d[C.originalYCategoryValue] : d[Q.yField];
+    const f = d[x.originalCategoryValue] !== void 0 ? d[x.originalCategoryValue] : d[_.xField], m = d[x.originalYCategoryValue] !== void 0 ? d[x.originalYCategoryValue] : d[_.yField];
     l.add(`${f}|${m}`);
   }
   for (const d of i) {
@@ -7149,10 +7164,10 @@ function Kl(t) {
           fieldValue: y
         }) ?? m : m;
         c.push({
-          [C.originalCategoryValue]: d === null ? null : d,
-          [C.originalYCategoryValue]: m === null ? null : m,
-          [Q.xField]: d === null ? "null" : g,
-          [Q.yField]: m === null ? "null" : p,
+          [x.originalCategoryValue]: d === null ? null : d,
+          [x.originalYCategoryValue]: m === null ? null : m,
+          [_.xField]: d === null ? "null" : g,
+          [_.yField]: m === null ? "null" : p,
           [r]: n
         });
       }
@@ -7181,7 +7196,7 @@ async function cr(t) {
   } = t, m = { valid: !0 };
   let y;
   if (We(e)) {
-    const { nullPolicy: g } = e, p = e.series[0], { x: S, y: x, query: v, xTemporalBinning: b, yTemporalBinning: B } = p, N = v?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = v?.outStatistics?.[0]?.statisticType ?? D.Count, w = Xl(e), L = Q.valueField, A = g === Se.Zero ? 0 : null;
+    const { nullPolicy: g } = e, p = e.series[0], { x: h, y: v, query: B, xTemporalBinning: b, yTemporalBinning: C } = p, N = B?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = B?.outStatistics?.[0]?.statisticType ?? D.Count, w = Xl(e), L = _.valueField, A = g === Se.Zero ? 0 : null;
     if (Io(e)) {
       const I = await Ns({
         chartConfig: e,
@@ -7195,10 +7210,10 @@ async function cr(t) {
       if (!Ae({
         count: I?.length ?? 0,
         seriesCount: 1,
-        chartType: h.HeatSeries,
+        chartType: S.HeatSeries,
         chartLimits: o
       }))
-        It({ dataInfo: m, chartType: h.HeatSeries });
+        It({ dataInfo: m, chartType: S.HeatSeries });
       else if (typeof I?.[0] == "object") {
         const P = Ce(a, u);
         y = lr({
@@ -7214,14 +7229,14 @@ async function cr(t) {
         const O = await Yt({
           queryObject: a,
           queryConfig: i,
-          category: S,
+          category: h,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
         }), V = await Yt({
           queryObject: a,
           queryConfig: i,
-          category: x,
+          category: v,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
@@ -7234,8 +7249,8 @@ async function cr(t) {
             yUniqueValues: V,
             valueField: L,
             emptyCellValue: A,
-            x: S,
-            y: x,
+            x: h,
+            y: v,
             queryObject: a
           })
         ], w && (y = Jl({
@@ -7253,31 +7268,31 @@ async function cr(t) {
         syncViewTimeZone: l,
         errorStrings: n,
         abortSignal: f
-      }), P = B ? Zl(B.unit) : await Yt({ queryObject: a, queryConfig: i, category: x, errorStrings: n, abortKey: d, abortSignal: f });
+      }), P = C ? Zl(C.unit) : await Yt({ queryObject: a, queryConfig: i, category: v, errorStrings: n, abortKey: d, abortSignal: f });
       let O = 0;
       y = I?.features.flatMap((V) => {
         const $ = [], { attributes: M, stackedAttributes: q } = V, G = [];
         if (q?.forEach((J) => {
-          const X = `${J[x]}`;
+          const X = `${J[v]}`;
           G.push(X), $.push({
-            [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
-            [Q.yField]: X,
+            [_.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
+            [_.yField]: X,
             [L]: J[N]
           });
         }), r && P && G.length !== P?.length) {
           const J = P.filter((X) => !G.includes(X.toString()));
           w && (J.length !== P.length || G.length === 0) || J.forEach((X) => {
-            Number.isFinite(Number(M[W.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(X)) && (b?.unit === he.DayOfMonth && B?.unit === he.MonthOfYear && Ui({
+            Number.isFinite(Number(M[W.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(X)) && (b?.unit === he.DayOfMonth && C?.unit === he.MonthOfYear && Ui({
               day: Number(M[W.heatChartLowerBoundaryAlias]),
               month: Number(X),
               includeLeapDay: e.includeLeapDay
-            }) || B?.unit === he.DayOfMonth && b?.unit === he.MonthOfYear && Ui({
+            }) || C?.unit === he.DayOfMonth && b?.unit === he.MonthOfYear && Ui({
               day: Number(X),
               month: Number(M[W.heatChartLowerBoundaryAlias]),
               includeLeapDay: e.includeLeapDay
             })) || $.push({
-              [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
-              [Q.yField]: X,
+              [_.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
+              [_.yField]: X,
               [L]: g === Se.Zero ? 0 : null
             });
           });
@@ -7286,9 +7301,9 @@ async function cr(t) {
       }), Ae({
         count: O,
         seriesCount: 1,
-        chartType: h.HeatSeries,
+        chartType: S.HeatSeries,
         chartLimits: o
-      }) || It({ dataInfo: m, chartType: h.HeatSeries });
+      }) || It({ dataInfo: m, chartType: S.HeatSeries });
     }
     y && (m.data = {
       dataItems: y,
@@ -7339,23 +7354,23 @@ async function xi(t) {
     popupTemplateFieldInfosEnabled: d,
     view: f,
     syncViewTimeZone: m
-  } = t, { behaviorAfterLimit: y } = l ?? {}, g = e.series, p = g[0], { x: S } = p, x = te(p.query?.where), v = { valid: !0 };
+  } = t, { behaviorAfterLimit: y } = l ?? {}, g = e.series, p = g[0], { x: h } = p, v = te(p.query?.where), B = { valid: !0 };
   let b;
   if (be(p)) {
-    const { temporalBinning: B } = p;
-    if (a && B) {
-      const { unit: N, size: T } = B;
+    const { temporalBinning: C } = p;
+    if (a && C) {
+      const { unit: N, size: T } = C;
       let w = 1, L = { unit: N, size: T }, A = !1;
       const I = Il({
         series: p,
         isTimeBinningSeries: !0,
         setTimeBinningInfoWhenNotProvided: u
-      }), P = !rt(x, a) || I ? await Bl({ queryObject: a, queryConfig: i, x: S, errorStrings: o, abortSignal: n }) : void 0;
-      I && P && P.numberOfFeatures > 0 && P.dateRange.dateMaxTimestamp !== void 0 && P.dateRange.dateMinTimestamp !== void 0 && (L = Ol(P), Ce(a).find((G) => G.name === S)?.type === U.DateOnly && L.unit !== void 0 && [
+      }), P = !rt(v, a) || I ? await Bl({ queryObject: a, queryConfig: i, x: h, errorStrings: o, abortSignal: n }) : void 0;
+      I && P && P.numberOfFeatures > 0 && P.dateRange.dateMaxTimestamp !== void 0 && P.dateRange.dateMinTimestamp !== void 0 && (L = Ol(P), Ce(a).find((G) => G.name === h)?.type === U.DateOnly && L.unit !== void 0 && [
         R.Hour,
         R.Minute,
         R.Second
-      ].includes(L.unit) && (L.unit = R.Day, L.size = 1), B.size = L.size, B.unit = L.unit);
+      ].includes(L.unit) && (L.unit = R.Day, L.size = 1), C.size = L.size, C.unit = L.unit);
       const { uniqueQuery: O, mapToStatField: V } = yi({
         chartConfig: e,
         queryConfig: i,
@@ -7368,18 +7383,18 @@ async function xi(t) {
       let $ = Ae({
         count: w ?? 0,
         seriesCount: g.length,
-        chartType: h.LineSeries,
+        chartType: S.LineSeries,
         chartLimits: l
       });
       if ($) {
-        if (rt(x, a)) {
-          const M = e.axes?.[0].valueFormat.type === h.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0, q = s?.[0] instanceof Er ? s : await Ps({
+        if (rt(v, a)) {
+          const M = e.axes?.[0].valueFormat.type === S.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0, q = s?.[0] instanceof Er ? s : await Ps({
             queryObject: a,
-            dateField: S,
-            splitByField: x,
+            dateField: h,
+            splitByField: v,
             queryConfig: O,
             axisTimeZone: M,
-            temporalBinning: B,
+            temporalBinning: C,
             errorStrings: o,
             view: f,
             syncViewTimeZone: m,
@@ -7389,15 +7404,15 @@ async function xi(t) {
             chartConfig: e,
             queryResults: q,
             mapToStatField: V,
-            splitByField: x,
-            x: S,
+            splitByField: v,
+            x: h,
             y: G,
-            nullPolicy: B.nullPolicy,
+            nullPolicy: C.nullPolicy,
             queryObject: a
           }), !Ae({
             count: b.length,
             seriesCount: g.length,
-            chartType: h.LineSeries,
+            chartType: S.LineSeries,
             chartLimits: l
           })) {
             const J = ue(g), X = b.filter(
@@ -7406,7 +7421,7 @@ async function xi(t) {
             Ae({
               count: X,
               seriesCount: g.length,
-              chartType: h.LineSeries,
+              chartType: S.LineSeries,
               chartLimits: l
             }) || ($ = !1);
           }
@@ -7432,7 +7447,7 @@ async function xi(t) {
             queryObject: a,
             queryConfig: i,
             queryResults: b,
-            x: S,
+            x: h,
             seriesConfig: g,
             dateRange: P.dateRange,
             timeIntervalInfo: L,
@@ -7442,10 +7457,10 @@ async function xi(t) {
         }
         fa(a) && b && b?.length === pl && (A = !0), y === lt.RenderUpToTheLimit && b && (b = eu({ chartConfig: e, chartLimits: l, data: b }));
       }
-      $ || (v.valid = !1, v.invalidType = j.LineChartExceedsLimit), b && b.length > 0 && (b[b.length - 1][C.lastTemporalBin] = !0), v.data = { dataItems: b, timeIntervalInfo: L, serverLimitReached: A }, v.count = w;
+      $ || (B.valid = !1, B.invalidType = Q.LineChartExceedsLimit), b && b.length > 0 && (b[b.length - 1][x.lastTemporalBin] = !0), B.data = { dataItems: b, timeIntervalInfo: L, serverLimitReached: A }, B.count = w;
     }
   }
-  return v;
+  return B;
 }
 async function tu(t) {
   const {
@@ -7525,7 +7540,7 @@ async function iu(t) {
 }
 const au = "{ groupByFieldsForStatistics } WHEN ({ y } { yMinOperand } { yValue } AND { y } { yMaxOperand } { yValuePlusStep } AND { x } { xMinOperand } { xValue } AND { x } { xMaxOperand } { xValuePlusStep }) THEN '{ xValue }|{ xValuePlusStep}|{ yValue }|{ yValuePlusStep }'";
 async function ru(t) {
-  const { chartConfig: e, queryObject: i, queryConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = e.series[0], { x: u, y: c } = o, { dataContextCountDistinctX: l, dataContextCountDistinctY: d } = C.scatterplotAggregationFields, f = {
+  const { chartConfig: e, queryObject: i, queryConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = e.series[0], { x: u, y: c } = o, { dataContextCountDistinctX: l, dataContextCountDistinctY: d } = x.scatterplotAggregationFields, f = {
     ...a,
     outStatistics: [
       {
@@ -7558,10 +7573,10 @@ async function nu(t) {
     dataContextYMaxField: f,
     dataContextCountDistinctX: m,
     dataContextCountDistinctY: y
-  } = C.scatterplotAggregationFields;
-  let g, p, S, x, v;
-  const b = e.get(c), B = e.get(l), N = e.get(d), T = e.get(f);
-  if (b != null && N !== void 0 && N !== null && B !== void 0 && B !== null && T !== void 0 && T !== null && !Number.isNaN(b + B + N + T)) {
+  } = x.scatterplotAggregationFields;
+  let g, p, h, v, B;
+  const b = e.get(c), C = e.get(l), N = e.get(d), T = e.get(f);
+  if (b != null && N !== void 0 && N !== null && C !== void 0 && C !== null && T !== void 0 && T !== null && !Number.isNaN(b + C + N + T)) {
     const { maxScatterPointsAfterAggregation: w } = ut(r), A = Math.floor(Math.sqrt(w)), I = await ru({
       queryObject: a,
       chartConfig: i,
@@ -7570,7 +7585,7 @@ async function nu(t) {
       abortKey: o,
       abortSignal: u
     });
-    S = Math.min(I.get(y) ?? Number.NaN, A), x = Math.min(I.get(m) ?? Number.NaN, A), v = x * S, g = B === b ? 0 : (B - b) / (x - 1), p = T === N ? 0 : (T - N) / (S - 1), e.set(C.scatterplotAggregationFields.xStep, g), e.set(C.scatterplotAggregationFields.yStep, p), e.set(C.scatterplotAggregationFields.rowCount, S), e.set(C.scatterplotAggregationFields.columnCount, x), e.set(C.scatterplotAggregationFields.realGridSize, v);
+    h = Math.min(I.get(y) ?? Number.NaN, A), v = Math.min(I.get(m) ?? Number.NaN, A), B = v * h, g = C === b ? 0 : (C - b) / (v - 1), p = T === N ? 0 : (T - N) / (h - 1), e.set(x.scatterplotAggregationFields.xStep, g), e.set(x.scatterplotAggregationFields.yStep, p), e.set(x.scatterplotAggregationFields.rowCount, h), e.set(x.scatterplotAggregationFields.columnCount, v), e.set(x.scatterplotAggregationFields.realGridSize, B);
   }
 }
 function su(t) {
@@ -7623,12 +7638,12 @@ async function lu(t) {
     dataContextYMinField: y,
     dataContextYMaxField: g,
     queryNumberOfFeatures: p,
-    queryNumberOfAggregatedFeatures: S
-  } = C.scatterplotAggregationFields;
-  let x;
-  const v = e?.get(f) ?? Number.NaN, b = e?.get(m) ?? Number.NaN, B = e?.get(p) ?? Number.NaN, N = e?.get(y) ?? v, T = e?.get(g) ?? b;
-  if (v != null && N !== void 0 && N !== null && b !== void 0 && b !== null && T !== void 0 && T !== null && !Number.isNaN(v + b + N + T)) {
-    const w = z(a), { idField: L, isTraditionalTypeOID: A } = ve(w), I = A ? L : "*", P = e?.get(C.scatterplotAggregationFields.xStep), O = e?.get(C.scatterplotAggregationFields.yStep), V = e?.get(C.scatterplotAggregationFields.realGridSize), $ = e?.get(C.scatterplotAggregationFields.rowCount), M = e?.get(C.scatterplotAggregationFields.columnCount), q = /* @__PURE__ */ new Map(), G = Ce(a);
+    queryNumberOfAggregatedFeatures: h
+  } = x.scatterplotAggregationFields;
+  let v;
+  const B = e?.get(f) ?? Number.NaN, b = e?.get(m) ?? Number.NaN, C = e?.get(p) ?? Number.NaN, N = e?.get(y) ?? B, T = e?.get(g) ?? b;
+  if (B != null && N !== void 0 && N !== null && b !== void 0 && b !== null && T !== void 0 && T !== null && !Number.isNaN(B + b + N + T)) {
+    const w = z(a), { idField: L, isTraditionalTypeOID: A } = ve(w), I = A ? L : "*", P = e?.get(x.scatterplotAggregationFields.xStep), O = e?.get(x.scatterplotAggregationFields.yStep), V = e?.get(x.scatterplotAggregationFields.realGridSize), $ = e?.get(x.scatterplotAggregationFields.rowCount), M = e?.get(x.scatterplotAggregationFields.columnCount), q = /* @__PURE__ */ new Map(), G = Ce(a);
     if (G?.forEach((H) => {
       Ft(H) && q.set(H.name, {
         onStatisticField: H.name,
@@ -7649,7 +7664,7 @@ async function lu(t) {
       });
     }), L !== "" && q.set(L, {
       onStatisticField: I,
-      outStatisticFieldName: S,
+      outStatisticFieldName: h,
       statisticType: D.Count
     }), q.set(l, {
       onStatisticField: l,
@@ -7665,11 +7680,11 @@ async function lu(t) {
           ...r,
           outStatistics: [...q.values()]
         };
-        x = await Ts({
+        v = await Ts({
           queryObject: a,
           queryConfig: H,
           xStep: P,
-          xMin: v,
+          xMin: B,
           xMax: b,
           x: l,
           y: d,
@@ -7680,7 +7695,7 @@ async function lu(t) {
       } else if ($ !== void 0 && M !== void 0) {
         let H = 0;
         const { maxScatterCellsPerQuery: ae, maxScatterCellsPerQueryForStandard: pe } = $t(), Ni = await no(w, u) ? pe : ae, Ti = [];
-        let Ht = !0, Xe = v, ke = N, Je = "", Ct = 1, zt = 1, vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER;
+        let Ht = !0, Xe = B, ke = N, Je = "", Ct = 1, zt = 1, vt = Number.MAX_SAFE_INTEGER, Bt = Number.MIN_SAFE_INTEGER, Nt = Number.MAX_SAFE_INTEGER, Tt = Number.MIN_SAFE_INTEGER;
         for (; zt <= M && Ht; ) {
           for (ke = N, Ct = 1; Ct <= $ && Ht; ) {
             if (Je = su({
@@ -7693,7 +7708,7 @@ async function lu(t) {
               yStep: O,
               endOfRow: Ct === $,
               endOfColumn: zt === M
-            }), Xe < vt && (vt = Xe), Xe + P > Bt && (Bt = Xe + P), ke < Nt && (Nt = ke), ke + P > Tt && (Tt = ke + O), H += 1, H % Ni === 0 || H === V || H === B) {
+            }), Xe < vt && (vt = Xe), Xe + P > Bt && (Bt = Xe + P), ke < Nt && (Nt = ke), ke + P > Tt && (Tt = ke + O), H += 1, H % Ni === 0 || H === V || H === C) {
               Je = `${Je} ${Ue.groupByCaseEnd}`;
               const pr = {
                 ...r,
@@ -7719,11 +7734,11 @@ async function lu(t) {
           }
           Xe += P, zt += 1;
         }
-        x = (await Promise.all(Ti)).flat();
+        v = (await Promise.all(Ti)).flat();
       }
     }
   }
-  return x;
+  return v;
 }
 async function uu(t) {
   const { chartConfig: e, queryConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = e.series[0], { x: u, y: c } = o;
@@ -7734,10 +7749,10 @@ async function uu(t) {
     dataContextYMinField: m,
     dataContextYMaxField: y,
     queryNumberOfFeatures: g
-  } = C.scatterplotAggregationFields, { idField: p, isTraditionalTypeOID: S } = ve(z(a)), x = S ? p : "*", v = [
+  } = x.scatterplotAggregationFields, { idField: p, isTraditionalTypeOID: h } = ve(z(a)), v = h ? p : "*", B = [
     {
       statisticType: D.Count,
-      onStatisticField: x,
+      onStatisticField: v,
       outStatisticFieldName: g
     },
     {
@@ -7751,7 +7766,7 @@ async function uu(t) {
       onStatisticField: u
     }
   ];
-  u !== c && v.push(
+  u !== c && B.push(
     {
       statisticType: D.Minimum,
       outStatisticFieldName: m,
@@ -7764,7 +7779,7 @@ async function uu(t) {
     }
   );
   const b = { ...i };
-  return b.outStatistics = v, l = await xt({
+  return b.outStatistics = B, l = await xt({
     queryObject: a,
     queryConfig: b,
     errorStrings: r,
@@ -7777,45 +7792,45 @@ function wt(t) {
   return e === i || e === a ? e : Math.random() * (a - i) + i;
 }
 function cu(t) {
-  const { useQueryAttributeBins: e, graphic: i, x: a, y: r, yStep: n } = t, { groupByOutKeyword: s } = Ue, { dataContextXMinField: o, dataContextXMaxField: u, dataContextYMinField: c, dataContextYMaxField: l } = C.scatterplotAggregationFields;
+  const { useQueryAttributeBins: e, graphic: i, x: a, y: r, yStep: n } = t, { groupByOutKeyword: s } = Ue, { dataContextXMinField: o, dataContextXMaxField: u, dataContextYMinField: c, dataContextYMaxField: l } = x.scatterplotAggregationFields;
   let d = [];
   if (e && "stackedAttributes" in i && i.stackedAttributes) {
     const f = Oa(a, r), m = i.attributes[f.lowerBoundaryAlias], y = i.attributes[f.upperBoundaryAlias];
     i.stackedAttributes.forEach((g) => {
-      let p = g[f.stackAlias], S;
-      typeof p == "number" && typeof n == "number" && (p *= n), typeof p == "number" && typeof n == "number" && (S = p + n);
-      const x = g[a], v = g[r];
-      typeof p == "number" && typeof S == "number" && typeof x == "number" && typeof v == "number" && d.push({
+      let p = g[f.stackAlias], h;
+      typeof p == "number" && typeof n == "number" && (p *= n), typeof p == "number" && typeof n == "number" && (h = p + n);
+      const v = g[a], B = g[r];
+      typeof p == "number" && typeof h == "number" && typeof v == "number" && typeof B == "number" && d.push({
         ...g,
-        [a]: wt({ value: x, valueMin: m, valueMax: y }),
-        [r]: wt({ value: v, valueMin: p, valueMax: S }),
+        [a]: wt({ value: v, valueMin: m, valueMax: y }),
+        [r]: wt({ value: B, valueMin: p, valueMax: h }),
         [o]: Math.min(m, y),
         [u]: Math.max(m, y),
         [c]: p,
-        [l]: S
+        [l]: h
       });
     });
   } else {
     const { expr: f, isInItem: m } = Vt(i.attributes);
     if (m && f && i.attributes[f] !== s) {
-      let [y, g, p, S] = i.attributes[f].split("|");
-      y = Math.min(y, g), g = Math.max(y, g), p = Math.min(p, S), S = Math.max(p, S);
-      const x = {
+      let [y, g, p, h] = i.attributes[f].split("|");
+      y = Math.min(y, g), g = Math.max(y, g), p = Math.min(p, h), h = Math.max(p, h);
+      const v = {
         ...i.attributes,
         [o]: y,
         [u]: g,
         [c]: p,
-        [l]: S
+        [l]: h
       };
-      x[a] = wt({
-        value: x[a],
+      v[a] = wt({
+        value: v[a],
         valueMin: y,
         valueMax: g
-      }), x[r] = wt({
-        value: x[r],
+      }), v[r] = wt({
+        value: v[r],
         valueMin: p,
-        valueMax: S
-      }), d = [x];
+        valueMax: h
+      }), d = [v];
     }
   }
   return d;
@@ -7842,21 +7857,21 @@ async function fu(t) {
   let f = [];
   const m = Ce(e), y = kt(d).idFields, g = (m?.filter((b) => Ft(b) && b.name !== c && b.name !== l) ?? []).map(
     (b) => b.name
-  ) ?? [], p = u?.additionalTooltipFields ?? [], S = Array.from(
+  ) ?? [], p = u?.additionalTooltipFields ?? [], h = Array.from(
     /* @__PURE__ */ new Set([c, l, ...y ?? [], ...g, ...p])
-  ), x = ge(d);
-  if (x && !x.isTable) {
-    const { rendererField: b, rendererNormalizationField: B } = io(d?.renderer ?? void 0);
-    oe(b) || S.push(b), oe(B) || S.push(B);
+  ), v = ge(d);
+  if (v && !v.isTable) {
+    const { rendererField: b, rendererNormalizationField: C } = io(d?.renderer ?? void 0);
+    oe(b) || h.push(b), oe(C) || h.push(C);
   }
-  const v = {
+  const B = {
     ...i,
     orderByFields: [`${c} ${ye.Ascending}`],
-    outFields: S
+    outFields: h
   };
   return f = await Fe({
     queryObject: e,
-    queryConfig: v,
+    queryConfig: B,
     featureCount: r,
     errorStrings: n,
     abortKey: s,
@@ -7923,7 +7938,7 @@ async function dr(t) {
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    }), { queryNumberOfFeatures: f, yStep: m } = C.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), g = d?.get(f) ?? Number.NaN, p = g >= y, S = gn(a);
+    }), { queryNumberOfFeatures: f, yStep: m } = x.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), g = d?.get(f) ?? Number.NaN, p = g >= y, h = gn(a);
     p && await nu({
       statsMap: d,
       chartConfig: e,
@@ -7934,35 +7949,35 @@ async function dr(t) {
       abortKey: u,
       abortSignal: c
     });
-    const x = await mu({
+    const v = await mu({
       ...t,
       queryObject: a,
       statsMap: d,
       numberOfFeatures: g,
       isAggregationMode: p,
-      useQueryAttributeBins: S
-    }), v = du({
+      useQueryAttributeBins: h
+    }), B = du({
       chartConfig: e,
-      rawData: x,
+      rawData: v,
       isAggregationMode: p,
       yStep: d.get(m),
-      useQueryAttributeBins: S
+      useQueryAttributeBins: h
     });
     r !== !1 && ht({
-      arrayToSort: v,
+      arrayToSort: B,
       sortingField: e.series[0].x,
       orderBy: ye.Ascending
     });
-    const { r2: b, trendLinePoints: B } = n !== !1 ? await Va({
-      data: v,
+    const { r2: b, trendLinePoints: C } = n !== !1 ? await Va({
+      data: B,
       statsMap: d,
       queryConfig: i,
       queryObject: a,
       chartConfig: e,
       errorStrings: o,
       abortSignal: c
-    }) : C.scatterplotSeries;
-    l = { dataItems: v, r2: b, trendLinePoints: B, aggregated: p };
+    }) : x.scatterplotSeries;
+    l = { dataItems: B, r2: b, trendLinePoints: C, aggregated: p };
   }
   return l;
 }
@@ -8045,7 +8060,7 @@ function Bi(t) {
   const { seriesConfig: e, filteredSeriesIds: i, showMean: a } = t;
   let r = [];
   if (a === !0) {
-    const n = e.find((s) => s.type === h.BoxPlotSeries);
+    const n = e.find((s) => s.type === S.BoxPlotSeries);
     n !== void 0 && "y" in n && (r = [n.y].flat());
   } else
     r = ue(e, i);
@@ -8062,7 +8077,7 @@ function zd(t) {
   const { chartConfig: e, nullAsValid: i = !1, dataSet: a } = t;
   let r = !0;
   if (e !== void 0) {
-    const n = _(e.series);
+    const n = j(e.series);
     if (a === void 0 || a.length === 0)
       r = !0;
     else {
@@ -8070,22 +8085,22 @@ function zd(t) {
       r = !a.some((o) => {
         let u = !1;
         switch (n) {
-          case h.HistogramSeries:
+          case S.HistogramSeries:
             {
               const c = o;
               u = Me(c.minValue, i) && Me(c.maxValue, i);
             }
             break;
-          case h.ScatterSeries:
+          case S.ScatterSeries:
             {
               const c = o, { x: l, y: d } = e.series[0];
               u = Me(c[l], i) && Me(c[d], i);
             }
             break;
-          case h.ComboLineAndBarSeries:
-          case h.RadarSeries:
-          case h.LineSeries:
-          case h.BarSeries: {
+          case S.ComboLineAndBarSeries:
+          case S.RadarSeries:
+          case S.LineSeries:
+          case S.BarSeries: {
             const c = o, { x: l } = e.series[0];
             u = s.some(
               (d) => gu({
@@ -8098,7 +8113,7 @@ function zd(t) {
             );
             break;
           }
-          case h.BoxPlotSeries: {
+          case S.BoxPlotSeries: {
             if (de(e)) {
               const c = e.series;
               u = yu({
@@ -8110,7 +8125,7 @@ function zd(t) {
             }
             break;
           }
-          case h.PieSeries:
+          case S.PieSeries:
             {
               const c = o;
               let { x: l, y: d } = e.series[0];
@@ -8119,15 +8134,15 @@ function zd(t) {
               u = c[l] !== void 0 && c[l] !== null && !hr(f) && Me(Number(f), i);
             }
             break;
-          case h.GaugeSeries:
+          case S.GaugeSeries:
             {
               const { x: c } = e.series[0];
               u = Me(o[c], i);
             }
             break;
-          case h.HeatSeries:
+          case S.HeatSeries:
             u = a.some(
-              (c) => Me(c[Q.valueField], i)
+              (c) => Me(c[_.valueField], i)
             );
             break;
         }
@@ -8148,7 +8163,7 @@ function pu(t, e) {
 }
 function hu(t) {
   const { seriesConfig: e, filteredSeriesIds: i, filteredData: a } = t, r = pu(e, i), n = e.find(
-    (c) => c.type === h.LineSeries || c.type === h.RadarSeries
+    (c) => c.type === S.LineSeries || c.type === S.RadarSeries
   )?.stackNegativeValuesToBaseline ?? !0;
   let s = Number.MIN_SAFE_INTEGER, o = Number.MAX_SAFE_INTEGER, u = !1;
   return a.forEach((c) => {
@@ -8179,30 +8194,30 @@ function Yi(t) {
   let e = Number.NaN, i = Number.NaN, a, r;
   const { chartConfig: n, chartData: s, filteredSeriesIds: o } = t, { series: u } = n;
   if (u?.length > 0) {
-    const { x: c } = u[0], l = _(n.series);
-    if (l === h.HistogramSeries && s.length > 0) {
+    const { x: c } = u[0], l = j(n.series);
+    if (l === S.HistogramSeries && s.length > 0) {
       const d = s[0]?.[$i.Start], f = s[s.length - 1]?.[$i.End];
       a = typeof d == "number" ? d : a, r = typeof f == "number" ? f : r;
     } else {
       const d = s.filter((m) => m[c] !== null);
-      if ({ min: a, max: r } = St(d, (m) => m[c]), n.axes?.[0]?.valueFormat.type === h.DateAxisFormat && a !== void 0 && r !== void 0 && ([a, r] = [new Date(a).valueOf(), new Date(r).valueOf()]), l === h.BoxPlotSeries) {
+      if ({ min: a, max: r } = St(d, (m) => m[c]), n.axes?.[0]?.valueFormat.type === S.DateAxisFormat && a !== void 0 && r !== void 0 && ([a, r] = [new Date(a).valueOf(), new Date(r).valueOf()]), l === S.BoxPlotSeries) {
         e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER;
         const m = ue(u, o), y = k(u), g = "standardizeValues" in n ? n.standardizeValues === !0 : void 0, p = n.series.map(
-          (S) => S.visible !== !1 ? fe({ where: S.query?.where }) : ""
+          (h) => h.visible !== !1 ? fe({ where: h.query?.where }) : ""
         );
-        p.length === 0 && p.push(" "), d.forEach((S) => {
-          m.forEach((x) => {
-            const v = y === F.BoxPlotMultiFieldsAndCategory ? x : void 0;
+        p.length === 0 && p.push(" "), d.forEach((h) => {
+          m.forEach((v) => {
+            const B = y === F.BoxPlotMultiFieldsAndCategory ? v : void 0;
             p.forEach((b) => {
-              const { min: B, max: N } = Su({
-                y: v,
+              const { min: C, max: N } = Su({
+                y: B,
                 splitByValue: b,
                 chartSubType: y,
                 showOutliers: !1,
                 standardizeValues: g,
-                dataItem: S
+                dataItem: h
               });
-              B != null && B < e && (e = B), N != null && N > i && (i = N);
+              C != null && C < e && (e = C), N != null && N > i && (i = N);
             });
           });
         });
@@ -8222,11 +8237,11 @@ function Yi(t) {
           case Te.Side:
           default: {
             e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER, ue(u, o).forEach((g) => {
-              const { min: p, max: S } = St(
+              const { min: p, max: h } = St(
                 d,
-                (x) => x[g]
+                (v) => v[g]
               );
-              p !== void 0 && p < e && (e = p), S !== void 0 && S > i && (i = S);
+              p !== void 0 && p < e && (e = p), h !== void 0 && h > i && (i = h);
             });
             break;
           }
@@ -8247,7 +8262,7 @@ function yr(t) {
   let e = !1;
   if (t) {
     const i = t.axes?.[0], a = i?.isLogarithmic === !0, r = i?.valueFormat?.type;
-    e = (r === h.NumberAxisFormat || r === h.DateAxisFormat) && a;
+    e = (r === S.NumberAxisFormat || r === S.DateAxisFormat) && a;
   }
   return e;
 }
@@ -8294,14 +8309,14 @@ function bu(t, e) {
   return i;
 }
 function xu(t, e) {
-  const i = _(e);
+  const i = j(e);
   let a = t;
   const r = e?.[0];
-  if ((i === h.PieSeries || i === h.BoxPlotSeries || i === h.LineSeries || i === h.RadarSeries || i === h.BarSeries || i === h.HeatSeries || i === h.ComboLineAndBarSeries) && r !== void 0) {
+  if ((i === S.PieSeries || i === S.BoxPlotSeries || i === S.LineSeries || i === S.RadarSeries || i === S.BarSeries || i === S.HeatSeries || i === S.ComboLineAndBarSeries) && r !== void 0) {
     const n = ui(t);
     let s = n ? t : t.dataItems;
     if (t !== void 0) {
-      const { originalCategoryValue: o, originalYCategoryValue: u, originalDateValue: c, xAxisField: l } = C, d = i === h.HeatSeries ? Q.xField : r.x, f = i === h.HeatSeries ? Q.yField : void 0;
+      const { originalCategoryValue: o, originalYCategoryValue: u, originalDateValue: c, xAxisField: l } = x, d = i === S.HeatSeries ? _.xField : r.x, f = i === S.HeatSeries ? _.yField : void 0;
       s = s.map((m) => {
         let y = m[d];
         m[c] !== void 0 ? y = m[c] : m[o] !== void 0 && (y = m[o]);
@@ -8318,30 +8333,30 @@ function xu(t, e) {
 }
 function Zi(t) {
   const e = { ...t };
-  delete e[C.technicalSortingFieldBySum], delete e[C.technicalSortingFieldByPercent], delete e[C.pieChart.technicalFieldSlicePercent], delete e[C.pieChart.technicalFieldGroupedSlices], delete e[C.lastTemporalBin], delete e[C.originalServerBinningRange], delete e[C.technicalFieldSplitByField], delete e[W.uniqueIdsName], Object.keys(e).filter(
-    (r) => r.includes(C.rendererSymbolField)
+  delete e[x.technicalSortingFieldBySum], delete e[x.technicalSortingFieldByPercent], delete e[x.pieChart.technicalFieldSlicePercent], delete e[x.pieChart.technicalFieldGroupedSlices], delete e[x.lastTemporalBin], delete e[x.originalServerBinningRange], delete e[x.technicalFieldSplitByField], delete e[W.uniqueIdsName], Object.keys(e).filter(
+    (r) => r.includes(x.rendererSymbolField)
   ).forEach((r) => delete e[r]);
   const a = Vt(e);
   return a.isInItem && delete e[a.expr ?? ""], e;
 }
 function Cu(t, e) {
   let i = t;
-  const a = _(e);
+  const a = j(e);
   let r = Ci(i);
   if (r !== void 0)
     switch (a) {
-      case h.ComboLineAndBarSeries:
-      case h.BarSeries:
-      case h.LineSeries:
-      case h.RadarSeries:
-      case h.PieSeries:
+      case S.ComboLineAndBarSeries:
+      case S.BarSeries:
+      case S.LineSeries:
+      case S.RadarSeries:
+      case S.PieSeries:
         {
           r = r.map(Zi), i = { dataItems: r };
           const { timeIntervalInfo: n, serverLimitReached: s } = t ?? {};
           Sr(n) || (i.timeIntervalInfo = n), s !== void 0 && (i.serverLimitReached = s);
         }
         break;
-      case h.ScatterSeries:
+      case S.ScatterSeries:
         i = {
           ...i,
           dataItems: r.map(Zi)
@@ -8360,28 +8375,28 @@ function Ud(t) {
   return a !== void 0 && (a = xu(a, i), a = Cu(a, i), a = bu(a, i)), a;
 }
 function vu(t) {
-  const { dataFetchingResults: e, numberOfQueries: i, series: a } = t, r = _(a), n = k(a);
+  const { dataFetchingResults: e, numberOfQueries: i, series: a } = t, r = j(a), n = k(a);
   let s = [];
   const o = /* @__PURE__ */ new Map();
   for (let u = 0; u < i; u += 1) {
     const c = e[u];
     if (c !== void 0) {
       let l;
-      if (r === h.ScatterSeries)
+      if (r === S.ScatterSeries)
         l = c.dataItems;
       else if ("data" in c && c.data) {
         const d = c.data;
         "dataItems" in d && (l = d.dataItems), "outliers" in d && d.outliers && s.push(...d.outliers), "meanLines" in d && d.meanLines && s.push(...d.meanLines);
       }
       if (l)
-        if (a[0].type === h.HeatSeries)
+        if (a[0].type === S.HeatSeries)
           i > 0 && l.forEach((d) => {
             o.set(
-              `${d[Q.xField]}-${d[Q.yField]}`,
+              `${d[_.xField]}-${d[_.yField]}`,
               d
             );
           });
-        else if (a[0].type === h.ScatterSeries) {
+        else if (a[0].type === S.ScatterSeries) {
           const { x: d, y: f } = a[0];
           s.push(
             ...l.map((m) => ({
@@ -8418,12 +8433,12 @@ async function Bu(t) {
     returnFeaturesExtent: f,
     popupTemplateFieldInfosEnabled: m,
     view: y
-  } = t, { series: g } = a, p = _(g), S = [], { maxOIDsPerSelectionQuery: x } = $t();
+  } = t, { series: g } = a, p = j(g), h = [], { maxOIDsPerSelectionQuery: v } = $t();
   for (let b = 0; b < e; b += 1) {
-    const B = b * x, N = (b + 1) * x - 1, T = i.slice(B === 0 ? 0 : B - 1, N), w = { ...r };
+    const C = b * v, N = (b + 1) * v - 1, T = i.slice(C === 0 ? 0 : C - 1, N), w = { ...r };
     switch (w.objectIds = T, p) {
-      case h.HeatSeries:
-        S.push(
+      case S.HeatSeries:
+        h.push(
           cr({
             completeHeatChartDataset: !1,
             // we do not want the empty bins to be added for the selection
@@ -8438,11 +8453,11 @@ async function Bu(t) {
           })
         );
         break;
-      case h.PieSeries:
-      case h.BarSeries:
-      case h.LineSeries:
-      case h.RadarSeries:
-      case h.ComboLineAndBarSeries:
+      case S.PieSeries:
+      case S.BarSeries:
+      case S.LineSeries:
+      case S.RadarSeries:
+      case S.ComboLineAndBarSeries:
         if (Pe({
           xAxisValueFormatType: xe(a),
           setTimeBinningInfoWhenNotProvided: d,
@@ -8450,7 +8465,7 @@ async function Bu(t) {
           queryObject: s
         })) {
           const L = He(a);
-          "temporalBinning" in L.series[0] && L.series[0].temporalBinning && (L.series[0].temporalBinning.trimIncompleteTimeInterval = !1, rt(o, s) && (delete L.series[0].temporalBinning.start, delete L.series[0].temporalBinning.end)), S.push(
+          "temporalBinning" in L.series[0] && L.series[0].temporalBinning && (L.series[0].temporalBinning.trimIncompleteTimeInterval = !1, rt(o, s) && (delete L.series[0].temporalBinning.start, delete L.series[0].temporalBinning.end)), h.push(
             xi({
               chartConfig: L,
               queryConfig: w,
@@ -8464,7 +8479,7 @@ async function Bu(t) {
             })
           );
         } else
-          S.push(
+          h.push(
             tu({
               queryObject: s,
               chartConfig: a,
@@ -8477,8 +8492,8 @@ async function Bu(t) {
             })
           );
         break;
-      case h.BoxPlotSeries:
-        S.push(
+      case S.BoxPlotSeries:
+        h.push(
           iu({
             queryObject: s,
             chartConfig: a,
@@ -8494,8 +8509,8 @@ async function Bu(t) {
           })
         );
         break;
-      case h.ScatterSeries:
-        S.push(
+      case S.ScatterSeries:
+        h.push(
           dr({
             queryObject: s,
             chartConfig: a,
@@ -8515,8 +8530,8 @@ async function Bu(t) {
           })
         );
         break;
-      case h.HistogramSeries:
-        S.push(
+      case S.HistogramSeries:
+        h.push(
           Do({
             queryObject: s,
             queryConfig: w,
@@ -8528,7 +8543,7 @@ async function Bu(t) {
         break;
     }
   }
-  return await Promise.all(S);
+  return await Promise.all(h);
 }
 async function Yd(t) {
   const {
@@ -8548,12 +8563,12 @@ async function Yd(t) {
     viewExtentUpdated: y,
     runtimeDataFilters: g,
     ignoreViewExtent: p,
-    returnSelectionOIDs: S,
-    selectionData: x
-  } = t, { series: v } = e, { selectionItems: b, selectionOIDs: B } = x ?? {};
+    returnSelectionOIDs: h,
+    selectionData: v
+  } = t, { series: B } = e, { selectionItems: b, selectionOIDs: C } = v ?? {};
   let N;
-  const T = _(v), w = T !== h.HistogramSeries && T !== h.HeatSeries && b !== void 0 && b.length > 0 && !(v[0].x in b[0]) && !(ce in b[0]) && !(C.boxPlot.boxPlotCategory in b[0]);
-  if (y !== !0 && S !== !1 && B !== void 0 && B.length > 0 && (a === !0 || w || u)) {
+  const T = j(B), w = T !== S.HistogramSeries && T !== S.HeatSeries && b !== void 0 && b.length > 0 && !(B[0].x in b[0]) && !(ce in b[0]) && !(x.boxPlot.boxPlotCategory in b[0]);
+  if (y !== !0 && h !== !1 && C !== void 0 && C.length > 0 && (a === !0 || w || u)) {
     const A = Ci(i), I = Ha({
       queryObject: s,
       chartConfig: e,
@@ -8564,12 +8579,12 @@ async function Yd(t) {
     if (A !== void 0 && !Bn({ dataContext: A[0], chartConfig: e, chartLimits: c }))
       N = A.filter((P) => {
         const O = P[W.uniqueIdsName];
-        return typeof O == "number" || typeof O == "string" ? B?.includes(O) : !1;
+        return typeof O == "number" || typeof O == "string" ? C?.includes(O) : !1;
       });
-    else if (B?.[0] !== void 0 && I !== void 0) {
-      const { maxOIDsPerSelectionQuery: P } = $t(), O = Math.ceil(B.length / P), V = te(e.series[0]?.query?.where), $ = await Bu({
+    else if (C?.[0] !== void 0 && I !== void 0) {
+      const { maxOIDsPerSelectionQuery: P } = $t(), O = Math.ceil(C.length / P), V = te(e.series[0]?.query?.where), $ = await Bu({
         numberOfQueries: O,
-        selectionOIDs: B,
+        selectionOIDs: C,
         queryConfig: I,
         queryObject: s,
         replaceNoValueCategoryWithZero: r,
@@ -8586,7 +8601,7 @@ async function Yd(t) {
       N = vu({
         dataFetchingResults: $,
         numberOfQueries: O,
-        series: v
+        series: B
       });
     }
   }
@@ -8603,7 +8618,7 @@ export {
   re as A,
   E as B,
   fd as C,
-  j as D,
+  Q as D,
   le as E,
   zs as F,
   ps as G,
@@ -8766,9 +8781,9 @@ export {
   Wd as c4,
   td as c5,
   cc as c6,
-  sd as c7,
+  nd as c7,
   Qd as c8,
-  nd as c9,
+  rd as c9,
   bt as cA,
   al as cB,
   Md as cC,
@@ -8776,24 +8791,24 @@ export {
   Oi as cE,
   oc as cF,
   yc as cG,
-  ld as cH,
-  lc as cI,
-  Od as cJ,
-  uc as cK,
-  ud as cL,
-  ii as cM,
-  pt as cN,
-  dn as cO,
-  Jc as cP,
-  md as cQ,
-  We as cR,
-  $i as cS,
-  wa as cT,
-  Dd as cU,
-  ad as cV,
+  Dd as cH,
+  od as cI,
+  lc as cJ,
+  Od as cK,
+  uc as cL,
+  ld as cM,
+  ii as cN,
+  pt as cO,
+  dn as cP,
+  Jc as cQ,
+  md as cR,
+  We as cS,
+  $i as cT,
+  cd as cU,
+  wa as cV,
   Hd as cW,
   Jn as cX,
-  rd as cY,
+  ad as cY,
   xe as cZ,
   $d as c_,
   Zn as ca,
@@ -8806,11 +8821,11 @@ export {
   sc as ch,
   ed as ci,
   Di as cj,
-  od as ck,
+  sd as ck,
   In as cl,
   st as cm,
   Xc as cn,
-  cd as co,
+  ud as co,
   is as cp,
   de as cq,
   Kc as cr,