@arcgis/charts-components 4.33.0-next.162 → 4.33.0-next.164

package/dist/chunks/data.js

@@ -1,7 +1,7 @@
-import { WebChartStackedKinds as he, WebChartStatisticType as h, WebChartOrderDataByTypes as L, WebChartSortOrderKinds as N, WebChartTypes as U, WebChartTemporalBinningTypes as K, RESTFieldType as ne, WebChartNullPolicyTypes as re, defaultBarLineFromFieldsName as W, RESTSymbolType as Te, WebChartCalendarBinningUnits as Be, WebChartFixedDateBinningUnits as we, defaultBarLineFromFieldsValue as Ce } from "@arcgis/charts-spec";
-import { memoize as ce, isEmpty as Le, cloneDeep as ke } from "lodash-es";
+import { WebChartStackedKinds as Te, WebChartStatisticType as b, WebChartTypes as C, defaultBarLineFromFieldsName as P, WebChartOrderDataByTypes as L, WebChartSortOrderKinds as N, defaultBarLineFromFieldsValue as Be, defaultPieFromFieldsValue as we, WebChartTemporalBinningTypes as W, RESTFieldType as ye, WebChartNullPolicyTypes as ne, RESTSymbolType as Ce, WebChartCalendarBinningUnits as Le, WebChartFixedDateBinningUnits as ke } from "@arcgis/charts-spec";
+import { capitalize as E, memoize as ue, isEmpty as Ne, cloneDeep as ve } from "lodash-es";
 import "d3-array";
-import { bS as Ne, c0 as d, a4 as Q, al as ve, a2 as Ie, a0 as Ve, aV as Oe, c5 as De, aL as de, c9 as j, bR as O, m as I, b5 as qe, bt as ye, b6 as Z, b7 as ee, cd as Me, h as te, cr as je, k as z, cs as $, i as Ue, b4 as $e, a5 as Ee, a6 as Ke, ao as Pe, ap as We, ar as Re, b3 as le } from "./interfaces.js";
+import { bS as Ie, c0 as y, a4 as Z, al as Oe, a2 as De, a0 as Ve, aV as qe, c5 as $e, aL as me, c9 as j, bR as D, k as R, bO as je, e as Me, cs as M, m as I, b5 as Ue, bt as pe, b6 as ee, b7 as te, cd as Ee, h as ie, cr as Pe, i as Ke, b4 as We, a5 as Re, a6 as ze, ao as Xe, ap as Ye, ar as _e, b3 as ce } from "./interfaces.js";
 import "@arcgis/core/geometry/support/jsonUtils.js";
 import "@arcgis/core/rest/support/AttributeBinsQuery.js";
 import "@arcgis/core/rest/support/Query.js";
@@ -9,312 +9,327 @@ import "@arcgis/core/rest/support/StatisticDefinition.js";
 import "@arcgis/core/time/TimeExtent.js";
 import "@arcgis/core/core/promiseUtils.js";
 import "@arcgis/core/request.js";
