@arcgis/charts-components 5.2.0-next.12 → 5.2.0-next.13

package/dist/chunks/index2.js

@@ -1,41 +1,41 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import { isEqual as at, sortBy as Ni, cloneDeep as He, memoize as It, isArray as li, isNil as hr, isEmpty as Sr } from "lodash-es";
-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 Ui, G as xr } from "./chart-object-literals.js";
+import { isEqual as at, sortBy as Ni, cloneDeep as He, memoize as It, isArray as li, isNil as pr, isEmpty as hr } from "lodash-es";
+import { u as h, k as Sr, r as D, v as Ke, m as Se, p as ye, n as De, q as Te, g as Z, j as Fr, s as R, t as ee, d as he, a as Ui, G as br } from "./chart-object-literals.js";
 import Ti from "@arcgis/core/layers/support/FeatureFilter.js";
-import Cr from "@arcgis/core/smartMapping/statistics/histogram.js";
+import xr from "@arcgis/core/smartMapping/statistics/histogram.js";
 import Ai from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
 import * as Yi from "@arcgis/core/geometry/support/jsonUtils.js";
-import vr from "@arcgis/core/rest/support/AttributeBinsQuery.js";
-import Br from "@arcgis/core/rest/support/Query.js";
-import Nr from "@arcgis/core/rest/support/StatisticDefinition.js";
+import Cr from "@arcgis/core/rest/support/AttributeBinsQuery.js";
+import vr from "@arcgis/core/rest/support/Query.js";
+import Br from "@arcgis/core/rest/support/StatisticDefinition.js";
 import Zi from "@arcgis/core/time/TimeExtent.js";
-import Tr from "@arcgis/core/layers/FeatureLayer.js";
-import Ar from "@arcgis/core/layers/support/CodedValueDomain.js";
-import wr from "@arcgis/core/layers/support/Field.js";
-import * as Lr from "@arcgis/core/layers/support/fieldUtils.js";
-import Pr from "@arcgis/core/portal/Portal.js";
+import Nr from "@arcgis/core/layers/FeatureLayer.js";
+import Tr from "@arcgis/core/layers/support/CodedValueDomain.js";
+import Ar from "@arcgis/core/layers/support/Field.js";
+import * as wr from "@arcgis/core/layers/support/fieldUtils.js";
+import Lr from "@arcgis/core/portal/Portal.js";
 import * as Xi from "@arcgis/core/renderers/support/jsonUtils.js";
 import wt from "@arcgis/core/request.js";
 import Ji from "@arcgis/core/rest/support/FeatureSet.js";
 import { g as _ } from "./series-types.js";
-import { F as C, q as oe, C as F, e as Zt, z as Ki, l as ui, o as wi, v as ea, d as Xt, x as Mr, g as ta, s as zt, w as Dr, i as Or, r as Ae, t as Et } from "./index3.js";
-import Ir from "@arcgis/core/Graphic.js";
+import { F as C, q as oe, C as F, e as Zt, z as Ki, l as ui, o as wi, v as ea, d as Xt, x as Pr, g as ta, s as zt, w as Mr, i as Dr, r as Ae, t as Et } from "./index3.js";
+import Or from "@arcgis/core/Graphic.js";
 import * as Wt from "@arcgis/core/symbols/support/symbolUtils.js";
 import { f as Jt, h as et, i as _e, e as se, R as U } from "./rest-js-object-literals.js";
-import Er from "@arcgis/core/AttributeBinsGraphic.js";
+import Ir from "@arcgis/core/AttributeBinsGraphic.js";
 import { substitute as Be } from "@arcgis/core/intl.js";
-import { g as qt, L as lt, az as W, j as Q, r as ut, o as Oe, ax as Kt, am as ia, aB as aa, aq as qr, s as Vt, ay as Vr, b as Rr, a as $r } from "./index.js";
-import { unsafeGetElementDirection as kr } from "@arcgis/toolkit/dom";
+import { g as qt, L as lt, az as W, j as Q, r as ut, o as Oe, ax as Kt, am as ia, aB as aa, aq as Er, s as Vt, ay as qr, b as Vr, a as Rr } from "./index.js";
+import { unsafeGetElementDirection as $r } from "@arcgis/toolkit/dom";
 import { fetchT9nStringsBundle as ft, getElementLocale as ze, supportedLocales as ra } from "@arcgis/toolkit/intl";
-import { i as na, b as sa, c as ie, a as mt, f as Qr, e as _r } from "./type-guards.js";
+import { i as na, b as sa, c as ie, a as mt, f as kr, e as Qr } from "./type-guards.js";
 import * as oa from "@arcgis/core/core/promiseUtils.js";
 import { g as yt } from "./runtime.js";
-import { linearRegression as jr, linearRegressionLine as Hr, rSquared as zr } from "simple-statistics";
-import { sqlLiteral as Wr } from "@arcgis/core/core/sql.js";
+import { linearRegression as _r, linearRegressionLine as jr, rSquared as Hr } from "simple-statistics";
+import { sqlLiteral as zr } from "@arcgis/core/core/sql.js";
 import { DateTime as me } from "luxon";
-import { computeStatisticsHistograms as Gr, computeRasterAttributeTable as Ur, getCurrentRasterInfo as Rt, fetchPixelFeatureSet as Yr } from "@arcgis/core/applications/Components/imageryUtils.js";
-import la from "@arcgis/core/geometry/Extent.js";
-import ua from "@arcgis/core/geometry/Point.js";
+import { computeStatisticsHistograms as Wr, computeRasterAttributeTable as Gr, getCurrentRasterInfo as Rt, fetchPixelFeatureSet as Ur } from "@arcgis/core/applications/Components/imageryUtils.js";
+import Yr from "@arcgis/core/geometry/Extent.js";
+import la from "@arcgis/core/geometry/Point.js";
 import Zr from "@arcgis/core/layers/ImageryLayer.js";
 import Xr from "@arcgis/core/layers/ImageryTileLayer.js";
 import Jr from "@arcgis/core/layers/WCSLayer.js";
