@arcgis/charts-components 5.0.0-next.13 → 5.0.0-next.15

package/dist/chunks/interfaces.js

@@ -22,7 +22,7 @@ import Vr from "@arcgis/core/time/TimeExtent.js";
 import * as zr from "@arcgis/core/core/promiseUtils.js";
 /*! All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
-v5.0.0-next.13 */
+v5.0.0-next.15 */
 const Ie = "24.4.0", Pi = "arcgis_charts_pie_from_fields_name", Ur = "arcgis_charts_pie_from_fields_value", ia = "arcgis_charts_bar_line_from_fields_name", ra = "arcgis_charts_bar_line_from_fields_value", be = {
   Mean: "Mean",
   Median: "Median",
@@ -7960,7 +7960,10 @@ function Mc(t) {
 function Wd(t) {
   return kd.includes(t.type);
 }
-const Bc = {
+function Bc(t, e) {
+  return JSON.stringify(t.dataFilters) !== JSON.stringify(e.dataFilters);
+}
+const Pc = {
   getPieChartChartSubType: ms,
   getBarLineChartSubType: gs
 }, k = {
@@ -7991,7 +7994,7 @@ function Md(t) {
 function Bd(t) {
   return t.subType === _s.FeatureGauge;
 }
-function Pc(t) {
+function jc(t) {
   let e;
   return t !== void 0 && ("bins" in t ? e = t.bins : "dataItems" in t && (e = t.dataItems)), e;
 }
@@ -8066,7 +8069,7 @@ function _d(t) {
   const { dataItem: e, x: i, y: r, nullAsValid: n = !1 } = t;
   return e[i] !== void 0 && (typeof e[i] != "number" || Number.isFinite(e[i])) && De(e[r], n);
 }
-function jc(t) {
+function qc(t) {
   const { chartConfig: e, nullAsValid: i = !1, dataSet: r } = t;
   let n = !0;
   if (e !== void 0) {
@@ -8180,7 +8183,7 @@ function Ud(t) {
   const { dataItem: e, ...i } = t, r = Kt({ key: k.Min, ...i }), n = Kt({ key: k.Max, ...i }), s = e[r], a = e[n];
   return { min: s, max: a };
 }
-function qc(t) {
+function _c(t) {
   let e = Number.NaN, i = Number.NaN, r, n;
   const { chartConfig: s, chartData: a, filteredSeriesIds: o } = t, { series: l } = s;
   if (l?.length > 0) {
@@ -8253,7 +8256,7 @@ function Ss(t) {
   const s = v.now().setZone(e), a = s.offset / 60, o = i ? s.setZone(i).offset / 60 : 0, l = a - o;
   return l !== 0 && (r ? n = `${l > 0 ? "+" : "-"}1*INTERVAL '${Math.abs(l)}' HOUR ` : n = l > 0 ? `+INTERVAL '${Math.abs(l)}:00:01' HOUR TO SECOND` : `-INTERVAL '${Math.abs(l) - 1}:59:59' HOUR TO SECOND`), n;
 }
-function _c(t, e) {
+function Vc(t, e) {
   const i = Ss({}), r = `EXTRACT(YEAR FROM ${t} ${i})`, n = `EXTRACT(MONTH FROM ${t} ${i})`, s = `EXTRACT(DAY FROM ${t} ${i})`, a = `EXTRACT(HOUR FROM ${t} ${i})`, o = `EXTRACT(MINUTE FROM ${t} ${i})`, l = `EXTRACT(SECOND FROM ${t} ${i})`;
   let d = [];
   switch (e) {
@@ -8294,7 +8297,7 @@ const ce = {
   ChartDisposed: "ChartDisposeError",
   LayerFieldsNotFound: "layerFieldsNotFound"
 };
-function Vc(t) {
+function zc(t) {
   return t !== void 0 && (!("url" in t) || !t.url);
 }
 function Ot(t) {
@@ -8309,7 +8312,7 @@ function Hd(t) {
 function Yi(t) {
   return t !== void 0 && "type" in t && t.type === "subtype-sublayer";
 }
-function zc(t) {
+function Uc(t) {
   return Gd(t) || Yi(t);
 }
 function j(t) {
@@ -8324,12 +8327,12 @@ function Zd(t, e) {
 function Qd(t, e) {
   return t !== void 0 && (Ot(t) || "capabilities" in t && t.capabilities?.queryAttributeBins?.supportsDate === !0 && (me(e) || t.capabilities?.queryAttributeBins?.supportsStackBy));
 }
-function Uc(t) {
+function Gc(t) {
   return j(
     V(t)
   )?.sourceJSON?.advancedQueryCapabilities.supportedOperationsWithCacheHint.includes("queryBins");
 }
-function Gc(t) {
+function Hc(t) {
   let e = !1;
   const r = j(V(t)).sourceJSON;
   if (r) {
@@ -8340,7 +8343,7 @@ function Gc(t) {
   }
   return e;
 }
-function Hc(t) {
+function Zc(t) {
   let e;
   return Ot(t) ? e = t.layer : e = t, e;
 }
@@ -8353,7 +8356,7 @@ function Jd(t) {
   const i = j(t).sourceJSON?.advancedQueryCapabilities?.supportedSpatialAggregationStatistics ?? [], r = t.capabilities?.query.supportedSpatialAggregationStatistics ?? {};
   return e = i.includes("EnvelopeAggregate") || "envelope" in r && r.envelope === !0, e;
 }
-function Zc(t) {
+function Qc(t) {
   const { chartConfig: e, queryObject: i } = t;
   let r;
   const n = V(i);
@@ -8387,7 +8390,7 @@ function Yd(t) {
   }
   return e;
 }
-async function Qc(t) {
+async function Jc(t) {
   const { queryObject: e, queryConfig: i, outputFormat: r, dataFormat: n, outAnalytics: s } = t, { where: a, geometry: o, distance: l, units: d, timeExtent: p } = i;
   let c;
   const f = V(e), h = j(f), g = { query: { where: bt([a, h.definitionExpression]) } }, S = Ki(o)?.extent?.toJSON();
@@ -8423,7 +8426,7 @@ function Kd(t, e) {
     stackAlias: `charts_stack_alias_${e}`
   };
 }
-async function Jc(t) {
+async function Yc(t) {
   const { chartConfig: e, queryObject: i, queryConfig: r, errorStrings: n } = t;
   let s;
   const a = V(i), o = Zd(a, i);
@@ -8453,7 +8456,7 @@ async function Jc(t) {
     );
   return s;
 }
-async function Yc(t) {
+async function Kc(t) {
   const { chartConfig: e, queryObject: i, queryConfig: r, returnFeaturesExtent: n, errorStrings: s, abortKey: a } = t, o = e.series[0];
   let l;
   if (o.type === u.HeatSeries) {
@@ -8470,7 +8473,7 @@ async function Yc(t) {
   }
   return l;
 }
-async function Kc(t) {
+async function Xc(t) {
   const { queryObject: e, queryConfig: i, xStep: r, xMin: n, xMax: s, x: a, y: o, yStep: l, errorStrings: d } = t;
   let p;
   if (e && "queryAttributeBins" in e && Number.isFinite(r) && Number.isFinite(l) && Number.isFinite(n) && Number.isFinite(s) && r > 0 && l > 0) {
@@ -8492,7 +8495,7 @@ async function Kc(t) {
   }
   return p;
 }
-async function Xc(t) {
+async function eu(t) {
   const { queryConfig: e, x: i, queryObject: r, chartSubType: n, isGaugeByFeature: s } = t, a = V(r);
   let o;
   if (r !== void 0) {
@@ -8514,7 +8517,7 @@ async function Xc(t) {
   }
   return o;
 }
-async function eu(t) {
+async function tu(t) {
   const { queryObject: e, queryConfig: i, abortKey: r } = t, { outStatistics: n } = i, s = /* @__PURE__ */ new Map();
   if (e !== void 0 && n !== void 0 && n.length > 0) {
     const a = n.map((p) => {
@@ -8629,7 +8632,7 @@ async function Is(t) {
   }
   return o;
 }
-async function tu(t) {
+async function iu(t) {
   const { queryObject: e, queryConfig: i, uniqueFeature: r, abortKey: n } = t, s = { ...i, returnDistinctValues: !0 };
   return await Is({
     queryObject: e,
@@ -8640,7 +8643,7 @@ async function tu(t) {
     // in case of querying for a unique feature, we know the query will bring back only 1 entry
   });
 }
-function iu(t) {
+function ru(t) {
   if (t !== void 0) {
     const e = gt.get(t);
     e !== void 0 && e.abort(), gt.set(t, new AbortController());
@@ -8652,7 +8655,7 @@ function ep(t) {
     upperBoundaryAlias: `charts_upper_boundary_${t}`
   };
 }
-async function ru(t) {
+async function nu(t) {
   const { queryObject: e, dateField: i, splitByField: r, queryConfig: n, temporalBinning: s } = t;
   let a = [], o;
   if (s) {
@@ -8917,10 +8920,10 @@ function Fs(t) {
 function dp(t) {
   return j(t)?.sourceJSON?.advancedQueryCapabilities?.supportsMaxRecordCountFactor === !0 ? _e.maxRecordCountFactor : void 0;
 }
-const nu = {
+const su = {
   sanitizeOutFields: Cs
 };
-function su(t) {
+function au(t) {
   let e, i, r;
   return t !== void 0 && (e = t.type, (e === di.UniqueValue || e === di.ClassBreaks) && (i = t.field ?? void 0, e === di.ClassBreaks && (r = t.normalizationField ?? void 0))), { rendererType: e, rendererField: i, rendererNormalizationField: r };
 }
@@ -8950,19 +8953,19 @@ const As = Ks(async (t) => {
   const s = new Js(n);
   return await s.load(), s;
 });
-async function au(t) {
-  const { layer: e, view: i, chartConfig: r } = t;
-  let n;
+async function ou(t) {
+  const { layer: e, view: i, chartConfig: r, filterByExtent: n } = t;
+  let s;
   if (e !== void 0) {
-    const s = V(e), a = j(s);
-    if (i !== void 0 && !a.isTable) {
-      a.outFields = ["*"];
-      const o = (d) => "highlight" in d, l = await i.whenLayerView(a);
-      o(l) && (n = l);
+    const a = V(e), o = j(a);
+    if (n && i !== void 0 && !o.isTable) {
+      o.outFields = ["*"];
+      const l = (p) => "highlight" in p, d = await i.whenLayerView(o);
+      l(d) && (s = d);
     } else
-      n = e;
-  } else "iLayer" in r && r.iLayer && (n = await As(r.iLayer));
-  return n;
+      s = e;
+  } else "iLayer" in r && r.iLayer && (s = await As(r.iLayer));
+  return s;
 }
 async function Dt(t, e) {
   const i = V(t);
@@ -8986,7 +8989,7 @@ async function Dt(t, e) {
 function Xi(t, e = []) {
   return e.find((i) => i.name === t);
 }
-function ou(t) {
+function lu(t) {
   return t.find((i) => i.type === M.OID)?.name ?? "";
 }
 function Os(t) {
@@ -8998,22 +9001,22 @@ function Os(t) {
     M.BigInteger
   ].includes(t.type);
 }
-function lu(t) {
+function du(t) {
   return t.type === M.Date;
 }
-function du(t) {
+function pu(t) {
   return [
     M.SmallInteger,
     M.Integer,
     M.BigInteger
   ].includes(t.type);
 }
-function pu(t) {
+function cu(t) {
   return t.filter(
     (e) => e.type === M.Date || e.type === M.DateOnly || e.type === M.TimestampOffset
   ).map((e) => e.name);
 }
-function cu(t) {
+function uu(t) {
   return t.filter((e) => Os(e)).map((e) => e.name);
 }
 function Ds(t) {
@@ -9046,7 +9049,7 @@ function Mi(t, e) {
     i.push({ id: o ?? "", name: s, domains: c });
   }), i.length === 0 ? void 0 : i;
 }
-function uu(t) {
+function fu(t) {
   let e;
   if (t !== void 0) {
     const i = V(t);
@@ -9068,7 +9071,7 @@ function uu(t) {
   }
   return e;
 }
-function fu(t) {
+function hu(t) {
   const { fieldName: e, fieldValueToMatch: i, subtypeInfo: r, fieldList: n } = t;
   let s;
   if ((typeof i != "string" || !me(i)) && !me(e) && (s = Ds({
@@ -9094,7 +9097,7 @@ function fu(t) {
   }
   return s;
 }
-async function hu(t) {
+async function yu(t) {
   let e = [];
   return !j(t).isTable && t.fieldsIndex && (e = await Gs.getRendererFields(t.renderer, t.fieldsIndex)), e;
 }
@@ -9104,7 +9107,7 @@ function Ls(t) {
   const r = i.indexOf(e);
   return i = r > -1 ? t.substring(0, r) : t, `${i}/rest/info`;
 }
-async function yu(t) {
+async function mu(t) {
   let e = !0;
   const i = ".arcgis.com/", r = t.url, n = r?.includes(i);
   if (r && n && j(t).sourceJSON.serviceItemId !== void 0) {
@@ -9139,7 +9142,7 @@ async function cp(t) {
     )
   )), n;
 }
-function mu(t) {
+function gu(t) {
   const { queryObject: e, chartConfig: i, runtimeDataFilters: r, ignoreViewExtent: n } = t, { series: s, dataFilters: a } = i, {
     where: o,
     gdbVersion: l,
@@ -9165,7 +9168,7 @@ function mu(t) {
     ignoreViewExtent: n
   }), _.distance = T ?? c, _.units = q ?? f, _.objectIds = G ?? h, _.spatialRelationship = H ?? y, Z?.outStatistics?.[0]?.statisticType === $.Count && (_.returnDistinctValues = Z?.returnDistinctValues ?? !1), _;
 }
-async function gu(t) {
+async function bu(t) {
   let e = [];
   return t !== void 0 && (e = await fp(t)), e;
 }
@@ -9196,7 +9199,7 @@ async function fp(t) {
   }
   return i;
 }
-const bu = {
+const Su = {
   getServerRestInfo: Ls,
   getSubtypeName: Ds,
   getFeatureTypes: Mi
@@ -21214,7 +21217,7 @@ Currently this property is only used for bar and line series.`,
   AdditionalProperties: "additionalProperties",
   Enum: "enum",
   AnyOf: "anyOf"
-}, Su = {
+}, wu = {
   BadData: "badData",
   EmptyDataSet: "emptyDataSet",
   HistogramEmptyField: "histogramEmptyField",
@@ -21497,16 +21500,6 @@ async function Bs(t, e) {
   }
   return i;
 }
-const wu = {
-  findCustomErrors: Bs,
-  findWarnings: Ms,
-  findNumericAggregationWarnings: Ns,
-  findDuplicateSeriesIDWarnings: Ws,
-  findLayerLoadError: Rs,
-  createStartingSchema: ut,
-  extractSchemaNameFromRefPath: $s,
-  customizeValidationErrors: Es
-};
 async function vu(t) {
   const { input: e, queryObject: i, allowUsingObjectIdStat: r } = t;
   let n;
@@ -21558,7 +21551,16 @@ function Iu(t) {
   }
   return i;
 }
-const Tu = [
+const Tu = {
+  findCustomErrors: Bs,
+  findWarnings: Ms,
+  findNumericAggregationWarnings: Ns,
+  findDuplicateSeriesIDWarnings: Ws,
+  findLayerLoadError: Rs,
+  createStartingSchema: ut,
+  extractSchemaNameFromRefPath: $s,
+  customizeValidationErrors: Es
+}, xu = [
   {
     unit: W.Second,
     threshold: 6e4,
@@ -21601,7 +21603,7 @@ const Tu = [
     unitMs: 1e3 * 60 * 60 * 24 * 7 * 4 * 12,
     preferredIntervalSize: [1, 2, 4, 5, 10, 25, 50, 100]
   }
-], xu = "{ groupByFieldsForStatistics } WHEN { dateField }>='{ startDate }' AND { dateField }{ endDateOperand }'{ endDate }' THEN '{ y }|{ binIndex}'", Cu = [
+], Cu = "{ groupByFieldsForStatistics } WHEN { dateField }>='{ startDate }' AND { dateField }{ endDateOperand }'{ endDate }' THEN '{ y }|{ binIndex}'", Fu = [
   ...zs,
   "ar-u-nu-latn",
   "en-AU",
@@ -21616,142 +21618,142 @@ const Tu = [
   "it-IT"
 ];
 export {
-  Bp as $,
-  Bd as A,
-  Pc as B,
+  al as $,
+  Md as A,
+  Bd as B,
   ks as C,
-  Su as D,
-  Pd as E,
-  Kt as F,
-  vi as G,
-  Xt as H,
-  qd as I,
-  _d as J,
-  jc as K,
-  zd as L,
-  qc as M,
-  k as N,
+  wu as D,
+  jc as E,
+  Pd as F,
+  Kt as G,
+  vi as H,
+  Xt as I,
+  qd as J,
+  _d as K,
+  qc as L,
+  zd as M,
+  _c as N,
   be as O,
-  Tu as P,
+  k as P,
   xu as Q,
-  Wp as R,
-  rl as S,
-  _e as T,
-  nl as U,
-  Mp as V,
+  Cu as R,
+  Wp as S,
+  rl as T,
+  _e as U,
+  nl as V,
   Ie as W,
-  pe as X,
-  sl as Y,
-  Qn as Z,
-  al as _,
+  Mp as X,
+  pe as Y,
+  sl as Z,
+  Qn as _,
   Ur as a,
-  Ol as a$,
-  Pp as a0,
-  jp as a1,
-  Zi as a2,
-  ol as a3,
-  ll as a4,
-  ye as a5,
-  Jn as a6,
-  qp as a7,
-  si as a8,
-  L as a9,
-  wl as aA,
-  Zp as aB,
-  Qp as aC,
-  vl as aD,
-  Il as aE,
-  Jp as aF,
-  Yp as aG,
-  mt as aH,
-  Kp as aI,
-  Xp as aJ,
-  ec as aK,
-  tc as aL,
-  ic as aM,
-  rc as aN,
-  nc as aO,
-  sc as aP,
-  Tl as aQ,
-  xl as aR,
-  Cl as aS,
-  ac as aT,
-  Fl as aU,
-  oc as aV,
-  lc as aW,
-  dc as aX,
-  Al as aY,
-  pc as aZ,
-  cc as a_,
-  Yn as aa,
-  F as ab,
-  Ft as ac,
-  pl as ad,
-  _p as ae,
-  Ri as af,
-  Vp as ag,
-  zp as ah,
-  zt as ai,
-  Ne as aj,
-  Nt as ak,
-  We as al,
-  Te as am,
-  Up as an,
-  cl as ao,
-  ul as ap,
-  fl as aq,
-  Gp as ar,
-  hl as as,
-  yl as at,
-  ml as au,
-  ze as av,
-  gl as aw,
-  bl as ax,
-  Sl as ay,
-  Hp as az,
+  cc as a$,
+  Bp as a0,
+  Pp as a1,
+  jp as a2,
+  Zi as a3,
+  ol as a4,
+  ll as a5,
+  ye as a6,
+  Jn as a7,
+  qp as a8,
+  si as a9,
+  Hp as aA,
+  wl as aB,
+  Zp as aC,
+  Qp as aD,
+  vl as aE,
+  Il as aF,
+  Jp as aG,
+  Yp as aH,
+  mt as aI,
+  Kp as aJ,
+  Xp as aK,
+  ec as aL,
+  tc as aM,
+  ic as aN,
+  rc as aO,
+  nc as aP,
+  sc as aQ,
+  Tl as aR,
+  xl as aS,
+  Cl as aT,
+  ac as aU,
+  Fl as aV,
+  oc as aW,
+  lc as aX,
+  dc as aY,
+  Al as aZ,
+  pc as a_,
+  L as aa,
+  Yn as ab,
+  F as ac,
+  Ft as ad,
+  pl as ae,
+  _p as af,
+  Ri as ag,
+  Vp as ah,
+  zp as ai,
+  zt as aj,
+  Ne as ak,
+  Nt as al,
+  We as am,
+  Te as an,
+  Up as ao,
+  cl as ap,
+  ul as aq,
+  fl as ar,
+  Gp as as,
+  hl as at,
+  yl as au,
+  ml as av,
+  ze as aw,
+  gl as ax,
+  bl as ay,
+  Sl as az,
   ia as b,
-  Zd as b$,
-  Dl as b0,
-  uc as b1,
-  fc as b2,
-  Zn as b3,
-  C as b4,
-  ve as b5,
-  ce as b6,
-  su as b7,
+  ws as b$,
+  Ol as b0,
+  Dl as b1,
+  uc as b2,
+  fc as b3,
+  Zn as b4,
+  C as b5,
+  ve as b6,
+  ce as b7,
   au as b8,
-  Dt as b9,
-  tu as bA,
+  ou as b9,
+  Is as bA,
   iu as bB,
-  ep as bC,
-  ru as bD,
-  gt as bE,
-  Ts as bF,
-  xs as bG,
-  bt as bH,
-  tp as bI,
-  ip as bJ,
-  rp as bK,
-  Ki as bL,
-  sp as bM,
-  ap as bN,
-  op as bO,
-  lp as bP,
-  Fs as bQ,
-  dp as bR,
-  nu as bS,
-  Vc as bT,
-  Ot as bU,
-  Gd as bV,
-  Hd as bW,
-  Yi as bX,
-  zc as bY,
-  j as bZ,
-  ws as b_,
-  Xi as ba,
-  ou as bb,
-  Os as bc,
-  lu as bd,
+  ru as bC,
+  ep as bD,
+  nu as bE,
+  gt as bF,
+  Ts as bG,
+  xs as bH,
+  bt as bI,
+  tp as bJ,
+  ip as bK,
+  rp as bL,
+  Ki as bM,
+  sp as bN,
+  ap as bO,
+  op as bP,
+  lp as bQ,
+  Fs as bR,
+  dp as bS,
+  su as bT,
+  zc as bU,
+  Ot as bV,
+  Gd as bW,
+  Hd as bX,
+  Yi as bY,
+  Uc as bZ,
+  j as b_,
+  Dt as ba,
+  Xi as bb,
+  lu as bc,
+  Os as bd,
   du as be,
   pu as bf,
   cu as bg,
@@ -21759,62 +21761,63 @@ export {
   fu as bi,
   hu as bj,
   yu as bk,
-  pp as bl,
-  cp as bm,
-  mu as bn,
+  mu as bl,
+  pp as bm,
+  cp as bn,
   gu as bo,
-  up as bp,
-  fp as bq,
-  bu as br,
-  Qc as bs,
-  Kd as bt,
-  Jc as bu,
+  bu as bp,
+  up as bq,
+  fp as br,
+  Su as bs,
+  Jc as bt,
+  Kd as bu,
   Yc as bv,
   Kc as bw,
   Xc as bx,
   eu as by,
-  Is as bz,
+  tu as bz,
   ra as c,
-  Qd as c0,
-  Uc as c1,
+  Zd as c0,
+  Qd as c1,
   Gc as c2,
   Hc as c3,
-  V as c4,
-  Jd as c5,
-  Zc as c6,
-  Cu as c7,
-  yc as c8,
-  mc as c9,
-  hc as cA,
-  v as cB,
-  _c as cC,
-  $r as cD,
-  gc as ca,
-  Id as cb,
-  Cd as cc,
-  us as cd,
-  bc as ce,
-  Sc as cf,
-  wc as cg,
-  vc as ch,
-  Ic as ci,
-  me as cj,
-  Fd as ck,
-  Tc as cl,
-  xc as cm,
-  Cc as cn,
-  Fc as co,
-  Ac as cp,
-  Oc as cq,
-  Dc as cr,
-  Ad as cs,
-  Od as ct,
-  Lc as cu,
-  kc as cv,
-  $c as cw,
-  Ec as cx,
-  Rc as cy,
-  b as cz,
+  Zc as c4,
+  V as c5,
+  Jd as c6,
+  Qc as c7,
+  Fu as c8,
+  yc as c9,
+  b as cA,
+  hc as cB,
+  v as cC,
+  Vc as cD,
+  $r as cE,
+  mc as ca,
+  gc as cb,
+  Id as cc,
+  Cd as cd,
+  us as ce,
+  bc as cf,
+  Sc as cg,
+  wc as ch,
+  vc as ci,
+  Ic as cj,
+  me as ck,
+  Fd as cl,
+  Tc as cm,
+  xc as cn,
+  Cc as co,
+  Fc as cp,
+  Ac as cq,
+  Oc as cr,
+  Dc as cs,
+  Ad as ct,
+  Od as cu,
+  Lc as cv,
+  kc as cw,
+  $c as cx,
+  Ec as cy,
+  Rc as cz,
   Pi as d,
   Pe as e,
   Dd as f,
@@ -21831,11 +21834,11 @@ export {
   Mc as q,
   Wd as r,
   Bc as s,
-  wu as t,
+  Pc as t,
   Ld as u,
   vu as v,
   kd as w,
   Iu as x,
-  Oe as y,
-  Md as z
+  Tu as y,
+  Oe as z
 };