@arcgis/charts-components 5.1.0-next.0 → 5.1.0-next.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (145) hide show
  1. package/dist/cdn/{I4JPIKWZ.js → 2FVGG2EI.js} +1 -1
  2. package/dist/cdn/{Z3ATQCGU.js → 2TSZGBRW.js} +1 -1
  3. package/dist/cdn/{N7QH3COK.js → 3DSUDPMW.js} +1 -1
  4. package/dist/cdn/{4OI742MI.js → 3H63O632.js} +1 -1
  5. package/dist/cdn/{VPF4DANX.js → 3VYTY4CH.js} +1 -1
  6. package/dist/cdn/{F7EELFJY.js → 46NT4YQ5.js} +1 -1
  7. package/dist/cdn/{4SDMBWIH.js → 4NQ4FOPA.js} +1 -1
  8. package/dist/cdn/{GUN4GTO3.js → 4ONBF7EX.js} +1 -1
  9. package/dist/cdn/4XC2ZKSZ.js +2 -0
  10. package/dist/cdn/527DICLD.js +2 -0
  11. package/dist/cdn/{6AMFQCS7.js → 54S7WK2Q.js} +1 -1
  12. package/dist/cdn/{IMMCY2GO.js → 5F7P2IRB.js} +1 -1
  13. package/dist/cdn/{I45WQ4BL.js → 5GIBJIKZ.js} +1 -1
  14. package/dist/cdn/{YBWIUGMX.js → 5RFEFP2G.js} +1 -1
  15. package/dist/cdn/{VLDV4SLC.js → 6HU6FAC6.js} +1 -1
  16. package/dist/cdn/{H2ZHJTT5.js → 6MUSVNGM.js} +1 -1
  17. package/dist/cdn/{B227HROY.js → 6WQPKBUS.js} +1 -1
  18. package/dist/cdn/734N3Q42.js +2 -0
  19. package/dist/cdn/{5UWCB534.js → 7GVHJYQ4.js} +1 -1
  20. package/dist/cdn/{RREICBPO.js → 7J7IYWG7.js} +19 -19
  21. package/dist/cdn/{PGRROSLP.js → 7OIBIDJX.js} +1 -1
  22. package/dist/cdn/{MFY2WNGC.js → 7SSRNOEZ.js} +1 -1
  23. package/dist/cdn/A43B7S7N.js +2 -0
  24. package/dist/cdn/{YFQBIEH6.js → AT5TLS5G.js} +1 -1
  25. package/dist/cdn/B6AQ5E4L.js +2 -0
  26. package/dist/cdn/{GB3TK5D3.js → BJPCRXMJ.js} +1 -1
  27. package/dist/cdn/BUTXND3Y.js +2 -0
  28. package/dist/cdn/{2BIDUUM3.js → BW44TT3O.js} +1 -1
  29. package/dist/cdn/{UPWTKME3.js → CKOTQVMD.js} +1 -1
  30. package/dist/cdn/{TCKWKRVQ.js → CLZB5JAL.js} +1 -1
  31. package/dist/cdn/{MAYX7C4V.js → D5EFLFGK.js} +1 -1
  32. package/dist/cdn/DFSUGOC2.js +2 -0
  33. package/dist/cdn/{7XB4DP2Y.js → DGBFUPHF.js} +1 -1
  34. package/dist/cdn/DGTF5KBL.js +2 -0
  35. package/dist/cdn/{7TA3GQ2P.js → DLWGXLTP.js} +1 -1
  36. package/dist/cdn/{VQGWUSUK.js → EGTQDORP.js} +1 -1
  37. package/dist/cdn/{RBLN6H3R.js → ESHE4EJO.js} +1 -1
  38. package/dist/cdn/{XVD4CGMV.js → EVWSDR7F.js} +1 -1
  39. package/dist/cdn/{YP55GB27.js → F7YBMSC7.js} +1 -1
  40. package/dist/cdn/{C3QBGU3R.js → FVHKQX4O.js} +1 -1
  41. package/dist/cdn/{ZMTNSPCX.js → G2EFW5BS.js} +1 -1
  42. package/dist/cdn/{ACIPSEQP.js → GS4YJSDV.js} +1 -1
  43. package/dist/cdn/{UVEAGNF2.js → GTMWPA5J.js} +1 -1
  44. package/dist/cdn/{XAWIW6KZ.js → GU6JH3VZ.js} +3 -3
  45. package/dist/cdn/{JYAZY7C6.js → GWYSKUDT.js} +1 -1
  46. package/dist/cdn/{T6J2NNJR.js → HAJ2VWEU.js} +1 -1
  47. package/dist/cdn/{GV3FPWSE.js → HI6AE5XG.js} +1 -1
  48. package/dist/cdn/IHPHZSVH.js +2 -0
  49. package/dist/cdn/{OKE67HPM.js → ITVP53KT.js} +1 -1
  50. package/dist/cdn/JDUDNQNC.js +2 -0
  51. package/dist/cdn/{NZKAMZX6.js → JLC5Q7Y2.js} +1 -1
  52. package/dist/cdn/{CSMPPQK6.js → JQFKP5BO.js} +1 -1
  53. package/dist/cdn/{4YGTK6R4.js → KBCK3TOS.js} +1 -1
  54. package/dist/cdn/{OBF3ZYVJ.js → KKUG22EI.js} +1 -1
  55. package/dist/cdn/{AE43AFN2.js → KZ7WEJMS.js} +1 -1
  56. package/dist/cdn/LA5QA6QE.js +2 -0
  57. package/dist/cdn/{7OIBV6LX.js → M6U6FZYV.js} +1 -1
  58. package/dist/cdn/{5SBX2OSZ.js → NO66QM4U.js} +1 -1
  59. package/dist/cdn/{YHXUQR6R.js → NP2HK66D.js} +1 -1
  60. package/dist/cdn/{ITMPO5LO.js → NRBBCJMI.js} +1 -1
  61. package/dist/cdn/ODSBX4UB.js +2 -0
  62. package/dist/cdn/{Z5OGHBTB.js → OFNVRKLL.js} +1 -1
  63. package/dist/cdn/{OLGKBPS4.js → OH623XHQ.js} +1 -1
  64. package/dist/cdn/OOYDYFQL.js +2 -0
  65. package/dist/cdn/{VCDTXXBB.js → PQQQPD6E.js} +1 -1
  66. package/dist/cdn/{N5LXTC5F.js → QBDBBEMO.js} +1 -1
  67. package/dist/cdn/{RESJUXIH.js → QES24ZNV.js} +1 -1
  68. package/dist/cdn/QGBDD3VP.js +2 -0
  69. package/dist/cdn/{FGQCHT3Y.js → QITSU7UB.js} +1 -1
  70. package/dist/cdn/{XPATRR6S.js → R65NAU4T.js} +1 -1
  71. package/dist/cdn/{CGRJSESJ.js → R6PSD7B7.js} +1 -1
  72. package/dist/cdn/{CF4MUKBD.js → RBW7HCYN.js} +1 -1
  73. package/dist/cdn/{E4Z7JPW7.js → RHEU3VW6.js} +1 -1
  74. package/dist/cdn/ROJ67ATL.js +2 -0
  75. package/dist/cdn/{E2XSIMND.js → RVDUQNQH.js} +1 -1
  76. package/dist/cdn/{ILN66JCQ.js → S6IN2PJK.js} +1 -1
  77. package/dist/cdn/{UR4SN4J4.js → SBBG2LAI.js} +1 -1
  78. package/dist/cdn/{3KIKTBU4.js → SM5V7JW4.js} +1 -1
  79. package/dist/cdn/{SGOQQYBY.js → SPAXIJWK.js} +1 -1
  80. package/dist/cdn/{UKLAAPT4.js → STULUM25.js} +1 -1
  81. package/dist/cdn/{L7BKIZJN.js → UJ3X5GAK.js} +1 -1
  82. package/dist/cdn/{EOT7WEOM.js → UUYAX5P7.js} +1 -1
  83. package/dist/cdn/{NKTG3HYP.js → VCBEQAWJ.js} +1 -1
  84. package/dist/cdn/{INA4MWOS.js → VFC4KZRP.js} +1 -1
  85. package/dist/cdn/{DSCSQG33.js → VMAJ5W4A.js} +1 -1
  86. package/dist/cdn/{7HHTWL5X.js → W32EPRL3.js} +1 -1
  87. package/dist/cdn/{JEOHGL3P.js → W7THVT7Z.js} +1 -1
  88. package/dist/cdn/WHQ6EWYY.js +2 -0
  89. package/dist/cdn/{WZJQSJPK.js → XINBF3UQ.js} +1 -1
  90. package/dist/cdn/{V3NRWE2B.js → XRYZYAL4.js} +1 -1
  91. package/dist/cdn/{UNGIAYCA.js → XYKNQZFD.js} +1 -1
  92. package/dist/cdn/{CCBSYUDL.js → Y3U6VC3K.js} +1 -1
  93. package/dist/cdn/{O3LWVBLQ.js → YBSBFAGE.js} +1 -1
  94. package/dist/cdn/{A2TYB4C2.js → YQC2FUWM.js} +1 -1
  95. package/dist/cdn/{7F454N3C.js → Z4B2NHJI.js} +2 -2
  96. package/dist/cdn/{TW7SDPY6.js → ZTF5EW2C.js} +1 -1
  97. package/dist/cdn/{HOPCZKQO.js → ZYEUKPGT.js} +1 -1
  98. package/dist/cdn/index.js +1 -1
  99. package/dist/chunks/action-bar-utils.js +9 -8
  100. package/dist/chunks/box-plot-data.js +1 -1
  101. package/dist/chunks/chart-ui-utils.js +52 -48
  102. package/dist/chunks/chart-ui-utils2.js +1 -1
  103. package/dist/chunks/class-breaks.js +159 -94
  104. package/dist/chunks/data.js +10 -9
  105. package/dist/chunks/heat-chart-model.js +83 -66
  106. package/dist/chunks/index.js +117 -109
  107. package/dist/chunks/model-setter.js +1 -1
  108. package/dist/chunks/model-with-guides.js +7 -6
  109. package/dist/chunks/pie-chart-data.js +1 -1
  110. package/dist/chunks/radar-chart-model.js +9 -9
  111. package/dist/chunks/serial-chart-data.js +315 -306
  112. package/dist/chunks/serial-chart-model.js +4 -4
  113. package/dist/chunks/web-component-utils.js +32 -32
  114. package/dist/components/arcgis-chart/customElement.d.ts +1 -1
  115. package/dist/components/arcgis-chart/customElement.js +845 -842
  116. package/dist/components/arcgis-charts-config-bar-chart-data/customElement.js +1 -0
  117. package/dist/components/arcgis-charts-config-create-flow/customElement.js +120 -112
  118. package/dist/components/arcgis-charts-config-guide/customElement.js +1 -0
  119. package/dist/components/arcgis-charts-config-heat-chart-data/customElement.js +111 -101
  120. package/dist/components/arcgis-charts-config-heat-chart-data/index.js +2 -0
  121. package/dist/components/arcgis-charts-config-heat-chart-popover/customElement.js +28 -15
  122. package/dist/docs/api.json +1 -1
  123. package/dist/docs/docs.json +1 -1
  124. package/dist/docs/vscode.html-custom-data.json +1 -1
  125. package/dist/docs/web-types.json +1 -1
  126. package/dist/loader.js +1 -1
  127. package/dist/model/heat-chart-model/heat-chart-model.d.ts +7 -0
  128. package/dist/utils/ui/chart-ui-utils.d.ts +6 -3
  129. package/package.json +4 -4
  130. package/dist/cdn/BJJLSSQL.js +0 -2
  131. package/dist/cdn/CSHLYYDR.js +0 -2
  132. package/dist/cdn/DISBHZRX.js +0 -2
  133. package/dist/cdn/FGQ6QTNI.js +0 -2
  134. package/dist/cdn/FIBU5QUG.js +0 -2
  135. package/dist/cdn/GRFJADFY.js +0 -2
  136. package/dist/cdn/MMVAIEM3.js +0 -2
  137. package/dist/cdn/OFZOPSWX.js +0 -2
  138. package/dist/cdn/OQA4LU5O.js +0 -2
  139. package/dist/cdn/OX34MEOD.js +0 -2
  140. package/dist/cdn/T6HUC3X4.js +0 -2
  141. package/dist/cdn/W2Z3VO3C.js +0 -2
  142. package/dist/cdn/WI7OSEXJ.js +0 -2
  143. package/dist/cdn/WQS6NQUO.js +0 -2
  144. package/dist/cdn/YWRPXNSI.js +0 -2
  145. package/dist/cdn/ZARMIUOQ.js +0 -2