-import { q as Xe, l as k, n as ze, o as Ye, j as w, k as C } from "./index4.js";
-import { S } from "./common.js";
-import { g as ue } from "./series-types.js";
-import { u as me } from "./index3.js";
+import { q as He, l as k, n as Ge, o as Qe, j as B, k as w } from "./index4.js";
+import { a as Je, S } from "./common.js";
+import { g as se } from "./series-types.js";
+import { u as ge } from "./index3.js";
 /*! All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.33/esri/copyright.txt for details.
-v4.33.0-next.162 */
-async function ie(t = Ne().locale) {
+v4.33.0-next.164 */
+async function ae(t = Ie().locale) {
   let e = await import("./messages.en3.js");
   switch (t) {
-    case d.Arabic:
+    case y.Arabic:
       e = await import("./messages.ar3.js");
       break;
-    case d.Bosnian:
+    case y.Bosnian:
       e = await import("./messages.bs3.js");
       break;
-    case d.Bulgarian:
+    case y.Bulgarian:
       e = await import("./messages.bg3.js");
       break;
-    case d.Catalan:
+    case y.Catalan:
       e = await import("./messages.ca3.js");
       break;
-    case d.Czech:
+    case y.Czech:
       e = await import("./messages.cs3.js");
       break;
-    case d.Danish:
+    case y.Danish:
       e = await import("./messages.da3.js");
       break;
-    case d.German:
+    case y.German:
       e = await import("./messages.de3.js");
       break;
-    case d.Greek:
+    case y.Greek:
       e = await import("./messages.el3.js");
       break;
-    case d.EnglishUSA:
+    case y.EnglishUSA:
       e = await import("./messages.en-US3.js");
       break;
-    case d.Spanish:
+    case y.Spanish:
       e = await import("./messages.es3.js");
       break;
-    case d.Estonian:
+    case y.Estonian:
       e = await import("./messages.et3.js");
       break;
-    case d.French:
+    case y.French:
       e = await import("./messages.fr3.js");
       break;
-    case d.Finnish:
+    case y.Finnish:
       e = await import("./messages.fi3.js");
       break;
-    case d.Hebrew:
+    case y.Hebrew:
       e = await import("./messages.he3.js");
       break;
-    case d.Croatian:
+    case y.Croatian:
       e = await import("./messages.hr3.js");
       break;
-    case d.Hungarian:
+    case y.Hungarian:
       e = await import("./messages.hu3.js");
       break;
-    case d.Indonesian:
+    case y.Indonesian:
       e = await import("./messages.id3.js");
       break;
-    case d.Italian:
+    case y.Italian:
       e = await import("./messages.it3.js");
       break;
-    case d.Japanese:
+    case y.Japanese:
       e = await import("./messages.ja3.js");
       break;
-    case d.Korean:
+    case y.Korean:
       e = await import("./messages.ko3.js");
       break;
-    case d.Lithuanian:
+    case y.Lithuanian:
       e = await import("./messages.lt3.js");
       break;
-    case d.Latvian:
+    case y.Latvian:
       e = await import("./messages.lv3.js");
       break;
-    case d.NorwegianBokml:
+    case y.NorwegianBokml:
       e = await import("./messages.no3.js");
       break;
-    case d.Dutch:
+    case y.Dutch:
       e = await import("./messages.nl3.js");
       break;
-    case d.Polish:
+    case y.Polish:
       e = await import("./messages.pl3.js");
       break;
-    case d.PortugueseBrazil:
+    case y.PortugueseBrazil:
       e = await import("./messages.pt-BR3.js");
       break;
-    case d.PortuguesePortugal:
+    case y.PortuguesePortugal:
       e = await import("./messages.pt-PT3.js");
       break;
-    case d.Romanian:
+    case y.Romanian:
       e = await import("./messages.ro3.js");
       break;
-    case d.Russian:
+    case y.Russian:
       e = await import("./messages.ru3.js");
       break;
-    case d.Serbian:
+    case y.Serbian:
       e = await import("./messages.sr3.js");
       break;
-    case d.Slovak:
+    case y.Slovak:
       e = await import("./messages.sk3.js");
       break;
-    case d.Slovenian:
+    case y.Slovenian:
       e = await import("./messages.sl3.js");
       break;
-    case d.Swedish:
+    case y.Swedish:
       e = await import("./messages.sv3.js");
       break;
-    case d.Thai:
+    case y.Thai:
       e = await import("./messages.th3.js");
       break;
-    case d.Turkish:
+    case y.Turkish:
       e = await import("./messages.tr3.js");
       break;
-    case d.Ukrainian:
+    case y.Ukrainian:
       e = await import("./messages.uk3.js");
       break;
-    case d.Vietnamese:
+    case y.Vietnamese:
       e = await import("./messages.vi3.js");
       break;
-    case d.ChineseChina:
+    case y.ChineseChina:
       e = await import("./messages.zh-CN3.js");
       break;
-    case d.ChineseHongKong:
+    case y.ChineseHongKong:
       e = await import("./messages.zh-HK3.js");
       break;
-    case d.ChineseTaiwan:
+    case y.ChineseTaiwan:
       e = await import("./messages.zh-TW3.js");
       break;
-    case d.English:
+    case y.English:
   }
   return e;
 }
-function R(t, e, i) {
+function X(t, e, i) {
   const s = t?.axes?.[e];
-  s?.title !== void 0 ? s.title.content.text = i : s !== void 0 && (s.title = Ie({
+  s?.title !== void 0 ? s.title.content.text = i : s !== void 0 && (s.title = De({
     text: i,
     visible: !0,
-    font: Ve(Oe.AxisTitle)
+    font: Ve(qe.AxisTitle)
   }));
 }
-async function Y(t) {
+async function _(t) {
   const { config: e, layerInfo: i, numericFields: s, aggregationType: a } = t;
   let r = "";
   if (e) {
-    const n = De(e) === he.Stacked100, l = await ie();
-    if (n)
-      r = l.axisLabels.percent;
+    const c = $e(e) === Te.Stacked100, n = await ae();
+    if (c)
+      r = n.axisLabels.percent;
     else {
-      const o = await de(a);
+      const m = await me(a);
       if (s.length === 1) {
-        const m = j(i.layerFieldsInfo, s[0]);
-        a === h.NoAggregation ? r = m : a === h.Count && s[0] === i.objectIdField ? r = l.axisLabels.count : r = O(l.axisLabels.aggregationOfFieldName, {
-          aggregation: o,
-          fieldName: m
+        const l = j(i.layerFieldsInfo, s[0]);
+        a === b.NoAggregation ? r = l : a === b.Count && s[0] === i.objectIdField ? r = n.axisLabels.count : r = D(n.axisLabels.aggregationOfFieldName, {
+          aggregation: m,
+          fieldName: l
         });
-      } else s.length > 1 && (a === h.NoAggregation ? r = l.axisLabels.values : r = O(l.axisLabels.aggregationOfValues, {
-        aggregation: o
+      } else s.length > 1 && (a === b.NoAggregation ? r = n.axisLabels.values : r = D(n.axisLabels.aggregationOfValues, {
+        aggregation: m
       }));
     }
   }
   return r;
 }
-const pe = async (t, e) => t.axes?.[e] ?? (await ve(t.type))[e], ge = (t, e, i) => {
+const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i) => {
   t.axes !== void 0 && (t.axes[i] = e);
-}, _ = (t, e, i) => {
+}, H = (t, e, i) => {
   let s = Number.NaN;
   return i ? s = t.axes?.[e]?.maximum : s = t.axes?.[e]?.minimum, s ?? Number.NaN;
-}, H = async (t, e, i, s) => {
+}, G = async (t, e, i, s) => {
   const a = t?.axes?.[i];
   s && a !== void 0 ? a.maximum = e : !s && a !== void 0 && (a.minimum = e);
-}, kt = (t) => _(t, 1, !0), q = async (t, e) => {
-  await H(t, e, 1, !0);
-}, Nt = (t) => _(t, 1, !1), M = async (t, e) => {
-  await H(t, e, 1, !1);
-}, vt = (t) => _(t, 0, !0), _e = async (t, e) => {
-  await H(t, e, 0, !0);
-}, It = (t) => _(t, 0, !1), He = async (t, e) => {
-  await H(t, e, 0, !1);
-}, Ge = (t) => t.axes?.[0]?.valueFormat ?? Q(), Je = async (t, e) => {
-  const i = await pe(t, 0);
+}, Dt = (t) => H(t, 1, !0), q = async (t, e) => {
+  await G(t, e, 1, !0);
+}, Vt = (t) => H(t, 1, !1), $ = async (t, e) => {
+  await G(t, e, 1, !1);
+}, qt = (t) => H(t, 0, !0), Ze = async (t, e) => {
+  await G(t, e, 0, !0);
+}, $t = (t) => H(t, 0, !1), et = async (t, e) => {
+  await G(t, e, 0, !1);
+}, tt = (t) => t.axes?.[0]?.valueFormat ?? Z(), it = async (t, e) => {
+  const i = await Fe(t, 0);
   if (i !== void 0 && e !== void 0) {
     const s = {
       ...i,
       valueFormat: e
     };
-    ge(t, s, 0);
+    fe(t, s, 0);
   }
-}, Vt = (t) => {
+}, jt = (t) => {
   let e;
-  return Xe(t.axes?.[1]?.valueFormat) && (e = t.axes?.[1]?.valueFormat), e;
-}, Ot = async (t, e) => {
-  const i = await pe(t, 1);
+  return He(t.axes?.[1]?.valueFormat) && (e = t.axes?.[1]?.valueFormat), e;
+}, Mt = async (t, e) => {
+  const i = await Fe(t, 1);
   if (i !== void 0 && e !== void 0) {
     const s = {
       ...i,
       valueFormat: e
     };
-    ge(t, s, 1);
+    fe(t, s, 1);
   }
-}, oe = (t, e, i) => {
+}, de = (t, e, i) => {
   const s = t.axes?.[e];
   s !== void 0 && (s.integerOnlyValues = i);
-}, Qe = (t) => {
+}, st = (t) => {
   let e = S.xAxisAsc;
   const i = t.orderOptions?.data?.orderType ?? L.Category, s = t.orderOptions?.data?.orderBy ?? N.Ascending;
   return i === L.Category && Array.isArray(s) ? e = S.customSort : i === L.Category ? s === N.Ascending ? e = S.xAxisAsc : e = S.xAxisDesc : s === N.Ascending ? e = S.yAxisAsc : e = S.yAxisDesc, e;
-}, Ze = (t) => {
-  const e = ue(t.series);
+}, at = (t) => {
+  const e = se(t.series);
   let i = !1;
-  return (e === U.BarSeries || e === U.LineSeries) && (i = Qe(t) === S.customSort), i;
-}, Dt = (t) => {
+  return (e === C.BarSeries || e === C.LineSeries) && (i = st(t) === S.customSort), i;
+}, Ut = (t) => {
   let e = [];
   const i = t.orderOptions?.data?.orderType;
-  return Ze(t) && i === L.Category && (e = t.orderOptions?.data?.orderBy), e;
-}, qt = (t, e, i) => {
+  return at(t) && i === L.Category && (e = t.orderOptions?.data?.orderBy), e;
+}, Et = (t, e, i) => {
   let s = L.Category, a = N.Ascending;
-  const r = ue(e.series);
+  const r = se(e.series);
   e.orderOptions ??= {}, t === S.customSort && i !== void 0 ? (a = [...i], e.orderOptions.data = {
     orderType: s,
     orderBy: a
-  }) : (r === U.BarSeries || r === U.LineSeries) && (s = t === S.xAxisAsc || t === S.xAxisDesc ? L.Category : L.YValue, a = t === S.xAxisAsc || t === S.yAxisAsc ? N.Ascending : N.Descending, e.orderOptions.data = {
+  }) : (r === C.BarSeries || r === C.LineSeries) && (s = t === S.xAxisAsc || t === S.xAxisDesc ? L.Category : L.YValue, a = t === S.xAxisAsc || t === S.yAxisAsc ? N.Ascending : N.Descending, e.orderOptions.data = {
     orderType: s,
     orderBy: a
   });
-}, P = (t) => t?.series?.[0]?.x ?? "", et = (t) => {
+}, U = (t) => t?.series?.[0]?.x ?? "", re = (t) => {
+  const { config: e, numericFields: i, aggregationType: s, mode: a, layer: r, numericFieldIndex: c, seriesIndex: n } = t, m = se(e.series), l = R(e.series), F = r ? je(r).objectIdField : "FID", o = U(e), f = Me(e.series[0].query?.where ?? ""), d = i.length === 1 && i[0] === F;
+  let u = "y", p = "y";
+  switch (m) {
+    case C.PieSeries: {
+      s !== b.NoAggregation ? a === Je.Category ? (u = `${s}_${i[0]}_0`.toUpperCase(), p = d ? E(b.Count) : E(`${s} of ${i[0]}`)) : u = we : u = i[0];
+      break;
+    }
+    case C.BarSeries:
+    case C.LineSeries:
+    case C.ComboLineAndBarSeries:
+    case C.RadarSeries: {
+      if (f === "" || i.length > 1)
+        o === P || o === void 0 || o.trim() === "" || l === M.BarAndLineFromFields ? u = Be : (u = `${s}_${i[c ?? 0]}_${c ?? 0}`.toUpperCase(), p = d ? E(b.Count) : E(`${s} of ${i[c ?? 0]}`));
+      else {
+        const g = i[0];
+        u = `${s}_${g}_${n ?? 0}`.toUpperCase(), p = d ? E(b.Count) : E(`${s} of ${g}`);
+      }
+      break;
+    }
+  }
+  return {
+    name: u,
+    description: p
+  };
+}, rt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.size), e;
-}, tt = (t) => {
+}, lt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.unit), e;
-}, it = (t) => {
+}, ot = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.timeAggregationType), e;
-}, st = (t) => {
+}, nt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.trimIncompleteTimeInterval), e;
-}, at = (t) => {
+}, ct = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.nullPolicy), e;
-}, Fe = (t, e) => {
+}, Se = (t, e) => {
   e?.series?.forEach((i) => {
-    I(i) && (i.temporalBinning ??= { type: K.FixedDateBased }, i.temporalBinning.size = t);
-  }), M(e, null), q(e, null);
-}, rt = (t, e) => {
+    I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.size = t);
+  }), $(e, null), q(e, null);
+}, dt = (t, e) => {
   e?.series?.forEach((i) => {
-    I(i) && (i.temporalBinning ??= { type: K.FixedDateBased }, i.temporalBinning.nullPolicy = t);
-  }), M(e, null), q(e, null);
-}, Mt = (t, e) => {
+    I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.nullPolicy = t);
+  }), $(e, null), q(e, null);
+}, Pt = (t, e) => {
   e.series?.forEach((i) => {
-    I(i) && (i.temporalBinning ??= { type: K.FixedDateBased }, i.temporalBinning.unit = t);
-  }), M(e, null), q(e, null);
-}, jt = (t, e) => {
+    I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.unit = t);
+  }), $(e, null), q(e, null);
+}, Kt = (t, e) => {
   e.series?.forEach((i) => {
-    I(i) && (i.temporalBinning ??= { type: K.FixedDateBased }, i.temporalBinning.timeAggregationType = t);
-  }), M(e, null), q(e, null);
-}, Ut = (t, e) => {
+    I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.timeAggregationType = t);
+  }), $(e, null), q(e, null);
+}, Wt = (t, e) => {
   e.series?.forEach((i) => {
-    I(i) && (i.temporalBinning ??= { type: K.FixedDateBased }, i.temporalBinning.trimIncompleteTimeInterval = t);
-  }), M(e, null), q(e, null);
-}, $t = (t) => {
-  Fe(0, t);
+    I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.trimIncompleteTimeInterval = t);
+  }), $(e, null), q(e, null);
+}, Rt = (t) => {
+  Se(0, t);
 };
