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

package/dist/chunks/data.js

@@ -1,7 +1,7 @@
 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 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 { 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, cs as M, m as I, b5 as Me, bt as pe, b6 as ee, b7 as te, cd as Ue, h as ie, cr as Ee, i as Pe, b4 as Ke, a5 as We, a6 as Re, ao as ze, ap as Xe, ar as Ye, 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,13 +9,13 @@ 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 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 { q as _e, l as k, n as He, o as Ge, j as B, k as w } from "./index4.js";
+import { a as Qe, 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.164 */
+v4.33.0-next.165 */
 async function ae(t = Ie().locale) {
   let e = await import("./messages.en3.js");
   switch (t) {
@@ -155,18 +155,18 @@ async function _(t) {
   const { config: e, layerInfo: i, numericFields: s, aggregationType: a } = t;
   let r = "";
   if (e) {
-    const c = $e(e) === Te.Stacked100, n = await ae();
+    const c = $e(e) === Te.Stacked100, o = await ae();
     if (c)
-      r = n.axisLabels.percent;
+      r = o.axisLabels.percent;
     else {
       const m = await me(a);
       if (s.length === 1) {
         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, {
+        a === b.NoAggregation ? r = l : a === b.Count && s[0] === i.objectIdField ? r = o.axisLabels.count : r = D(o.axisLabels.aggregationOfFieldName, {
           aggregation: m,
           fieldName: l
         });
-      } else s.length > 1 && (a === b.NoAggregation ? r = n.axisLabels.values : r = D(n.axisLabels.aggregationOfValues, {
+      } else s.length > 1 && (a === b.NoAggregation ? r = o.axisLabels.values : r = D(o.axisLabels.aggregationOfValues, {
         aggregation: m
       }));
     }
@@ -181,15 +181,15 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
 }, 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);
-}, Dt = (t) => H(t, 1, !0), q = async (t, e) => {
+}, Ot = (t) => H(t, 1, !0), q = async (t, e) => {
   await G(t, e, 1, !0);
-}, Vt = (t) => H(t, 1, !1), $ = async (t, e) => {
+}, Dt = (t) => H(t, 1, !1), $ = async (t, e) => {
   await G(t, e, 1, !1);
-}, qt = (t) => H(t, 0, !0), Ze = async (t, e) => {
+}, Vt = (t) => H(t, 0, !0), Je = async (t, e) => {
   await G(t, e, 0, !0);
-}, $t = (t) => H(t, 0, !1), et = async (t, e) => {
+}, qt = (t) => H(t, 0, !1), Ze = async (t, e) => {
   await G(t, e, 0, !1);
-}, tt = (t) => t.axes?.[0]?.valueFormat ?? Z(), it = async (t, e) => {
+}, et = (t) => t.axes?.[0]?.valueFormat ?? Z(), tt = async (t, e) => {
   const i = await Fe(t, 0);
   if (i !== void 0 && e !== void 0) {
     const s = {
@@ -198,10 +198,10 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
     };
     fe(t, s, 0);
   }
-}, jt = (t) => {
+}, $t = (t) => {
   let e;
-  return He(t.axes?.[1]?.valueFormat) && (e = t.axes?.[1]?.valueFormat), e;
-}, Mt = async (t, e) => {
+  return _e(t.axes?.[1]?.valueFormat) && (e = t.axes?.[1]?.valueFormat), e;
+}, jt = async (t, e) => {
   const i = await Fe(t, 1);
   if (i !== void 0 && e !== void 0) {
     const s = {
@@ -213,19 +213,19 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
 }, de = (t, e, i) => {
   const s = t.axes?.[e];
   s !== void 0 && (s.integerOnlyValues = i);
-}, st = (t) => {
+}, it = (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;
-}, at = (t) => {
+}, st = (t) => {
   const e = se(t.series);
   let i = !1;
-  return (e === C.BarSeries || e === C.LineSeries) && (i = st(t) === S.customSort), i;
-}, Ut = (t) => {
+  return (e === C.BarSeries || e === C.LineSeries) && (i = it(t) === S.customSort), i;
+}, Mt = (t) => {
   let e = [];
   const i = t.orderOptions?.data?.orderType;
-  return at(t) && i === L.Category && (e = t.orderOptions?.data?.orderBy), e;
-}, Et = (t, e, i) => {
+  return st(t) && i === L.Category && (e = t.orderOptions?.data?.orderBy), e;
+}, Ut = (t, e, i) => {
   let s = L.Category, a = N.Ascending;
   const r = se(e.series);
   e.orderOptions ??= {}, t === S.customSort && i !== void 0 ? (a = [...i], e.orderOptions.data = {
@@ -236,22 +236,31 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
     orderBy: a
   });
 }, 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;
+  const {
+    config: e,
+    numericFields: i,
+    aggregationType: s,
+    mode: a,
+    layer: r,
+    numericFieldIndex: c,
+    seriesIndex: o,
+    splitByField: m = ""
+  } = t, l = se(e.series), f = R(e.series), n = r ? je(r).objectIdField : "FID", g = U(e), d = i.length === 1 && i[0] === n;
   let u = "y", p = "y";
-  switch (m) {
+  switch (l) {
     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];
+      s !== b.NoAggregation ? a === Qe.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]}`));
+      if (m === "" || i.length > 1)
+        g === P || g === void 0 || g.trim() === "" || f === 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}`);
+        const F = i[0];
+        u = `${s}_${F}_${o ?? 0}`.toUpperCase(), p = d ? E(b.Count) : E(`${s} of ${F}`);
       }
       break;
     }
@@ -260,23 +269,23 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
     name: u,
     description: p
   };
-}, rt = (t) => {
+}, at = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.size), e;
-}, lt = (t) => {
+}, rt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.unit), e;
-}, ot = (t) => {
+}, lt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.timeAggregationType), e;
-}, nt = (t) => {
+}, ot = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.trimIncompleteTimeInterval), e;
-}, ct = (t) => {
+}, nt = (t) => {
   let e;
   const i = t.series[0];
   return I(i) && (e = i.temporalBinning?.nullPolicy), e;
@@ -284,36 +293,36 @@ const Fe = async (t, e) => t.axes?.[e] ?? (await Oe(t.type))[e], fe = (t, e, i)
   e?.series?.forEach((i) => {
     I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.size = t);
   }), $(e, null), q(e, null);
