@arcgis/charts-components 4.34.0-next.137 → 4.34.0-next.139

package/dist/chunks/data.js

@@ -1,10 +1,11 @@
 import { substitute as k } from "@arcgis/core/intl.js";
-import { cloneDeep as G, capitalize as U, memoize as fe, isEmpty as we } from "lodash-es";
-import { e as Ne, a as b, u as Q, W as h, g as O, t as w, m as te, n as Ve, i as se } from "./series-types.js";
-import { a as Se, R as De } from "./rest-js-object-literals.js";
-import { ad as ie, c9 as Oe, aU as be, cd as j, au as qe, ab as V, a9 as D, b2 as L, ac as Me, p as W, c2 as $e, b as R, cx as P, c as ke, a as je, r as M, be as Ee, bF as Fe, bf as ae, bg as re, ch as Pe, l as le, cv as Ue, m as Re, bd as Ke, x as oe, ax as We, ay as ze, aA as Xe, bc as ge, ae as _e, af as Ye } from "./interfaces.js";
-import { fetchT9nStringsBundle as ne, getElementLocale as ce } from "@arcgis/toolkit/intl";
+import { cloneDeep as Z, capitalize as U, memoize as fe, isEmpty as Ne } from "lodash-es";
+import { a as S, e as Ve, u as Q, W as h, g as O, t as w, m as te, n as De, i as se } from "./series-types.js";
+import { R as Se, f as Oe } from "./rest-js-object-literals.js";
+import { b as K, c as qe, a as Me } from "./events.js";
+import { fetchT9nStringsBundle as ae, getElementLocale as re } from "@arcgis/toolkit/intl";
 import "d3-array";
+import { N as Fe, aI as $e, A as ke, a0 as ie, aJ as je, h as be, c as j, av as Pe, aA as V, aH as D, aG as L, b as Ee, m as W, C as E, at as M, aK as Ue, ar as Te, Y as le, Z as oe, ap as Ke, an as ne, ac as Re, X as We, Q as Xe, i as ce, o as ze, G as _e, w as Ye, a3 as ge, $ as Ge, ax as Ze } from "./interfaces2.js";
 import "@arcgis/core/geometry/support/jsonUtils.js";
 import "@arcgis/core/rest/support/AttributeBinsQuery.js";
 import "@arcgis/core/rest/support/Query.js";
@@ -13,14 +14,47 @@ import "@arcgis/core/time/TimeExtent.js";
 import "@arcgis/core/core/promiseUtils.js";
 import "@arcgis/core/request.js";
 import { g as de } from "./runtime.js";
-import { q as Ze, l as I, n as Ge, o as Qe, j as B, k as C } from "./index5.js";
+import { m as Qe, b as I, i as Je, n as He, a as B, f as C } from "./index.js";
 import "@arcgis/toolkit/dom";