-async function lt(t) {
-  const {
-    config: e,
-    layer: i,
-    xAxisField: s,
-    splitByField: a,
-    layerFieldsInfo: r,
-    aggregationFields: n,
-    aggregationType: l,
-    fetchNullValues: o
-  } = t, y = r.filter((f) => f.name === a)[0]?.type, c = o !== !0 ? `${a} IS NOT NULL` : "", b = s && o !== !0 ? `${s} IS NOT NULL` : "", { where: g } = e?.dataFilters ?? {}, u = {
-    where: ye([g, c, b]),
+async function yt(t) {
+  const { config: e, layer: i, xAxisField: s, splitByField: a, layerFieldsInfo: r, aggregationFields: c, fetchNullValues: n } = t, l = r.filter((x) => x.name === a)[0]?.type, F = n !== !0 ? `${a} IS NOT NULL` : "", o = s && n !== !0 ? `${s} IS NOT NULL` : "", { where: f } = e?.dataFilters ?? {}, d = {
+    where: pe([f, F, o]),
     // excluding the null values from the list
-    orderByFields: Me(a) ? [] : [`${a} ${N.Ascending}`],
+    orderByFields: Ee(a) ? [] : [`${a} ${N.Ascending}`],
     // default sorting ascending for split-by field
     geometry: e?.dataFilters?.geometry
-  }, x = i;
+  }, u = i;
   let p = "";
-  n.length === 0 ? p = x?.objectIdField ?? "" : [p] = n;
-  const F = l !== void 0 ? `${l}_${p}` : "";
-  let A = await me({
-    queryObject: x,
+  c.length === 0 ? p = u?.objectIdField ?? "" : [p] = c;
+  let g = await ge({
+    queryObject: u,
     category: e?.series[0].x ?? "",
     splitByField: a,
-    queryConfig: u
+    queryConfig: d
   });
   if (e) {
-    const f = e?.series.map((T) => te({ where: T.query?.where })?.toString() ?? "").filter((T) => T !== void 0 && T !== "");
-    A = je({
-      arrayA: A,
-      arrayB: f,
-      getKey: (T) => T.toString()
+    const x = e?.series.map((A) => ie({ where: A.query?.where })?.toString() ?? "").filter((A) => A !== void 0 && A !== "");
+    g = Pe({
+      arrayA: g,
+      arrayB: x,
+      getKey: (A) => A.toString()
     });
   }
-  return { categoriesArray: A, fieldName: F, splitByFieldType: y, numericalField: p };
+  return { categoriesArray: g, splitByFieldType: l, numericalField: p };
 }
-function Et(t, e) {
+function zt(t, e) {
   let i = e === "";
   for (const s of t)
     if (e === s.name) {
@@ -323,12 +338,12 @@ function Et(t, e) {
     }
   return i;
 }
-function Kt(t, e) {
-  const i = qe(t);
+function Xt(t, e) {
+  const i = Ue(t);
   let s = e.length === 0, a = 0;
   for (const r of e) {
-    for (const n of i)
-      if (r === n && (a += 1), a === e.length) {
+    for (const c of i)
+      if (r === c && (a += 1), a === e.length) {
         s = !0;
         break;
       }
@@ -337,7 +352,7 @@ function Kt(t, e) {
   }
   return s;
 }
-function Pt(t, e) {
+function Yt(t, e) {
   e.forEach((i) => {
     Object.getOwnPropertyNames(i.prototype).forEach((s) => {
       Object.defineProperty(
@@ -348,193 +363,193 @@ function Pt(t, e) {
     });
   });
 }
-async function ot(t) {
-  const { layerInfo: e, config: i, category: s } = t, { layer: a } = e, { where: r } = i?.dataFilters ?? {}, { fetchNullValues: n } = i?.series?.[0]?.query ?? {}, l = n !== !0 ? `${s} IS NOT NULL` : "", o = {
-    where: ye([r, l]),
+async function ut(t) {
+  const { layerInfo: e, config: i, category: s } = t, { layer: a } = e, { where: r } = i?.dataFilters ?? {}, { fetchNullValues: c } = i?.series?.[0]?.query ?? {}, n = c !== !0 ? `${s} IS NOT NULL` : "", m = {
+    where: pe([r, n]),
     // excluding the null values from the list
     orderByFields: [],
     geometry: i?.dataFilters?.geometry
-  }, m = Z(a);
+  }, l = ee(a);
   return (
     // fetch unique category values asynchronously
-    (await me({ queryObject: a, category: s, queryConfig: o })).map((c) => {
-      const b = String(c);
-      return ee({
+    (await ge({ queryObject: a, category: s, queryConfig: m })).map((o) => {
+      const f = String(o);
+      return te({
         fieldName: s,
-        fieldValueToMatch: b,
-        subtypeInfo: m,
+        fieldValueToMatch: f,
+        subtypeInfo: l,
         // use the retrieved subtype information
         fieldList: e.layerFieldsInfo
         // list of field information from the layer
-      }) ?? b;
+      }) ?? f;
     })
   );
 }
-async function X(t) {
+async function Y(t) {
   const { seriesIndex: e, config: i, layerInfo: s } = t, { objectIdField: a } = s ?? {};
   let r;
-  const n = i.series[e ?? 0];
-  let l = !1, o = !1;
-  if (n === void 0) {
-    const g = i.series;
-    l = g.slice(0, e).every((u) => w(u)), o = g.slice(0, e).every((u) => C(u));
+  const c = i.series[e ?? 0];
+  let n = !1, m = !1;
+  if (c === void 0) {
+    const d = i.series;
+    n = d.slice(0, e).every((u) => B(u)), m = d.slice(0, e).every((u) => w(u));
   } else
-    l = w(n), o = C(n);
-  l ? r = await Pe({
+    n = B(c), m = w(c);
+  n ? r = await Xe({
     seriesIndex: e,
     objectIDField: a
-  }) : o ? r = await We({
+  }) : m ? r = await Ye({
     seriesIndex: e,
     objectIDField: a
-  }) : r = await Re({
+  }) : r = await _e({
     seriesIndex: e,
     objectIDField: a
   });
-  const m = P(i), y = i.series[0]?.dataLabels?.visible ?? !1, c = {
+  const l = U(i), F = i.series[0]?.dataLabels?.visible ?? !1, o = {
     ...r,
-    x: m,
+    x: l,
     y: "",
     dataLabels: {
       ...r.dataLabels,
-      type: r.dataLabels?.type ?? U.Text,
-      content: r.dataLabels?.content ?? { type: Te.TS },
-      visible: y
+      type: r.dataLabels?.type ?? C.Text,
+      content: r.dataLabels?.content ?? { type: Ce.TS },
+      visible: F
     }
-  }, b = D(i);
-  if (c.query = {
-    groupByFieldsForStatistics: [m]
-  }, b !== h.NoAggregation && a !== void 0) {
-    const g = `${b}_${a}_0`.toUpperCase();
-    c.y = g, c.query.outStatistics = [
+  }, f = V(i);
+  if (o.query = {
+    groupByFieldsForStatistics: [l]
+  }, f !== b.NoAggregation && a !== void 0) {
+    const d = `${f}_${a}_0`.toUpperCase();
+    o.y = d, o.query.outStatistics = [
       {
-        statisticType: b,
+        statisticType: f,
         onStatisticField: a,
-        outStatisticFieldName: g
+        outStatisticFieldName: d
       }
     ];
   }
-  if (w(c) || C(c)) {
-    let g;
-    if (i?.series?.[0] !== void 0 && (g = z(i.series)), g !== $.BarAndLineNoAggregation && g !== $.BarAndLineSplitByNoAggregation) {
-      let u = tt(i);
-      u === Be.Quarter && (u = we.Month), c.temporalBinning = {
-        type: K.FixedDateBased,
-        size: et(i),
+  if (B(o) || w(o)) {
+    let d;
+    if (i?.series?.[0] !== void 0 && (d = R(i.series)), d !== M.BarAndLineNoAggregation && d !== M.BarAndLineSplitByNoAggregation) {
+      let u = lt(i);
+      u === Le.Quarter && (u = ke.Month), o.temporalBinning = {
+        type: W.FixedDateBased,
+        size: rt(i),
         unit: u,
-        timeAggregationType: it(i),
-        trimIncompleteTimeInterval: st(i),
-        nullPolicy: at(i)
+        timeAggregationType: ot(i),
+        trimIncompleteTimeInterval: nt(i),
+        nullPolicy: ct(i)
       };
     }
   }
-  return ke(c);
+  return ve(o);
 }
-async function G(t, e) {
-  const { layerFieldsInfo: i, objectIdField: s } = e, a = P(t), r = z(t.series), n = v(t), l = D(t), o = E(t), m = n.length === 0 || n.includes(s), y = await de(l), c = m ? "" : n.map((f) => j(i ?? [], f)).join(", "), b = j(i ?? [], a), g = j(i ?? [], o), u = t.series.some((f) => k(f)), x = u ? "category" : "xAxisField", p = b;
-  let F = "";
-  const A = await ie();
-  if (r === $.BarAndLineFromFields)
-    F = O(A.titleLabels.aggrTypeOfAggrFields, {
-      aggregationType: y,
-      aggregationFields: c
+async function Q(t, e) {
+  const { layerFieldsInfo: i, objectIdField: s } = e, a = U(t), r = R(t.series), c = v(t), n = V(t), m = K(t), l = c.length === 0 || c.includes(s), F = await me(n), o = l ? "" : c.map((h) => j(i ?? [], h)).join(", "), f = j(i ?? [], a), d = j(i ?? [], m), u = t.series.some((h) => k(h)), p = u ? "category" : "xAxisField", g = f;
+  let x = "";
+  const A = await ae();
+  if (r === M.BarAndLineFromFields)
+    x = D(A.titleLabels.aggrTypeOfAggrFields, {
+      aggregationType: F,
+      aggregationFields: o
     });
-  else if (l === h.NoAggregation) {
-    const f = m ? s : c;
-    if (o === "") {
-      const T = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      F = O(A.titleLabels[T], {
-        aggregationType: f,
-        [x]: p
+  else if (n === b.NoAggregation) {
+    const h = l ? s : o;
+    if (m === "") {
+      const z = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      x = D(A.titleLabels[z], {
+        aggregationType: h,
+        [p]: g
       });
     } else {
-      const T = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      F = O(A.titleLabels[T], {
-        aggregationType: f,
-        [x]: p,
-        splitByField: g
+      const z = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      x = D(A.titleLabels[z], {
+        aggregationType: h,
+        [p]: g,
+        splitByField: d
       });
     }
-  } else if (l === h.Count)
-    if (o === "") {
-      const f = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      F = O(A.titleLabels[f], {
-        aggregationType: y,
-        [x]: p
+  } else if (n === b.Count)
+    if (m === "") {
+      const h = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      x = D(A.titleLabels[h], {
+        aggregationType: F,
+        [p]: g
       });
     } else {
-      const f = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      F = O(A.titleLabels[f], {
-        aggregationType: y,
-        [x]: p,
-        splitByField: g
+      const h = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      x = D(A.titleLabels[h], {
+        aggregationType: F,
+        [p]: g,
+        splitByField: d
       });
     }
-  else if (o !== "") {
-    const f = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
-    F = O(A.titleLabels[f], {
-      aggregationType: y,
-      aggregationField: c,
-      [x]: p,
-      splitByField: g
+  else if (m !== "") {
+    const h = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
+    x = D(A.titleLabels[h], {
+      aggregationType: F,
+      aggregationField: o,
+      [p]: g,
+      splitByField: d
     });
-  } else if (n.length > 0) {
-    const f = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
-    F = O(A.titleLabels[f], {
-      aggregationType: y,
-      aggregationFields: c,
-      [x]: p
+  } else if (c.length > 0) {
+    const h = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
+    x = D(A.titleLabels[h], {
+      aggregationType: F,
+      aggregationFields: o,
+      [p]: g
     });
   }
-  return F;
+  return x;
 }
-const fe = (t) => te({
+const be = (t) => ie({
   where: t.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", D = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? h.NoAggregation, Wt = async (t, e, i) => {
-  const s = v(e), a = E(e);
-  await ae({
+}) ?? "", V = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? b.NoAggregation, _t = async (t, e, i) => {
+  const s = v(e), a = K(e);
+  await oe({
     splitByField: a,
     numericFields: s,
     aggregationType: t,
     config: e,
     layerInfo: i
   });
-  const r = await Y({
+  const r = await _({
     config: e,
     layerInfo: i,
     numericFields: v(e),
-    aggregationType: D(e)
+    aggregationType: V(e)
   });
-  R(e, 1, r), e.title && (e.title.content.text = await G(e, i)), await M(e, null), await q(e, null), se(e, i);
-}, E = ce(
+  X(e, 1, r), e.title && (e.title.content.text = await Q(e, i)), await $(e, null), await q(e, null), le(e, i);
+}, K = ue(
   (t) => {
     const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
-    return Ue(t?.series?.[0]?.query?.where) ? "" : e;
+    return Ke(t?.series?.[0]?.query?.where) ? "" : e;
   },
   (t) => t?.series?.[0]?.query?.where
-), Rt = async (t, e, i) => {
-  const s = v(e), a = D(e);
-  await ae({
+), Ht = async (t, e, i) => {
+  const s = v(e), a = V(e);
+  await oe({
     splitByField: t,
     numericFields: s,
     aggregationType: a,
     config: e,
     layerInfo: i
   });
-  const r = await Y({
+  const r = await _({
     config: e,
     layerInfo: i,
     numericFields: v(e),
-    aggregationType: D(e)
+    aggregationType: V(e)
   });
-  R(e, 1, r), e.title && (e.title.content.text = await G(e, i)), await M(e, null), await q(e, null);
-}, v = ce(
+  X(e, 1, r), e.title && (e.title.content.text = await Q(e, i)), await $(e, null), await q(e, null);
+}, v = ue(
   // 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 (E(t) === "")
+    if (K(t) === "")
       e = t?.series.map((i) => {
         const s = i.query?.outStatistics?.map((a) => a.onStatisticField) ?? [];
         return s?.length > 0 ? s : i.y;
@@ -547,313 +562,329 @@ const fe = (t) => te({
   },
   // using series array address as key, since a change to the numeric fields will always rebuild a fresh series array
   (t) => t?.series
-), nt = async (t, e, i) => {
+), mt = async (t, e, i) => {
   const { objectIdField: s } = i;
-  let a = D(e);
-  t.length === 0 ? (t.push(s), a = h.Count) : a === h.Count && t.length >= 1 && !t.includes(s) && (a = h.Sum);
-  const r = E(e);
-  await ae({
+  let a = V(e);
+  t.length === 0 ? (t.push(s), a = b.Count) : a === b.Count && t.length >= 1 && !t.includes(s) && (a = b.Sum);
+  const r = K(e);
+  await oe({
     splitByField: r,
     numericFields: t,
     aggregationType: a,
     config: e,
     layerInfo: i
   });
-  const n = await Y({
+  const c = await _({
     config: e,
     layerInfo: i,
     numericFields: v(e),
-    aggregationType: D(e)
+    aggregationType: V(e)
   });
-  R(e, 1, n), e.title && (e.title.content.text = await G(e, i)), await M(e, null), await q(e, null), se(e, i);
-}, Xt = async (t, e, i) => {
-  const { layerFieldsInfo: s } = i ?? {}, a = e?.series?.length ?? 0, r = P(e);
-  let n;
-  const l = e.series.some((c) => k(c)), o = ze(e.series), m = Ye(e.series);
+  X(e, 1, c), e.title && (e.title.content.text = await Q(e, i)), await $(e, null), await q(e, null), le(e, i);
+}, Gt = async (t, e, i) => {
+  const { layerFieldsInfo: s } = i ?? {}, a = e?.series?.length ?? 0, r = U(e);
+  let c;
+  const n = e.series.some((o) => k(o)), m = Ge(e.series), l = Qe(e.series);
   if (s !== void 0) {
-    const c = $e(s);
-    !c.includes(r) && c.includes(t) ? n = Ee() : c.includes(r) && !c.includes(t) && (l ? n = Q() : n = Ke()), s.find((g) => g.name === t)?.type === ne.String && (n = Q()), n !== void 0 && await Je(e, n);
+    const o = We(s);
+    !o.includes(r) && o.includes(t) ? c = Re() : o.includes(r) && !o.includes(t) && (n ? c = Z() : c = ze()), s.find((d) => d.name === t)?.type === ye.String && (c = Z()), c !== void 0 && await it(e, c);
   }
-  a === 0 && (e.series = [await X({ config: e, layerInfo: i })]), e.series.forEach((c) => {
-    c.x = t, c.query !== void 0 && (c.query.groupByFieldsForStatistics = [t]);
+  a === 0 && (e.series = [await Y({ config: e, layerInfo: i })]), e.series.forEach((o) => {
+    o.x = t, o.query !== void 0 && (o.query.groupByFieldsForStatistics = [t]);
   });
-  const y = j(s, t);
-  if (R(e, 0, y), i !== void 0) {
-    const c = await Y({
+  const F = j(s, t);
+  if (X(e, 0, F), i !== void 0) {
+    const o = await _({
       config: e,
       layerInfo: i,
       numericFields: v(e),
-      aggregationType: D(e)
+      aggregationType: V(e)
     });
-    R(e, 1, c), e.title && (e.title.content.text = await G(e, i)), se(e, i);
-    const b = v(e);
-    await nt(b, e, i);
+    X(e, 1, o), e.title && (e.title.content.text = await Q(e, i)), le(e, i);
+    const f = v(e);
+    await mt(f, e, i);
   }
-  if (await M(e, null), await q(e, null), o || m) {
-    await He(e, null), await _e(e, null), Fe(0, e);
-    const c = n?.type === U.DateAxisFormat ? re.Null : re.Interpolate;
-    rt(c, e);
+  if (await $(e, null), await q(e, null), m || l) {
+    await et(e, null), await Ze(e, null), Se(0, e);
+    const o = c?.type === C.DateAxisFormat ? ne.Null : ne.Interpolate;
+    dt(o, e);
   }
 };
-function se(t, e) {
+function le(t, e) {
   let i = !1;
-  const s = D(t), a = v(t);
-  s === h.Count ? i = !0 : s === h.NoAggregation && (i = a.every((l) => {
-    const o = e.layerFieldsInfo.find((m) => m.name === l);
-    return o !== void 0 ? le(o) : !1;
-  })), oe(t, 1, i);
-  const r = t.series.some((l) => w(l)), n = t.series.some((l) => C(l));
-  if (r || n) {
-    const l = P(t), o = e.layerFieldsInfo.find((y) => y.name === l), m = o !== void 0 && le(o);
-    oe(t, 0, m);
+  const s = V(t), a = v(t);
+  s === b.Count ? i = !0 : s === b.NoAggregation && (i = a.every((n) => {
+    const m = e.layerFieldsInfo.find((l) => l.name === n);
+    return m !== void 0 ? ce(m) : !1;
+  })), de(t, 1, i);
+  const r = t.series.some((n) => B(n)), c = t.series.some((n) => w(n));
+  if (r || c) {
+    const n = U(t), m = e.layerFieldsInfo.find((F) => F.name === n), l = m !== void 0 && ce(m);
+    de(t, 0, l);
   }
 }
-const ct = (t) => {
+const pt = (t) => {
   let e = S.xAxisAsc;
   const i = t.orderOptions?.data?.orderType ?? L.Category, s = t.orderOptions?.data?.orderBy ?? N.Ascending;
   return i === L.Category && Array.isArray(s) ? e = S.customSort : i === L.Category ? s === N.Ascending ? e = S.xAxisAsc : e = S.xAxisDesc : s === N.Ascending ? e = S.yAxisAsc : e = S.yAxisDesc, e;
 };
-async function dt(t) {
+async function gt(t) {
   const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t;
   let r = !1;
-  const n = await X({
+  const c = await Y({
     config: s,
     layerInfo: a,
     seriesIndex: 0
-  }), l = await ie(), o = {
-    ...n,
+  }), n = await ae(), m = re({
+    config: s,
+    numericFields: e,
+    aggregationType: i,
+    layer: a.layer
+  }).name, l = {
+    ...c,
     id: `series_${Date.now()}`,
-    name: l.axisLabels.values,
-    x: W,
-    y: Ce
-  }, m = [];
-  for (const c of e)
-    m.push({
-      onStatisticField: c,
-      outStatisticFieldName: `${c}_0`.toUpperCase(),
+    name: n.axisLabels.values,
+    x: P,
+    y: m
+  }, F = [];
+  for (const f of e)
+    F.push({
+      onStatisticField: f,
+      outStatisticFieldName: `${f}_0`.toUpperCase(),
       statisticType: i
     });
-  o.query = { outStatistics: m };
-  const y = s.series[0];
-  return y !== void 0 && (o.id = y.id, s.colorMatch || (k(y) && k(o) ? o.fillSymbol = y.fillSymbol : (w(o) && w(y) || C(o) && C(y)) && (o.lineSymbol = y.lineSymbol, o.markerSymbol = y.markerSymbol), r = !0), o.id = y.id, y.name !== n.name && (o.name = y.name)), s.series.length === 1 && !s.colorMatch && (k(o) ? o.fillSymbol = s.series[0].fillSymbol : (w(o) || C(o)) && (o.lineSymbol = s.series[0].lineSymbol, o.markerSymbol = s.series[0].markerSymbol), r = !0), s.colorMatch = !r, [o];
+  l.query = { outStatistics: F };
+  const o = s.series[0];
+  return o !== void 0 && (l.id = o.id, s.colorMatch || (k(o) && k(l) ? l.fillSymbol = o.fillSymbol : (B(l) && B(o) || w(l) && w(o)) && (l.lineSymbol = o.lineSymbol, l.markerSymbol = o.markerSymbol), r = !0), l.id = o.id, o.name !== c.name && (l.name = o.name)), s.series.length === 1 && !s.colorMatch && (k(l) ? l.fillSymbol = s.series[0].fillSymbol : (B(l) || w(l)) && (l.lineSymbol = s.series[0].lineSymbol, l.markerSymbol = s.series[0].markerSymbol), r = !0), s.colorMatch = !r, [l];
 }
-async function Se(t) {
-  const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: n } = a, l = [];
-  let o = !1;
-  const m = e.map((y, c) => `${i}_${y}_${c}`.toUpperCase());
-  for (let y = 0; y < e.length; y += 1) {
-    const c = await X({
+async function xe(t) {
+  const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: c } = a, n = [];
+  let m = !1;
+  for (let l = 0; l < e.length; l += 1) {
+    const F = await Y({
       config: s,
       layerInfo: a,
-      seriesIndex: y
-    }), b = m[y].toUpperCase(), g = e[y];
-    let u = {
-      ...c,
+      seriesIndex: l
+    }), o = re({
+      config: s,
+      numericFields: e,
+      aggregationType: i,
+      layer: a.layer,
+      numericFieldIndex: l
+    }).name, f = e[l];
+    let d = {
+      ...F,
       query: {
-        ...c.query
+        ...F.query
       }
     };
-    g !== n && (u = {
-      ...u,
-      id: g,
-      name: j(r, g)
+    f !== c && (d = {
+      ...d,
+      id: f,
+      name: j(r, f)
     });
-    let x = g;
-    u.query !== void 0 && (i !== h.NoAggregation ? (x = b, u.query.outStatistics = [
+    let u = f;
+    d.query !== void 0 && (i !== b.NoAggregation ? (u = o, d.query.outStatistics = [
       {
-        ...c.query?.outStatistics?.[0] ?? {},
-        onStatisticField: g,
-        outStatisticFieldName: b,
+        ...F.query?.outStatistics?.[0] ?? {},
+        onStatisticField: f,
+        outStatisticFieldName: o,
         statisticType: i
       }
-    ]) : delete u.query.outStatistics), u.y = x;
+    ]) : delete d.query.outStatistics), d.y = u;
     const p = s.series.find(
-      (F) => F.query?.outStatistics?.[0]?.onStatisticField === g && F.query.where === void 0
+      (g) => g.query?.outStatistics?.[0]?.onStatisticField === f && g.query.where === void 0
     );
     if (p !== void 0 && typeof p.y == "string" && p.y.trim() !== "") {
-      s.colorMatch || (k(u) && k(p) ? u.fillSymbol = p.fillSymbol : (w(u) && w(p) || C(u) && C(p)) && (u.lineSymbol = p.lineSymbol, u.markerSymbol = p.markerSymbol), o = !0);
-      const F = await X({
+      s.colorMatch || (k(d) && k(p) ? d.fillSymbol = p.fillSymbol : (B(d) && B(p) || w(d) && w(p)) && (d.lineSymbol = p.lineSymbol, d.markerSymbol = p.markerSymbol), m = !0);
+      const g = await Y({
         config: s,
         layerInfo: a,
-        seriesIndex: y
+        seriesIndex: l
       });
-      u.id = p.id, p.id !== F.id && p.name !== F.name && (u.id = p.id, u.name = p.name);
+      d.id = p.id, p.id !== g.id && p.name !== g.name && (d.id = p.id, d.name = p.name);
     }
-    l.push(u);
+    n.push(d);
   }
-  return s.series.length === 1 && l.length === 1 && !s.colorMatch && (k(s.series[0]) && k(l[0]) ? l[0].fillSymbol = s.series[0].fillSymbol : (w(s.series[0]) && w(l[0]) || C(s.series[0]) && C(l[0])) && (l[0].lineSymbol = s.series[0].lineSymbol, l[0].markerSymbol = s.series[0].markerSymbol), o = !0), s.colorMatch = !o, l;
+  return s.series.length === 1 && n.length === 1 && !s.colorMatch && (k(s.series[0]) && k(n[0]) ? n[0].fillSymbol = s.series[0].fillSymbol : (B(s.series[0]) && B(n[0]) || w(s.series[0]) && w(n[0])) && (n[0].lineSymbol = s.series[0].lineSymbol, n[0].markerSymbol = s.series[0].markerSymbol), m = !0), s.colorMatch = !m, n;
 }
-async function yt(t) {
-  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { layer: n, layerFieldsInfo: l } = r, { fetchNullValues: o } = a?.series?.[0]?.query ?? {}, m = P(a), y = m !== W ? m : void 0, { categoriesArray: c, fieldName: b, splitByFieldType: g, numericalField: u } = await lt({
+async function Ft(t) {
+  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { layer: c, layerFieldsInfo: n } = r, { fetchNullValues: m } = a?.series?.[0]?.query ?? {}, l = U(a), F = l !== P ? l : void 0, { categoriesArray: o, splitByFieldType: f, numericalField: d } = await yt({
     config: a,
-    layer: n,
-    layerFieldsInfo: l,
-    xAxisField: y,
+    layer: c,
+    layerFieldsInfo: n,
+    xAxisField: F,
     aggregationFields: i,
-    aggregationType: s,
     splitByField: e,
-    fetchNullValues: o
+    fetchNullValues: m
   });
-  let x = [], p = !1;
-  if (c.length === 0) {
-    x = await Se({
+  let u = [], p = !1;
+  if (o.length === 0) {
+    u = await xe({
       numericFields: i,
       aggregationType: s,
       config: a,
       layerInfo: r
     });
-    for (const F of x)
-      F.query && (F.query.where = `${e}=''`);
+    for (const g of u)
+      g.query && (g.query.where = `${e}=''`);
   } else
-    for (let F = 0; F < c.length; F += 1) {
-      const A = c[F], f = `${b}_${F}`.toUpperCase(), T = await X({
+    for (let g = 0; g < o.length; g += 1) {
+      const x = o[g], A = re({
+        config: a,
+        numericFields: i,
+        aggregationType: s,
+        layer: r.layer,
+        seriesIndex: g
+      }).name, h = await Y({
         config: a,
         layerInfo: r,
-        seriesIndex: F
-      }), be = {
+        seriesIndex: g
+      }), z = {
         fieldName: e,
-        fieldValueToMatch: A ?? "",
-        subtypeInfo: Z(r.layer),
+        fieldValueToMatch: x ?? "",
+        subtypeInfo: ee(r.layer),
         fieldList: r.layerFieldsInfo
-      }, xe = ee(be), J = `${A}`, B = {
-        ...T,
+      }, he = te(z), J = `${x}`, T = {
+        ...h,
         id: J,
-        name: xe ?? J,
-        y: f,
+        name: he ?? J,
+        y: A,
         query: {
-          ...T.query,
-          where: `${e}=${g === ne.String && A !== null ? `'${A}'` : A}`,
-          outStatistics: s !== h.NoAggregation ? [
+          ...h.query,
+          where: `${e}=${f === ye.String && x !== null ? `'${x}'` : x}`,
+          outStatistics: s !== b.NoAggregation ? [
             {
-              ...T.query?.outStatistics?.[0] ?? {},
-              onStatisticField: u,
-              outStatisticFieldName: f,
+              ...h.query?.outStatistics?.[0] ?? {},
+              onStatisticField: d,
+              outStatisticFieldName: A,
               statisticType: s
             }
           ] : void 0
         }
       };
-      s === h.NoAggregation && (B.query !== void 0 && (delete B.query.outStatistics, delete B.query.groupByFieldsForStatistics), B.y = u);
-      const V = a.series.find(
-        (Ae) => String(fe(Ae)).trim().replace(/'/gu, "") === J
+      s === b.NoAggregation && (T.query !== void 0 && (delete T.query.outStatistics, delete T.query.groupByFieldsForStatistics), T.y = d);
+      const O = a.series.find(
+        (Ae) => String(be(Ae)).trim().replace(/'/gu, "") === J
       );
-      V !== void 0 && (a.colorMatch || (k(B) && k(V) ? B.fillSymbol = V.fillSymbol : (w(B) && w(V) || C(B) && C(V)) && (B.lineSymbol = V.lineSymbol, B.markerSymbol = V.markerSymbol), p = !0), B.id = V.id, B.name = V.name), x.push(B);
+      O !== void 0 && (a.colorMatch || (k(T) && k(O) ? T.fillSymbol = O.fillSymbol : (B(T) && B(O) || w(T) && w(O)) && (T.lineSymbol = O.lineSymbol, T.markerSymbol = O.markerSymbol), p = !0), T.id = O.id, T.name = O.name), u.push(T);
     }
-  return a.colorMatch = !p, x;
+  return a.colorMatch = !p, u;
 }
-const ae = async (t) => {
-  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { x: n } = a.series[0], l = z(a.series);
-  e === "" || i.length > 1 ? n === W || n === void 0 || n.trim() === "" || l === $.BarAndLineFromFields ? a.series = await dt({
+const oe = async (t) => {
+  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { x: c } = a.series[0], n = R(a.series);
+  e === "" || i.length > 1 ? c === P || c === void 0 || c.trim() === "" || n === M.BarAndLineFromFields ? a.series = await gt({
     config: a,
     layerInfo: r,
     numericFields: i,
     aggregationType: s
-  }) : a.series = await Se({
+  }) : a.series = await xe({
     config: a,
     layerInfo: r,
     numericFields: i,
     aggregationType: s
-  }) : a.series = await yt({
+  }) : a.series = await Ft({
     config: a,
     layerInfo: r,
     splitByField: e,
     numericFields: i,
     aggregationType: s
   });
-}, zt = (t) => {
-  const { config: e, seriesIndex: i, layerInfo: s, commonStrings: a } = t, r = e.series?.[i], n = E(e);
-  let l;
-  if (z(e.series) === $.BarAndLineFromFields)
-    l = a.axisLabels.values;
-  else if (Le(n)) {
-    const m = r.query?.outStatistics?.[0]?.onStatisticField;
-    m !== void 0 && m !== s.objectIdField && (l = j(s.layerFieldsInfo, m));
+}, Qt = (t) => {
+  const { config: e, seriesIndex: i, layerInfo: s, commonStrings: a } = t, r = e.series?.[i], c = K(e);
+  let n;
+  if (R(e.series) === M.BarAndLineFromFields)
+    n = a.axisLabels.values;
+  else if (Ne(c)) {
+    const l = r.query?.outStatistics?.[0]?.onStatisticField;
+    l !== void 0 && l !== s.objectIdField && (n = j(s.layerFieldsInfo, l));
   } else {
-    const m = String(fe(r)).trim().replace(/'/gu, ""), y = {
-      fieldName: E(e),
-      fieldValueToMatch: m ?? "",
-      subtypeInfo: Z(s.layer),
+    const l = String(be(r)).trim().replace(/'/gu, ""), F = {
+      fieldName: K(e),
+      fieldValueToMatch: l ?? "",
+      subtypeInfo: ee(s.layer),
       fieldList: s.layerFieldsInfo
     };
-    l = ee(y) ?? m;
+    n = te(F) ?? l;
   }
-  return l ?? r.id;
-}, Yt = (t, e) => {
+  return n ?? r.id;
+}, Jt = (t, e) => {
   e.orderOptions ??= {};
   const i = e.orderOptions?.data?.orderType;
-  ct(e) === S.customSort && i === L.Category && (e.orderOptions.data = {
+  pt(e) === S.customSort && i === L.Category && (e.orderOptions.data = {
     orderType: L.Category,
     orderBy: [...t]
   });
-}, _t = (t) => t.dataFilters, Ht = (t, e) => {
+}, Zt = (t) => t.dataFilters, ei = (t, e) => {
   t !== void 0 ? e.dataFilters = t : delete e.dataFilters;
-}, Gt = async (t, e) => {
-  const i = P(t), s = Ge(t)?.type, a = v(t), r = z(t.series);
-  let n = [];
-  return s === U.CategoryAxisFormat && (r === $.BarAndLineFromFields || i === W ? n = a.map((l) => j(e?.layerFieldsInfo, l)) : i.trim() !== "" && i !== W && e !== void 0 && (n = await ot({
+}, ti = async (t, e) => {
+  const i = U(t), s = tt(t)?.type, a = v(t), r = R(t.series);
+  let c = [];
+  return s === C.CategoryAxisFormat && (r === M.BarAndLineFromFields || i === P ? c = a.map((n) => j(e?.layerFieldsInfo, n)) : i.trim() !== "" && i !== P && e !== void 0 && (c = await ut({
     layerInfo: e,
     config: t,
     category: i
-  }))), n;
-}, Jt = (t, e) => {
+  }))), c;
+}, ii = (t, e) => {
   e.series.forEach((i) => {
     i.query && (i.query.fetchNullValues = t);
   });
-}, Qt = (t) => t.series.some((e) => e.query?.fetchNullValues), Zt = (t) => (
+}, si = (t) => t.series.some((e) => e.query?.fetchNullValues), ai = (t) => (
   // TODO: Look into split-by values gotchas cases once done
-  t.series.map((e) => String(te({ where: e.query?.where }))).filter((e) => e !== void 0 && e.trim() !== "")
+  t.series.map((e) => String(ie({ where: e.query?.where }))).filter((e) => e !== void 0 && e.trim() !== "")
 );
 export {
-  jt as A,
-  st as B,
-  Ut as C,
-  at as D,
-  rt as E,
-  $t as F,
-  Xt as G,
-  nt as H,
-  Wt as I,
-  Rt as J,
-  _t as K,
-  Ht as L,
-  ct as M,
-  Gt as N,
-  qt as O,
-  Dt as P,
-  Yt as Q,
-  ae as R,
-  Jt as S,
-  Qt as T,
-  vt as U,
-  It as V,
-  kt as W,
-  Nt as X,
+  ot as A,
+  Kt as B,
+  nt as C,
+  Wt as D,
+  ct as E,
+  dt as F,
+  Rt as G,
+  Gt as H,
+  mt as I,
+  _t as J,
+  Ht as K,
+  Zt as L,
+  ei as M,
+  pt as N,
+  ti as O,
+  Et as P,
+  Ut as Q,
+  Jt as R,
+  oe as S,
+  ii as T,
+  si as U,
+  qt as V,
+  $t as W,
+  Dt as X,
   Vt as Y,
-  Ot as Z,
-  _e as a,
-  M as b,
+  jt as Z,
+  Mt as _,
+  Ze as a,
+  $ as b,
   q as c,
-  zt as d,
-  Pt as e,
-  ie as f,
-  Y as g,
-  Et as h,
-  Kt as i,
-  Je as j,
-  Ge as k,
-  ot as l,
-  lt as m,
-  oe as n,
-  P as o,
-  D as p,
-  v as q,
-  Zt as r,
-  He as s,
-  E as t,
-  R as u,
-  et as v,
-  Fe as w,
-  tt as x,
-  Mt as y,
-  it as z
+  re as d,
+  Qt as e,
+  ae as f,
+  _ as g,
+  Yt as h,
+  Xt as i,
+  zt as j,
+  it as k,
+  tt as l,
+  ut as m,
+  yt as n,
+  de as o,
+  U as p,
+  V as q,
+  v as r,
+  et as s,
+  ai as t,
+  X as u,
+  K as v,
+  rt as w,
+  Se as x,
+  lt as y,
+  Pt as z
 };