-}, dt = (t, e) => {
+}, ct = (t, e) => {
   e?.series?.forEach((i) => {
     I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.nullPolicy = t);
   }), $(e, null), q(e, null);
-}, Pt = (t, e) => {
+}, Et = (t, e) => {
   e.series?.forEach((i) => {
     I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.unit = t);
   }), $(e, null), q(e, null);
-}, Kt = (t, e) => {
+}, Pt = (t, e) => {
   e.series?.forEach((i) => {
     I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.timeAggregationType = t);
   }), $(e, null), q(e, null);
-}, Wt = (t, e) => {
+}, Kt = (t, e) => {
   e.series?.forEach((i) => {
     I(i) && (i.temporalBinning ??= { type: W.FixedDateBased }, i.temporalBinning.trimIncompleteTimeInterval = t);
   }), $(e, null), q(e, null);
-}, Rt = (t) => {
+}, Wt = (t) => {
   Se(0, t);
 };
-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]),
+async function dt(t) {
+  const { config: e, layer: i, xAxisField: s, splitByField: a, layerFieldsInfo: r, aggregationFields: c, fetchNullValues: o } = t, l = r.filter((x) => x.name === a)[0]?.type, f = o !== !0 ? `${a} IS NOT NULL` : "", n = s && o !== !0 ? `${s} IS NOT NULL` : "", { where: g } = e?.dataFilters ?? {}, d = {
+    where: pe([g, f, n]),
     // excluding the null values from the list
-    orderByFields: Ee(a) ? [] : [`${a} ${N.Ascending}`],
+    orderByFields: Ue(a) ? [] : [`${a} ${N.Ascending}`],
     // default sorting ascending for split-by field
     geometry: e?.dataFilters?.geometry
   }, u = i;
   let p = "";
   c.length === 0 ? p = u?.objectIdField ?? "" : [p] = c;
-  let g = await ge({
+  let F = await ge({
     queryObject: u,
     category: e?.series[0].x ?? "",
     splitByField: a,
@@ -321,15 +330,15 @@ async function yt(t) {
   });
   if (e) {
     const x = e?.series.map((A) => ie({ where: A.query?.where })?.toString() ?? "").filter((A) => A !== void 0 && A !== "");
-    g = Pe({
-      arrayA: g,
+    F = Ee({
+      arrayA: F,
       arrayB: x,
       getKey: (A) => A.toString()
     });
   }
-  return { categoriesArray: g, splitByFieldType: l, numericalField: p };
+  return { categoriesArray: F, splitByFieldType: l, numericalField: p };
 }
-function zt(t, e) {
+function Rt(t, e) {
   let i = e === "";
   for (const s of t)
     if (e === s.name) {
@@ -338,8 +347,8 @@ function zt(t, e) {
     }
   return i;
 }
-function Xt(t, e) {
-  const i = Ue(t);
+function zt(t, e) {
+  const i = Me(t);
   let s = e.length === 0, a = 0;
   for (const r of e) {
     for (const c of i)
@@ -352,7 +361,7 @@ function Xt(t, e) {
   }
   return s;
 }
-function Yt(t, e) {
+function Xt(t, e) {
   e.forEach((i) => {
     Object.getOwnPropertyNames(i.prototype).forEach((s) => {
       Object.defineProperty(
@@ -363,25 +372,25 @@ function Yt(t, e) {
     });
   });
 }
-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]),
+async function yt(t) {
+  const { layerInfo: e, config: i, category: s } = t, { layer: a } = e, { where: r } = i?.dataFilters ?? {}, { fetchNullValues: c } = i?.series?.[0]?.query ?? {}, o = c !== !0 ? `${s} IS NOT NULL` : "", m = {
+    where: pe([r, o]),
     // excluding the null values from the list
     orderByFields: [],
     geometry: i?.dataFilters?.geometry
   }, l = ee(a);
   return (
     // fetch unique category values asynchronously
-    (await ge({ queryObject: a, category: s, queryConfig: m })).map((o) => {
-      const f = String(o);
+    (await ge({ queryObject: a, category: s, queryConfig: m })).map((n) => {
+      const g = String(n);
       return te({
         fieldName: s,
-        fieldValueToMatch: f,
+        fieldValueToMatch: g,
         subtypeInfo: l,
         // use the retrieved subtype information
         fieldList: e.layerFieldsInfo
         // list of field information from the layer
-      }) ?? f;
+      }) ?? g;
     })
   );
 }
@@ -389,23 +398,23 @@ async function Y(t) {
   const { seriesIndex: e, config: i, layerInfo: s } = t, { objectIdField: a } = s ?? {};
   let r;
   const c = i.series[e ?? 0];
-  let n = !1, m = !1;
+  let o = !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));
+    o = d.slice(0, e).every((u) => B(u)), m = d.slice(0, e).every((u) => w(u));
   } else
-    n = B(c), m = w(c);
-  n ? r = await Xe({
+    o = B(c), m = w(c);
+  o ? r = await ze({
     seriesIndex: e,
     objectIDField: a
-  }) : m ? r = await Ye({
+  }) : m ? r = await Xe({
     seriesIndex: e,
     objectIDField: a
-  }) : r = await _e({
+  }) : r = await Ye({
     seriesIndex: e,
     objectIDField: a
   });
-  const l = U(i), F = i.series[0]?.dataLabels?.visible ?? !1, o = {
+  const l = U(i), f = i.series[0]?.dataLabels?.visible ?? !1, n = {
     ...r,
     x: l,
     y: "",
@@ -413,91 +422,91 @@ async function Y(t) {
       ...r.dataLabels,
       type: r.dataLabels?.type ?? C.Text,
       content: r.dataLabels?.content ?? { type: Ce.TS },
-      visible: F
+      visible: f
     }
-  }, f = V(i);
-  if (o.query = {
+  }, g = V(i);
+  if (n.query = {
     groupByFieldsForStatistics: [l]
-  }, f !== b.NoAggregation && a !== void 0) {
-    const d = `${f}_${a}_0`.toUpperCase();
-    o.y = d, o.query.outStatistics = [
+  }, g !== b.NoAggregation && a !== void 0) {
+    const d = `${g}_${a}_0`.toUpperCase();
+    n.y = d, n.query.outStatistics = [
       {
-        statisticType: f,
+        statisticType: g,
         onStatisticField: a,
         outStatisticFieldName: d
       }
     ];
   }
-  if (B(o) || w(o)) {
+  if (B(n) || w(n)) {
     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 = {
+      let u = rt(i);
+      u === Le.Quarter && (u = ke.Month), n.temporalBinning = {
         type: W.FixedDateBased,
-        size: rt(i),
+        size: at(i),
         unit: u,
-        timeAggregationType: ot(i),
-        trimIncompleteTimeInterval: nt(i),
-        nullPolicy: ct(i)
+        timeAggregationType: lt(i),
+        trimIncompleteTimeInterval: ot(i),
+        nullPolicy: nt(i)
       };
     }
   }
-  return ve(o);
+  return ve(n);
 }
 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;
+  const { layerFieldsInfo: i, objectIdField: s } = e, a = U(t), r = R(t.series), c = v(t), o = V(t), m = K(t), l = c.length === 0 || c.includes(s), f = await me(o), n = l ? "" : c.map((h) => j(i ?? [], h)).join(", "), g = j(i ?? [], a), d = j(i ?? [], m), u = t.series.some((h) => k(h)), p = u ? "category" : "xAxisField", F = g;
   let x = "";
   const A = await ae();
   if (r === M.BarAndLineFromFields)
     x = D(A.titleLabels.aggrTypeOfAggrFields, {
-      aggregationType: F,
-      aggregationFields: o
+      aggregationType: f,
+      aggregationFields: n
     });
-  else if (n === b.NoAggregation) {
-    const h = l ? s : o;
+  else if (o === b.NoAggregation) {
+    const h = l ? s : n;
     if (m === "") {
       const z = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
       x = D(A.titleLabels[z], {
         aggregationType: h,
-        [p]: g
+        [p]: F
       });
     } else {
       const z = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
       x = D(A.titleLabels[z], {
         aggregationType: h,
-        [p]: g,
+        [p]: F,
         splitByField: d
       });
     }
-  } else if (n === b.Count)
+  } else if (o === b.Count)
     if (m === "") {
       const h = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
       x = D(A.titleLabels[h], {
-        aggregationType: F,
-        [p]: g
+        aggregationType: f,
+        [p]: F
       });
     } else {
       const h = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
       x = D(A.titleLabels[h], {
-        aggregationType: F,
-        [p]: g,
+        aggregationType: f,
+        [p]: F,
         splitByField: d
       });
     }
   else if (m !== "") {
     const h = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
     x = D(A.titleLabels[h], {
-      aggregationType: F,
-      aggregationField: o,
-      [p]: g,
+      aggregationType: f,
+      aggregationField: n,
+      [p]: F,
       splitByField: d
     });
   } else if (c.length > 0) {
     const h = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
     x = D(A.titleLabels[h], {
-      aggregationType: F,
-      aggregationFields: o,
-      [p]: g
+      aggregationType: f,
+      aggregationFields: n,
+      [p]: F
     });
   }
   return x;
@@ -506,7 +515,7 @@ const be = (t) => ie({
   where: t.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", V = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? b.NoAggregation, _t = async (t, e, i) => {
+}) ?? "", V = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? b.NoAggregation, Yt = async (t, e, i) => {
   const s = v(e), a = K(e);
   await oe({
     splitByField: a,
@@ -525,10 +534,10 @@ const be = (t) => ie({
 }, K = ue(
   (t) => {
     const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
-    return Ke(t?.series?.[0]?.query?.where) ? "" : e;
+    return Pe(t?.series?.[0]?.query?.where) ? "" : e;
   },
   (t) => t?.series?.[0]?.query?.where
-), Ht = async (t, e, i) => {
+), _t = async (t, e, i) => {
   const s = v(e), a = V(e);
   await oe({
     splitByField: t,
@@ -562,7 +571,7 @@ const be = (t) => ie({
   },
   // using series array address as key, since a change to the numeric fields will always rebuild a fresh series array
   (t) => t?.series
-), mt = async (t, e, i) => {
+), ut = async (t, e, i) => {
   const { objectIdField: s } = i;
   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);
@@ -581,61 +590,61 @@ const be = (t) => ie({
     aggregationType: V(e)
   });
   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) => {
+}, Ht = 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);
+  const o = e.series.some((n) => k(n)), m = He(e.series), l = Ge(e.series);
   if (s !== void 0) {
-    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);
+    const n = Ke(s);
+    !n.includes(r) && n.includes(t) ? c = We() : n.includes(r) && !n.includes(t) && (o ? c = Z() : c = Re()), s.find((d) => d.name === t)?.type === ye.String && (c = Z()), c !== void 0 && await tt(e, c);
   }
-  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]);
+  a === 0 && (e.series = [await Y({ config: e, layerInfo: i })]), e.series.forEach((n) => {
+    n.x = t, n.query !== void 0 && (n.query.groupByFieldsForStatistics = [t]);
   });
-  const F = j(s, t);
-  if (X(e, 0, F), i !== void 0) {
-    const o = await _({
+  const f = j(s, t);
+  if (X(e, 0, f), i !== void 0) {
+    const n = await _({
       config: e,
       layerInfo: i,
       numericFields: v(e),
       aggregationType: V(e)
     });
-    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);
+    X(e, 1, n), e.title && (e.title.content.text = await Q(e, i)), le(e, i);
+    const g = v(e);
+    await ut(g, e, i);
   }
   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);
+    await Ze(e, null), await Je(e, null), Se(0, e);
+    const n = c?.type === C.DateAxisFormat ? ne.Null : ne.Interpolate;
+    ct(n, e);
   }
 };
 function le(t, e) {
   let i = !1;
   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);
+  s === b.Count ? i = !0 : s === b.NoAggregation && (i = a.every((o) => {
+    const m = e.layerFieldsInfo.find((l) => l.name === o);
     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));
+  const r = t.series.some((o) => B(o)), c = t.series.some((o) => w(o));
   if (r || c) {
-    const n = U(t), m = e.layerFieldsInfo.find((F) => F.name === n), l = m !== void 0 && ce(m);
+    const o = U(t), m = e.layerFieldsInfo.find((f) => f.name === o), l = m !== void 0 && ce(m);
     de(t, 0, l);
   }
 }
-const pt = (t) => {
+const mt = (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 gt(t) {
+async function pt(t) {
   const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t;
   let r = !1;
   const c = await Y({
     config: s,
     layerInfo: a,
     seriesIndex: 0
-  }), n = await ae(), m = re({
+  }), o = await ae(), m = re({
     config: s,
     numericFields: e,
     aggregationType: i,
@@ -643,103 +652,104 @@ async function gt(t) {
   }).name, l = {
     ...c,
     id: `series_${Date.now()}`,
-    name: n.axisLabels.values,
+    name: o.axisLabels.values,
     x: P,
     y: m
-  }, F = [];
-  for (const f of e)
-    F.push({
-      onStatisticField: f,
-      outStatisticFieldName: `${f}_0`.toUpperCase(),
+  }, f = [];
+  for (const g of e)
+    f.push({
+      onStatisticField: g,
+      outStatisticFieldName: `${g}_0`.toUpperCase(),
       statisticType: i
     });
-  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];
+  l.query = { outStatistics: f };
+  const n = s.series[0];
+  return n !== void 0 && (l.id = n.id, s.colorMatch || (k(n) && k(l) ? l.fillSymbol = n.fillSymbol : (B(l) && B(n) || w(l) && w(n)) && (l.lineSymbol = n.lineSymbol, l.markerSymbol = n.markerSymbol), r = !0), l.id = n.id, n.name !== c.name && (l.name = n.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 xe(t) {
-  const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: c } = a, n = [];
+  const { numericFields: e, aggregationType: i, config: s, layerInfo: a } = t, { layerFieldsInfo: r, objectIdField: c } = a, o = [];
   let m = !1;
   for (let l = 0; l < e.length; l += 1) {
-    const F = await Y({
+    const f = await Y({
       config: s,
       layerInfo: a,
       seriesIndex: l
-    }), o = re({
+    }), n = re({
       config: s,
       numericFields: e,
       aggregationType: i,
       layer: a.layer,
       numericFieldIndex: l
-    }).name, f = e[l];
+    }).name, g = e[l];
     let d = {
-      ...F,
+      ...f,
       query: {
-        ...F.query
+        ...f.query
       }
     };
-    f !== c && (d = {
+    g !== c && (d = {
       ...d,
-      id: f,
-      name: j(r, f)
+      id: g,
+      name: j(r, g)
     });
-    let u = f;
-    d.query !== void 0 && (i !== b.NoAggregation ? (u = o, d.query.outStatistics = [
+    let u = g;
+    d.query !== void 0 && (i !== b.NoAggregation ? (u = n, d.query.outStatistics = [
       {
-        ...F.query?.outStatistics?.[0] ?? {},
-        onStatisticField: f,
-        outStatisticFieldName: o,
+        ...f.query?.outStatistics?.[0] ?? {},
+        onStatisticField: g,
+        outStatisticFieldName: n,
         statisticType: i
       }
     ]) : delete d.query.outStatistics), d.y = u;
     const p = s.series.find(
-      (g) => g.query?.outStatistics?.[0]?.onStatisticField === f && g.query.where === void 0
+      (F) => F.query?.outStatistics?.[0]?.onStatisticField === g && F.query.where === void 0
     );
     if (p !== void 0 && typeof p.y == "string" && p.y.trim() !== "") {
       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({
+      const F = await Y({
         config: s,
         layerInfo: a,
         seriesIndex: l
       });
-      d.id = p.id, p.id !== g.id && p.name !== g.name && (d.id = p.id, d.name = p.name);
+      d.id = p.id, p.id !== F.id && p.name !== F.name && (d.id = p.id, d.name = p.name);
     }
-    n.push(d);
+    o.push(d);
   }
-  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;
+  return s.series.length === 1 && o.length === 1 && !s.colorMatch && (k(s.series[0]) && k(o[0]) ? o[0].fillSymbol = s.series[0].fillSymbol : (B(s.series[0]) && B(o[0]) || w(s.series[0]) && w(o[0])) && (o[0].lineSymbol = s.series[0].lineSymbol, o[0].markerSymbol = s.series[0].markerSymbol), m = !0), s.colorMatch = !m, o;
 }
-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({
+async function gt(t) {
+  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { layer: c, layerFieldsInfo: o } = r, { fetchNullValues: m } = a?.series?.[0]?.query ?? {}, l = U(a), f = l !== P ? l : void 0, { categoriesArray: n, splitByFieldType: g, numericalField: d } = await dt({
     config: a,
     layer: c,
-    layerFieldsInfo: n,
-    xAxisField: F,
+    layerFieldsInfo: o,
+    xAxisField: f,
     aggregationFields: i,
     splitByField: e,
     fetchNullValues: m
   });
   let u = [], p = !1;
-  if (o.length === 0) {
+  if (n.length === 0) {
     u = await xe({
       numericFields: i,
       aggregationType: s,
       config: a,
       layerInfo: r
     });
-    for (const g of u)
-      g.query && (g.query.where = `${e}=''`);
+    for (const F of u)
+      F.query && (F.query.where = `${e}=''`);
   } else
-    for (let g = 0; g < o.length; g += 1) {
-      const x = o[g], A = re({
+    for (let F = 0; F < n.length; F += 1) {
+      const x = n[F], A = re({
         config: a,
         numericFields: i,
         aggregationType: s,
         layer: r.layer,
-        seriesIndex: g
+        seriesIndex: F,
+        splitByField: e
       }).name, h = await Y({
         config: a,
         layerInfo: r,
-        seriesIndex: g
+        seriesIndex: F
       }), z = {
         fieldName: e,
         fieldValueToMatch: x ?? "",
@@ -752,7 +762,7 @@ async function Ft(t) {
         y: A,
         query: {
           ...h.query,
-          where: `${e}=${f === ye.String && x !== null ? `'${x}'` : x}`,
+          where: `${e}=${g === ye.String && x !== null ? `'${x}'` : x}`,
           outStatistics: s !== b.NoAggregation ? [
             {
               ...h.query?.outStatistics?.[0] ?? {},
@@ -772,8 +782,8 @@ async function Ft(t) {
   return a.colorMatch = !p, u;
 }
 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({
+  const { splitByField: e, numericFields: i, aggregationType: s, config: a, layerInfo: r } = t, { x: c } = a.series[0], o = R(a.series);
+  e === "" || i.length > 1 ? c === P || c === void 0 || c.trim() === "" || o === M.BarAndLineFromFields ? a.series = await pt({
     config: a,
     layerInfo: r,
     numericFields: i,
@@ -783,108 +793,108 @@ const oe = async (t) => {
     layerInfo: r,
     numericFields: i,
     aggregationType: s
-  }) : a.series = await Ft({
+  }) : a.series = await gt({
     config: a,
     layerInfo: r,
     splitByField: e,
     numericFields: i,
     aggregationType: s
   });
-}, Qt = (t) => {
+}, Gt = (t) => {
   const { config: e, seriesIndex: i, layerInfo: s, commonStrings: a } = t, r = e.series?.[i], c = K(e);
-  let n;
+  let o;
   if (R(e.series) === M.BarAndLineFromFields)
-    n = a.axisLabels.values;
+    o = 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));
+    l !== void 0 && l !== s.objectIdField && (o = j(s.layerFieldsInfo, l));
   } else {
-    const l = String(be(r)).trim().replace(/'/gu, ""), F = {
+    const l = String(be(r)).trim().replace(/'/gu, ""), f = {
       fieldName: K(e),
       fieldValueToMatch: l ?? "",
       subtypeInfo: ee(s.layer),
       fieldList: s.layerFieldsInfo
     };
-    n = te(F) ?? l;
+    o = te(f) ?? l;
   }
-  return n ?? r.id;
-}, Jt = (t, e) => {
+  return o ?? r.id;
+}, Qt = (t, e) => {
   e.orderOptions ??= {};
   const i = e.orderOptions?.data?.orderType;
-  pt(e) === S.customSort && i === L.Category && (e.orderOptions.data = {
+  mt(e) === S.customSort && i === L.Category && (e.orderOptions.data = {
     orderType: L.Category,
     orderBy: [...t]
   });
-}, Zt = (t) => t.dataFilters, ei = (t, e) => {
+}, Jt = (t) => t.dataFilters, Zt = (t, e) => {
   t !== void 0 ? e.dataFilters = t : delete e.dataFilters;
-}, ti = async (t, e) => {
-  const i = U(t), s = tt(t)?.type, a = v(t), r = R(t.series);
+}, ei = async (t, e) => {
+  const i = U(t), s = et(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({
+  return s === C.CategoryAxisFormat && (r === M.BarAndLineFromFields || i === P ? c = a.map((o) => j(e?.layerFieldsInfo, o)) : i.trim() !== "" && i !== P && e !== void 0 && (c = await yt({
     layerInfo: e,
     config: t,
     category: i
   }))), c;
-}, ii = (t, e) => {
+}, ti = (t, e) => {
   e.series.forEach((i) => {
     i.query && (i.query.fetchNullValues = t);
   });
-}, si = (t) => t.series.some((e) => e.query?.fetchNullValues), ai = (t) => (
+}, ii = (t) => t.series.some((e) => e.query?.fetchNullValues), si = (t) => (
   // TODO: Look into split-by values gotchas cases once done
   t.series.map((e) => String(ie({ where: e.query?.where }))).filter((e) => e !== void 0 && e.trim() !== "")
 );
 export {
-  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,
+  lt as A,
+  Pt as B,
+  ot as C,
+  Kt as D,
+  nt as E,
+  ct as F,
+  Wt as G,
+  Ht as H,
+  ut as I,
+  Yt as J,
+  _t as K,
+  Jt as L,
+  Zt as M,
+  mt as N,
+  ei as O,
+  Ut as P,
+  Mt as Q,
+  Qt as R,
   oe as S,
-  ii as T,
-  si as U,
-  qt as V,
-  $t as W,
-  Dt as X,
-  Vt as Y,
-  jt as Z,
-  Mt as _,
-  Ze as a,
+  ti as T,
+  ii as U,
+  Vt as V,
+  qt as W,
+  Ot as X,
+  Dt as Y,
+  $t as Z,
+  jt as _,
+  Je as a,
   $ as b,
   q as c,
   re as d,
-  Qt as e,
+  Gt 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,
+  Xt as h,
+  zt as i,
+  Rt as j,
+  tt as k,
+  et as l,
+  yt as m,
+  dt as n,
   de as o,
   U as p,
   V as q,
   v as r,
-  et as s,
-  ai as t,
+  Ze as s,
+  si as t,
   X as u,
   K as v,
-  rt as w,
+  at as w,
   Se as x,
-  lt as y,
-  Pt as z
+  rt as y,
+  Et as z
 };