@@ -62,16 +62,16 @@ function nc(t) {
   return t.intlOptions;
 }
 function ne(t) {
-  return t?.type === S.NumberAxisFormat;
+  return t?.type === h.NumberAxisFormat;
 }
 function sc(t) {
   return ne(t) && t.intlOptions?.style === "percent";
 }
 function we(t) {
-  return t?.type === S.CategoryAxisFormat;
+  return t?.type === h.CategoryAxisFormat;
 }
 function je(t) {
-  return t?.type === S.DateAxisFormat;
+  return t?.type === h.DateAxisFormat;
 }
 function oc(t) {
   const { oldConfig: e, newConfig: i, rotationChanged: a } = t;
@@ -108,28 +108,28 @@ function lc(t) {
   const { chartType: e, axesConfig: i, errorStrings: a } = t;
   let r, n;
   switch (e) {
-    case S.GaugeSeries:
+    case h.GaugeSeries:
       r = ln, n = "invalidValueFormatForGauge";
       break;
-    case S.ScatterSeries:
+    case h.ScatterSeries:
       r = sn, n = "invalidValueFormatForScatterplot";
       break;
-    case S.HistogramSeries:
+    case h.HistogramSeries:
       r = on, n = "invalidValueFormatForHistogram";
       break;
-    case S.LineSeries:
+    case h.LineSeries:
       r = en, n = "invalidValueFormatForLineChart";
       break;
-    case S.BarSeries:
+    case h.BarSeries:
       r = tn, n = "invalidValueFormatForBarChart";
       break;
-    case S.ComboLineAndBarSeries:
+    case h.ComboLineAndBarSeries:
       r = nn, n = "invalidValueFormatForComboBarLineChart";
       break;
-    case S.BoxPlotSeries:
+    case h.BoxPlotSeries:
       r = an, n = "invalidValueFormatForBoxPlot";
       break;
-    case S.HeatSeries:
+    case h.HeatSeries:
       r = rn, n = "invalidValueFormatForHeatChart";
       break;
   }
@@ -137,16 +137,16 @@ function lc(t) {
 }
 function un(t) {
   const { isXAxis: e, chartType: i, valueFormat: a, isAxisForHistogramOverlaySeries: r } = t;
-  return e && (we(a) || i === S.HistogramSeries && !r || i === S.BarSeries && ne(a));
+  return e && (we(a) || i === h.HistogramSeries && !r || i === h.BarSeries && ne(a));
 }
 function We(t) {
-  return _(t?.series) === S.HeatSeries;
+  return _(t?.series) === h.HeatSeries;
 }
 function de(t) {
-  return _(t?.series) === S.BoxPlotSeries;
+  return _(t?.series) === h.BoxPlotSeries;
 }
 function uc(t) {
-  return _(t?.series) === S.ComboLineAndBarSeries;
+  return _(t?.series) === h.ComboLineAndBarSeries;
 }
 function cn(t) {
   return t !== void 0 && t !== Jt.Solid && t !== Jt.Null;
@@ -237,7 +237,7 @@ const ce = "arcgis_charts_pie_from_fields_name", Ne = "arcgis_charts_pie_from_fi
       // blue
     },
     legend: {
-      position: Fr.Bottom,
+      position: Sr.Bottom,
       chartPadding: 40,
       legendPadding: 20,
       width: 70,
@@ -335,22 +335,22 @@ function Fc(t) {
 function Ee(t) {
   return t !== void 0 && "view" in t && "layer" in t && t.layer.type === "feature";
 }
-function ca(t) {
+function ua(t) {
   return t !== void 0 && "type" in t && t.type === "feature";
 }
 function bc(t) {
   return t !== void 0 && "type" in t && t.type === "subtype-group";
 }
-function da(t) {
+function ca(t) {
   return t !== void 0 && "type" in t && t.type === "subtype-sublayer";
 }
 function fn(t) {
-  return ca(t) || da(t);
+  return ua(t) || ca(t);
 }
 function ge(t) {
-  return da(t) ? t.parent ?? void 0 : t;
+  return ca(t) ? t.parent ?? void 0 : t;
 }
-function fa(t) {
+function da(t) {
   return t?.capabilities?.query?.supportsDistance || ge(t)?.sourceJSON?.advancedQueryCapabilities?.supportsQueryWithDistance === !0;
 }
 function mn(t) {
@@ -358,7 +358,7 @@ function mn(t) {
 }
 function xc(t) {
   const { chartConfig: e, queryObject: i, options: a } = t, r = _(e?.series), n = te(e?.series[0]?.query?.where);
-  return !(r === S.HeatSeries || e && Pe({
+  return !(r === h.HeatSeries || e && Pe({
     xAxisValueFormatType: xe(e),
     setTimeBinningInfoWhenNotProvided: a?.setTimeBinningInfoWhenNotProvided,
     seriesConfig: e.series[0],
@@ -506,10 +506,10 @@ const Qe = [
   "25.0.0",
   "25.1.0"
 ], pn = "1.0.0", hn = "unrecognized.version", Sn = [
-  S.LineSeries,
-  S.BarSeries,
-  S.ComboLineAndBarSeries,
-  S.RadarSeries
+  h.LineSeries,
+  h.BarSeries,
+  h.ComboLineAndBarSeries,
+  h.RadarSeries
 ];
 function Gt(t, e) {
   let i = 0;
@@ -553,7 +553,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 === S.LineSeries) : e[0];
+  let a = ("showMean" in t ? t.showMean : !1) === !0 ? e.find((r) => r.type === h.LineSeries) : e[0];
   return a ??= e[0], a;
 }
 function Tc(t, e) {
@@ -589,34 +589,34 @@ function Le(t) {
   let o = e;
   return n !== "" && s !== "" && (s === null ? o = `${n} IS NULL` : o = `${n}=${s}`), o;
 }
-function ma(t) {
+function fa(t) {
   let e = F.PieFromCategory;
   return t[0].query?.outStatistics === void 0 ? e = F.PieNoAggregation : t[0].query?.groupByFieldsForStatistics === void 0 && (e = F.PieFromFields), e;
 }
-function ya(t) {
+function ma(t) {
   let e = F.BarAndLineMonoField;
   const i = t[0].query?.where;
   return t[0].query?.groupByFieldsForStatistics === void 0 && (t[0].query?.outStatistics ?? []).length > 0 ? e = F.BarAndLineFromFields : i === void 0 && t[0].query?.outStatistics === void 0 ? e = F.BarAndLineNoAggregation : Ie(i) ? t.length > 1 && (e = F.BarAndLineMultiFields) : e = t[0].query?.outStatistics === void 0 ? F.BarAndLineSplitByNoAggregation : F.BarAndLineSplitBy, e;
 }
 function bn(t) {
   let e = F.BoxPlotMonoField;
-  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;
+  const i = t.length === 1, a = t.find((o) => o.type === h.LineSeries) ?? t[0], { x: r } = a, n = "y" in a ? a.y : "", s = a.query?.where;
   return r === qt ? 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 S.PieSeries:
-        e = ma(t);
+      case h.PieSeries:
+        e = fa(t);
         break;
-      case S.RadarSeries:
-      case S.BarSeries:
-      case S.LineSeries:
-      case S.ComboLineAndBarSeries:
-        e = ya(t);
+      case h.RadarSeries:
+      case h.BarSeries:
+      case h.LineSeries:
+      case h.ComboLineAndBarSeries:
+        e = ma(t);
         break;
-      case S.BoxPlotSeries:
+      case h.BoxPlotSeries:
         e = bn(t);
         break;
     }
@@ -628,13 +628,13 @@ function xn(t) {
 function Cn(t) {
   let e = !0;
   const i = _(t.series);
-  if (i === S.BarSeries || i === S.LineSeries || i === S.ComboLineAndBarSeries) {
+  if (i === h.BarSeries || i === h.LineSeries || i === h.ComboLineAndBarSeries) {
     const a = k(t.series);
     e = a !== F.BarAndLineNoAggregation && a !== F.BarAndLineSplitByNoAggregation;
   }
   return e;
 }
-function ga(t) {
+function ya(t) {
   const { statsMap: e, dataContext: i, chartLimits: a } = t;
   let r = !1;
   if (e !== void 0) {
@@ -648,15 +648,15 @@ function vn(t) {
   let r = !0;
   if (i !== void 0)
     switch (_(i.series)) {
-      case S.BarSeries:
-      case S.LineSeries:
-      case S.ComboLineAndBarSeries:
+      case h.BarSeries:
+      case h.LineSeries:
+      case h.ComboLineAndBarSeries:
         r = Cn(i);
         break;
-      case S.ScatterSeries:
-        r = ga({ dataContext: e, chartLimits: a });
+      case h.ScatterSeries:
+        r = ya({ dataContext: e, chartLimits: a });
         break;
-      case S.PieSeries:
+      case h.PieSeries:
         r = xn(i);
         break;
     }
@@ -665,7 +665,7 @@ function vn(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 === S.DateAxisFormat) {
+  if (!ie(r) && !(z(r)?.fields?.find((o) => o.name === e.x)?.type === "time-only") && be(e) && e.binTemporalData !== !1 && i === h.DateAxisFormat) {
     const o = k([e]);
     if (e.temporalBinning && o !== F.BarAndLineNoAggregation && o !== F.BarAndLineSplitByNoAggregation) {
       const { unit: u, size: c } = e.temporalBinning;
@@ -677,7 +677,7 @@ function Pe(t) {
 function be(t) {
   return Sn.includes(t?.type);
 }
-function pa(t) {
+function ga(t) {
   const { previousConfig: e, newConfig: i, behaviorAfterLimit: a } = t, r = e.series, n = i.series;
   let s = !1, o = !1;
   (a === lt.RenderUpToTheLimit || e.orderOptions?.data === void 0 || i.orderOptions?.data === void 0) && (o = !at(
@@ -704,21 +704,21 @@ function Nn(t, e) {
       i = !0;
     else {
       const a = _(t);
-      if (a !== S.HistogramSeries && a !== S.GaugeSeries) {
+      if (a !== h.HistogramSeries && a !== h.GaugeSeries) {
         const r = ue(t).sort(), n = ue(e).sort();
         i = JSON.stringify(r) !== JSON.stringify(n);
       }
     }
   return i;
 }
-function ha(t, e) {
+function pa(t, e) {
   return (t ?? !1) !== (e ?? !1);
 }
-function Sa(t, e) {
+function ha(t, e) {
   return be(t.series[0]) && be(e.series[0]) && (t.series[0].binTemporalData ?? C.binTemporalData) !== (e.series[0].binTemporalData ?? C.binTemporalData);
 }
-function Fa(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 === S.DateAxisFormat && a === S.NumberAxisFormat, o = i === S.NumberAxisFormat && a === S.DateAxisFormat;
+function Sa(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;
   return i !== a && (n || s || o);
 }
 function Tn(t) {
@@ -738,13 +738,13 @@ function Tn(t) {
 function Li(t, e) {
   return e.length !== t.length;
 }
-function ba(t, e) {
+function Fa(t, e) {
   return st(t) !== st(e);
 }
-function xa(t, e) {
+function ba(t, e) {
   return JSON.stringify(t.series[0]?.valueConversion) !== JSON.stringify(e.series[0]?.valueConversion);
 }
-function Ca(t, e) {
+function xa(t, e) {
   return JSON.stringify(t.series[0]?.xTemporalBinning) !== JSON.stringify(e.series[0]?.xTemporalBinning) || JSON.stringify(t.series[0]?.yTemporalBinning) !== JSON.stringify(e.series[0]?.yTemporalBinning) || (t.firstDayOfWeek ?? 7) !== (e.firstDayOfWeek ?? 7) || t.outTimeZone !== e.outTimeZone || (t.nullPolicy ?? Se.Null) !== (e.nullPolicy ?? Se.Null);
 }
 function An(t, e) {
@@ -756,7 +756,7 @@ function wn(t, e) {
 function Ln(t) {
   const { previousConfig: e, newConfig: i, fieldList: a } = t, r = e.series[0], n = i.series[0];
   let s = !1;
-  if (r.type === S.ScatterSeries && n.type === S.ScatterSeries && a && a.length > 0) {
+  if (r.type === h.ScatterSeries && n.type === h.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));
@@ -776,11 +776,11 @@ function Lt(t) {
   return e.position === void 0 && (e.position = gt.heatChart.legend.position), e;
 }
 function Lc(t, e) {
-  const i = t.legend ?? { type: S.Legend }, a = e.legend ?? { type: S.Legend }, r = Lt(i), n = Lt(a);
+  const i = t.legend ?? { type: h.Legend }, a = e.legend ?? { type: h.Legend }, r = Lt(i), n = Lt(a);
   return !at(r, n);
 }
 function Pc(t, e) {
-  const i = t.legend ?? { type: S.Legend }, a = e.legend ?? { type: S.Legend }, r = Lt(i), n = Lt(a);
+  const i = t.legend ?? { type: h.Legend }, a = e.legend ?? { type: h.Legend }, r = Lt(i), n = Lt(a);
   return r.position !== n.position;
 }
 function Mc(t, e) {
@@ -793,7 +793,7 @@ 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 === S.PieSeries && o === S.PieSeries) {
+  if (s === h.PieSeries && o === h.PieSeries) {
     const { slices: u, sliceGrouping: c } = r, { slices: l, sliceGrouping: d } = n, f = u?.map((g) => ({
       sliceId: g.sliceId,
       label: g.label
@@ -847,13 +847,13 @@ function jc(t, e) {
   return JSON.stringify(t?.chartRenderer) !== JSON.stringify(e?.chartRenderer);
 }
 function Hc(t, e) {
-  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;
+  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;
   return i !== a;
 }
 function zc(t, e) {
   let i = !1;
   const a = t.series[0], r = e.series[0];
-  if (a.type === S.ScatterSeries && r.type === S.ScatterSeries) {
+  if (a.type === h.ScatterSeries && r.type === h.ScatterSeries) {
     const { sizePolicy: n } = a, { sizePolicy: s } = r;
     i = JSON.stringify(n) !== JSON.stringify(s);
   }
@@ -862,7 +862,7 @@ function zc(t, e) {
 function Wc(t, e) {
   let i = !1;
   const a = t.series[0], r = e.series[0];
-  if (a.type === S.ScatterSeries && r.type === S.ScatterSeries) {
+  if (a.type === h.ScatterSeries && r.type === h.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;
   }
@@ -882,7 +882,7 @@ function Gc(t) {
     chartLimits: l
   } = t, { series: d } = i, { series: f } = e, m = _(d);
   let y = !1, p = !1, g = !1;
-  const h = {
+  const S = {
     common: {
       layerChanged: !1,
       queryChanged: !1,
@@ -908,22 +908,22 @@ function Gc(t) {
       tooltipFieldsChanged: !1
     }
   };
-  switch (h.common.queryChanged = pa({
+  switch (S.common.queryChanged = ga({
     previousConfig: e,
     newConfig: i,
     behaviorAfterLimit: l?.behaviorAfterLimit
-  }), h.common.configFiltersChanged = Bn(e, i), h.common.xOrYChanged = Nn(f, d), h.common.filterBySelectionChanged = ha(
+  }), S.common.configFiltersChanged = Bn(e, i), S.common.xOrYChanged = Nn(f, d), S.common.filterBySelectionChanged = pa(
     a,
     o
-  ), h.common.dataForFilterBySelectionChanged = Pn({
+  ), S.common.dataForFilterBySelectionChanged = Pn({
     previousSelectionOIDs: r,
     selectionData: u,
     filterBySelection: o
-  }), h.common.binTemporalDataChanged = Sa(e, i), h.common.valueFormatChangeRequiresNewData = Fa(
+  }), S.common.binTemporalDataChanged = ha(e, i), S.common.valueFormatChangeRequiresNewData = Sa(
     e,
     i
-  ), h.common = {
-    ...h.common,
+  ), S.common = {
+    ...S.common,
     ...Tn({
       previousSeries: f,
       newConfig: i,
@@ -931,38 +931,38 @@ function Gc(t) {
       queryObject: s
     })
   }, m) {
-    case S.HistogramSeries:
-      h.histogram.dataPropsChanged = Kn(f, d) || Jn(
+    case h.HistogramSeries:
+      S.histogram.dataPropsChanged = Kn(f, d) || Jn(
         f,
         d
       );
       break;
-    case S.LineSeries:
-    case S.BarSeries:
-    case S.ComboLineAndBarSeries:
-      h.common.numberOfSeriesChanged = Li(f, d);
+    case h.LineSeries:
+    case h.BarSeries:
+    case h.ComboLineAndBarSeries:
+      S.common.numberOfSeriesChanged = Li(f, d);
       break;
-    case S.BoxPlotSeries:
-      de(e) && de(i) && (h.common.numberOfSeriesChanged = Li(f, d), h.boxPlot.showMeanChanged = ba(e, i));
+    case h.BoxPlotSeries:
+      de(e) && de(i) && (S.common.numberOfSeriesChanged = Li(f, d), S.boxPlot.showMeanChanged = Fa(e, i));
       break;
-    case S.GaugeSeries:
-      h.gauge.valueConversionChanged = xa(e, i);
+    case h.GaugeSeries:
+      S.gauge.valueConversionChanged = ba(e, i);
       break;
-    case S.HeatSeries:
-      We(e) && We(i) && (h.heatChart.binningChanged = Ca(e, i), h.heatChart.hideEmptyRowsAndColumnsChanged = An(
+    case h.HeatSeries:
+      We(e) && We(i) && (S.heatChart.binningChanged = xa(e, i), S.heatChart.hideEmptyRowsAndColumnsChanged = An(
         e,
         i
-      ), h.heatChart.includeLeapDay = wn(e, i));
+      ), S.heatChart.includeLeapDay = wn(e, i));
       break;
-    case S.ScatterSeries:
-      h.scatterPlot.tooltipFieldsChanged = Ln({
+    case h.ScatterSeries:
+      S.scatterPlot.tooltipFieldsChanged = Ln({
         previousConfig: e,
         newConfig: i,
         fieldList: n
       });
       break;
   }
-  return p = Object.values(h.common).some((x) => x), (h.gauge.valueConversionChanged || h.histogram.dataPropsChanged || h.boxPlot.showMeanChanged || h.heatChart.binningChanged || h.heatChart.hideEmptyRowsAndColumnsChanged || h.heatChart.includeLeapDay || h.scatterPlot.tooltipFieldsChanged) && (g = !0), y = p || g, { dataUpdateNeeded: y, dataUpdateDetails: h };
+  return p = Object.values(S.common).some((b) => b), (S.gauge.valueConversionChanged || S.histogram.dataPropsChanged || S.boxPlot.showMeanChanged || S.heatChart.binningChanged || S.heatChart.hideEmptyRowsAndColumnsChanged || S.heatChart.includeLeapDay || S.scatterPlot.tooltipFieldsChanged) && (g = !0), y = p || g, { dataUpdateNeeded: y, dataUpdateDetails: S };
 }
 function Uc(t, e) {
   const i = He(t);
@@ -1005,7 +1005,7 @@ function Mn(t) {
   const r = ci(e);
   return r?.length === 2 && (a = i === Q.xField ? r[0]?.orderBy : r[1]?.orderBy), a;
 }
-function va(t) {
+function Ca(t) {
   const e = k(t.series);
   let i;
   if (t.orderOptions?.data !== void 0) {
@@ -1033,14 +1033,14 @@ function va(t) {
   }
   return i;
 }
-function Ba(t) {
+function va(t) {
   const e = t.series[0], { x: i, y: a } = e, r = k(t.series) === F.PieFromFields, n = k(t.series) === F.BarAndLineFromFields;
   let s, o = "", u;
   if (t.orderOptions?.data !== void 0) {
     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 : gt.originalCategoryValue : o = r ? Ne : [a].flat()[0], o !== void 0 && o !== "") {
       const l = ui(t);
-      if (_(t.series) !== S.PieSeries && o !== i && t.series?.length > 1)
+      if (_(t.series) !== h.PieSeries && o !== i && t.series?.length > 1)
         switch (l) {
           case Te.Stacked:
             o = C.technicalSortingFieldBySum;
@@ -1071,17 +1071,17 @@ function Pt(t) {
   if (t?.series && t.series.length > 0) {
     let a;
     switch (i) {
-      case S.HeatSeries:
+      case h.HeatSeries:
         We(t) && (e = ci(t));
         break;
-      case S.BoxPlotSeries:
-        de(t) && (a = va(t));
+      case h.BoxPlotSeries:
+        de(t) && (a = Ca(t));
         break;
-      case S.LineSeries:
-      case S.BarSeries:
-      case S.RadarSeries:
-      case S.PieSeries:
-        a = Ba(t);
+      case h.LineSeries:
+      case h.BarSeries:
+      case h.RadarSeries:
+      case h.PieSeries:
+        a = va(t);
         break;
     }
     !e && a && (e = [], e.push(a));
@@ -1093,7 +1093,7 @@ function Yc(t) {
   let s = !1, o = !1;
   if (n !== F.BoxPlotMonoField && n !== F.BoxPlotMonoFieldAndSplitBy && i.orderOptions?.data !== void 0) {
     const u = Pt(e), c = Pt(i);
-    if (r === S.HeatSeries) {
+    if (r === h.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 {
@@ -1104,17 +1104,17 @@ function Yc(t) {
   return s;
 }
 const Zc = {
-  getPieChartChartSubType: ma,
-  getBarLineChartSubType: ya,
-  hasQueryChanged: pa,
-  hasFilterBySelectionChanged: ha,
-  hasBinTemporalDataChanged: Sa,
-  hasGaugeValueConversionChanged: xa,
-  isNewDataRequiredForValueFormatChange: Fa,
-  hasShowMeanChanged: ba,
-  hasHeatChartBinningChanged: Ca,
-  getDataOrderParametersForBoxPlot: va,
-  getDataOrderParametersForCommonChart: Ba,
+  getPieChartChartSubType: fa,
+  getBarLineChartSubType: ma,
+  hasQueryChanged: ga,
+  hasFilterBySelectionChanged: pa,
+  hasBinTemporalDataChanged: ha,
+  hasGaugeValueConversionChanged: ba,
+  isNewDataRequiredForValueFormatChange: Sa,
+  hasShowMeanChanged: Fa,
+  hasHeatChartBinningChanged: xa,
+  getDataOrderParametersForBoxPlot: Ca,
+  getDataOrderParametersForCommonChart: va,
   getDataOrderParametersForHeatChart: ci
 };
 function Dn(t) {
@@ -1136,7 +1136,7 @@ function Pi(t) {
   const { originalCategoryValue: u, originalDateValue: c } = C;
   if (i !== void 0) {
     const l = n ? jn(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 === S.BarSeries || s?.series?.[0].type === S.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[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");
   }
   return o;
 }
@@ -1231,7 +1231,7 @@ function qn(t, e) {
     let a = 0, r = 0, n = 0;
     t.forEach((s) => {
       const o = s[e];
-      !Mr(o) || o === 0 ? n += 1 : o > 0 ? a += 1 : r += 1;
+      !Pr(o) || o === 0 ? n += 1 : o > 0 ? a += 1 : r += 1;
     }), i = n === t.length || a >= 0 && r === 0 || a === 0 && r >= 0;
   }
   return i;
@@ -1242,7 +1242,7 @@ function Tt(t) {
   const n = [];
   return typeof e == "number" && Number.isFinite(e) && n.push(e), typeof i == "number" && Number.isFinite(i) && n.push(i * a), n.length > 0 && (r = Math.min(...n)), r;
 }
-function Na(t, e) {
+function Ba(t, e) {
   let i;
   const {
     maxBarChartSeriesCount: a,
@@ -1259,44 +1259,44 @@ function Na(t, e) {
     maxLineThreePlusSeriesCountTotal: y,
     maxPieChartSliceCountTotal: p,
     maxGaugeByFeaturesLimit: g
-  } = ut(e), h = _(t.series), x = t.series.length === 0 ? 1 : t.series.length, v = k(t.series);
-  switch (h) {
-    case S.ComboLineAndBarSeries:
-    case S.BarSeries:
-      x <= a && (x === 1 ? i = r : x === 2 ? i = Tt({
+  } = ut(e), S = _(t.series), b = t.series.length === 0 ? 1 : t.series.length, v = k(t.series);
+  switch (S) {
+    case h.ComboLineAndBarSeries:
+    case h.BarSeries:
+      b <= a && (b === 1 ? i = r : b === 2 ? i = Tt({
         countTotal: s,
         countPerSeries: n,
-        numberOfSeries: x
-      }) : x > 2 && (i = Tt({
+        numberOfSeries: b
+      }) : b > 2 && (i = Tt({
         countTotal: u,
         countPerSeries: o,
-        numberOfSeries: x
+        numberOfSeries: b
       })));
       break;
-    case S.LineSeries:
-      x <= c && (x === 1 ? i = l : x === 2 ? i = Tt({
+    case h.LineSeries:
+      b <= c && (b === 1 ? i = l : b === 2 ? i = Tt({
         countTotal: f,
         countPerSeries: d,
-        numberOfSeries: x
-      }) : x > 2 && (i = Tt({
+        numberOfSeries: b
+      }) : b > 2 && (i = Tt({
         countTotal: y,
         countPerSeries: m,
-        numberOfSeries: x
+        numberOfSeries: b
       })));
       break;
-    case S.PieSeries:
+    case h.PieSeries:
       i = p;
       break;
-    case S.GaugeSeries:
+    case h.GaugeSeries:
       i = g;
       break;
-    case S.ScatterSeries:
+    case h.ScatterSeries:
     // handled through the aggregation feature
-    case S.HistogramSeries:
+    case h.HistogramSeries:
     // handled through the number of bins
-    case S.BoxPlotSeries:
+    case h.BoxPlotSeries:
   }
-  return (v === F.BarAndLineNoAggregation || v === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / x)), i;
+  return (v === F.BarAndLineNoAggregation || v === F.BarAndLineMultiFields) && i !== void 0 && (i = Math.ceil(i / b)), i;
 }
 function Mi(t, e) {
   let i = t;
@@ -1322,7 +1322,7 @@ function Xc(t) {
   }
   return e;
 }
-function Ta(t) {
+function Na(t) {
   const { stringToTruncate: e, characterLimit: i, ellipsis: a = C.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;
@@ -1333,7 +1333,7 @@ function Jc(t) {
   if (i > 0 && e.length > i) {
     const r = e.lastIndexOf(" ", i), n = e.lastIndexOf("-", i), s = Math.max(r, n), o = s === n && n > 0, u = s > 0 ? s + (o ? 1 : 0) : i, c = Math.min(i, u), l = e.slice(0, c).trimEnd();
     let d = e.slice(c).trimStart();
-    d.length > i && (d = Ta({
+    d.length > i && (d = Na({
       stringToTruncate: d,
       characterLimit: Math.max(1, i - 1)
     })), a = `${l}
@@ -1347,7 +1347,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 = Ta({
+    return !oe(a) && a !== C.htmlEmptyContent && (a = Na({
       stringToTruncate: a,
       characterLimit: t
     })), a;
@@ -1370,7 +1370,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 === Fr.Wrap && (c = !0, l = l ?? C.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
@@ -1381,12 +1381,12 @@ function Qn(t) {
   return t ? t.replace(/[A-Z]/gu, (e) => `-${e.toLowerCase()}`) : void 0;
 }
 const id = [
-  S.BarSeries,
-  S.BoxPlotSeries,
-  S.LineSeries,
-  S.PieSeries,
-  S.HistogramSeries,
-  S.ScatterSeries
+  h.BarSeries,
+  h.BoxPlotSeries,
+  h.LineSeries,
+  h.PieSeries,
+  h.HistogramSeries,
+  h.ScatterSeries
 ], ad = 1, rd = { PNG: "png" }, tt = {
   ChartRenderer: 1,
   LayerRenderer: 2
@@ -1403,19 +1403,19 @@ function nd(t) {
     }), l = z(i)?.renderer;
     switch (l?.type) {
       case se.Simple:
-        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;
+        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;
         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 === S.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 === h.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 === S.HeatSeries || n === S.ScatterSeries || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation;
+        a = n === h.HeatSeries || n === h.ScatterSeries || s === F.BarAndLineNoAggregation || s === F.PieNoAggregation;
         break;
       case se.Dictionary:
       case se.DotDensity:
@@ -1443,7 +1443,7 @@ function jn(t) {
 function Hn(t) {
   return t?.type !== void 0 && (t.color !== void 0 || t.label !== void 0 || t.style !== void 0 || t.outline !== void 0);
 }
-function Aa(t) {
+function Ta(t) {
   const { symbolField: e, dataItem: i, rendererSymbol: a, rendererOrigin: r } = t;
   let n = !1;
   if (!Hn(a))
@@ -1464,30 +1464,30 @@ function zn(t) {
       const { color: m, label: y } = d;
       let p;
       Array.isArray(m) && m?.length === 4 ? p = m : m && "toRgba" in m && (p = m.toRgba());
-      let g = !1, h = !0;
+      let g = !1, S = !0;
       switch (u) {
-        case S.BarSeries:
-        case S.LineSeries:
-        case S.ComboLineAndBarSeries:
-        case S.RadarSeries:
+        case h.BarSeries:
+        case h.LineSeries:
+        case h.ComboLineAndBarSeries:
+        case h.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 b = i.find((v) => v.query?.outStatistics?.[0]?.onStatisticField === f);
+            b !== void 0 && "y" in b ? f = [b.y].flat()[0] : f = "";
           }
           g = a !== F.BarAndLineFromFields || f === r[C.originalCategoryValue];
           break;
-        case S.PieSeries:
+        case h.PieSeries:
           g = a === F.PieFromFields && f === r[C.originalCategoryValue];
           break;
-        case S.BoxPlotSeries:
-          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? g = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (g = i.map((v) => v.y).flat().includes(f)), h = !1;
+        case h.BoxPlotSeries:
+          a === F.BoxPlotMonoField || a === F.BoxPlotMonoFieldAndCategory ? g = f === i[0].y : f && (a === F.BoxPlotMultiFields || a === F.BoxPlotMultiFieldsAndCategory) && (g = i.map((v) => v.y).flat().includes(f)), S = !1;
           break;
       }
       g && p && (s = {
         type: _e.SMS,
         color: p,
-        label: h && y ? y : void 0
-      }, c != null && (s.outline = c), Aa({
+        label: S && y ? y : void 0
+      }, c != null && (s.outline = c), Ta({
         dataItem: r,
         symbolField: a === F.BarAndLineFromFields || a === F.PieFromFields ? C.rendererSymbolField : `${C.rendererSymbolField}_${f}`,
         rendererSymbol: s,
@@ -1523,14 +1523,14 @@ function Wn(t) {
     }
   return n;
 }
-function wa(t) {
+function Aa(t) {
   const { seriesConfig: e, chartSubType: i, rendererType: a, dataItem: r } = t;
   let n = Wn({
     seriesConfig: e,
     chartSubType: i,
     rendererType: a
   });
-  return n instanceof Array && e.type === S.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[qt]) ?? n[0]), n = n !== C.rendererSymbolField ? `${C.rendererSymbolField}_${n.toString()}` : n, n;
+  return n instanceof Array && e.type === h.BoxPlotSeries && a === se.PieChart && r !== void 0 && (n = n.find((s) => s === r[qt]) ?? n[0]), n = n !== C.rendererSymbolField ? `${C.rendererSymbolField}_${n.toString()}` : n, n;
 }
 function Gn(t) {
   const { chartRenderer: e, queryObject: i } = t, a = e !== void 0 ? {
@@ -1539,7 +1539,7 @@ function Gn(t) {
     ...z(i),
     renderer: Xi.fromJSON(e)
   } : z(i);
-  return new Ir({
+  return new Or({
     layer: a
   });
 }
@@ -1569,13 +1569,13 @@ async function Un(t) {
   } else if (i?.[Kt.defaultGroupOfSlicesId] !== !0) {
     const { x: m } = e[0], y = /* @__PURE__ */ new Map();
     o && o.trim() !== "" ? e.forEach((p) => {
-      if (p.type === S.BarSeries || p.type === S.LineSeries || p.type === S.BoxPlotSeries || p.type === S.RadarSeries) {
-        const g = wa({
+      if (p.type === h.BarSeries || p.type === h.LineSeries || p.type === h.BoxPlotSeries || p.type === h.RadarSeries) {
+        const g = Aa({
           seriesConfig: p,
           chartSubType: s,
           rendererType: r,
           dataItem: i
-        }), h = fe({
+        }), S = fe({
           where: p.query?.where,
           normalize: !0,
           keepSurroundingQuotes: !1,
@@ -1583,13 +1583,13 @@ async function Un(t) {
         });
         y.set(g, {
           ...i,
-          [o]: h
+          [o]: S
         });
       }
-    }) : e[0].type === S.HeatSeries && r === se.ClassBreaks ? y.set(C.rendererSymbolField, {
+    }) : e[0].type === h.HeatSeries && r === se.ClassBreaks ? y.set(C.rendererSymbolField, {
       [Q.valueField]: i[Q.valueField]
     }) : y.set(
-      _(e) === S.HistogramSeries ? C.rendererSymbolFieldForHistogram : C.rendererSymbolField,
+      _(e) === h.HistogramSeries ? C.rendererSymbolFieldForHistogram : C.rendererSymbolField,
       {
         ...i,
         [m]: On(i)
@@ -1598,18 +1598,18 @@ async function Un(t) {
     try {
       const p = Array.from(y.entries()), g = u.clone();
       g.layer = u.layer;
-      const h = a?.uniqueValueInfos;
-      for (let x = 0; x < p.length; x += 1) {
-        const [v, b] = p[x];
+      const S = a?.uniqueValueInfos;
+      for (let b = 0; b < p.length; b += 1) {
+        const [v, x] = p[b];
         if (Di({
           mode: "encode",
           x: m,
           splitByField: o,
-          attributes: b
-        }), c && c.length > 0 && Object.keys(b).forEach((N) => {
-          c.includes(N) || delete b[N];
-        }), g.attributes = b, l?.has(JSON.stringify(b)))
-          d = l.get(JSON.stringify(b));
+          attributes: x
+        }), c && c.length > 0 && Object.keys(x).forEach((N) => {
+          c.includes(N) || delete x[N];
+        }), g.attributes = x, l?.has(JSON.stringify(x)))
+          d = l.get(JSON.stringify(x));
         else {
           if (d = (await Wt.getDisplayedSymbol(g))?.toJSON(), d != null) {
             if (d.color === void 0) {
@@ -1617,16 +1617,16 @@ async function Un(t) {
               T && (d.color = T.length === 4 ? T : [...T, 255]);
             }
             const N = await Wt.getLegendLabel(g);
-            N != null && N !== "" && (d.label = N, d.uniqueValue = h?.find((T) => T.label === N)?.value ?? void 0);
+            N != null && N !== "" && (d.label = N, d.uniqueValue = S?.find((T) => T.label === N)?.value ?? void 0);
           }
-          l?.set(JSON.stringify(b), d);
+          l?.set(JSON.stringify(x), d);
         }
         Di({
           mode: "revert",
           x: m,
           splitByField: o,
           attributes: i
-        }), Aa({
+        }), Ta({
           dataItem: i,
           symbolField: v,
           rendererSymbol: d,
@@ -1648,7 +1648,7 @@ function Yn(t) {
   const { dataItem: e, seriesConfig: i, chartSubType: a, colorMatch: r, rendererType: n } = t;
   let s;
   if (r && e !== void 0) {
-    const o = wa({
+    const o = Aa({
       seriesConfig: i,
       chartSubType: a,
       rendererType: n,
@@ -1713,7 +1713,7 @@ function Kn(t, e) {
 function ld(t, e) {
   let i = !0;
   const a = _(t?.series), r = _(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;
+  return a && a !== r && (i = a === h.ComboLineAndBarSeries && (r === h.BarSeries || r === h.LineSeries) || r === h.ComboLineAndBarSeries && (a === h.BarSeries || a === h.LineSeries) || a === h.BarSeries && r === h.LineSeries || a === h.LineSeries && r === h.BarSeries), i;
 }
 function ei(t, e) {
   return t !== void 0 && e !== void 0 && e > 0;
@@ -1725,7 +1725,7 @@ function ud(t) {
   return r = e.series.map((c, l) => {
     const d = _([c]);
     let f;
-    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 = Yn({
+    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 = Yn({
       dataItem: a[0],
       seriesConfig: c,
       chartSubType: n,
@@ -1754,7 +1754,7 @@ function is(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;
   return r - n;
 }
-function La(t) {
+function wa(t) {
   const {
     outTimeZone: e = Intl.DateTimeFormat().resolvedOptions().timeZone,
     dataTimeZone: i = "UTC",
@@ -1771,7 +1771,7 @@ function La(t) {
   return r;
 }
 function as(t) {
-  const { dateFieldName: e, unit: i, runsOnClientQueryEngine: a, outTimeZone: r } = t, n = La({ runsOnClientQueryEngine: a, outTimeZone: r }), s = `EXTRACT(YEAR FROM ${e} ${n})`, o = `EXTRACT(MONTH FROM ${e} ${n})`, u = `EXTRACT(DAY FROM ${e} ${n})`, c = `EXTRACT(HOUR FROM ${e} ${n})`, l = `EXTRACT(MINUTE FROM ${e} ${n})`, d = `EXTRACT(SECOND FROM ${e} ${n})`;
+  const { dateFieldName: e, unit: i, runsOnClientQueryEngine: a, outTimeZone: r } = t, n = wa({ runsOnClientQueryEngine: a, outTimeZone: r }), s = `EXTRACT(YEAR FROM ${e} ${n})`, o = `EXTRACT(MONTH FROM ${e} ${n})`, u = `EXTRACT(DAY FROM ${e} ${n})`, c = `EXTRACT(HOUR FROM ${e} ${n})`, l = `EXTRACT(MINUTE FROM ${e} ${n})`, d = `EXTRACT(SECOND FROM ${e} ${n})`;
   let f = [];
   switch (i) {
     case R.Second:
@@ -1922,10 +1922,10 @@ function cs(t) {
     ]);
   }
 }
-function Pa(t) {
+function La(t) {
   const { chartConfig: e, uniqueQuery: i, chartLimits: a } = t;
   if (a?.behaviorAfterLimit === lt.RenderUpToTheLimit) {
-    const r = Na(e, a);
+    const r = Ba(e, a);
     if (r !== void 0) {
       const n = k(e.series);
       if (n === F.PieFromFields || n === F.BarAndLineFromFields) {
@@ -1954,26 +1954,26 @@ function mi(t) {
     seriesConfig: d,
     queryObject: a
   });
-  let g = /* @__PURE__ */ new Map(), h = !1, x = !1, v = !1, b = !1, B = !1, N = {};
+  let g = /* @__PURE__ */ new Map(), S = !1, b = !1, v = !1, x = !1, B = !1, N = {};
   if (f !== void 0) {
     N = He(f);
     const $ = te(f.where);
     let M = "";
     switch (i.fetchNullValues !== !0 && (m !== C.boxPlot.boxPlotCategory && (M = `${m} IS NOT NULL`), $.trim() !== "" && $ !== m && !Ie(f.where) && (M = Y([M, `${$} IS NOT NULL`]))), l) {
       case F.BarAndLineSplitBy: {
-        g = ns(c), b = !0, h = !0, x = !0;
+        g = ns(c), x = !0, S = !0, b = !0;
         break;
       }
       case F.BarAndLineMultiFields:
-        us(N, c), x = !0;
+        us(N, c), b = !0;
         break;
       case F.PieFromFields:
       case F.BarAndLineFromFields:
-        M = "", v = !0, x = !0;
+        M = "", v = !0, b = !0;
         break;
       case F.BarAndLineMonoField:
       case F.PieFromCategory:
-        x = !0;
+        b = !0;
         break;
       case F.BoxPlotMonoField:
       case F.BoxPlotMultiFields:
@@ -1984,23 +1984,23 @@ function mi(t) {
       case F.BoxPlotMonoFieldAndSplitBy:
       case F.BoxPlotMonoFieldAndCategoryAndSplitBy:
       case F.BoxPlotMultiFieldsAndSplitBy: {
-        B = !0, b = !0, v = !0;
+        B = !0, x = !0, v = !0;
         break;
       }
       case F.PieNoAggregation:
       case F.BarAndLineNoAggregation:
       case F.BarAndLineSplitByNoAggregation:
     }
-    if (x && os({
+    if (b && os({
       uniqueQuery: N,
       y,
-      useGenericOutStatFieldName: h,
+      useGenericOutStatFieldName: S,
       queryObject: a,
       chartSubType: l,
       isTimeBinningSeries: p,
       returnFeaturesExtent: o,
       splitByField: $
-    }), b && ss({ uniqueQuery: N, splitByField: $, x: m }), de(e) && B && (N.outStatistics = ls({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
+    }), x && ss({ uniqueQuery: N, splitByField: $, x: m }), de(e) && B && (N.outStatistics = ls({ chartConfig: e, fetchFullBoxPlotData: s })), v ? delete N.orderByFields : i.orderByFields !== void 0 && (N.orderByFields = i.orderByFields.filter((q) => {
       const G = q.split(" ");
       return !oe(G[0]);
     })), p && be(c[0])) {
@@ -2017,9 +2017,9 @@ function mi(t) {
     }
     N.where = M;
   }
-  Pa({ chartConfig: e, uniqueQuery: N, chartLimits: u });
-  const { gdbVersion: T, geometry: w, distance: P, units: A, timeExtent: I, where: L, objectIds: O, spatialRelationship: V } = i;
-  return T !== void 0 && (N.gdbVersion = T), w !== void 0 && (N.geometry = w), P !== void 0 && (N.distance = P), A !== void 0 && (N.units = A), I !== void 0 && (N.timeExtent = I), O !== void 0 && (N.objectIds = O), V !== void 0 && (N.spatialRelationship = V), L !== void 0 && (N.where = Y([N.where, L])), { uniqueQuery: N, mapToStatField: g };
+  La({ chartConfig: e, uniqueQuery: N, chartLimits: u });
+  const { gdbVersion: T, geometry: w, distance: L, units: A, timeExtent: I, where: P, objectIds: O, spatialRelationship: V } = i;
+  return T !== void 0 && (N.gdbVersion = T), w !== void 0 && (N.geometry = w), L !== void 0 && (N.distance = L), A !== void 0 && (N.units = A), I !== void 0 && (N.timeExtent = I), O !== void 0 && (N.objectIds = O), V !== void 0 && (N.spatialRelationship = V), P !== void 0 && (N.where = Y([N.where, P])), { uniqueQuery: N, mapToStatField: g };
 }
 const le = {
   Default: "defaultError",
@@ -2076,49 +2076,49 @@ function fs(t) {
   return e;
 }
 async function ms(t) {
-  const { queryConfig: e, chartConfig: i, queryObject: a, abortKey: r, abortSignal: n, view: s } = t, o = i.series[0], { x: u, dataTransformationType: c, binCount: l } = o, d = z(a);
-  if (!ie(d))
+  const { queryConfig: e, chartConfig: i, queryObject: a, abortKey: r, abortSignal: n, filterByViewExtent: s, view: o } = t, u = i.series[0], { x: c, dataTransformationType: l, binCount: d } = u, f = z(a);
+  if (!ie(f))
     throw new re(le.LayerNotSupported);
-  d.loaded || await d.load({ signal: n });
-  const f = await ct(d, n);
-  if (!f)
+  f.loaded || await f.load({ signal: n });
+  const m = await ct(f, n);
+  if (!m)
     throw new Error("Raster info is not available for the layer.");
-  const m = dt(e.geometry) ?? d.fullExtent, y = f.bandCount === 1 ? 0 : f.bandInfos.findIndex((h) => h.name === u);
-  let p, g;
-  if (s === void 0 && (c === void 0 || c === Z.None) && l && Array.isArray(f.histograms) && f.histograms.length > y && f.histograms[y].size % l === 0 && Array.isArray(f.statistics) && f?.statistics?.length > y)
-    p = f.histograms[y], g = f.statistics[y];
+  const y = dt(e.geometry) ?? f.fullExtent, p = m.bandCount === 1 ? 0 : m.bandInfos.findIndex((b) => b.name === c);
+  let g, S;
+  if (s !== !0 && (l === void 0 || l === Z.None) && d && Array.isArray(m.histograms) && m.histograms.length > p && m.histograms[p].size % d === 0 && Array.isArray(m.statistics) && m?.statistics?.length > p)
+    g = m.histograms[p], S = m.statistics[p];
   else {
-    let h, x, v;
-    if (s)
-      h = s.resolution, x = s.resolution, v = s.spatialReference;
+    let b, v, x;
+    if (o)
+      b = o.resolution, v = o.resolution, x = o.spatialReference;
     else {
-      const T = ds, w = 2, P = f.width, A = f.height, I = Math.max(
+      const w = ds, L = 2, A = m.width, I = m.height, P = Math.max(
         0,
-        Math.ceil(Math.log(Math.max(P, A) / T) / Math.log(w))
-      ), L = w ** I;
-      h = f.pixelSize.x * L, x = f.pixelSize.y * L, v = d.spatialReference;
+        Math.ceil(Math.log(Math.max(A, I) / w) / Math.log(L))
+      ), O = L ** P;
+      b = m.pixelSize.x * O, v = m.pixelSize.y * O, x = f.spatialReference;
     }
-    const b = new ua({
-      x: h,
-      y: x,
-      spatialReference: v
-    }), B = fs(c), N = await Gr(
-      d,
+    const B = new la({
+      x: b,
+      y: v,
+      spatialReference: x
+    }), N = fs(l), T = await Wr(
+      f,
       {
-        bandIds: [y],
-        geometry: m,
-        histogramSize: l ?? void 0,
-        pixelSize: b,
-        transformType: B,
+        bandIds: [p],
+        geometry: y,
+        histogramSize: d ?? void 0,
+        pixelSize: B,
+        transformType: N,
         downsampleOnly: !0
       },
       {
         signal: n ?? (r !== void 0 ? Ge.get(r)?.signal : void 0)
       }
     );
-    g = N.statistics[0], p = N.histograms[0];
+    S = T.statistics[0], g = T.histograms[0];
   }
-  return { histogram: p, statistics: g };
+  return { histogram: g, statistics: S };
 }
 function ys(t, e) {
   const i = [], a = (t.max - t.min) / t.size;
@@ -2293,15 +2293,15 @@ async function Cs(t) {
   let m;
   const y = z(e), p = ge(y);
   if (p) {
-    const h = { where: Y([u, p.definitionExpression]) }, x = { query: h, signal: o }, v = dt(c)?.extent?.toJSON();
+    const S = { where: Y([u, p.definitionExpression]) }, b = { query: S, signal: o }, v = dt(c)?.extent?.toJSON();
     if (v !== void 0) {
-      const B = xs(d), { xmin: N, ymin: T, xmax: w, ymax: P } = v;
-      h.geometryType = "esriGeometryEnvelope", h.geometry = `${N},${T},${w},${P}`, l !== void 0 && (h.distance = l.toString()), B !== void 0 && (h.units = B, c?.spatialReference?.wkid != null && (h.inSR = c.spatialReference.wkid.toString()));
+      const B = xs(d), { xmin: N, ymin: T, xmax: w, ymax: L } = v;
+      S.geometryType = "esriGeometryEnvelope", S.geometry = `${N},${T},${w},${L}`, l !== void 0 && (S.distance = l.toString()), B !== void 0 && (S.units = B, c?.spatialReference?.wkid != null && (S.inSR = c.spatialReference.wkid.toString()));
     }
-    f && (h.time = `${f[0]},${f[1]}`);
-    const b = `${p.url}/${p.layerId}/queryAnalytic?f=${a}&dataFormat=${r}&outAnalytics=${n}`;
+    f && (S.time = `${f[0]},${f[1]}`);
+    const x = `${p.url}/${p.layerId}/queryAnalytic?f=${a}&dataFormat=${r}&outAnalytics=${n}`;
     try {
-      m = (await wt(b, x)).data?.features?.[0]?.attributes;
+      m = (await wt(x, b)).data?.features?.[0]?.attributes;
     } catch (B) {
       const N = s ?? (await ft(
         ze(document.documentElement).t9nLocale,
@@ -2313,7 +2313,7 @@ async function Cs(t) {
   }
   return m;
 }
-function Ma(t, e) {
+function Pa(t, e) {
   return {
     lowerBoundaryAlias: `charts_lower_boundary_${t}`,
     upperBoundaryAlias: `charts_upper_boundary_${t}`,
@@ -2325,7 +2325,7 @@ async function vs(t) {
   let u;
   const c = z(i), l = mn(c);
   if (l && i && "queryAttributeBins" in i) {
-    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: p, firstDayOfWeek: g, includeLeapDay: h } = e, x = So({
+    const { x: d, y: f, xTemporalBinning: m, yTemporalBinning: y } = e.series[0], { outTimeZone: p, firstDayOfWeek: g, includeLeapDay: S } = e, b = So({
       queryObject: i,
       queryConfig: a,
       x: d,
@@ -2334,12 +2334,12 @@ async function vs(t) {
       yTemporalBinning: y,
       configTimeZone: p,
       firstDayOfWeek: g,
-      includeLeapDay: h,
+      includeLeapDay: S,
       view: r,
       syncViewTimeZone: n
     });
     try {
-      u = await i.queryAttributeBins(x, { signal: o });
+      u = await i.queryAttributeBins(b, { signal: o });
     } catch (v) {
       throw new re(le.QueryFeaturesError, s.errors.queryError, v);
     }
@@ -2444,7 +2444,7 @@ async function bt(t) {
   }
   return o;
 }
-async function Da(t) {
+async function Ma(t) {
   const { queryObject: e, queryConfig: i, returnUniqueIdsOnly: a, abortKey: r, errorStrings: n, abortSignal: s } = t;
   let o = [];
   const u = z(e), c = s || (r !== void 0 ? Ge.get(r)?.signal : void 0), l = bo(u), d = pi({
@@ -2485,17 +2485,17 @@ async function As(t) {
       ...r,
       start: u,
       num: Math.min(a, i - u)
-    }, e.push(Da({ ...l, abortSignal: n })), u += a, o += 1;
+    }, e.push(Ma({ ...l, abortSignal: n })), u += a, o += 1;
   }
   return s = (await Promise.all(e)).flat(), s;
 }
 async function Fe(t) {
   const { queryObject: e, queryConfig: i, returnUniqueIdsOnly: a, featureCount: r, noBatch: n, errorStrings: s, abortKey: o, abortSignal: u } = t;
   let c = [];
-  const l = z(e), d = r ?? 1, f = Ha(l);
+  const l = z(e), d = r ?? 1, f = ja(l);
   if (n !== !0 && d > f && l?.capabilities?.query.supportsPagination) {
     let m = 0, y = 0;
-    const p = Math.ceil(d / f), g = Math.ceil(p / W.maxParallelRequests), h = [];
+    const p = Math.ceil(d / f), g = Math.ceil(p / W.maxParallelRequests), S = [];
     for (; y < g; ) {
       m = y * W.maxParallelRequests * f;
       const v = As({
@@ -2508,10 +2508,10 @@ async function Fe(t) {
         abortKey: o,
         abortSignal: u
       });
-      h.push(v), y += 1;
+      S.push(v), y += 1;
     }
-    c = (await Promise.all(h)).flat();
-  } else (Number.isNaN(d) || d >= 0) && (c = await Da({
+    c = (await Promise.all(S)).flat();
+  } else (Number.isNaN(d) || d >= 0) && (c = await Ma({
     queryObject: e,
     queryConfig: i,
     returnUniqueIdsOnly: a,
@@ -2539,7 +2539,7 @@ function ws(t) {
     e !== void 0 && e.abort(), Ge.set(t, new AbortController());
   }
 }
-function Oa(t) {
+function Da(t) {
   return {
     lowerBoundaryAlias: `charts_lower_boundary_${t}`,
     upperBoundaryAlias: `charts_upper_boundary_${t}`
@@ -2640,23 +2640,23 @@ async function Os(t) {
     typeKey: y,
     typeValue: p,
     fieldValue: g,
-    slopePropertyList: h,
-    interceptPropertyList: x,
+    slopePropertyList: S,
+    interceptPropertyList: b,
     r2PropertyList: v
-  } = bs, b = `[{"${y}": "${p}", "${g}":"${u},${c}"}]`, B = await Cs({
+  } = bs, x = `[{"${y}": "${p}", "${g}":"${u},${c}"}]`, B = await Cs({
     queryObject: i,
     queryConfig: r,
     outputFormat: m,
     dataFormat: f,
-    outAnalytics: b,
+    outAnalytics: x,
     errorStrings: n,
     abortSignal: s
   });
   if (B !== void 0) {
     let N = Number.NaN, T = Number.NaN;
-    const { expr: w } = zt(B, h), { expr: P } = zt(B, x), { expr: A } = zt(B, v);
-    w !== void 0 && Number.isFinite(B[w]) && (N = B[w]), P !== void 0 && Number.isFinite(B[P]) && (T = B[P]), A !== void 0 && Number.isFinite(B[A]) && (l = B[A]);
-    const { dataContextXMinField: I, dataContextXMaxField: L, dataContextYMinField: O, dataContextYMaxField: V } = C.scatterplotAggregationFields, $ = e.get(I) ?? Number.NaN, M = e.get(L) ?? Number.NaN, q = e.get(O) ?? Number.NaN, G = e.get(V) ?? Number.NaN, X = (M - $) / 100;
+    const { expr: w } = zt(B, S), { expr: L } = zt(B, b), { expr: A } = zt(B, v);
+    w !== void 0 && Number.isFinite(B[w]) && (N = B[w]), L !== void 0 && Number.isFinite(B[L]) && (T = B[L]), A !== void 0 && Number.isFinite(B[A]) && (l = B[A]);
+    const { dataContextXMinField: I, dataContextXMaxField: P, dataContextYMinField: O, dataContextYMaxField: V } = C.scatterplotAggregationFields, $ = e.get(I) ?? Number.NaN, M = e.get(P) ?? Number.NaN, q = e.get(O) ?? Number.NaN, G = e.get(V) ?? Number.NaN, X = (M - $) / 100;
     let H = $ - X, ae = Number.NaN;
     for (; !(ae >= q && ae <= G) && H <= M; )
       H += X, ae = N * H + T;
@@ -2670,17 +2670,17 @@ async function Os(t) {
   }
   return { r2: l, trendLinePoints: d };
 }
-function Ia(t) {
+function Oa(t) {
   const { data: e, chartConfig: i } = t, a = i.series[0], { x: r, y: n } = a;
   let { r2: s, trendLinePoints: o } = C.scatterplotSeries;
   const u = Ds({ data: e, x: r, y: n });
   if (u !== void 0) {
-    const c = jr(u), l = Hr(c);
-    s = c.m === 0 ? 0 : zr(u, l), o = Ms({ x: r, y: n, trendlineXToY: l, data: e });
+    const c = _r(u), l = jr(c);
+    s = c.m === 0 ? 0 : Hr(u, l), o = Ms({ x: r, y: n, trendlineXToY: l, data: e });
   }
   return { r2: s, trendLinePoints: o };
 }
-async function Ea(t) {
+async function Ia(t) {
   const e = await Ps(t), { chartConfig: i } = t, a = i.series[0], { x: r, y: n } = a, { r2: s } = C.scatterplotSeries, o = [
     { [r]: Number.NaN, [n]: Number.NaN },
     { [r]: Number.NaN, [n]: Number.NaN }
@@ -2692,7 +2692,7 @@ async function Ea(t) {
     } catch {
       c = !0;
     }
-  return (!e || c) && (u = Ia(t)), u;
+  return (!e || c) && (u = Oa(t)), u;
 }
 const Is = 50, Es = 4194304;
 async function qs(t) {
@@ -2742,7 +2742,7 @@ async function Rs(t) {
     sortingField: e.series[0].x,
     orderBy: ye.Ascending
   });
-  const l = /* @__PURE__ */ new Map(), { r2: d, trendLinePoints: f } = n !== !1 ? await Ea({
+  const l = /* @__PURE__ */ new Map(), { r2: d, trendLinePoints: f } = n !== !1 ? await Ia({
     data: c,
     statsMap: l,
     queryConfig: i,
@@ -2769,7 +2769,7 @@ function ks(t) {
       }), c !== Number.MAX_SAFE_INTEGER && l !== Number.MIN_SAFE_INTEGER && d !== Number.MAX_SAFE_INTEGER && f !== Number.MIN_SAFE_INTEGER && (r = {
         xBandId: o,
         yBandId: u,
-        pixelRanges: new la({ xmin: c, xmax: l, ymin: d, ymax: f })
+        pixelRanges: new Yr({ xmin: c, xmax: l, ymin: d, ymax: f })
       });
     } else if (o !== void 0 && o === u) {
       let c = Number.MAX_SAFE_INTEGER, l = Number.MIN_SAFE_INTEGER;
@@ -2886,91 +2886,92 @@ function Oi(t, e) {
   } : i = { groupKey: t, display: t, original: t }, i;
 }
 async function js(t) {
-  const { layer: e, geometry: i, view: a, abortKey: r, abortSignal: n } = t;
-  e.loaded || await e.load({ signal: n });
-  const s = await ct(e, n), o = dt(i) ?? e.fullExtent;
-  let u = s?.attributeTable;
-  if (!(o instanceof la && o.equals(e.fullExtent))) {
-    const l = a ? new ua({
-      x: a.resolution,
-      y: a.resolution,
-      spatialReference: a.spatialReference
+  const { layer: e, geometry: i, filterByViewExtent: a, view: r, abortKey: n, abortSignal: s } = t;
+  e.loaded || await e.load({ signal: s });
+  const o = await ct(e, s), u = dt(i) ?? e.fullExtent;
+  let c = o?.attributeTable;
+  if (a) {
+    const l = r ? new la({
+      x: r.resolution,
+      y: r.resolution,
+      spatialReference: r.spatialReference
     }) : void 0;
-    u = await Ur(
+    c = await Gr(
       e,
       {
-        geometry: o,
+        geometry: u,
         pixelSize: l,
         downsampleOnly: !0
       },
       {
-        signal: n ?? (r !== void 0 ? Ge.get(r)?.signal : void 0)
+        signal: s ?? (n !== void 0 ? Ge.get(n)?.signal : void 0)
       }
     );
   }
-  return u;
+  return c;
 }
 async function Hs(t) {
-  const { chartConfig: e, queryConfig: i, queryObject: a, view: r, abortKey: n, abortSignal: s } = t;
-  let o;
+  const { chartConfig: e, queryConfig: i, queryObject: a, filterByViewExtent: r, view: n, abortKey: s, abortSignal: o } = t;
+  let u;
   if (a === void 0)
     throw new Error("QueryObject is undefined!");
-  const u = z(a);
-  if (!ie(u))
+  const c = z(a);
+  if (!ie(c))
     throw new re(le.LayerNotSupported);
-  const c = await js({
-    layer: u,
+  const l = await js({
+    layer: c,
     geometry: i.geometry,
-    view: r,
-    abortKey: n,
-    abortSignal: s
-  }), l = c?.features;
-  if (!c || !l)
-    o = {
+    filterByViewExtent: r,
+    view: n,
+    abortKey: s,
+    abortSignal: o
+  }), d = l?.features;
+  if (!l || !d)
+    u = {
       valid: !1,
       invalidType: j.BadData
     };
   else {
-    const d = e.series;
-    if (!d || d.length === 0 || l.length === 0)
-      o = {
+    const f = e.series;
+    if (!f || f.length === 0 || d.length === 0)
+      u = {
         valid: !0
       };
     else {
-      const f = i.groupByFieldsForStatistics?.[0] ?? "", m = d.some((g) => g.query?.fetchNullValues), y = /* @__PURE__ */ new Map();
-      for (const g of l) {
-        const { groupKey: h } = Oi(g.attributes[f], m);
-        h === C.nullValue && !m || (y.has(h) || y.set(h, []), y.get(h).push(g.attributes));
+      const m = i.groupByFieldsForStatistics?.[0] ?? "", y = f.some((S) => S.query?.fetchNullValues), p = /* @__PURE__ */ new Map();
+      for (const S of d) {
+        const { groupKey: b } = Oi(S.attributes[m], y);
+        b === C.nullValue && !y || (p.has(b) || p.set(b, []), p.get(b).push(S.attributes));
       }
-      const p = [];
-      y.forEach((g) => {
-        const h = {}, x = g[0][f], { display: v, original: b } = Oi(x, m);
-        h[f] = v, h[C.xAxisField] = v, h[C.originalCategoryValue] = b, d.forEach((B) => {
-          const N = B.query?.outStatistics?.[0];
-          if (!N) {
-            const { name: L } = B;
-            h[L] = g[0][L];
+      const g = [];
+      p.forEach((S) => {
+        const b = {}, v = S[0][m], { display: x, original: B } = Oi(v, y);
+        b[m] = x, b[C.xAxisField] = x, b[C.originalCategoryValue] = B, f.forEach((N) => {
+          const T = N.query?.outStatistics?.[0];
+          if (!T) {
+            const { name: O } = N;
+            b[O] = S[0][O];
             return;
           }
-          let T = g;
-          const w = B.query?.where;
-          w && (T = g.filter((L) => Qs(L, w)));
-          const P = N.statisticType, A = N.onStatisticField, I = N.outStatisticFieldName;
-          h[I] = _s({
-            features: T,
-            aggregationType: P,
-            onField: A
+          let w = S;
+          const L = N.query?.where;
+          L && (w = S.filter((O) => Qs(O, L)));
+          const A = T.statisticType, I = T.onStatisticField, P = T.outStatisticFieldName;
+          b[P] = _s({
+            features: w,
+            aggregationType: A,
+            onField: I
           });
-        }), p.push(h);
-      }), o = {
+        }), g.push(b);
+      }), u = {
         valid: !0,
         data: {
-          dataItems: p
+          dataItems: g
         }
       };
     }
   }
-  return o;
+  return u;
 }
 async function gd(t) {
   const { layer: e, category: i, splitByField: a } = t, s = (await ct(e))?.attributeTable?.features, o = a !== void 0;
@@ -3025,21 +3026,21 @@ function Gs(t) {
   }
   return r;
 }
-const qa = "PixelID", Us = "Pixel ID", Ys = [
-  S.BarSeries,
-  S.HistogramSeries,
-  S.ScatterSeries
+const Ea = "PixelID", Us = "Pixel ID", Ys = [
+  h.BarSeries,
+  h.HistogramSeries,
+  h.ScatterSeries
 ];
 async function pd(t) {
   let e = !1;
   const { config: i, layer: a, abortSignal: r } = t;
-  if (Dr(Ys, i))
+  if (Mr(Ys, i))
     switch (_(i?.series)) {
-      case S.BarSeries:
+      case h.BarSeries:
         a.loaded || await a.load({ signal: r }), e = !!(await ct(a, r))?.attributeTable;
         break;
-      case S.HistogramSeries:
-      case S.ScatterSeries:
+      case h.HistogramSeries:
+      case h.ScatterSeries:
         e = !0;
         break;
     }
@@ -3048,7 +3049,7 @@ async function pd(t) {
 async function Zs(t) {
   const { layer: e, chartConfig: i } = t;
   let a;
-  return ie(e) ? a = e : i?.iLayer?.layerType === "ArcGISImageServiceLayer" ? a = await $a(i.iLayer) : i?.iLayer?.layerType === "ArcGISTiledImageServiceLayer" && (a = await ka(i.iLayer)), a;
+  return ie(e) ? a = e : i?.iLayer?.layerType === "ArcGISImageServiceLayer" ? a = await Ra(i.iLayer) : i?.iLayer?.layerType === "ArcGISTiledImageServiceLayer" && (a = await $a(i.iLayer)), a;
 }
 function Xs(t) {
   let e;
@@ -3065,13 +3066,13 @@ function Xs(t) {
   }
   return e;
 }
-function Va(t) {
+function qa(t) {
   if (!t.loaded)
     throw new Error("Raster layer must be loaded to get its ID field name");
   const i = Rt(t)?.attributeTable?.fields.find((a) => a.type === "oid");
-  return i ? i.name : qa;
+  return i ? i.name : Ea;
 }
-function Ra(t) {
+function Va(t) {
   const { layer: e, rasterInfo: i, popupTemplateFieldInfosEnabled: a } = t;
   if (!e.loaded)
     throw new Error("Raster layer must be loaded to get its fields info");
@@ -3094,7 +3095,7 @@ function Ra(t) {
         )?.label;
         return d && d !== l.name && (l.alias = d), l;
       }), n = [{
-        name: qa,
+        name: Ea,
         alias: Us,
         type: U.OID
       }, ...o];
@@ -3105,14 +3106,14 @@ function Ra(t) {
   return n;
 }
 async function ct(t, e) {
-  return t.loaded || await t.load({ signal: e }), Qr(t) ? Rt(t) ?? void 0 : await t.generateRasterInfo(t.rasterFunction, { signal: e });
+  return t.loaded || await t.load({ signal: e }), kr(t) ? Rt(t) ?? void 0 : await t.generateRasterInfo(t.rasterFunction, { signal: e });
 }
 async function hd(t, e) {
   t.loaded || await t.load();
   const i = await ct(t);
-  return Ra({ layer: t, rasterInfo: i, popupTemplateFieldInfosEnabled: e });
+  return Va({ layer: t, rasterInfo: i, popupTemplateFieldInfosEnabled: e });
 }
-const $a = It(
+const Ra = It(
   async (t, e) => {
     const i = {}, a = t.layerDefinition;
     i.definitionExpression = a?.definitionExpression, i.id = t.id, t.url !== void 0 && (i.url = t.url), t.itemId !== void 0 && t.layerDefinition?.id !== void 0 && (i.portalItem = { id: t.itemId });
@@ -3121,7 +3122,7 @@ const $a = It(
   },
   (t) => JSON.stringify(t, Object.keys(t).sort())
   // stringify with sorted keys
-), ka = It(
+), $a = It(
   async (t, e) => {
     const i = {};
     i.id = t.id, t.url !== void 0 && (i.url = t.url), t.itemId !== void 0 && (i.portalItem = { id: t.itemId });
@@ -3155,21 +3156,21 @@ const $a = It(
   const { chartConfig: e, layer: i, selectionDataItems: a } = t, r = _(e.series);
   let n;
   switch (r) {
-    case S.BarSeries:
+    case h.BarSeries:
       n = Gs({
         chartConfig: e,
         layer: i,
         selectionDataItems: a
       });
       break;
-    case S.HistogramSeries:
+    case h.HistogramSeries:
       n = hs({
         chartConfig: e,
         layer: i,
         selectionDataItems: a
       });
       break;
-    case S.ScatterSeries:
+    case h.ScatterSeries:
       n = ks({
         chartConfig: e,
         layer: i,
@@ -3194,7 +3195,7 @@ async function Ks(t) {
         autoResample: !0,
         maxPixelCount: r,
         skipFactor: a
-      }, d = await Yr(u, l, { signal: o });
+      }, d = await Ur(u, l, { signal: o });
       s = Ji.fromJSON(d.featureSet).features;
     } catch {
       s = [];
@@ -3244,7 +3245,7 @@ const yi = It(
       r = t.layerDefinition;
     const n = {};
     if (a !== void 0) {
-      if (n.source = Ji.fromJSON(a).features, r?.fields !== void 0 && (n.fields = r.fields.map((o) => wr.fromJSON(o))), r?.objectIdField !== void 0 && (n.objectIdField = r.objectIdField), r?.geometryType !== void 0) {
+      if (n.source = Ji.fromJSON(a).features, r?.fields !== void 0 && (n.fields = r.fields.map((o) => Ar.fromJSON(o))), r?.objectIdField !== void 0 && (n.objectIdField = r.objectIdField), r?.geometryType !== void 0) {
         const o = Yi.fromJSON({
           geometryType: r.geometryType
         });
@@ -3257,7 +3258,7 @@ const yi = It(
       const o = r.drawingInfo;
       o?.renderer !== void 0 && (n.renderer = Xi.fromJSON(o.renderer));
     }
-    const s = new Tr(n);
+    const s = new Nr(n);
     return await s.load({ signal: e }), s;
   },
   (t) => JSON.stringify(t)
@@ -3270,10 +3271,10 @@ async function Fd(t, e) {
       i = await yi(t, e);
       break;
     case "ArcGISImageServiceLayer":
-      i = await $a(t, e);
+      i = await Ra(t, e);
       break;
     case "ArcGISTiledImageServiceLayer":
-      i = await ka(t, e);
+      i = await $a(t, e);
       break;
     case "WCS":
       i = await Js(t, e);
@@ -3284,7 +3285,7 @@ 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, chartConfig: a, filterByViewExtent: r, abortSignal: n } = t, s = ie(e) || Qr(a);
   let o;
   if (s)
     o = await Zs(t);
@@ -3299,7 +3300,7 @@ function Ce(t, e) {
   let a = [];
   if (i !== void 0) {
     const r = e === !0 && i?.popupTemplate?.fieldInfos !== void 0;
-    ie(i) ? a = Ra({ layer: i, popupTemplateFieldInfosEnabled: e }) : a = i.fields.map((n) => {
+    ie(i) ? a = Va({ layer: i, popupTemplateFieldInfosEnabled: e }) : a = i.fields.map((n) => {
       const s = n.toJSON();
       if (r) {
         const o = i.popupTemplate?.fieldInfos?.find(
@@ -3318,7 +3319,7 @@ function xd(t, e = []) {
 function $t(t) {
   let e, i = !1;
   if (ie(t))
-    e = [Va(t)];
+    e = [qa(t)];
   else {
     const a = ge(t);
     a && ("uniqueIdFields" in a && a.uniqueIdFields && a.uniqueIdFields.length > 0 ? e = a.uniqueIdFields : (e = [a.objectIdField], i = !0));
@@ -3328,7 +3329,7 @@ function $t(t) {
 function ve(t) {
   let e = "", i = !1;
   if (ie(t))
-    e = Va(t);
+    e = qa(t);
   else if (t) {
     const a = $t(t);
     i = a.isTraditionalTypeOID, a.idFields && (e = a.idFields[0]);
@@ -3372,7 +3373,7 @@ function ai(t, e) {
   let i;
   if (e) {
     const r = z(t).getFieldDomain(e);
-    r instanceof Ar && (i = r);
+    r instanceof Tr && (i = r);
   }
   return i;
 }
@@ -3384,11 +3385,11 @@ function Ii(t) {
   const { queryObject: e, fieldName: i, fieldValue: a } = t;
   return ie(e) ? void 0 : ri(a, ai(e, i));
 }
-async function Qa(t) {
+async function ka(t) {
   let e = [];
-  return t && !ge(t)?.isTable && t.fieldsIndex && (e = await Lr.getRendererFields(t.renderer, t.fieldsIndex)), e;
+  return t && !ge(t)?.isTable && t.fieldsIndex && (e = await wr.getRendererFields(t.renderer, t.fieldsIndex)), e;
 }
-function _a(t) {
+function Qa(t) {
   const e = "/rest/services";
   let i = t.toLowerCase();
   const a = i.indexOf(e);
@@ -3398,7 +3399,7 @@ async function ro(t, e) {
   let i = !0;
   const a = ".arcgis.com/", r = t?.url, n = r?.includes(a);
   if (r && n && ge(t)?.sourceJSON?.serviceItemId !== void 0) {
-    const s = _a(r);
+    const s = Qa(r);
     try {
       const o = (await wt(s, { query: { f: "json" }, signal: e })).data;
       if (o.owningTenant !== void 0 && o.owningSystemUrl !== void 0) {
@@ -3406,7 +3407,7 @@ async function ro(t, e) {
           authMode: "auto",
           query: { f: "json" },
           signal: e
-        })).data, l = new Pr({ sourceJSON: c });
+        })).data, l = new Lr({ sourceJSON: c });
         await l.load({ signal: e }), i = l?.sourceJSON?.subscriptionInfo?.dataStoreLevel === void 0;
       }
     } catch {
@@ -3429,7 +3430,7 @@ function oo(t) {
     (n) => no({ queryObject: i, fieldToMatch: n, returnUndefinedIfNotFound: a })
   )), r;
 }
-function ja(t) {
+function _a(t) {
   const { queryObject: e, chartConfig: i, runtimeDataFilters: a, ignoreViewExtent: r, view: n } = t, { series: s, dataFilters: o } = i, {
     where: u,
     gdbVersion: c,
@@ -3441,15 +3442,15 @@ function ja(t) {
     spatialRelationship: p
   } = o ?? {}, {
     where: g,
-    gdbVersion: h,
-    timeExtent: x,
+    gdbVersion: S,
+    timeExtent: b,
     geometry: v,
-    distance: b,
+    distance: x,
     units: B,
     objectIds: N,
     spatialRelationship: T
-  } = a ?? {}, w = s[0], { query: P } = w, { where: A } = P ?? {}, I = k(s), L = { ...P };
-  return L.where = Y([u, g]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (L.where = Y([L.where, A])), i.orderOptions?.orderByFields !== void 0 && (L.orderByFields = i.orderOptions.orderByFields), L.gdbVersion = h ?? c, L.timeExtent = mo(n?.timeExtent, x ?? l), L.geometry = ie(e) ? eo({
+  } = a ?? {}, w = s[0], { query: L } = w, { where: A } = L ?? {}, I = k(s), P = { ...L };
+  return P.where = Y([u, g]), I !== F.BarAndLineSplitBy && I !== F.BoxPlotMonoFieldAndSplitBy && I !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && I !== F.BoxPlotMultiFieldsAndSplitBy && I !== F.BarAndLineSplitByNoAggregation && (P.where = Y([P.where, A])), i.orderOptions?.orderByFields !== void 0 && (P.orderByFields = i.orderOptions.orderByFields), P.gdbVersion = S ?? c, P.timeExtent = mo(n?.timeExtent, b ?? l), P.geometry = ie(e) ? eo({
     queryObject: e,
     defaultGeometry: v ?? d,
     ignoreViewExtent: r,
@@ -3458,11 +3459,11 @@ function ja(t) {
     queryObject: e,
     defaultGeometry: v ?? d,
     ignoreViewExtent: r
-  }), L.distance = b ?? f, L.units = B ?? m, L.objectIds = N ?? y, L.spatialRelationship = T ?? p, P?.outStatistics?.[0]?.statisticType === D.Count && (L.returnDistinctValues = P?.returnDistinctValues ?? !1), L?.outStatistics?.forEach((O) => {
+  }), P.distance = x ?? f, P.units = B ?? m, P.objectIds = N ?? y, P.spatialRelationship = T ?? p, L?.outStatistics?.[0]?.statisticType === D.Count && (P.returnDistinctValues = L?.returnDistinctValues ?? !1), P?.outStatistics?.forEach((O) => {
     fi(O) && !("statisticParameters" in O) && (O.statisticParameters = {
       value: W.defaultStatParameterValue
     });
-  }), L;
+  }), P;
 }
 async function Td(t) {
   let e = [];
@@ -3474,7 +3475,7 @@ async function lo(t, e) {
   const r = t.series;
   let n = e;
   if (t.iLayer?.layerType === "ArcGISFeatureLayer" && (n = await yi(t.iLayer)), n !== void 0) {
-    const s = r[0].x ?? "", o = r.map((f) => "y" in f ? f.y : "").flat(), u = te(t.series[0].query?.where), c = Or(t), l = t?.series.map((f) => {
+    const s = r[0].x ?? "", o = r.map((f) => "y" in f ? f.y : "").flat(), u = te(t.series[0].query?.where), c = Dr(t), l = t?.series.map((f) => {
       const m = f.query?.outStatistics?.map((y) => y.onStatisticField) ?? [];
       return m?.length > 0 ? m : "";
     }).flat();
@@ -3513,7 +3514,7 @@ function Ad(t) {
   return a;
 }
 const wd = {
-  getServerRestInfo: _a
+  getServerRestInfo: Qa
 };
 async function kt(t, e) {
   await t.load({ signal: e }), (na(t) || sa(t)) && await t.generateRasterInfo(t.rasterFunction, {
@@ -3524,7 +3525,7 @@ function fo(t) {
   const e = !t.geometry || t.geometry.type === "extent", i = (t.where ?? "").toUpperCase(), a = !i.includes("CURRENT_TIMESTAMP") && !i.includes("CURRENT_DATE") && !i.includes("CURRENT_TIME");
   return e && a;
 }
-function Ha(t) {
+function ja(t) {
   let e = W.maxRecords;
   if (t && "sourceJSON" in t && t.sourceJSON?.maxRecordCount) {
     const { sourceJSON: i } = t;
@@ -3565,29 +3566,29 @@ function dt(t) {
   let e;
   return t !== void 0 && (e = Yi.fromJSON(t)), e;
 }
-function za(t) {
+function Ha(t) {
   return t === void 0 ? ["*"] : Array.from(new Set(t));
 }
 function Qt(t) {
   const { queryType: e, queryObject: i, queryConfig: a, view: r, configTimeZone: n, dateField: s, useViewTimeZone: o } = t, { where: u, outStatistics: c, geometry: l, distance: d, units: f, timeExtent: m, returnDistinctValues: y } = a ?? {}, p = z(i);
-  let h = ge(p)?.createQuery() ?? new Br(), x;
+  let S = ge(p)?.createQuery() ?? new vr(), b;
   const v = $t(p).idFields;
-  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && v && (x = `${v} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (h = new vr(h.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
+  if (e === "AttributeBinsQuery" && a?.objectIds?.[0] !== void 0 && v && (b = `${v} IN (${a.objectIds.join(",")})`), e === "AttributeBinsQuery" && (S = new Cr(S.toJSON()), Ce(i).find((T) => T.name === s)?.type !== U.DateOnly)) {
     const T = Intl.DateTimeFormat().resolvedOptions().timeZone, w = o && r && "timeZone" in r ? r.timeZone : void 0;
-    let P = n ?? w ?? T;
-    P === "unknown" ? P = "Etc/UTC" : P === "system" && (P = T), h.outTimeZone = P;
+    let L = n ?? w ?? T;
+    L === "unknown" ? L = "Etc/UTC" : L === "system" && (L = T), S.outTimeZone = L;
   }
-  if (h.where = Y([h.where, u, x]), "returnDistinctValues" in h && (h.returnDistinctValues = y ?? !1), c !== void 0) {
+  if (S.where = Y([S.where, u, b]), "returnDistinctValues" in S && (S.returnDistinctValues = y ?? !1), c !== void 0) {
     const B = gn(p);
-    h.outStatistics = c.filter(
+    S.outStatistics = c.filter(
       (N) => N.statisticType !== D.EnvelopeAggregate || B
-    ).map((N) => Nr.fromJSON(N));
+    ).map((N) => Br.fromJSON(N));
   }
-  const b = dt(l);
-  return b !== void 0 && (h.geometry = b, a?.spatialRelationship && (h.spatialRelationship = a.spatialRelationship), fa(p) && (d !== void 0 && (h.distance = d), f !== void 0 && (h.units = f))), m && (h.timeExtent = new Zi({
+  const x = dt(l);
+  return x !== void 0 && (S.geometry = x, a?.spatialRelationship && (S.spatialRelationship = a.spatialRelationship), da(p) && (d !== void 0 && (S.distance = d), f !== void 0 && (S.units = f))), m && (S.timeExtent = new Zi({
     start: m?.[0],
     end: m?.[1]
-  })), fo(h) && (h.cacheHint = !0), h;
+  })), fo(S) && (S.cacheHint = !0), S;
 }
 function go(t) {
   let e;
@@ -3602,7 +3603,7 @@ function go(t) {
   return e;
 }
 function po(t) {
-  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: p } = a, g = z(e), h = Qt({
+  const { queryObject: e, queryConfig: i, temporalBinning: a, dateField: r, splitByField: n, axisTimeZone: s, view: o, syncViewTimeZone: u } = t, { unit: c, size: l, timeAggregationType: d, start: f, end: m, offset: y, outTimeZone: p } = a, g = z(e), S = Qt({
     queryType: "AttributeBinsQuery",
     queryObject: e,
     queryConfig: i,
@@ -3611,23 +3612,23 @@ function po(t) {
     view: o,
     dateField: r,
     useViewTimeZone: u ?? !1
-  }), x = Oa(r);
-  if (h.lowerBoundaryAlias = x.lowerBoundaryAlias, h.upperBoundaryAlias = x.upperBoundaryAlias, h.binParameters = {
+  }), b = Da(r);
+  if (S.lowerBoundaryAlias = b.lowerBoundaryAlias, S.upperBoundaryAlias = b.upperBoundaryAlias, S.binParameters = {
     type: "date",
     field: r,
     interval: { unit: c, value: l },
     start: f,
     end: m,
     offset: y ? { unit: y.unit, value: y.size } : null
-  }, h.binParameters.type === "date" && (g?.capabilities?.queryAttributeBins?.supportsSnapToData && (h.binParameters.snapToData = go(d)), g?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (h.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
-    const b = ge(g)?.fields.find((B) => B.name === n)?.type;
-    (!b || b === "string" || b === "integer" || b === "small-integer" || b === "big-integer" || b === "double") && (h.binParameters.stackBy = {
+  }, S.binParameters.type === "date" && (g?.capabilities?.queryAttributeBins?.supportsSnapToData && (S.binParameters.snapToData = go(d)), g?.capabilities?.queryAttributeBins?.supportsReturnFullIntervalBin && (S.binParameters.returnFullIntervalBin = !0)), !oe(n)) {
+    const x = ge(g)?.fields.find((B) => B.name === n)?.type;
+    (!x || x === "string" || x === "integer" || x === "small-integer" || x === "big-integer" || x === "double") && (S.binParameters.stackBy = {
       type: "field",
       value: n,
-      valueType: b === "string" ? "string" : "integer"
+      valueType: x === "string" ? "string" : "integer"
     });
   }
-  return h;
+  return S;
 }
 function gi(t) {
   const {
@@ -3668,7 +3669,7 @@ function gi(t) {
       break;
   }
   if (l) {
-    const m = o ? ` ${La({
+    const m = o ? ` ${wa({
       dataTimeZone: n,
       runsOnClientQueryEngine: s,
       outTimeZone: r
@@ -3742,8 +3743,8 @@ function So(t) {
     xOrYFieldType: m,
     addIntervalStatement: !1,
     includeLeapDay: u
-  }), { field: h, expression: x, start: v, end: b } = g;
-  h ? p.binParameters.field = h : x && (p.binParameters.expression = x, p.binParameters.expressionValueType = "integer", p.binParameters.type === "fixed-interval" && (v !== void 0 && (p.binParameters.start = v), b !== void 0 && (p.binParameters.end = b)));
+  }), { field: S, expression: b, start: v, end: x } = g;
+  S ? p.binParameters.field = S : b && (p.binParameters.expression = b, p.binParameters.expressionValueType = "integer", p.binParameters.type === "fixed-interval" && (v !== void 0 && (p.binParameters.start = v), x !== void 0 && (p.binParameters.end = x)));
   const B = Ei({
     temporalBinning: s,
     xOrY: r,
@@ -3764,7 +3765,7 @@ function Fo(t) {
     queryObject: e,
     queryConfig: i,
     useViewTimeZone: !1
-  }), l = Ma(s, o);
+  }), l = Pa(s, o);
   return c.lowerBoundaryAlias = l.lowerBoundaryAlias, c.upperBoundaryAlias = l.upperBoundaryAlias, c.binParameters = {
     type: "fixed-interval",
     field: s,
@@ -3788,18 +3789,18 @@ function pi(t) {
   });
   l.returnGeometry = !1;
   const d = z(e);
-  return l.outFields = za(c), l.groupByFieldsForStatistics = r ?? l.groupByFieldsForStatistics, l.orderByFields = n ?? [], l.objectIds = i?.objectIds, a !== void 0 && (l.maxRecordCountFactor = a), s !== void 0 && s !== "" && (l.gdbVersion = s), u !== void 0 && (l.num = u), o !== void 0 && (l.start = o, l.num = l.num ?? Ha(d)), l;
+  return l.outFields = Ha(c), l.groupByFieldsForStatistics = r ?? l.groupByFieldsForStatistics, l.orderByFields = n ?? [], l.objectIds = i?.objectIds, a !== void 0 && (l.maxRecordCountFactor = a), s !== void 0 && s !== "" && (l.gdbVersion = s), u !== void 0 && (l.num = u), o !== void 0 && (l.start = o, l.num = l.num ?? ja(d)), l;
 }
 function bo(t) {
   return t && "sourceJSON" in t && t.sourceJSON?.advancedQueryCapabilities?.supportsMaxRecordCountFactor === !0 ? W.maxRecordCountFactor : void 0;
 }
 const Pd = {
-  sanitizeOutFields: za
+  sanitizeOutFields: Ha
 };
 function xo(t = Z.None, e) {
   return t === Z.None || t === Z.Log && e > 0 || t === Z.Sqrt && e >= 0;
 }
-function Wa(t, e) {
+function za(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;
 }
@@ -3826,7 +3827,7 @@ function vo(t) {
   }
   return e;
 }
-function Ga(t) {
+function Wa(t) {
   let e = "field";
   switch (t) {
     case Z.Log:
@@ -3870,8 +3871,8 @@ async function Bo(t) {
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), h = g.get(d) ?? Number.NaN, x = g.get(f) ?? Number.NaN, v = g.get(m) ?? Number.NaN, b = g.get(y) ?? Number.NaN;
-  return { countExcludingNulls: x, countIncludingNulls: h, min: v, max: b };
+  }), S = g.get(d) ?? Number.NaN, b = g.get(f) ?? Number.NaN, v = g.get(m) ?? Number.NaN, x = g.get(y) ?? Number.NaN;
+  return { countExcludingNulls: b, countIncludingNulls: S, min: v, max: x };
 }
 async function No(t) {
   const { queryConfig: e, chartConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = i.series[0], { x: u, dataTransformationType: c } = o;
@@ -3883,8 +3884,8 @@ async function No(t) {
     errorStrings: r,
     abortKey: n,
     abortSignal: s
-  }), p = xo(c, m), g = f < 2 || m === y, h = { ...e };
-  return h.where = Y([h.where, `${u} is not null`]), {
+  }), p = xo(c, m), g = f < 2 || m === y, S = { ...e };
+  return S.where = Y([S.where, `${u} is not null`]), {
     rawData: l,
     dataCompatibleWithTransformation: p,
     dataCountIncompatible: g,
@@ -3909,7 +3910,7 @@ function Ao(t) {
   };
   return u !== Z.None && (c = {
     ...c,
-    normalizationType: Ga(u)
+    normalizationType: Wa(u)
   }), c;
 }
 function wo(t) {
@@ -3929,7 +3930,7 @@ function wo(t) {
     field: c,
     minValue: n,
     maxValue: s,
-    numBins: l ?? qr,
+    numBins: l ?? Er,
     classificationMethod: "equal-interval",
     // excluding the filters like 1=tionMethod: "equal-interval",1 from the sqlWhere. It's causing query failures (see https://devtopia.esri.com/WebGIS/arcgis-charts/issues/6677)
     sqlWhere: Ie(o.where) ? void 0 : o.where,
@@ -3938,7 +3939,7 @@ function wo(t) {
   };
   return d !== Z.None && (f = {
     ...f,
-    normalizationType: Ga(d)
+    normalizationType: Wa(d)
   }), f;
 }
 function Lo(t, e) {
@@ -3965,36 +3966,36 @@ async function Po(t) {
     queryConfig: i,
     abortSignal: u
   });
-  let h;
-  if (p !== void 0 && (h = new Ti({
+  let S;
+  if (p !== void 0 && (S = new Ti({
     geometry: p.extent
-  }), p.extent !== void 0 && fa(f))) {
+  }), p.extent !== void 0 && da(f))) {
     const { distance: A, units: I } = i;
-    A !== void 0 && (h.distance = A), I !== void 0 && (h.units = I);
+    A !== void 0 && (S.distance = A), I !== void 0 && (S.units = I);
   }
   if (i.timeExtent) {
     const A = { start: i.timeExtent[0], end: i.timeExtent[1] };
-    h === void 0 ? h = new Ti({ timeExtent: A }) : h.timeExtent = A;
+    S === void 0 ? S = new Ti({ timeExtent: A }) : S.timeExtent = A;
   }
-  g.filter = h;
-  let x;
+  g.filter = S;
+  let b;
   g.outStatisticTypes = { exclude: ["median"] };
   try {
-    x = await Ai(g);
+    b = await Ai(g);
   } catch (A) {
     throw new re(le.QueryFeaturesError, o.errors.queryError, A);
   }
   g.outStatisticTypes = { include: ["median"] };
   try {
     const A = await Ai(g);
-    A?.median && (x.median = A.median);
+    A?.median && (b.median = A.median);
   } catch {
   }
-  x = To(x);
-  const { avg: v, count: b, stddev: B, min: N, max: T, sum: w, median: P } = x;
-  if (b === 0)
+  b = To(b);
+  const { avg: v, count: x, stddev: B, min: N, max: T, sum: w, median: L } = b;
+  if (x === 0)
     d = {
-      ...Wa(l)
+      ...za(l)
     };
   else {
     const A = wo({
@@ -4008,29 +4009,29 @@ async function Po(t) {
       queryConfig: i,
       abortSignal: u
     });
-    A.filter = h;
+    A.filter = S;
     let I;
     try {
-      I = await Cr(A);
+      I = await xr(A);
     } catch (O) {
       throw new re(le.QueryFeaturesError, o.errors.queryError, O);
     }
-    const L = Lo(n, r);
+    const P = Lo(n, r);
     d.data = {
       mean: v,
       stddev: B,
       min: N,
       max: T,
-      median: Number(P),
+      median: Number(L),
       bins: I?.bins,
       count: r,
-      nulls: L,
+      nulls: P,
       sum: w ?? void 0
     }, d.data.bins.length > 0 && (d.data.bins[d.data.bins.length - 1].isLastBin = !0);
   }
   return d;
 }
-async function Ua(t) {
+async function Ga(t) {
   const { chartConfig: e, queryConfig: i, queryObject: a, abortKey: r, abortSignal: n, errorStrings: s, view: o } = t, { series: u } = e, c = u[0];
   let l;
   if (ie(a))
@@ -4050,7 +4051,7 @@ async function Ua(t) {
       abortKey: r,
       abortSignal: n
     });
-    l = { valid: !0 }, !f || m ? l = Wa(c.dataTransformationType, m) : l = await Po({
+    l = { valid: !0 }, !f || m ? l = za(c.dataTransformationType, m) : l = await Po({
       chartConfig: e,
       queryObject: a,
       queryConfig: i,
@@ -4090,7 +4091,7 @@ const qi = {
   groupByCaseEnd: "ELSE 'OUT' END"
 };
 function Md(t) {
-  return _(t.series) !== S.BoxPlotSeries ? C.xAxisField : t.series[0].x;
+  return _(t.series) !== h.BoxPlotSeries ? C.xAxisField : t.series[0].x;
 }
 function Dd(t) {
   const e = ui(t);
@@ -4130,7 +4131,7 @@ const Io = [
   "it-IT"
 ];
 function Id(t) {
-  const { t9nLocale: e } = ze(t ?? document.documentElement), i = Ya(t ?? document.documentElement), a = kr(t ?? document.documentElement) === "rtl";
+  const { t9nLocale: e } = ze(t ?? document.documentElement), i = Ua(t ?? document.documentElement), a = $r(t ?? document.documentElement) === "rtl";
   return { locale: e, formatLocale: i, rtl: a };
 }
 function Ed(t) {
@@ -4163,30 +4164,30 @@ function Eo(t) {
   const e = Array.from(ra);
   return Io.includes(t) && !e.includes(t);
 }
-function Ya(t) {
+function Ua(t) {
   const { lang: e, t9nLocale: i } = ze(t);
   return Eo(e) ? e : i;
 }
 function Dt(t) {
   const { dataInfo: e, chartType: i, subError: a } = t;
   switch (e.valid = !1, i) {
-    case S.BarSeries:
-    case S.ComboLineAndBarSeries:
+    case h.BarSeries:
+    case h.ComboLineAndBarSeries:
       e.invalidType = j.BarElementExceedsLimit;
       break;
-    case S.LineSeries:
+    case h.LineSeries:
       e.invalidType = j.LineChartExceedsLimit;
       break;
-    case S.PieSeries:
+    case h.PieSeries:
       e.invalidType = j.PieChartExceedsLimit;
       break;
-    case S.GaugeSeries:
+    case h.GaugeSeries:
       e.invalidType = j.GaugeExceedsLimit;
       break;
-    case S.BoxPlotSeries:
+    case h.BoxPlotSeries:
       a?.outlierLimit === !0 ? e.invalidType = j.BoxPlotOutliersExceedsLimit : e.invalidType = j.BoxPlotExceedsLimit;
       break;
-    case S.HeatSeries:
+    case h.HeatSeries:
       e.invalidType = j.HeatChartExceedsLimit;
       break;
   }
@@ -4202,7 +4203,7 @@ function $d(t) {
     seriesCount: r,
     queryObject: n,
     filterBySelection: s,
-    formatLocale: o = Ya(document.documentElement),
+    formatLocale: o = Ua(document.documentElement),
     isTemporalChart: u,
     isGaugeChartByFeature: c,
     errorStrings: l
@@ -4213,16 +4214,16 @@ function $d(t) {
   switch (e) {
     case j.BarElementExceedsLimit: {
       g = 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, {
+      let b = Number.NaN, v = Number.NaN, x = "";
+      r !== void 0 && (r <= y.maxBarChartSeriesCount ? r === 1 ? (x = l.errors.uniqueSeriesBarCountCannotExceedLimit, b = y.maxBarUniqueSeriesCountTotal) : r === 2 ? (x = l.errors.twoSeriesBarCountCannotExceedLimit, b = y.maxBarTwoSeriesCountTotal, v = y.maxBarTwoSeriesCountPerSeries) : r > 2 && (x = l.errors.threePlusSeriesBarCountCannotExceedLimit, b = y.maxBarThreePlusSeriesCountTotal, v = y.maxBarThreePlusSeriesCountPerSeries) : (x = l.errors.barSeriesCountCannotExceedLimit, v = y.maxBarChartSeriesCount));
+      const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+      d = Be(x, {
         totalLimit: B,
         seriesLimit: N,
         elementCount: T
       }), f = {
         actualCount: a ?? Number.NaN,
-        totalLimit: x,
+        totalLimit: b,
         seriesLimit: v
       };
       break;
@@ -4230,16 +4231,16 @@ function $d(t) {
     case j.LineChartExceedsLimit:
       {
         g = 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, {
+        let b = Number.NaN, v = Number.NaN, x = "";
+        r !== void 0 && (r <= y.maxLineChartSeriesCount ? r === 1 ? (x = u ? l.errors.uniqueTemporalSeriesLineCountCannotExceedLimit : l.errors.uniqueSeriesLineCountCannotExceedLimit, b = y.maxLineUniqueSeriesCountTotal) : r === 2 ? (x = u ? l.errors.twoTemporalSeriesLineCountCannotExceedLimit : l.errors.twoSeriesLineCountCannotExceedLimit, b = y.maxLineTwoSeriesCountTotal, v = y.maxLineTwoSeriesCountPerSeries) : r > 2 && (x = u ? l.errors.threePlusTemporalSeriesLineCountCannotExceedLimit : l.errors.threePlusSeriesLineCountCannotExceedLimit, b = y.maxLineThreePlusSeriesCountTotal, v = y.maxLineThreePlusSeriesCountPerSeries) : (x = l.errors.lineSeriesCountCannotExceedLimit, v = y.maxLineChartSeriesCount));
+        const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+        d = Be(x, {
           elementCount: T,
           seriesLimit: N,
           totalLimit: B
         }), f = {
           actualCount: a ?? Number.NaN,
-          totalLimit: x,
+          totalLimit: b,
           seriesLimit: v
         };
       }
@@ -4247,16 +4248,16 @@ function $d(t) {
     case j.BoxPlotExceedsLimit:
       {
         g = 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, {
+        let b = Number.NaN, v = Number.NaN, x = "";
+        r !== void 0 && (r <= y.maxBoxPlotSeriesCount ? r === 1 ? (x = l.errors.uniqueSeriesBoxCountCannotExceedLimit, b = y.maxBoxUniqueSeriesCountTotal) : r === 2 ? (x = l.errors.twoSeriesBoxCountCannotExceedLimit, b = y.maxBoxTwoSeriesCountTotal, v = y.maxBoxTwoSeriesCountPerSeries) : r > 2 && (x = l.errors.threePlusBoxLineCountCannotExceedLimit, b = y.maxBoxThreePlusSeriesCountTotal, v = y.maxBoxThreePlusSeriesCountPerSeries) : (x = l.errors.boxSeriesCountCannotExceedLimit, v = y.maxBoxPlotSeriesCount));
+        const B = m.format(b), N = m.format(v), T = a !== void 0 ? m.format(a) : "";
+        d = Be(x, {
           elementCount: T,
           seriesLimit: N,
           totalLimit: B
         }), f = {
           actualCount: a ?? Number.NaN,
-          totalLimit: x,
+          totalLimit: b,
           seriesLimit: v
         };
       }
@@ -4264,19 +4265,19 @@ function $d(t) {
     case j.BoxPlotOutliersExceedsLimit:
       {
         g = l.modalHeaders.tooManyFeatures;
-        const x = l.errors.boxSeriesOutlierCannotExceedLimit, v = y.maxBoxPlotOutlierLimit, b = m.format(v);
-        d = Be(x, {
-          totalLimit: b
+        const b = l.errors.boxSeriesOutlierCannotExceedLimit, v = y.maxBoxPlotOutlierLimit, x = m.format(v);
+        d = Be(b, {
+          totalLimit: x
         }), f = { actualCount: a ?? Number.NaN, totalLimit: v };
       }
       break;
     case j.HeatChartExceedsLimit:
       {
         g = 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, {
+        const b = l.errors.heatChartCannotExceedLimit, v = y.maxHeatChartCellLimit, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(b, {
           featureCount: B,
-          totalLimit: b
+          totalLimit: x
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4286,10 +4287,10 @@ function $d(t) {
     case j.PieChartExceedsLimit:
       {
         g = 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, {
+        const b = l.errors.pieChartSlicesCannotExceedLimit, v = y.maxPieChartSliceCountTotal, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(b, {
           sliceCount: B,
-          totalLimit: b
+          totalLimit: x
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4299,10 +4300,10 @@ function $d(t) {
     case j.GaugeExceedsLimit:
       {
         g = 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, {
+        const b = l.errors.gaugeCannotExceedLimit, v = y.maxGaugeByFeaturesLimit, x = m.format(v), B = a !== void 0 ? m.format(a) : "";
+        d = Be(b, {
           featureCount: B,
-          totalLimit: b
+          totalLimit: x
         }), f = {
           actualCount: a ?? Number.NaN,
           totalLimit: v
@@ -4336,9 +4337,9 @@ function $d(t) {
     case j.BadData:
   }
   if (d === l.errors.defaultInvalidChart && (e === j.BarElementExceedsLimit || e === j.LineChartExceedsLimit || e === j.HeatChartExceedsLimit || e === j.PieChartExceedsLimit || e === j.GaugeExceedsLimit || e === j.BoxPlotExceedsLimit) && typeof a == "number" && typeof r == "number" && a / r > p) {
-    const x = a / r;
+    const b = a / r;
     d = Be(l.errors.categoryCountCannotExceedLimit, {
-      categoryCount: m.format(x),
+      categoryCount: m.format(b),
       maxCategoryCount: m.format(p)
     });
   }
@@ -4386,20 +4387,20 @@ function hi(t) {
           showOutliers: !1,
           standardizeValues: !0
         };
-        let h = K(u);
-        if (o[h] = ni({ mean: d, stdDev: f, value: g }), m === E.Min || m === E.Max) {
+        let S = K(u);
+        if (o[S] = ni({ mean: d, stdDev: f, value: g }), m === E.Min || m === E.Max) {
           u = {
             ...u,
             key: m,
             showOutliers: !0,
             standardizeValues: !0
-          }, h = K(u), u = {
+          }, S = K(u), u = {
             ...u,
             standardizeValues: !1,
             splitByValue: r
           };
-          const x = K(u);
-          g = Number(e[x]), Number.isFinite(g) && (o[h] = ni({
+          const b = K(u);
+          g = Number(e[b]), Number.isFinite(g) && (o[S] = ni({
             mean: d,
             stdDev: f,
             value: g
@@ -4544,21 +4545,21 @@ function Vi(t) {
   let d;
   return u === "outliers" && o !== s ? d = `(${e}<${o} OR ${e}>${s})` : u === "alternativeData" && (o === s ? d = `(${e}=${o})` : d = `(${e}>=${o} AND ${e}<=${s})`), [c, l, d].filter((m) => m !== void 0).join(" AND ");
 }
-function Za(t) {
+function Ya(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 } = Vt();
   let d = [], f = [], m = 1;
   return e.forEach((y, p) => {
-    const { outlierMinThreshold: g, outlierMaxThreshold: h } = jo(y, o);
-    if (typeof g == "number" && typeof h == "number") {
-      const x = {
+    const { outlierMinThreshold: g, outlierMaxThreshold: S } = jo(y, o);
+    if (typeof g == "number" && typeof S == "number") {
+      const b = {
         yField: i,
         outlierMinThreshold: g,
-        outlierMaxThreshold: h
+        outlierMaxThreshold: S
       };
-      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (x.xField = a, x.xValue = di({
+      (r === F.BoxPlotMonoFieldAndCategory || r === F.BoxPlotMultiFieldsAndCategory || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && a !== void 0 && a in y && (b.xField = a, b.xValue = di({
         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(Vi({ ...x, target: "outliers" })), f.push(Vi({ ...x, target: "alternativeData" })), (m % l === 0 || p === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
+      })), (r === F.BoxPlotMonoFieldAndSplitBy || r === F.BoxPlotMultiFieldsAndSplitBy || r === F.BoxPlotMonoFieldAndCategoryAndSplitBy) && n !== void 0 && n in y && (b.splitByField = n, b.splitByValue = y[n]), d.push(Vi({ ...b, target: "outliers" })), f.push(Vi({ ...b, target: "alternativeData" })), (m % l === 0 || p === e.length - 1) && (u.push(Y(d, "OR")), c.push(Y(f, "OR")), d = [], f = []);
     }
     m += 1;
   }), { outliersFilterBatches: u, dataWithoutOutliersFilterBatches: c };
@@ -4595,9 +4596,9 @@ function Ho(t) {
 async function zo(t) {
   const { seriesConfig: e, data: i, uniqueQuery: a, queryObject: r, meanAndStdDevPerField: n, errorStrings: s, abortKey: o, abortSignal: u } = t, c = k(e), l = e[0], { x: d } = l, f = te(l.query?.where), m = z(r), y = ve(m).idField, p = ue(e), g = [];
   for (let v = 0; v < p.length; v += 1) {
-    const b = p[v], { outliersFilterBatches: B } = Za({
+    const x = p[v], { outliersFilterBatches: B } = Ya({
       data: i,
-      yField: b,
+      yField: x,
       x: d,
       chartSubType: c,
       splitByField: f
@@ -4606,8 +4607,8 @@ async function zo(t) {
       const T = B[N];
       if (T !== "") {
         const w = [];
-        d !== C.boxPlot.boxPlotCategory && w.push(d), w.push(b), f !== "" && w.push(f), w.push(y);
-        const P = {
+        d !== C.boxPlot.boxPlotCategory && w.push(d), w.push(x), f !== "" && w.push(f), w.push(y);
+        const L = {
           ...a,
           where: Y([a.where, T]),
           groupByFieldsForStatistics: void 0,
@@ -4619,7 +4620,7 @@ async function zo(t) {
         g.push(
           Fe({
             queryObject: r,
-            queryConfig: P,
+            queryConfig: L,
             featureCount: 1,
             // TODO: pre-count to trigger batching
             errorStrings: s,
@@ -4630,10 +4631,10 @@ async function zo(t) {
       }
     }
   }
-  const h = await Promise.all(g), x = /* @__PURE__ */ new Map();
-  for (let v = 0; v < h.length; v += 1) {
-    const b = h[v], B = p[v];
-    b.forEach((N) => {
+  const S = await Promise.all(g), b = /* @__PURE__ */ new Map();
+  for (let v = 0; v < S.length; v += 1) {
+    const x = S[v], B = p[v];
+    x.forEach((N) => {
       const T = { ...N.attributes };
       if (T[B] !== void 0) {
         d === C.boxPlot.boxPlotCategory && (T[C.boxPlot.boxPlotCategory] = B);
@@ -4657,13 +4658,13 @@ async function zo(t) {
             };
             break;
         }
-        const P = K(w), A = T[B];
-        T[P] = A;
-        const I = `${T[d]}-${T[f]}-${A}`, L = x.get(I);
+        const L = K(w), A = T[B];
+        T[L] = A;
+        const I = `${T[d]}-${T[f]}-${A}`, P = b.get(I);
         if (T[W.uniqueIdsName] = [
-          ...L?.[W.uniqueIdsName] ?? [],
+          ...P?.[W.uniqueIdsName] ?? [],
           T[y]
-        ], delete T[y], fr(c)) {
+        ], delete T[y], dr(c)) {
           const O = K({
             ...w,
             standardizeValues: !0
@@ -4682,11 +4683,11 @@ async function zo(t) {
             stdDev: $
           }));
         }
-        delete T[B], T[C.boxPlot.boxPlotOutlierId] = !0, x.set(I, T);
+        delete T[B], T[C.boxPlot.boxPlotOutlierId] = !0, b.set(I, T);
       }
     });
   }
-  return Array.from(x.values());
+  return Array.from(b.values());
 }
 async function Wo(t) {
   const {
@@ -4701,29 +4702,29 @@ async function Wo(t) {
     abortSignal: c
   } = t;
   let l = [];
-  const { series: d, showMean: f } = n, m = Ci({ showMean: f, seriesConfig: d }), y = k(d), p = Re(n), { x: g } = p, h = te(p.query?.where), x = [];
-  for (let b = 0; b < m.length; b += 1) {
-    const B = m[b], { dataWithoutOutliersFilterBatches: N } = Za({
+  const { series: d, showMean: f } = n, m = Ci({ showMean: f, seriesConfig: d }), y = k(d), p = Re(n), { x: g } = p, S = te(p.query?.where), b = [];
+  for (let x = 0; x < m.length; x += 1) {
+    const B = m[x], { dataWithoutOutliersFilterBatches: N } = Ya({
       data: e,
       yField: B,
       x: g,
       chartSubType: y,
-      splitByField: h
+      splitByField: S
     });
     for (let T = 0; T < N.length; T += 1) {
-      const w = N[T], P = {
+      const w = N[T], L = {
         ...a,
         where: Y([a.where, w])
       };
-      P.outStatistics !== void 0 && (P.outStatistics = P.outStatistics?.filter(
+      L.outStatistics !== void 0 && (L.outStatistics = L.outStatistics?.filter(
         (A) => (A.statisticType === D.Minimum || A.statisticType === D.Maximum) && A.onStatisticField === B
       ).map((A) => ({
         ...A,
         outStatisticFieldName: `${A.outStatisticFieldName}${C.boxPlot.boxPlotOutliersSuffix}`
-      }))), x.push(
+      }))), b.push(
         _t({
           queryObject: i,
-          uniqueQuery: P,
+          uniqueQuery: L,
           chartConfig: n,
           elementCount: r,
           isTimeBinningSeries: !1,
@@ -4736,12 +4737,12 @@ async function Wo(t) {
       );
     }
   }
-  const v = await Promise.all(x);
-  for (let b = 0; b < v.length; b += 1)
-    l.push(...v[b]);
+  const v = await Promise.all(b);
+  for (let x = 0; x < v.length; x += 1)
+    l.push(...v[x]);
   return y !== F.BoxPlotMonoFieldAndCategoryAndSplitBy && y !== F.BoxPlotMonoField && (l = Ft({
     data: l,
-    x: h !== void 0 && h !== "" ? h : g
+    x: S !== void 0 && S !== "" ? S : g
   })), l;
 }
 async function Go(t) {
@@ -4792,7 +4793,7 @@ function Uo(t) {
     return c !== void 0 && (u = { ...o, ...c }), u;
   });
 }
-function Xa(t) {
+function Za(t) {
   const { chartConfig: e, data: i, calculateZScore: a = !1, meanAndStdDevPerField: r } = t, { series: n, showMean: s } = e, o = Re(e), u = k(e.series), { x: c } = o, l = Ci({ showMean: s, seriesConfig: n });
   let d = i;
   if (i?.[0] !== void 0) {
@@ -4895,7 +4896,7 @@ async function Yo(t) {
         chartConfig: n
       });
     }
-    d = Xa({
+    d = Za({
       chartConfig: n,
       data: d,
       meanAndStdDevPerField: y,
@@ -4919,7 +4920,7 @@ function Ri(t) {
   );
   return r && n.length > 1 && n.sort((s, o) => Zo(s, o, r)), n.map((s) => ({ [i]: s }));
 }
-function Ja(t) {
+function Xa(t) {
   const { chartConfig: e, chartData: i } = t;
   return {
     xAxisData: Ri({
@@ -4936,7 +4937,7 @@ function Ja(t) {
 }
 function $i(t) {
   const { orderBy: e, axisFormatOptions: i } = t;
-  return e !== void 0 && i !== void 0 && (!Array.isArray(e) || i?.type === S.CategoryAxisFormat);
+  return e !== void 0 && i !== void 0 && (!Array.isArray(e) || i?.type === h.CategoryAxisFormat);
 }
 function ki(t, e, i) {
   let a = 0;
@@ -4971,7 +4972,7 @@ function Xo(t) {
 }
 function Jo(t) {
   const { chartConfig: e, chartData: i } = t;
-  i.heatChartAxesData = Ja({
+  i.heatChartAxesData = Xa({
     chartConfig: e,
     chartData: i.dataItems
   });
@@ -4989,8 +4990,8 @@ function Ot(t) {
     else if (c?.[0] !== void 0 && e !== void 0 && e.length > 1) {
       const { orderBy: l } = c[0];
       let { sortingField: d } = c[0];
-      const f = i.orderOptions?.data?.orderType === De.Category, m = c[0].preferLabel !== !1, y = s === F.BarAndLineFromFields || s === F.PieFromFields || s === F.BoxPlotMultiFields || s === F.BoxPlotMultiFieldsAndSplitBy, p = y || o === S.PieSeries, g = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
-      if (f && p && (!m || (o === S.LineSeries || o === S.RadarSeries) && u === S.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, p = y || o === h.PieSeries, g = s === F.PieNoAggregation || s === F.BarAndLineNoAggregation || s === F.BarAndLineSplitByNoAggregation;
+      if (f && p && (!m || (o === h.LineSeries || o === h.RadarSeries) && u === h.NumberAxisFormat) && (d = C.originalCategoryValue), Array.isArray(l))
         In({
           arrayToSort: e,
           orderBy: l,
@@ -5000,12 +5001,12 @@ function Ot(t) {
           preferLabel: m
         });
       else {
-        const h = u === S.DateAxisFormat && f;
+        const S = u === h.DateAxisFormat && f;
         pt({
           arrayToSort: e,
           orderBy: l,
           sortingField: d,
-          forceAscendingOrder: h,
+          forceAscendingOrder: S,
           isNonAggregated: g,
           sortByCategory: f,
           preferLabel: m,
@@ -5048,20 +5049,20 @@ async function Qd(t) {
   if (r && !ie(i)) {
     const { series: o, chartRenderer: u } = a, c = Ko(u), l = c ? tt.ChartRenderer : tt.LayerRenderer, d = i ? z(i) : void 0, f = c ?? d?.renderer;
     let m;
-    d && l === tt.LayerRenderer ? s = await Qa(d) : l === tt.ChartRenderer && (s = Xn(f));
+    d && l === tt.LayerRenderer ? s = await ka(d) : l === tt.ChartRenderer && (s = Xn(f));
     const y = _n(c, d?.renderer), p = Gn({
       chartRenderer: u,
       queryObject: i
-    }), g = _(o), h = k(o), x = Re(a), v = te(x.query?.where);
+    }), g = _(o), S = k(o), b = Re(a), v = te(b.query?.where);
     m = /* @__PURE__ */ new Map();
-    for (let b = 0; b < (g === S.HistogramSeries && e.length > 0 ? 1 : e.length); b += 1) {
-      const B = e[b], N = await Un({
+    for (let x = 0; x < (g === h.HistogramSeries && e.length > 0 ? 1 : e.length); x += 1) {
+      const B = e[x], N = await Un({
         seriesConfig: a.series,
         dataItem: B,
         renderer: f,
         rendererType: y,
         rendererOrigin: l,
-        chartSubType: h,
+        chartSubType: S,
         splitByField: v,
         graphicTemplate: p,
         mapAttributesToSymbol: m,
@@ -5073,7 +5074,7 @@ async function Qd(t) {
   return { dataItems: e, colorMatchApplied: n, rendererFieldNames: s };
 }
 async function el(t) {
-  const { queryObject: e, queryConfig: i, chartConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = a.series[0], { x: u, valueConversion: c } = o, l = dr(a), d = await Fe({
+  const { queryObject: e, queryConfig: i, chartConfig: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = a.series[0], { x: u, valueConversion: c } = o, l = cr(a), d = await Fe({
     queryObject: e,
     queryConfig: i,
     featureCount: i.num ?? 1,
@@ -5096,9 +5097,9 @@ async function el(t) {
   return f;
 }
 async function tl(t) {
-  const { queryObject: e, chartConfig: i, queryConfig: a, chartLimits: r, errorStrings: n, abortKey: s, abortSignal: o } = t, u = { valid: !0 }, { behaviorAfterLimit: c, maxGaugeByFeaturesLimit: l } = r ?? {}, d = dr(i);
+  const { queryObject: e, chartConfig: i, queryConfig: a, chartLimits: r, errorStrings: n, abortKey: s, abortSignal: o } = t, u = { valid: !0 }, { behaviorAfterLimit: c, maxGaugeByFeaturesLimit: l } = r ?? {}, d = cr(i);
   let f = !0, m;
-  if (d && (m = (await lr({
+  if (d && (m = (await or({
     chartConfig: i,
     queryObject: e,
     queryConfig: a,
@@ -5109,7 +5110,7 @@ async function tl(t) {
   })).elementCount, r?.behaviorAfterLimit !== lt.RenderUpToTheLimit && (f = Ae({
     count: m ?? 0,
     seriesCount: i.series.length,
-    chartType: S.GaugeSeries,
+    chartType: h.GaugeSeries,
     chartLimits: r
   })), r && (Number.isFinite(l) || Number.isFinite(m)))) {
     const y = Math.min(l ?? Number.NaN, m ?? Number.NaN);
@@ -5117,7 +5118,7 @@ async function tl(t) {
     Number.isFinite(y) && (p = {
       ...r,
       maxGaugeByFeaturesLimit: y
-    }), Pa({ chartConfig: i, chartLimits: p, uniqueQuery: a });
+    }), La({ chartConfig: i, chartLimits: p, uniqueQuery: a });
   }
   if (Number.isNaN(f) || f) {
     const y = await el({
@@ -5132,7 +5133,7 @@ async function tl(t) {
   } else
     u.count = m, Dt({
       dataInfo: u,
-      chartType: S.GaugeSeries
+      chartType: h.GaugeSeries
     });
   return u;
 }
@@ -5192,15 +5193,15 @@ function il(t) {
       C.technicalFieldSplitByField,
       W.uniqueIdsName,
       Q.valueField,
-      ...Vr
+      ...qr
     ], d = (p, g) => {
-      const h = g[C.originalCategoryValue];
-      h !== void 0 && r && (g[r] = h);
-      const x = g[C.originalYCategoryValue];
-      x !== void 0 && n && (g[n] = x), r && g[Q.xField] !== void 0 && (g[r] = g[C.originalCategoryValue] !== void 0 ? g[C.originalCategoryValue] : g[Q.xField], delete g[Q.xField]), n && g[Q.yField] !== void 0 && (g[n] = g[C.originalYCategoryValue] !== void 0 ? g[C.originalYCategoryValue] : g[Q.yField], delete g[Q.yField]), s && g[Q.valueField] !== void 0 && (g[s] = g[Q.valueField], delete g[Q.valueField]);
+      const S = g[C.originalCategoryValue];
+      S !== void 0 && r && (g[r] = S);
+      const b = g[C.originalYCategoryValue];
+      b !== void 0 && n && (g[n] = b), r && g[Q.xField] !== void 0 && (g[r] = g[C.originalCategoryValue] !== void 0 ? g[C.originalCategoryValue] : g[Q.xField], delete g[Q.xField]), n && g[Q.yField] !== void 0 && (g[n] = g[C.originalYCategoryValue] !== void 0 ? g[C.originalYCategoryValue] : g[Q.yField], delete g[Q.yField]), s && g[Q.valueField] !== void 0 && (g[s] = g[Q.valueField], delete g[Q.valueField]);
       const v = {};
-      return Object.keys(g).forEach((b) => {
-        !l.includes(b) && !b.includes(C.rendererSymbolField) && (v[b] = g[b]);
+      return Object.keys(g).forEach((x) => {
+        !l.includes(x) && !x.includes(C.rendererSymbolField) && (v[x] = g[x]);
       }), p.push(v), p;
     }, f = (p, g) => JSON.stringify(p).localeCompare(JSON.stringify(g));
     let m = o?.reduce(d, [])?.sort(f), y = u?.reduce(d, [])?.sort(f);
@@ -5246,7 +5247,7 @@ function rl(t) {
   const { dataContext: e, xAxisField: i, yAxisField: a, options: r } = t;
   let n = "";
   const { dataContextXMinField: s, dataContextXMaxField: o, dataContextYMinField: u, dataContextYMaxField: c } = C.scatterplotAggregationFields;
-  if (ga({ dataContext: e, chartLimits: r?.chartLimits })) {
+  if (ya({ 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)) {
       const y = [];
@@ -5261,9 +5262,9 @@ function rl(t) {
 }
 function Qi(t) {
   const { fieldsIndex: e, fieldName: i, inputDate: a } = t, r = e.get(i), n = e.getTimeZone(i);
-  return Wr(new Date(a), { type: "date" }, { type: r, timeZone: n });
+  return zr(new Date(a), { type: "date" }, { type: r, timeZone: n });
 }
-function Ka(t) {
+function Ja(t) {
   const { xAxisField: e, dataContext: i, queryObject: a } = t;
   let r = "";
   const n = i[C.originalServerBinningRange] ?? i[C.dateBinningRange];
@@ -5282,7 +5283,7 @@ function Ka(t) {
   }
   return r;
 }
-function er(t, e) {
+function Ka(t, e) {
   let i = "";
   if (Number.isFinite(t)) {
     const a = 1 / 10 ** C.queryMaxFloatPrecision;
@@ -5290,7 +5291,7 @@ function er(t, e) {
   }
   return i;
 }
-function tr(t) {
+function er(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) {
@@ -5298,7 +5299,7 @@ function tr(t) {
       value: r[e],
       dataContext: r
     });
-    n === U.Double ? o = er(d, e) : (je(s.axes?.[0].valueFormat) && (d = nt(d)), o = Le({
+    n === U.Double ? o = Ka(d, e) : (je(s.axes?.[0].valueFormat) && (d = nt(d)), o = Le({
       where: qe(e, d),
       normalize: !1,
       escape: !0
@@ -5329,13 +5330,13 @@ function nl(t) {
   const { xAxisField: e, splitBy: i, dataContext: a, xAxisFieldType: r, chartConfig: n, queryObject: s } = t;
   let o = "";
   if (C.dateBinningRange in a)
-    o = Ka({ xAxisField: e, dataContext: a, queryObject: s });
+    o = Ja({ xAxisField: e, dataContext: a, queryObject: s });
   else if (k(n.series) !== F.BarAndLineFromFields) {
     let l = di({
       value: a[e],
       dataContext: a
     });
-    r === U.Double ? o = er(l, e) : (je(n.axes?.[0].valueFormat) && r !== U.TimeOnly && (l = nt(l)), o = Le({
+    r === U.Double ? o = Ka(l, e) : (je(n.axes?.[0].valueFormat) && r !== U.TimeOnly && (l = nt(l)), o = Le({
       where: qe(e, l),
       normalize: !1,
       escape: !0
@@ -5378,10 +5379,10 @@ function ol(t) {
     runsOnClientQueryEngine: o
   } = t, u = r.series[0];
   let c = "";
-  if (u.type === S.HeatSeries) {
+  if (u.type === h.HeatSeries) {
     let l, d;
-    const f = a[Q.xField], m = a[C.originalCategoryValue], y = a[Q.yField], p = a[C.originalYCategoryValue], g = r.axes?.[0]?.valueFormat?.type, h = r.axes?.[1]?.valueFormat?.type;
-    g === S.CategoryAxisFormat ? l = Le({
+    const f = a[Q.xField], m = a[C.originalCategoryValue], y = a[Q.yField], p = a[C.originalYCategoryValue], g = r.axes?.[0]?.valueFormat?.type, S = r.axes?.[1]?.valueFormat?.type;
+    g === h.CategoryAxisFormat ? l = Le({
       where: qe(u.x, m ?? f),
       normalize: !1,
       escape: !0
@@ -5393,7 +5394,7 @@ function ol(t) {
       outTimeZone: n,
       dataTimeZone: s,
       runsOnClientQueryEngine: o
-    }), h === S.CategoryAxisFormat ? d = Le({
+    }), S === h.CategoryAxisFormat ? d = Le({
       where: qe(u.y, p ?? y),
       normalize: !1,
       escape: !0
@@ -5413,7 +5414,7 @@ function ll(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 === S.HistogramSeries) {
+  if (Number.isFinite(s) && Number.isFinite(o) && n.type === h.HistogramSeries) {
     const u = En(e, n.dataTransformationType), c = i.isLastBin ? "<=" : "<";
     r = Y([
       `${u}>=${s?.toString()}`,
@@ -5426,25 +5427,25 @@ function jd(t) {
   const { chartConfig: e } = t, i = _(e.series);
   let a = "";
   switch (i) {
-    case S.ScatterSeries:
+    case h.ScatterSeries:
       a = rl(t);
       break;
-    case S.HeatSeries:
+    case h.HeatSeries:
       a = ol(t);
       break;
-    case S.RadarSeries:
-    case S.BarSeries:
-    case S.LineSeries:
-    case S.ComboLineAndBarSeries:
+    case h.RadarSeries:
+    case h.BarSeries:
+    case h.LineSeries:
+    case h.ComboLineAndBarSeries:
       a = nl(t);
       break;
-    case S.BoxPlotSeries:
-      a = tr(t);
+    case h.BoxPlotSeries:
+      a = er(t);
       break;
-    case S.HistogramSeries:
+    case h.HistogramSeries:
       a = ll(t);
       break;
-    case S.PieSeries:
+    case h.PieSeries:
       a = sl(t);
       break;
   }
@@ -5469,18 +5470,18 @@ async function ul(t) {
   } = t, p = k(a.series);
   let g = { valid: !0, data: { dataItems: [] } };
   if (r !== void 0 && r.length > 0) {
-    const h = Re(a), { x } = h, v = "y" in h ? h.y : "", B = Ce(e).find((I) => I.name === x)?.type, N = [], T = r.reduce(
-      (I, L) => {
+    const S = Re(a), { x: b } = S, v = "y" in S ? S.y : "", B = Ce(e).find((I) => I.name === b)?.type, N = [], T = r.reduce(
+      (I, P) => {
         const O = [];
-        if (W.uniqueIdsName in L)
-          N.push(L[W.uniqueIdsName]);
+        if (W.uniqueIdsName in P)
+          N.push(P[W.uniqueIdsName]);
         else {
           switch (p) {
             case F.BoxPlotMonoFieldAndSplitBy:
             case F.BoxPlotMultiFieldsAndSplitBy:
             case F.BoxPlotMonoFieldAndCategoryAndSplitBy: {
-              const M = te(h.query?.where ?? ""), q = `_${E.Average}`;
-              Object.keys(L).forEach((G) => {
+              const M = te(S.query?.where ?? ""), q = `_${E.Average}`;
+              Object.keys(P).forEach((G) => {
                 if (G.includes(q)) {
                   const J = G.replace(q, "");
                   J.trim() !== "" && O.push(qe(M, J));
@@ -5492,16 +5493,16 @@ async function ul(t) {
           const V = [v].flat();
           let $ = V.length === 1 ? V[0] : "";
           if (p === F.BoxPlotMultiFieldsAndCategory) {
-            const M = `_${E.FirstQuartile}`, q = Object.keys(L).find((G) => G.includes(M));
+            const M = `_${E.FirstQuartile}`, q = Object.keys(P).find((G) => G.includes(M));
             q !== void 0 && ($ = q.replace(M, ""));
           }
           O.length === 0 && O.push(""), O.forEach((M) => {
-            const q = tr({
+            const q = er({
               chartConfig: a,
-              xAxisField: x,
+              xAxisField: b,
               yAxisField: $,
               splitBy: M,
-              dataContext: L,
+              dataContext: P,
               xAxisFieldType: B
             });
             I.push(q);
@@ -5515,8 +5516,8 @@ async function ul(t) {
       const I = ve(w).idField;
       T.push(`${I} IN (${N.join(",")})`);
     }
-    const P = T.join(" OR "), A = { ...i };
-    A.where = Y([A.where, P]), g = await Si({
+    const L = T.join(" OR "), A = { ...i };
+    A.where = Y([A.where, L]), g = await Si({
       queryObject: e,
       chartConfig: a,
       queryConfig: A,
@@ -5554,26 +5555,26 @@ async function cl(t) {
     abortSignal: g
   } = t;
   mt(e);
-  const { series: h } = a, x = _(h), v = xe(a);
-  let b = { valid: !0 }, B = s?.selectionItems ?? [];
+  const { series: S } = a, b = _(S), v = xe(a);
+  let x = { valid: !0 }, B = s?.selectionItems ?? [];
   n || (B = al({ chartConfig: a, currentSelectionDataItems: r, selectionData: s }));
   let N = !1;
-  switch (x) {
-    case S.HeatSeries:
-      b.data = { dataItems: B };
+  switch (b) {
+    case h.HeatSeries:
+      x.data = { dataItems: B };
       break;
-    case S.PieSeries:
+    case h.PieSeries:
       if (k(a.series) === F.PieFromFields) {
-        const { x: T, y: w } = a.series[0], P = He(B);
-        P.forEach((A) => {
+        const { x: T, y: w } = a.series[0], L = He(B);
+        L.forEach((A) => {
           T in A && (A[ce] = A[T], delete A[T]), w in A && (A[Ne] = A[w], delete A[w]);
-        }), b.data = { dataItems: P };
+        }), x.data = { dataItems: L };
       } else
-        b.data = { dataItems: B };
-      b.count = B.length, N = !0;
+        x.data = { dataItems: B };
+      x.count = B.length, N = !0;
       break;
-    case S.BoxPlotSeries:
-      de(a) && (b = await ul({
+    case h.BoxPlotSeries:
+      de(a) && (x = await ul({
         queryObject: e,
         queryConfig: i,
         chartConfig: a,
@@ -5590,30 +5591,30 @@ async function cl(t) {
         abortSignal: g
       }));
       break;
-    case S.BarSeries:
-    case S.ComboLineAndBarSeries:
-    case S.RadarSeries:
-    case S.LineSeries:
+    case h.BarSeries:
+    case h.ComboLineAndBarSeries:
+    case h.RadarSeries:
+    case h.LineSeries:
       if (B.length === 0 || !Pe({
         xAxisValueFormatType: v,
         setTimeBinningInfoWhenNotProvided: o,
-        seriesConfig: h[0],
+        seriesConfig: S[0],
         queryObject: e
       }))
-        b.data = { dataItems: B }, b.count = B.length * h.length, N = !0;
+        x.data = { dataItems: B }, x.count = B.length * S.length, N = !0;
       else {
         const T = { ...i };
         if (r !== void 0 && r.length > 0) {
-          const P = r.map(
-            (I) => Ka({
-              xAxisField: h[0].x,
+          const L = r.map(
+            (I) => Ja({
+              xAxisField: S[0].x,
               dataContext: I,
               queryObject: e
             })
-          ), A = Y(P, "OR");
+          ), A = Y(L, "OR");
           T.where = Y([T.where, A]);
         }
-        b = await bi({
+        x = await bi({
           queryObject: e,
           queryConfig: T,
           chartConfig: a,
@@ -5627,22 +5628,22 @@ async function cl(t) {
         });
       }
       break;
-    case S.HistogramSeries: {
+    case h.HistogramSeries: {
       if (B.length === 0)
-        b.data = {
+        x.data = {
           mean: Number.NaN,
           median: Number.NaN,
           stddev: Number.NaN,
           max: Number.NaN,
           min: Number.NaN,
           bins: []
-        }, b.count = 0;
+        }, x.count = 0;
       else {
-        const { x: T } = h[0], w = B.map((I, L) => {
-          const { minValue: O, maxValue: V } = I, $ = L === B.length - 1 ? "<=" : "<";
+        const { x: T } = S[0], w = B.map((I, P) => {
+          const { minValue: O, maxValue: V } = I, $ = P === B.length - 1 ? "<=" : "<";
           return `${T} >= ${O} AND ${T} ${$} ${V}`;
-        }), P = Y(w, "OR"), A = { ...i };
-        A.where = Y([A.where, P]), b = await Ua({
+        }), L = Y(w, "OR"), A = { ...i };
+        A.where = Y([A.where, L]), x = await Ga({
           queryObject: e,
           chartConfig: a,
           queryConfig: A,
@@ -5654,24 +5655,24 @@ async function cl(t) {
       }
       break;
     }
-    case S.ScatterSeries: {
+    case h.ScatterSeries: {
       if (B.length === 0) {
         const { r2: T, trendLinePoints: w } = C.scatterplotSeries;
-        b.data = { dataItems: [], r2: T, trendLinePoints: w, count: 0 }, b.count = 0;
+        x.data = { dataItems: [], r2: T, trendLinePoints: w, count: 0 }, x.count = 0;
       } else {
-        const { r2: T, trendLinePoints: w } = Ia({
+        const { r2: T, trendLinePoints: w } = Oa({
           data: B,
           chartConfig: a
         });
-        b.data = { dataItems: B, r2: T, trendLinePoints: w }, b.count = B.length;
+        x.data = { dataItems: B, r2: T, trendLinePoints: w }, x.count = B.length;
       }
       break;
     }
   }
-  return N && b.data !== void 0 && Ot({
-    arrayToSort: "dataItems" in b.data ? b.data.dataItems : b.data,
+  return N && x.data !== void 0 && Ot({
+    arrayToSort: "dataItems" in x.data ? x.data.dataItems : x.data,
     chartConfig: a
-  }), b;
+  }), x;
 }
 async function Si(t) {
   const {
@@ -5709,9 +5710,9 @@ async function Si(t) {
   if (!p)
     y = g;
   else {
-    const h = { dataItems: [] };
-    h.meanLines = g.data.dataItems;
-    const x = Do(i), v = (await si({
+    const S = { dataItems: [] };
+    S.meanLines = g.data.dataItems;
+    const b = Do(i), v = (await si({
       queryObject: e,
       queryConfig: a,
       fetchFullBoxPlotData: !0,
@@ -5723,11 +5724,11 @@ async function Si(t) {
       replaceNoValueCategoryWithZero: f,
       view: m,
       errorStrings: r,
-      chartConfig: x,
+      chartConfig: b,
       abortKey: n,
       abortSignal: s
     })).data;
-    h.dataItems = v.dataItems, h.outliers = v.outliers, y.data = h;
+    S.dataItems = v.dataItems, S.outliers = v.outliers, y.data = S;
   }
   return y;
 }
@@ -5749,18 +5750,19 @@ async function dl(t) {
     errorStrings: y,
     abortKey: p,
     abortSignal: g,
-    fieldList: h,
-    currentSelectionDataItems: x,
+    fieldList: S,
+    currentSelectionDataItems: b,
     dataForFilterBySelectionChanged: v,
-    preFetchedQueryResponse: b
-  } = t, { series: B } = i, N = _(B);
-  let T = { valid: !0 };
+    filterByViewExtent: x,
+    preFetchedQueryResponse: B
+  } = t, { series: N } = i, T = _(N);
+  let w = { valid: !0 };
   if (r)
-    T = await cl({
+    w = await cl({
       queryObject: e,
       queryConfig: a,
       chartConfig: i,
-      currentSelectionDataItems: x,
+      currentSelectionDataItems: b,
       dataForFilterBySelectionChanged: v,
       selectionData: n,
       setTimeBinningInfoWhenNotProvided: s,
@@ -5775,9 +5777,9 @@ async function dl(t) {
       abortSignal: g
     });
   else
-    switch (N) {
-      case S.HeatSeries:
-        mt(e), T = await ur({
+    switch (T) {
+      case h.HeatSeries:
+        mt(e), w = await lr({
           chartConfig: i,
           queryConfig: a,
           queryObject: e,
@@ -5791,8 +5793,8 @@ async function dl(t) {
           abortSignal: g
         });
         break;
-      case S.BoxPlotSeries:
-        de(i) && (T = await Si({
+      case h.BoxPlotSeries:
+        de(i) && (w = await Si({
           queryObject: e,
           // @REV: temporary
           chartConfig: i,
@@ -5809,16 +5811,17 @@ async function dl(t) {
           abortSignal: g
         }));
         break;
-      case S.BarSeries:
-      case S.ComboLineAndBarSeries:
-      case S.PieSeries:
-      case S.RadarSeries:
-      case S.LineSeries: {
-        const w = {
+      case h.BarSeries:
+      case h.ComboLineAndBarSeries:
+      case h.PieSeries:
+      case h.RadarSeries:
+      case h.LineSeries: {
+        const L = {
           queryObject: e,
           // @REV: temporary
           queryConfig: a,
           chartConfig: i,
+          filterByViewExtent: x,
           errorStrings: y,
           setTimeBinningInfoWhenNotProvided: s,
           returnFeaturesExtent: o,
@@ -5829,21 +5832,22 @@ async function dl(t) {
           view: f,
           abortKey: p,
           abortSignal: g,
-          fieldList: h,
-          preFetchedQueryResponse: b
+          fieldList: S,
+          preFetchedQueryResponse: B
         };
         Pe({
           xAxisValueFormatType: xe(i),
           setTimeBinningInfoWhenNotProvided: s,
-          seriesConfig: B[0],
+          seriesConfig: N[0],
           queryObject: e
-        }) ? T = await bi(w) : T = await si(w);
+        }) ? w = await bi(L) : w = await si(L);
         break;
       }
-      case S.ScatterSeries:
-        T.data = await cr({
+      case h.ScatterSeries:
+        w.data = await ur({
           queryObject: e,
           queryConfig: a,
+          filterByViewExtent: x,
           setTimeBinningInfoWhenNotProvided: s,
           returnFeaturesExtent: o,
           chartLimits: u,
@@ -5857,8 +5861,8 @@ async function dl(t) {
           abortSignal: g
         });
         break;
-      case S.HistogramSeries:
-        T = await Ua({
+      case h.HistogramSeries:
+        w = await Ga({
           queryObject: e,
           queryConfig: a,
           chartConfig: i,
@@ -5868,8 +5872,8 @@ async function dl(t) {
           errorStrings: y
         });
         break;
-      case S.GaugeSeries:
-        mt(e), T = await tl({
+      case h.GaugeSeries:
+        mt(e), w = await tl({
           queryObject: e,
           chartConfig: i,
           queryConfig: a,
@@ -5880,7 +5884,7 @@ async function dl(t) {
         });
         break;
     }
-  return T;
+  return w;
 }
 async function Hd(t) {
   const {
@@ -5890,52 +5894,54 @@ async function Hd(t) {
     abortSignal: r,
     currentSelectionDataItems: n,
     dataForFilterBySelectionChanged: s,
-    runtimeDataFilters: o,
-    ignoreViewExtent: u,
-    filterBySelection: c,
-    selectionData: l,
-    setTimeBinningInfoWhenNotProvided: d,
-    returnFeaturesExtent: f,
-    chartLimits: m,
-    popupTemplateFieldInfosEnabled: y,
-    hideZeroCountCategories: p,
-    replaceNoValueCategoryWithZero: g,
-    view: h,
-    syncViewTimeZone: x,
-    errorStrings: v,
-    fieldList: b,
-    preFetchedQueryResponse: B
+    filterByViewExtent: o,
+    runtimeDataFilters: u,
+    ignoreViewExtent: c,
+    filterBySelection: l,
+    selectionData: d,
+    setTimeBinningInfoWhenNotProvided: f,
+    returnFeaturesExtent: m,
+    chartLimits: y,
+    popupTemplateFieldInfosEnabled: p,
+    hideZeroCountCategories: g,
+    replaceNoValueCategoryWithZero: S,
+    view: b,
+    syncViewTimeZone: v,
+    errorStrings: x,
+    fieldList: B,
+    preFetchedQueryResponse: N
   } = t;
-  let N = { valid: !0 };
-  const T = ja({
+  let T = { valid: !0 };
+  const w = _a({
     queryObject: e,
     chartConfig: i,
-    runtimeDataFilters: o,
-    ignoreViewExtent: u,
-    view: h
+    runtimeDataFilters: u,
+    ignoreViewExtent: c,
+    view: b
   });
-  return ws(a), N = await dl({
+  return ws(a), T = await dl({
     chartConfig: i,
     queryObject: e,
-    queryConfig: T,
+    queryConfig: w,
     currentSelectionDataItems: n,
     dataForFilterBySelectionChanged: s,
-    filterBySelection: c,
-    selectionData: l,
-    setTimeBinningInfoWhenNotProvided: d,
-    returnFeaturesExtent: f,
-    chartLimits: m,
-    popupTemplateFieldInfosEnabled: y,
-    hideZeroCountCategories: p,
-    replaceNoValueCategoryWithZero: g,
-    view: h,
-    syncViewTimeZone: x,
+    filterByViewExtent: o,
+    filterBySelection: l,
+    selectionData: d,
+    setTimeBinningInfoWhenNotProvided: f,
+    returnFeaturesExtent: m,
+    chartLimits: y,
+    popupTemplateFieldInfosEnabled: p,
+    hideZeroCountCategories: g,
+    replaceNoValueCategoryWithZero: S,
+    view: b,
+    syncViewTimeZone: v,
     abortKey: a,
     abortSignal: r,
-    errorStrings: v,
-    fieldList: b,
-    preFetchedQueryResponse: B
-  }), N.queryConfig = T, N;
+    errorStrings: x,
+    fieldList: B,
+    preFetchedQueryResponse: N
+  }), T.queryConfig = w, T;
 }
 function fl(t, e, i) {
   const a = /* @__PURE__ */ new Map();
@@ -5963,28 +5969,28 @@ async function ml(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 === S.CategoryAxisFormat) {
+  if (s !== lt.RenderUpToTheLimit && n !== void 0 && n > e.length && f !== F.BarAndLineFromFields && f !== F.BarAndLineNoAggregation && f !== F.PieNoAggregation && m === h.CategoryAxisFormat) {
     const { x: y } = l[0], p = {
       ...a,
       returnDistinctValues: !0,
       outFields: [y]
     };
     delete p.outStatistics, delete p.orderByFields, delete p.groupByFieldsForStatistics;
-    const h = (await Fe({
+    const S = (await Fe({
       queryObject: r,
       queryConfig: p,
       featureCount: n,
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    })).map((x) => x.attributes[y]).filter((x) => x != null);
-    h.length > e.length && (d = fl(h, e, y));
+    })).map((b) => b.attributes[y]).filter((b) => b != null);
+    S.length > e.length && (d = fl(S, e, y));
   }
   return d;
 }
 function yl(t, e) {
   const i = t, { series: a } = e;
-  if (xe(e) === S.CategoryAxisFormat && a[0].query?.outStatistics?.[0].statisticType === D.Count) {
+  if (xe(e) === h.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];
@@ -5997,7 +6003,7 @@ function yl(t, e) {
   }
   return i;
 }
-const ir = [
+const tr = [
   F.BarAndLineMonoField,
   F.BarAndLineMultiFields,
   F.PieNoAggregation,
@@ -6049,7 +6055,7 @@ const ir = [
     preferredIntervalSize: [1, 2, 4, 5, 10, 25, 50, 100]
   }
 ], pl = "{ groupByFieldsForStatistics } WHEN { dateField }>='{ startDate }' AND { dateField }{ endDateOperand }'{ endDate }' THEN '{ y }|{ binIndex}'";
-function ar(t, e) {
+function ir(t, e) {
   let i = t;
   return e === R.Week ? i /= 7 : e === R.Month ? i /= 30 : e === R.Year && (i /= 365), i = Math.ceil(i), i;
 }
@@ -6164,31 +6170,31 @@ function bl(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: p } = m?.outStatistics?.[0] ?? Ui;
-    let g = !1, h = d === ee.End ? e.length - 1 : 0;
-    const x = {
-      binFirstOrLastIndex: h,
+    let g = !1, S = d === ee.End ? e.length - 1 : 0;
+    const b = {
+      binFirstOrLastIndex: S,
       data: e,
       x: l,
       timeIntervalInfo: a
     };
     for (; !g; ) {
       let v = {};
-      const { binStartDate: b, binEndDate: B, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: P } = d === ee.End ? (
+      const { binStartDate: x, binEndDate: B, last: N, nextBinFirstOrLastIndex: T, sliceStartIndex: w, sliceEndIndex: L } = d === ee.End ? (
         // When grouping from the end we'll start from the last date and move backward to create the bins
-        Sl(x)
+        Sl(b)
       ) : (
         // When grouping from the start we'll start from the first date and move forward to create the bins
-        hl(x)
+        hl(b)
       );
-      if (g = N, v = d === ee.End ? v = e[P - 1] : v = e[h], B > n && b < n || b < r && B > r || b >= r && B <= n) {
-        const A = e.slice(w, P).filter((O) => !(C.dateBinModel in O));
+      if (g = N, v = d === ee.End ? v = e[L - 1] : v = e[S], B > n && x < n || x < r && B > r || x >= r && B <= n) {
+        const A = e.slice(w, L).filter((O) => !(C.dateBinModel in O));
         y.forEach((O) => {
           v[O] = Fl({ binsToRegroup: A, statisticType: p, y: O, nullPolicy: f });
         });
-        const I = A.map((O) => O[Oe]).filter((O) => O !== void 0), L = Dn(I);
-        L !== void 0 && (v[Oe] = L), v[l] = b, v[C.xAxisField] = b, v[C.dateBinningRange] = [b, B], delete v[C.dateBinModel], s.push(v);
+        const I = A.map((O) => O[Oe]).filter((O) => O !== void 0), P = Dn(I);
+        P !== void 0 && (v[Oe] = P), v[l] = x, v[C.xAxisField] = x, v[C.dateBinningRange] = [x, B], delete v[C.dateBinModel], s.push(v);
       } else N && d !== ee.End && s.length > 0 && (s[s.length - 1][C.dateBinningRange][1] = s[s.length - 1][C.dateBinningRange][1] + 1);
-      h = T, x.binFirstOrLastIndex = T;
+      S = T, b.binFirstOrLastIndex = T;
     }
     d === ee.End && (s = s.reverse());
   } else u === 1 ? s = e.map((m, y) => {
@@ -6206,7 +6212,7 @@ function bl(t) {
   }) : s = e;
   return s;
 }
-function rr(t) {
+function ar(t) {
   const { dateMinTimestamp: e, dateMaxTimestamp: i, timeIntervalInfo: a } = t, { size: r, unit: n } = a;
   let s = 0, o = 0;
   if (r !== void 0 && Number.isFinite(r) && Number.isFinite(e) && Number.isFinite(i)) {
@@ -6235,7 +6241,7 @@ function rr(t) {
   }
   return { numberOfFinalBinsWithinDataRange: s, numberOfSingleBinsWithinDataRange: o };
 }
-function nr(t) {
+function rr(t) {
   const e = t[0].temporalBinning?.nullPolicy;
   return t.reduce(
     (a, r) => {
@@ -6259,10 +6265,10 @@ function xl(t) {
   if (o !== void 0 && Number.isFinite(o) && a / i !== o) {
     let y = Math.ceil(a / i) * i - a;
     u === R.Week && (y *= 7);
-    const p = nr(n);
+    const p = rr(n);
     if (l === ee.End) {
       let g = r[0][c];
-      for (let h = 0; h < y; h += 1)
+      for (let S = 0; S < y; S += 1)
         g = Ve({
           date: g,
           unit: u,
@@ -6276,7 +6282,7 @@ function xl(t) {
       y > 0 && (d = r[r.length - 1][c]);
     } else {
       let g = r[r.length - 1][c];
-      for (let h = 0; h < y; h += 1)
+      for (let S = 0; S < y; S += 1)
         g = Ve({
           date: g,
           unit: u,
@@ -6294,7 +6300,7 @@ function xl(t) {
 }
 function Cl(t) {
   const { numberOfSingleBinsWithinDataRange: e, dataLength: i, unit: a } = t;
-  return ar(i, a) >= e;
+  return ir(i, a) >= e;
 }
 async function vl(t) {
   const { queryObject: e, queryConfig: i, x: a, errorStrings: r, abortSignal: n } = t, s = `MIN_${a}`, o = `MAX_${a}`, u = `COUNT_${a}`, c = {
@@ -6343,7 +6349,7 @@ function Bl(t) {
     dataLength: s,
     unit: u
   })) {
-    const { x: d } = a[0], f = a[0].temporalBinning?.timeAggregationType, m = nr(a);
+    const { x: d } = a[0], f = a[0].temporalBinning?.timeAggregationType, m = rr(a);
     let p = f === ee.End ? i : e, g = f === ee.End ? r.length - 1 : 0;
     for (; g < r.length && (f === ee.End && p > e || f !== ee.End && p < i); )
       p !== r[g][d] ? c.push({
@@ -6403,10 +6409,10 @@ function* Al(t) {
     ];
     let y = Ue.groupByCaseBegin;
     for (let g = 0; g < r.length; g += 1) {
-      const h = r[g], [x, v] = h[C.dateBinningRange], b = nt(x), B = nt(v);
+      const S = r[g], [b, v] = S[C.dateBinningRange], x = nt(b), B = nt(v);
       y = Tl({
         groupByFieldsForStatistics: y,
-        queryStartDate: b,
+        queryStartDate: x,
         queryEndDate: B,
         dateField: l,
         y: [d].flat()[0],
@@ -6448,8 +6454,8 @@ async function wl(t) {
         if (y !== void 0) {
           const [p, g] = y.split("|");
           if (g !== void 0) {
-            const h = m.attributes[D.ContinuousPercentile];
-            o[g][`${p}`] = h;
+            const S = m.attributes[D.ContinuousPercentile];
+            o[g][`${p}`] = S;
           }
         }
       });
@@ -6476,38 +6482,38 @@ function Hi(t) {
   }
 }
 function Ll(t) {
-  const { chartConfig: e, queryResults: i, mapToStatField: a, splitByField: r, x: n, y: s, nullPolicy: o, queryObject: u } = t, c = Oa(n), d = Ce(u).find((g) => g.name === n)?.type, f = [], m = e.series[0], y = "temporalBinning" in m ? m.temporalBinning?.trimIncompleteTimeInterval : !1, p = "temporalBinning" in m ? m.temporalBinning?.timeAggregationType : !1;
-  return i.forEach((g, h) => {
-    if (!(y && (h === 0 && p === ee.End || h === i.length - 1 && p === ee.Start))) {
-      const { attributes: v, stackedAttributes: b } = g;
+  const { chartConfig: e, queryResults: i, mapToStatField: a, splitByField: r, x: n, y: s, nullPolicy: o, queryObject: u } = t, c = Da(n), d = Ce(u).find((g) => g.name === n)?.type, f = [], m = e.series[0], y = "temporalBinning" in m ? m.temporalBinning?.trimIncompleteTimeInterval : !1, p = "temporalBinning" in m ? m.temporalBinning?.timeAggregationType : !1;
+  return i.forEach((g, S) => {
+    if (!(y && (S === 0 && p === ee.End || S === i.length - 1 && p === ee.Start))) {
+      const { attributes: v, stackedAttributes: x } = g;
       let B = v[c.lowerBoundaryAlias], N = v[c.upperBoundaryAlias];
-      const T = B, w = N, P = (A, I) => {
-        let L = A;
+      const T = B, 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") {
             const O = A.split("-");
-            O.length === 3 && (L = me.local(Number(O[0]), Number(O[1]), Number(O[2])).valueOf());
+            O.length === 3 && (P = me.local(Number(O[0]), Number(O[1]), Number(O[2])).valueOf());
           } else
-            L = new Date(A), L = new Date(L.valueOf() + L.getTimezoneOffset() * 6e4), L = me.local(L.getFullYear(), L.getMonth() + 1, L.getDate()).valueOf();
+            P = new Date(A), P = new Date(P.valueOf() + P.getTimezoneOffset() * 6e4), P = me.local(P.getFullYear(), P.getMonth() + 1, P.getDate()).valueOf();
         else typeof A == "string" && ["+", "-"].forEach((O) => {
-          O && A.lastIndexOf(O) === A.length - 6 && (L = new Date(A.slice(0, A.lastIndexOf(O))).valueOf());
+          O && A.lastIndexOf(O) === A.length - 6 && (P = new Date(A.slice(0, A.lastIndexOf(O))).valueOf());
         });
-        return L;
+        return P;
       };
-      if (B = P(B, d), N = P(N, d), typeof B == "number" && typeof N == "number") {
+      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) => {
+        A[C.originalServerBinningRange] = [T, w], A[n] = B, A[C.xAxisField] = B, A[C.dateBinningRange] = [B, N], delete A[c.lowerBoundaryAlias], delete A[c.upperBoundaryAlias], x && r && !oe(r) && a ? x.forEach((O) => {
           const V = O[r];
           if (V === null || typeof V == "string" || typeof V == "number") {
             const $ = a?.get(V);
             $ !== void 0 && (A[$] = O[W.outStatistics?.outStatisticFieldName ?? ""], Hi({ dataItem: A, statField: $, nullPolicy: o }));
           }
         }) : typeof s == "string" && Hi({ dataItem: A, statField: s, nullPolicy: o });
-        const { featureExtent: I, featureExtentKey: L } = sr({
+        const { featureExtent: I, featureExtentKey: P } = nr({
           feature: g,
           splitByField: r
         });
-        I && (A[L] = I), f.push(A);
+        I && (A[P] = I), f.push(A);
       }
     }
   }), f;
@@ -6532,11 +6538,11 @@ async function Pl(t) {
       arrayToSort: l,
       sortingField: a
     }), m > 1) {
-      const { numberOfFinalBinsWithinDataRange: y, numberOfSingleBinsWithinDataRange: p } = rr({
+      const { numberOfFinalBinsWithinDataRange: y, numberOfSingleBinsWithinDataRange: p } = ar({
         dateMinTimestamp: d,
         dateMaxTimestamp: f,
         timeIntervalInfo: o
-      }), { newDateMin: g, newDateMax: h } = xl({
+      }), { newDateMin: g, newDateMax: S } = xl({
         dateMaxTimestamp: f,
         data: l,
         numberOfFinalBinsWithinDataRange: y,
@@ -6546,7 +6552,7 @@ async function Pl(t) {
       });
       l = Bl({
         newDateMin: g,
-        newDateMax: h,
+        newDateMax: S,
         seriesConfig: n,
         data: l,
         initialNumberOfBins: m,
@@ -6586,10 +6592,10 @@ function Dl(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 = Ml(i), u = (s - n) / o, c = ji.findIndex((h) => h.threshold > u), l = ji[c], { unitMs: d, preferredIntervalSize: f } = l;
+    const o = Ml(i), u = (s - n) / o, c = ji.findIndex((S) => S.threshold > u), l = ji[c], { unitMs: d, preferredIntervalSize: f } = l;
     ({ unit: a } = l);
     const m = u / d, y = f.findIndex(
-      (h) => h >= m
+      (S) => S >= m
     ), p = f[y], g = y === 0 ? f[0] : f[y - 1];
     r = p - m < m - g ? p : g;
   }
@@ -6651,11 +6657,11 @@ async function Ut(t) {
   });
   return Array.from(
     new Set(
-      g.map((x) => x.attributes[c ? r : a])
+      g.map((b) => b.attributes[c ? r : a])
     )
-  ).sort((x, v) => typeof x == "string" && typeof v == "string" ? x.localeCompare(v) : Number(x) - Number(v));
+  ).sort((b, v) => typeof b == "string" && typeof v == "string" ? b.localeCompare(v) : Number(b) - Number(v));
 }
-function sr(t) {
+function nr(t) {
   const { feature: e, splitByField: i, chartSubType: a } = t;
   let r;
   if (e.aggregateGeometries && "Extent" in e.aggregateGeometries)
@@ -6687,7 +6693,7 @@ function Ft(t) {
 }
 function ql(t, e) {
   const i = t, a = _(e);
-  if (a !== S.PieSeries && a !== S.BoxPlotSeries) {
+  if (a !== h.PieSeries && a !== h.BoxPlotSeries) {
     const r = ue(e), n = e[0].y;
     t.forEach((s) => {
       let o = 0;
@@ -6714,7 +6720,7 @@ function Vl(t, e) {
 }
 function Rl(t, e) {
   const i = e.series[0], a = t;
-  if (i.type === S.HeatSeries) {
+  if (i.type === h.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];
     const s = i.query?.outStatistics?.[0]?.outStatisticFieldName;
@@ -6792,12 +6798,12 @@ function Hl(t) {
 }
 function zl(t) {
   const { queryResponse: e, chartConfig: i, maxCategoryCount: a } = t, r = k(i.series);
-  return a && Number.isFinite(a) && a < e.length && ir.includes(r) ? e.slice(0, a) : e;
+  return a && Number.isFinite(a) && a < e.length && tr.includes(r) ? e.slice(0, a) : e;
 }
 function Wl(t) {
   const { attributes: e, uniqueCategoryList: i, maxCategoryCount: a, x: r, chartSubType: n } = t;
   let s = !1;
-  if (r && a && Number.isFinite(a) && !ir.includes(n))
+  if (r && a && Number.isFinite(a) && !tr.includes(n))
     if ((n === F.BarAndLineFromFields || n === F.PieFromFields) && Object.keys(e).length > a)
       Object.keys(e).filter((o) => o !== D.EnvelopeAggregate).forEach((o, u) => {
         u >= a && delete e[o];
@@ -6823,14 +6829,14 @@ function Gl(t) {
     yAxisValueFormat: d
   } = t;
   let f, m;
-  c !== F.PieFromFields && (s && (typeof i == "string" || typeof i == "number") && (f = ri(i, s)), o && u === S.HeatSeries && typeof n == "string" && (typeof a == "string" || typeof a == "number") && (m = ri(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 = ri(i, s)), o && u === h.HeatSeries && typeof n == "string" && (typeof a == "string" || typeof a == "number") && (m = ri(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));
 }
 function Ul(t) {
   let e;
   const [i, a, r] = t.split(":");
   return Number.isFinite(Number(i)) && Number.isFinite(Number(a)) && Number.isFinite(Number(r)) && (e = new Date(2e3, 0, 1, Number(i), Number(a), Number(r)).valueOf()), e;
 }
-function or(t) {
+function sr(t) {
   const {
     queryObject: e,
     queryResponse: i,
@@ -6842,14 +6848,14 @@ function or(t) {
     showMean: u,
     chartLimits: c,
     fieldList: l
-  } = t, { series: d } = a, f = k(d), m = _(d), { x: y } = d[0], p = "y" in d[0] ? d[0].y : void 0, g = d[0].query?.outStatistics ?? [], h = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: x, originalCategoryValue: v, originalDateValue: b } = C, B = ai(e, y), N = typeof p == "string" ? ai(e, p) : void 0, w = ao(l ?? []).includes(y), P = [];
+  } = t, { series: d } = a, f = k(d), m = _(d), { x: y } = d[0], p = "y" in d[0] ? d[0].y : void 0, g = d[0].query?.outStatistics ?? [], S = we(a?.axes?.[0]?.valueFormat), { originalYCategoryValue: b, originalCategoryValue: v, originalDateValue: x } = C, B = ai(e, y), N = typeof p == "string" ? ai(e, p) : void 0, w = ao(l ?? []).includes(y), L = [];
   let A = 0;
-  const I = /* @__PURE__ */ new Set(), { maxCategoryCount: L } = ut(c), O = zl({ queryResponse: i, chartConfig: a, maxCategoryCount: L });
+  const I = /* @__PURE__ */ new Set(), { maxCategoryCount: P } = ut(c), O = zl({ queryResponse: i, chartConfig: a, maxCategoryCount: P });
   for (let V = 0; O[V] && V < O.length && !(o !== void 0 && A >= o); V += 1) {
     A += jl(f, a);
     const $ = O[V];
     let M = { ...$.attributes };
-    if (Wl({ attributes: M, uniqueCategoryList: I, maxCategoryCount: L, x: y, chartSubType: f }))
+    if (Wl({ attributes: M, uniqueCategoryList: I, maxCategoryCount: P, x: y, chartSubType: f }))
       continue;
     if ($l(M, d), f === F.PieFromFields || f === F.BarAndLineFromFields)
       M = kl(M, g);
@@ -6863,13 +6869,13 @@ function or(t) {
     Hl({ attributes: M, showMean: u, chartSubType: f });
     let q = M[y];
     const G = typeof p == "string" ? M[p] : void 0;
-    q === null && d[0]?.query?.fetchNullValues === !0 && f !== F.PieFromFields && (M[v] = null, q = C.nullValue), h || (w && typeof q == "string" ? q = new Date(q).valueOf() : s && (q = Il(M))), typeof q == "string" && l?.find((ae) => ae.name === y)?.type === U.TimeOnly && (M[v] = q, q = Ul(q));
-    const { outStatisticFieldName: J } = W.outStatistics ?? {}, { featureExtent: X, featureExtentKey: H } = sr({ feature: $, splitByField: n, chartSubType: f });
+    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 = Il(M))), typeof q == "string" && l?.find((ae) => ae.name === y)?.type === U.TimeOnly && (M[v] = q, q = Ul(q));
+    const { outStatisticFieldName: J } = W.outStatistics ?? {}, { featureExtent: X, featureExtentKey: H } = nr({ 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), un({ isXAxis: !0, chartType: m, valueFormat: a.axes?.[0]?.valueFormat }) && (M[C.xAxisField] = `${q}-${V}`, M[C.xAxisDisplayField] = q), M[W.uniqueIdsName] = $.getObjectId());
-    m === S.BoxPlotSeries && (M = Vl(d, M)), m === S.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 === S.HeatSeries ? "null" : C.nullValue : M[y] = q, Gl({
+    } else (f === F.PieNoAggregation || f === F.BarAndLineNoAggregation || f === F.BarAndLineSplitByNoAggregation) && (w ? M[x] = q : q !== C.nullValue && (M[v] = q), un({ 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 = Vl(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, Gl({
       attributes: M,
       xValue: q,
       yValue: G,
@@ -6881,9 +6887,9 @@ function or(t) {
       chartSubType: f,
       xAxisValueFormat: a.axes?.[0].valueFormat,
       yAxisValueFormat: a.axes?.[1]?.valueFormat
-    }), m === S.HeatSeries && typeof p == "string" && M[p] === null && (M[p] = "null", M[x] = null), M[C.xAxisField] === void 0 && (M[C.xAxisField] = M[y])), M = Rl(M, a), P.push(M);
+    }), m === h.HeatSeries && typeof p == "string" && M[p] === null && (M[p] = "null", M[b] = null), M[C.xAxisField] === void 0 && (M[C.xAxisField] = M[y])), M = Rl(M, a), L.push(M);
   }
-  return P;
+  return L;
 }
 async function _t(t) {
   const {
@@ -6902,31 +6908,31 @@ async function _t(t) {
     errorStrings: m
   } = t, { series: y } = a, p = k(y);
   let g = [];
-  const h = p === F.BarAndLineSplitBy || p === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", x = f ?? await Fe({
+  const S = p === F.BarAndLineSplitBy || p === F.BarAndLineSplitByNoAggregation ? te(y[0].query?.where) : "", b = f ?? await Fe({
     queryObject: e,
     queryConfig: i,
     featureCount: o,
     abortKey: n,
     errorStrings: m,
     abortSignal: s
-  }), v = Ce(e, d), { x: b } = y[0];
-  return g = or({
+  }), v = Ce(e, d), { x } = y[0];
+  return g = sr({
     queryObject: e,
-    queryResponse: x,
+    queryResponse: b,
     chartConfig: a,
     mapToStatField: r,
-    splitByField: h,
+    splitByField: S,
     isTimeBinningSeries: u,
     fieldList: v,
     resultLimit: i.num,
     showMean: c,
     chartLimits: l
-  }), p !== F.BarAndLineSplitByNoAggregation && p !== F.BarAndLineFromFields && (h !== "" && (g = Ft({ data: g, x: b, splitByField: h })), g = ql(
+  }), p !== F.BarAndLineSplitByNoAggregation && p !== F.BarAndLineFromFields && (S !== "" && (g = Ft({ data: g, x, splitByField: S })), g = ql(
     g,
     y
   )), g;
 }
-async function lr(t) {
+async function or(t) {
   const {
     chartConfig: e,
     queryObject: i,
@@ -6968,16 +6974,16 @@ async function si(t) {
     chartLimits: f,
     popupTemplateFieldInfosEnabled: m,
     hideZeroCountCategories: y
-  } = t, p = st(e), g = t.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, h = !(y ?? !g), { behaviorAfterLimit: x } = f ?? {};
+  } = t, p = st(e), g = t.replaceNoValueCategoryWithZero ?? C.options.replaceNoValueCategoryWithZero, S = !(y ?? !g), { behaviorAfterLimit: b } = f ?? {};
   let v;
-  const b = { valid: !0 };
+  const x = { valid: !0 };
   let B, N = !1;
-  const T = e.series, w = T[0], P = k(e.series);
+  const T = e.series, w = T[0], L = k(e.series);
   if (ie(r))
-    v = _(T) === S.BarSeries ? await Hs(t) : b;
+    v = _(T) === h.BarSeries ? await Hs(t) : x;
   else {
     if (w !== void 0) {
-      const A = _(T), { uniqueQuery: I, mapToStatField: L } = mi({
+      const A = _(T), { uniqueQuery: I, mapToStatField: P } = mi({
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
@@ -6986,11 +6992,11 @@ async function si(t) {
         returnFeaturesExtent: d,
         chartLimits: f
       });
-      let { categoryOrDateCount: O, elementCount: V } = await lr({
+      let { categoryOrDateCount: O, elementCount: V } = await or({
         chartConfig: e,
         queryObject: r,
         queryConfig: i,
-        behaviorAfterLimit: x,
+        behaviorAfterLimit: b,
         numberMaxOfFeaturesToFetch: I.num,
         abortSignal: c
       });
@@ -7006,7 +7012,7 @@ async function si(t) {
         uniqueQuery: I,
         chartConfig: e,
         preFetchedQueryResponse: o,
-        mapToStatField: L,
+        mapToStatField: P,
         elementCount: V,
         isTimeBinningSeries: !1,
         showMean: p,
@@ -7015,7 +7021,7 @@ async function si(t) {
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), de(e) && B !== void 0 && (b.data = await Yo({
+      }), de(e) && B !== void 0 && (x.data = await Yo({
         data: B,
         queryObject: r,
         fetchFullBoxPlotData: a,
@@ -7026,22 +7032,22 @@ async function si(t) {
         errorStrings: u,
         abortKey: n,
         abortSignal: c
-      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (b.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = B.length, V = ti(P) ? O * T.length : O, M = Ae({
+      }), f?.maxBoxPlotOutlierLimit !== void 0 && (M = (x.data.outliers ?? []).length <= f.maxBoxPlotOutlierLimit, N = !M)), $ && (O = B.length, V = ti(L) ? O * T.length : O, M = Ae({
         count: V,
         seriesCount: T.length,
         chartType: A,
         chartLimits: f
       })), M)) {
-        if (A === S.PieSeries) {
-          P === F.PieFromFields && (B = Mt({
+        if (A === h.PieSeries) {
+          L === F.PieFromFields && (B = Mt({
             dataToConvert: B[0],
             x: ce,
             y: Ne,
             fieldList: s
           }));
           let q = "";
-          P === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), qn(B, q) ? b.data = { dataItems: B } : qo(b, j.PieChartMixOfNegativePositiveSlices);
-        } else if ((A === S.RadarSeries || A === S.BarSeries || A === S.LineSeries || A === S.ComboLineAndBarSeries) && (P === F.BarAndLineFromFields && "y" in w && typeof w.y == "string" ? B = Mt({
+          L === F.PieFromFields ? q = Ne : "y" in w && typeof w.y == "string" && (q = w.y), qn(B, q) ? x.data = { dataItems: B } : qo(x, 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 = Mt({
           dataToConvert: B[0],
           x: w.x,
           y: w.y,
@@ -7052,32 +7058,32 @@ async function si(t) {
           chartConfig: e,
           queryConfig: i,
           categoryOrDateCount: O,
-          behaviorAfterLimit: x,
+          behaviorAfterLimit: b,
           errorStrings: u,
           abortKey: n,
           abortSignal: c
-        }), V = ti(P) ? B.length * T.length : B.length, M = Ae({
+        }), V = ti(L) ? B.length * T.length : B.length, M = Ae({
           count: V,
           seriesCount: T.length,
           chartType: A,
           chartLimits: f
         }), M)) {
-          h && (B = yl(B, e));
+          S && (B = yl(B, 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 };
+          x.data = { dataItems: B, timeIntervalInfo: q };
         }
       }
       M || Dt({
-        dataInfo: b,
+        dataInfo: x,
         chartType: A,
         subError: { outlierLimit: N }
-      }), b.count = V;
+      }), x.count = V;
     }
-    v = b;
+    v = x;
   }
   return v;
 }
@@ -7141,7 +7147,7 @@ function zi(t) {
   const { day: e, month: i, includeLeapDay: a } = t;
   return i === 2 && e > (a ? 29 : 28) || [4, 6, 9, 11].includes(i) && e > 30;
 }
-async function ur(t) {
+async function lr(t) {
   const {
     chartConfig: e,
     queryConfig: i,
@@ -7158,7 +7164,7 @@ async function ur(t) {
   } = t, m = { valid: !0 };
   let y;
   if (We(e)) {
-    const { nullPolicy: p } = e, g = e.series[0], { x: h, y: x, query: v, xTemporalBinning: b, yTemporalBinning: B } = g, N = v?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = v?.outStatistics?.[0]?.statisticType ?? D.Count, w = Zl(e), P = Q.valueField, A = p === Se.Zero ? 0 : null;
+    const { nullPolicy: p } = e, g = e.series[0], { x: S, y: b, query: v, xTemporalBinning: x, yTemporalBinning: B } = g, N = v?.outStatistics?.[0]?.outStatisticFieldName ?? "", T = v?.outStatistics?.[0]?.statisticType ?? D.Count, w = Zl(e), L = Q.valueField, A = p === Se.Zero ? 0 : null;
     if (Oo(e)) {
       const I = await Bs({
         chartConfig: e,
@@ -7172,13 +7178,13 @@ async function ur(t) {
       if (!Ae({
         count: I?.length ?? 0,
         seriesCount: 1,
-        chartType: S.HeatSeries,
+        chartType: h.HeatSeries,
         chartLimits: o
       }))
-        Dt({ dataInfo: m, chartType: S.HeatSeries });
+        Dt({ dataInfo: m, chartType: h.HeatSeries });
       else if (typeof I?.[0] == "object") {
-        const L = Ce(a, u);
-        y = or({
+        const P = Ce(a, u);
+        y = sr({
           queryObject: a,
           queryResponse: I,
           chartConfig: e,
@@ -7186,19 +7192,19 @@ async function ur(t) {
           isTimeBinningSeries: !1,
           chartLimits: o,
           resultLimit: i.num,
-          fieldList: L
+          fieldList: P
         });
         const O = await Ut({
           queryObject: a,
           queryConfig: i,
-          category: h,
+          category: S,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
         }), V = await Ut({
           queryObject: a,
           queryConfig: i,
-          category: x,
+          category: b,
           errorStrings: n,
           abortKey: d,
           abortSignal: f
@@ -7209,15 +7215,15 @@ async function ur(t) {
             dataItems: y,
             xUniqueValues: O,
             yUniqueValues: V,
-            valueField: P,
+            valueField: L,
             emptyCellValue: A,
-            x: h,
-            y: x,
+            x: S,
+            y: b,
             queryObject: a
           })
         ], w && (y = Xl({
           dataItems: y,
-          valueField: P,
+          valueField: L,
           filterOutZero: T === D.Count
         })));
       }
@@ -7230,32 +7236,32 @@ async function ur(t) {
         syncViewTimeZone: l,
         errorStrings: n,
         abortSignal: f
-      }), L = B ? Yl(B.unit) : await Ut({ queryObject: a, queryConfig: i, category: x, errorStrings: n, abortKey: d, abortSignal: f });
+      }), P = B ? Yl(B.unit) : await Ut({ queryObject: a, queryConfig: i, category: b, 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[b]}`;
           G.push(X), $.push({
             [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
             [Q.yField]: X,
-            [P]: J[N]
+            [L]: J[N]
           });
-        }), r && L && G.length !== L?.length) {
-          const J = L.filter((X) => !G.includes(X.toString()));
-          w && (J.length !== L.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 && zi({
+        }), r && P && G.length !== P?.length) {
+          const J = P.filter((X) => !G.includes(X.toString()));
+          w && (J.length !== P.length || G.length === 0) || J.forEach((X) => {
+            Number.isFinite(Number(M[W.heatChartLowerBoundaryAlias])) && Number.isFinite(Number(X)) && (x?.unit === he.DayOfMonth && B?.unit === he.MonthOfYear && zi({
               day: Number(M[W.heatChartLowerBoundaryAlias]),
               month: Number(X),
               includeLeapDay: e.includeLeapDay
-            }) || B?.unit === he.DayOfMonth && b?.unit === he.MonthOfYear && zi({
+            }) || B?.unit === he.DayOfMonth && x?.unit === he.MonthOfYear && zi({
               day: Number(X),
               month: Number(M[W.heatChartLowerBoundaryAlias]),
               includeLeapDay: e.includeLeapDay
             })) || $.push({
               [Q.xField]: `${M[W.heatChartLowerBoundaryAlias]}`,
               [Q.yField]: X,
-              [P]: p === Se.Zero ? 0 : null
+              [L]: p === Se.Zero ? 0 : null
             });
           });
         }
@@ -7263,13 +7269,13 @@ async function ur(t) {
       }), Ae({
         count: O,
         seriesCount: 1,
-        chartType: S.HeatSeries,
+        chartType: h.HeatSeries,
         chartLimits: o
-      }) || Dt({ dataInfo: m, chartType: S.HeatSeries });
+      }) || Dt({ dataInfo: m, chartType: h.HeatSeries });
     }
     y && (m.data = {
       dataItems: y,
-      heatChartAxesData: Ja({ chartConfig: e, chartData: y })
+      heatChartAxesData: Xa({ chartConfig: e, chartData: y })
     });
   }
   return m;
@@ -7277,7 +7283,7 @@ async function ur(t) {
 function Kl(t) {
   const { chartConfig: e, data: i, chartLimits: a } = t, r = e.series;
   let n = i;
-  const s = Na(e, a);
+  const s = Ba(e, a);
   if (s !== void 0) {
     const o = ue(r);
     if (o.length === 1)
@@ -7316,28 +7322,28 @@ async function bi(t) {
     popupTemplateFieldInfosEnabled: d,
     view: f,
     syncViewTimeZone: m
-  } = t, { behaviorAfterLimit: y } = l ?? {}, p = e.series, g = p[0], { x: h } = g, x = te(g.query?.where), v = { valid: !0 };
-  let b;
+  } = t, { behaviorAfterLimit: y } = l ?? {}, p = e.series, g = p[0], { x: S } = g, b = te(g.query?.where), v = { valid: !0 };
+  let x;
   if (be(g)) {
     const { temporalBinning: B } = g;
     if (a && B) {
       const { unit: N, size: T } = B;
-      let w = 1, P = { unit: N, size: T }, A = !1;
+      let w = 1, L = { unit: N, size: T }, A = !1;
       const I = Ol({
         series: g,
         isTimeBinningSeries: !0,
         setTimeBinningInfoWhenNotProvided: u
-      }), L = !rt(x, a) || I ? await vl({ queryObject: a, queryConfig: i, x: h, errorStrings: o, abortSignal: n }) : void 0;
-      I && L && L.numberOfFeatures > 0 && L.dateRange.dateMaxTimestamp !== void 0 && L.dateRange.dateMinTimestamp !== void 0 && (P = Dl(L), Ce(a).find((G) => G.name === h)?.type === U.DateOnly && P.unit !== void 0 && [
+      }), P = !rt(b, a) || I ? await vl({ 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 = Dl(P), Ce(a).find((G) => G.name === S)?.type === U.DateOnly && L.unit !== void 0 && [
         R.Hour,
         R.Minute,
         R.Second
-      ].includes(P.unit) && (P.unit = R.Day, P.size = 1), B.size = P.size, B.unit = P.unit);
+      ].includes(L.unit) && (L.unit = R.Day, L.size = 1), B.size = L.size, B.unit = L.unit);
       const { uniqueQuery: O, mapToStatField: V } = mi({
         chartConfig: e,
         queryConfig: i,
         queryObject: a,
-        timeIntervalInfo: P,
+        timeIntervalInfo: L,
         setTimeBinningInfoWhenNotProvided: u,
         returnFeaturesExtent: c,
         chartLimits: l
@@ -7345,15 +7351,15 @@ async function bi(t) {
       let $ = Ae({
         count: w ?? 0,
         seriesCount: p.length,
-        chartType: S.LineSeries,
+        chartType: h.LineSeries,
         chartLimits: l
       });
       if ($) {
-        if (rt(x, 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 Ls({
+        if (rt(b, a)) {
+          const M = e.axes?.[0].valueFormat.type === h.DateAxisFormat ? e.axes[0].valueFormat.intlOptions.timeZone : void 0, q = s?.[0] instanceof Ir ? s : await Ls({
             queryObject: a,
-            dateField: h,
-            splitByField: x,
+            dateField: S,
+            splitByField: b,
             queryConfig: O,
             axisTimeZone: M,
             temporalBinning: B,
@@ -7362,38 +7368,38 @@ async function bi(t) {
             syncViewTimeZone: m,
             abortSignal: n
           }), G = "y" in g && typeof g.y == "string" ? g.y : void 0;
-          if (b = Ll({
+          if (x = Ll({
             chartConfig: e,
             queryResults: q,
             mapToStatField: V,
-            splitByField: x,
-            x: h,
+            splitByField: b,
+            x: S,
             y: G,
             nullPolicy: B.nullPolicy,
             queryObject: a
           }), !Ae({
-            count: b.length,
+            count: x.length,
             seriesCount: p.length,
-            chartType: S.LineSeries,
+            chartType: h.LineSeries,
             chartLimits: l
           })) {
-            const J = ue(p), X = b.filter(
+            const J = ue(p), X = x.filter(
               (H) => J.some((ae) => ae in H && Number.isFinite(H[ae]))
             ).length;
             Ae({
               count: X,
               seriesCount: p.length,
-              chartType: S.LineSeries,
+              chartType: h.LineSeries,
               chartLimits: l
             }) || ($ = !1);
           }
-        } else if (L?.dateRange.dateMinTimestamp && L.dateRange.dateMaxTimestamp) {
-          const { numberOfFinalBinsWithinDataRange: M } = rr({
-            dateMinTimestamp: L.dateRange.dateMinTimestamp,
-            dateMaxTimestamp: L.dateRange.dateMaxTimestamp,
-            timeIntervalInfo: P
+        } else if (P?.dateRange.dateMinTimestamp && P.dateRange.dateMaxTimestamp) {
+          const { numberOfFinalBinsWithinDataRange: M } = ar({
+            dateMinTimestamp: P.dateRange.dateMinTimestamp,
+            dateMaxTimestamp: P.dateRange.dateMaxTimestamp,
+            timeIntervalInfo: L
           });
-          w = M * p.length, w = ar(w, P.unit), b = await _t({
+          w = M * p.length, w = ir(w, L.unit), x = await _t({
             queryObject: a,
             uniqueQuery: O,
             chartConfig: e,
@@ -7405,21 +7411,21 @@ async function bi(t) {
             errorStrings: o,
             abortKey: r,
             abortSignal: n
-          }), b = await Pl({
+          }), x = await Pl({
             queryObject: a,
             queryConfig: i,
-            queryResults: b,
-            x: h,
+            queryResults: x,
+            x: S,
             seriesConfig: p,
-            dateRange: L.dateRange,
-            timeIntervalInfo: P,
+            dateRange: P.dateRange,
+            timeIntervalInfo: L,
             errorStrings: o,
             abortSignal: n
           });
         }
-        ca(a) && b && b?.length === gl && (A = !0), y === lt.RenderUpToTheLimit && b && (b = Kl({ chartConfig: e, chartLimits: l, data: b }));
+        ua(a) && x && x?.length === gl && (A = !0), y === lt.RenderUpToTheLimit && x && (x = Kl({ chartConfig: e, chartLimits: l, data: x }));
       }
-      $ || (v.valid = !1, v.invalidType = j.LineChartExceedsLimit), b && b.length > 0 && (b[b.length - 1][C.lastTemporalBin] = !0), v.data = { dataItems: b, timeIntervalInfo: P, serverLimitReached: A }, v.count = w;
+      $ || (v.valid = !1, v.invalidType = j.LineChartExceedsLimit), x && x.length > 0 && (x[x.length - 1][C.lastTemporalBin] = !0), v.data = { dataItems: x, timeIntervalInfo: L, serverLimitReached: A }, v.count = w;
     }
   }
   return v;
@@ -7463,7 +7469,7 @@ async function eu(t) {
     errorStrings: c,
     abortKey: r
   });
-  return de(e) && (g = Xa({ chartConfig: e, data: g, calculateZScore: !1 })), d.data = { dataItems: g }, d;
+  return de(e) && (g = Za({ chartConfig: e, data: g, calculateZScore: !1 })), d.data = { dataItems: g }, d;
 }
 async function tu(t) {
   const {
@@ -7536,9 +7542,9 @@ async function ru(t) {
     dataContextCountDistinctX: m,
     dataContextCountDistinctY: y
   } = C.scatterplotAggregationFields;
-  let p, g, h, 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)) {
+  let p, g, S, b, v;
+  const x = e.get(c), B = e.get(l), N = e.get(d), T = e.get(f);
+  if (x != null && N !== void 0 && N !== null && B !== void 0 && B !== null && T !== void 0 && T !== null && !Number.isNaN(x + B + N + T)) {
     const { maxScatterPointsAfterAggregation: w } = ut(r), A = Math.floor(Math.sqrt(w)), I = await au({
       queryObject: a,
       chartConfig: i,
@@ -7547,7 +7553,7 @@ async function ru(t) {
       abortKey: o,
       abortSignal: u
     });
-    h = Math.min(I.get(y) ?? Number.NaN, A), x = Math.min(I.get(m) ?? Number.NaN, A), v = x * h, p = B === b ? 0 : (B - b) / (x - 1), g = T === N ? 0 : (T - N) / (h - 1), e.set(C.scatterplotAggregationFields.xStep, p), e.set(C.scatterplotAggregationFields.yStep, g), e.set(C.scatterplotAggregationFields.rowCount, h), e.set(C.scatterplotAggregationFields.columnCount, x), e.set(C.scatterplotAggregationFields.realGridSize, v);
+    S = Math.min(I.get(y) ?? Number.NaN, A), b = Math.min(I.get(m) ?? Number.NaN, A), v = b * S, p = B === x ? 0 : (B - x) / (b - 1), g = T === N ? 0 : (T - N) / (S - 1), e.set(C.scatterplotAggregationFields.xStep, p), e.set(C.scatterplotAggregationFields.yStep, g), e.set(C.scatterplotAggregationFields.rowCount, S), e.set(C.scatterplotAggregationFields.columnCount, b), e.set(C.scatterplotAggregationFields.realGridSize, v);
   }
 }
 function nu(t) {
@@ -7600,12 +7606,12 @@ async function ou(t) {
     dataContextYMinField: y,
     dataContextYMaxField: p,
     queryNumberOfFeatures: g,
-    queryNumberOfAggregatedFeatures: h
+    queryNumberOfAggregatedFeatures: S
   } = C.scatterplotAggregationFields;
-  let x;
-  const v = e?.get(f) ?? Number.NaN, b = e?.get(m) ?? Number.NaN, B = e?.get(g) ?? Number.NaN, N = e?.get(y) ?? v, T = e?.get(p) ?? 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: P, isTraditionalTypeOID: A } = ve(w), I = A ? P : "*", L = 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);
+  let b;
+  const v = e?.get(f) ?? Number.NaN, x = e?.get(m) ?? Number.NaN, B = e?.get(g) ?? Number.NaN, N = e?.get(y) ?? v, T = e?.get(p) ?? x;
+  if (v != null && N !== void 0 && N !== null && x !== void 0 && x !== null && T !== void 0 && T !== null && !Number.isNaN(v + x + N + T)) {
+    const w = z(a), { idField: L, isTraditionalTypeOID: A } = ve(w), I = A ? L : "*", P = e?.get(C.scatterplotAggregationFields.xStep), O = e?.get(C.scatterplotAggregationFields.yStep), V = e?.get(C.scatterplotAggregationFields.realGridSize), $ = e?.get(C.scatterplotAggregationFields.rowCount), M = e?.get(C.scatterplotAggregationFields.columnCount), q = /* @__PURE__ */ new Map(), G = Ce(a);
     if (G?.forEach((H) => {
       St(H) && q.set(H.name, {
         onStatisticField: H.name,
@@ -7618,15 +7624,15 @@ async function ou(t) {
         outStatisticFieldName: H.name,
         statisticType: D.Maximum
       });
-    }), (await Qa(w)).forEach((H) => {
+    }), (await ka(w)).forEach((H) => {
       q.set(H, {
         onStatisticField: H,
         outStatisticFieldName: H,
         statisticType: D.Maximum
       });
-    }), P !== "" && q.set(P, {
+    }), L !== "" && q.set(L, {
       onStatisticField: I,
-      outStatisticFieldName: h,
+      outStatisticFieldName: S,
       statisticType: D.Count
     }), q.set(l, {
       onStatisticField: l,
@@ -7636,18 +7642,18 @@ async function ou(t) {
       onStatisticField: d,
       outStatisticFieldName: d,
       statisticType: D.Maximum
-    }), L !== void 0 && O !== void 0) {
+    }), P !== void 0 && O !== void 0) {
       if (n) {
         const H = {
           ...r,
           outStatistics: [...q.values()]
         };
-        x = await Ns({
+        b = await Ns({
           queryObject: a,
           queryConfig: H,
-          xStep: L,
+          xStep: P,
           xMin: v,
-          xMax: b,
+          xMax: x,
           x: l,
           y: d,
           yStep: O,
@@ -7666,13 +7672,13 @@ async function ou(t) {
               y: d,
               xValue: Xe,
               yValue: ke,
-              xStep: L,
+              xStep: P,
               yStep: O,
               endOfRow: xt === $,
               endOfColumn: Ht === M
-            }), Xe < Ct && (Ct = Xe), Xe + L > vt && (vt = Xe + L), ke < Bt && (Bt = ke), ke + L > Nt && (Nt = ke + O), H += 1, H % vi === 0 || H === V || H === B) {
+            }), Xe < Ct && (Ct = Xe), Xe + P > vt && (vt = Xe + P), ke < Bt && (Bt = ke), ke + P > Nt && (Nt = ke + O), H += 1, H % vi === 0 || H === V || H === B) {
               Je = `${Je} ${Ue.groupByCaseEnd}`;
-              const pr = {
+              const gr = {
                 ...r,
                 groupByFieldsForStatistics: [Je],
                 outStatistics: [...q.values()]
@@ -7680,7 +7686,7 @@ async function ou(t) {
               Bi.push(
                 su({
                   chartConfig: i,
-                  queryConfig: pr,
+                  queryConfig: gr,
                   queryObject: a,
                   xMin: Ct,
                   xMax: vt,
@@ -7694,13 +7700,13 @@ async function ou(t) {
             }
             ke += O, xt += 1;
           }
-          Xe += L, Ht += 1;
+          Xe += P, Ht += 1;
         }
-        x = (await Promise.all(Bi)).flat();
+        b = (await Promise.all(Bi)).flat();
       }
     }
   }
-  return x;
+  return b;
 }
 async function lu(t) {
   const { chartConfig: e, queryConfig: i, queryObject: a, errorStrings: r, abortKey: n, abortSignal: s } = t, o = e.series[0], { x: u, y: c } = o;
@@ -7711,10 +7717,10 @@ async function lu(t) {
     dataContextYMinField: m,
     dataContextYMaxField: y,
     queryNumberOfFeatures: p
-  } = C.scatterplotAggregationFields, { idField: g, isTraditionalTypeOID: h } = ve(z(a)), x = h ? g : "*", v = [
+  } = C.scatterplotAggregationFields, { idField: g, isTraditionalTypeOID: S } = ve(z(a)), b = S ? g : "*", v = [
     {
       statisticType: D.Count,
-      onStatisticField: x,
+      onStatisticField: b,
       outStatisticFieldName: p
     },
     {
@@ -7740,10 +7746,10 @@ async function lu(t) {
       onStatisticField: c
     }
   );
-  const b = { ...i };
-  return b.outStatistics = v, l = await bt({
+  const x = { ...i };
+  return x.outStatistics = v, l = await bt({
     queryObject: a,
-    queryConfig: b,
+    queryConfig: x,
     errorStrings: r,
     abortKey: n,
     abortSignal: s
@@ -7757,42 +7763,42 @@ function uu(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;
   let d = [];
   if (e && "stackedAttributes" in i && i.stackedAttributes) {
-    const f = Ma(a, r), m = i.attributes[f.lowerBoundaryAlias], y = i.attributes[f.upperBoundaryAlias];
+    const f = Pa(a, r), m = i.attributes[f.lowerBoundaryAlias], y = i.attributes[f.upperBoundaryAlias];
     i.stackedAttributes.forEach((p) => {
-      let g = p[f.stackAlias], h;
-      typeof g == "number" && typeof n == "number" && (g *= n), typeof g == "number" && typeof n == "number" && (h = g + n);
-      const x = p[a], v = p[r];
-      typeof g == "number" && typeof h == "number" && typeof x == "number" && typeof v == "number" && d.push({
+      let g = p[f.stackAlias], S;
+      typeof g == "number" && typeof n == "number" && (g *= n), typeof g == "number" && typeof n == "number" && (S = g + n);
+      const b = p[a], v = p[r];
+      typeof g == "number" && typeof S == "number" && typeof b == "number" && typeof v == "number" && d.push({
         ...p,
-        [a]: At({ value: x, valueMin: m, valueMax: y }),
-        [r]: At({ value: v, valueMin: g, valueMax: h }),
+        [a]: At({ value: b, valueMin: m, valueMax: y }),
+        [r]: At({ value: v, valueMin: g, valueMax: S }),
         [o]: Math.min(m, y),
         [u]: Math.max(m, y),
         [c]: g,
-        [l]: h
+        [l]: S
       });
     });
   } else {
     const { expr: f, isInItem: m } = Et(i.attributes);
     if (m && f && i.attributes[f] !== s) {
-      let [y, p, g, h] = i.attributes[f].split("|");
-      y = Math.min(y, p), p = Math.max(y, p), g = Math.min(g, h), h = Math.max(g, h);
-      const x = {
+      let [y, p, g, S] = i.attributes[f].split("|");
+      y = Math.min(y, p), p = Math.max(y, p), g = Math.min(g, S), S = Math.max(g, S);
+      const b = {
         ...i.attributes,
         [o]: y,
         [u]: p,
         [c]: g,
-        [l]: h
+        [l]: S
       };
-      x[a] = At({
-        value: x[a],
+      b[a] = At({
+        value: b[a],
         valueMin: y,
         valueMax: p
-      }), x[r] = At({
-        value: x[r],
+      }), b[r] = At({
+        value: b[r],
         valueMin: g,
-        valueMax: h
-      }), d = [x];
+        valueMax: S
+      }), d = [b];
     }
   }
   return d;
@@ -7817,19 +7823,19 @@ function cu(t) {
 async function du(t) {
   const { queryObject: e, queryConfig: i, chartConfig: a, featureCount: r, errorStrings: n, abortKey: s, abortSignal: o } = t, u = a.series[0], { x: c, y: l } = u, d = z(e);
   let f = [];
-  const m = Ce(e), y = $t(d).idFields, p = (m?.filter((b) => St(b) && b.name !== c && b.name !== l) ?? []).map(
-    (b) => b.name
-  ) ?? [], g = u?.additionalTooltipFields ?? [], h = Array.from(
+  const m = Ce(e), y = $t(d).idFields, p = (m?.filter((x) => St(x) && x.name !== c && x.name !== l) ?? []).map(
+    (x) => x.name
+  ) ?? [], g = u?.additionalTooltipFields ?? [], S = Array.from(
     /* @__PURE__ */ new Set([c, l, ...y ?? [], ...p, ...g])
-  ), x = ge(d);
-  if (x && !x.isTable) {
-    const { rendererField: b, rendererNormalizationField: B } = to(d?.renderer ?? void 0);
-    oe(b) || h.push(b), oe(B) || h.push(B);
+  ), b = ge(d);
+  if (b && !b.isTable) {
+    const { rendererField: x, rendererNormalizationField: B } = to(d?.renderer ?? void 0);
+    oe(x) || S.push(x), oe(B) || S.push(B);
   }
   const v = {
     ...i,
     orderByFields: [`${c} ${ye.Ascending}`],
-    outFields: h
+    outFields: S
   };
   return f = await Fe({
     queryObject: e,
@@ -7877,7 +7883,7 @@ async function fu(t) {
   }
   return e;
 }
-async function cr(t) {
+async function ur(t) {
   const {
     chartConfig: e,
     queryConfig: i,
@@ -7900,7 +7906,7 @@ async function cr(t) {
       errorStrings: o,
       abortKey: u,
       abortSignal: c
-    }), { queryNumberOfFeatures: f, yStep: m } = C.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), p = d?.get(f) ?? Number.NaN, g = p >= y, h = yn(a);
+    }), { queryNumberOfFeatures: f, yStep: m } = C.scatterplotAggregationFields, { maxScatterPointsBeforeAggregation: y } = ut(s), p = d?.get(f) ?? Number.NaN, g = p >= y, S = yn(a);
     g && await ru({
       statsMap: d,
       chartConfig: e,
@@ -7911,26 +7917,26 @@ async function cr(t) {
       abortKey: u,
       abortSignal: c
     });
-    const x = await fu({
+    const b = await fu({
       ...t,
       queryObject: a,
       statsMap: d,
       numberOfFeatures: p,
       isAggregationMode: g,
-      useQueryAttributeBins: h
+      useQueryAttributeBins: S
     }), v = cu({
       chartConfig: e,
-      rawData: x,
+      rawData: b,
       isAggregationMode: g,
       yStep: d.get(m),
-      useQueryAttributeBins: h
+      useQueryAttributeBins: S
     });
     r !== !1 && pt({
       arrayToSort: v,
       sortingField: e.series[0].x,
       orderBy: ye.Ascending
     });
-    const { r2: b, trendLinePoints: B } = n !== !1 ? await Ea({
+    const { r2: x, trendLinePoints: B } = n !== !1 ? await Ia({
       data: v,
       statsMap: d,
       queryConfig: i,
@@ -7939,7 +7945,7 @@ async function cr(t) {
       errorStrings: o,
       abortSignal: c
     }) : C.scatterplotSeries;
-    l = { dataItems: v, r2: b, trendLinePoints: B, aggregated: g };
+    l = { dataItems: v, r2: x, trendLinePoints: B, aggregated: g };
   }
   return l;
 }
@@ -7957,20 +7963,20 @@ function it(t) {
     [E.StandardDeviation]: `${e ? "" : `${t}_`}${E.StandardDeviation}`
   };
 }
-function dr(t) {
-  return "subType" in t && t.subType === xr.FeatureGauge;
+function cr(t) {
+  return "subType" in t && t.subType === br.FeatureGauge;
 }
 function xi(t) {
   let e;
   return t !== void 0 && ("bins" in t ? e = t.bins : "dataItems" in t && (e = t.dataItems)), e;
 }
-function fr(t) {
+function dr(t) {
   return t === F.BoxPlotMultiFields || t === F.BoxPlotMultiFieldsAndCategory || t === F.BoxPlotMultiFieldsAndSplitBy;
 }
 function K(t) {
   const { key: e, y: i, chartSubType: a, splitBy: r, splitByValue: n, showOutliers: s, standardizeValues: o } = t;
   let u = n, l = it(i)[e];
-  return s === !0 && (e === E.Min || e === E.Max) && (l = `${l}${Rr}`), o === !0 && (fr(a) || e === E.Outlier) && (l = `${l}${$r}`), (n === void 0 || `${n}`.trim() === "") && (u = fe({ where: r, normalize: !0, escape: !1 })), u !== void 0 && `${u}`.trim() !== "" && (l = `${u}${l !== "" ? `_${l}` : ""}`), l;
+  return s === !0 && (e === E.Min || e === E.Max) && (l = `${l}${Vr}`), o === !0 && (dr(a) || e === E.Outlier) && (l = `${l}${Rr}`), (n === void 0 || `${n}`.trim() === "") && (u = fe({ where: r, normalize: !0, escape: !1 })), u !== void 0 && `${u}`.trim() !== "" && (l = `${u}${l !== "" ? `_${l}` : ""}`), l;
 }
 function Yt(t) {
   const { dataItem: e, y: i, splitBy: a, showOutliers: r } = t, n = K({ key: E.FirstQuartile, y: i, splitBy: a, showOutliers: r }), s = K({ key: E.ThirdQuartile, y: i, splitBy: a, showOutliers: r });
@@ -8007,12 +8013,12 @@ function mu(t) {
   }
   return s;
 }
-function mr(t) {
+function fr(t) {
   return t.map((e) => e.id).filter((e) => e !== void 0);
 }
 function ue(t, e) {
   let i = [];
-  const a = e ?? mr(t), r = k(t);
+  const a = e ?? fr(t), r = k(t);
   return i = t.filter((n) => a.includes(n.id)).map((n) => {
     let s = "y" in n ? n.y : void 0;
     return s !== void 0 && r === F.BarAndLineSplitByNoAggregation && (s = `${s.toString()}_${fe({ where: n.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), s;
@@ -8022,7 +8028,7 @@ function Ci(t) {
   const { seriesConfig: e, filteredSeriesIds: i, showMean: a } = t;
   let r = [];
   if (a === !0) {
-    const n = e.find((s) => s.type === S.BoxPlotSeries);
+    const n = e.find((s) => s.type === h.BoxPlotSeries);
     n !== void 0 && "y" in n && (r = [n.y].flat());
   } else
     r = ue(e, i);
@@ -8047,22 +8053,22 @@ function zd(t) {
       r = !a.some((o) => {
         let u = !1;
         switch (n) {
-          case S.HistogramSeries:
+          case h.HistogramSeries:
             {
               const c = o;
               u = Me(c.minValue, i) && Me(c.maxValue, i);
             }
             break;
-          case S.ScatterSeries:
+          case h.ScatterSeries:
             {
               const c = o, { x: l, y: d } = e.series[0];
               u = Me(c[l], i) && Me(c[d], i);
             }
             break;
-          case S.ComboLineAndBarSeries:
-          case S.RadarSeries:
-          case S.LineSeries:
-          case S.BarSeries: {
+          case h.ComboLineAndBarSeries:
+          case h.RadarSeries:
+          case h.LineSeries:
+          case h.BarSeries: {
             const c = o, { x: l } = e.series[0];
             u = s.some(
               (d) => yu({
@@ -8075,7 +8081,7 @@ function zd(t) {
             );
             break;
           }
-          case S.BoxPlotSeries: {
+          case h.BoxPlotSeries: {
             if (de(e)) {
               const c = e.series;
               u = mu({
@@ -8087,22 +8093,22 @@ function zd(t) {
             }
             break;
           }
-          case S.PieSeries:
+          case h.PieSeries:
             {
               const c = o;
               let { x: l, y: d } = e.series[0];
               k(e.series) === F.PieFromFields && (l = ce, d = Ne);
               const f = c[d];
-              u = c[l] !== void 0 && c[l] !== null && !hr(f) && Me(Number(f), i);
+              u = c[l] !== void 0 && c[l] !== null && !pr(f) && Me(Number(f), i);
             }
             break;
-          case S.GaugeSeries:
+          case h.GaugeSeries:
             {
               const { x: c } = e.series[0];
               u = Me(o[c], i);
             }
             break;
-          case S.HeatSeries:
+          case h.HeatSeries:
             u = a.some(
               (c) => Me(c[Q.valueField], i)
             );
@@ -8115,7 +8121,7 @@ function zd(t) {
   return r;
 }
 function gu(t, e) {
-  const i = /* @__PURE__ */ new Map(), a = e ?? mr(t);
+  const i = /* @__PURE__ */ new Map(), a = e ?? fr(t);
   return t.forEach((r) => {
     if (a.includes(r.id) && "y" in r) {
       const n = i.get(r.type) ?? [];
@@ -8125,7 +8131,7 @@ function gu(t, e) {
 }
 function pu(t) {
   const { seriesConfig: e, filteredSeriesIds: i, filteredData: a } = t, r = gu(e, i), n = e.find(
-    (c) => c.type === S.LineSeries || c.type === S.RadarSeries
+    (c) => c.type === h.LineSeries || c.type === h.RadarSeries
   )?.stackNegativeValuesToBaseline ?? !0;
   let s = Number.MIN_SAFE_INTEGER, o = Number.MAX_SAFE_INTEGER, u = !1;
   return a.forEach((c) => {
@@ -8157,27 +8163,27 @@ function Wi(t) {
   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 === S.HistogramSeries && s.length > 0) {
+    if (l === h.HistogramSeries && s.length > 0) {
       const d = s[0]?.[qi.Start], f = s[s.length - 1]?.[qi.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 } = ht(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) {
+      if ({ min: a, max: r } = ht(d, (m) => m[c]), n.axes?.[0]?.valueFormat.type === h.DateAxisFormat && a !== void 0 && r !== void 0 && ([a, r] = [new Date(a).valueOf(), new Date(r).valueOf()]), l === h.BoxPlotSeries) {
         e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER;
         const m = ue(u, o), y = k(u), p = "standardizeValues" in n ? n.standardizeValues === !0 : void 0, g = n.series.map(
-          (h) => h.visible !== !1 ? fe({ where: h.query?.where }) : ""
+          (S) => S.visible !== !1 ? fe({ where: S.query?.where }) : ""
         );
-        g.length === 0 && g.push(" "), d.forEach((h) => {
-          m.forEach((x) => {
-            const v = y === F.BoxPlotMultiFieldsAndCategory ? x : void 0;
-            g.forEach((b) => {
+        g.length === 0 && g.push(" "), d.forEach((S) => {
+          m.forEach((b) => {
+            const v = y === F.BoxPlotMultiFieldsAndCategory ? b : void 0;
+            g.forEach((x) => {
               const { min: B, max: N } = hu({
                 y: v,
-                splitByValue: b,
+                splitByValue: x,
                 chartSubType: y,
                 showOutliers: !1,
                 standardizeValues: p,
-                dataItem: h
+                dataItem: S
               });
               B != null && B < e && (e = B), N != null && N > i && (i = N);
             });
@@ -8199,11 +8205,11 @@ function Wi(t) {
           case Te.Side:
           default: {
             e = Number.MAX_SAFE_INTEGER, i = Number.MIN_SAFE_INTEGER, ue(u, o).forEach((p) => {
-              const { min: g, max: h } = ht(
+              const { min: g, max: S } = ht(
                 d,
-                (x) => x[p]
+                (b) => b[p]
               );
-              g !== void 0 && g < e && (e = g), h !== void 0 && h > i && (i = h);
+              g !== void 0 && g < e && (e = g), S !== void 0 && S > i && (i = S);
             });
             break;
           }
@@ -8220,11 +8226,11 @@ function Su(t) {
     return (a === void 0 || a.includes(n.id)) && (i === !0 && "assignToSecondValueAxis" in n && n.assignToSecondValueAxis === !0 || i !== !0 && (!("assignToSecondValueAxis" in n) || n.assignToSecondValueAxis !== !0)) && ({ id: s } = n), s;
   }).filter((n) => n !== "")), r;
 }
-function yr(t) {
+function mr(t) {
   let e = !1;
   if (t) {
     const i = t.axes?.[0], a = i?.isLogarithmic === !0, r = i?.valueFormat?.type;
-    e = (r === S.NumberAxisFormat || r === S.DateAxisFormat) && a;
+    e = (r === h.NumberAxisFormat || r === h.DateAxisFormat) && a;
   }
   return e;
 }
@@ -8232,11 +8238,11 @@ function oi(t, e) {
   let i = !1;
   return Number.isFinite(t) && t !== Number.MAX_SAFE_INTEGER && Number.isFinite(e) && e !== Number.MIN_SAFE_INTEGER && (i = t <= 0 || e <= 0), i;
 }
-function gr(t) {
+function yr(t) {
   const { chartConfig: e, chartData: i, axisConfigIndex: a } = t;
   let r = !1;
   if (a === 0) {
-    if (yr(e)) {
+    if (mr(e)) {
       const { minX: n, maxX: s } = Wi({
         chartConfig: e,
         chartData: i
@@ -8260,7 +8266,7 @@ function Wd(t) {
   const { chartConfig: e, axisConfigIndex: i, chartData: a } = t;
   let r = !0;
   const n = e?.axes?.[i];
-  return e && a && n?.isLogarithmic === !0 && (r = !gr({ chartConfig: e, chartData: a, axisConfigIndex: i })), r;
+  return e && a && n?.isLogarithmic === !0 && (r = !yr({ chartConfig: e, chartData: a, axisConfigIndex: i })), r;
 }
 function Fu(t, e) {
   const i = t;
@@ -8274,11 +8280,11 @@ function bu(t, e) {
   const i = _(e);
   let a = t;
   const r = e?.[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) {
+  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) {
     const n = li(t);
     let s = n ? t : t.dataItems;
     if (t !== void 0) {
-      const { originalCategoryValue: o, originalYCategoryValue: u, originalDateValue: c, xAxisField: l } = C, d = i === S.HeatSeries ? Q.xField : r.x, f = i === S.HeatSeries ? Q.yField : 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;
       s = s.map((m) => {
         let y = m[d];
         m[c] !== void 0 ? y = m[c] : m[o] !== void 0 && (y = m[o]);
@@ -8307,18 +8313,18 @@ function xu(t, e) {
   let r = xi(i);
   if (r !== void 0)
     switch (a) {
-      case S.ComboLineAndBarSeries:
-      case S.BarSeries:
-      case S.LineSeries:
-      case S.RadarSeries:
-      case S.PieSeries:
+      case h.ComboLineAndBarSeries:
+      case h.BarSeries:
+      case h.LineSeries:
+      case h.RadarSeries:
+      case h.PieSeries:
         {
           r = r.map(Gi), i = { dataItems: r };
           const { timeIntervalInfo: n, serverLimitReached: s } = t ?? {};
-          Sr(n) || (i.timeIntervalInfo = n), s !== void 0 && (i.serverLimitReached = s);
+          hr(n) || (i.timeIntervalInfo = n), s !== void 0 && (i.serverLimitReached = s);
         }
         break;
-      case S.ScatterSeries:
+      case h.ScatterSeries:
         i = {
           ...i,
           dataItems: r.map(Gi)
@@ -8344,21 +8350,21 @@ function Cu(t) {
     const c = e[u];
     if (c !== void 0) {
       let l;
-      if (r === S.ScatterSeries)
+      if (r === h.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 === S.HeatSeries)
+        if (a[0].type === h.HeatSeries)
           i > 0 && l.forEach((d) => {
             o.set(
               `${d[Q.xField]}-${d[Q.yField]}`,
               d
             );
           });
-        else if (a[0].type === S.ScatterSeries) {
+        else if (a[0].type === h.ScatterSeries) {
           const { x: d, y: f } = a[0];
           s.push(
             ...l.map((m) => ({
@@ -8395,13 +8401,13 @@ async function vu(t) {
     returnFeaturesExtent: f,
     popupTemplateFieldInfosEnabled: m,
     view: y
-  } = t, { series: p } = a, g = _(p), h = [], { maxOIDsPerSelectionQuery: x } = Vt();
-  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 };
+  } = t, { series: p } = a, g = _(p), S = [], { maxOIDsPerSelectionQuery: b } = Vt();
+  for (let x = 0; x < e; x += 1) {
+    const B = x * b, N = (x + 1) * b - 1, T = i.slice(B === 0 ? 0 : B - 1, N), w = { ...r };
     switch (w.objectIds = T, g) {
-      case S.HeatSeries:
-        h.push(
-          ur({
+      case h.HeatSeries:
+        S.push(
+          lr({
             completeHeatChartDataset: !1,
             // we do not want the empty bins to be added for the selection
             chartConfig: a,
@@ -8415,21 +8421,21 @@ async function vu(t) {
           })
         );
         break;
-      case S.PieSeries:
-      case S.BarSeries:
-      case S.LineSeries:
-      case S.RadarSeries:
-      case S.ComboLineAndBarSeries:
+      case h.PieSeries:
+      case h.BarSeries:
+      case h.LineSeries:
+      case h.RadarSeries:
+      case h.ComboLineAndBarSeries:
         if (Pe({
           xAxisValueFormatType: xe(a),
           setTimeBinningInfoWhenNotProvided: d,
           seriesConfig: p[0],
           queryObject: s
         })) {
-          const P = He(a);
-          "temporalBinning" in P.series[0] && P.series[0].temporalBinning && (P.series[0].temporalBinning.trimIncompleteTimeInterval = !1, rt(o, s) && (delete P.series[0].temporalBinning.start, delete P.series[0].temporalBinning.end)), h.push(
+          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(
             bi({
-              chartConfig: P,
+              chartConfig: L,
               queryConfig: w,
               queryObject: s,
               chartLimits: l,
@@ -8441,7 +8447,7 @@ async function vu(t) {
             })
           );
         } else
-          h.push(
+          S.push(
             eu({
               queryObject: s,
               chartConfig: a,
@@ -8454,8 +8460,8 @@ async function vu(t) {
             })
           );
         break;
-      case S.BoxPlotSeries:
-        h.push(
+      case h.BoxPlotSeries:
+        S.push(
           tu({
             queryObject: s,
             chartConfig: a,
@@ -8471,9 +8477,9 @@ async function vu(t) {
           })
         );
         break;
-      case S.ScatterSeries:
-        h.push(
-          cr({
+      case h.ScatterSeries:
+        S.push(
+          ur({
             queryObject: s,
             chartConfig: a,
             queryConfig: w,
@@ -8492,8 +8498,8 @@ async function vu(t) {
           })
         );
         break;
-      case S.HistogramSeries:
-        h.push(
+      case h.HistogramSeries:
+        S.push(
           Mo({
             queryObject: s,
             queryConfig: w,
@@ -8505,7 +8511,7 @@ async function vu(t) {
         break;
     }
   }
-  return await Promise.all(h);
+  return await Promise.all(S);
 }
 async function Yd(t) {
   const {
@@ -8525,13 +8531,13 @@ async function Yd(t) {
     viewExtentUpdated: y,
     runtimeDataFilters: p,
     ignoreViewExtent: g,
-    returnSelectionOIDs: h,
-    selectionData: x
-  } = t, { series: v } = e, { selectionItems: b, selectionOIDs: B } = x ?? {};
+    returnSelectionOIDs: S,
+    selectionData: b
+  } = t, { series: v } = e, { selectionItems: x, selectionOIDs: B } = b ?? {};
   let N;
-  const T = _(v), w = T !== S.HistogramSeries && T !== S.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 && h !== !1 && B !== void 0 && B.length > 0 && (a === !0 || w || u)) {
-    const A = xi(i), I = ja({
+  const T = _(v), w = T !== h.HistogramSeries && T !== h.HeatSeries && x !== void 0 && x.length > 0 && !(v[0].x in x[0]) && !(ce in x[0]) && !(C.boxPlot.boxPlotCategory in x[0]);
+  if (y !== !0 && S !== !1 && B !== void 0 && B.length > 0 && (a === !0 || w || u)) {
+    const A = xi(i), I = _a({
       queryObject: s,
       chartConfig: e,
       runtimeDataFilters: p,
@@ -8539,12 +8545,12 @@ async function Yd(t) {
       view: m
     });
     if (A !== void 0 && !vn({ dataContext: A[0], chartConfig: e, chartLimits: c }))
-      N = A.filter((L) => {
-        const O = L[W.uniqueIdsName];
+      N = A.filter((P) => {
+        const O = P[W.uniqueIdsName];
         return typeof O == "number" || typeof O == "string" ? B?.includes(O) : !1;
       });
     else if (B?.[0] !== void 0 && I !== void 0) {
-      const { maxOIDsPerSelectionQuery: L } = Vt(), O = Math.ceil(B.length / L), V = te(e.series[0]?.query?.where), $ = await vu({
+      const { maxOIDsPerSelectionQuery: P } = Vt(), O = Math.ceil(B.length / P), V = te(e.series[0]?.query?.where), $ = await vu({
         numberOfQueries: O,
         selectionOIDs: B,
         queryConfig: I,
@@ -8570,9 +8576,9 @@ async function Yd(t) {
   return N;
 }
 const Zd = {
-  shouldCheckDataMinMaxForLogScaleOnXAxis: yr,
+  shouldCheckDataMinMaxForLogScaleOnXAxis: mr,
   minMaxHasZeroOrNegativeValues: oi,
-  isChartWithZeroOrNegativeValues: gr
+  isChartWithZeroOrNegativeValues: yr
 };
 export {
   pu as $,
@@ -8607,7 +8613,7 @@ export {
   Ec as a$,
   Pt as a0,
   qd as a1,
-  Ya as a2,
+  Ua as a2,
   yi as a3,
   ai as a4,
   ri as a5,
@@ -8617,7 +8623,7 @@ export {
   Mn as a9,
   Zs as aA,
   ks as aB,
-  Qa as aC,
+  ka as aC,
   to as aD,
   Yd as aE,
   Re as aF,
@@ -8642,8 +8648,8 @@ export {
   Dc as aY,
   Hc as aZ,
   Li as a_,
-  $a as aa,
-  ka as ab,
+  Ra as aa,
+  $a as ab,
   Fd as ac,
   ao as ad,
   vc as ae,
@@ -8654,18 +8660,18 @@ export {
   Id as aj,
   ge as ak,
   bo as al,
-  Ha as am,
+  ja as am,
   ve as an,
-  Ma as ao,
-  Oa as ap,
+  Pa as ao,
+  Da as ap,
   yo as aq,
   bd as ar,
   mo as as,
   ii as at,
   Gs as au,
   hs as av,
-  Ra as aw,
-  Va as ax,
+  Va as aw,
+  qa as ax,
   Sd as ay,
   eo as az,
   Ge as b,
@@ -8711,21 +8717,21 @@ export {
   io as bb,
   zd as bc,
   Fc as bd,
-  ca as be,
+  ua as be,
   Ee as bf,
-  dr as bg,
+  cr as bg,
   Bd as bh,
-  fr as bi,
+  dr as bi,
   Yc as bj,
   St as bk,
   fo as bl,
   pd as bm,
-  ga as bn,
+  ya as bn,
   Pe as bo,
   ro as bp,
   Cd as bq,
   bc as br,
-  da as bs,
+  ca as bs,
   fn as bt,
   vd as bu,
   wd as bv,
@@ -8765,7 +8771,7 @@ export {
   md as cR,
   We as cS,
   qi as cT,
-  Ta as cU,
+  Na as cU,
   Dd as cV,
   ad as cW,
   Hd as cX,
@@ -8805,8 +8811,8 @@ export {
   id as d3,
   jn as d4,
   mi as d5,
-  lr as d6,
-  ja as e,
+  or as d6,
+  _a as e,
   Zc as f,
   Qe as g,
   Y as h,
@@ -8819,7 +8825,7 @@ export {
   Wc as o,
   Yt as p,
   Gc as q,
-  fa as r,
+  da as r,
   Cc as s,
   mn as t,
   yn as u,