@@ -1,10 +1,10 @@
1
1
  /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
2
- import { substitute as D } from "@arcgis/core/intl.js";
3
- import { cloneDeep as re, memoize as ne, isEmpty as Ce } from "lodash-es";
2
+ import { substitute as k } from "@arcgis/core/intl.js";
3
+ import { cloneDeep as ne, memoize as le, isEmpty as Be } from "lodash-es";
4
4
  import "@arcgis/toolkit/type";
5
- import { w as Be, a as L, d as be, t as A, g as Ae, W as M, m as j, n as ve, i as H } from "./series-types.js";
6
- import { R as le, f as Ie } from "./rest-js-object-literals.js";
7
- import { U as Le, cH as qe, o as X, df as w, j as Ne, cF as we, bL as Ve, bX as Oe, am as De, q as N, p as Me, dm as ke, cB as Pe, dn as Z, cc as Re, c8 as Ee, k as oe, Z as Y, cY as V, dk as $e, di as E, bK as K, bQ as de, bR as ue, br as Ue, dh as ce, l as Xe, b as $, bO as Ye, b3 as Ke, b4 as We, a_ as je, b6 as He, bN as ee, aL as Qe, aK as te, aM as ze } from "./index.js";
5
+ import { w as Ce, a as v, d as be, t as I, m as E, g as Ae, W as D, n as ve, i as H } from "./series-types.js";
6
+ import { R as oe, f as Ie } from "./rest-js-object-literals.js";
7
+ import { U as Le, cH as qe, o as X, df as V, j as Ne, cF as we, bL as Ve, bX as Oe, am as ke, q as N, p as De, dm as Re, cB as Me, dn as ee, cc as Pe, c8 as Ee, k as de, Z as Y, cY as O, dk as $e, di as $, bK as K, bQ as ue, bR as ce, br as Ue, dh as _, l as We, b as U, bO as Xe, b3 as Ye, b4 as Ke, a_ as je, b6 as He, bN as te, aL as Qe, aK as ie, aM as ze } from "./index.js";
8
8
  import "@arcgis/toolkit/intl";
9
9
  import "luxon";
10
10
  import "d3-array";
@@ -15,14 +15,14 @@ import "@arcgis/core/time/TimeExtent.js";
15
15
  import "@arcgis/core/core/promiseUtils.js";
16
16
  import "@arcgis/core/request.js";
17
17
  import "./runtime.js";
18
- import { h as ye, l as v, o as _e, p as Ge, j as x, k as C, m as ie } from "./index4.js";
18
+ import { h as ye, l as L, o as _e, p as Ge, j as B, k as C, m as se } from "./index4.js";
19
19
  import "@arcgis/toolkit/dom";
20
+ import { s as q, u as R, d as ge, e as Je, f as Ze, g as me, h as et, j as ae } from "./utils.js";
20
21
  import { S as Q } from "./common.js";
21
22
  import "@esri/arcgis-html-sanitizer";
22
- import { s as I, u as k, d as ge, e as Je, f as Ze, g as me, h as et, j as se } from "./utils.js";
23
- import { b as R, c as pe, g as _, e as ae, f as tt } from "./data.js";
23
+ import { b as P, c as pe, g as G, e as re, f as tt } from "./data.js";
24
24
  import { b as it, g as st } from "./series-length.js";
25
- import { g as G } from "./utils2.js";
25
+ import { g as J } from "./utils2.js";
26
26
  import "@arcgis/core/Graphic.js";
27
27
  import "@arcgis/core/renderers/support/jsonUtils.js";
28
28
  import "@arcgis/core/symbols/support/symbolUtils.js";
@@ -32,15 +32,15 @@ import "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
32
32
  import "simple-statistics";
33
33
  import "@arcgis/core/AttributeBinsGraphic.js";
34
34
  import { c as at } from "./index2.js";
