@arcgis/charts-components 5.2.0-next.65 → 5.2.0-next.67

package/dist/chunks/serial-chart-data.js

@@ -1,20 +1,20 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import { substitute as w } from "@arcgis/core/intl.js";
-import { cloneDeep as G, isEmpty as Ye, memoize as We } from "lodash-es";
-import { S as ne } from "./common.js";
-import { s as D, u as E, a as Ie, g as ye, b as Le, c as He, d as Xe, e as pe } from "./utils.js";
-import { w as I, i as Ue, di as W, cn as je, bC as Ke, a$ as De, x as Ze, Y as J, cS as _e, cR as Qe, p as ze, aJ as me, ct as Ge, d as Je, aI as et, I as tt, a7 as st, bx as it, W as at, e as rt, bI as nt, ds as ot, v as lt, dy as fe, cb as ut, dz as ct, c7 as dt, B as yt, N as Se, bL as Z, dv as mt, bj as Y, bP as _, ap as U, a6 as Ne, bd as P, bc as gt, k as oe, bt as pt, bB as ft, bs as O, bA as V, bp as Fe, br as xe } from "./index2.js";
-import { a as M, s as ge, g as ee, b as he, c as St } from "./data.js";
-import { u as T, r as v, k as Ft, d as k, n as L, m as H, p as xt, t as ht, s as le } from "./chart-object-literals.js";
+import { substitute as E } from "@arcgis/core/intl.js";
+import { cloneDeep as J, isEmpty as Ye, memoize as We } from "lodash-es";
+import { S as oe } from "./common.js";
+import { s as D, u as $, a as Ie, g as ye, b as Le, c as He, d as Xe, e as pe } from "./utils.js";
+import { w as I, i as Ue, di as Y, cn as je, bC as Ke, a$ as De, x as Ze, Y as ee, cS as _e, cR as Qe, p as ze, aJ as me, ct as Ge, d as Je, aI as et, I as tt, a7 as st, bx as it, W as at, e as rt, bI as nt, ds as ot, v as lt, dy as fe, cb as ct, dz as ut, c7 as dt, B as yt, N as Se, bL as _, dv as mt, bj as q, bP as Q, ap as j, a6 as Ne, bd as M, bc as gt, k as U, bt as pt, bB as ft, bs as O, bA as V, bp as Fe, br as xe } from "./index2.js";
+import { a as P, s as ge, g as te, b as he, c as St } from "./data.js";
+import { u as T, r as v, k as Ft, d as k, n as L, m as W, p as xt, t as ht, s as le } from "./chart-object-literals.js";
 import { R as Oe, i as Tt } from "./rest-js-object-literals.js";
-import { i as te } from "./index4.js";
-import { aD as Bt, K as Q, F as ue, w as Ct, $ as bt, ac as At, ao as vt, A as It, a2 as Lt } from "./index.js";
-import { C as q, F as X, d as R } from "./index3.js";
+import { i as se } from "./index4.js";
+import { aD as Bt, K as z, F as ce, w as Ct, $ as bt, ac as At, ao as vt, A as It, a2 as Lt } from "./index.js";
+import { C as w, F as H, d as R } from "./index3.js";
 import { g as Ve, s as Dt } from "./series-types.js";
 import { convertChartSpec as Nt } from "../utils/chart-config/converter/index.js";
-import { d as ce, f as Ot } from "./type-guards.js";
+import { d as ue, f as Ot } from "./type-guards.js";
 import { C as Vt, m as kt } from "./model-setter.js";