-import { a as He, S } from "./common.js";
-import { u as Te } from "./index3.js";
+import { a as et, S as F } from "./common.js";
 /*! All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
-v4.34.0-next.137 */
-function X(t, e, s) {
+v4.34.0-next.139 */
+async function Ae(t) {
+  const { queryObject: e, queryConfig: s, category: i, splitByField: a, chartLimits: r, abortKey: c } = t, n = a !== void 0, y = i !== ke ? [i] : [];
+  n && y.push(a);
+  const l = Fe(e), x = {
+    ...s,
+    groupByFieldsForStatistics: Array.from(new Set(y)),
+    outStatistics: [
+      {
+        statisticType: S.Count,
+        onStatisticField: l.objectIdField,
+        // Generating an out stat field name. Letting it to COUNT only can fail the query on arcObject layers
+        outStatisticFieldName: `${S.Count}_OBJECTID`
+      }
+    ],
+    orderByFields: void 0,
+    // Adding num (resultRecordCount) to match the query fetching the results (build by `buildUniqueQuery()). We pick an arbitrary limit (maxBarThreePlusSeriesCountTotal)
+    // as we don't know in advance how many results we will get.
+    // TODO: once the servers are able to make a distinction between values with a different number of trailing spaces we'll be able to revert that function to its previous
+    // state, using the `returnDistinctValues` on a specific field.
+    // Refer to: https://devtopia.esri.com/WebGIS/arcgis-charts/issues/8208
+    num: r?.maxBarThreePlusSeriesCountTotal
+  }, d = await $e({
+    queryObject: e,
+    featureCount: 1,
+    // skipping the count
+    queryConfig: x,
+    abortKey: c
+  });
+  return Array.from(
+    new Set(
+      d.map((o) => o.attributes[n ? a : i])
+    )
+  ).sort((o, u) => typeof o == "string" && typeof u == "string" ? o.localeCompare(u) : Number(o) - Number(u));
+}
+function z(t, e, s) {
   const i = t?.axes?.[e];
   i?.title !== void 0 ? i.title.content.text = s : i !== void 0 && (i.title = V({
     text: s,
@@ -32,124 +66,124 @@ async function Y(t) {
   const { config: e, layerInfo: s, numericFields: i, aggregationType: a } = t;
   let r = "";
   if (e) {
-    const c = Oe(e) === Ne.Stacked100, o = await ne(
-      ce(document.documentElement).t9nLocale,
+    const c = je(e) === Ve.Stacked100, n = await ae(
+      re(document.documentElement).t9nLocale,
       de("./assets/common/t9n"),
       "messages."
     );
     if (c)
-      r = o.utilsStrings.statistics.percent;
+      r = n.utilsStrings.statistics.percent;
     else {
       const y = await be(a);
       if (i.length === 1) {
         const l = j(s.layerFieldsInfo, i[0]);
-        a === b.NoAggregation ? r = l : a === b.Count && i[0] === s.objectIdField ? r = o.utilsStrings.statistics.count : r = k(o.axisLabels.aggregationOfFieldName, {
+        a === S.NoAggregation ? r = l : a === S.Count && i[0] === s.objectIdField ? r = n.utilsStrings.statistics.count : r = k(n.axisLabels.aggregationOfFieldName, {
           aggregation: y,
           fieldName: l
         });
-      } else i.length > 1 && (a === b.NoAggregation ? r = o.axisLabels.values : r = k(o.axisLabels.aggregationOfValues, {
+      } else i.length > 1 && (a === S.NoAggregation ? r = n.axisLabels.values : r = k(n.axisLabels.aggregationOfValues, {
         aggregation: y
       }));
     }
   }
   return r;
 }
-const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
+const he = async (t, e) => t.axes?.[e] ?? (await Pe(t.type))[e], ve = (t) => {
   const { config: e, axis: s, axisIndex: i } = t;
   e.axes !== void 0 && (e.axes[i] = s);
-}, Pt = (t) => {
+}, Kt = (t) => {
   const { config: e, axisIndex: s, isMax: i } = t;
   let a = Number.NaN;
   return i ? a = e.axes?.[s]?.maximum : a = e.axes?.[s]?.minimum, a ?? Number.NaN;
 }, f = (t) => {
   const { config: e, value: s, axisIndex: i, isMax: a } = t, r = e?.axes?.[i];
   r !== void 0 && (a ? r.maximum = s : r.minimum = s);
-}, Ut = (t, e) => {
+}, Rt = (t, e) => {
   f({ config: t, value: e, axisIndex: 0, isMax: !1 });
-}, Je = (t) => t.axes?.[0]?.valueFormat ?? ie(), et = async (t, e) => {
-  const s = await Ae(t, 0);
+}, tt = (t) => t.axes?.[0]?.valueFormat ?? ie(), st = async (t, e) => {
+  const s = await he(t, 0);
   if (s !== void 0 && e !== void 0) {
     const i = {
       ...s,
       valueFormat: e
     };
-    he({ config: t, axis: i, axisIndex: 0 });
+    ve({ config: t, axis: i, axisIndex: 0 });
   }
 }, pe = (t, e, s) => {
   const i = t.axes?.[e];
   i !== void 0 && (i.integerOnlyValues = s);
-}, tt = (t) => {
+}, it = (t) => {
   const e = Q(t.series);
   return e === h.BarSeries || e === h.ComboLineAndBarSeries || e === h.LineSeries;
-}, st = (t) => {
+}, at = (t) => {
   const { axisIndex: e, config: s, isMultiAxis: i } = t;
   let a = !1;
-  return e === 0 || e === 1 && i ? a = !0 : e === 2 && (a = tt(s)), a;
-}, Rt = (t) => {
+  return e === 0 || e === 1 && i ? a = !0 : e === 2 && (a = it(s)), a;
+}, Wt = (t) => {
   const { axisIndex: e, func: s, config: i } = t;
-  return st({ axisIndex: e, config: i, isMultiAxis: !0 }) ? s(e) : void 0;
-}, Kt = (t, e) => {
+  return at({ axisIndex: e, config: i, isMultiAxis: !0 }) ? s(e) : void 0;
+}, Xt = (t, e) => {
   let s;
   const i = e.axes?.[t]?.valueFormat;
-  return (t === 0 || t >= 1 && Ze(i)) && (s = i), s;
-}, Wt = async (t) => {
-  const { config: e, valueFormat: s, axisIndex: i = 0 } = t, a = await Ae(e, i);
+  return (t === 0 || t >= 1 && Qe(i)) && (s = i), s;
+}, zt = async (t) => {
+  const { config: e, valueFormat: s, axisIndex: i = 0 } = t, a = await he(e, i);
   if (a !== void 0 && s !== void 0) {
     const r = {
       ...a,
       valueFormat: s
     };
-    he({
+    ve({
       config: e,
       axis: r,
       axisIndex: i
     });
   }
-}, zt = (t, e) => t.axes?.[e]?.isLogarithmic ?? !1, Xt = (t) => {
+}, _t = (t, e) => t.axes?.[e]?.isLogarithmic ?? !1, Yt = (t) => {
   const { config: e, isLogarithmic: s, axisIndex: i } = t, a = e.axes?.[i];
   a && (a.isLogarithmic = s, f({ config: e, value: null, axisIndex: i, isMax: !0 }), f({ config: e, value: null, axisIndex: i, isMax: !1 }));
-}, _t = (t) => {
+}, Gt = (t) => {
   const { config: e, scrollbar: s, axisIndex: i } = t;
   e.axes?.[i] !== void 0 && (e.axes[i].scrollbar = s);
-}, it = (t) => t.title?.content.text ?? "", Yt = (t, e) => {
+}, rt = (t) => t.title?.content.text ?? "", Zt = (t, e) => {
   e.title !== void 0 ? e.title.content.text = t : e.title === void 0 && t !== void 0 && (e.title = V({
     text: t,
     visible: !0,
     font: D(L.ChartTitle)
   }));
-}, Zt = (t) => t.subtitle?.content.text ?? "", Gt = (t, e) => {
+}, Qt = (t) => t.subtitle?.content.text ?? "", Jt = (t, e) => {
   e.subtitle !== void 0 ? e.subtitle.content.text = t : e.subtitle === void 0 && t !== void 0 && (e.subtitle = V({
     text: t,
     visible: !0,
     font: D(L.ChartSubtitle)
   }));
-}, Qt = (t) => t.footer?.content.text ?? "", Ht = (t, e) => {
+}, Ht = (t) => t.footer?.content.text ?? "", es = (t, e) => {
   e.footer !== void 0 ? e.footer.content.text = t : e.footer === void 0 && t !== void 0 && (e.footer = V({
     text: t,
     visible: !0,
     font: D(L.DescriptionText)
   }));
-}, Jt = (t) => t.title ? t.title.visible ?? !0 : !1, es = (t, e) => {
+}, ts = (t) => t.title ? t.title.visible ?? !0 : !1, ss = (t, e) => {
   e.title !== void 0 ? e.title.visible = t : e.title === void 0 && (e.title = V({
     text: "",
     visible: t,
     font: D(L.ChartTitle)
   }));
-}, ts = (t) => t.subtitle ? t.subtitle.visible ?? !0 : !1, ss = (t, e) => {
+}, is = (t) => t.subtitle ? t.subtitle.visible ?? !0 : !1, as = (t, e) => {
   e.subtitle !== void 0 ? e.subtitle.visible = t : e.subtitle === void 0 && (e.subtitle = V({
     text: "",
     visible: t,
     font: D(L.ChartSubtitle)
   }));
-}, at = (t) => t.footer?.visible ?? !1, is = (t, e) => {
-  e.footer !== void 0 ? e.footer.visible = t : e.footer === void 0 && t !== at(e) && (e.footer = V({
+}, lt = (t) => t.footer?.visible ?? !1, rs = (t, e) => {
+  e.footer !== void 0 ? e.footer.visible = t : e.footer === void 0 && t !== lt(e) && (e.footer = V({
     text: "",
     visible: !0,
     font: D(L.DescriptionText)
   }));
-}, as = (t) => t.chartRenderer, rs = (t, e) => {
+}, ls = (t) => t.chartRenderer, os = (t, e) => {
   e.chartRenderer = t;
-}, ls = (t, e) => t.axes?.[e]?.title?.content, os = (t) => {
+}, ns = (t, e) => t.axes?.[e]?.title?.content, cs = (t) => {
   const { config: e, axisIndex: s, symbol: i } = t, a = e.axes?.[s];
   if (a !== void 0) {
     const r = a.title?.content.text;
@@ -160,11 +194,11 @@ const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
       type: L.AxisTitle
     })), i !== void 0 && (a.title.content = i), a.title.content.text = r;
   }
-}, ns = (t) => {
+}, ds = (t) => {
   for (const e of t.axes ?? [])
     if (e?.labels !== void 0)
       return e.labels.content;
-}, cs = (t, e) => {
+}, us = (t, e) => {
   for (const s of e.axes ?? [])
     if (s !== void 0) {
       const i = s.labels?.content.text;
@@ -173,75 +207,75 @@ const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
         visible: !0,
         font: D(L.AxisLabels),
         type: L.AxisLabels
-      }) : s.labels.content = G(t), s.labels.content.text = i;
+      }) : s.labels.content = Z(t), s.labels.content.text = i;
     }
-}, ds = (t) => {
+}, ys = (t) => {
   for (const e of t.axes ?? [])
     if (e?.lineSymbol !== void 0)
       return e.lineSymbol;
-}, us = (t, e) => {
+}, ms = (t, e) => {
   for (const s of e.axes ?? [])
-    s !== void 0 && (s.lineSymbol = G(t) ?? Me());
-}, ys = (t) => {
+    s !== void 0 && (s.lineSymbol = Z(t) ?? Ee());
+}, xs = (t) => {
   for (const e of t.axes ?? [])
     if (e?.grid !== void 0)
       return e.grid;
-}, ms = (t, e, s) => {
+}, gs = (t, e, s) => {
   const i = e.axes;
   s.forEach((a) => {
-    i?.[a] !== void 0 && (i[a].grid = G(t));
+    i?.[a] !== void 0 && (i[a].grid = Z(t));
   });
-}, ue = (t, e) => e.axes?.[t]?.title?.content.text ?? "", xs = (t, e, s) => {
+}, ue = (t, e) => e.axes?.[t]?.title?.content.text ?? "", ps = (t, e, s) => {
   const i = s.axes?.[e];
   i?.title !== void 0 ? i.title.content.text = t : i !== void 0 && i?.title === void 0 && (i.title = V({
     text: t,
     visible: !0,
     font: D(L.AxisTitle)
   }));
-}, gs = (t, e) => e.axes?.[t]?.title?.visible ?? !1, ps = (t, e, s) => {
+}, fs = (t, e) => e.axes?.[t]?.title?.visible ?? !1, Ss = (t, e, s) => {
   const i = s.axes?.[e];
   i?.title !== void 0 ? i.title.visible = t : i !== void 0 && i?.title === void 0 && (i.title = V({
     text: ue(e, s),
     visible: t,
     font: D(L.AxisTitle)
   }));
-}, fs = (t, e) => t.axes?.[e]?.displayZeroLine ?? !1, Ss = (t, e, s) => {
+}, Fs = (t, e) => t.axes?.[e]?.displayZeroLine ?? !1, bs = (t, e, s) => {
   t.axes?.[s] !== void 0 && (t.axes[s].displayZeroLine = e);
-}, bs = (t, e) => t.axes?.[e]?.displayCursorTooltip ?? !1, Fs = (t) => {
+}, Ts = (t, e) => t.axes?.[e]?.displayCursorTooltip ?? !1, As = (t) => {
   const { config: e, displayCursorTooltip: s, axisIndex: i } = t;
   e.axes?.[i] !== void 0 && (e.axes[i].displayCursorTooltip = s);
-}, Ts = (t, e) => t.axes?.[e]?.buffer ?? !1, As = (t) => {
+}, hs = (t, e) => t.axes?.[e]?.buffer ?? !1, vs = (t) => {
   const { config: e, buffer: s, axisIndex: i } = t, a = e.axes?.[i];
   a !== void 0 && (a.buffer = s);
-}, hs = (t, e) => t.axes?.[e]?.tickSpacing, vs = (t) => {
+}, Bs = (t, e) => t.axes?.[e]?.tickSpacing, Cs = (t) => {
   const { config: e, tickSpacing: s, axisIndex: i } = t;
   e.axes?.[i] !== void 0 && (e.axes[i].tickSpacing = s);
-}, Bs = (t, e) => t.axes?.[e]?.integerOnlyValues ?? !1, Cs = (t) => {
+}, Ls = (t, e) => t.axes?.[e]?.integerOnlyValues ?? !1, Is = (t) => {
   const { config: e, integerOnlyValues: s, axisIndex: i } = t;
   e.axes?.[i] !== void 0 && (e.axes[i].integerOnlyValues = s);
-}, rt = (t) => {
-  let e = S.xAxisAsc;
+}, ot = (t) => {
+  let e = F.xAxisAsc;
   const s = t.orderOptions?.data?.orderType ?? w.Category, i = t.orderOptions?.data?.orderBy ?? O.Ascending;
-  return s === w.Category && Array.isArray(i) ? e = S.customSort : s === w.Category ? i === O.Ascending ? e = S.xAxisAsc : e = S.xAxisDesc : i === O.Ascending ? e = S.yAxisAsc : e = S.yAxisDesc, e;
-}, lt = (t) => {
+  return s === w.Category && Array.isArray(i) ? e = F.customSort : s === w.Category ? i === O.Ascending ? e = F.xAxisAsc : e = F.xAxisDesc : i === O.Ascending ? e = F.yAxisAsc : e = F.yAxisDesc, e;
+}, nt = (t) => {
   const e = Q(t.series);
   let s = !1;
-  return (e === h.BarSeries || e === h.LineSeries) && (s = rt(t) === S.customSort), s;
-}, Ls = (t) => {
+  return (e === h.BarSeries || e === h.LineSeries) && (s = ot(t) === F.customSort), s;
+}, ws = (t) => {
   let e = [];
   const s = t.orderOptions?.data?.orderType;
-  return lt(t) && s === w.Category && (e = t.orderOptions?.data?.orderBy), e;
-}, Is = (t, e, s) => {
+  return nt(t) && s === w.Category && (e = t.orderOptions?.data?.orderBy), e;
+}, Ns = (t, e, s) => {
   let i = w.Category, a = O.Ascending;
   const r = Q(e.series);
-  e.orderOptions ??= {}, t === S.customSort && s !== void 0 ? (a = [...s], e.orderOptions.data = {
+  e.orderOptions ??= {}, t === F.customSort && s !== void 0 ? (a = [...s], e.orderOptions.data = {
     orderType: i,
     orderBy: a
-  }) : (r === h.BarSeries || r === h.LineSeries) && (i = t === S.xAxisAsc || t === S.xAxisDesc ? w.Category : w.YValue, a = t === S.xAxisAsc || t === S.yAxisAsc ? O.Ascending : O.Descending, e.orderOptions.data = {
+  }) : (r === h.BarSeries || r === h.LineSeries) && (i = t === F.xAxisAsc || t === F.xAxisDesc ? w.Category : w.YValue, a = t === F.xAxisAsc || t === F.yAxisAsc ? O.Ascending : O.Descending, e.orderOptions.data = {
     orderType: i,
     orderBy: a
   });
-}, E = (t) => t?.series?.[0]?.x ?? "", ye = (t) => {
+}, P = (t) => t?.series?.[0]?.x ?? "", ye = (t) => {
   const {
     config: e,
     numericFields: s,
@@ -249,13 +283,13 @@ const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
     mode: a,
     layer: r,
     numericFieldIndex: c,
-    seriesIndex: o,
+    seriesIndex: n,
     splitByField: y = ""
-  } = t, l = Q(e.series), p = W(e.series), d = r ? $e(r).objectIdField : "FID", x = E(e), n = s.length === 1 && s[0] === d;
+  } = t, l = Q(e.series), x = W(e.series), d = r ? Fe(r).objectIdField : "FID", g = P(e), o = s.length === 1 && s[0] === d;
   let u = "y", m = "y";
   switch (l) {
     case h.PieSeries: {
-      i !== b.NoAggregation ? a === He.Category ? (u = `${i}_${s[0]}_0`.toUpperCase(), m = n ? U(b.Count) : U(`${i} of ${s[0]}`)) : u = je : u = s[0];
+      i !== S.NoAggregation ? a === et.Category ? (u = `${i}_${s[0]}_0`.toUpperCase(), m = o ? U(S.Count) : U(`${i} of ${s[0]}`)) : u = Me : u = s[0];
       break;
     }
     case h.BarSeries:
@@ -263,10 +297,10 @@ const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
     case h.ComboLineAndBarSeries:
     case h.RadarSeries: {
       if (y === "" || s.length > 1)
-        x === R || x === void 0 || x.trim() === "" || p === P.BarAndLineFromFields ? u = ke : (u = `${i}_${s[c ?? 0]}_${c ?? 0}`.toUpperCase(), m = n ? U(b.Count) : U(`${i} of ${s[c ?? 0]}`));
+        g === K || g === void 0 || g.trim() === "" || x === E.BarAndLineFromFields ? u = qe : (u = `${i}_${s[c ?? 0]}_${c ?? 0}`.toUpperCase(), m = o ? U(S.Count) : U(`${i} of ${s[c ?? 0]}`));
       else {
-        const g = s[0];
-        u = `${i}_${g}_${o ?? 0}`.toUpperCase(), m = n ? U(b.Count) : U(`${i} of ${g}`);
+        const p = s[0];
+        u = `${i}_${p}_${n ?? 0}`.toUpperCase(), m = o ? U(S.Count) : U(`${i} of ${p}`);
       }
       break;
     }
@@ -275,76 +309,76 @@ const Ae = async (t, e) => t.axes?.[e] ?? (await qe(t.type))[e], he = (t) => {
     name: u,
     description: m
   };
-}, ot = (t) => {
+}, ct = (t) => {
   let e;
   const s = t.series[0];
   return M(s) && (e = s.temporalBinning?.size), e;
-}, nt = (t) => {
+}, dt = (t) => {
   let e;
   const s = t.series[0];
   return M(s) && (e = s.temporalBinning?.unit), e;
-}, ct = (t) => {
+}, ut = (t) => {
   let e;
   const s = t.series[0];
   return M(s) && (e = s.temporalBinning?.timeAggregationType), e;
-}, dt = (t) => {
+}, yt = (t) => {
   let e;
   const s = t.series[0];
   return M(s) && (e = s.temporalBinning?.trimIncompleteTimeInterval), e;
-}, ut = (t) => {
+}, mt = (t) => {
   let e;
   const s = t.series[0];
   return M(s) && (e = s.temporalBinning?.nullPolicy), e;
-}, ve = (t, e) => {
+}, Be = (t, e) => {
   e?.series?.forEach((s) => {
     M(s) && (s.temporalBinning ??= {}, s.temporalBinning.size = t);
   }), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, yt = (t, e) => {
+}, xt = (t, e) => {
   e?.series?.forEach((s) => {
     M(s) && (s.temporalBinning ??= {}, s.temporalBinning.nullPolicy = t);
   }), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, ws = (t, e) => {
+}, Vs = (t, e) => {
   e.series?.forEach((s) => {
     M(s) && (s.temporalBinning ??= {}, s.temporalBinning.unit = t);
   }), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Ns = (t, e) => {
+}, Ds = (t, e) => {
   e.series?.forEach((s) => {
     M(s) && (s.temporalBinning ??= {}, s.temporalBinning.timeAggregationType = t);
   }), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Vs = (t, e) => {
+}, Os = (t, e) => {
   e.series?.forEach((s) => {
     M(s) && (s.temporalBinning ??= {}, s.temporalBinning.trimIncompleteTimeInterval = t);
   }), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Ds = (t) => {
-  ve(0, t);
+}, qs = (t) => {
+  Be(0, t);
 };
-async function mt(t) {
-  const { config: e, layer: s, xAxisField: i, splitByField: a, layerFieldsInfo: r, aggregationFields: c, fetchNullValues: o } = t, l = r.filter((F) => F.name === a)[0]?.type, p = o !== !0 ? `${a} IS NOT NULL` : "", d = i && o !== !0 ? `${i} IS NOT NULL` : "", { where: x } = e?.dataFilters ?? {}, n = {
-    where: Fe([x, p, d]),
+async function gt(t) {
+  const { config: e, layer: s, xAxisField: i, splitByField: a, layerFieldsInfo: r, aggregationFields: c, fetchNullValues: n } = t, l = r.filter((b) => b.name === a)[0]?.type, x = n !== !0 ? `${a} IS NOT NULL` : "", d = i && n !== !0 ? `${i} IS NOT NULL` : "", { where: g } = e?.dataFilters ?? {}, o = {
+    where: Te([g, x, d]),
     // excluding the null values from the list
-    orderByFields: Pe(a) ? [] : [`${a} ${O.Ascending}`],
+    orderByFields: Ke(a) ? [] : [`${a} ${O.Ascending}`],
     // default sorting ascending for split-by field
     geometry: e?.dataFilters?.geometry
   }, u = s;
   let m = "";
   c.length === 0 ? m = u?.objectIdField ?? "" : [m] = c;
-  let g = await Te({
+  let p = await Ae({
     queryObject: u,
     category: e?.series[0].x ?? "",
     splitByField: a,
-    queryConfig: n
+    queryConfig: o
   });
   if (e) {
-    const F = e?.series.map((A) => le({ where: A.query?.where })?.toString() ?? "").filter((A) => A !== void 0 && A !== "");
-    g = Ue({
-      arrayA: g,
-      arrayB: F,
-      getKey: (A) => A.toString()
+    const b = e?.series.map((T) => ne({ where: T.query?.where })?.toString() ?? "").filter((T) => T !== void 0 && T !== "");
+    p = Re({
+      arrayA: p,
+      arrayB: b,
+      getKey: (T) => T === null ? null : T?.toString()
     });
   }
-  return { categoriesArray: g, splitByFieldType: l, numericalField: m };
+  return { categoriesArray: p, splitByFieldType: l, numericalField: m };
 }
-function Os(t, e) {
+function Ms(t, e) {
   let s = e === "";
   for (const i of t)
     if (e === i.name) {
@@ -353,8 +387,8 @@ function Os(t, e) {
     }
   return s;
 }
-function qs(t, e) {
-  const s = Ee(t);
+function $s(t, e) {
+  const s = Ue(t);
   let i = e.length === 0, a = 0;
   for (const r of e) {
     for (const c of s)
@@ -367,7 +401,7 @@ function qs(t, e) {
   }
   return i;
 }
-function Ms(t, e) {
+function ks(t, e) {
   e.forEach((s) => {
     Object.getOwnPropertyNames(s.prototype).forEach((i) => {
       Object.defineProperty(
@@ -378,25 +412,25 @@ function Ms(t, e) {
     });
   });
 }
-async function xt(t) {
-  const { layerInfo: e, config: s, category: i } = t, { layer: a } = e, { where: r } = s?.dataFilters ?? {}, { fetchNullValues: c } = s?.series?.[0]?.query ?? {}, o = c !== !0 ? `${i} IS NOT NULL` : "", y = {
-    where: Fe([r, o]),
+async function pt(t) {
+  const { layerInfo: e, config: s, category: i } = t, { layer: a } = e, { where: r } = s?.dataFilters ?? {}, { fetchNullValues: c } = s?.series?.[0]?.query ?? {}, n = c !== !0 ? `${i} IS NOT NULL` : "", y = {
+    where: Te([r, n]),
     // excluding the null values from the list
     orderByFields: [],
     geometry: s?.dataFilters?.geometry
-  }, l = ae(a);
+  }, l = le(a);
   return (
     // fetch unique category values asynchronously
-    (await Te({ queryObject: a, category: i, queryConfig: y })).map((d) => {
-      const x = String(d);
-      return re({
+    (await Ae({ queryObject: a, category: i, queryConfig: y })).map((d) => {
+      const g = String(d);
+      return oe({
         fieldName: i,
-        fieldValueToMatch: x,
+        fieldValueToMatch: g,
         subtypeInfo: l,
         // use the retrieved subtype information
         fieldList: e.layerFieldsInfo
         // list of field information from the layer
-      }) ?? x;
+      }) ?? g;
     })
   );
 }
@@ -404,128 +438,128 @@ async function _(t) {
   const { seriesIndex: e, config: s, layerInfo: i } = t, { objectIdField: a } = i ?? {};
   let r;
   const c = s.series[e ?? 0];
-  let o = !1, y = !1;
+  let n = !1, y = !1;
   if (c === void 0) {
-    const n = s.series;
-    o = n.slice(0, e).every((u) => B(u)), y = n.slice(0, e).every((u) => C(u));
+    const o = s.series;
+    n = o.slice(0, e).every((u) => B(u)), y = o.slice(0, e).every((u) => C(u));
   } else
-    o = B(c), y = C(c);
-  o ? r = await We({
+    n = B(c), y = C(c);
+  n ? r = await ze({
     seriesIndex: e,
     objectIDField: a
-  }) : y ? r = await ze({
+  }) : y ? r = await _e({
     seriesIndex: e,
     objectIDField: a
-  }) : r = await Xe({
+  }) : r = await Ye({
     seriesIndex: e,
     objectIDField: a
   });
-  const l = E(s), p = s.series[0]?.dataLabels?.visible ?? !1, d = {
+  const l = P(s), x = s.series[0]?.dataLabels?.visible ?? !1, d = {
     ...r,
     x: l,
     y: "",
     dataLabels: {
       ...r.dataLabels,
       type: r.dataLabels?.type ?? h.Text,
-      content: r.dataLabels?.content ?? { type: De.TS },
-      visible: p
+      content: r.dataLabels?.content ?? { type: Oe.TS },
+      visible: x
     }
-  }, x = q(s);
+  }, g = q(s);
   if (d.query = {
     groupByFieldsForStatistics: [l]
-  }, x !== b.NoAggregation && a !== void 0) {
-    const n = `${x}_${a}_0`.toUpperCase();
-    d.y = n, d.query.outStatistics = [
+  }, g !== S.NoAggregation && a !== void 0) {
+    const o = `${g}_${a}_0`.toUpperCase();
+    d.y = o, d.query.outStatistics = [
       {
-        statisticType: x,
+        statisticType: g,
         onStatisticField: a,
-        outStatisticFieldName: n
+        outStatisticFieldName: o
       }
     ];
   }
   if (B(d) || C(d) || I(d) && s.series[0]?.binTemporalData) {
-    let n;
-    if (s?.series?.[0] !== void 0 && (n = W(s.series)), n !== P.BarAndLineNoAggregation && n !== P.BarAndLineSplitByNoAggregation) {
-      let u = nt(s);
+    let o;
+    if (s?.series?.[0] !== void 0 && (o = W(s.series)), o !== E.BarAndLineNoAggregation && o !== E.BarAndLineSplitByNoAggregation) {
+      let u = dt(s);
       u === se.Quarter && (u = se.Month), d.temporalBinning = {
-        size: ot(s),
+        size: ct(s),
         unit: u,
-        timeAggregationType: ct(s),
-        trimIncompleteTimeInterval: dt(s),
-        nullPolicy: ut(s)
+        timeAggregationType: ut(s),
+        trimIncompleteTimeInterval: yt(s),
+        nullPolicy: mt(s)
       };
     }
   }
-  return G(d);
+  return Z(d);
 }
-async function Z(t, e) {
-  const { layerFieldsInfo: s, objectIdField: i } = e, a = E(t), r = W(t.series), c = N(t), o = q(t), y = K(t), l = c.length === 0 || c.includes(i), p = await be(o), d = l ? "" : c.map((T) => j(s ?? [], T)).join(", "), x = j(s ?? [], a), n = j(s ?? [], y), u = t.series.some((T) => I(T)), m = u ? "category" : "xAxisField", g = x;
-  let F = "";
-  const A = await ne(
-    ce(document.documentElement).t9nLocale,
+async function G(t, e) {
+  const { layerFieldsInfo: s, objectIdField: i } = e, a = P(t), r = W(t.series), c = N(t), n = q(t), y = R(t), l = c.length === 0 || c.includes(i), x = await be(n), d = l ? "" : c.map((A) => j(s ?? [], A)).join(", "), g = j(s ?? [], a), o = j(s ?? [], y), u = t.series.some((A) => I(A)), m = u ? "category" : "xAxisField", p = g;
+  let b = "";
+  const T = await ae(
+    re(document.documentElement).t9nLocale,
     de("./assets/common/t9n"),
     "messages."
   );
-  if (r === P.BarAndLineFromFields)
-    F = k(A.titleLabels.aggrTypeOfAggrFields, {
-      aggregationType: p,
+  if (r === E.BarAndLineFromFields)
+    b = k(T.titleLabels.aggrTypeOfAggrFields, {
+      aggregationType: x,
       aggregationFields: d
     });
-  else if (o === b.NoAggregation) {
-    const T = l ? i : d;
+  else if (n === S.NoAggregation) {
+    const A = l ? i : d;
     if (y === "") {
-      const z = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      F = k(A.titleLabels[z], {
-        aggregationType: T,
-        [m]: g
+      const X = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      b = k(T.titleLabels[X], {
+        aggregationType: A,
+        [m]: p
       });
     } else {
-      const z = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      F = k(A.titleLabels[z], {
-        aggregationType: T,
-        [m]: g,
-        splitByField: n
+      const X = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      b = k(T.titleLabels[X], {
+        aggregationType: A,
+        [m]: p,
+        splitByField: o
       });
     }
-  } else if (o === b.Count)
+  } else if (n === S.Count)
     if (y === "") {
-      const T = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      F = k(A.titleLabels[T], {
-        aggregationType: p,
-        [m]: g
+      const A = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      b = k(T.titleLabels[A], {
+        aggregationType: x,
+        [m]: p
       });
     } else {
-      const T = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      F = k(A.titleLabels[T], {
-        aggregationType: p,
-        [m]: g,
-        splitByField: n
+      const A = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      b = k(T.titleLabels[A], {
+        aggregationType: x,
+        [m]: p,
+        splitByField: o
       });
     }
   else if (y !== "") {
-    const T = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
-    F = k(A.titleLabels[T], {
-      aggregationType: p,
+    const A = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
+    b = k(T.titleLabels[A], {
+      aggregationType: x,
       aggregationField: d,
-      [m]: g,
-      splitByField: n
+      [m]: p,
+      splitByField: o
     });
   } else if (c.length > 0) {
-    const T = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
-    F = k(A.titleLabels[T], {
-      aggregationType: p,
+    const A = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
+    b = k(T.titleLabels[A], {
+      aggregationType: x,
       aggregationFields: d,
-      [m]: g
+      [m]: p
     });
   }
-  return F;
+  return b;
 }
-const Be = (t) => le({
+const Ce = (t) => ne({
   where: t.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", q = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? b.NoAggregation, $s = async (t, e, s) => {
-  const i = N(e), a = K(e), r = await H(e, s), c = await J(e, s);
+}) ?? "", q = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? S.NoAggregation, js = async (t, e, s) => {
+  const i = N(e), a = R(e), r = await J(e, s), c = await H(e, s);
   if (await xe({
     splitByField: a,
     numericFields: i,
@@ -533,23 +567,23 @@ const Be = (t) => le({
     config: e,
     layerInfo: s
   }), c) {
-    const o = await Y({
+    const n = await Y({
       config: e,
       layerInfo: s,
       numericFields: N(e),
       aggregationType: q(e)
     });
-    X(e, 1, o);
+    z(e, 1, n);
   }
-  e.title && r && (e.title.content.text = await Z(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), me(e, s);
-}, K = fe(
+  e.title && r && (e.title.content.text = await G(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), me(e, s);
+}, R = fe(
   (t) => {
     const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
-    return Re(t?.series?.[0]?.query?.where) ? "" : e;
+    return We(t?.series?.[0]?.query?.where) ? "" : e;
   },
   (t) => t?.series?.[0]?.query?.where
-), ks = async (t, e, s) => {
-  const i = N(e), a = q(e), r = await H(e, s), c = await J(e, s);
+), Ps = async (t, e, s) => {
+  const i = N(e), a = q(e), r = await J(e, s), c = await H(e, s);
   if (await xe({
     splitByField: t,
     numericFields: i,
@@ -557,21 +591,21 @@ const Be = (t) => le({
     config: e,
     layerInfo: s
   }), c) {
-    const o = await Y({
+    const n = await Y({
       config: e,
       layerInfo: s,
       numericFields: N(e),
       aggregationType: q(e)
     });
-    X(e, 1, o);
+    z(e, 1, n);
   }
-  e.title && r && (e.title.content.text = await Z(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
+  e.title && r && (e.title.content.text = await G(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 });
 }, N = fe(
   // without memoizing, the worst case efficiency is O(series.length), best case is O(1)
   // with memoizing, the worst case efficiency for repeated calls becomes O(1)
   (t) => {
     let e = [];
-    if (K(t) === "")
+    if (R(t) === "")
       e = t?.series.map((s) => {
         const i = s.query?.outStatistics?.map((a) => a.onStatisticField) ?? [];
         return i?.length > 0 ? i : s.y;
@@ -584,14 +618,14 @@ const Be = (t) => le({
   },
   // using series array address as key, since a change to the numeric fields will always rebuild a fresh series array
   (t) => t?.series
-), gt = async (t, e, s) => {
+), ft = async (t, e, s) => {
   const { objectIdField: i } = s;
   let a = q(e);
-  const r = await H(e, s), c = await J(e, s);
-  t.length === 0 ? (t.push(i), a = b.Count) : a === b.Count && t.length >= 1 && !t.includes(i) && (a = b.Sum);
-  const o = K(e);
+  const r = await J(e, s), c = await H(e, s);
+  t.length === 0 ? (t.push(i), a = S.Count) : a === S.Count && t.length >= 1 && !t.includes(i) && (a = S.Sum);
+  const n = R(e);
   if (await xe({
-    splitByField: o,
+    splitByField: n,
     numericFields: t,
     aggregationType: a,
     config: e,
@@ -603,70 +637,70 @@ const Be = (t) => le({
       numericFields: N(e),
       aggregationType: q(e)
     });
-    X(e, 1, y);
+    z(e, 1, y);
   }
-  e.title && r && (e.title.content.text = await Z(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), me(e, s);
-}, js = async (t, e, s) => {
-  const { layerFieldsInfo: i } = s ?? {}, a = e?.series?.length ?? 0, r = E(e), c = await H(e, s), o = await J(e, s), y = await bt(e, s);
+  e.title && r && (e.title.content.text = await G(e, s)), f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), me(e, s);
+}, Es = async (t, e, s) => {
+  const { layerFieldsInfo: i } = s ?? {}, a = e?.series?.length ?? 0, r = P(e), c = await J(e, s), n = await H(e, s), y = await Tt(e, s);
   let l;
-  const p = e.series.some((n) => I(n)), d = Ge(e.series), x = Qe(e.series);
+  const x = e.series.some((o) => I(o)), d = Je(e.series), g = He(e.series);
   if (i !== void 0) {
-    const n = Ke(i);
-    !n.includes(r) && n.includes(t) ? l = _e() : n.includes(r) && !n.includes(t) && (p ? l = ie() : l = Ye()), i.find((m) => m.name === t)?.type === Se.String && (l = ie()), l !== void 0 && await et(e, l);
+    const o = Xe(i);
+    !o.includes(r) && o.includes(t) ? l = Ge() : o.includes(r) && !o.includes(t) && (x ? l = ie() : l = Ze()), i.find((m) => m.name === t)?.type === Se.String && (l = ie()), l !== void 0 && await st(e, l);
   }
-  if (a === 0 && (e.series = [await _({ config: e, layerInfo: s })]), e.series.forEach((n) => {
-    n.x = t, n.query !== void 0 && (n.query.groupByFieldsForStatistics = [t]);
+  if (a === 0 && (e.series = [await _({ config: e, layerInfo: s })]), e.series.forEach((o) => {
+    o.x = t, o.query !== void 0 && (o.query.groupByFieldsForStatistics = [t]);
   }), y) {
-    const n = j(i, t);
-    X(e, 0, n);
+    const o = j(i, t);
+    z(e, 0, o);
   }
   if (s !== void 0) {
-    if (o) {
+    if (n) {
       const u = await Y({
         config: e,
         layerInfo: s,
         numericFields: N(e),
         aggregationType: q(e)
       });
-      X(e, 1, u);
+      z(e, 1, u);
     }
-    e.title && c && (e.title.content.text = await Z(e, s)), me(e, s);
-    const n = N(e);
-    await gt(n, e, s);
+    e.title && c && (e.title.content.text = await G(e, s)), me(e, s);
+    const o = N(e);
+    await ft(o, e, s);
   }
-  if (f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), d || x) {
-    f({ config: e, value: null, axisIndex: 0, isMax: !1 }), f({ config: e, value: null, axisIndex: 0, isMax: !0 }), ve(0, e);
-    const n = l?.type === h.DateAxisFormat ? te.Null : te.Interpolate;
-    yt(n, e);
+  if (f({ config: e, value: null, axisIndex: 1, isMax: !1 }), f({ config: e, value: null, axisIndex: 1, isMax: !0 }), d || g) {
+    f({ config: e, value: null, axisIndex: 0, isMax: !1 }), f({ config: e, value: null, axisIndex: 0, isMax: !0 }), Be(0, e);
+    const o = l?.type === h.DateAxisFormat ? te.Null : te.Interpolate;
+    xt(o, e);
   }
 };
 function me(t, e) {
   let s = !1;
   const i = q(t), a = N(t);
-  i === b.Count ? s = !0 : i === b.NoAggregation && (s = a.every((o) => {
-    const y = e.layerFieldsInfo.find((l) => l.name === o);
+  i === S.Count ? s = !0 : i === S.NoAggregation && (s = a.every((n) => {
+    const y = e.layerFieldsInfo.find((l) => l.name === n);
     return y !== void 0 ? ge(y) : !1;
   })), pe(t, 1, s);
-  const r = t.series.some((o) => B(o)), c = t.series.some((o) => C(o));
+  const r = t.series.some((n) => B(n)), c = t.series.some((n) => C(n));
   if (r || c) {
-    const o = E(t), y = e.layerFieldsInfo.find((p) => p.name === o), l = y !== void 0 && ge(y);
+    const n = P(t), y = e.layerFieldsInfo.find((x) => x.name === n), l = y !== void 0 && ge(y);
     pe(t, 0, l);
   }
 }
-const pt = (t) => {
-  let e = S.xAxisAsc;
+const St = (t) => {
+  let e = F.xAxisAsc;
   const s = t.orderOptions?.data?.orderType ?? w.Category, i = t.orderOptions?.data?.orderBy ?? O.Ascending;
-  return s === w.Category && Array.isArray(i) ? e = S.customSort : s === w.Category ? i === O.Ascending ? e = S.xAxisAsc : e = S.xAxisDesc : i === O.Ascending ? e = S.yAxisAsc : e = S.yAxisDesc, e;
+  return s === w.Category && Array.isArray(i) ? e = F.customSort : s === w.Category ? i === O.Ascending ? e = F.xAxisAsc : e = F.xAxisDesc : i === O.Ascending ? e = F.yAxisAsc : e = F.yAxisDesc, e;
 };
-async function ft(t) {
+async function Ft(t) {
   const { numericFields: e, aggregationType: s, config: i, layerInfo: a } = t;
   let r = !1;
   const c = await _({
     config: i,
     layerInfo: a,
     seriesIndex: 0
-  }), o = await ne(
-    ce(document.documentElement).t9nLocale,
+  }), n = await ae(
+    re(document.documentElement).t9nLocale,
     de("./assets/common/t9n"),
     "messages."
   ), y = ye({
@@ -677,25 +711,25 @@ async function ft(t) {
   }).name, l = {
     ...c,
     id: `series_${Date.now()}`,
-    name: o.axisLabels.values,
-    x: R,
+    name: n.axisLabels.values,
+    x: K,
     y
-  }, p = [];
-  for (const x of e)
-    p.push({
-      onStatisticField: x,
-      outStatisticFieldName: `${x}_0`.toUpperCase(),
+  }, x = [];
+  for (const g of e)
+    x.push({
+      onStatisticField: g,
+      outStatisticFieldName: `${g}_0`.toUpperCase(),
       statisticType: s
     });
-  l.query = { outStatistics: p };
+  l.query = { outStatistics: x };
   const d = i.series[0];
   return d !== void 0 && (l.id = d.id, i.colorMatch || (I(d) && I(l) ? l.fillSymbol = d.fillSymbol : (B(l) && B(d) || C(l) && C(d)) && (l.lineSymbol = d.lineSymbol, l.markerSymbol = d.markerSymbol), r = !0), l.id = d.id, d.name !== c.name && (l.name = d.name)), i.series.length === 1 && !i.colorMatch && (I(l) ? l.fillSymbol = i.series[0].fillSymbol : (B(l) || C(l)) && (l.lineSymbol = i.series[0].lineSymbol, l.markerSymbol = i.series[0].markerSymbol), r = !0), i.colorMatch = !r, [l];
 }
-async function Ce(t) {
-  const { numericFields: e, aggregationType: s, config: i, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: c } = a, o = [];
+async function Le(t) {
+  const { numericFields: e, aggregationType: s, config: i, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: c } = a, n = [];
   let y = !1;
   for (let l = 0; l < e.length; l += 1) {
-    const p = await _({
+    const x = await _({
       config: i,
       layerInfo: a,
       seriesIndex: l
@@ -705,290 +739,291 @@ async function Ce(t) {
       aggregationType: s,
       layer: a.layer,
       numericFieldIndex: l
-    }).name, x = e[l];
-    let n = {
-      ...p,
+    }).name, g = e[l];
+    let o = {
+      ...x,
       query: {
-        ...p.query
+        ...x.query
       }
     };
-    x !== c && (n = {
-      ...n,
-      id: x,
-      name: j(r, x)
+    g !== c && (o = {
+      ...o,
+      id: g,
+      name: j(r, g)
     });
-    let u = x;
-    n.query !== void 0 && (s !== b.NoAggregation ? (u = d, n.query.outStatistics = [
+    let u = g;
+    o.query !== void 0 && (s !== S.NoAggregation ? (u = d, o.query.outStatistics = [
       {
-        ...p.query?.outStatistics?.[0] ?? {},
-        onStatisticField: x,
+        ...x.query?.outStatistics?.[0] ?? {},
+        onStatisticField: g,
         outStatisticFieldName: d,
         statisticType: s
       }
-    ]) : delete n.query.outStatistics), n.y = u;
+    ]) : delete o.query.outStatistics), o.y = u;
     const m = i.series.find(
-      (g) => g.query?.outStatistics?.[0]?.onStatisticField === x && g.query.where === void 0
+      (p) => p.query?.outStatistics?.[0]?.onStatisticField === g && p.query.where === void 0
     );
     if (m !== void 0 && typeof m.y == "string" && m.y.trim() !== "") {
-      i.colorMatch || (I(n) && I(m) ? n.fillSymbol = m.fillSymbol : (B(n) && B(m) || C(n) && C(m)) && (n.lineSymbol = m.lineSymbol, n.markerSymbol = m.markerSymbol), y = !0);
-      const g = await _({
+      i.colorMatch || (I(o) && I(m) ? o.fillSymbol = m.fillSymbol : (B(o) && B(m) || C(o) && C(m)) && (o.lineSymbol = m.lineSymbol, o.markerSymbol = m.markerSymbol), y = !0);
+      const p = await _({
         config: i,
         layerInfo: a,
         seriesIndex: l
       });
-      n.id = m.id, m.id !== g.id && m.name !== g.name && (n.id = m.id, n.name = m.name);
+      o.id = m.id, m.id !== p.id && m.name !== p.name && (o.id = m.id, o.name = m.name);
     }
-    o.push(n);
+    n.push(o);
   }
-  return i.series.length === 1 && o.length === 1 && !i.colorMatch && (I(i.series[0]) && I(o[0]) ? o[0].fillSymbol = i.series[0].fillSymbol : (B(i.series[0]) && B(o[0]) || C(i.series[0]) && C(o[0])) && (o[0].lineSymbol = i.series[0].lineSymbol, o[0].markerSymbol = i.series[0].markerSymbol), y = !0), i.colorMatch = !y, o;
+  return i.series.length === 1 && n.length === 1 && !i.colorMatch && (I(i.series[0]) && I(n[0]) ? n[0].fillSymbol = i.series[0].fillSymbol : (B(i.series[0]) && B(n[0]) || C(i.series[0]) && C(n[0])) && (n[0].lineSymbol = i.series[0].lineSymbol, n[0].markerSymbol = i.series[0].markerSymbol), y = !0), i.colorMatch = !y, n;
 }
-async function St(t) {
-  const { splitByField: e, numericFields: s, aggregationType: i, config: a, layerInfo: r } = t, { layer: c, layerFieldsInfo: o } = r, { fetchNullValues: y } = a?.series?.[0]?.query ?? {}, l = E(a), p = l !== R ? l : void 0, { categoriesArray: d, splitByFieldType: x, numericalField: n } = await mt({
+async function bt(t) {
+  const { splitByField: e, numericFields: s, aggregationType: i, config: a, layerInfo: r } = t, { layer: c, layerFieldsInfo: n } = r, { fetchNullValues: y } = a?.series?.[0]?.query ?? {}, l = P(a), x = l !== K ? l : void 0, { categoriesArray: d, splitByFieldType: g, numericalField: o } = await gt({
     config: a,
     layer: c,
-    layerFieldsInfo: o,
-    xAxisField: p,
+    layerFieldsInfo: n,
+    xAxisField: x,
     aggregationFields: s,
     splitByField: e,
     fetchNullValues: y
   });
   let u = [], m = !1;
   if (d.length === 0) {
-    u = await Ce({
+    u = await Le({
       numericFields: s,
       aggregationType: i,
       config: a,
       layerInfo: r
     });
-    for (const g of u)
-      g.query && (g.query.where = `${e}=''`);
+    for (const p of u)
+      p.query && (p.query.where = `${e}=''`);
   } else
-    for (let g = 0; g < d.length; g += 1) {
-      const F = d[g], A = ye({
+    for (let p = 0; p < d.length; p += 1) {
+      const b = d[p], T = ye({
         config: a,
         numericFields: s,
         aggregationType: i,
         layer: r.layer,
-        seriesIndex: g,
+        seriesIndex: p,
         splitByField: e
-      }).name, T = await _({
+      }).name, A = await _({
         config: a,
         layerInfo: r,
-        seriesIndex: g
-      }), z = {
+        seriesIndex: p
+      }), X = {
         fieldName: e,
-        fieldValueToMatch: F ?? "",
-        subtypeInfo: ae(r.layer),
+        fieldValueToMatch: b ?? "",
+        subtypeInfo: le(r.layer),
         fieldList: r.layerFieldsInfo
-      }, Le = re(z), ee = `${F}`, v = {
-        ...T,
+      }, Ie = oe(X), ee = `${b}`, v = {
+        ...A,
         id: ee,
-        name: Le ?? ee,
-        y: A,
+        name: Ie ?? ee,
+        y: T,
         query: {
-          ...T.query,
-          where: `${e}=${x === Se.String && F !== null ? `'${F}'` : F}`,
-          outStatistics: i !== b.NoAggregation ? [
+          ...A.query,
+          where: `${e}=${g === Se.String && b !== null ? `'${b}'` : b}`,
+          outStatistics: i !== S.NoAggregation ? [
             {
-              ...T.query?.outStatistics?.[0] ?? {},
-              onStatisticField: n,
-              outStatisticFieldName: A,
+              ...A.query?.outStatistics?.[0] ?? {},
+              onStatisticField: o,
+              outStatisticFieldName: T,
               statisticType: i
             }
           ] : void 0
         }
       };
-      i === b.NoAggregation && (v.query !== void 0 && (delete v.query.outStatistics, delete v.query.groupByFieldsForStatistics), v.y = n);
+      i === S.NoAggregation && (v.query !== void 0 && (delete v.query.outStatistics, delete v.query.groupByFieldsForStatistics), v.y = o);
       const $ = a.series.find(
-        (Ie) => String(Be(Ie)).trim().replace(/'/gu, "") === ee
+        (we) => String(Ce(we)).trim().replace(/'/gu, "") === ee
       );
       $ !== void 0 && (a.colorMatch || (I(v) && I($) ? v.fillSymbol = $.fillSymbol : (B(v) && B($) || C(v) && C($)) && (v.lineSymbol = $.lineSymbol, v.markerSymbol = $.markerSymbol), m = !0), v.id = $.id, v.name = $.name), u.push(v);
     }
   return a.colorMatch = !m, u;
 }
 const xe = async (t) => {
-  const { splitByField: e, numericFields: s, aggregationType: i, config: a, layerInfo: r } = t, { x: c } = a.series[0], o = W(a.series);
-  e === "" || s.length > 1 ? c === R || c === void 0 || c.trim() === "" || o === P.BarAndLineFromFields ? a.series = await ft({
+  const { splitByField: e, numericFields: s, aggregationType: i, config: a, layerInfo: r } = t, { x: c } = a.series[0], n = W(a.series);
+  e === "" || s.length > 1 ? c === K || c === void 0 || c.trim() === "" || n === E.BarAndLineFromFields ? a.series = await Ft({
     config: a,
     layerInfo: r,
     numericFields: s,
     aggregationType: i
-  }) : a.series = await Ce({
+  }) : a.series = await Le({
     config: a,
     layerInfo: r,
     numericFields: s,
     aggregationType: i
-  }) : a.series = await St({
+  }) : a.series = await bt({
     config: a,
     layerInfo: r,
     splitByField: e,
     numericFields: s,
     aggregationType: i
   });
-}, Es = (t) => {
-  const { config: e, seriesIndex: s, layerInfo: i, commonStrings: a } = t, r = e.series?.[s], c = K(e);
-  let o;
-  if (W(e.series) === P.BarAndLineFromFields)
-    o = a.axisLabels.values;
-  else if (we(c)) {
+}, Us = (t) => {
+  const { config: e, seriesIndex: s, layerInfo: i, commonStrings: a } = t, r = e.series?.[s], c = R(e);
+  let n;
+  if (W(e.series) === E.BarAndLineFromFields)
+    n = a.axisLabels.values;
+  else if (Ne(c)) {
     const l = r.query?.outStatistics?.[0]?.onStatisticField;
-    l !== void 0 && l !== i.objectIdField && (o = j(i.layerFieldsInfo, l));
+    l !== void 0 && l !== i.objectIdField && (n = j(i.layerFieldsInfo, l));
   } else {
-    const l = String(Be(r)).trim().replace(/'/gu, ""), p = {
-      fieldName: K(e),
+    const l = String(Ce(r)).trim().replace(/'/gu, ""), x = {
+      fieldName: R(e),
       fieldValueToMatch: l ?? "",
-      subtypeInfo: ae(i.layer),
+      subtypeInfo: le(i.layer),
       fieldList: i.layerFieldsInfo
     };
-    o = re(p) ?? l;
+    n = oe(x) ?? l;
   }
-  return o ?? r.id;
-}, Ps = (t, e) => {
+  return n ?? r.id;
+}, Ks = (t, e) => {
   e.orderOptions ??= {};
   const s = e.orderOptions?.data?.orderType;
-  pt(e) === S.customSort && s === w.Category && (e.orderOptions.data = {
+  St(e) === F.customSort && s === w.Category && (e.orderOptions.data = {
     orderType: w.Category,
     orderBy: [...t]
   });
-}, Us = async (t, e) => {
-  const s = E(t), i = Je(t)?.type, a = N(t), r = W(t.series);
+}, Rs = async (t, e) => {
+  const s = P(t), i = tt(t)?.type, a = N(t), r = W(t.series);
   let c = [];
-  return i === h.CategoryAxisFormat && (r === P.BarAndLineFromFields || s === R ? c = a.map((o) => j(e?.layerFieldsInfo, o)) : s.trim() !== "" && s !== R && e !== void 0 && (c = await xt({
+  return i === h.CategoryAxisFormat && (r === E.BarAndLineFromFields || s === K ? c = a.map((n) => j(e?.layerFieldsInfo, n)) : s.trim() !== "" && s !== K && e !== void 0 && (c = await pt({
     layerInfo: e,
     config: t,
     category: s
   }))), c;
 };
-async function H(t, e) {
-  const s = await Z(t, e), i = it(t), a = oe(t);
+async function J(t, e) {
+  const s = await G(t, e), i = rt(t), a = ce(t);
   return s === i || a;
 }
-async function J(t, e) {
+async function H(t, e) {
   const s = await Y({
     config: t,
     layerInfo: e,
     numericFields: N(t),
     aggregationType: q(t)
-  }), i = ue(1, t), a = oe(t);
+  }), i = ue(1, t), a = ce(t);
   return s === i || a;
 }
-async function bt(t, e) {
-  const s = j(e.layerFieldsInfo, E(t)), i = ue(0, t), a = oe(t);
+async function Tt(t, e) {
+  const s = j(e.layerFieldsInfo, P(t)), i = ue(0, t), a = ce(t);
   return s === i || a;
 }
-function Rs(t) {
+function Ws(t) {
   return t?.series?.[0]?.binTemporalData ?? !1;
 }
-function Ks(t, e) {
+function Xs(t, e) {
   e?.series.forEach((s) => {
     s.binTemporalData = t, t ? s.temporalBinning = {
       unit: se.Day,
       size: 0,
-      timeAggregationType: Ve.Start,
+      timeAggregationType: De.Start,
       trimIncompleteTimeInterval: !0,
       nullPolicy: te.Null
     } : delete s.temporalBinning;
   });
 }
-const Ws = (t, e) => {
+const zs = (t, e) => {
   e.series.forEach((s) => {
     s.query && (s.query.fetchNullValues = t);
   });
-}, zs = (t) => t.series.some((e) => e.query?.fetchNullValues), Xs = (t) => (
+}, _s = (t) => t.series.some((e) => e.query?.fetchNullValues), Ys = (t) => (
   // TODO: Look into split-by values gotchas cases once done
-  t.series.map((e) => String(le({ where: e.query?.where }))).filter((e) => e !== void 0 && e.trim() !== "")
-), _s = (t) => t.dataFilters, Ys = (t, e) => {
+  t.series.map((e) => String(ne({ where: e.query?.where }))).filter((e) => e !== void 0 && e.trim() !== "")
+), Gs = (t) => t.dataFilters, Zs = (t, e) => {
   t !== void 0 ? e.dataFilters = t : delete e.dataFilters;
 };
 export {
-  at as $,
-  dt as A,
-  Vs as B,
-  ut as C,
-  yt as D,
-  Ds as E,
-  js as F,
-  gt as G,
-  $s as H,
-  ks as I,
-  pt as J,
-  Is as K,
-  Us as L,
-  Ls as M,
-  Ps as N,
+  lt as $,
+  yt as A,
+  Os as B,
+  mt as C,
+  xt as D,
+  qs as E,
+  Es as F,
+  ft as G,
+  js as H,
+  Ps as I,
+  St as J,
+  Ns as K,
+  Rs as L,
+  ws as M,
+  Ks as N,
   xe as O,
-  Rs as P,
-  Ks as Q,
-  Z as R,
-  Qt as S,
-  Yt as T,
-  Zt as U,
-  Gt as V,
-  Ht as W,
-  Jt as X,
-  es as Y,
-  ts as Z,
-  ss as _,
+  Ws as P,
+  Xs as Q,
+  G as R,
+  Ht as S,
+  Zt as T,
+  Qt as U,
+  Jt as V,
+  es as W,
+  ts as X,
+  ss as Y,
+  is as Z,
+  as as _,
   ue as a,
-  is as a0,
-  as as a1,
-  rs as a2,
-  Ws as a3,
-  zs as a4,
-  _s as a5,
-  Ys as a6,
-  xs as a7,
-  gs as a8,
-  ps as a9,
-  Pt as aa,
-  Ut as ab,
-  ls as ac,
-  os as ad,
-  ns as ae,
-  cs as af,
-  ds as ag,
-  us as ah,
-  Rt as ai,
-  ys as aj,
-  ms as ak,
-  hs as al,
-  Kt as am,
-  Wt as an,
-  zt as ao,
-  Xt as ap,
-  _t as aq,
-  fs as ar,
-  Ss as as,
-  bs as at,
-  Fs as au,
-  Ts as av,
-  As as aw,
-  vs as ax,
-  Bs as ay,
-  Cs as az,
+  rs as a0,
+  ls as a1,
+  os as a2,
+  zs as a3,
+  _s as a4,
+  Gs as a5,
+  Zs as a6,
+  ps as a7,
+  fs as a8,
+  Ss as a9,
+  Ae as aA,
+  Kt as aa,
+  Rt as ab,
+  ns as ac,
+  cs as ad,
+  ds as ae,
+  us as af,
+  ys as ag,
+  ms as ah,
+  Wt as ai,
+  xs as aj,
+  gs as ak,
+  Bs as al,
+  Xt as am,
+  zt as an,
+  _t as ao,
+  Yt as ap,
+  Gt as aq,
+  Fs as ar,
+  bs as as,
+  Ts as at,
+  As as au,
+  hs as av,
+  vs as aw,
+  Cs as ax,
+  Ls as ay,
+  Is as az,
   Y as b,
   ye as c,
-  Es as d,
-  Ms as e,
-  Os as f,
-  it as g,
-  et as h,
-  qs as i,
-  Je as j,
-  xt as k,
-  mt as l,
-  pe as m,
-  E as n,
-  q as o,
-  N as p,
-  Xs as q,
-  K as r,
+  Us as d,
+  ks as e,
+  Ms as f,
+  rt as g,
+  P as h,
+  $s as i,
+  q as j,
+  N as k,
+  Ys as l,
+  R as m,
+  st as n,
+  tt as o,
+  pt as p,
+  gt as q,
+  pe as r,
   f as s,
-  ot as t,
-  X as u,
-  ve as v,
-  nt as w,
-  ws as x,
-  ct as y,
-  Ns as z
+  ct as t,
+  z as u,
+  Be as v,
+  dt as w,
+  Vs as x,
+  ut as y,
+  Ds as z
 };