35
- function ni(t, e) {
35
+ function li(t, e) {
36
36
  let i;
37
37
  return e !== void 0 && (i = { ...e }, i.legend !== void 0 && (i.legend.position = t)), i;
38
38
  }
39
- function li(t, e) {
39
+ function oi(t, e) {
40
40
  let i;
41
41
  return e !== void 0 && (i = { ...e }, i.legend !== void 0 && (i.legend.visible = t)), i;
42
42
  }
43
- function oi(t, e) {
43
+ function di(t, e) {
44
44
  let i;
45
45
  return e !== void 0 && (i = { ...e, rotated: t }), i;
46
46
  }
@@ -48,46 +48,46 @@ function rt(t) {
48
48
  let e;
49
49
  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;
50
50
  }
51
- function di(t, e) {
51
+ function ui(t, e) {
52
52
  return e != null || ye(t);
53
53
  }
54
54
  async function nt(t) {
55
55
  const { queryObject: e, chartConfig: i, options: r, splitByField: a } = t;
56
56
  let s = [], n;
57
- const l = re(i), o = l.series[0], d = Oe({
57
+ const l = ne(i), o = l.series[0], d = Oe({
58
58
  queryObject: e,
59
59
  chartConfig: l,
60
60
  runtimeDataFilters: r?.runtimeDataFilters,
61
61
  ignoreViewExtent: r?.ignoreViewExtent
62
62
  });
63
- if (d.outStatistics?.[0]?.outStatisticFieldName && (d.outStatistics[0].outStatisticFieldName = De.outStatistics.outStatisticFieldName), N(o) && Me({
64
- xAxisValueFormatType: ke(l),
63
+ if (d.outStatistics?.[0]?.outStatisticFieldName && (d.outStatistics[0].outStatisticFieldName = ke.outStatistics.outStatisticFieldName), N(o) && De({
64
+ xAxisValueFormatType: Re(l),
65
65
  setTimeBinningInfoWhenNotProvided: r?.setTimeBinningInfoWhenNotProvided,
66
66
  seriesConfig: o
67
- }) && Pe(e)) {
68
- const { temporalBinning: f, x: c } = o, { uniqueQuery: F } = await Z({
67
+ }) && Me(e)) {
68
+ const { temporalBinning: p, x: c } = o, { uniqueQuery: S } = await ee({
69
69
  chartConfig: l,
70
70
  queryConfig: d,
71
71
  queryObject: e,
72
72
  options: r
73
73
  });
74
- n = await Re({
74
+ n = await Pe({
75
75
  queryObject: e,
76
76
  dateField: c,
77
77
  splitByField: a,
78
- queryConfig: F,
79
- temporalBinning: f
78
+ queryConfig: S,
79
+ temporalBinning: p
80
80
  }), s = Array.from(
81
81
  new Set(
82
- n.flatMap((S) => {
83
- const { stackedAttributes: g } = S;
82
+ n.flatMap((f) => {
83
+ const { stackedAttributes: g } = f;
84
84
  let u = [];
85
- return g && (u = g.map((p) => p[a]).filter((p) => p !== void 0)), u;
85
+ return g && (u = g.map((m) => m[a]).filter((m) => m !== void 0)), u;
86
86
  })
87
87
  ).values()
88
88
  );
89
89
  } else {
90
- const { uniqueQuery: f } = await Z({
90
+ const { uniqueQuery: p } = await ee({
91
91
  chartConfig: l,
92
92
  queryObject: e,
93
93
  queryConfig: d,
@@ -95,7 +95,7 @@ async function nt(t) {
95
95
  });
96
96
  n = await Ee({
97
97
  queryObject: e,
98
- queryConfig: f,
98
+ queryConfig: p,
99
99
  featureCount: 1
100
100
  }), s = Array.from(
101
101
  new Set(
@@ -108,7 +108,7 @@ async function nt(t) {
108
108
  function lt(t, e) {
109
109
  const i = /* @__PURE__ */ new Map();
110
110
  return t.series.forEach((r) => {
111
- let a = oe({
111
+ let a = de({
112
112
  where: r.query?.where,
113
113
  // normalize the value so it matches what we get from getAllValues()
114
114
  // Refer to https://devtopia.esri.com/WebGIS/arcgis-charts/issues/8127
@@ -118,7 +118,7 @@ function lt(t, e) {
118
118
  escape: !1
119
119
  });
120
120
  e && a !== null && (a = Number(a));
121
- const s = Be([r]);
121
+ const s = Ce([r]);
122
122
  s !== void 0 && i.set(s, [
123
123
  ...i.get(s) ?? [],
124
124
  a
@@ -159,28 +159,28 @@ async function ut(t) {
159
159
  const l = i.series.length === 0;
160
160
  i.series.length === 0 && s !== void 0 && i.series.push(s);
161
161
  const o = X(i.series);
162
- if ((o === w.BoxPlotMonoFieldAndSplitBy || o === w.BoxPlotMultiFieldsAndSplitBy || o === w.BoxPlotMonoFieldAndCategoryAndSplitBy || o === w.BarAndLineSplitBy || o === w.BarAndLineSplitByNoAggregation) && a !== void 0) {
163
- const d = Ne(i.series[0]?.query?.where), f = we(a);
164
- await f.load();
165
- const c = f.getField(d)?.toJSON(), F = Ve(c), S = await nt({
162
+ if ((o === V.BoxPlotMonoFieldAndSplitBy || o === V.BoxPlotMultiFieldsAndSplitBy || o === V.BoxPlotMonoFieldAndCategoryAndSplitBy || o === V.BarAndLineSplitBy || o === V.BarAndLineSplitByNoAggregation) && a !== void 0) {
163
+ const d = Ne(i.series[0]?.query?.where), p = we(a);
164
+ await p.load();
165
+ const c = p.getField(d)?.toJSON(), S = Ve(c), f = await nt({
166
166
  queryObject: a,
167
167
  chartConfig: i,
168
168
  splitByField: d,
169
169
  options: r
170
- }), { allValues: g } = S;
171
- if ({ preFetchedQueryResponse: n } = S, g.length > 0) {
172
- const u = lt(i, F), p = ot({
170
+ }), { allValues: g } = f;
171
+ if ({ preFetchedQueryResponse: n } = f, g.length > 0) {
172
+ const u = lt(i, S), m = ot({
173
173
  allValues: g,
174
174
  configUniqueValuesPerSeriesType: u,
175
175
  initialConfigWasEmpty: l
176
176
  });
177
- Array.from(p.keys()).forEach((h) => {
178
- (p.get(h) ?? []).forEach((m) => {
177
+ Array.from(m.keys()).forEach((h) => {
178
+ (m.get(h) ?? []).forEach((y) => {
179
179
  i.series.push(
180
180
  dt({
181
181
  chartConfig: i,
182
182
  seriesTemplate: s,
183
- missingValue: m,
183
+ missingValue: y,
184
184
  splitByField: d
185
185
  })
186
186
  );
@@ -194,7 +194,7 @@ async function ut(t) {
194
194
  function ct(t, e) {
195
195
  e && !ye(e) && (e = qe({ chartConfig: e, queryObject: t }));
196
196
  }
197
- async function ui(t) {
197
+ async function ci(t) {
198
198
  const { configToAlter: e, layer: i, addMissingSeries: r, updateSplitBySeries: a, chartContainer: s, queryObject: n, options: l } = t;
199
199
  let o = e, d;
200
200
  return o && (ct(i, o), o = await at(o, i), r && (d = await ut({
@@ -227,90 +227,90 @@ const yt = (t) => {
227
227
  }, fe = (t, e) => {
228
228
  e?.series?.forEach((i) => {
229
229
  N(i) && (i.temporalBinning ??= {}, i.temporalBinning.size = t);
230
- }), I({ config: e, value: null, axisIndex: 1, isMax: !1 }), I({ config: e, value: null, axisIndex: 1, isMax: !0 });
230
+ }), q({ config: e, value: null, axisIndex: 1, isMax: !1 }), q({ config: e, value: null, axisIndex: 1, isMax: !0 });
231
231
  }, St = (t, e) => {
232
232
  e?.series?.forEach((i) => {
233
233
  N(i) && (i.temporalBinning ??= {}, i.temporalBinning.nullPolicy = t);
234
- }), I({ config: e, value: null, axisIndex: 1, isMax: !1 }), I({ config: e, value: null, axisIndex: 1, isMax: !0 });
235
- }, ci = (t, e) => {
234
+ }), q({ config: e, value: null, axisIndex: 1, isMax: !1 }), q({ config: e, value: null, axisIndex: 1, isMax: !0 });
235
+ }, yi = (t, e) => {
236
236
  e.series?.forEach((i) => {
237
237
  N(i) && (i.temporalBinning ??= {}, i.temporalBinning.unit = t);
238
- }), I({ config: e, value: null, axisIndex: 1, isMax: !1 }), I({ config: e, value: null, axisIndex: 1, isMax: !0 });
239
- }, yi = (t, e) => {
238
+ }), q({ config: e, value: null, axisIndex: 1, isMax: !1 }), q({ config: e, value: null, axisIndex: 1, isMax: !0 });
239
+ }, gi = (t, e) => {
240
240
  e.series?.forEach((i) => {
241
241
  N(i) && (i.temporalBinning ??= {}, i.temporalBinning.timeAggregationType = t);
242
- }), I({ config: e, value: null, axisIndex: 1, isMax: !1 }), I({ config: e, value: null, axisIndex: 1, isMax: !0 });
243
- }, gi = (t, e) => {
242
+ }), q({ config: e, value: null, axisIndex: 1, isMax: !1 }), q({ config: e, value: null, axisIndex: 1, isMax: !0 });
243
+ }, mi = (t, e) => {
244
244
  e.series?.forEach((i) => {
245
245
  N(i) && (i.temporalBinning ??= {}, i.temporalBinning.trimIncompleteTimeInterval = t);
246
- }), I({ config: e, value: null, axisIndex: 1, isMax: !1 }), I({ config: e, value: null, axisIndex: 1, isMax: !0 });
247
- }, mi = (t) => {
246
+ }), q({ config: e, value: null, axisIndex: 1, isMax: !1 }), q({ config: e, value: null, axisIndex: 1, isMax: !0 });
247
+ }, pi = (t) => {
248
248
  fe(0, t);
249
- }, pi = (t) => t.hideEmptyRowsAndColumns, fi = (t, e) => {
249
+ }, fi = (t) => t.hideEmptyRowsAndColumns, Si = (t, e) => {
250
250
  t.hideEmptyRowsAndColumns = e;
251
- }, Si = (t, e) => {
251
+ }, Fi = (t, e) => {
252
252
  const i = t.series[0];
253
253
  i.heatRulesType = e;
254
- }, Fi = (t) => t.series[0].heatRulesType, hi = (t, e) => {
254
+ }, Ti = (t) => t.series[0].heatRulesType, hi = (t, e) => {
255
255
  const i = t.series[0];
256
256
  i.gradientRules = e;
257
- }, Ti = (t) => t.series[0].gradientRules, xi = (t) => {
258
- const { yField: e, config: i, layerInfo: r } = t, { layerFieldsInfo: a } = r, s = G(1, i), n = Ft(i), l = Y(i), o = i.series[0];
257
+ }, xi = (t) => t.series[0].gradientRules, Bi = (t) => {
258
+ const { yField: e, config: i, layerInfo: r } = t, { layerFieldsInfo: a } = r, s = J(1, i), n = Ft(i), l = Y(i), o = i.series[0];
259
259
  if (typeof e == "string" && n !== e && o && (o.y = e, rt(i), n === s || l)) {
260
- const d = V(a, e);
261
- k(i, 1, d);
260
+ const d = O(a, e);
261
+ R(i, 1, d);
262
262
  }
263
263
  }, Ft = (t) => t.series[0].y ?? "", Ci = (t) => {
264
264
  const { binning: e, config: i, commonStrings: r } = t, a = i.series[0];
265
265
  if (a.xTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
266
266
  const s = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
267
- k(i, 0, s);
267
+ R(i, 0, s);
268
268
  }
269
- }, Bi = (t) => t.series[0].xTemporalBinning, bi = (t) => {
269
+ }, bi = (t) => t.series[0].xTemporalBinning, Ai = (t) => {
270
270
  const { binning: e, config: i, commonStrings: r } = t, a = i.series[0];
271
271
  if (a.yTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
272
272
  const s = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
273
- k(i, 1, s);
273
+ R(i, 1, s);
274
274
  }
275
- }, Ai = (t) => t.series[0].yTemporalBinning, ht = (t, e) => {
275
+ }, vi = (t) => t.series[0].yTemporalBinning, Tt = (t, e) => {
276
276
  e.orderOptions ??= {};
277
- const i = e.axes?.[0]?.valueFormat?.type === "category" ? A.Category : A.YValue, r = z(e)[0], a = e.axes?.[1]?.valueFormat?.type === "category" ? A.Category : A.YValue, s = z(e)[1], n = {
277
+ const i = e.axes?.[0]?.valueFormat?.type === "category" ? I.Category : I.YValue, r = z(e)[0], a = e.axes?.[1]?.valueFormat?.type === "category" ? I.Category : I.YValue, s = z(e)[1], n = {
278
278
  ...e.orderOptions.data ?? {},
279
- orderType: A.MultiAxes
279
+ orderType: I.MultiAxes
280
280
  };
281
- r === Q.customSort && i === A.Category && (n.orderByX = [...t]), s === Q.customSort && a === A.Category && (n.orderByY = [...t]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
282
- }, vi = (t, e) => {
281
+ r === Q.customSort && i === I.Category && (n.orderByX = [...t]), s === Q.customSort && a === I.Category && (n.orderByY = [...t]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
282
+ }, Ii = (t, e) => {
283
283
  const i = e.series[0];
284
284
  i.gridLine && (i.gridLine.width = t);
285
- }, Ii = (t) => t.series[0].gridLine?.width, Li = (t, e) => {
285
+ }, Li = (t) => t.series[0].gridLine?.width, qi = (t, e) => {
286
286
  const i = e.series[0], r = t?.length === 4 && t.every((a) => typeof a == "number");
287
287
  i.gridLine && r && (i.gridLine.color = t);
288
- }, qi = (t) => t.series[0].gridLine?.color, Ni = (t, e) => {
288
+ }, Ni = (t) => t.series[0].gridLine?.color, wi = (t, e) => {
289
289
  const i = e.legend;
290
290
  i && (i.position = t);
291
- }, wi = (t) => t.legend?.position ?? be.Bottom, Vi = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, Oi = (t, e) => {
291
+ }, Vi = (t) => t.legend?.position ?? be.Bottom, Oi = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, ki = (t, e) => {
292
292
  const i = e.series[0].query?.outStatistics?.[0];
293
293
  i ? (i.onStatisticField = t, i.outStatisticFieldName = `${i.statisticType}_${t}`) : e.series[0].query = {
294
294
  outStatistics: [
295
295
  {
296
296
  onStatisticField: t,
297
- outStatisticFieldName: `${L.Count}_${t}`,
298
- statisticType: L.Count
297
+ outStatisticFieldName: `${v.Count}_${t}`,
298
+ statisticType: v.Count
299
299
  }
300
300
  ]
301
301
  };
302
- }, Di = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? L.Count, Mi = (t, e) => {
302
+ }, Di = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? v.Count, Ri = (t, e) => {
303
303
  const i = e.series[0]?.query?.outStatistics?.[0];
304
- i && t !== L.NoAggregation && (i.statisticType = t, i.outStatisticFieldName = `${t}_${i.onStatisticField}`);
305
- }, ki = (t) => t.nullPolicy, Pi = (t, e) => {
304
+ i && t !== v.NoAggregation && (i.statisticType = t, i.outStatisticFieldName = `${t}_${i.onStatisticField}`), (t === v.Count || t === v.Sum) && ht(E.Zero, e);
305
+ }, Mi = (t) => t.nullPolicy, ht = (t, e) => {
306
306
  e.nullPolicy = t;
307
- }, Ri = (t) => t.series[0].emptyCells, Ei = (t, e) => {
307
+ }, Pi = (t) => t.series[0].emptyCells, Ei = (t, e) => {
308
308
  e.series[0].emptyCells = t;
309
309
  }, $i = (t) => t.series[0].emptyCells?.text, Ui = (t, e) => {
310
310
  e.series[0].emptyCells ? e.series[0].emptyCells.text = t : e.series[0].emptyCells = { text: t };
311
- }, Xi = (t) => t.includeLeapDay, Yi = (t, e) => {
311
+ }, Wi = (t) => t.includeLeapDay, Xi = (t, e) => {
312
312
  e.includeLeapDay = t;
313
- }, Ki = (t) => t.series[0].emptyCells?.symbol, Wi = (t, e) => {
313
+ }, Yi = (t) => t.series[0].emptyCells?.symbol, Ki = (t, e) => {
314
314
  e.series[0].emptyCells ? e.series[0].emptyCells.symbol = t : e.series[0].emptyCells = { symbol: t };
315
315
  };
316
316
  function ji(t) {
@@ -320,11 +320,11 @@ function Hi(t, e) {
320
320
  $e(e) || (e.viewType = t);
321
321
  }
322
322
  function Qi(t) {
323
- return t.series[0].classBreaksRules?.breaksCount ?? E.classBreaks.breaksCount;
323
+ return t.series[0].classBreaksRules?.breaksCount ?? $.classBreaks.breaksCount;
324
324
  }
325
325
  function zi(t, e) {
326
- e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? E.classBreaks.breaksCount : e.series[0].classBreaksRules = {
327
- breaksCount: t ?? E.classBreaks.breaksCount
326
+ e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? $.classBreaks.breaksCount : e.series[0].classBreaksRules = {
327
+ breaksCount: t ?? $.classBreaks.breaksCount
328
328
  };
329
329
  }
330
330
  function _i(t) {
@@ -333,45 +333,51 @@ function _i(t) {
333
333
  function Gi(t, e) {
334
334
  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.classificationMethod = t : e.series[0].classBreaksRules = {
335
335
  classificationMethod: t
336
- }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? E.classBreaks.breaksCount;
336
+ }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? $.classBreaks.breaksCount;
337
+ }
338
+ function Ji(t, e) {
339
+ e.firstDayOfWeek = t;
340
+ }
341
+ function Zi(t) {
342
+ return t.firstDayOfWeek;
337
343
  }
338
- function P(t) {
344
+ function M(t) {
339
345
  const { seriesIndex: e, xAxisField: i, aggregationType: r, config: a, layerInfo: s, commonStrings: n } = t, l = K(s?.layer).idField;
340
346
  let o;
341
347
  const d = a.series[e ?? 0];
342
- let f = !1, c = !1, F = !1;
348
+ let p = !1, c = !1, S = !1;
343
349
  if (d === void 0) {
344
350
  const u = a.series;
345
- f = u.slice(0, e).every((p) => x(p)), c = u.slice(0, e).every((p) => C(p)), F = u.slice(0, e).every((p) => ie(p));
351
+ p = u.slice(0, e).every((m) => B(m)), c = u.slice(0, e).every((m) => C(m)), S = u.slice(0, e).every((m) => se(m));
346
352
  } else
347
- f = x(d), c = C(d), F = ie(d);
348
- f ? o = Ke({
353
+ p = B(d), c = C(d), S = se(d);
354
+ p ? o = Ye({
349
355
  commonStrings: n,
350
356
  seriesIndex: e,
351
357
  objectIDField: l
352
- }) : c ? o = We({
358
+ }) : c ? o = Ke({
353
359
  commonStrings: n,
354
360
  seriesIndex: e,
355
361
  objectIDField: l
356
- }) : F ? o = je(n, l) : o = He({
362
+ }) : S ? o = je(n, l) : o = He({
357
363
  seriesIndex: e,
358
364
  objectIDField: l,
359
365
  commonStrings: n
360
366
  });
361
- const S = a.series[0]?.dataLabels, g = {
367
+ const f = a.series[0]?.dataLabels, g = {
362
368
  ...o,
363
369
  x: i,
364
370
  y: "",
365
371
  dataLabels: {
366
372
  ...o.dataLabels,
367
- type: o.dataLabels?.type ?? M.Text,
368
- content: { ...o.dataLabels?.content, ...S?.content, type: Ie.TS },
369
- visible: S?.visible ?? !1
373
+ type: o.dataLabels?.type ?? D.Text,
374
+ content: { ...o.dataLabels?.content, ...f?.content, type: Ie.TS },
375
+ visible: f?.visible ?? !1
370
376
  }
371
377
  };
372
378
  if (g.query = {
373
379
  groupByFieldsForStatistics: [i]
374
- }, r !== L.NoAggregation && l !== void 0) {
380
+ }, r !== v.NoAggregation && l !== void 0) {
375
381
  const u = `${r}_${l}_0`.toUpperCase();
376
382
  g.y = u, g.query.outStatistics = [
377
383
  {
@@ -381,98 +387,98 @@ function P(t) {
381
387
  }
382
388
  ];
383
389
  }
384
- if (x(g) || C(g) || v(g) && a.series[0]?.binTemporalData) {
390
+ if (B(g) || C(g) || L(g) && a.series[0]?.binTemporalData) {
385
391
  let u;
386
- if (a?.series?.[0] !== void 0 && (u = X(a.series)), u !== w.BarAndLineNoAggregation && u !== w.BarAndLineSplitByNoAggregation) {
387
- let p = gt(a);
388
- p === H.Quarter && (p = H.Month), g.temporalBinning = {
392
+ if (a?.series?.[0] !== void 0 && (u = X(a.series)), u !== V.BarAndLineNoAggregation && u !== V.BarAndLineSplitByNoAggregation) {
393
+ let m = gt(a);
394
+ m === H.Quarter && (m = H.Month), g.temporalBinning = {
389
395
  size: yt(a),
390
- unit: p,
396
+ unit: m,
391
397
  timeAggregationType: mt(a),
392
398
  trimIncompleteTimeInterval: pt(a),
393
399
  nullPolicy: ft(a)
394
400
  };
395
401
  }
396
402
  }
397
- return re(g);
403
+ return ne(g);
398
404
  }
399
405
  function Se(t, e, i) {
400
- const { layerFieldsInfo: r } = e, { idField: a, isTraditionalTypeOID: s } = K(e.layer), n = R(t), l = J(t), o = he(t), d = U(t), f = s && (l.length === 0 || l.includes(a)), c = Ue(o, i), F = f ? "" : l.map((m) => V(r ?? [], m)).join(", "), S = V(r ?? [], n), g = V(r ?? [], d), u = t.series.some((m) => v(m)), p = u ? "category" : "xAxisField", h = S;
401
- let y = "";
406
+ const { layerFieldsInfo: r } = e, { idField: a, isTraditionalTypeOID: s } = K(e.layer), n = P(t), l = Z(t), o = Te(t), d = W(t), p = s && (l.length === 0 || l.includes(a)), c = Ue(o, i), S = p ? "" : l.map((y) => O(r ?? [], y)).join(", "), f = O(r ?? [], n), g = O(r ?? [], d), u = t.series.some((y) => L(y)), m = u ? "category" : "xAxisField", h = f;
407
+ let T = "";
402
408
  if (pe({
403
409
  fieldName: n,
404
410
  numericFields: l,
405
411
  fieldList: r
406
412
  }))
407
- y = D(i.titleLabels.aggrTypeOfAggrFields, {
413
+ T = k(i.titleLabels.aggrTypeOfAggrFields, {
408
414
  aggregationType: c,
409
- aggregationFields: F
415
+ aggregationFields: S
410
416
  });
411
- else if (o === L.NoAggregation) {
412
- const m = f ? a : F;
417
+ else if (o === v.NoAggregation) {
418
+ const y = p ? a : S;
413
419
  if (d === "") {
414
- const q = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
415
- y = D(i.titleLabels[q], {
416
- aggregationType: m,
417
- [p]: h
420
+ const F = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
421
+ T = k(i.titleLabels[F], {
422
+ aggregationType: y,
423
+ [m]: h
418
424
  });
419
425
  } else {
420
- const q = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
421
- y = D(i.titleLabels[q], {
422
- aggregationType: m,
423
- [p]: h,
426
+ const F = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
427
+ T = k(i.titleLabels[F], {
428
+ aggregationType: y,
429
+ [m]: h,
424
430
  splitByField: g
425
431
  });
426
432
  }
427
- } else if (o === L.Count)
433
+ } else if (o === v.Count)
428
434
  if (d === "") {
429
- const m = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
430
- y = D(i.titleLabels[m], {
435
+ const y = u ? "aggrTypeCategory" : "aggrTypeXAxisField";
436
+ T = k(i.titleLabels[y], {
431
437
  aggregationType: c,
432
- [p]: h
438
+ [m]: h
433
439
  });
434
440
  } else {
435
- const m = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
436
- y = D(i.titleLabels[m], {
441
+ const y = u ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
442
+ T = k(i.titleLabels[y], {
437
443
  aggregationType: c,
438
- [p]: h,
444
+ [m]: h,
439
445
  splitByField: g
440
446
  });
441
447
  }
442
448
  else if (d !== "") {
443
- const m = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
444
- y = D(i.titleLabels[m], {
449
+ const y = u ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
450
+ T = k(i.titleLabels[y], {
445
451
  aggregationType: c,
446
- aggregationField: F,
447
- [p]: h,
452
+ aggregationField: S,
453
+ [m]: h,
448
454
  splitByField: g
449
455
  });
450
456
  } else if (l.length > 0) {
451
- const m = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
452
- y = D(i.titleLabels[m], {
457
+ const y = u ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
458
+ T = k(i.titleLabels[y], {
453
459
  aggregationType: c,
454
- aggregationFields: F,
455
- [p]: h
460
+ aggregationFields: S,
461
+ [m]: h
456
462
  });
457
463
  }
458
- return y;
464
+ return T;
459
465
  }
460
- const Fe = (t) => oe({
466
+ const Fe = (t) => de({
461
467
  where: t.query?.where,
462
468
  normalize: !1,
463
469
  escape: !1
464
- }) ?? "", he = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? L.NoAggregation, U = ne(
470
+ }) ?? "", Te = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? v.NoAggregation, W = le(
465
471
  (t) => {
466
472
  const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
467
- return Xe(t?.series?.[0]?.query?.where) ? "" : e;
473
+ return We(t?.series?.[0]?.query?.where) ? "" : e;
468
474
  },
469
475
  (t) => t?.series?.[0]?.query?.where
470
- ), J = ne(
476
+ ), Z = le(
471
477
  // without memoizing, the worst case efficiency is O(series.length), best case is O(1)
472
478
  // with memoizing, the worst case efficiency for repeated calls becomes O(1)
473
479
  (t) => {
474
480
  let e = [];
475
- if (U(t) === "")
481
+ if (W(t) === "")
476
482
  e = t?.series.map((i) => {
477
483
  const r = i.query?.outStatistics?.map((a) => a.onStatisticField) ?? [];
478
484
  return r?.length > 0 ? r : i.y;
@@ -486,41 +492,41 @@ const Fe = (t) => oe({
486
492
  // using series array address as key, since a change to the numeric fields will always rebuild a fresh series array
487
493
  (t) => t?.series
488
494
  );
489
- function Tt(t) {
495
+ function xt(t) {
490
496
  const { numericFields: e, aggregationType: i, config: r, layerInfo: a } = t;
491
497
  let s = !1;
492
- i === L.Count ? s = !0 : i === L.NoAggregation && (s = e.every((o) => {
493
- const d = a.layerFieldsInfo.find((f) => f.name === o);
494
- return d !== void 0 ? ee(d) : !1;
495
- })), se(r, 1, s);
496
- const n = r.series.some((o) => x(o)), l = r.series.some((o) => C(o));
498
+ i === v.Count ? s = !0 : i === v.NoAggregation && (s = e.every((o) => {
499
+ const d = a.layerFieldsInfo.find((p) => p.name === o);
500
+ return d !== void 0 ? te(d) : !1;
501
+ })), ae(r, 1, s);
502
+ const n = r.series.some((o) => B(o)), l = r.series.some((o) => C(o));
497
503
  if (n || l) {
498
- const o = R(r), d = a.layerFieldsInfo.find((c) => c.name === o), f = d !== void 0 && ee(d);
499
- se(r, 0, f);
504
+ const o = P(r), d = a.layerFieldsInfo.find((c) => c.name === o), p = d !== void 0 && te(d);
505
+ ae(r, 0, p);
500
506
  }
501
507
  }
502
508
  const z = (t) => {
503
509
  let e;
504
- if (ce(t)) {
505
- const i = t.orderOptions?.data?.orderByX ?? [""], r = t.orderOptions?.data?.orderByY ?? [""], a = t.axes?.[0]?.valueFormat?.type === "category" ? A.Category : A.YValue, s = t.axes?.[1]?.valueFormat?.type === "category" ? A.Category : A.YValue;
506
- e = [ae(i, a), ae(r, s)];
510
+ if (_(t)) {
511
+ const i = t.orderOptions?.data?.orderByX ?? [""], r = t.orderOptions?.data?.orderByY ?? [""], a = t.axes?.[0]?.valueFormat?.type === "category" ? I.Category : I.YValue, s = t.axes?.[1]?.valueFormat?.type === "category" ? I.Category : I.YValue;
512
+ e = [re(i, a), re(r, s)];
507
513
  } else {
508
- const i = t.orderOptions?.data?.orderType ?? A.Category, r = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : Ae.Ascending;
514
+ const i = t.orderOptions?.data?.orderType ?? I.Category, r = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : Ae.Ascending;
509
515
  e = [tt(r, i)];
510
516
  }
511
517
  return e;
512
518
  };
513
- function xt(t) {
519
+ function Bt(t) {
514
520
  const { xAxisField: e, numericFields: i, aggregationType: r, config: a, layerInfo: s, commonStrings: n } = t, { layerFieldsInfo: l } = s;
515
521
  let o = !1;
516
- const d = P({
522
+ const d = M({
517
523
  config: a,
518
524
  xAxisField: e,
519
525
  aggregationType: r,
520
526
  layerInfo: s,
521
527
  seriesIndex: 0,
522
528
  commonStrings: n
523
- }), f = _({
529
+ }), p = G({
524
530
  config: a,
525
531
  xAxisField: e,
526
532
  numericFields: i,
@@ -531,31 +537,31 @@ function xt(t) {
531
537
  ...d,
532
538
  id: `series_${Date.now()}`,
533
539
  name: n.axisLabels.values,
534
- x: $,
535
- y: f
536
- }, F = [];
540
+ x: U,
541
+ y: p
542
+ }, S = [];
537
543
  for (const g of i)
538
- F.push({
544
+ S.push({
539
545
  onStatisticField: g,
540
546
  outStatisticFieldName: `${g}_0`.toUpperCase(),
541
547
  statisticType: r
542
548
  });
543
- c.query = { outStatistics: F };
544
- const S = a.series[0];
545
- return S !== void 0 && (c.id = S.id, a.colorMatch || (v(S) && v(c) ? c.fillSymbol = S.fillSymbol : (x(c) && x(S) || C(c) && C(S)) && (c.lineSymbol = S.lineSymbol, c.markerSymbol = S.markerSymbol), o = !0), c.id = S.id, S.name !== d.name && (c.name = S.name)), a.series.length === 1 && !a.colorMatch && (v(c) ? c.fillSymbol = a.series[0].fillSymbol : (x(c) || C(c)) && (c.lineSymbol = a.series[0].lineSymbol, c.markerSymbol = a.series[0].markerSymbol), o = !0), a.colorMatch = !o, [c];
549
+ c.query = { outStatistics: S };
550
+ const f = a.series[0];
551
+ return f !== void 0 && (c.id = f.id, a.colorMatch || (L(f) && L(c) ? c.fillSymbol = f.fillSymbol : (B(c) && B(f) || C(c) && C(f)) && (c.lineSymbol = f.lineSymbol, c.markerSymbol = f.markerSymbol), o = !0), c.id = f.id, f.name !== d.name && (c.name = f.name)), a.series.length === 1 && !a.colorMatch && (L(c) ? c.fillSymbol = a.series[0].fillSymbol : (B(c) || C(c)) && (c.lineSymbol = a.series[0].lineSymbol, c.markerSymbol = a.series[0].markerSymbol), o = !0), a.colorMatch = !o, [c];
546
552
  }
547
- function Te(t) {
553
+ function he(t) {
548
554
  const { xAxisField: e, numericFields: i, aggregationType: r, config: a, layerInfo: s, commonStrings: n } = t, { layerFieldsInfo: l } = s, o = K(s.layer).idField, d = [];
549
- let f = !1;
555
+ let p = !1;
550
556
  for (let u = 0; u < i.length; u += 1) {
551
- const p = P({
557
+ const m = M({
552
558
  config: a,
553
559
  xAxisField: e,
554
560
  aggregationType: r,
555
561
  layerInfo: s,
556
562
  seriesIndex: u,
557
563
  commonStrings: n
558
- }), h = _({
564
+ }), h = G({
559
565
  config: a,
560
566
  xAxisField: e,
561
567
  numericFields: i,
@@ -563,33 +569,33 @@ function Te(t) {
563
569
  layer: s.layer,
564
570
  numericFieldIndex: u,
565
571
  fieldList: l
566
- }).name, y = i[u];
567
- let m = {
568
- ...p,
572
+ }).name, T = i[u];
573
+ let y = {
574
+ ...m,
569
575
  query: {
570
- ...p.query
576
+ ...m.query
571
577
  }
572
578
  };
573
- i && y !== o && (m = {
574
- ...m,
575
- id: y,
576
- name: V(l, y)
579
+ i && T !== o && (y = {
580
+ ...y,
581
+ id: T,
582
+ name: O(l, T)
577
583
  });
578
- let q = y;
579
- m.query !== void 0 && (r !== L.NoAggregation ? (q = h, m.query.outStatistics = [
584
+ let F = T;
585
+ y.query !== void 0 && (r !== v.NoAggregation ? (F = h, y.query.outStatistics = [
580
586
  {
581
- ...p.query?.outStatistics?.[0] ?? {},
582
- onStatisticField: y,
587
+ ...m.query?.outStatistics?.[0] ?? {},
588
+ onStatisticField: T,
583
589
  outStatisticFieldName: h,
584
590
  statisticType: r
585
591
  }
586
- ]) : delete m.query.outStatistics), m.y = q;
587
- const B = a.series.find(
588
- (O) => O.query?.outStatistics?.[0]?.onStatisticField === y && O.query.where === void 0
592
+ ]) : delete y.query.outStatistics), y.y = F;
593
+ const b = a.series.find(
594
+ (w) => w.query?.outStatistics?.[0]?.onStatisticField === T && w.query.where === void 0
589
595
  );
590
- if (B !== void 0 && typeof B.y == "string" && B.y.trim() !== "") {
591
- a.colorMatch || (v(m) && v(B) ? m.fillSymbol = B.fillSymbol : (x(m) && x(B) || C(m) && C(B)) && (m.lineSymbol = B.lineSymbol, m.markerSymbol = B.markerSymbol), f = !0);
592
- const O = P({
596
+ if (b !== void 0 && typeof b.y == "string" && b.y.trim() !== "") {
597
+ a.colorMatch || (L(y) && L(b) ? y.fillSymbol = b.fillSymbol : (B(y) && B(b) || C(y) && C(b)) && (y.lineSymbol = b.lineSymbol, y.markerSymbol = b.markerSymbol), p = !0);
598
+ const w = M({
593
599
  config: a,
594
600
  xAxisField: e,
595
601
  aggregationType: r,
@@ -597,30 +603,30 @@ function Te(t) {
597
603
  seriesIndex: u,
598
604
  commonStrings: n
599
605
  });
600
- m.id = B.id, B.id !== O.id && B.name !== O.name && (m.id = B.id, m.name = B.name);
606
+ y.id = b.id, b.id !== w.id && b.name !== w.name && (y.id = b.id, y.name = b.name);
601
607
  }
602
- d.push(m);
608
+ d.push(y);
603
609
  }
604
- const c = d.filter((u) => v(u)), F = d.filter(
605
- (u) => x(u) || C(u)
606
- ), S = a.series.filter((u) => v(u)), g = a.series.filter(
607
- (u) => x(u) || C(u)
610
+ const c = d.filter((u) => L(u)), S = d.filter(
611
+ (u) => B(u) || C(u)
612
+ ), f = a.series.filter((u) => L(u)), g = a.series.filter(
613
+ (u) => B(u) || C(u)
608
614
  );
609
- return S.length === 1 && c.length === 1 && !a.colorMatch && (v(S[0]) && v(c[0]) && (c[0].fillSymbol = S[0].fillSymbol), f = !0), g.length === 1 && F.length === 1 && !a.colorMatch && ((x(g[0]) && x(F[0]) || C(g[0]) && C(F[0])) && (F[0].lineSymbol = g[0].lineSymbol, F[0].markerSymbol = g[0].markerSymbol), f = !0), a.colorMatch = !f, d;
615
+ return f.length === 1 && c.length === 1 && !a.colorMatch && (L(f[0]) && L(c[0]) && (c[0].fillSymbol = f[0].fillSymbol), p = !0), g.length === 1 && S.length === 1 && !a.colorMatch && ((B(g[0]) && B(S[0]) || C(g[0]) && C(S[0])) && (S[0].lineSymbol = g[0].lineSymbol, S[0].markerSymbol = g[0].markerSymbol), p = !0), a.colorMatch = !p, d;
610
616
  }
611
617
  async function Ct(t) {
612
- const { splitByField: e, xAxisField: i, numericFields: r, aggregationType: a, config: s, layerInfo: n, commonStrings: l } = t, { layer: o, layerFieldsInfo: d } = n, { fetchNullValues: f } = s?.series?.[0]?.query ?? {}, c = i !== $ ? i : void 0, { categoriesArray: F, splitByFieldType: S, numericalField: g } = await et({
618
+ const { splitByField: e, xAxisField: i, numericFields: r, aggregationType: a, config: s, layerInfo: n, commonStrings: l } = t, { layer: o, layerFieldsInfo: d } = n, { fetchNullValues: p } = s?.series?.[0]?.query ?? {}, c = i !== U ? i : void 0, { categoriesArray: S, splitByFieldType: f, numericalField: g } = await et({
613
619
  config: s,
614
620
  layer: o,
615
621
  layerFieldsInfo: d,
616
622
  xAxisField: c,
617
623
  aggregationFields: r,
618
624
  splitByField: e,
619
- fetchNullValues: f
625
+ fetchNullValues: p
620
626
  });
621
- let u = [], p = !1;
622
- if (F.length === 0) {
623
- u = Te({
627
+ let u = [], m = !1;
628
+ if (S.length === 0) {
629
+ u = he({
624
630
  xAxisField: i,
625
631
  numericFields: r,
626
632
  aggregationType: a,
@@ -631,8 +637,8 @@ async function Ct(t) {
631
637
  for (const h of u)
632
638
  h.query && (h.query.where = `${e}=''`);
633
639
  } else
634
- for (let h = 0; h < F.length; h += 1) {
635
- const y = F[h], m = _({
640
+ for (let h = 0; h < S.length; h += 1) {
641
+ const T = S[h], y = G({
636
642
  config: s,
637
643
  xAxisField: i,
638
644
  numericFields: r,
@@ -641,68 +647,68 @@ async function Ct(t) {
641
647
  seriesIndex: h,
642
648
  splitByField: e,
643
649
  fieldList: d
644
- }).name, q = P({
650
+ }).name, F = M({
645
651
  config: s,
646
652
  xAxisField: i,
647
653
  aggregationType: a,
648
654
  layerInfo: n,
649
655
  seriesIndex: h,
650
656
  commonStrings: l
651
- }), B = {
657
+ }), b = {
652
658
  fieldName: e,
653
- fieldValueToMatch: y ?? "",
654
- subtypeInfo: de(n.layer),
659
+ fieldValueToMatch: T ?? "",
660
+ subtypeInfo: ue(n.layer),
655
661
  fieldList: n.layerFieldsInfo
656
- }, O = ue(B), W = `${y}`, T = {
657
- ...q,
658
- id: W,
659
- name: O ?? W,
660
- y: m,
662
+ }, w = ce(b), j = `${T}`, x = {
663
+ ...F,
664
+ id: j,
665
+ name: w ?? j,
666
+ y,
661
667
  query: {
662
- ...q.query,
663
- where: `${e}=${S === le.String && y !== null ? `'${y}'` : y}`,
664
- outStatistics: a !== L.NoAggregation ? [
668
+ ...F.query,
669
+ where: `${e}=${f === oe.String && T !== null ? `'${T}'` : T}`,
670
+ outStatistics: a !== v.NoAggregation ? [
665
671
  {
666
- ...q.query?.outStatistics?.[0] ?? {},
672
+ ...F.query?.outStatistics?.[0] ?? {},
667
673
  onStatisticField: g,
668
- outStatisticFieldName: m,
674
+ outStatisticFieldName: y,
669
675
  statisticType: a
670
676
  }
671
677
  ] : void 0
672
678
  }
673
679
  };
674
- a === L.NoAggregation && (T.query !== void 0 && (delete T.query.outStatistics, delete T.query.groupByFieldsForStatistics), T.y = g);
675
- const b = s.series.find(
676
- (xe) => String(Fe(xe)).trim().replace(/'/gu, "") === W
680
+ a === v.NoAggregation && (x.query !== void 0 && (delete x.query.outStatistics, delete x.query.groupByFieldsForStatistics), x.y = g);
681
+ const A = s.series.find(
682
+ (xe) => String(Fe(xe)).trim().replace(/'/gu, "") === j
677
683
  );
678
- b !== void 0 && (s.colorMatch || (v(T) && v(b) ? T.fillSymbol = b.fillSymbol : (x(T) && x(b) || C(T) && C(b)) && (T.lineSymbol = b.lineSymbol, T.markerSymbol = b.markerSymbol), p = !0), (x(T) && x(b) || C(T) && C(b)) && (T.lineSmoothed = b.lineSmoothed), (x(T) && x(b) || C(T) && C(b)) && (T.showArea = b.showArea), T.id = b.id, T.name = b.name), u.push(T);
684
+ A !== void 0 && (s.colorMatch || (L(x) && L(A) ? x.fillSymbol = A.fillSymbol : (B(x) && B(A) || C(x) && C(A)) && (x.lineSymbol = A.lineSymbol, x.markerSymbol = A.markerSymbol), m = !0), (B(x) && B(A) || C(x) && C(A)) && (x.lineSmoothed = A.lineSmoothed), (B(x) && B(A) || C(x) && C(A)) && (x.showArea = A.showArea), x.id = A.id, x.name = A.name), u.push(x);
679
685
  }
680
- return s.colorMatch = !p, u;
686
+ return s.colorMatch = !m, u;
681
687
  }
682
- const Ji = async (t) => {
683
- const { xAxisField: e, splitByField: i, numericFields: r, aggregationType: a, config: s, layerInfo: n, commonStrings: l } = t, { layerFieldsInfo: o } = n ?? {}, d = it(s), f = R(s), c = Bt(s, n, l), F = bt(s, n, l), S = At(s, n);
688
+ const es = async (t) => {
689
+ const { xAxisField: e, splitByField: i, numericFields: r, aggregationType: a, config: s, layerInfo: n, commonStrings: l } = t, { layerFieldsInfo: o } = n ?? {}, d = it(s), p = P(s), c = bt(s, n, l), S = At(s, n, l), f = vt(s, n);
684
690
  let g = ge(s);
685
- const u = s.series.some((y) => v(y)), p = _e(s.series), h = Ge(s.series);
686
- if (o !== void 0) {
687
- const y = Ye(o);
688
- !y.includes(f) && y.includes(e) ? g = Qe() : y.includes(f) && !y.includes(e) && (u ? g = te() : g = ze()), o.find((q) => q.name === e)?.type === le.String && (g = te()), g !== void 0 && Ze(s, l, g);
691
+ const u = s.series.some((F) => L(F)), m = _e(s.series), h = Ge(s.series), T = _(s), y = {};
692
+ if (T && (y.classBreaksRules = s.series[0]?.classBreaksRules, y.xTemporalBinning = s.series[0]?.xTemporalBinning, y.yTemporalBinning = s.series[0]?.yTemporalBinning), o !== void 0) {
693
+ const F = Xe(o);
694
+ !F.includes(p) && F.includes(e) ? g = Qe() : F.includes(p) && !F.includes(e) && (u ? g = ie() : g = ze()), o.find((w) => w.name === e)?.type === oe.String && (g = ie()), g !== void 0 && Ze(s, l, g);
689
695
  }
690
696
  if (d === 0 && (s.series = [
691
- P({ config: s, xAxisField: e, aggregationType: a, layerInfo: n, commonStrings: l })
692
- ]), s.series.forEach((y) => {
693
- y.x = e, y.query !== void 0 && (y.query.groupByFieldsForStatistics = [e]);
697
+ M({ config: s, xAxisField: e, aggregationType: a, layerInfo: n, commonStrings: l })
698
+ ]), s.series.forEach((F) => {
699
+ F.x = e, F.query !== void 0 && (F.query.groupByFieldsForStatistics = [e]);
694
700
  }), i === "" || r.length > 1 ? pe({
695
701
  fieldName: e,
696
702
  numericFields: r,
697
703
  fieldList: o
698
- }) ? s.series = xt({
704
+ }) ? s.series = Bt({
699
705
  config: s,
700
706
  layerInfo: n,
701
707
  xAxisField: e,
702
708
  numericFields: r,
703
709
  aggregationType: a,
704
710
  commonStrings: l
705
- }) : s.series = Te({
711
+ }) : s.series = he({
706
712
  config: s,
707
713
  layerInfo: n,
708
714
  xAxisField: e,
@@ -717,160 +723,163 @@ const Ji = async (t) => {
717
723
  numericFields: r,
718
724
  aggregationType: a,
719
725
  commonStrings: l
720
- })), S) {
721
- const y = V(o, e);
722
- k(s, 0, y);
726
+ })), f) {
727
+ const F = O(o, e);
728
+ R(s, 0, F);
723
729
  }
724
- if (F) {
725
- const y = me({
730
+ if (S) {
731
+ const F = me({
726
732
  config: s,
727
733
  layerInfo: n,
728
734
  commonStrings: l,
729
735
  numericFields: r,
730
736
  aggregationType: a
731
737
  });
732
- k(s, 1, y);
738
+ R(s, 1, F);
733
739
  }
734
- if (s.title && c && (s.title.content.text = Se(s, n, l)), I({ config: s, value: null, axisIndex: 1, isMax: !1 }), I({ config: s, value: null, axisIndex: 1, isMax: !0 }), Tt({ numericFields: r, aggregationType: a, config: s, layerInfo: n }), p || h) {
735
- I({ config: s, value: null, axisIndex: 0, isMax: !1 }), I({ config: s, value: null, axisIndex: 0, isMax: !0 }), fe(0, s);
736
- const y = g?.type === M.DateAxisFormat ? j.Null : j.Interpolate;
737
- St(y, s);
740
+ if (s.title && c && (s.title.content.text = Se(s, n, l)), q({ config: s, value: null, axisIndex: 1, isMax: !1 }), q({ config: s, value: null, axisIndex: 1, isMax: !0 }), xt({ numericFields: r, aggregationType: a, config: s, layerInfo: n }), m || h) {
741
+ q({ config: s, value: null, axisIndex: 0, isMax: !1 }), q({ config: s, value: null, axisIndex: 0, isMax: !0 }), fe(0, s);
742
+ const F = g?.type === D.DateAxisFormat ? E.Null : E.Interpolate;
743
+ St(F, s);
738
744
  }
739
- }, Zi = (t) => {
740
- const { config: e, seriesIndex: i, layerInfo: r, commonStrings: a } = t, s = e.series?.[i], n = U(e);
745
+ T && (s.series[0].classBreaksRules = y.classBreaksRules, s.series[0].xTemporalBinning = y.xTemporalBinning, s.series[0].yTemporalBinning = y.yTemporalBinning);
746
+ }, ts = (t) => {
747
+ const { config: e, seriesIndex: i, layerInfo: r, commonStrings: a } = t, s = e.series?.[i], n = W(e);
741
748
  let l;
742
- if (X(e.series) === w.BarAndLineFromFields)
749
+ if (X(e.series) === V.BarAndLineFromFields)
743
750
  l = a.axisLabels.values;
744
- else if (Ce(n)) {
751
+ else if (Be(n)) {
745
752
  const d = s.query?.outStatistics?.[0]?.onStatisticField;
746
- d !== void 0 && d !== K(r.layer).idField && (l = V(r.layerFieldsInfo, d));
753
+ d !== void 0 && d !== K(r.layer).idField && (l = O(r.layerFieldsInfo, d));
747
754
  } else {
748
- const d = String(Fe(s)).trim().replace(/'/gu, ""), f = {
749
- fieldName: U(e),
755
+ const d = String(Fe(s)).trim().replace(/'/gu, ""), p = {
756
+ fieldName: W(e),
750
757
  fieldValueToMatch: d ?? "",
751
- subtypeInfo: de(r.layer),
758
+ subtypeInfo: ue(r.layer),
752
759
  fieldList: r.layerFieldsInfo
753
760
  };
754
- l = ue(f) ?? d;
761
+ l = ce(p) ?? d;
755
762
  }
756
763
  return l ?? s.id;
757
- }, es = (t, e) => {
758
- if (ce(e))
759
- ht(t, e);
764
+ }, is = (t, e) => {
765
+ if (_(e))
766
+ Tt(t, e);
760
767
  else {
761
768
  e.orderOptions ??= {};
762
769
  const i = e.orderOptions?.data?.orderType;
763
- z(e)[0] === Q.customSort && i === A.Category && (e.orderOptions.data = {
764
- orderType: A.Category,
770
+ z(e)[0] === Q.customSort && i === I.Category && (e.orderOptions.data = {
771
+ orderType: I.Category,
765
772
  orderBy: [...t]
766
773
  });
767
774
  }
768
- }, ts = async (t, e) => {
769
- const i = R(t), r = ge(t)?.type, a = J(t), s = X(t.series);
775
+ }, ss = async (t, e) => {
776
+ const i = P(t), r = ge(t)?.type, a = Z(t), s = X(t.series);
770
777
  let n = [];
771
- return r === M.CategoryAxisFormat && (s === w.BarAndLineFromFields || i === $ ? n = a.map((l) => V(e?.layerFieldsInfo, l)) : i.trim() !== "" && i !== $ && e !== void 0 && (n = await Je({
778
+ return r === D.CategoryAxisFormat && (s === V.BarAndLineFromFields || i === U ? n = a.map((l) => O(e?.layerFieldsInfo, l)) : i.trim() !== "" && i !== U && e !== void 0 && (n = await Je({
772
779
  layerInfo: e,
773
780
  config: t,
774
781
  category: i
775
782
  }))), n;
776
783
  };
777
- function Bt(t, e, i) {
784
+ function bt(t, e, i) {
778
785
  const r = Se(t, e, i), a = st(t), s = Y(t);
779
786
  return r === a || s;
780
787
  }
781
- function bt(t, e, i) {
788
+ function At(t, e, i) {
782
789
  const r = me({
783
790
  config: t,
784
791
  layerInfo: e,
785
792
  commonStrings: i,
786
- numericFields: J(t),
787
- aggregationType: he(t)
788
- }), a = G(1, t), s = Y(t);
793
+ numericFields: Z(t),
794
+ aggregationType: Te(t)
795
+ }), a = J(1, t), s = Y(t);
789
796
  return r === a || s;
790
797
  }
791
- function At(t, e) {
792
- const i = V(e.layerFieldsInfo, R(t)), r = G(0, t), a = Y(t);
798
+ function vt(t, e) {
799
+ const i = O(e.layerFieldsInfo, P(t)), r = J(0, t), a = Y(t);
793
800
  return i === r || a;
794
801
  }
795
- function is(t) {
802
+ function as(t) {
796
803
  return t.series[0]?.binTemporalData ?? !1;
797
804
  }
798
- function ss(t, e) {
805
+ function rs(t, e) {
799
806
  e?.series.forEach((i) => {
800
- (i?.type === M.BarSeries || i?.type === M.LineSeries) && (i.binTemporalData = t, t ? i.temporalBinning = {
807
+ (i?.type === D.BarSeries || i?.type === D.LineSeries) && (i.binTemporalData = t, t ? i.temporalBinning = {
801
808
  unit: H.Day,
802
809
  size: 0,
803
810
  timeAggregationType: ve.Start,
804
811
  trimIncompleteTimeInterval: !0,
805
- nullPolicy: j.Null
812
+ nullPolicy: E.Null
806
813
  } : delete i.temporalBinning);
807
814
  });
808
815
  }
809
816
  export {
810
- St as $,
817
+ mi as $,
811
818
  Di as A,
812
- Mi as B,
813
- wi as C,
814
- Ni as D,
815
- ki as E,
816
- Pi as F,
817
- Ri as G,
819
+ Ri as B,
820
+ Vi as C,
821
+ wi as D,
822
+ Mi as E,
823
+ ht as F,
824
+ Pi as G,
818
825
  Ei as H,
819
826
  z as I,
820
827
  $i as J,
821
828
  Ui as K,
822
- Xi as L,
823
- Yi as M,
824
- Ki as N,
825
- Wi as O,
826
- he as P,
827
- J as Q,
828
- U as R,
829
- yt as S,
830
- fe as T,
831
- gt as U,
832
- ci as V,
833
- mt as W,
829
+ Wi as L,
830
+ Xi as M,
831
+ Zi as N,
832
+ Ji as O,
833
+ Yi as P,
834
+ Ki as Q,
835
+ Te as R,
836
+ Z as S,
837
+ W as T,
838
+ yt as U,
839
+ fe as V,
840
+ gt as W,
834
841
  yi as X,
835
- pt as Y,
842
+ mt as Y,
836
843
  gi as Z,
837
- ft as _,
844
+ pt as _,
838
845
  Se as a,
839
- mi as a0,
840
- ts as a1,
841
- es as a2,
842
- is as a3,
843
- ss as a4,
844
- Ji as a5,
845
- ui as a6,
846
- di as a7,
847
- oi as a8,
848
- ni as a9,
849
- li as aa,
850
- rt as ab,
846
+ ft as a0,
847
+ St as a1,
848
+ pi as a2,
849
+ ss as a3,
850
+ is as a4,
851
+ as as a5,
852
+ rs as a6,
853
+ es as a7,
854
+ ci as a8,
855
+ ui as a9,
856
+ di as aa,
857
+ li as ab,
858
+ oi as ac,
859
+ rt as ad,
851
860
  Ft as b,
852
861
  ji as c,
853
862
  Hi as d,
854
- Bi as e,
863
+ bi as e,
855
864
  Ci as f,
856
- Zi as g,
857
- Ai as h,
858
- bi as i,
865
+ ts as g,
866
+ vi as h,
867
+ Ai as i,
859
868
  Qi as j,
860
869
  zi as k,
861
870
  _i as l,
862
871
  Gi as m,
863
- pi as n,
864
- fi as o,
865
- Ii as p,
866
- vi as q,
867
- qi as r,
868
- xi as s,
869
- Li as t,
870
- Fi as u,
871
- Si as v,
872
- Ti as w,
872
+ fi as n,
873
+ Si as o,
874
+ Li as p,
875
+ Ii as q,
876
+ Ni as r,
877
+ Bi as s,
878
+ qi as t,
879
+ Ti as u,
880
+ Fi as v,
881
+ xi as w,
873
882
  hi as x,
874
- Vi as y,
875
- Oi as z
883
+ Oi as y,
884
+ ki as z
876
885
  };