@arcgis/charts-components 5.2.0-next.40 → 5.2.0-next.42

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

@@ -1,206 +1,207 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import { substitute as w } from "@arcgis/core/intl.js";
-import { cloneDeep as K, isEmpty as qe, memoize as Re } from "lodash-es";
-import { S as se } from "./common.js";
-import { s as R, u as E, g as le, a as Fe, b as ke, c as Oe, d as ce } from "./utils.js";
-import { w as k, i as De, cS as M, bY as Pe, bm as we, x as Ee, Y as _, cq as Me, cp as $e, p as We, aH as oe, c2 as Ye, d as Xe, aG as je, I as Ue, a7 as Ze, bk as He, W as Ke, e as _e, bo as Qe, cZ as ze, v as Ge, d4 as de, bM as Je, d5 as et, bI as tt, B as st, d1 as it, an as U, a6 as he, b9 as at, k as ie, bq as rt, bu as ye, bb as H, bh as me } from "./index2.js";
-import { a as Y, s as Te, g as Q, b as pe, c as nt } from "./data.js";
-import { u as B, r as L, k as lt, n as q, m as $, p as ot, t as ut, s as ae } from "./chart-object-literals.js";
-import { i as ct, R as dt } from "./rest-js-object-literals.js";
-import { i as z } from "./index4.js";
-import { aA as yt, u as mt, Z as pt, aa as gt, am as ft, y as St, D as ge, I as fe, a0 as Ft } from "./index.js";
-import { C as P, F as W, d as D } from "./index3.js";
-import { h as xe, i as O, j as ht, n as Tt, g as A, m as v, e as Se } from "./index5.js";
-import { convertChartSpec as xt } from "../utils/chart-config/converter/index.js";
-import { d as re, f as Bt } from "./type-guards.js";
-import { g as Be } from "./series-types.js";
-import { C as Ct, m as bt } from "./model-setter.js";
-import { g as ue } from "./utils2.js";
-import { a as At, b as vt } from "./series-length.js";
-const gs = (t) => {
+import { substitute as M } from "@arcgis/core/intl.js";
+import { cloneDeep as J, isEmpty as He, memoize as Xe } from "lodash-es";
+import { S as oe } from "./common.js";
+import { s as k, u as E, a as Le, g as pe, b as Ve, c as Ue, d as je, e as fe } from "./utils.js";
+import { w as D, i as Ke, cU as Y, b_ as Ze, bm as _e, x as Qe, Y as ee, cs as ze, cr as Ge, p as Je, aH as ge, c4 as et, d as tt, aG as it, I as st, a7 as at, bk as rt, W as nt, e as lt, bo as ot, c$ as ut, v as ct, d6 as Se, bN as dt, d7 as yt, bJ as mt, B as pt, N as Fe, bq as _, d3 as gt, bb as W, bu as Q, an as K, a6 as Ne, b9 as ft, k as ue, bh as xe } from "./index2.js";
+import { a as X, s as Oe, g as te, b as he, c as St } from "./data.js";
+import { u as h, r as L, k as Ft, d as R, n as O, m as $, p as xt, t as ht, s as ce } from "./chart-object-literals.js";
+import { i as Tt, R as Bt } from "./rest-js-object-literals.js";
+import { i as ie } from "./index4.js";
+import { aA as Ct, I as z, D as de, u as bt, Z as At, aa as vt, am as It, y as Lt, a0 as Vt } from "./index.js";
+import { C as w, F as H, d as P } from "./index3.js";
+import { h as ke, i as q, j as Nt, n as Ot, g as A, m as v, e as Te } from "./index5.js";
+import { convertChartSpec as kt } from "../utils/chart-config/converter/index.js";
+import { d as ye, f as Dt } from "./type-guards.js";
+import { g as De } from "./series-types.js";
+import { C as qt, m as Rt } from "./model-setter.js";
+import { g as se } from "./utils2.js";
+import { a as Pt, b as wt } from "./series-length.js";
+const Oi = (t) => {
   let e;
-  const s = t.series[0];
-  return k(s) && (e = s.temporalBinning?.size), e;
-}, It = (t) => {
+  const i = t.series[0];
+  return D(i) && (e = i.temporalBinning?.size), e;
+}, Mt = (t) => {
   let e;
-  const s = t.series[0];
-  return k(s) && (e = s.temporalBinning?.unit), e;
-}, fs = (t) => {
+  const i = t.series[0];
+  return D(i) && (e = i.temporalBinning?.unit), e;
+}, ki = (t) => {
   let e;
-  const s = t.series[0];
-  return k(s) && (e = s.temporalBinning?.timeAggregationType), e;
-}, Ss = (t) => {
+  const i = t.series[0];
+  return D(i) && (e = i.temporalBinning?.timeAggregationType), e;
+}, Di = (t) => {
   let e;
-  const s = t.series[0];
-  return k(s) && (e = s.temporalBinning?.trimIncompleteTimeInterval), e;
-}, Fs = (t) => {
+  const i = t.series[0];
+  return D(i) && (e = i.temporalBinning?.trimIncompleteTimeInterval), e;
+}, qi = (t) => {
   let e;
-  const s = t.series[0];
-  return k(s) && (e = s.temporalBinning?.nullPolicy), e;
-}, Lt = (t, e) => {
-  e?.series?.forEach((s) => {
-    k(s) && (s.temporalBinning ??= {}, s.temporalBinning.size = t);
-  }), R({ config: e, value: null, axisIndex: 1, isMax: !1 }), R({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Vt = (t, e) => {
-  e?.series?.forEach((s) => {
-    k(s) && (s.temporalBinning ??= {}, s.temporalBinning.nullPolicy = t);
-  }), R({ config: e, value: null, axisIndex: 1, isMax: !1 }), R({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, hs = (t, e) => {
-  e.series?.forEach((s) => {
-    k(s) && (s.temporalBinning ??= {}, s.temporalBinning.unit = t);
-  }), R({ config: e, value: null, axisIndex: 1, isMax: !1 }), R({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Ts = (t, e) => {
-  e.series?.forEach((s) => {
-    k(s) && (s.temporalBinning ??= {}, s.temporalBinning.timeAggregationType = t);
-  }), R({ config: e, value: null, axisIndex: 1, isMax: !1 }), R({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, xs = (t, e) => {
-  e.series?.forEach((s) => {
-    k(s) && (s.temporalBinning ??= {}, s.temporalBinning.trimIncompleteTimeInterval = t);
-  }), R({ config: e, value: null, axisIndex: 1, isMax: !1 }), R({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Nt = (t) => {
-  Lt(0, t);
+  const i = t.series[0];
+  return D(i) && (e = i.temporalBinning?.nullPolicy), e;
+}, Et = (t, e) => {
+  e?.series?.forEach((i) => {
+    D(i) && (i.temporalBinning ??= {}, i.temporalBinning.size = t);
+  }), k({ config: e, value: null, axisIndex: 1, isMax: !1 }), k({ config: e, value: null, axisIndex: 1, isMax: !0 });
+}, Wt = (t, e) => {
+  e?.series?.forEach((i) => {
+    D(i) && (i.temporalBinning ??= {}, i.temporalBinning.nullPolicy = t);
+  }), k({ config: e, value: null, axisIndex: 1, isMax: !1 }), k({ config: e, value: null, axisIndex: 1, isMax: !0 });
+}, Ri = (t, e) => {
+  e.series?.forEach((i) => {
+    D(i) && (i.temporalBinning ??= {}, i.temporalBinning.unit = t);
+  }), k({ config: e, value: null, axisIndex: 1, isMax: !1 }), k({ config: e, value: null, axisIndex: 1, isMax: !0 });
+}, Pi = (t, e) => {
+  e.series?.forEach((i) => {
+    D(i) && (i.temporalBinning ??= {}, i.temporalBinning.timeAggregationType = t);
+  }), k({ config: e, value: null, axisIndex: 1, isMax: !1 }), k({ config: e, value: null, axisIndex: 1, isMax: !0 });
+}, wi = (t, e) => {
+  e.series?.forEach((i) => {
+    D(i) && (i.temporalBinning ??= {}, i.temporalBinning.trimIncompleteTimeInterval = t);
+  }), k({ config: e, value: null, axisIndex: 1, isMax: !1 }), k({ config: e, value: null, axisIndex: 1, isMax: !0 });
+}, Yt = (t) => {
+  Et(0, t);
 };
-var qt = Object.defineProperty, Rt = Object.getOwnPropertyDescriptor, kt = (t, e, s, r) => {
-  for (var a = Rt(e, s), i = t.length - 1, n; i >= 0; i--)
-    (n = t[i]) && (a = n(e, s, a) || a);
-  return a && qt(e, s, a), a;
+var $t = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Xt = (t, e, i, a) => {
+  for (var r = Ht(e, i), s = t.length - 1, n; s >= 0; s--)
+    (n = t[s]) && (r = n(e, i, r) || r);
+  return r && $t(e, i, r), r;
 };
-const Ot = (t) => {
+const Ut = (t) => {
   let e;
-  return M(t) ? e = t.outTimeZone : t?.series.forEach((s) => {
-    (s.type === B.BarSeries || s.type === B.RadarSeries || s.type === B.LineSeries) && s.temporalBinning && (e = s.temporalBinning.outTimeZone);
-  }), e || (e = t?.axes?.[0]?.valueFormat.type === B.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0), e;
-}, Ce = (t, e) => {
-  const s = De(t);
-  M(e) ? t ? e.outTimeZone = s : delete e.outTimeZone : e?.series.forEach((r) => {
-    (r.type === B.BarSeries || r.type === B.RadarSeries || r.type === B.LineSeries) && (t ? (r.temporalBinning ??= {}, r.temporalBinning.outTimeZone = s) : r.temporalBinning && delete r.temporalBinning.outTimeZone);
-  }), e?.axes?.[0]?.valueFormat.type === B.DateAxisFormat && (t ? e.axes[0].valueFormat.intlOptions.timeZone = s : delete e.axes[0].valueFormat.intlOptions.timeZone);
+  return Y(t) ? e = t.outTimeZone : t?.series.forEach((i) => {
+    (i.type === h.BarSeries || i.type === h.RadarSeries || i.type === h.LineSeries) && i.temporalBinning && (e = i.temporalBinning.outTimeZone);
+  }), e || (e = t?.axes?.[0]?.valueFormat.type === h.DateAxisFormat ? t.axes[0].valueFormat.intlOptions.timeZone : void 0), e;
+}, qe = (t, e) => {
+  const i = Ke(t);
+  Y(e) ? t ? e.outTimeZone = i : delete e.outTimeZone : e?.series.forEach((a) => {
+    (a.type === h.BarSeries || a.type === h.RadarSeries || a.type === h.LineSeries) && (t ? (a.temporalBinning ??= {}, a.temporalBinning.outTimeZone = i) : a.temporalBinning && delete a.temporalBinning.outTimeZone);
+  }), e?.axes?.[0]?.valueFormat.type === h.DateAxisFormat && (t ? e.axes[0].valueFormat.intlOptions.timeZone = i : delete e.axes[0].valueFormat.intlOptions.timeZone);
 };
-class Dt extends Ct {
+class jt extends qt {
   /**
    * Gets the time zone for the chart.
    */
   get timeZone() {
-    return Ot(this._config);
+    return Ut(this._config);
   }
   set timeZone(e) {
-    Ce(e, this._config), this.dispatchEvent(new CustomEvent("arcgisChartsModelDataChange"));
+    qe(e, this._config), this.dispatchEvent(new CustomEvent("arcgisChartsModelDataChange"));
   }
 }
-kt([
-  bt
-], Dt.prototype, "timeZone");
-function Bs(t, e) {
-  let s;
-  return e !== void 0 && (s = { ...e }, s.legend !== void 0 && (s.legend.position = t)), s;
+Xt([
+  Rt
+], jt.prototype, "timeZone");
+function Mi(t, e) {
+  let i;
+  return e !== void 0 && (i = { ...e }, i.legend !== void 0 && (i.legend.position = t)), i;
 }
-function Cs(t, e) {
-  let s;
-  return e !== void 0 && (s = { ...e }, s.legend !== void 0 && (s.legend.visible = t)), s;
+function Ei(t, e) {
+  let i;
+  return e !== void 0 && (i = { ...e }, i.legend !== void 0 && (i.legend.visible = t)), i;
 }
-function bs(t, e) {
-  let s;
-  return e !== void 0 && (s = { ...e, rotated: t }), s;
+function Wi(t, e) {
+  let i;
+  return e !== void 0 && (i = { ...e, rotated: t }), i;
 }
-function Pt(t) {
+function Kt(t) {
   let e;
   return t !== void 0 && (e = { ...t }, delete e.axes?.[0]?.minimum, delete e.axes?.[0]?.maximum, delete e.axes?.[1]?.minimum, delete e.axes?.[1]?.maximum), e;
 }
-function As(t, e) {
-  return e != null || xe(t);
+function Yi(t, e) {
+  return e != null || ke(t);
 }
-async function vs(t) {
-  const { config: e, layer: s, abortSignal: r } = t;
-  let a = !1;
-  return re(s) || Bt(e) ? e && re(s) && (a = await we({ config: e, layer: s, abortSignal: r })) : a = !0, a;
+async function $i(t) {
+  const { config: e, layer: i, abortSignal: a } = t;
+  let r = !1;
+  return ye(i) || Dt(e) ? e && ye(i) && (r = await _e({ config: e, layer: i, abortSignal: a })) : r = !0, r;
 }
-async function wt(t) {
+async function Zt(t) {
   const {
     queryObject: e,
-    chartConfig: s,
-    splitByField: r,
-    errorStrings: a,
-    abortSignal: i,
+    chartConfig: i,
+    splitByField: a,
+    errorStrings: r,
+    abortSignal: s,
     runtimeDataFilters: n,
-    ignoreViewExtent: o,
+    ignoreViewExtent: l,
     setTimeBinningInfoWhenNotProvided: c,
-    returnFeaturesExtent: m,
+    returnFeaturesExtent: d,
     chartLimits: p
   } = t;
-  let u = [], d;
-  const y = K(s), g = y.series[0], l = _e({
+  let u = [], y;
+  const m = J(i), g = m.series[0], o = lt({
     queryObject: e,
-    chartConfig: y,
+    chartConfig: m,
     runtimeDataFilters: n,
-    ignoreViewExtent: o
+    ignoreViewExtent: l
   });
-  if (l.outStatistics?.[0]?.outStatisticFieldName && (l.outStatistics[0].outStatisticFieldName = yt.outStatistics.outStatisticFieldName), k(g) && Qe({
-    xAxisValueFormatType: ze(y),
+  if (o.outStatistics?.[0]?.outStatisticFieldName && (o.outStatistics[0].outStatisticFieldName = Ct.outStatistics.outStatisticFieldName), D(g) && ot({
+    xAxisValueFormatType: ut(m),
     setTimeBinningInfoWhenNotProvided: c,
     seriesConfig: g,
     queryObject: e
-  }) && Ge(r, e)) {
-    const { temporalBinning: f, x } = g, { uniqueQuery: b } = de({
-      chartConfig: y,
-      queryConfig: l,
+  }) && ct(a, e)) {
+    const { temporalBinning: f, x: B } = g, { uniqueQuery: b } = Se({
+      chartConfig: m,
+      queryConfig: o,
       queryObject: e,
       setTimeBinningInfoWhenNotProvided: c,
-      returnFeaturesExtent: m,
+      returnFeaturesExtent: d,
       chartLimits: p
-    }), F = s.axes?.[0].valueFormat.type === B.DateAxisFormat ? s.axes[0].valueFormat.intlOptions.timeZone : void 0;
-    d = await Je({
+    }), F = i.axes?.[0].valueFormat.type === h.DateAxisFormat ? i.axes[0].valueFormat.intlOptions.timeZone : void 0;
+    y = await dt({
       queryObject: e,
-      dateField: x,
-      splitByField: r,
+      dateField: B,
+      splitByField: a,
       queryConfig: b,
       axisTimeZone: F,
       temporalBinning: f,
-      errorStrings: a,
-      abortSignal: i
+      errorStrings: r,
+      abortSignal: s
     }), u = Array.from(
       new Set(
-        d.flatMap((S) => {
+        y.flatMap((S) => {
           const { stackedAttributes: I } = S;
           let T = [];
-          return I && (T = I.map((h) => h[r]).filter((h) => h !== void 0)), T;
+          return I && (T = I.map((x) => x[a]).filter((x) => x !== void 0)), T;
         })
       ).values()
     );
   } else {
-    const { uniqueQuery: f } = de({
-      chartConfig: y,
+    const { uniqueQuery: f } = Se({
+      chartConfig: m,
       queryObject: e,
-      queryConfig: l,
+      queryConfig: o,
       setTimeBinningInfoWhenNotProvided: c,
-      returnFeaturesExtent: m,
+      returnFeaturesExtent: d,
       chartLimits: p
-    }), { elementCount: x } = await et({
-      chartConfig: y,
+    }), { elementCount: B } = await yt({
+      chartConfig: m,
       queryObject: e,
-      queryConfig: l,
+      queryConfig: o,
       behaviorAfterLimit: p?.behaviorAfterLimit,
       numberMaxOfFeaturesToFetch: f.num,
-      abortSignal: i
+      abortSignal: s
     });
-    d = await tt({
+    y = await mt({
       queryObject: e,
       queryConfig: f,
-      featureCount: x,
-      errorStrings: a,
-      abortSignal: i
+      featureCount: B,
+      returnStatisticsAggregatedIds: !0,
+      errorStrings: r,
+      abortSignal: s
     }), u = Array.from(
       new Set(
-        d.map((b) => b.attributes[r]).filter((b) => b !== void 0)
+        y.map((b) => b.attributes[a]).filter((b) => b !== void 0)
       ).values()
     );
   }
-  return { allValues: u, preFetchedQueryResponse: d };
+  return { allValues: u, preFetchedQueryResponse: y };
 }
-function Et(t, e) {
-  const s = /* @__PURE__ */ new Map();
-  return t.series.forEach((r) => {
-    let a = oe({
-      where: r.query?.where,
+function _t(t, e) {
+  const i = /* @__PURE__ */ new Map();
+  return t.series.forEach((a) => {
+    let r = ge({
+      where: a.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,231 +209,236 @@ function Et(t, e) {
       // Refer to https://devtopia.esri.com/WebGIS/arcgis-charts/issues/8078
       escape: !1
     });
-    e && a !== null && (a = Number(a));
-    const i = Be([r]);
-    i !== void 0 && s.set(i, [
-      ...s.get(i) ?? [],
-      a
+    e && r !== null && (r = Number(r));
+    const s = De([a]);
+    s !== void 0 && i.set(s, [
+      ...i.get(s) ?? [],
+      r
     ]);
-  }), s;
+  }), i;
 }
-function Mt(t) {
-  const { allValues: e, configUniqueValuesPerSeriesType: s, initialConfigWasEmpty: r } = t, a = /* @__PURE__ */ new Map();
-  return Array.from(s.keys()).forEach((i) => {
-    const n = s.get(i) ?? [];
-    let o = [];
-    r ? o = e : e.forEach((c) => {
-      n.includes(c) || o.push(c);
-    }), a.set(i, o);
-  }), a;
+function Qt(t) {
+  const { allValues: e, configUniqueValuesPerSeriesType: i, initialConfigWasEmpty: a } = t, r = /* @__PURE__ */ new Map();
+  return Array.from(i.keys()).forEach((s) => {
+    const n = i.get(s) ?? [];
+    let l = [];
+    a ? l = e : e.forEach((c) => {
+      n.includes(c) || l.push(c);
+    }), r.set(s, l);
+  }), r;
 }
-function $t(t) {
-  const { chartConfig: e, missingValue: s, splitByField: r, seriesTemplate: a } = t, i = JSON.parse(
+function zt(t) {
+  const { chartConfig: e, missingValue: i, splitByField: a, seriesTemplate: r } = t, s = JSON.parse(
     JSON.stringify({
       ...e.series[0],
-      ...a
+      ...r
     })
   );
-  if (i.query) {
-    if (s === null ? i.id = W.nullValue : s === "" ? i.id = W.emptyStringValue : i.id = `${s}`, i.name = `${s}`, i.query.outStatistics?.[0] !== void 0) {
-      const o = i.id;
-      i.query.outStatistics[0].outStatisticFieldName = o, "y" in i && (i.y = o);
+  if (s.query) {
+    if (i === null ? s.id = H.nullValue : i === "" ? s.id = H.emptyStringValue : s.id = `${i}`, s.name = `${i}`, s.query.outStatistics?.[0] !== void 0) {
+      const l = s.id;
+      s.query.outStatistics[0].outStatisticFieldName = l, "y" in s && (s.y = l);
     }
-    const n = typeof s == "number" || s === null ? s : `'${s}'`;
-    i.query.where = `${r}=${n}`;
+    const n = typeof i == "number" || i === null ? i : `'${i}'`;
+    s.query.where = `${a}=${n}`;
   }
-  return i;
+  return s;
 }
-async function Wt(t) {
+async function Gt(t) {
   const {
     updateSplitBySeries: e,
-    config: s,
-    queryObject: r,
-    errorStrings: a,
-    abortSignal: i,
+    config: i,
+    queryObject: a,
+    errorStrings: r,
+    abortSignal: s,
     runtimeDataFilters: n,
-    ignoreViewExtent: o,
+    ignoreViewExtent: l,
     setTimeBinningInfoWhenNotProvided: c,
-    returnFeaturesExtent: m,
+    returnFeaturesExtent: d,
     chartLimits: p
   } = t, { seriesTemplate: u } = e ?? {};
-  let d;
-  if (r && !re(r) && e !== void 0 && s !== void 0 && (s.series.length > 0 || u !== void 0) && e.addMissingSeries) {
-    const y = s.series.length === 0;
-    s.series.length === 0 && u !== void 0 && s.series.push(u);
-    const g = _(s.series);
-    if (g === P.BoxPlotMonoFieldAndSplitBy || g === P.BoxPlotMultiFieldsAndSplitBy || g === P.BoxPlotMonoFieldAndCategoryAndSplitBy || g === P.BarAndLineSplitBy || g === P.BarAndLineSplitByNoAggregation) {
-      const l = je(s.series[0]?.query?.where), f = Ue(r), x = Ze(l, f), b = x ? He(x) : !1, F = await wt({
-        queryObject: r,
-        chartConfig: s,
-        splitByField: l,
-        abortSignal: i,
+  let y;
+  if (a && !ye(a) && e !== void 0 && i !== void 0 && (i.series.length > 0 || u !== void 0) && e.addMissingSeries) {
+    const m = i.series.length === 0;
+    i.series.length === 0 && u !== void 0 && i.series.push(u);
+    const g = ee(i.series);
+    if (g === w.BoxPlotMonoFieldAndSplitBy || g === w.BoxPlotMultiFieldsAndSplitBy || g === w.BoxPlotMonoFieldAndCategoryAndSplitBy || g === w.BarAndLineSplitBy || g === w.BarAndLineSplitByNoAggregation) {
+      const o = it(i.series[0]?.query?.where), f = st(a), B = at(o, f), b = B ? rt(B) : !1, F = await Zt({
+        queryObject: a,
+        chartConfig: i,
+        splitByField: o,
+        abortSignal: s,
         runtimeDataFilters: n,
-        ignoreViewExtent: o,
+        ignoreViewExtent: l,
         setTimeBinningInfoWhenNotProvided: c,
-        returnFeaturesExtent: m,
+        returnFeaturesExtent: d,
         chartLimits: p,
-        errorStrings: a
+        errorStrings: r
       }), { allValues: S } = F;
-      if ({ preFetchedQueryResponse: d } = F, S.length > 0) {
-        const I = Et(s, b), T = Mt({
+      if ({ preFetchedQueryResponse: y } = F, S.length > 0) {
+        const I = _t(i, b), T = Qt({
           allValues: S,
           configUniqueValuesPerSeriesType: I,
-          initialConfigWasEmpty: y
+          initialConfigWasEmpty: m
         });
-        Array.from(T.keys()).forEach((h) => {
-          (T.get(h) ?? []).forEach((N) => {
-            s.series.push(
-              $t({
-                chartConfig: s,
+        Array.from(T.keys()).forEach((x) => {
+          (T.get(x) ?? []).forEach((N) => {
+            i.series.push(
+              zt({
+                chartConfig: i,
                 seriesTemplate: u,
                 missingValue: N,
-                splitByField: l
+                splitByField: o
               })
             );
-          }), y && s.series.shift();
+          }), m && i.series.shift();
         });
       }
     }
   }
-  return d;
+  return y;
 }
-function Yt(t, e) {
-  e && !xe(e) && (e = Xe({ chartConfig: e, queryObject: t }));
+function Jt(t, e) {
+  e && !ke(e) && (e = tt({ chartConfig: e, queryObject: t }));
 }
-async function Is(t) {
+async function Hi(t) {
   const {
     configToAlter: e,
-    layer: s,
-    addMissingSeries: r,
-    updateSplitBySeries: a,
-    chartContainer: i,
+    layer: i,
+    addMissingSeries: a,
+    updateSplitBySeries: r,
+    chartContainer: s,
     queryObject: n,
-    abortSignal: o,
+    abortSignal: l,
     runtimeDataFilters: c,
-    ignoreViewExtent: m,
+    ignoreViewExtent: d,
     setTimeBinningInfoWhenNotProvided: p,
     returnFeaturesExtent: u,
-    chartLimits: d,
-    timeZone: y,
+    chartLimits: y,
+    timeZone: m,
     errorStrings: g
   } = t;
-  let l = e, f;
-  return l && (Yt(s, l), l = await xt(l, s, void 0, o), r && n && (f = await Wt({
-    updateSplitBySeries: a,
-    config: l,
+  let o = e, f;
+  return o && (Jt(i, o), o = await kt(o, i, void 0, l), a && n && (f = await Gt({
+    updateSplitBySeries: r,
+    config: o,
     queryObject: n,
     errorStrings: g,
-    abortSignal: o,
+    abortSignal: l,
     runtimeDataFilters: c,
-    ignoreViewExtent: m,
+    ignoreViewExtent: d,
     setTimeBinningInfoWhenNotProvided: p,
     returnFeaturesExtent: u,
-    chartLimits: d
-  })), l = Pe(l, i), Ce(y, l)), { alteredConfig: l, preFetchedQueryResponse: f };
+    chartLimits: y
+  })), o = Ze(o, s), qe(m, o)), { alteredConfig: o, preFetchedQueryResponse: f };
 }
-function Xt(t, e) {
-  let s = !1;
+function ei(t, e) {
+  let i = !1;
   if (e !== void 0) {
-    const r = Ke({ key: st.Average, splitBy: e });
-    s = Number.isFinite(t[r]);
+    const a = nt({ key: pt.Average, splitBy: e });
+    i = Number.isFinite(t[a]);
   }
-  return s;
+  return i;
 }
-function Ls(t) {
-  const { data: e, config: s, showEmptySeries: r } = t, a = s.series.length, i = K(s);
+function Xi(t) {
+  const { data: e, config: i, showEmptySeries: a } = t, r = i.series.length, s = J(i);
   let n = !1;
-  if (!r && a > 1 && e) {
-    const o = Ee(e), c = Be(s?.series), m = _(s?.series), p = /* @__PURE__ */ new Set();
+  if (!a && r > 1 && e) {
+    const l = Qe(e), c = De(i?.series), d = ee(i?.series), p = /* @__PURE__ */ new Set();
     switch (c) {
-      case B.ComboLineAndBarSeries:
-      case B.BarSeries:
-      case B.RadarSeries:
-      case B.LineSeries: {
-        i.series.forEach((d) => {
-          if (Array.isArray(o)) {
-            let y = "";
-            "y" in d && (y = Array.isArray(d.y) ? d.y[0] : d.y, m === P.BarAndLineSplitByNoAggregation && (y = `${y}_${oe({ where: d.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), o.some(
-              (l) => Ye({
-                dataItem: l,
-                x: d.x,
-                y,
-                aggregationType: s.series[0].query?.outStatistics?.[0]?.statisticType
+      case h.ComboLineAndBarSeries:
+      case h.BarSeries:
+      case h.RadarSeries:
+      case h.LineSeries: {
+        s.series.forEach((y) => {
+          if (Array.isArray(l)) {
+            let m = "";
+            "y" in y && (m = Array.isArray(y.y) ? y.y[0] : y.y, d === w.BarAndLineSplitByNoAggregation && (m = `${m}_${ge({ where: y.query?.where, keepSurroundingQuotes: !1, escape: !1 })}`), l.some(
+              (o) => et({
+                dataItem: o,
+                x: y.x,
+                y: m,
+                aggregationType: i.series[0].query?.outStatistics?.[0]?.statisticType
               })
-            ) && p.add(d));
+            ) && p.add(y));
           }
         });
         break;
       }
-      case B.BoxPlotSeries: {
-        if (Me(s)) {
-          const d = $e(s);
-          s.series.forEach((y) => {
-            let g, l;
-            y.type === B.BoxPlotSeries ? (g = e.dataItems, l = g?.some(
-              (f) => We({
+      case h.BoxPlotSeries: {
+        if (ze(i)) {
+          const y = Ge(i);
+          i.series.forEach((m) => {
+            let g, o;
+            m.type === h.BoxPlotSeries ? (g = e.dataItems, o = g?.some(
+              (f) => Je({
                 dataItem: f,
-                splitBy: y.query?.where,
-                showOutliers: d
+                splitBy: m.query?.where,
+                showOutliers: y
               })
-            )) : y.type === B.LineSeries && (g = e.meanLines, l = g?.some(
-              (f) => Xt(f, y.query?.where)
-            )), l && p.add(y);
+            )) : m.type === h.LineSeries && (g = e.meanLines, o = g?.some(
+              (f) => ei(f, m.query?.where)
+            )), o && p.add(m);
           });
         }
         break;
       }
     }
     const u = Array.from(p.values());
-    n = u.length > 0 && u.length < a, n && (i.series = u);
+    n = u.length > 0 && u.length < r, n && (s.series = u);
   }
-  return { seriesFilteredOut: n, filteredConfig: i };
+  return { seriesFilteredOut: n, filteredConfig: s };
 }
-const Vs = (t) => t.hideEmptyRowsAndColumns, Ns = (t, e) => {
+const Ui = (t) => t.hideEmptyRowsAndColumns, ji = (t, e) => {
   t.hideEmptyRowsAndColumns = e;
-}, qs = (t, e) => {
-  const s = t.series[0];
-  s.heatRulesType = e;
-}, Rs = (t) => t.series[0].heatRulesType, ks = (t, e) => {
-  const s = t.series[0];
-  s.gradientRules = e;
-}, Os = (t) => t.series[0].gradientRules, Ds = (t) => {
-  const { yField: e, config: s, layerInfo: r } = t, { layerFieldsInfo: a } = r, i = ue(1, s), n = jt(s), o = z(s), c = s.series[0];
-  if (typeof e == "string" && n !== e && c && (c.y = e, Pt(s), n === i || o)) {
-    const m = D(a, e);
-    E(s, 1, m);
+}, Ki = (t, e) => {
+  const i = t.series[0];
+  i.heatRulesType = e;
+}, Zi = (t) => t.series[0].heatRulesType, _i = (t, e) => {
+  const i = t.series[0];
+  i.gradientRules = e;
+}, Qi = (t) => t.series[0].gradientRules, zi = (t) => {
+  const { yField: e, config: i, layerInfo: a, commonStrings: r } = t, { layerFieldsInfo: s } = a, n = se(1, i), l = ti(i), c = ie(i), d = i.series[0];
+  if (typeof e == "string" && l !== e && d) {
+    if (d.y = e, Kt(i), l === n || c) {
+      const p = P(s, e);
+      E(i, 1, p);
+    }
+    Re({ commonStrings: r, config: i, layerInfo: a });
   }
-}, jt = (t) => t.series[0].y ?? "", Ps = (t) => {
-  const { binning: e, config: s, commonStrings: r } = t, a = s.series[0];
-  if (a.xTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
-    const i = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
-    E(s, 0, i);
+}, ti = (t) => t.series[0].y ?? "", Gi = (t) => {
+  const { binning: e, config: i, commonStrings: a } = t, r = i.series[0];
+  if (r.xTemporalBinning = e, e?.unit !== void 0 && e.unit in a.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const s = a.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    E(i, 0, s);
   }
-}, ws = (t) => t.series[0].xTemporalBinning, Es = (t) => {
-  const { binning: e, config: s, commonStrings: r } = t, a = s.series[0];
-  if (a.yTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
-    const i = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
-    E(s, 1, i);
+  G({ axisIndex: 0, commonStrings: a, config: i });
+}, ii = (t) => t.series[0].xTemporalBinning, Ji = (t) => {
+  const { binning: e, config: i, commonStrings: a } = t, r = i.series[0];
+  if (r.yTemporalBinning = e, e?.unit !== void 0 && e.unit in a.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const s = a.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    E(i, 1, s);
   }
-}, Ms = (t) => t.series[0].yTemporalBinning, Ut = (t, e) => {
+  G({ axisIndex: 1, commonStrings: a, config: i });
+}, si = (t) => t.series[0].yTemporalBinning, ai = (t, e) => {
   e.orderOptions ??= {};
-  const s = e.axes?.[0]?.valueFormat?.type === "category" ? q.Category : q.YValue, r = ne(e)[0], a = e.axes?.[1]?.valueFormat?.type === "category" ? q.Category : q.YValue, i = ne(e)[1], n = {
+  const i = e.axes?.[0]?.valueFormat?.type === "category" ? O.Category : O.YValue, a = me(e)[0], r = e.axes?.[1]?.valueFormat?.type === "category" ? O.Category : O.YValue, s = me(e)[1], n = {
     ...e.orderOptions.data ?? {},
-    orderType: q.MultiAxes
+    orderType: O.MultiAxes
   };
-  r === se.customSort && s === q.Category && (n.orderByX = [...t]), i === se.customSort && a === q.Category && (n.orderByY = [...t]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
-}, $s = (t, e) => {
-  const s = e.series[0];
-  s.gridLine && (s.gridLine.width = t);
-}, Ws = (t) => t.series[0].gridLine?.width, Ys = (t, e) => {
-  const s = e.series[0], r = t?.length === 4 && t.every((a) => typeof a == "number");
-  s.gridLine && r && (s.gridLine.color = t);
-}, Xs = (t) => t.series[0].gridLine?.color, js = (t, e) => {
-  const s = e.legend;
-  s && (s.position = t);
-}, Us = (t) => t.legend?.position ?? lt.Bottom, Zs = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, Hs = (t) => {
-  const { field: e, config: s, layerInfo: r, commonStrings: a } = t, i = s.series[0].query?.outStatistics?.[0], n = ee(s, r, a);
-  i ? (i.onStatisticField = e, i.outStatisticFieldName = `${i.statisticType}_${e}`) : s.series[0].query = {
+  a === oe.customSort && i === O.Category && (n.orderByX = [...t]), s === oe.customSort && r === O.Category && (n.orderByY = [...t]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
+}, es = (t, e) => {
+  const i = e.series[0];
+  i.gridLine && (i.gridLine.width = t);
+}, ts = (t) => t.series[0].gridLine?.width, is = (t, e) => {
+  const i = e.series[0], a = t?.length === 4 && t.every((r) => typeof r == "number");
+  i.gridLine && a && (i.gridLine.color = t);
+}, ss = (t) => t.series[0].gridLine?.color, as = (t, e) => {
+  const i = e.legend;
+  i && (i.position = t);
+}, rs = (t) => t.legend?.position ?? Ft.Bottom, ns = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, ls = (t) => {
+  const { field: e, config: i, layerInfo: a, commonStrings: r } = t, s = i.series[0].query?.outStatistics?.[0], n = ne(i, a, r);
+  s ? (s.onStatisticField = e, s.outStatisticFieldName = `${s.statisticType}_${e}`) : i.series[0].query = {
     outStatistics: [
       {
         onStatisticField: e,
@@ -440,53 +446,53 @@ const Vs = (t) => t.hideEmptyRowsAndColumns, Ns = (t, e) => {
         statisticType: L.Count
       }
     ]
-  }, n && s.title && (s.title.content.text = Z(s, r, a));
-}, Ks = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? L.Count, _s = (t) => {
-  const { aggregationType: e, config: s, layerInfo: r, commonStrings: a } = t, i = s.series[0]?.query?.outStatistics?.[0], n = ee(s, r, a);
-  i && e !== L.NoAggregation && (i.statisticType = e, i.outStatisticFieldName = `${e}_${i.onStatisticField}`), (e === L.Count || e === L.Sum) && Zt($.Zero, s), n && s.title && (s.title.content.text = Z(s, r, a));
-}, Qs = (t) => t.nullPolicy, Zt = (t, e) => {
+  }, n && i.title && (i.title.content.text = Z(i, a, r));
+}, os = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? L.Count, us = (t) => {
+  const { aggregationType: e, config: i, layerInfo: a, commonStrings: r } = t, s = i.series[0]?.query?.outStatistics?.[0], n = ne(i, a, r);
+  s && e !== L.NoAggregation && (s.statisticType = e, s.outStatisticFieldName = `${e}_${s.onStatisticField}`), (e === L.Count || e === L.Sum) && ri($.Zero, i), n && i.title && (i.title.content.text = Z(i, a, r));
+}, cs = (t) => t.nullPolicy, ri = (t, e) => {
   e.nullPolicy = t;
-}, zs = (t) => t.series[0].emptyCells, Gs = (t, e) => {
+}, ds = (t) => t.series[0].emptyCells, ys = (t, e) => {
   e.series[0].emptyCells = t;
-}, Js = (t) => t.series[0].emptyCells?.text, ei = (t, e) => {
+}, ms = (t) => t.series[0].emptyCells?.text, ps = (t, e) => {
   e.series[0].emptyCells ? e.series[0].emptyCells.text = t : e.series[0].emptyCells = { text: t };
-}, ti = (t) => t.includeLeapDay, si = (t, e) => {
+}, gs = (t) => t.includeLeapDay, fs = (t, e) => {
   e.includeLeapDay = t;
-}, ii = (t) => t.series[0].emptyCells?.symbol, ai = (t, e) => {
+}, Ss = (t) => t.series[0].emptyCells?.symbol, Fs = (t, e) => {
   e.series[0].emptyCells ? e.series[0].emptyCells.symbol = t : e.series[0].emptyCells = { symbol: t };
 };
-function ri(t) {
+function xs(t) {
   return t.viewType;
 }
-function ni(t, e) {
-  it(e) || (e.viewType = t);
+function hs(t, e) {
+  gt(e) || (e.viewType = t);
 }
-function li(t) {
-  return t.series[0].classBreaksRules?.breaksCount ?? W.classBreaks.breaksCount;
+function Ts(t) {
+  return t.series[0].classBreaksRules?.breaksCount ?? H.classBreaks.breaksCount;
 }
-function oi(t, e) {
-  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? W.classBreaks.breaksCount : e.series[0].classBreaksRules = {
-    breaksCount: t ?? W.classBreaks.breaksCount
+function Bs(t, e) {
+  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? H.classBreaks.breaksCount : e.series[0].classBreaksRules = {
+    breaksCount: t ?? H.classBreaks.breaksCount
   };
 }
-function ui(t) {
+function Cs(t) {
   return t.series[0].classBreaksRules?.classificationMethod;
 }
-function ci(t, e) {
+function bs(t, e) {
   e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.classificationMethod = t : e.series[0].classBreaksRules = {
     classificationMethod: t
-  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? W.classBreaks.breaksCount;
+  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? H.classBreaks.breaksCount;
 }
-function di(t, e) {
+function As(t, e) {
   e.firstDayOfWeek = t;
 }
-function yi(t) {
+function vs(t) {
   return t.firstDayOfWeek;
 }
-function mi(t) {
+function Is(t) {
   return t.series[0].classBreaksRules?.colorRampInfo?.name;
 }
-function pi(t, e) {
+function Ls(t, e) {
   e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.colorRampInfo = {
     ...e.series[0].classBreaksRules.colorRampInfo,
     name: t
@@ -497,10 +503,10 @@ function pi(t, e) {
     }
   };
 }
-function gi(t) {
+function Vs(t) {
   return t.series[0].classBreaksRules?.colorRampInfo?.flipped ?? !1;
 }
-function fi(t, e) {
+function Ns(t, e) {
   e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.colorRampInfo = {
     ...e.series[0].classBreaksRules.colorRampInfo,
     flipped: t
@@ -510,613 +516,691 @@ function fi(t, e) {
     }
   };
 }
-function X(t) {
-  const { seriesIndex: e, xAxisField: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, o = U(i?.layer).idField;
+const ni = [
+  R.DayOfMonth,
+  R.MonthOfYear
+], Be = (t) => {
+  let e;
+  return _(t) ? e = de() : (W(t) || Q(t)) && (e = z()), e;
+}, Ce = (t) => W(t) || Q(t), be = (t) => {
+  const { axisIndex: e, commonStrings: i, config: a, valueFormat: r } = t, s = a.axes?.[e]?.valueFormat;
+  r !== void 0 && s?.type !== r.type && Le({ config: a, commonStrings: i, valueFormat: r, axisIndex: e });
+}, li = (t, e) => {
+  let i;
+  return e === 0 ? i = t.series[0]?.xTemporalBinning : e === 1 && (i = t.series[0]?.yTemporalBinning), i;
+}, Ae = (t, e) => t.utilsStrings.heatChartCalendarDatePartsUnits[e] ?? "", ve = (t, e) => {
+  let i = ni[t];
+  return t === 0 && e?.unit === R.DayOfWeek ? i = R.HourOfDay : t === 1 && e?.unit === R.HourOfDay && (i = R.DayOfWeek), {
+    type: h.CalendarDateParts,
+    unit: i
+  };
+}, oi = (t) => {
+  let e = {};
+  switch (t.unit) {
+    case R.DayOfMonth:
+      e = { day: "2-digit" };
+      break;
+    case R.DayOfWeek:
+      e = { weekday: "short" };
+      break;
+    case R.HourOfDay:
+      e = { hour: "numeric", hour12: !1 };
+      break;
+    case R.MonthOfYear:
+      e = { month: "short" };
+      break;
+    default:
+      e = z().intlOptions;
+      break;
+  }
+  return {
+    type: h.DateAxisFormat,
+    intlOptions: e
+  };
+}, Ie = (t) => {
+  const { axisIndex: e, binning: i, commonStrings: a, config: r, fieldName: s, layerInfo: n } = t, l = r.series[0], c = se(e, r), d = P(n.layerFieldsInfo, s);
+  e === 0 ? l.xTemporalBinning = i : e === 1 && (l.yTemporalBinning = i), i !== void 0 && (c === "" || c === d || c === Ae(a, i.unit)) && E(r, e, Ae(a, i.unit));
+}, G = (t) => {
+  const { axisIndex: e, commonStrings: i, config: a } = t, r = li(a, e), s = r ? oi(r) : void 0;
+  Le({ config: a, commonStrings: i, valueFormat: s, axisIndex: e });
+}, Re = (t) => {
+  const { commonStrings: e, config: i, layerInfo: a } = t, r = i.series[0]?.x ?? "", s = i.series[0]?.y ?? "", n = Fe(a.layerFieldsInfo, r), l = Fe(a.layerFieldsInfo, s), c = Be(n), d = Be(l), p = Ce(n) && Ce(l), u = _(n) && _(l);
+  if (be({ axisIndex: 0, commonStrings: e, config: i, valueFormat: c }), be({ axisIndex: 1, commonStrings: e, config: i, valueFormat: d }), p) {
+    const y = ii(i) === void 0, m = si(i) === void 0;
+    y && (Ie({
+      axisIndex: 0,
+      binning: ve(0, i.series[0].yTemporalBinning),
+      commonStrings: e,
+      config: i,
+      fieldName: r,
+      layerInfo: a
+    }), G({
+      axisIndex: 0,
+      commonStrings: e,
+      config: i
+    })), m && (Ie({
+      axisIndex: 1,
+      binning: ve(1, i.series[0].xTemporalBinning),
+      commonStrings: e,
+      config: i,
+      fieldName: s,
+      layerInfo: a
+    }), G({
+      axisIndex: 1,
+      commonStrings: e,
+      config: i
+    }));
+  }
+  u && (i.series[0].xTemporalBinning = void 0, i.series[0].yTemporalBinning = void 0);
+};
+function U(t) {
+  const { seriesIndex: e, xAxisField: i, aggregationType: a, config: r, layerInfo: s, commonStrings: n } = t, l = K(s?.layer).idField;
   let c;
-  const m = a.series[e ?? 0];
-  let p = !1, u = !1, d = !1;
-  if (m === void 0) {
-    const l = a.series;
-    p = l.slice(0, e).every((f) => A(f)), u = l.slice(0, e).every((f) => v(f)), d = l.slice(0, e).every((f) => Se(f));
+  const d = r.series[e ?? 0];
+  let p = !1, u = !1, y = !1;
+  if (d === void 0) {
+    const o = r.series;
+    p = o.slice(0, e).every((f) => A(f)), u = o.slice(0, e).every((f) => v(f)), y = o.slice(0, e).every((f) => Te(f));
   } else
-    p = A(m), u = v(m), d = Se(m);
-  p ? c = pt({
+    p = A(d), u = v(d), y = Te(d);
+  p ? c = At({
     commonStrings: n,
     seriesIndex: e,
-    objectIDField: o
-  }) : u ? c = gt({
+    objectIDField: l
+  }) : u ? c = vt({
     commonStrings: n,
     seriesIndex: e,
-    objectIDField: o
-  }) : d ? c = ft(n, o) : c = St({
+    objectIDField: l
+  }) : y ? c = It(n, l) : c = Lt({
     seriesIndex: e,
-    objectIDField: o,
+    objectIDField: l,
     commonStrings: n
   });
-  const y = a.series[0]?.dataLabels, g = {
+  const m = r.series[0]?.dataLabels, g = {
     ...c,
-    x: s,
+    x: i,
     y: "",
     dataLabels: {
       ...c.dataLabels,
-      type: c.dataLabels?.type ?? B.Text,
-      content: { ...c.dataLabels?.content, ...y?.content, type: ct.TS },
-      visible: y?.visible ?? !1
+      type: c.dataLabels?.type ?? h.Text,
+      content: { ...c.dataLabels?.content, ...m?.content, type: Tt.TS },
+      visible: m?.visible ?? !1
     }
   };
   if (g.query = {
-    groupByFieldsForStatistics: [s]
-  }, r !== L.NoAggregation && o !== void 0) {
-    const l = `${r}_${o}_0`.toUpperCase();
-    g.y = l, g.query.outStatistics = [
+    groupByFieldsForStatistics: [i]
+  }, a !== L.NoAggregation && l !== void 0) {
+    const o = `${a}_${l}_0`.toUpperCase();
+    g.y = o, g.query.outStatistics = [
       {
-        statisticType: r,
-        onStatisticField: o,
-        outStatisticFieldName: l
+        statisticType: a,
+        onStatisticField: l,
+        outStatisticFieldName: o
       }
     ];
   }
-  if (k(a.series[0]) && k(g)) {
-    let l = It(a);
-    l === ae.Quarter && (l = ae.Month), g.temporalBinning = {
-      ...a.series[0]?.temporalBinning,
-      unit: l
+  if (D(r.series[0]) && D(g)) {
+    let o = Mt(r);
+    o === ce.Quarter && (o = ce.Month), g.temporalBinning = {
+      ...r.series[0]?.temporalBinning,
+      unit: o
     };
   }
-  return K(g);
+  return J(g);
 }
-function Z(t, e, s) {
-  const { layerFieldsInfo: r } = e, { idField: a, isTraditionalTypeOID: i } = U(e.layer), n = Y(t), o = J(t), c = Ae(t), m = G(t), p = i && (o.length === 0 || o.includes(a)), u = mt(c, s), d = p ? "" : o.map((F) => D(r ?? [], F)).join(", "), y = D(r ?? [], n), g = D(r ?? [], m), l = t.series.some((F) => O(F)), f = l ? "category" : "xAxisField", x = y;
+function Z(t, e, i) {
+  const { layerFieldsInfo: a } = e, { idField: r, isTraditionalTypeOID: s } = K(e.layer), n = X(t), l = re(t), c = we(t), d = ae(t), p = s && (l.length === 0 || l.includes(r)), u = bt(c, i), y = p ? "" : l.map((F) => P(a ?? [], F)).join(", "), m = P(a ?? [], n), g = P(a ?? [], d), o = t.series.some((F) => q(F)), f = o ? "category" : "xAxisField", B = m;
   let b = "";
-  if (Te({
+  if (Oe({
     fieldName: n,
-    numericFields: o,
-    fieldList: r
+    numericFields: l,
+    fieldList: a
   }))
-    b = w(s.titleLabels.aggrTypeOfAggrFields, {
+    b = M(i.titleLabels.aggrTypeOfAggrFields, {
       aggregationType: u,
-      aggregationFields: d
+      aggregationFields: y
     });
   else if (c === L.NoAggregation) {
-    const F = p ? a : d;
-    if (m === "") {
-      const S = l ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      b = w(s.titleLabels[S], {
+    const F = p ? r : y;
+    if (d === "") {
+      const S = o ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      b = M(i.titleLabels[S], {
         aggregationType: F,
-        [f]: x
+        [f]: B
       });
     } else {
-      const S = l ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      b = w(s.titleLabels[S], {
+      const S = o ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      b = M(i.titleLabels[S], {
         aggregationType: F,
-        [f]: x,
+        [f]: B,
         splitByField: g
       });
     }
   } else if (c === L.Count)
-    if (m === "") {
-      const F = l ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      b = w(s.titleLabels[F], {
+    if (d === "") {
+      const F = o ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      b = M(i.titleLabels[F], {
         aggregationType: u,
-        [f]: x
+        [f]: B
       });
     } else {
-      const F = l ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      b = w(s.titleLabels[F], {
+      const F = o ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      b = M(i.titleLabels[F], {
         aggregationType: u,
-        [f]: x,
+        [f]: B,
         splitByField: g
       });
     }
-  else if (m !== "") {
-    const F = l ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
-    b = w(s.titleLabels[F], {
+  else if (d !== "") {
+    const F = o ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
+    b = M(i.titleLabels[F], {
       aggregationType: u,
-      aggregationField: d,
-      [f]: x,
+      aggregationField: y,
+      [f]: B,
       splitByField: g
     });
-  } else if (o.length > 0) {
-    const F = l ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
-    b = w(s.titleLabels[F], {
+  } else if (l.length > 0) {
+    const F = o ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
+    b = M(i.titleLabels[F], {
       aggregationType: u,
-      aggregationFields: d,
-      [f]: x
+      aggregationFields: y,
+      [f]: B
     });
   }
   return b;
 }
-const be = (t) => oe({
+const Pe = (t) => ge({
   where: t.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", Ae = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? L.NoAggregation, G = Re(
+}) ?? "", we = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? L.NoAggregation, ae = Xe(
   (t) => {
     const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
-    return at(t?.series?.[0]?.query?.where) ? "" : e;
+    return ft(t?.series?.[0]?.query?.where) ? "" : e;
   },
   (t) => t?.series?.[0]?.query?.where
-), J = (t) => {
+), re = (t) => {
   let e = [];
-  if (G(t) === "")
-    e = t?.series.map((s) => {
-      const r = s.query?.outStatistics?.map((a) => a.onStatisticField) ?? [];
-      return r?.length > 0 ? r : s.y;
+  if (ae(t) === "")
+    e = t?.series.map((i) => {
+      const a = i.query?.outStatistics?.map((r) => r.onStatisticField) ?? [];
+      return a?.length > 0 ? a : i.y;
     }).flat() ?? [];
   else {
-    const s = t?.series?.[0], r = s?.query?.outStatistics?.[0]?.onStatisticField ?? [s?.y].flat()[0];
-    e = r !== void 0 ? [r] : [];
+    const i = t?.series?.[0], a = i?.query?.outStatistics?.[0]?.onStatisticField ?? [i?.y].flat()[0];
+    e = a !== void 0 ? [a] : [];
   }
-  return e.filter((s) => s !== "");
+  return e.filter((i) => i !== "");
 };
-function ve(t) {
-  const { splitByField: e, numericFields: s, layer: r, seriesIndex: a } = t, i = U(r).idField ?? "";
-  return e === "" ? s[a] ?? i : s[0] ?? i;
+function Me(t) {
+  const { splitByField: e, numericFields: i, layer: a, seriesIndex: r } = t, s = K(a).idField ?? "";
+  return e === "" ? i[r] ?? s : i[0] ?? s;
 }
-function Ht(t) {
-  const { numericFields: e, aggregationType: s, config: r, layerInfo: a } = t;
-  let i = !1;
-  s === L.Count ? i = !0 : s === L.NoAggregation && (i = e.every((c) => {
-    const m = a.layerFieldsInfo.find((p) => p.name === c);
-    return m !== void 0 ? me(m) : !1;
-  })), ce(r, 1, i);
-  const n = r.series.some((c) => A(c)), o = r.series.some((c) => v(c));
-  if (n || o) {
-    const c = Y(r), m = a.layerFieldsInfo.find((u) => u.name === c), p = m !== void 0 && me(m);
-    ce(r, 0, p);
+function ui(t) {
+  const { numericFields: e, aggregationType: i, config: a, layerInfo: r } = t;
+  let s = !1;
+  i === L.Count ? s = !0 : i === L.NoAggregation && (s = e.every((c) => {
+    const d = r.layerFieldsInfo.find((p) => p.name === c);
+    return d !== void 0 ? xe(d) : !1;
+  })), fe(a, 1, s);
+  const n = a.series.some((c) => A(c)), l = a.series.some((c) => v(c));
+  if (n || l) {
+    const c = X(a), d = r.layerFieldsInfo.find((u) => u.name === c), p = d !== void 0 && xe(d);
+    fe(a, 0, p);
   }
 }
-const ne = (t) => {
+const me = (t) => {
   let e;
-  if (M(t)) {
-    const s = t.orderOptions?.data?.orderByX ?? [""], r = t.orderOptions?.data?.orderByY ?? [""], a = t.axes?.[0]?.valueFormat?.type === "category" ? q.Category : q.YValue, i = t.axes?.[1]?.valueFormat?.type === "category" ? q.Category : q.YValue;
-    e = [pe(s, a), pe(r, i)];
+  if (Y(t)) {
+    const i = t.orderOptions?.data?.orderByX ?? [""], a = t.orderOptions?.data?.orderByY ?? [""], r = t.axes?.[0]?.valueFormat?.type === "category" ? O.Category : O.YValue, s = t.axes?.[1]?.valueFormat?.type === "category" ? O.Category : O.YValue;
+    e = [he(i, r), he(a, s)];
   } else {
-    const s = t.orderOptions?.data?.orderType ?? q.Category, r = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : ot.Ascending;
-    e = [nt(r, s)];
+    const i = t.orderOptions?.data?.orderType ?? O.Category, a = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : xt.Ascending;
+    e = [St(a, i)];
   }
   return e;
 };
-function Kt(t) {
-  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, { layerFieldsInfo: o } = i;
+function ci(t) {
+  const { xAxisField: e, numericFields: i, aggregationType: a, config: r, layerInfo: s, commonStrings: n } = t, { layerFieldsInfo: l } = s;
   let c = !1;
-  const m = X({
-    config: a,
+  const d = U({
+    config: r,
     xAxisField: e,
-    aggregationType: r,
-    layerInfo: i,
+    aggregationType: a,
+    layerInfo: s,
     seriesIndex: 0,
     commonStrings: n
-  }), p = Q({
-    config: a,
+  }), p = te({
+    config: r,
     xAxisField: e,
-    numericFields: s,
-    aggregationType: r,
-    layer: i.layer,
-    fieldList: o
+    numericFields: i,
+    aggregationType: a,
+    layer: s.layer,
+    fieldList: l
   }).name, u = {
-    ...m,
+    ...d,
     id: `series_${Date.now()}`,
     name: n.axisLabels.values,
-    x: ie,
+    x: ue,
     y: p
-  }, d = [];
-  for (const g of s)
-    d.push({
+  }, y = [];
+  for (const g of i)
+    y.push({
       onStatisticField: g,
       outStatisticFieldName: `${g}_0`.toUpperCase(),
-      statisticType: r
+      statisticType: a
     });
-  u.query = { outStatistics: d };
-  const y = a.series[0];
-  return y !== void 0 && (u.id = y.id, (A(u) && A(y) || v(u) && v(y)) && j(u, y), a.colorMatch || (O(y) && O(u) ? u.fillSymbol = y.fillSymbol : (A(u) && A(y) || v(u) && v(y)) && (u.lineSymbol = y.lineSymbol, u.markerSymbol = y.markerSymbol), c = !0), u.id = y.id, y.name !== m.name && (u.name = y.name)), a.series.length === 1 && ((A(u) || v(u)) && j(u, a.series[0]), a.colorMatch || (O(u) ? u.fillSymbol = a.series[0].fillSymbol : (A(u) || v(u)) && (u.lineSymbol = a.series[0].lineSymbol, u.markerSymbol = a.series[0].markerSymbol), c = !0)), a.colorMatch = !c, [u];
+  u.query = { outStatistics: y };
+  const m = r.series[0];
+  return m !== void 0 && (u.id = m.id, (A(u) && A(m) || v(u) && v(m)) && j(u, m), r.colorMatch || (q(m) && q(u) ? u.fillSymbol = m.fillSymbol : (A(u) && A(m) || v(u) && v(m)) && (u.lineSymbol = m.lineSymbol, u.markerSymbol = m.markerSymbol), c = !0), u.id = m.id, m.name !== d.name && (u.name = m.name)), r.series.length === 1 && ((A(u) || v(u)) && j(u, r.series[0]), r.colorMatch || (q(u) ? u.fillSymbol = r.series[0].fillSymbol : (A(u) || v(u)) && (u.lineSymbol = r.series[0].lineSymbol, u.markerSymbol = r.series[0].markerSymbol), c = !0)), r.colorMatch = !c, [u];
 }
-function Ie(t) {
-  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, { layerFieldsInfo: o } = i, c = U(i.layer).idField, m = [];
+function Ee(t) {
+  const { xAxisField: e, numericFields: i, aggregationType: a, config: r, layerInfo: s, commonStrings: n } = t, { layerFieldsInfo: l } = s, c = K(s.layer).idField, d = [];
   let p = !1;
-  for (let l = 0; l < s.length; l += 1) {
-    const f = X({
-      config: a,
+  for (let o = 0; o < i.length; o += 1) {
+    const f = U({
+      config: r,
       xAxisField: e,
-      aggregationType: r,
-      layerInfo: i,
-      seriesIndex: l,
+      aggregationType: a,
+      layerInfo: s,
+      seriesIndex: o,
       commonStrings: n
-    }), x = a.series[l]?.y, b = typeof x == "string" && x.trim() !== "" && !o.find((h) => h.name === x) ? x : Q({
-      config: a,
+    }), B = r.series[o]?.y, b = typeof B == "string" && B.trim() !== "" && !l.find((x) => x.name === B) ? B : te({
+      config: r,
       xAxisField: e,
-      numericFields: s,
-      aggregationType: r,
-      layer: i.layer,
-      numericFieldIndex: l,
-      fieldList: o
-    }).name, F = s[l];
+      numericFields: i,
+      aggregationType: a,
+      layer: s.layer,
+      numericFieldIndex: o,
+      fieldList: l
+    }).name, F = i[o];
     let S = {
       ...f,
       query: {
         ...f.query
       }
     };
-    s && F !== c && (S = {
+    i && F !== c && (S = {
       ...S,
       id: F,
-      name: D(o, F)
+      name: P(l, F)
     });
     let I = F;
-    S.query !== void 0 && (r !== L.NoAggregation ? (I = b, S.query.outStatistics = [
+    S.query !== void 0 && (a !== L.NoAggregation ? (I = b, S.query.outStatistics = [
       {
         ...f.query?.outStatistics?.[0] ?? {},
         onStatisticField: F,
         outStatisticFieldName: b,
-        statisticType: r
+        statisticType: a
       }
     ]) : delete S.query.outStatistics), S.y = I;
-    const T = a.series.find(
-      (h) => h.query?.outStatistics?.[0]?.onStatisticField === F && h.query.where === void 0 || h.query?.outStatistics === void 0 && (h.y === F || h.x === F)
+    const T = r.series.find(
+      (x) => x.query?.outStatistics?.[0]?.onStatisticField === F && x.query.where === void 0 || x.query?.outStatistics === void 0 && (x.y === F || x.x === F)
     );
     if (T !== void 0 && typeof T.y == "string" && T.y.trim() !== "") {
-      (A(S) && A(T) || v(S) && v(T)) && j(S, T), a.colorMatch || (O(S) && O(T) ? S.fillSymbol = T.fillSymbol : (A(S) && A(T) || v(S) && v(T)) && (S.lineSymbol = T.lineSymbol, S.markerSymbol = T.markerSymbol), p = !0);
-      const h = X({
-        config: a,
+      (A(S) && A(T) || v(S) && v(T)) && j(S, T), r.colorMatch || (q(S) && q(T) ? S.fillSymbol = T.fillSymbol : (A(S) && A(T) || v(S) && v(T)) && (S.lineSymbol = T.lineSymbol, S.markerSymbol = T.markerSymbol), p = !0);
+      const x = U({
+        config: r,
         xAxisField: e,
-        aggregationType: r,
-        layerInfo: i,
-        seriesIndex: l,
+        aggregationType: a,
+        layerInfo: s,
+        seriesIndex: o,
         commonStrings: n
       });
-      S.id = T.id, T.id !== h.id && T.name !== h.name && (S.id = T.id, S.name = T.name), S.assignToSecondValueAxis = T.assignToSecondValueAxis, S.type === B.HeatSeries && T.type === B.HeatSeries && (S.y = T.y, S.heatRulesType = T.heatRulesType);
+      S.id = T.id, T.id !== x.id && T.name !== x.name && (S.id = T.id, S.name = T.name), S.assignToSecondValueAxis = T.assignToSecondValueAxis, S.type === h.HeatSeries && T.type === h.HeatSeries && (S.y = T.y, S.heatRulesType = T.heatRulesType);
     }
-    m.push(S);
+    d.push(S);
   }
-  const u = m.filter((l) => O(l)), d = m.filter(
-    (l) => A(l) || v(l)
-  ), y = a.series.filter((l) => O(l)), g = a.series.filter(
-    (l) => A(l) || v(l)
+  const u = d.filter((o) => q(o)), y = d.filter(
+    (o) => A(o) || v(o)
+  ), m = r.series.filter((o) => q(o)), g = r.series.filter(
+    (o) => A(o) || v(o)
   );
-  return y.length === 1 && u.length === 1 && !a.colorMatch && (O(y[0]) && O(u[0]) && (u[0].fillSymbol = y[0].fillSymbol), p = !0), g.length === 1 && d.length === 1 && ((A(g[0]) && A(d[0]) || v(g[0]) && v(d[0])) && j(d[0], g[0]), a.colorMatch || ((A(g[0]) && A(d[0]) || v(g[0]) && v(d[0])) && (d[0].lineSymbol = g[0].lineSymbol, d[0].markerSymbol = g[0].markerSymbol), p = !0)), a.colorMatch = !p, m;
+  return m.length === 1 && u.length === 1 && !r.colorMatch && (q(m[0]) && q(u[0]) && (u[0].fillSymbol = m[0].fillSymbol), p = !0), g.length === 1 && y.length === 1 && ((A(g[0]) && A(y[0]) || v(g[0]) && v(y[0])) && j(y[0], g[0]), r.colorMatch || ((A(g[0]) && A(y[0]) || v(g[0]) && v(y[0])) && (y[0].lineSymbol = g[0].lineSymbol, y[0].markerSymbol = g[0].markerSymbol), p = !0)), r.colorMatch = !p, d;
 }
-function Si(t) {
-  const { aggregationType: e, config: s, layerInfo: r, commonStrings: a } = t, { layerFieldsInfo: i, layer: n } = r, o = Y(s), c = J(s), m = G(s), p = ee(s, r, a), u = Le(s, r, a);
-  if (s.series.forEach((d, y) => {
-    const g = Q({
-      config: s,
-      xAxisField: o,
+function Os(t) {
+  const { aggregationType: e, config: i, layerInfo: a, commonStrings: r } = t, { layerFieldsInfo: s, layer: n } = a, l = X(i), c = re(i), d = ae(i), p = ne(i, a, r), u = We(i, a, r);
+  if (i.series.forEach((y, m) => {
+    const g = te({
+      config: i,
+      xAxisField: l,
       numericFields: c,
       aggregationType: e,
-      splitByField: m,
+      splitByField: d,
       layer: n,
-      seriesIndex: y,
-      numericFieldIndex: y,
-      fieldList: i
+      seriesIndex: m,
+      numericFieldIndex: m,
+      fieldList: s
     }).name;
-    d.y = g;
-    const l = ve({
-      splitByField: m,
+    y.y = g;
+    const o = Me({
+      splitByField: d,
       numericFields: c,
       layer: n,
-      seriesIndex: y
-    }), f = d.query?.outStatistics?.[0]?.onStatisticField ?? l;
-    d.query = {
-      ...d.query,
+      seriesIndex: m
+    }), f = y.query?.outStatistics?.[0]?.onStatisticField ?? o;
+    y.query = {
+      ...y.query,
       outStatistics: e === L.NoAggregation ? void 0 : [
         {
-          ...d.query?.outStatistics?.[0],
+          ...y.query?.outStatistics?.[0],
           outStatisticFieldName: g,
           statisticType: e,
           onStatisticField: f
         }
       ]
-    }, "temporalBinning" in d && d.temporalBinning !== void 0 && (d.temporalBinning.nullPolicy = e === L.NoAggregation ? $.Interpolate : $.Null), e === L.NoAggregation && Nt(s);
-  }), p && s.title && (s.title.content.text = Z(s, r, a)), u && s.series[0].type !== B.HeatSeries) {
-    const d = le({
-      config: s,
-      layerInfo: r,
-      commonStrings: a,
+    }, "temporalBinning" in y && y.temporalBinning !== void 0 && (y.temporalBinning.nullPolicy = e === L.NoAggregation ? $.Interpolate : $.Null), e === L.NoAggregation && Yt(i);
+  }), p && i.title && (i.title.content.text = Z(i, a, r)), u && i.series[0].type !== h.HeatSeries) {
+    const y = pe({
+      config: i,
+      layerInfo: a,
+      commonStrings: r,
       numericFields: c,
       aggregationType: e
     });
-    E(s, 1, d);
+    E(i, 1, y);
   }
 }
-function _t(t) {
+function di(t) {
   const {
     splitByField: e,
-    xAxisField: s,
-    numericFields: r,
-    aggregationType: a,
-    config: i,
+    xAxisField: i,
+    numericFields: a,
+    aggregationType: r,
+    config: s,
     layerInfo: n,
-    commonStrings: o,
+    commonStrings: l,
     splitByFieldInfos: c
-  } = t, { layer: m, layerFieldsInfo: p } = n, { categoriesArray: u, splitByFieldType: d } = c, y = ve({
+  } = t, { layer: d, layerFieldsInfo: p } = n, { categoriesArray: u, splitByFieldType: y } = c, m = Me({
     splitByField: e,
-    numericFields: r,
-    layer: m,
+    numericFields: a,
+    layer: d,
     seriesIndex: 0
   });
-  let g = [], l = !1;
+  let g = [], o = !1;
   if (u.length === 0) {
-    g = Ie({
-      xAxisField: s,
-      numericFields: r,
-      aggregationType: a,
-      config: i,
+    g = Ee({
+      xAxisField: i,
+      numericFields: a,
+      aggregationType: r,
+      config: s,
       layerInfo: n,
-      commonStrings: o
+      commonStrings: l
     });
     for (const f of g)
       f.query && (f.query.where = `${e}=''`);
   } else
     for (let f = 0; f < u.length; f += 1) {
-      const x = u[f], b = Q({
-        config: i,
-        xAxisField: s,
-        numericFields: r,
-        aggregationType: a,
+      const B = u[f], b = te({
+        config: s,
+        xAxisField: i,
+        numericFields: a,
+        aggregationType: r,
         layer: n.layer,
         seriesIndex: f,
         splitByField: e,
         fieldList: p
-      }).name, F = X({
-        config: i,
-        xAxisField: s,
-        aggregationType: a,
+      }).name, F = U({
+        config: s,
+        xAxisField: i,
+        aggregationType: r,
         layerInfo: n,
         seriesIndex: f,
-        commonStrings: o
-      }), S = he({
+        commonStrings: l
+      }), S = Ne({
         queryObject: n.layer,
         fieldName: e,
-        fieldValue: x ?? ""
-      }), I = `${x}`, h = {
+        fieldValue: B ?? ""
+      }), I = `${B}`, x = {
         ...F,
         id: I,
         name: S ?? I,
         y: b,
         query: {
           ...F.query,
-          where: `${e}=${d === dt.String && x !== null ? `'${x}'` : x}`,
-          outStatistics: a !== L.NoAggregation ? [
+          where: `${e}=${y === Bt.String && B !== null ? `'${B}'` : B}`,
+          outStatistics: r !== L.NoAggregation ? [
             {
               ...F.query?.outStatistics?.[0] ?? {},
-              onStatisticField: y,
+              onStatisticField: m,
               outStatisticFieldName: b,
-              statisticType: a
+              statisticType: r
             }
           ] : void 0
         }
-      }, V = i.series.find(
-        (N) => String(be(N)).trim().replace(/'/gu, "") === I
+      }, V = s.series.find(
+        (N) => String(Pe(N)).trim().replace(/'/gu, "") === I
       );
-      V !== void 0 && ((A(h) && A(V) || v(h) && v(V)) && j(h, V), i.colorMatch || (O(h) && O(V) ? h.fillSymbol = V.fillSymbol : (A(h) && A(V) || v(h) && v(V)) && (h.lineSymbol = V.lineSymbol, h.markerSymbol = V.markerSymbol), l = !0), h.id = V.id, h.name = V.name, h.assignToSecondValueAxis = V.assignToSecondValueAxis), h.query && (h.query.fetchNullValues = i.series.some((N) => N.query?.fetchNullValues)), g.push(h);
+      V !== void 0 && ((A(x) && A(V) || v(x) && v(V)) && j(x, V), s.colorMatch || (q(x) && q(V) ? x.fillSymbol = V.fillSymbol : (A(x) && A(V) || v(x) && v(V)) && (x.lineSymbol = V.lineSymbol, x.markerSymbol = V.markerSymbol), o = !0), x.id = V.id, x.name = V.name, x.assignToSecondValueAxis = V.assignToSecondValueAxis), x.query && (x.query.fetchNullValues = s.series.some((N) => N.query?.fetchNullValues)), g.push(x);
     }
-  return i.colorMatch = !l, g;
+  return s.colorMatch = !o, g;
 }
-const Fi = (t) => {
+const ks = (t) => {
   const {
     xAxisFieldName: e,
-    splitByField: s,
-    numericFields: r,
-    aggregationType: a,
-    config: i,
+    splitByField: i,
+    numericFields: a,
+    aggregationType: r,
+    config: s,
     layerInfo: n,
-    commonStrings: o,
+    commonStrings: l,
     splitByFieldInfos: c
-  } = t, { layerFieldsInfo: m } = n ?? {}, p = K(i), u = At(i), d = Y(p), y = m.find((C) => C.name === d), g = p.series[0].query?.fetchNullValues, l = "nullCategory" in p.series?.[0] ? p.series[0].nullCategory : void 0, f = p.series[0]?.query === void 0, x = m.find((C) => C.name === e), b = ee(p, n, o), F = Le(p, n, o), S = Qt(p, n);
-  let I = Fe(i);
-  const T = p.series.some((C) => O(C)), h = ht(p.series), V = Tt(p.series), N = {};
-  M(p) && (N.classBreaksRules = p.series[0]?.classBreaksRules, N.xTemporalBinning = p.series[0]?.xTemporalBinning, N.yTemporalBinning = p.series[0]?.yTemporalBinning, N.emptyCells = p.series[0]?.emptyCells, N.nullPolicy = p.nullPolicy);
-  let te = !1;
-  if (rt(x) ? I = ge() : !ye(y) && ye(x) ? I = fe() : !H(y) && H(x) ? (I = fe(), te = !0) : H(y) && !H(x) && (T ? I = ge() : I = Ft(), te = !0), I !== void 0 && Oe(i, o, I), u === 0 && (i.series = [
-    X({ config: i, xAxisField: e, aggregationType: a, layerInfo: n, commonStrings: o })
-  ]), i.series.forEach((C) => {
+  } = t, { layerFieldsInfo: d } = n ?? {}, p = J(s), u = Pt(s), y = X(p), m = d.find((C) => C.name === y), g = p.series[0].query?.fetchNullValues, o = "nullCategory" in p.series?.[0] ? p.series[0].nullCategory : void 0, f = p.series[0]?.query === void 0, B = d.find((C) => C.name === e), b = ne(p, n, l), F = We(p, n, l), S = yi(p, n);
+  let I = Ve(s);
+  const T = p.series.some((C) => q(C)), x = Nt(p.series), V = Ot(p.series), N = {};
+  Y(p) && (N.classBreaksRules = p.series[0]?.classBreaksRules, N.xTemporalBinning = p.series[0]?.xTemporalBinning, N.yTemporalBinning = p.series[0]?.yTemporalBinning, N.emptyCells = p.series[0]?.emptyCells, N.nullPolicy = p.nullPolicy);
+  let le = !1;
+  if (_(B) ? I = de() : !Q(m) && Q(B) ? I = z() : !W(m) && W(B) ? (I = z(), le = !0) : W(m) && !W(B) && (T ? I = de() : I = Vt(), le = !0), I !== void 0 && je(s, l, I), u === 0 && (s.series = [
+    U({ config: s, xAxisField: e, aggregationType: r, layerInfo: n, commonStrings: l })
+  ]), s.series.forEach((C) => {
     C.x = e, C.query !== void 0 && (C.query.groupByFieldsForStatistics = [e]);
-  }), s === "" || r.length > 1 ? Te({
+  }), i === "" || a.length > 1 ? Oe({
     fieldName: e,
-    numericFields: r,
-    fieldList: m
-  }) ? i.series = Kt({
-    config: i,
+    numericFields: a,
+    fieldList: d
+  }) ? s.series = ci({
+    config: s,
     layerInfo: n,
     xAxisField: e,
-    numericFields: r,
-    aggregationType: a,
-    commonStrings: o
-  }) : i.series = Ie({
-    config: i,
+    numericFields: a,
+    aggregationType: r,
+    commonStrings: l
+  }) : s.series = Ee({
+    config: s,
     layerInfo: n,
     xAxisField: e,
-    numericFields: r,
-    aggregationType: a,
-    commonStrings: o
-  }) : c && (i.series = _t({
-    config: i,
+    numericFields: a,
+    aggregationType: r,
+    commonStrings: l
+  }) : c && (s.series = di({
+    config: s,
     layerInfo: n,
-    splitByField: s,
+    splitByField: i,
     xAxisField: e,
-    numericFields: r,
-    aggregationType: a,
-    commonStrings: o,
+    numericFields: a,
+    aggregationType: r,
+    commonStrings: l,
     splitByFieldInfos: c
-  })), S && i.series[0].type !== B.HeatSeries) {
-    const C = D(m, e);
-    E(i, 0, C);
+  })), S && s.series[0].type !== h.HeatSeries) {
+    const C = P(d, e);
+    E(s, 0, C);
   }
-  if (F && i.series[0].type !== B.HeatSeries) {
-    const C = le({
-      config: i,
+  if (F && s.series[0].type !== h.HeatSeries) {
+    const C = pe({
+      config: s,
       layerInfo: n,
-      commonStrings: o,
-      numericFields: r,
-      aggregationType: a
+      commonStrings: l,
+      numericFields: a,
+      aggregationType: r
     });
-    E(i, 1, C);
+    E(s, 1, C);
   }
-  if (b && i.title && (i.title.content.text = Z(i, n, o)), R({ config: i, value: null, axisIndex: 1, isMax: !1 }), R({ config: i, value: null, axisIndex: 1, isMax: !0 }), Ht({ numericFields: r, aggregationType: a, config: i, layerInfo: n }), (h || V) && (R({ config: i, value: null, axisIndex: 0, isMax: !1 }), R({ config: i, value: null, axisIndex: 0, isMax: !0 }), te && a !== L.NoAggregation)) {
-    const C = I?.type === B.DateAxisFormat ? $.Null : $.Interpolate;
-    Vt(C, i);
+  if (b && s.title && (s.title.content.text = Z(s, n, l)), k({ config: s, value: null, axisIndex: 1, isMax: !1 }), k({ config: s, value: null, axisIndex: 1, isMax: !0 }), ui({ numericFields: a, aggregationType: r, config: s, layerInfo: n }), (x || V) && (k({ config: s, value: null, axisIndex: 0, isMax: !1 }), k({ config: s, value: null, axisIndex: 0, isMax: !0 }), le && r !== L.NoAggregation)) {
+    const C = I?.type === h.DateAxisFormat ? $.Null : $.Interpolate;
+    Wt(C, s);
   }
-  M(i) && (i.series[0].classBreaksRules = N.classBreaksRules, i.series[0].xTemporalBinning = N.xTemporalBinning, i.series[0].yTemporalBinning = N.yTemporalBinning, i.series[0].emptyCells = N.emptyCells, i.nullPolicy = N.nullPolicy), f ? i.series.forEach((C) => {
+  Y(s) && (s.series[0].classBreaksRules = N.classBreaksRules, s.series[0].xTemporalBinning = N.xTemporalBinning, s.series[0].yTemporalBinning = N.yTemporalBinning, s.series[0].emptyCells = N.emptyCells, s.nullPolicy = N.nullPolicy, Re({ commonStrings: l, config: s, layerInfo: n })), f ? s.series.forEach((C) => {
     delete C.query;
-  }) : g && i.series.forEach((C) => {
+  }) : g && s.series.forEach((C) => {
     C.query && (C.query.fetchNullValues = g);
-  }), l && i.series.forEach((C) => {
-    (C.type === B.BarSeries || C.type === B.LineSeries || C.type === B.RadarSeries) && (C.nullCategory = l);
-  }), i.series.forEach((C) => {
-    const Ve = p.series.find((Ne) => Ne.id === C.id)?.visible;
-    C.visible = Ve;
+  }), o && s.series.forEach((C) => {
+    (C.type === h.BarSeries || C.type === h.LineSeries || C.type === h.RadarSeries) && (C.nullCategory = o);
+  }), s.series.forEach((C) => {
+    const Ye = p.series.find(($e) => $e.id === C.id)?.visible;
+    C.visible = Ye;
   });
 }, j = (t, e) => {
   t.markerVisible = e.markerVisible, t.lineSmoothed = e.lineSmoothed, t.showArea = e.showArea, t.areaColor = e.areaColor, t.stackNegativeValuesToBaseline = e.stackNegativeValuesToBaseline, e.lineSymbol && (t.lineSymbol = { ...e.lineSymbol, color: t.lineSymbol?.color }), e.markerSymbol && (t.markerSymbol = {
     ...e.markerSymbol,
     color: t.markerSymbol?.color
   });
-}, hi = (t) => {
-  const { config: e, seriesIndex: s, layerInfo: r, commonStrings: a } = t, i = e.series?.[s], n = G(e);
-  let o;
-  if (_(e.series) === P.BarAndLineFromFields)
-    o = a.axisLabels.values;
-  else if (qe(n)) {
-    const m = i.query?.outStatistics?.[0]?.onStatisticField;
-    m !== void 0 && m !== U(r.layer).idField && (o = D(r.layerFieldsInfo, m));
+}, Ds = (t) => {
+  const { config: e, seriesIndex: i, layerInfo: a, commonStrings: r } = t, s = e.series?.[i], n = ae(e);
+  let l;
+  if (ee(e.series) === w.BarAndLineFromFields)
+    l = r.axisLabels.values;
+  else if (He(n)) {
+    const d = s.query?.outStatistics?.[0]?.onStatisticField;
+    d !== void 0 && d !== K(a.layer).idField && (l = P(a.layerFieldsInfo, d));
   } else {
-    const m = String(be(i)).trim().replace(/'/gu, "");
-    o = he({
-      queryObject: r.layer,
+    const d = String(Pe(s)).trim().replace(/'/gu, "");
+    l = Ne({
+      queryObject: a.layer,
       fieldName: n,
-      fieldValue: m ?? ""
-    }) ?? m;
+      fieldValue: d ?? ""
+    }) ?? d;
   }
-  return o ?? i.id;
-}, Ti = (t, e) => {
-  if (M(e))
-    Ut(t, e);
+  return l ?? s.id;
+}, qs = (t, e) => {
+  if (Y(e))
+    ai(t, e);
   else {
     e.orderOptions ??= {};
-    const s = e.orderOptions?.data?.orderType;
-    ne(e)[0] === se.customSort && s === q.Category && (e.orderOptions.data = {
-      orderType: q.Category,
+    const i = e.orderOptions?.data?.orderType;
+    me(e)[0] === oe.customSort && i === O.Category && (e.orderOptions.data = {
+      orderType: O.Category,
       orderBy: [...t]
     });
   }
-}, xi = async (t) => {
-  const { config: e, layerInfo: s, errorStrings: r } = t, a = Y(e), i = Fe(e)?.type, n = J(e), o = _(e.series);
+}, Rs = async (t) => {
+  const { config: e, layerInfo: i, errorStrings: a } = t, r = X(e), s = Ve(e)?.type, n = re(e), l = ee(e.series);
   let c = [];
-  return i === B.CategoryAxisFormat && (o === P.BarAndLineFromFields || a === ie ? c = n.map((m) => D(s?.layerFieldsInfo, m)) : a.trim() !== "" && a !== ie && s !== void 0 && (c = await ke({
-    layerInfo: s,
+  return s === h.CategoryAxisFormat && (l === w.BarAndLineFromFields || r === ue ? c = n.map((d) => P(i?.layerFieldsInfo, d)) : r.trim() !== "" && r !== ue && i !== void 0 && (c = await Ue({
+    layerInfo: i,
     config: e,
-    category: a,
-    errorStrings: r
+    category: r,
+    errorStrings: a
   }))), c;
 };
-function ee(t, e, s) {
-  const r = Z(t, e, s), a = vt(t), i = z(t);
-  return r === a || i;
+function ne(t, e, i) {
+  const a = Z(t, e, i), r = wt(t), s = ie(t);
+  return a === r || s;
 }
-function Le(t, e, s) {
-  const r = le({
+function We(t, e, i) {
+  const a = pe({
     config: t,
     layerInfo: e,
-    commonStrings: s,
-    numericFields: J(t),
-    aggregationType: Ae(t)
-  }), a = ue(1, t), i = z(t);
-  return r === a || i;
+    commonStrings: i,
+    numericFields: re(t),
+    aggregationType: we(t)
+  }), r = se(1, t), s = ie(t);
+  return a === r || s;
 }
-function Qt(t, e) {
-  const s = D(e.layerFieldsInfo, Y(t)), r = ue(0, t), a = z(t);
-  return s === r || a;
+function yi(t, e) {
+  const i = P(e.layerFieldsInfo, X(t)), a = se(0, t), r = ie(t);
+  return i === a || r;
 }
-function Bi(t) {
-  return k(t.series[0]) ? t.series[0].binTemporalData ?? !0 : !1;
+function Ps(t) {
+  return D(t.series[0]) ? t.series[0].binTemporalData ?? !0 : !1;
 }
-function Ci(t, e) {
-  e?.series.forEach((s) => {
-    (s?.type === B.BarSeries || s?.type === B.LineSeries) && (s.binTemporalData = t, t ? s.temporalBinning = {
-      unit: ae.Day,
+function ws(t, e) {
+  e?.series.forEach((i) => {
+    (i?.type === h.BarSeries || i?.type === h.LineSeries) && (i.binTemporalData = t, t ? i.temporalBinning = {
+      unit: ce.Day,
       size: 0,
-      timeAggregationType: ut.Start,
+      timeAggregationType: ht.Start,
       trimIncompleteTimeInterval: !0,
       nullPolicy: $.Null
-    } : delete s.temporalBinning);
+    } : delete i.temporalBinning);
   });
 }
 export {
-  Xs as $,
-  xi as A,
-  Ti as B,
-  Fi as C,
-  Bi as D,
-  Ci as E,
+  es as $,
+  Rs as A,
+  qs as B,
+  ks as C,
+  Ps as D,
+  ws as E,
   Z as F,
-  jt as G,
-  Ds as H,
-  ri as I,
-  ni as J,
-  ws as K,
-  Ps as L,
-  Ms as M,
-  Es as N,
-  li as O,
-  oi as P,
-  ui as Q,
-  ci as R,
-  mi as S,
-  pi as T,
-  gi as U,
-  fi as V,
-  Dt as W,
-  Vs as X,
-  Ns as Y,
-  Ws as Z,
-  $s as _,
-  As as a,
-  Ys as a0,
-  Rs as a1,
-  qs as a2,
-  Os as a3,
-  ks as a4,
-  Zs as a5,
-  Hs as a6,
-  Ks as a7,
-  _s as a8,
-  Us as a9,
-  js as aa,
-  Qs as ab,
-  Zt as ac,
-  zs as ad,
-  Gs as ae,
-  Js as af,
-  ei as ag,
-  ti as ah,
-  si as ai,
-  yi as aj,
-  di as ak,
-  ii as al,
-  ai as am,
-  Bs as b,
-  Cs as c,
-  J as d,
-  G as e,
-  Ls as f,
-  Ae as g,
-  hi as h,
-  vs as i,
-  gs as j,
-  Lt as k,
-  It as l,
-  hs as m,
-  fs as n,
-  Ts as o,
-  Is as p,
-  Ss as q,
-  Pt as r,
-  Ce as s,
-  xs as t,
-  bs as u,
-  Fs as v,
-  Vt as w,
-  Nt as x,
-  Si as y,
-  ne as z
+  Re as G,
+  ti as H,
+  zi as I,
+  xs as J,
+  hs as K,
+  ii as L,
+  Gi as M,
+  si as N,
+  Ji as O,
+  Ts as P,
+  Bs as Q,
+  Cs as R,
+  bs as S,
+  Is as T,
+  Ls as U,
+  Vs as V,
+  jt as W,
+  Ns as X,
+  Ui as Y,
+  ji as Z,
+  ts as _,
+  Yi as a,
+  ss as a0,
+  is as a1,
+  Zi as a2,
+  Ki as a3,
+  Qi as a4,
+  _i as a5,
+  ns as a6,
+  ls as a7,
+  os as a8,
+  us as a9,
+  rs as aa,
+  as as ab,
+  cs as ac,
+  ri as ad,
+  ds as ae,
+  ys as af,
+  ms as ag,
+  ps as ah,
+  gs as ai,
+  fs as aj,
+  vs as ak,
+  As as al,
+  Ss as am,
+  Fs as an,
+  Mi as b,
+  Ei as c,
+  re as d,
+  ae as e,
+  Xi as f,
+  we as g,
+  Ds as h,
+  $i as i,
+  Oi as j,
+  Et as k,
+  Mt as l,
+  Ri as m,
+  ki as n,
+  Pi as o,
+  Hi as p,
+  Di as q,
+  Kt as r,
+  qe as s,
+  wi as t,
+  Wi as u,
+  qi as v,
+  Wt as w,
+  Yt as x,
+  Os as y,
+  me as z
 };