-import { g as se } from "./utils2.js";
+import { g as ie } from "./utils2.js";
 import { a as Rt, b as qt } from "./series-length.js";
 const Ds = (s) => {
   let e;
@@ -59,20 +59,20 @@ const Ds = (s) => {
 }, Mt = (s) => {
   Pt(0, s);
 };
-var $t = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Wt = (s, e, t, a) => {
-  for (var i = Yt(e, t), r = s.length - 1, n; r >= 0; r--)
-    (n = s[r]) && (i = n(e, t, i) || i);
+var $t = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Wt = (s, e, t, r) => {
+  for (var i = Yt(e, t), a = s.length - 1, n; a >= 0; a--)
+    (n = s[a]) && (i = n(e, t, i) || i);
   return i && $t(e, t, i), i;
 };
 const Ht = (s) => {
   let e;
-  return W(s) ? e = s.outTimeZone : s?.series.forEach((t) => {
+  return Y(s) ? e = s.outTimeZone : s?.series.forEach((t) => {
     (t.type === T.BarSeries || t.type === T.RadarSeries || t.type === T.LineSeries) && t.temporalBinning && (e = t.temporalBinning.outTimeZone);
   }), e || (e = s?.axes?.[0]?.valueFormat.type === T.DateAxisFormat ? s.axes[0].valueFormat.intlOptions.timeZone : void 0), e;
 }, ke = (s, e) => {
   const t = Ue(s);
-  W(e) ? s ? e.outTimeZone = t : delete e.outTimeZone : e?.series.forEach((a) => {
-    (a.type === T.BarSeries || a.type === T.RadarSeries || a.type === T.LineSeries) && (s ? (a.temporalBinning ??= {}, a.temporalBinning.outTimeZone = t) : a.temporalBinning && delete a.temporalBinning.outTimeZone);
+  Y(e) ? s ? e.outTimeZone = t : delete e.outTimeZone : e?.series.forEach((r) => {
+    (r.type === T.BarSeries || r.type === T.RadarSeries || r.type === T.LineSeries) && (s ? (r.temporalBinning ??= {}, r.temporalBinning.outTimeZone = t) : r.temporalBinning && delete r.temporalBinning.outTimeZone);
   }), e?.axes?.[0]?.valueFormat.type === T.DateAxisFormat && (s ? e.axes[0].valueFormat.intlOptions.timeZone = t : delete e.axes[0].valueFormat.intlOptions.timeZone);
 };
 class Xt extends Vt {
@@ -109,97 +109,100 @@ function Ms(s, e) {
   return e != null || De(s);
 }
 async function $s(s) {
-  const { config: e, layer: t, abortSignal: a } = s;
+  const { config: e, layer: t, abortSignal: r } = s;
   let i = !1;
-  return ce(t) || Ot(e) ? e && ce(t) && (i = await Ke({ config: e, layer: t, abortSignal: a })) : i = !0, i;
+  return ue(t) || Ot(e) ? e && ue(t) && (i = await Ke({ config: e, layer: t, abortSignal: r })) : i = !0, i;
 }
 async function jt(s) {
   const {
     queryObject: e,
     chartConfig: t,
-    splitByField: a,
+    splitByField: r,
     errorStrings: i,
-    abortSignal: r,
+    abortSignal: a,
     runtimeDataFilters: n,
     ignoreViewExtent: o,
     setTimeBinningInfoWhenNotProvided: l,
     returnFeaturesExtent: c,
-    chartLimits: p
+    returnStatisticsAggregatedIds: p,
+    chartLimits: f
   } = s;
-  let g = [], d;
-  const m = G(t), y = m.series[0], u = rt({
+  let u = [], m;
+  const d = J(t), y = d.series[0], g = rt({
     queryObject: e,
-    chartConfig: m,
+    chartConfig: d,
     runtimeDataFilters: n,
     ignoreViewExtent: o
   });
-  if (u.outStatistics?.[0]?.outStatisticFieldName && (u.outStatistics[0].outStatisticFieldName = Bt.outStatistics.outStatisticFieldName), I(y) && nt({
-    xAxisValueFormatType: ot(m),
+  if (g.outStatistics?.[0]?.outStatisticFieldName && (g.outStatistics[0].outStatisticFieldName = Bt.outStatistics.outStatisticFieldName), I(y) && nt({
+    xAxisValueFormatType: ot(d),
     setTimeBinningInfoWhenNotProvided: l,
     seriesConfig: y,
     queryObject: e
-  }) && lt(a, e)) {
-    const { temporalBinning: S, x: F } = y, { uniqueQuery: x } = fe({
-      chartConfig: m,
-      queryConfig: u,
+  }) && lt(r, e)) {
+    const { temporalBinning: F, x: h } = y, { uniqueQuery: S } = fe({
+      chartConfig: d,
+      queryConfig: g,
       queryObject: e,
       setTimeBinningInfoWhenNotProvided: l,
       returnFeaturesExtent: c,
-      chartLimits: p
-    }), f = t.axes?.[0].valueFormat.type === T.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0;
-    d = await ut({
+      chartLimits: f
+    }), b = t.axes?.[0].valueFormat.type === T.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0;
+    m = await ct({
       queryObject: e,
-      dateField: F,
-      splitByField: a,
-      queryConfig: x,
-      axisTimeZone: f,
-      temporalBinning: S,
+      dateField: h,
+      splitByField: r,
+      queryConfig: S,
+      axisTimeZone: b,
+      temporalBinning: F,
+      returnStatisticsAggregatedIds: p,
       errorStrings: i,
-      abortSignal: r
-    }), g = Array.from(
+      abortSignal: a
+    }), u = Array.from(
       new Set(
-        d.flatMap((A) => {
-          const { stackedAttributes: b } = A;
-          let B = [];
-          return b && (B = b.map((C) => C[a]).filter((C) => C !== void 0)), B;
+        m.flatMap((C) => {
+          const { stackedAttributes: B } = C;
+          let A = [];
+          return B && (A = B.map((x) => x[r]).filter((x) => x !== void 0)), A;
         })
       ).values()
     );
   } else {
-    const { uniqueQuery: S } = fe({
-      chartConfig: m,
+    const { uniqueQuery: F } = fe({
+      chartConfig: d,
       queryObject: e,
-      queryConfig: u,
+      queryConfig: g,
       setTimeBinningInfoWhenNotProvided: l,
       returnFeaturesExtent: c,
-      chartLimits: p
-    }), { elementCount: F } = await ct({
-      chartConfig: m,
+      chartLimits: f
+    }), { elementCount: h } = await ut({
+      chartConfig: d,
       queryObject: e,
-      queryConfig: u,
-      behaviorAfterLimit: p?.behaviorAfterLimit,
-      numberMaxOfFeaturesToFetch: S.num,
-      abortSignal: r
+      queryConfig: g,
+      behaviorAfterLimit: f?.behaviorAfterLimit,
+      numberMaxOfFeaturesToFetch: F.num,
+      abortSignal: a
     });
-    d = await dt({
+    m = await dt({
       queryObject: e,
-      queryConfig: S,
-      featureCount: F,
+      queryConfig: F,
+      featureCount: h,
+      returnStatisticsAggregatedIds: p,
       errorStrings: i,
-      abortSignal: r
-    }), g = Array.from(
+      abortSignal: a
+    }), u = Array.from(
       new Set(
-        d.map((x) => x.attributes[a]).filter((x) => x !== void 0)
+        m.map((S) => S.attributes[r]).filter((S) => S !== void 0)
       ).values()
     );
   }
-  return { allValues: g, preFetchedQueryResponse: d };
+  return { allValues: u, preFetchedQueryResponse: m };
 }
 function Kt(s, e) {
   const t = /* @__PURE__ */ new Map();
-  return s.series.forEach((a) => {
+  return s.series.forEach((r) => {
     let i = me({
-      where: a.query?.where,
+      where: r.query?.where,
       // normalize the value so it matches what we get from getAllValues()
       // Refer to https://devtopia.esri.com/WebGIS/arcgis-charts/issues/8127
       normalize: !0,
@@ -208,93 +211,95 @@ function Kt(s, e) {
       escape: !1
     });
     e && i !== null && (i = Number(i));
-    const r = Ve([a]);
-    r !== void 0 && t.set(r, [
-      ...t.get(r) ?? [],
+    const a = Ve([r]);
+    a !== void 0 && t.set(a, [
+      ...t.get(a) ?? [],
       i
     ]);
   }), t;
 }
 function Zt(s) {
-  const { allValues: e, configUniqueValuesPerSeriesType: t, initialConfigWasEmpty: a } = s, i = /* @__PURE__ */ new Map();
-  return Array.from(t.keys()).forEach((r) => {
-    const n = t.get(r) ?? [];
+  const { allValues: e, configUniqueValuesPerSeriesType: t, initialConfigWasEmpty: r } = s, i = /* @__PURE__ */ new Map();
+  return Array.from(t.keys()).forEach((a) => {
+    const n = t.get(a) ?? [];
     let o = [];
-    a ? o = e : e.forEach((l) => {
+    r ? o = e : e.forEach((l) => {
       n.includes(l) || o.push(l);
-    }), i.set(r, o);
+    }), i.set(a, o);
   }), i;
 }
 function _t(s) {
-  const { chartConfig: e, missingValue: t, splitByField: a, seriesTemplate: i } = s, r = JSON.parse(
+  const { chartConfig: e, missingValue: t, splitByField: r, seriesTemplate: i } = s, a = JSON.parse(
     JSON.stringify({
       ...e.series[0],
       ...i
     })
   );
-  if (r.query) {
-    if (t === null ? r.id = X.nullValue : t === "" ? r.id = X.emptyStringValue : r.id = `${t}`, r.name = `${t}`, r.query.outStatistics?.[0] !== void 0) {
-      const o = r.id;
-      r.query.outStatistics[0].outStatisticFieldName = o, "y" in r && (r.y = o);
+  if (a.query) {
+    if (t === null ? a.id = H.nullValue : t === "" ? a.id = H.emptyStringValue : a.id = `${t}`, a.name = `${t}`, a.query.outStatistics?.[0] !== void 0) {
+      const o = a.id;
+      a.query.outStatistics[0].outStatisticFieldName = o, "y" in a && (a.y = o);
     }
     const n = typeof t == "number" || t === null ? t : `'${t}'`;
-    r.query.where = `${a}=${n}`;
+    a.query.where = `${r}=${n}`;
   }
-  return r;
+  return a;
 }
 async function Qt(s) {
   const {
     updateSplitBySeries: e,
     config: t,
-    queryObject: a,
+    queryObject: r,
     errorStrings: i,
-    abortSignal: r,
+    abortSignal: a,
     runtimeDataFilters: n,
     ignoreViewExtent: o,
     setTimeBinningInfoWhenNotProvided: l,
     returnFeaturesExtent: c,
-    chartLimits: p
-  } = s, { seriesTemplate: g } = e ?? {};
-  let d;
-  if (a && !ce(a) && e !== void 0 && t !== void 0 && (t.series.length > 0 || g !== void 0) && e.addMissingSeries) {
-    const m = t.series.length === 0;
-    t.series.length === 0 && g !== void 0 && t.series.push(g);
-    const y = J(t.series);
-    if (y === q.BoxPlotMonoFieldAndSplitBy || y === q.BoxPlotMultiFieldsAndSplitBy || y === q.BoxPlotMonoFieldAndCategoryAndSplitBy || y === q.BarAndLineSplitBy || y === q.BarAndLineSplitByNoAggregation) {
-      const u = et(t.series[0]?.query?.where), S = tt(a), F = st(u, S), x = F ? it(F) : !1, f = await jt({
-        queryObject: a,
+    returnStatisticsAggregatedIds: p,
+    chartLimits: f
+  } = s, { seriesTemplate: u } = e ?? {};
+  let m;
+  if (r && !ue(r) && e !== void 0 && t !== void 0 && (t.series.length > 0 || u !== void 0) && e.addMissingSeries) {
+    const d = t.series.length === 0;
+    t.series.length === 0 && u !== void 0 && t.series.push(u);
+    const y = ee(t.series);
+    if (y === w.BoxPlotMonoFieldAndSplitBy || y === w.BoxPlotMultiFieldsAndSplitBy || y === w.BoxPlotMonoFieldAndCategoryAndSplitBy || y === w.BarAndLineSplitBy || y === w.BarAndLineSplitByNoAggregation) {
+      const g = et(t.series[0]?.query?.where), F = tt(r), h = st(g, F), S = h ? it(h) : !1, b = await jt({
+        queryObject: r,
         chartConfig: t,
-        splitByField: u,
-        abortSignal: r,
+        splitByField: g,
+        abortSignal: a,
         runtimeDataFilters: n,
         ignoreViewExtent: o,
         setTimeBinningInfoWhenNotProvided: l,
         returnFeaturesExtent: c,
-        chartLimits: p,
+        returnStatisticsAggregatedIds: p,
+        chartLimits: f,
         errorStrings: i
-      }), { allValues: A } = f;
-      if ({ preFetchedQueryResponse: d } = f, A.length > 0) {
-        const b = Kt(t, x), B = Zt({
-          allValues: A,
-          configUniqueValuesPerSeriesType: b,
-          initialConfigWasEmpty: m
+      }), { allValues: C } = b;
+      if ({ preFetchedQueryResponse: m } = b, C.length > 0) {
+        const B = Kt(t, S), A = Zt({
+          allValues: C,
+          configUniqueValuesPerSeriesType: B,
+          initialConfigWasEmpty: d
         });
-        Array.from(B.keys()).forEach((C) => {
-          (B.get(C) ?? []).forEach(($) => {
+        Array.from(A.keys()).forEach((x) => {
+          (A.get(x) ?? []).forEach((N) => {
             t.series.push(
               _t({
                 chartConfig: t,
-                seriesTemplate: g,
-                missingValue: $,
-                splitByField: u
+                seriesTemplate: u,
+                missingValue: N,
+                splitByField: g
               })
             );
-          }), m && t.series.shift();
+          }), d && t.series.shift();
         });
       }
     }
   }
-  return d;
+  return m;
 }
 function zt(s, e) {
   e && !De(e) && (e = Je({ chartConfig: e, queryObject: s }));
@@ -303,89 +308,91 @@ async function Ys(s) {
   const {
     configToAlter: e,
     layer: t,
-    addMissingSeries: a,
+    addMissingSeries: r,
     updateSplitBySeries: i,
-    chartContainer: r,
+    chartContainer: a,
     queryObject: n,
     abortSignal: o,
     runtimeDataFilters: l,
     ignoreViewExtent: c,
     setTimeBinningInfoWhenNotProvided: p,
-    returnFeaturesExtent: g,
-    chartLimits: d,
-    timeZone: m,
+    returnFeaturesExtent: f,
+    returnStatisticsAggregatedIds: u,
+    chartLimits: m,
+    timeZone: d,
     errorStrings: y
   } = s;
-  let u = e, S;
-  return u && (zt(t, u), u = await Nt(u, t, void 0, o), a && n && (S = await Qt({
+  let g = e, F;
+  return g && (zt(t, g), g = await Nt(g, t, void 0, o), r && n && (F = await Qt({
     updateSplitBySeries: i,
-    config: u,
+    config: g,
     queryObject: n,
     errorStrings: y,
     abortSignal: o,
     runtimeDataFilters: l,
     ignoreViewExtent: c,
     setTimeBinningInfoWhenNotProvided: p,
-    returnFeaturesExtent: g,
-    chartLimits: d
-  })), u = je(u, r), ke(m, u)), { alteredConfig: u, preFetchedQueryResponse: S };
+    returnFeaturesExtent: f,
+    returnStatisticsAggregatedIds: u,
+    chartLimits: m
+  })), g = je(g, a), ke(d, g)), { alteredConfig: g, preFetchedQueryResponse: F };
 }
 function Gt(s, e) {
   let t = !1;
   if (e !== void 0) {
-    const a = at({ key: yt.Average, splitBy: e });
-    t = Number.isFinite(s[a]);
+    const r = at({ key: yt.Average, splitBy: e });
+    t = Number.isFinite(s[r]);
   }
   return t;
 }
 function Ws(s) {
-  const { data: e, config: t, showEmptySeries: a } = s, i = t.series.length, r = G(t);
+  const { data: e, config: t, showEmptySeries: r } = s, i = t.series.length, a = J(t);
   let n = !1;
-  if (!a && i > 1 && e) {
-    const o = Ze(e), l = Ve(t?.series), c = J(t?.series), p = /* @__PURE__ */ new Set();
+  if (!r && i > 1 && e) {
+    const o = Ze(e), l = Ve(t?.series), c = ee(t?.series), p = /* @__PURE__ */ new Set();
     switch (l) {
       case T.ComboLineAndBarSeries:
       case T.BarSeries:
       case T.RadarSeries:
       case T.LineSeries: {
-        r.series.forEach((d) => {
+        a.series.forEach((u) => {
           if (Array.isArray(o)) {
             let m = "";
-            "y" in d && (m = Array.isArray(d.y) ? d.y[0] : d.y, c === q.BarAndLineSplitByNoAggregation && (m = `${m}_${me({ where: d.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), o.some(
-              (u) => Ge({
-                dataItem: u,
-                x: d.x,
+            "y" in u && (m = Array.isArray(u.y) ? u.y[0] : u.y, c === w.BarAndLineSplitByNoAggregation && (m = `${m}_${me({ where: u.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), o.some(
+              (y) => Ge({
+                dataItem: y,
+                x: u.x,
                 y: m,
                 aggregationType: t.series[0].query?.outStatistics?.[0]?.statisticType
               })
-            ) && p.add(d));
+            ) && p.add(u));
           }
         });
         break;
       }
       case T.BoxPlotSeries: {
         if (_e(t)) {
-          const d = Qe(t);
+          const u = Qe(t);
           t.series.forEach((m) => {
-            let y, u;
-            m.type === T.BoxPlotSeries ? (y = e.dataItems, u = y?.some(
-              (S) => ze({
-                dataItem: S,
+            let d, y;
+            m.type === T.BoxPlotSeries ? (d = e.dataItems, y = d?.some(
+              (g) => ze({
+                dataItem: g,
                 splitBy: m.query?.where,
-                showOutliers: d
+                showOutliers: u
               })
-            )) : m.type === T.LineSeries && (y = e.meanLines, u = y?.some(
-              (S) => Gt(S, m.query?.where)
-            )), u && p.add(m);
+            )) : m.type === T.LineSeries && (d = e.meanLines, y = d?.some(
+              (g) => Gt(g, m.query?.where)
+            )), y && p.add(m);
           });
         }
         break;
       }
     }
-    const g = Array.from(p.values());
-    n = g.length > 0 && g.length < i, n && (r.series = g);
+    const f = Array.from(p.values());
+    n = f.length > 0 && f.length < i, n && (a.series = f);
   }
-  return { seriesFilteredOut: n, filteredConfig: r };
+  return { seriesFilteredOut: n, filteredConfig: a };
 }
 const Hs = (s) => s.hideEmptyRowsAndColumns, Xs = (s, e) => {
   s.hideEmptyRowsAndColumns = e;
@@ -396,47 +403,47 @@ const Hs = (s) => s.hideEmptyRowsAndColumns, Xs = (s, e) => {
   const t = s.series[0];
   t.gradientRules = e;
 }, Zs = (s) => s.series[0].gradientRules, _s = (s) => {
-  const { yField: e, config: t, layerInfo: a, commonStrings: i } = s, { layerFieldsInfo: r } = a, n = se(1, t), o = Jt(t), l = te(t), c = t.series[0];
+  const { yField: e, config: t, layerInfo: r, commonStrings: i } = s, { layerFieldsInfo: a } = r, n = ie(1, t), o = Jt(t), l = se(t), c = t.series[0];
   if (typeof e == "string" && o !== e && c) {
     if (c.y = e, Ut(t), o === n || l) {
-      const p = R(r, e);
-      E(t, 1, p);
+      const p = R(a, e);
+      $(t, 1, p);
     }
-    Re({ commonStrings: i, config: t, layerInfo: a });
+    Re({ commonStrings: i, config: t, layerInfo: r });
   }
 }, Jt = (s) => s.series[0].y ?? "", Qs = (s) => {
-  const { binning: e, config: t, commonStrings: a } = s, i = t.series[0];
-  if (i.xTemporalBinning = e, e?.unit !== void 0 && e.unit in a.utilsStrings.heatChartCalendarDatePartsUnits) {
-    const r = a.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
-    E(t, 0, r);
+  const { binning: e, config: t, commonStrings: r } = s, i = t.series[0];
+  if (i.xTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const a = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    $(t, 0, a);
   }
-  z({ axisIndex: 0, commonStrings: a, config: t });
+  G({ axisIndex: 0, commonStrings: r, config: t });
 }, es = (s) => s.series[0].xTemporalBinning, zs = (s) => {
-  const { binning: e, config: t, commonStrings: a } = s, i = t.series[0];
-  if (i.yTemporalBinning = e, e?.unit !== void 0 && e.unit in a.utilsStrings.heatChartCalendarDatePartsUnits) {
-    const r = a.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
-    E(t, 1, r);
+  const { binning: e, config: t, commonStrings: r } = s, i = t.series[0];
+  if (i.yTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const a = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    $(t, 1, a);
   }
-  z({ axisIndex: 1, commonStrings: a, config: t });
+  G({ axisIndex: 1, commonStrings: r, config: t });
 }, ts = (s) => s.series[0].yTemporalBinning, ss = (s, e) => {
   e.orderOptions ??= {};
-  const t = e.axes?.[0]?.valueFormat?.type === "category" ? L.Category : L.YValue, a = de(e)[0], i = e.axes?.[1]?.valueFormat?.type === "category" ? L.Category : L.YValue, r = de(e)[1], n = {
+  const t = e.axes?.[0]?.valueFormat?.type === "category" ? L.Category : L.YValue, r = de(e)[0], i = e.axes?.[1]?.valueFormat?.type === "category" ? L.Category : L.YValue, a = de(e)[1], n = {
     ...e.orderOptions.data ?? {},
     orderType: L.MultiAxes
   };
-  a === ne.customSort && t === L.Category && (n.orderByX = [...s]), r === ne.customSort && i === L.Category && (n.orderByY = [...s]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
+  r === oe.customSort && t === L.Category && (n.orderByX = [...s]), a === oe.customSort && i === L.Category && (n.orderByY = [...s]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
 }, Gs = (s, e) => {
   const t = e.series[0];
   t.gridLine && (t.gridLine.width = s);
 }, Js = (s) => s.series[0].gridLine?.width, ei = (s, e) => {
-  const t = e.series[0], a = s?.length === 4 && s.every((i) => typeof i == "number");
-  t.gridLine && a && (t.gridLine.color = s);
+  const t = e.series[0], r = s?.length === 4 && s.every((i) => typeof i == "number");
+  t.gridLine && r && (t.gridLine.color = s);
 }, ti = (s) => s.series[0].gridLine?.color, si = (s, e) => {
   const t = e.legend;
   t && (t.position = s);
 }, ii = (s) => s.legend?.position ?? Ft.Bottom, ai = (s) => s.series[0].query?.outStatistics?.[0]?.onStatisticField, ri = (s) => {
-  const { field: e, config: t, layerInfo: a, commonStrings: i } = s, r = t.series[0].query?.outStatistics?.[0], n = re(t, a, i);
-  r ? (r.onStatisticField = e, r.outStatisticFieldName = `${r.statisticType}_${e}`) : t.series[0].query = {
+  const { field: e, config: t, layerInfo: r, commonStrings: i } = s, a = t.series[0].query?.outStatistics?.[0], n = ne(t, r, i);
+  a ? (a.onStatisticField = e, a.outStatisticFieldName = `${a.statisticType}_${e}`) : t.series[0].query = {
     outStatistics: [
       {
         onStatisticField: e,
@@ -444,13 +451,13 @@ const Hs = (s) => s.hideEmptyRowsAndColumns, Xs = (s, e) => {
         statisticType: v.Count
       }
     ]
-  }, n && t.title && (t.title.content.text = j(t, a, i));
+  }, n && t.title && (t.title.content.text = K(t, r, i));
 }, ni = (s) => s.series[0].query?.outStatistics?.[0].statisticType ?? v.Count, oi = (s) => {
-  const { aggregationType: e, config: t, layerInfo: a, commonStrings: i } = s, r = t.series[0]?.query?.outStatistics?.[0], n = re(t, a, i);
-  r && e !== v.NoAggregation && (r.statisticType = e, r.outStatisticFieldName = `${e}_${r.onStatisticField}`), (e === v.Count || e === v.Sum) && is(H.Zero, t), n && t.title && (t.title.content.text = j(t, a, i));
+  const { aggregationType: e, config: t, layerInfo: r, commonStrings: i } = s, a = t.series[0]?.query?.outStatistics?.[0], n = ne(t, r, i);
+  a && e !== v.NoAggregation && (a.statisticType = e, a.outStatisticFieldName = `${e}_${a.onStatisticField}`), (e === v.Count || e === v.Sum) && is(W.Zero, t), n && t.title && (t.title.content.text = K(t, r, i));
 }, li = (s) => s.nullPolicy, is = (s, e) => {
   e.nullPolicy = s;
-}, ui = (s) => s.series[0].emptyCells, ci = (s, e) => {
+}, ci = (s) => s.series[0].emptyCells, ui = (s, e) => {
   e.series[0].emptyCells = s;
 }, di = (s) => s.series[0].emptyCells?.text, yi = (s, e) => {
   e.series[0].emptyCells ? e.series[0].emptyCells.text = s : e.series[0].emptyCells = { text: s };
@@ -466,11 +473,11 @@ function Fi(s, e) {
   mt(e) || (e.viewType = s);
 }
 function xi(s) {
-  return s.series[0].classBreaksRules?.breaksCount ?? X.classBreaks.breaksCount;
+  return s.series[0].classBreaksRules?.breaksCount ?? H.classBreaks.breaksCount;
 }
 function hi(s, e) {
-  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = s ?? X.classBreaks.breaksCount : e.series[0].classBreaksRules = {
-    breaksCount: s ?? X.classBreaks.breaksCount
+  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = s ?? H.classBreaks.breaksCount : e.series[0].classBreaksRules = {
+    breaksCount: s ?? H.classBreaks.breaksCount
   };
 }
 function Ti(s) {
@@ -479,7 +486,7 @@ function Ti(s) {
 function Bi(s, e) {
   e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.classificationMethod = s : e.series[0].classBreaksRules = {
     classificationMethod: s
-  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? X.classBreaks.breaksCount;
+  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? H.classBreaks.breaksCount;
 }
 function Ci(s, e) {
   e.firstDayOfWeek = s;
@@ -519,10 +526,10 @@ const as = [
   k.MonthOfYear
 ], Te = (s) => {
   let e;
-  return Z(s) ? e = ue() : (Y(s) || _(s)) && (e = Q()), e;
-}, Be = (s) => Y(s) || _(s), Ce = (s) => {
-  const { axisIndex: e, commonStrings: t, config: a, valueFormat: i } = s, r = a.axes?.[e]?.valueFormat;
-  i !== void 0 && r?.type !== i.type && Ie({ config: a, commonStrings: t, valueFormat: i, axisIndex: e });
+  return _(s) ? e = ce() : (q(s) || Q(s)) && (e = z()), e;
+}, Be = (s) => q(s) || Q(s), Ce = (s) => {
+  const { axisIndex: e, commonStrings: t, config: r, valueFormat: i } = s, a = r.axes?.[e]?.valueFormat;
+  i !== void 0 && a?.type !== i.type && Ie({ config: r, commonStrings: t, valueFormat: i, axisIndex: e });
 }, rs = (s, e) => {
   let t;
   return e === 0 ? t = s.series[0]?.xTemporalBinning : e === 1 && (t = s.series[0]?.yTemporalBinning), t;
@@ -548,7 +555,7 @@ const as = [
       e = { month: "short" };
       break;
     default:
-      e = Q().intlOptions;
+      e = z().intlOptions;
       break;
   }
   return {
@@ -556,23 +563,23 @@ const as = [
     intlOptions: e
   };
 }, ve = (s) => {
-  const { axisIndex: e, binning: t, commonStrings: a, config: i, fieldName: r, layerInfo: n } = s, o = i.series[0], l = se(e, i), c = R(n.layerFieldsInfo, r);
-  e === 0 ? o.xTemporalBinning = t : e === 1 && (o.yTemporalBinning = t), t !== void 0 && (l === "" || l === c || l === be(a, t.unit) || l === a.xAxis) && E(i, e, be(a, t.unit));
-}, z = (s) => {
-  const { axisIndex: e, commonStrings: t, config: a } = s, i = rs(a, e), r = i ? ns(i) : void 0;
-  Ie({ config: a, commonStrings: t, valueFormat: r, axisIndex: e });
+  const { axisIndex: e, binning: t, commonStrings: r, config: i, fieldName: a, layerInfo: n } = s, o = i.series[0], l = ie(e, i), c = R(n.layerFieldsInfo, a);
+  e === 0 ? o.xTemporalBinning = t : e === 1 && (o.yTemporalBinning = t), t !== void 0 && (l === "" || l === c || l === be(r, t.unit) || l === r.xAxis) && $(i, e, be(r, t.unit));
+}, G = (s) => {
+  const { axisIndex: e, commonStrings: t, config: r } = s, i = rs(r, e), a = i ? ns(i) : void 0;
+  Ie({ config: r, commonStrings: t, valueFormat: a, axisIndex: e });
 }, Re = (s) => {
-  const { commonStrings: e, config: t, layerInfo: a } = s, i = t.series[0]?.x ?? "", r = t.series[0]?.y ?? "", n = Se(a.layerFieldsInfo, i), o = Se(a.layerFieldsInfo, r), l = Te(n), c = Te(o), p = Be(n) && Be(o), g = Z(n) && Z(o);
+  const { commonStrings: e, config: t, layerInfo: r } = s, i = t.series[0]?.x ?? "", a = t.series[0]?.y ?? "", n = Se(r.layerFieldsInfo, i), o = Se(r.layerFieldsInfo, a), l = Te(n), c = Te(o), p = Be(n) && Be(o), f = _(n) && _(o);
   if (Ce({ axisIndex: 0, commonStrings: e, config: t, valueFormat: l }), Ce({ axisIndex: 1, commonStrings: e, config: t, valueFormat: c }), p) {
-    const d = es(t) === void 0, m = ts(t) === void 0;
-    d && (ve({
+    const u = es(t) === void 0, m = ts(t) === void 0;
+    u && (ve({
       axisIndex: 0,
       binning: Ae(0, t.series[0].yTemporalBinning),
       commonStrings: e,
       config: t,
       fieldName: i,
-      layerInfo: a
-    }), z({
+      layerInfo: r
+    }), G({
       axisIndex: 0,
       commonStrings: e,
       config: t
@@ -581,15 +588,15 @@ const as = [
       binning: Ae(1, t.series[0].xTemporalBinning),
       commonStrings: e,
       config: t,
-      fieldName: r,
-      layerInfo: a
-    }), z({
+      fieldName: a,
+      layerInfo: r
+    }), G({
       axisIndex: 1,
       commonStrings: e,
       config: t
     }));
   }
-  g && (t.series[0].xTemporalBinning = void 0, t.series[0].yTemporalBinning = void 0);
+  f && (t.series[0].xTemporalBinning = void 0, t.series[0].yTemporalBinning = void 0);
 };
 function os(s) {
   const e = {};
@@ -597,30 +604,30 @@ function os(s) {
     Dt(t) && "nullCategory" in t && t.nullCategory !== void 0 && (e.text ??= t.nullCategory.text, t.type === T.BarSeries ? e.fillSymbol ??= t.nullCategory.fillSymbol : e.markerSymbol ??= t.nullCategory.markerSymbol);
   }), e.text || e.fillSymbol || e.markerSymbol ? e : void 0;
 }
-function ie(s) {
-  const { seriesIndex: e, xAxisField: t, aggregationType: a, config: i, layerInfo: r, commonStrings: n } = s, o = U(r?.layer).idField;
+function ae(s) {
+  const { seriesIndex: e, xAxisField: t, aggregationType: r, config: i, layerInfo: a, commonStrings: n } = s, o = j(a?.layer).idField;
   let l;
   const c = i.series[e ?? 0];
-  let p = !1, g = !1, d = !1;
+  let p = !1, f = !1, u = !1;
   if (c === void 0) {
     const B = i.series;
-    p = B.slice(0, e).every((C) => O(C)), g = B.slice(0, e).every((C) => V(C)), d = B.slice(0, e).every((C) => Fe(C));
+    p = B.slice(0, e).every((A) => O(A)), f = B.slice(0, e).every((A) => V(A)), u = B.slice(0, e).every((A) => Fe(A));
   } else
-    p = O(c), g = V(c), d = Fe(c);
+    p = O(c), f = V(c), u = Fe(c);
   p ? l = bt({
     commonStrings: n,
     seriesIndex: e,
     objectIDField: o
-  }) : g ? l = At({
+  }) : f ? l = At({
     commonStrings: n,
     seriesIndex: e,
     objectIDField: o
-  }) : d ? l = vt(n, o) : l = It({
+  }) : u ? l = vt(n, o) : l = It({
     seriesIndex: e,
     objectIDField: o,
     commonStrings: n
   });
-  const m = i.series[0]?.dataLabels, y = "nullCategory" in i.series[0] ? os(i) : void 0, u = "binTemporalData" in i.series[0] ? i.series[0].binTemporalData : void 0, S = "classBreakRules" in i.series[0] ? i.series[0].classBreakRules : void 0, F = "xTemporalBinning" in i.series[0] ? i.series[0].xTemporalBinning : void 0, x = "yTemporalBinning" in i.series[0] ? i.series[0].yTemporalBinning : void 0, f = "emptyCells" in i.series[0] ? i.series[0].emptyCells : void 0, A = i.series[0].query && "fetchNullValues" in i.series[0].query ? i.series[0].query?.fetchNullValues : void 0, b = {
+  const m = i.series[0]?.dataLabels, d = "nullCategory" in i.series[0] ? os(i) : void 0, y = "binTemporalData" in i.series[0] ? i.series[0].binTemporalData : void 0, g = "classBreakRules" in i.series[0] ? i.series[0].classBreakRules : void 0, F = "xTemporalBinning" in i.series[0] ? i.series[0].xTemporalBinning : void 0, h = "yTemporalBinning" in i.series[0] ? i.series[0].yTemporalBinning : void 0, S = "emptyCells" in i.series[0] ? i.series[0].emptyCells : void 0, b = i.series[0].query && "fetchNullValues" in i.series[0].query ? i.series[0].query?.fetchNullValues : void 0, C = {
     ...l,
     x: t,
     y: "",
@@ -630,227 +637,227 @@ function ie(s) {
       content: { ...l.dataLabels?.content, ...m?.content, type: Tt.TS },
       visible: m?.visible ?? !1
     },
-    ...y !== void 0 ? { nullCategory: y } : {},
-    ...u !== void 0 ? { binTemporalData: u } : {},
-    ...S !== void 0 ? { classBreakRules: S } : {},
+    ...d !== void 0 ? { nullCategory: d } : {},
+    ...y !== void 0 ? { binTemporalData: y } : {},
+    ...g !== void 0 ? { classBreakRules: g } : {},
     ...F !== void 0 ? { xTemporalBinning: F } : {},
-    ...x !== void 0 ? { yTemporalBinning: x } : {},
-    ...f !== void 0 ? { emptyCells: f } : {}
+    ...h !== void 0 ? { yTemporalBinning: h } : {},
+    ...S !== void 0 ? { emptyCells: S } : {}
   };
-  if (b.query = {
+  if (C.query = {
     groupByFieldsForStatistics: [t],
-    ...A !== void 0 ? { fetchNullValues: A } : {}
-  }, a !== v.NoAggregation && o !== void 0) {
-    const B = `${a}_${o}_0`.toUpperCase();
-    b.y = B, b.query.outStatistics = [
+    ...b !== void 0 ? { fetchNullValues: b } : {}
+  }, r !== v.NoAggregation && o !== void 0) {
+    const B = `${r}_${o}_0`.toUpperCase();
+    C.y = B, C.query.outStatistics = [
       {
-        statisticType: a,
+        statisticType: r,
         onStatisticField: o,
         outStatisticFieldName: B
       }
     ];
   }
-  if (I(i.series[0]) && I(b)) {
+  if (I(i.series[0]) && I(C)) {
     let B = wt(i);
-    B === le.Quarter && (B = le.Month), b.temporalBinning = {
+    B === le.Quarter && (B = le.Month), C.temporalBinning = {
       ...i.series[0]?.temporalBinning,
       unit: B
     };
   }
-  return G(b);
+  return J(C);
 }
-function j(s, e, t) {
-  const { layerFieldsInfo: a } = e, { idField: i, isTraditionalTypeOID: r } = U(e.layer), n = M(s), o = K(s), l = we(s), c = ae(s), p = r && (o.length === 0 || o.includes(i)), g = Ct(l, t), d = p ? "" : o.map((f) => R(a ?? [], f)).join(", "), m = R(a ?? [], n), y = R(a ?? [], c), u = s.series.some((f) => P(f)), S = u ? "category" : "xAxisField", F = m;
-  let x = "";
+function K(s, e, t) {
+  const { layerFieldsInfo: r } = e, { idField: i, isTraditionalTypeOID: a } = j(e.layer), n = P(s), o = Z(s), l = we(s), c = re(s), p = a && (o.length === 0 || o.includes(i)), f = Ct(l, t), u = p ? "" : o.map((S) => R(r ?? [], S)).join(", "), m = R(r ?? [], n), d = R(r ?? [], c), y = s.series.some((S) => M(S)), g = y ? "category" : "xAxisField", F = m;
+  let h = "";
   if (ge({
     fieldName: n,
     numericFields: o,
-    fieldList: a
+    fieldList: r
   }))
-    x = w(t.titleLabels.aggrTypeOfAggrFields, {
-      aggregationType: g,
-      aggregationFields: d
+    h = E(t.titleLabels.aggrTypeOfAggrFields, {
+      aggregationType: f,
+      aggregationFields: u
     });
   else if (l === v.NoAggregation) {
-    const f = p ? i : d;
+    const S = p ? i : u;
     if (c === "") {
-      const A = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      x = w(t.titleLabels[A], {
-        aggregationType: f,
-        [S]: F
+      const b = y ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      h = E(t.titleLabels[b], {
+        aggregationType: S,
+        [g]: F
       });
     } else {
-      const A = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      x = w(t.titleLabels[A], {
-        aggregationType: f,
-        [S]: F,
-        splitByField: y
+      const b = y ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      h = E(t.titleLabels[b], {
+        aggregationType: S,
+        [g]: F,
+        splitByField: d
       });
     }
   } else if (l === v.Count)
     if (c === "") {
-      const f = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      x = w(t.titleLabels[f], {
-        aggregationType: g,
-        [S]: F
+      const S = y ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      h = E(t.titleLabels[S], {
+        aggregationType: f,
+        [g]: F
       });
     } else {
-      const f = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      x = w(t.titleLabels[f], {
-        aggregationType: g,
-        [S]: F,
-        splitByField: y
+      const S = y ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      h = E(t.titleLabels[S], {
+        aggregationType: f,
+        [g]: F,
+        splitByField: d
       });
     }
   else if (c !== "") {
-    const f = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
-    x = w(t.titleLabels[f], {
-      aggregationType: g,
-      aggregationField: d,
-      [S]: F,
-      splitByField: y
+    const S = y ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
+    h = E(t.titleLabels[S], {
+      aggregationType: f,
+      aggregationField: u,
+      [g]: F,
+      splitByField: d
     });
   } else if (o.length > 0) {
-    const f = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
-    x = w(t.titleLabels[f], {
-      aggregationType: g,
-      aggregationFields: d,
-      [S]: F
+    const S = y ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
+    h = E(t.titleLabels[S], {
+      aggregationType: f,
+      aggregationFields: u,
+      [g]: F
     });
   }
-  return x;
+  return h;
 }
 const qe = (s) => me({
   where: s.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", we = (s) => s?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? v.NoAggregation, ae = We(
+}) ?? "", we = (s) => s?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? v.NoAggregation, re = We(
   (s) => {
     const e = s?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
     return gt(s?.series?.[0]?.query?.where) ? "" : e;
   },
   (s) => s?.series?.[0]?.query?.where
-), K = (s) => {
+), Z = (s) => {
   let e = [];
-  if (ae(s) === "")
+  if (re(s) === "")
     e = s?.series.map((t) => {
-      const a = t.query?.outStatistics?.map((i) => i.onStatisticField) ?? [];
-      return a?.length > 0 ? a : t.y;
+      const r = t.query?.outStatistics?.map((i) => i.onStatisticField) ?? [];
+      return r?.length > 0 ? r : t.y;
     }).flat() ?? [];
   else {
-    const t = s?.series?.[0], a = t?.query?.outStatistics?.[0]?.onStatisticField ?? [t?.y].flat()[0];
-    e = a !== void 0 ? [a] : [];
+    const t = s?.series?.[0], r = t?.query?.outStatistics?.[0]?.onStatisticField ?? [t?.y].flat()[0];
+    e = r !== void 0 ? [r] : [];
   }
   return e.filter((t) => t !== "");
 };
 function Pe(s) {
-  const { splitByField: e, numericFields: t, layer: a, seriesIndex: i } = s, r = U(a).idField ?? "";
-  return e === "" ? t[i] ?? r : t[0] ?? r;
+  const { splitByField: e, numericFields: t, layer: r, seriesIndex: i } = s, a = j(r).idField ?? "";
+  return e === "" ? t[i] ?? a : t[0] ?? a;
 }
 function ls(s) {
-  const { numericFields: e, aggregationType: t, config: a, layerInfo: i } = s;
-  let r = !1;
-  t === v.Count ? r = !0 : t === v.NoAggregation && (r = e.every((l) => {
+  const { numericFields: e, aggregationType: t, config: r, layerInfo: i } = s;
+  let a = !1;
+  t === v.Count ? a = !0 : t === v.NoAggregation && (a = e.every((l) => {
     const c = i.layerFieldsInfo.find((p) => p.name === l);
     return c !== void 0 ? xe(c) : !1;
-  })), pe(a, 1, r);
-  const n = a.series.some((l) => O(l)), o = a.series.some((l) => V(l));
+  })), pe(r, 1, a);
+  const n = r.series.some((l) => O(l)), o = r.series.some((l) => V(l));
   if (n || o) {
-    const l = M(a), c = i.layerFieldsInfo.find((g) => g.name === l), p = c !== void 0 && xe(c);
-    pe(a, 0, p);
+    const l = P(r), c = i.layerFieldsInfo.find((f) => f.name === l), p = c !== void 0 && xe(c);
+    pe(r, 0, p);
   }
 }
 const de = (s) => {
   let e;
-  if (W(s)) {
-    const t = s.orderOptions?.data?.orderByX ?? [""], a = s.orderOptions?.data?.orderByY ?? [""], i = s.axes?.[0]?.valueFormat?.type === "category" ? L.Category : L.YValue, r = s.axes?.[1]?.valueFormat?.type === "category" ? L.Category : L.YValue;
-    e = [he(t, i), he(a, r)];
+  if (Y(s)) {
+    const t = s.orderOptions?.data?.orderByX ?? [""], r = s.orderOptions?.data?.orderByY ?? [""], i = s.axes?.[0]?.valueFormat?.type === "category" ? L.Category : L.YValue, a = s.axes?.[1]?.valueFormat?.type === "category" ? L.Category : L.YValue;
+    e = [he(t, i), he(r, a)];
   } else {
-    const t = s.orderOptions?.data?.orderType ?? L.Category, a = s.orderOptions?.data && "orderBy" in s.orderOptions.data ? s.orderOptions.data.orderBy : xt.Ascending;
-    e = [St(a, t)];
+    const t = s.orderOptions?.data?.orderType ?? L.Category, r = s.orderOptions?.data && "orderBy" in s.orderOptions.data ? s.orderOptions.data.orderBy : xt.Ascending;
+    e = [St(r, t)];
   }
   return e;
 };
-function us(s) {
-  const { xAxisField: e, numericFields: t, aggregationType: a, config: i, layerInfo: r, commonStrings: n } = s, { layerFieldsInfo: o } = r, l = ie({
+function cs(s) {
+  const { xAxisField: e, numericFields: t, aggregationType: r, config: i, layerInfo: a, commonStrings: n } = s, { layerFieldsInfo: o } = a, l = ae({
     config: i,
     xAxisField: e,
-    aggregationType: a,
-    layerInfo: r,
+    aggregationType: r,
+    layerInfo: a,
     seriesIndex: 0,
     commonStrings: n
-  }), c = ee({
+  }), c = te({
     config: i,
     xAxisField: e,
     numericFields: t,
-    aggregationType: a,
-    layer: r.layer,
+    aggregationType: r,
+    layer: a.layer,
     fieldList: o
-  }).name, p = M(i), g = K(i), d = ge({
+  }).name, p = P(i), f = Z(i), u = ge({
     fieldName: p,
-    numericFields: g,
+    numericFields: f,
     fieldList: o
-  }) ? i.series[0] : void 0, m = `series_${Date.now()}`, y = d?.id ?? m, u = d?.name ?? n.axisLabels.values, F = {
-    ...d ?? l,
-    id: y,
-    name: u,
-    x: oe,
+  }) ? i.series[0] : void 0, m = `series_${Date.now()}`, d = u?.id ?? m, y = u?.name ?? n.axisLabels.values, F = {
+    ...u ?? l,
+    id: d,
+    name: y,
+    x: U,
     y: c
-  }, x = [];
-  for (const f of t)
-    x.push({
-      onStatisticField: f,
-      outStatisticFieldName: `${f}_0`.toUpperCase(),
-      statisticType: a
+  }, h = [];
+  for (const S of t)
+    h.push({
+      onStatisticField: S,
+      outStatisticFieldName: `${S}_0`.toUpperCase(),
+      statisticType: r
     });
-  return F.query = { outStatistics: x }, i.series.length === 1 && ((O(F) || V(F)) && Me(F, i.series[0]), P(F) ? F.fillSymbol = i.series[0].fillSymbol : (O(F) || V(F)) && (F.lineSymbol = i.series[0].lineSymbol, F.markerSymbol = i.series[0].markerSymbol)), [F];
+  return F.query = { outStatistics: h }, i.series.length === 1 && ((O(F) || V(F)) && Me(F, i.series[0]), M(F) ? F.fillSymbol = i.series[0].fillSymbol : (O(F) || V(F)) && (F.lineSymbol = i.series[0].lineSymbol, F.markerSymbol = i.series[0].markerSymbol)), [F];
 }
 function Ee(s) {
-  const { xAxisField: e, numericFields: t, aggregationType: a, config: i, layerInfo: r, commonStrings: n } = s, { layerFieldsInfo: o } = r, l = U(r.layer).idField, c = [];
-  for (let y = 0; y < t.length; y += 1) {
-    const u = ie({
+  const { xAxisField: e, numericFields: t, aggregationType: r, config: i, layerInfo: a, commonStrings: n } = s, { layerFieldsInfo: o } = a, l = j(a.layer).idField, c = [];
+  for (let d = 0; d < t.length; d += 1) {
+    const y = ae({
       config: i,
       xAxisField: e,
-      aggregationType: a,
-      layerInfo: r,
-      seriesIndex: y,
+      aggregationType: r,
+      layerInfo: a,
+      seriesIndex: d,
       commonStrings: n
-    }), S = i.series[y]?.y, F = typeof S == "string" && S.trim() !== "" && !o.find((N) => N.name === S) ? S : ee({
+    }), g = i.series[d]?.y, F = typeof g == "string" && g.trim() !== "" && !o.find((N) => N.name === g) ? g : te({
       config: i,
       xAxisField: e,
       numericFields: t,
-      aggregationType: a,
-      layer: r.layer,
-      numericFieldIndex: y,
+      aggregationType: r,
+      layer: a.layer,
+      numericFieldIndex: d,
       fieldList: o
-    }).name, x = t[y], f = i.series.find(
-      (N) => N.query?.where === void 0 && (N.query?.outStatistics?.length === 1 && N.query?.outStatistics?.[0]?.onStatisticField === x || N.query?.outStatistics === void 0 && (N.y === x || N.x === x))
-    ), A = x !== l ? x : u.id, b = f?.id ?? A, B = f?.name ?? R(o, x) ?? b, C = f ?? u, h = {
-      ...C,
-      id: b,
+    }).name, h = t[d], S = i.series.find(
+      (N) => N.query?.where === void 0 && (N.query?.outStatistics?.length === 1 && N.query?.outStatistics?.[0]?.onStatisticField === h || N.query?.outStatistics === void 0 && (N.y === h || N.x === h))
+    ), b = h !== l ? h : y.id, C = S?.id ?? b, B = S?.name ?? R(o, h) ?? C, A = S ?? y, x = {
+      ...A,
+      id: C,
       name: B
     };
-    let $ = x;
-    h.query !== void 0 && (a !== v.NoAggregation ? ($ = h.type === T.HeatSeries && f?.type === T.HeatSeries ? x : F, h.query.outStatistics = [
+    let X = h;
+    x.query !== void 0 && (r !== v.NoAggregation ? (X = x.type === T.HeatSeries && S?.type === T.HeatSeries ? h : F, x.query.outStatistics = [
       {
-        ...C.query?.outStatistics?.[0] ?? {},
-        onStatisticField: x,
+        ...A.query?.outStatistics?.[0] ?? {},
+        onStatisticField: h,
         outStatisticFieldName: F,
-        statisticType: a
+        statisticType: r
       }
-    ]) : delete h.query.outStatistics), h.y = $, c.push(h);
+    ]) : delete x.query.outStatistics), x.y = X, c.push(x);
   }
-  const p = c.filter((y) => P(y)), g = c.filter(
-    (y) => O(y) || V(y)
-  ), d = i.series.filter((y) => P(y)), m = i.series.filter(
-    (y) => O(y) || V(y)
+  const p = c.filter((d) => M(d)), f = c.filter(
+    (d) => O(d) || V(d)
+  ), u = i.series.filter((d) => M(d)), m = i.series.filter(
+    (d) => O(d) || V(d)
   );
-  return d.length === 1 && p.length === 1 && P(d[0]) && P(p[0]) && (p[0].fillSymbol = d[0].fillSymbol), m.length === 1 && g.length === 1 && ((O(m[0]) && O(g[0]) || V(m[0]) && V(g[0])) && Me(g[0], m[0]), (O(m[0]) && O(g[0]) || V(m[0]) && V(g[0])) && (g[0].lineSymbol = m[0].lineSymbol, g[0].markerSymbol = m[0].markerSymbol)), c;
+  return u.length === 1 && p.length === 1 && M(u[0]) && M(p[0]) && (p[0].fillSymbol = u[0].fillSymbol), m.length === 1 && f.length === 1 && ((O(m[0]) && O(f[0]) || V(m[0]) && V(f[0])) && Me(f[0], m[0]), (O(m[0]) && O(f[0]) || V(m[0]) && V(f[0])) && (f[0].lineSymbol = m[0].lineSymbol, f[0].markerSymbol = m[0].markerSymbol)), c;
 }
 function Di(s) {
-  const { aggregationType: e, config: t, layerInfo: a, commonStrings: i } = s, { layerFieldsInfo: r, layer: n } = a, o = M(t), l = K(t), c = ae(t), p = re(t, a, i), g = $e(t, a, i);
-  if (t.series.forEach((d, m) => {
-    const y = ee({
+  const { aggregationType: e, config: t, layerInfo: r, commonStrings: i } = s, { layerFieldsInfo: a, layer: n } = r, o = P(t), l = Z(t), c = re(t), p = ne(t, r, i), f = $e(t, r, i);
+  if (t.series.forEach((u, m) => {
+    const d = te({
       config: t,
       xAxisField: o,
       numericFields: l,
@@ -859,100 +866,100 @@ function Di(s) {
       layer: n,
       seriesIndex: m,
       numericFieldIndex: m,
-      fieldList: r
+      fieldList: a
     }).name;
-    d.y = y;
-    const u = Pe({
+    u.y = d;
+    const y = Pe({
       splitByField: c,
       numericFields: l,
       layer: n,
       seriesIndex: m
-    }), S = d.query?.outStatistics?.[0]?.onStatisticField ?? u;
-    d.query = {
-      ...d.query,
+    }), g = u.query?.outStatistics?.[0]?.onStatisticField ?? y;
+    u.query = {
+      ...u.query,
       outStatistics: e === v.NoAggregation ? void 0 : [
         {
-          ...d.query?.outStatistics?.[0],
-          outStatisticFieldName: y,
+          ...u.query?.outStatistics?.[0],
+          outStatisticFieldName: d,
           statisticType: e,
-          onStatisticField: S
+          onStatisticField: g
         }
       ]
-    }, "temporalBinning" in d && d.temporalBinning !== void 0 && (d.temporalBinning.nullPolicy = e === v.NoAggregation ? H.Interpolate : H.Null), e === v.NoAggregation && Mt(t);
-  }), p && t.title && (t.title.content.text = j(t, a, i)), g && t.series[0].type !== T.HeatSeries) {
-    const d = ye({
+    }, "temporalBinning" in u && u.temporalBinning !== void 0 && (u.temporalBinning.nullPolicy = e === v.NoAggregation ? W.Interpolate : W.Null), e === v.NoAggregation && Mt(t);
+  }), p && t.title && (t.title.content.text = K(t, r, i)), f && t.series[0].type !== T.HeatSeries) {
+    const u = ye({
       config: t,
-      layerInfo: a,
+      layerInfo: r,
       commonStrings: i,
       numericFields: l,
       aggregationType: e
     });
-    E(t, 1, d);
+    $(t, 1, u);
   }
 }
-function cs(s) {
+function us(s) {
   const {
     splitByField: e,
     xAxisField: t,
-    numericFields: a,
+    numericFields: r,
     aggregationType: i,
-    config: r,
+    config: a,
     layerInfo: n,
     commonStrings: o,
     splitByFieldInfos: l
-  } = s, { layer: c, layerFieldsInfo: p } = n, { categoriesArray: g, splitByFieldType: d } = l, m = Pe({
+  } = s, { layer: c, layerFieldsInfo: p } = n, { categoriesArray: f, splitByFieldType: u } = l, m = Pe({
     splitByField: e,
-    numericFields: a,
+    numericFields: r,
     layer: c,
     seriesIndex: 0
   });
-  let y = [];
-  if (g.length === 0) {
-    y = Ee({
+  let d = [];
+  if (f.length === 0) {
+    d = Ee({
       xAxisField: t,
-      numericFields: a,
+      numericFields: r,
       aggregationType: i,
-      config: r,
+      config: a,
       layerInfo: n,
       commonStrings: o
     });
-    for (const u of y)
-      u.query && (u.query.where = `${e}=''`);
+    for (const y of d)
+      y.query && (y.query.where = `${e}=''`);
   } else
-    for (let u = 0; u < g.length; u += 1) {
-      const S = g[u], F = ee({
-        config: r,
+    for (let y = 0; y < f.length; y += 1) {
+      const g = f[y], F = te({
+        config: a,
         xAxisField: t,
-        numericFields: a,
+        numericFields: r,
         aggregationType: i,
         layer: n.layer,
-        seriesIndex: u,
+        seriesIndex: y,
         splitByField: e,
         fieldList: p
-      }).name, x = ie({
-        config: r,
+      }).name, h = ae({
+        config: a,
         xAxisField: t,
         aggregationType: i,
         layerInfo: n,
-        seriesIndex: u,
+        seriesIndex: y,
         commonStrings: o
-      }), f = Ne({
+      }), S = Ne({
         queryObject: n.layer,
         fieldName: e,
-        fieldValue: S ?? ""
-      }), A = `${S}`, b = r.series.find(
-        (N) => String(qe(N)).trim().replace(/'/gu, "") === A
-      ), B = b?.id ?? A, C = b?.name ?? f ?? B, h = b ?? x, $ = {
-        ...h,
+        fieldValue: g ?? ""
+      }), b = `${g}`, C = a.series.find(
+        (N) => String(qe(N)).trim().replace(/'/gu, "") === b
+      ), B = C?.id ?? b, A = C?.name ?? S ?? B, x = C ?? h, X = {
+        ...x,
         id: B,
-        name: C,
+        name: A,
         y: F,
         query: {
-          ...h.query,
-          where: `${e}=${d === Oe.String && S !== null ? `'${S}'` : S}`,
+          ...x.query,
+          where: `${e}=${u === Oe.String && g !== null ? `'${g}'` : g}`,
           outStatistics: i !== v.NoAggregation ? [
             {
-              ...h.query?.outStatistics?.[0] ?? {},
+              ...x.query?.outStatistics?.[0] ?? {},
               onStatisticField: m,
               outStatisticFieldName: F,
               statisticType: i
@@ -960,75 +967,74 @@ function cs(s) {
           ] : void 0
         }
       };
-      y.push($);
+      d.push(X);
     }
-  return y;
+  return d;
 }
 const Ni = (s) => {
   const {
     xAxisFieldName: e,
     splitByField: t,
-    numericFields: a,
+    numericFields: r,
     aggregationType: i,
-    config: r,
+    config: a,
     layerInfo: n,
     commonStrings: o,
     splitByFieldInfos: l
-  } = s, { layerFieldsInfo: c } = n ?? {}, p = G(r), g = Rt(r), d = M(p), m = c.find((h) => h.name === d), y = r.series[0]?.query === void 0, u = c.find((h) => h.name === e), S = re(p, n, o), F = $e(p, n, o), x = ds(p, n);
-  let f = Le(r);
-  const A = p.series.some((h) => P(h)), b = pt(p.series), B = ft(p.series);
-  let C = !1;
-  if (Z(u) ? f = ue() : !_(m) && _(u) ? (f = Q(), C = !0) : !Y(m) && Y(u) ? (f = Q(), C = !0) : Y(m) && !Y(u) && (A ? f = ue() : f = Lt(), C = !0), f !== void 0 && Xe(r, o, f), g === 0 && (r.series = [
-    ie({ config: r, xAxisField: e, aggregationType: i, layerInfo: n, commonStrings: o })
-  ]), r.series.forEach((h) => {
-    h.x = e, h.query !== void 0 && (h.query.groupByFieldsForStatistics = [e]);
-  }), t === "" || a.length > 1 ? ge({
+  } = s, { layerFieldsInfo: c } = n ?? {}, p = J(a), f = Rt(a), u = P(p), m = c.find((x) => x.name === u), d = a.series[0]?.query === void 0, y = c.find((x) => x.name === e), g = ne(p, n, o), F = $e(p, n, o), h = ds({ config: p, layerInfo: n, commonStrings: o });
+  let S = Le(a);
+  const b = p.series.some((x) => M(x)), C = pt(p.series), B = ft(p.series), A = q(m) || q(y);
+  if (_(y) ? S = ce() : !Q(m) && Q(y) ? S = z() : !q(m) && q(y) ? S = z() : q(m) && !q(y) && (b ? S = ce() : S = Lt()), S !== void 0 && Xe(a, o, S), f === 0 && (a.series = [
+    ae({ config: a, xAxisField: e, aggregationType: i, layerInfo: n, commonStrings: o })
+  ]), a.series.forEach((x) => {
+    x.x = e, x.query !== void 0 && (x.query.groupByFieldsForStatistics = [e]);
+  }), t === "" || r.length > 1 ? ge({
     fieldName: e,
-    numericFields: a,
+    numericFields: r,
     fieldList: c
-  }) ? r.series = us({
-    config: r,
+  }) ? a.series = cs({
+    config: a,
     layerInfo: n,
     xAxisField: e,
-    numericFields: a,
+    numericFields: r,
     aggregationType: i,
     commonStrings: o
-  }) : r.series = Ee({
-    config: r,
+  }) : a.series = Ee({
+    config: a,
     layerInfo: n,
     xAxisField: e,
-    numericFields: a,
+    numericFields: r,
     aggregationType: i,
     commonStrings: o
-  }) : l && (r.series = cs({
-    config: r,
+  }) : l && (a.series = us({
+    config: a,
     layerInfo: n,
     splitByField: t,
     xAxisField: e,
-    numericFields: a,
+    numericFields: r,
     aggregationType: i,
     commonStrings: o,
     splitByFieldInfos: l
-  })), x && r.series[0].type !== T.HeatSeries) {
-    const h = R(c, e);
-    E(r, 0, h);
+  })), h && e !== U && a.series[0].type !== T.HeatSeries) {
+    const x = R(c, e);
+    $(a, 0, x);
   }
-  if (F && r.series[0].type !== T.HeatSeries) {
-    const h = ye({
-      config: r,
+  if (F && a.series[0].type !== T.HeatSeries) {
+    const x = ye({
+      config: a,
       layerInfo: n,
       commonStrings: o,
-      numericFields: a,
+      numericFields: r,
       aggregationType: i
     });
-    E(r, 1, h);
+    $(a, 1, x);
   }
-  if (S && r.title && (r.title.content.text = j(r, n, o)), D({ config: r, value: null, axisIndex: 1, isMax: !1 }), D({ config: r, value: null, axisIndex: 1, isMax: !0 }), ls({ numericFields: a, aggregationType: i, config: r, layerInfo: n }), (b || B) && (D({ config: r, value: null, axisIndex: 0, isMax: !1 }), D({ config: r, value: null, axisIndex: 0, isMax: !0 }), C && i !== v.NoAggregation && !W(p))) {
-    const h = f?.type === T.DateAxisFormat ? H.Null : H.Interpolate;
-    Et(h, r);
+  if (g && a.title && (a.title.content.text = K(a, n, o)), D({ config: a, value: null, axisIndex: 1, isMax: !1 }), D({ config: a, value: null, axisIndex: 1, isMax: !0 }), ls({ numericFields: r, aggregationType: i, config: a, layerInfo: n }), (C || B) && (D({ config: a, value: null, axisIndex: 0, isMax: !1 }), D({ config: a, value: null, axisIndex: 0, isMax: !0 }), A && i !== v.NoAggregation && !Y(p))) {
+    const x = q(y) ? W.Null : W.Interpolate;
+    Et(x, a);
   }
-  W(r) && Re({ commonStrings: o, config: r, layerInfo: n }), r.series.forEach((h) => {
-    y && delete h.query, I(h) && h.binTemporalData === void 0 && u?.type === Oe.TimeOnly && (h.binTemporalData = !1);
+  Y(a) && Re({ commonStrings: o, config: a, layerInfo: n }), a.series.forEach((x) => {
+    d && delete x.query, I(x) && x.binTemporalData === void 0 && y?.type === Oe.TimeOnly && (x.binTemporalData = !1);
   });
 }, Me = (s, e) => {
   s.markerVisible = e.markerVisible, s.lineSmoothed = e.lineSmoothed, s.showArea = e.showArea, s.areaColor = e.areaColor, s.stackNegativeValuesToBaseline = e.stackNegativeValuesToBaseline, e.lineSymbol && (s.lineSymbol = { ...e.lineSymbol, color: s.lineSymbol?.color }), e.markerSymbol && (s.markerSymbol = {
@@ -1036,60 +1042,60 @@ const Ni = (s) => {
     color: s.markerSymbol?.color
   });
 }, Oi = (s) => {
-  const { config: e, seriesIndex: t, layerInfo: a, commonStrings: i } = s, r = e.series?.[t], n = ae(e);
+  const { config: e, seriesIndex: t, layerInfo: r, commonStrings: i } = s, a = e.series?.[t], n = re(e);
   let o;
-  if (J(e.series) === q.BarAndLineFromFields)
+  if (ee(e.series) === w.BarAndLineFromFields)
     o = i.axisLabels.values;
   else if (Ye(n)) {
-    const c = r.query?.outStatistics?.[0]?.onStatisticField;
-    c !== void 0 && c !== U(a.layer).idField && (o = R(a.layerFieldsInfo, c));
+    const c = a.query?.outStatistics?.[0]?.onStatisticField;
+    c !== void 0 && c !== j(r.layer).idField && (o = R(r.layerFieldsInfo, c));
   } else {
-    const c = String(qe(r)).trim().replace(/'/gu, "");
+    const c = String(qe(a)).trim().replace(/'/gu, "");
     o = Ne({
-      queryObject: a.layer,
+      queryObject: r.layer,
       fieldName: n,
       fieldValue: c ?? ""
     }) ?? c;
   }
-  return o ?? r.id;
+  return o ?? a.id;
 }, Vi = (s, e) => {
-  if (W(e))
+  if (Y(e))
     ss(s, e);
   else {
     e.orderOptions ??= {};
     const t = e.orderOptions?.data?.orderType;
-    de(e)[0] === ne.customSort && t === L.Category && (e.orderOptions.data = {
+    de(e)[0] === oe.customSort && t === L.Category && (e.orderOptions.data = {
       orderType: L.Category,
       orderBy: [...s]
     });
   }
 }, ki = async (s) => {
-  const { config: e, layerInfo: t, errorStrings: a } = s, i = M(e), r = Le(e)?.type, n = K(e), o = J(e.series);
+  const { config: e, layerInfo: t, errorStrings: r } = s, i = P(e), a = Le(e)?.type, n = Z(e), o = ee(e.series);
   let l = [];
-  return r === T.CategoryAxisFormat && (o === q.BarAndLineFromFields || i === oe ? l = n.map((c) => R(t?.layerFieldsInfo, c)) : i.trim() !== "" && i !== oe && t !== void 0 && (l = await He({
+  return a === T.CategoryAxisFormat && (o === w.BarAndLineFromFields || i === U ? l = n.map((c) => R(t?.layerFieldsInfo, c)) : i.trim() !== "" && i !== U && t !== void 0 && (l = await He({
     layerInfo: t,
     config: e,
     category: i,
-    errorStrings: a
+    errorStrings: r
   }))), l;
 };
-function re(s, e, t) {
-  const a = j(s, e, t), i = qt(s), r = te(s);
-  return a === i || r;
+function ne(s, e, t) {
+  const r = K(s, e, t), i = qt(s), a = se(s);
+  return r === i || a;
 }
 function $e(s, e, t) {
-  const a = ye({
+  const r = ye({
     config: s,
     layerInfo: e,
     commonStrings: t,
-    numericFields: K(s),
+    numericFields: Z(s),
     aggregationType: we(s)
-  }), i = se(1, s), r = te(s);
-  return a === i || r;
+  }), i = ie(1, s), a = se(s);
+  return r === i || a;
 }
-function ds(s, e) {
-  const t = R(e.layerFieldsInfo, M(s)), a = se(0, s), i = te(s);
-  return t === a || i;
+function ds(s) {
+  const { config: e, layerInfo: t, commonStrings: r } = s, i = R(t.layerFieldsInfo, P(e)), a = ie(0, e), n = se(e), o = P(e) === U && (a === "" || a === r.xAxis);
+  return i === a || n || o;
 }
 function Ri(s) {
   return I(s.series[0]) ? s.series[0].binTemporalData ?? !0 : !1;
@@ -1101,7 +1107,7 @@ function qi(s, e) {
       size: 0,
       timeAggregationType: ht.Start,
       trimIncompleteTimeInterval: !0,
-      nullPolicy: H.Null
+      nullPolicy: W.Null
     } : delete t.temporalBinning);
   });
 }
@@ -1112,7 +1118,7 @@ export {
   Ni as C,
   Ri as D,
   qi as E,
-  j as F,
+  K as F,
   Re as G,
   Jt as H,
   _s as I,
@@ -1149,8 +1155,8 @@ export {
   si as ab,
   li as ac,
   is as ad,
-  ui as ae,
-  ci as af,
+  ci as ae,
+  ui as af,
   di as ag,
   yi as ah,
   mi as ai,
@@ -1161,8 +1167,8 @@ export {
   fi as an,
   ws as b,
   Ps as c,
-  K as d,
-  ae as e,
+  Z as d,
+  re as e,
   Ws as f,
   we as g,
   Oi as h,