@graphysdk/viz-engine 1.9.0-beta.1788852300554 → 1.9.0-beta.1788853316769

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.
@@ -1,4 +1,4 @@
1
- import { differenceInDays as Xe, isBefore as qe, isValid as h, isWithinInterval as Qe, parse as C } from "date-fns";
1
+ import { differenceInDays as Xe, isBefore as qe, isValid as h, isWithinInterval as Qe, parse as R } from "date-fns";
2
2
  import { isEqual as Je, isInteger as Ze } from "lodash-es";
3
3
  var Kr = (e) => e.length > 0;
4
4
  function be(e) {
@@ -336,15 +336,15 @@ var Te = "en-GB", we = class extends Error {
336
336
  }
337
337
  ], Oe = 1900, Se = 2199, vt = 3, At = 6, Et = 5, Mt = 1, Tt = 28, wt = /\s*[–—]\s*|\s-\s/, _t = (e) => typeof e == "number" ? Number.isNaN(e) ? !1 : e >= Oe && e <= Se : typeof e == "string" ? mt.test(e) : !1, Ne = (e, t) => {
338
338
  const r = V(e);
339
- return !t && O(r) ? kt(r) : typeof r == "string" ? t ? h(C(r, t, /* @__PURE__ */ new Date())) : !!Re(r) || $(r) && h(new Date(r)) : h(r);
339
+ return !t && O(r) ? kt(r) : typeof r == "string" ? t ? h(R(r, t, /* @__PURE__ */ new Date())) : !!Ce(r) || $(r) && h(new Date(r)) : h(r);
340
340
  }, V = (e) => {
341
341
  if (typeof e != "string") return e;
342
342
  let t = e;
343
343
  for (const [r, a] of pt) t = t.replace(r, a);
344
344
  return t;
345
- }, Re = (e, t = Te) => {
345
+ }, Ce = (e, t = Te) => {
346
346
  const r = V(e);
347
- return $(r) ? { type: "datetime" } : Ce(t).find((a) => !Y(a) || a.type === "month" && r.length < vt ? !1 : a.dateFormat && h(C(r, a.dateFormat, /* @__PURE__ */ new Date())));
347
+ return $(r) ? { type: "datetime" } : Re(t).find((a) => !Y(a) || a.type === "month" && r.length < vt ? !1 : a.dateFormat && h(R(r, a.dateFormat, /* @__PURE__ */ new Date())));
348
348
  }, $ = (e) => yt.test(e.trim()), ua = (e) => {
349
349
  if (e instanceof Date) return h(e) ? e : null;
350
350
  if (typeof e != "string" || !$(e)) return null;
@@ -356,7 +356,7 @@ var Te = "en-GB", we = class extends Error {
356
356
  const n = V(r).trim(), s = V(a).trim();
357
357
  return Dt(t).find((o) => {
358
358
  if (!Y(o) || !o.dateFormat) return !1;
359
- const i = C(n, o.dateFormat, /* @__PURE__ */ new Date()), c = C(s, o.dateFormat, /* @__PURE__ */ new Date());
359
+ const i = R(n, o.dateFormat, /* @__PURE__ */ new Date()), c = R(s, o.dateFormat, /* @__PURE__ */ new Date());
360
360
  if (!h(i) || !h(c)) return !1;
361
361
  const f = new dt(), y = f.incrementYearIfNeeded(i), p = f.incrementYearIfNeeded(c), g = Xe(p, y);
362
362
  return Qe(new Date(y.getFullYear(), Mt, Tt), {
@@ -364,7 +364,7 @@ var Te = "en-GB", we = class extends Error {
364
364
  end: p
365
365
  }) && g === Et ? !0 : g === At;
366
366
  });
367
- }, Ce = (e) => {
367
+ }, Re = (e) => {
368
368
  const t = {
369
369
  date: Ie(e),
370
370
  year: [["yyyy"]],
@@ -462,7 +462,7 @@ var Te = "en-GB", we = class extends Error {
462
462
  case "percentage":
463
463
  return Nt(e);
464
464
  case "currency":
465
- return Rt(e);
465
+ return Ct(e);
466
466
  case "datetime":
467
467
  case "date":
468
468
  case "year":
@@ -474,7 +474,7 @@ var Te = "en-GB", we = class extends Error {
474
474
  return ze(e, t.dateFormat, r);
475
475
  case "weekly_date_range":
476
476
  case "weekly_date_range_with_year":
477
- return Ct(e, t.dateFormat, r);
477
+ return Rt(e, t.dateFormat, r);
478
478
  case "text":
479
479
  return It(e);
480
480
  case "lookup":
@@ -488,12 +488,12 @@ var Te = "en-GB", we = class extends Error {
488
488
  if (a.length === 0) return null;
489
489
  const n = /* @__PURE__ */ new Date();
490
490
  if (t) {
491
- const o = C(a, t, n);
491
+ const o = R(a, t, n);
492
492
  return h(o) ? H(o) : null;
493
493
  }
494
- for (const o of Ce(r)) {
494
+ for (const o of Re(r)) {
495
495
  if (!Y(o) || !o.dateFormat) continue;
496
- const i = C(a, o.dateFormat, n);
496
+ const i = R(a, o.dateFormat, n);
497
497
  if (h(i)) return H(i);
498
498
  }
499
499
  const s = new Date(a);
@@ -516,15 +516,15 @@ var Te = "en-GB", we = class extends Error {
516
516
  if (!De(t)) return null;
517
517
  const r = Number(t.replace(/%/g, "").replace(/,/g, "")) / 100;
518
518
  return Number.isNaN(r) ? null : r;
519
- }, Rt = (e) => {
519
+ }, Ct = (e) => {
520
520
  if (typeof e == "number") return Number.isNaN(e) ? null : e;
521
521
  if (typeof e != "string") return null;
522
522
  const t = e.trim();
523
523
  return Be(t) ? Ue(Ve(t)) : null;
524
- }, Ct = (e, t, r) => {
524
+ }, Rt = (e, t, r) => {
525
525
  const a = String(e).trim().split(Ot), [n, s] = [a[0]?.trim(), a[1]?.trim()];
526
526
  return !n || !s ? null : ze(n, t, r);
527
- }, It = (e) => String(e).trim(), H = (e) => new Date(Date.UTC(e.getFullYear(), e.getMonth(), e.getDate(), e.getHours(), e.getMinutes(), e.getSeconds(), e.getMilliseconds())), R = process.env.NODE_ENV !== "production";
527
+ }, It = (e) => String(e).trim(), H = (e) => new Date(Date.UTC(e.getFullYear(), e.getMonth(), e.getDate(), e.getHours(), e.getMinutes(), e.getSeconds(), e.getMilliseconds())), C = process.env.NODE_ENV !== "production";
528
528
  var G = !0, fa = (e) => {
529
529
  G = e;
530
530
  }, ga = () => G, ya = () => {
@@ -535,10 +535,10 @@ var G = !0, fa = (e) => {
535
535
  };
536
536
  return Object.assign((a, n) => {
537
537
  if (!G)
538
- return R && (t.misses += 1), n();
538
+ return C && (t.misses += 1), n();
539
539
  if (e && We(e.args, a))
540
- return R && (t.hits += 1), e.out;
541
- R && (t.misses += 1);
540
+ return C && (t.hits += 1), e.out;
541
+ C && (t.misses += 1);
542
542
  const s = n();
543
543
  return e = {
544
544
  args: a,
@@ -557,14 +557,14 @@ var G = !0, fa = (e) => {
557
557
  };
558
558
  return Object.assign((a, n, s) => {
559
559
  if (!G)
560
- return R && (t.misses += 1), s();
560
+ return C && (t.misses += 1), s();
561
561
  const o = e.get(a);
562
562
  if (o) for (let c = 0; c < o.length; c += 1) {
563
563
  const f = o[c];
564
564
  if (f && We(f.args, n))
565
- return R && (t.hits += 1), c > 0 && (o.splice(c, 1), o.unshift(f)), f.out;
565
+ return C && (t.hits += 1), c > 0 && (o.splice(c, 1), o.unshift(f)), f.out;
566
566
  }
567
- R && (t.misses += 1);
567
+ C && (t.misses += 1);
568
568
  const i = s();
569
569
  return o ? (o.unshift({
570
570
  args: n,
@@ -1121,7 +1121,7 @@ var Kt = class {
1121
1121
  }, Xt = (e, t) => {
1122
1122
  const r = typeof e == "string" ? e.trim() : e;
1123
1123
  if (O(r)) return { type: "decimal" };
1124
- const a = typeof r == "string" && Re(r, t);
1124
+ const a = typeof r == "string" && Ce(r, t);
1125
1125
  if (a) return a;
1126
1126
  const n = typeof r == "string" && Ft(r, t);
1127
1127
  return n || (Ne(e) ? { type: "date" } : De(e) ? { type: "percentage" } : Be(e) && typeof e == "string" ? {
@@ -1737,7 +1737,7 @@ var N = (e) => {
1737
1737
  declarations: e
1738
1738
  }) })
1739
1739
  })
1740
- }, ar = "#B84737", nr = 0.4, Oa = "sm", Sa = 2, Na = 8, ce = Object.freeze({
1740
+ }, ar = "#B84737", nr = 0.4, Oa = "sm", Sa = 2, Na = 8, Ca = 12, ce = Object.freeze({
1741
1741
  light: "#F5F1E9",
1742
1742
  dark: "#1F1E1C"
1743
1743
  }), sr = "#ffffff", Ra = 1, de = 1, or = 0.3, ir = 10, lr = 24, cr = 8, ue = Object.freeze({
@@ -2051,7 +2051,7 @@ for (const e of Ke) {
2051
2051
  for (const t of Object.values(e.declarations)) typeof t == "object" && Object.freeze(t);
2052
2052
  Object.freeze(e.declarations), e.when !== void 0 && Object.freeze(e.when), Object.freeze(e);
2053
2053
  }
2054
- var Ca = Object.freeze({
2054
+ var Ia = Object.freeze({
2055
2055
  tokens: Object.freeze(dr),
2056
2056
  defaults: Object.freeze(Ke),
2057
2057
  overrides: Object.freeze([])
@@ -2118,12 +2118,12 @@ var Ca = Object.freeze({
2118
2118
  new gr(),
2119
2119
  new yr(),
2120
2120
  new mr()
2121
- ], Ia = class extends Kt {
2121
+ ], xa = class extends Kt {
2122
2122
  constructor() {
2123
2123
  super("transform");
2124
2124
  for (const e of pr) this.register(e.transformType, e);
2125
2125
  }
2126
- }, xa = [
2126
+ }, Ba = [
2127
2127
  "brick",
2128
2128
  "grey",
2129
2129
  "red",
@@ -2134,7 +2134,7 @@ var Ca = Object.freeze({
2134
2134
  "blue",
2135
2135
  "purple",
2136
2136
  "pink"
2137
- ], Ba = [
2137
+ ], Va = [
2138
2138
  "cyan",
2139
2139
  "pink",
2140
2140
  "purple",
@@ -2295,7 +2295,7 @@ var Ca = Object.freeze({
2295
2295
  pink200: "#FED0F3",
2296
2296
  pink100: "#FFE8F9",
2297
2297
  pink50: "#FFF4FC"
2298
- }, Va = [j.brick100, j.brick900], Er = [
2298
+ }, ja = [j.brick100, j.brick900], Er = [
2299
2299
  j.grey200,
2300
2300
  _.green,
2301
2301
  _.red,
@@ -2432,7 +2432,7 @@ var Ca = Object.freeze({
2432
2432
  z.positive,
2433
2433
  z.negative,
2434
2434
  z.total
2435
- ], ja = {
2435
+ ], Pa = {
2436
2436
  transform: "linear",
2437
2437
  reverse: !1,
2438
2438
  nice: !0,
@@ -2444,16 +2444,16 @@ var Ca = Object.freeze({
2444
2444
  interpolate: "lab",
2445
2445
  domainMid: null,
2446
2446
  symmetric: !1
2447
- }, Pa = {
2447
+ }, za = {
2448
2448
  size: [4, 20],
2449
2449
  alpha: [0.1, 1],
2450
2450
  strokeWidth: [1, 4]
2451
- }, za = {
2451
+ }, Ua = {
2452
2452
  domainMin: null,
2453
2453
  domainMax: null,
2454
2454
  nice: !1,
2455
2455
  reverse: !1
2456
- }, Ua = {
2456
+ }, Wa = {
2457
2457
  range: null,
2458
2458
  domain: null,
2459
2459
  padding: 0.1,
@@ -2466,7 +2466,7 @@ function wr(e) {
2466
2466
  const t = P.indexOf(E[e]);
2467
2467
  return t <= 0 ? P : [...P.slice(t), ...P.slice(0, t)];
2468
2468
  }
2469
- function Wa(e, t = {}) {
2469
+ function Ya(e, t = {}) {
2470
2470
  switch (e.type) {
2471
2471
  case "default":
2472
2472
  return t.hasTouchingGeoms ? he(br, t.colorScheme ?? "light", t.groupCount) : hr;
@@ -2482,7 +2482,7 @@ function Wa(e, t = {}) {
2482
2482
  return e.colors;
2483
2483
  }
2484
2484
  }
2485
- function Ya(e, t) {
2485
+ function $a(e, t) {
2486
2486
  if (!t) return e;
2487
2487
  const r = [...e];
2488
2488
  for (const [a, n] of Object.entries(t)) {
@@ -2493,7 +2493,7 @@ function Ya(e, t) {
2493
2493
  }
2494
2494
  return r;
2495
2495
  }
2496
- function $a(e, t, r, a) {
2496
+ function Ga(e, t, r, a) {
2497
2497
  if (!t) return;
2498
2498
  const n = r?.type === "custom" ? a[r.id] : void 0, s = {};
2499
2499
  for (const [o, i] of Object.entries(t)) {
@@ -2519,7 +2519,7 @@ function $a(e, t, r, a) {
2519
2519
  }
2520
2520
  return Object.keys(s).length > 0 ? s : void 0;
2521
2521
  }
2522
- function Ga(e, t, r) {
2522
+ function Ha(e, t, r) {
2523
2523
  if (!t) return pe.palette;
2524
2524
  if (t.type === "custom") {
2525
2525
  const a = r[t.id];
@@ -2609,24 +2609,24 @@ function _r(e, t = {}) {
2609
2609
  overrides: t.overrides
2610
2610
  };
2611
2611
  }
2612
- var Ha = { labelCrossPosition: 0.5 }, Ka = {
2612
+ var Ka = { labelCrossPosition: 0.5 }, Xa = {
2613
2613
  kind: "rectangle",
2614
2614
  zOrder: "foreground"
2615
- }, Xa = {
2615
+ }, qa = {
2616
2616
  zOrder: "foreground",
2617
2617
  fit: "contain"
2618
- }, qa = {
2618
+ }, Qa = {
2619
2619
  x: 8,
2620
2620
  y: 8,
2621
2621
  unit: "px"
2622
- }, Qa = { align: "center" }, Ja = {
2622
+ }, Ja = { align: "center" }, Za = {
2623
2623
  startArrowheadStyle: "none",
2624
2624
  endArrowheadStyle: "line-arrow"
2625
- }, Za = {
2625
+ }, en = {
2626
2626
  thin: 2,
2627
2627
  medium: 4,
2628
2628
  thick: 8
2629
- }, en = 0.5, tn = {
2629
+ }, tn = 0.5, rn = {
2630
2630
  borderWidth: 2,
2631
2631
  shadow: {
2632
2632
  offsetX: 0,
@@ -2634,7 +2634,7 @@ var Ha = { labelCrossPosition: 0.5 }, Ka = {
2634
2634
  blur: 1.15,
2635
2635
  color: "rgba(0, 0, 0, 0.16)"
2636
2636
  }
2637
- }, rn = {
2637
+ }, an = {
2638
2638
  small: {
2639
2639
  arrow: { strokeWidth: 2 },
2640
2640
  label: {
@@ -2673,14 +2673,14 @@ var Ha = { labelCrossPosition: 0.5 }, Ka = {
2673
2673
  "lg",
2674
2674
  "xl",
2675
2675
  "full"
2676
- ], an = {
2676
+ ], nn = {
2677
2677
  point: Dr,
2678
2678
  line: kr,
2679
2679
  area: Lr,
2680
2680
  bar: Or,
2681
2681
  rule: Sr,
2682
2682
  tile: Nr
2683
- }, nn = (e) => typeof e == "string" && Fr.includes(e);
2683
+ }, sn = (e) => typeof e == "string" && Fr.includes(e);
2684
2684
  function x(e, t) {
2685
2685
  return {
2686
2686
  type: "layer",
@@ -2714,15 +2714,15 @@ function Sr(e = {}) {
2714
2714
  function Nr(e = {}) {
2715
2715
  return x("tile", e);
2716
2716
  }
2717
- var Rr = [
2717
+ var Cr = [
2718
2718
  "grouped-bars",
2719
2719
  "stacked-bars",
2720
2720
  "lines"
2721
- ], Cr = {
2721
+ ], Rr = {
2722
2722
  "grouped-bars": "dodge",
2723
2723
  "stacked-bars": "stack",
2724
2724
  lines: null
2725
- }, sn = (e) => e === "identity" ? "grouped-bars" : Rr.find((t) => Cr[t] === e) ?? null, on = {
2725
+ }, on = (e) => e === "identity" ? "grouped-bars" : Cr.find((t) => Rr[t] === e) ?? null, ln = {
2726
2726
  cartesian: (e = {}) => ({
2727
2727
  type: "coord",
2728
2728
  coordType: "cartesian",
@@ -2738,7 +2738,7 @@ var Rr = [
2738
2738
  coordType: "polar",
2739
2739
  params: e
2740
2740
  })
2741
- }, ln = {
2741
+ }, cn = {
2742
2742
  x: Object.assign((e) => Q("x", e), {
2743
2743
  continuous: (e) => b("x", e),
2744
2744
  discrete: (e) => D("x", e),
@@ -2802,7 +2802,7 @@ var Rr = [
2802
2802
  discrete: (e) => D("lineType", e),
2803
2803
  identity: (e) => U("lineType", e)
2804
2804
  }
2805
- }, cn = {
2805
+ }, dn = {
2806
2806
  identity: xr,
2807
2807
  count: Br,
2808
2808
  smooth: Ir,
@@ -2829,7 +2829,7 @@ function Vr() {
2829
2829
  function jr() {
2830
2830
  return { type: "sum" };
2831
2831
  }
2832
- var dn = {
2832
+ var un = {
2833
2833
  reshape: Pr,
2834
2834
  filter: zr,
2835
2835
  sort: Ur,
@@ -2887,131 +2887,132 @@ function $r(e) {
2887
2887
  }
2888
2888
  };
2889
2889
  }
2890
- function un(e) {
2890
+ function fn(e) {
2891
2891
  return {
2892
2892
  type: "config",
2893
2893
  config: $r(e)
2894
2894
  };
2895
2895
  }
2896
2896
  export {
2897
- wa as $,
2898
- Ee as $t,
2899
- Ga as A,
2900
- lt as At,
2901
- xa as B,
2902
- Te as Bt,
2897
+ _a as $,
2898
+ at as $t,
2899
+ Ha as A,
2900
+ dt as At,
2901
+ Ba as B,
2902
+ we as Bt,
2903
2903
  _r as C,
2904
- fa as Ct,
2904
+ ga as Ct,
2905
2905
  q as D,
2906
- ua as Dt,
2906
+ St as Dt,
2907
2907
  D as E,
2908
- St as Et,
2909
- Ua as F,
2910
- Y as Ft,
2908
+ C as Et,
2909
+ Wa as F,
2910
+ ct as Ft,
2911
2911
  nr as G,
2912
- sa as Gt,
2913
- Ia as H,
2914
- it as Ht,
2915
- Pa as I,
2916
- da as It,
2912
+ na as Gt,
2913
+ xa as H,
2914
+ ia as Ht,
2915
+ za as I,
2916
+ Y as It,
2917
2917
  Ra as J,
2918
- tt as Jt,
2918
+ Ae as Jt,
2919
2919
  ar as K,
2920
- oa as Kt,
2920
+ sa as Kt,
2921
2921
  hr as L,
2922
- A as Lt,
2923
- Wa as M,
2924
- ca as Mt,
2925
- ja as N,
2926
- _e as Nt,
2922
+ da as Lt,
2923
+ Ya as M,
2924
+ la as Mt,
2925
+ Pa as N,
2926
+ ca as Nt,
2927
2927
  b as O,
2928
- ut as Ot,
2929
- za as P,
2930
- ct as Pt,
2931
- _a as Q,
2932
- at as Qt,
2928
+ ua as Ot,
2929
+ Ua as P,
2930
+ _e as Pt,
2931
+ Sa as Q,
2932
+ st as Qt,
2933
2933
  br as R,
2934
- W as Rt,
2935
- en as S,
2936
- ga as St,
2934
+ A as Rt,
2935
+ tn as S,
2936
+ ya as St,
2937
2937
  U as T,
2938
- R as Tt,
2939
- Ca as U,
2940
- Me as Ut,
2941
- Ba as V,
2942
- ia as Vt,
2938
+ ma as Tt,
2939
+ Ia as U,
2940
+ it as Ut,
2941
+ Va as V,
2942
+ Te as Vt,
2943
2943
  Oa as W,
2944
- na as Wt,
2945
- Na as X,
2946
- rt as Xt,
2947
- sr as Y,
2948
- Zr as Yt,
2949
- Sa as Z,
2950
- st as Zt,
2951
- rn as _,
2952
- pa as _t,
2953
- on as a,
2954
- Jr as an,
2955
- Fa as at,
2956
- Ka as b,
2957
- xt as bt,
2958
- sn as c,
2959
- J as cn,
2960
- ka as ct,
2961
- an as d,
2962
- Kr as dn,
2963
- u as dt,
2964
- nt as en,
2965
- va as et,
2966
- nn as f,
2967
- Xr as fn,
2968
- ha as ft,
2969
- Ha as g,
2970
- te as gt,
2971
- Za as h,
2972
- $t as ht,
2973
- ln as i,
2974
- ta as in,
2975
- Aa as it,
2976
- $a as j,
2977
- la as jt,
2978
- Ya as k,
2979
- dt as kt,
2944
+ Me as Wt,
2945
+ sr as X,
2946
+ Zr as Xt,
2947
+ Ca as Y,
2948
+ tt as Yt,
2949
+ Na as Z,
2950
+ rt as Zt,
2951
+ an as _,
2952
+ te as _t,
2953
+ ln as a,
2954
+ ta as an,
2955
+ Aa as at,
2956
+ Xa as b,
2957
+ Bt as bt,
2958
+ on as c,
2959
+ et as cn,
2960
+ Da as ct,
2961
+ nn as d,
2962
+ be as dn,
2963
+ La as dt,
2964
+ Ee as en,
2965
+ wa as et,
2966
+ sn as f,
2967
+ Kr as fn,
2968
+ u as ft,
2969
+ Ka as g,
2970
+ $t as gt,
2971
+ en as h,
2972
+ Kt as ht,
2973
+ cn as i,
2974
+ m as in,
2975
+ Ta as it,
2976
+ Ga as j,
2977
+ lt as jt,
2978
+ $a as k,
2979
+ ut as kt,
2980
2980
  Fr as l,
2981
- qr as ln,
2982
- d as lt,
2983
- tn as m,
2984
- Kt as mt,
2985
- dn as n,
2986
- aa as nn,
2987
- Ma as nt,
2988
- Cr as o,
2989
- Qr as on,
2990
- Ea as ot,
2991
- Ja as p,
2992
- Jt as pt,
2981
+ J as ln,
2982
+ ka as lt,
2983
+ rn as m,
2984
+ Jt as mt,
2985
+ un as n,
2986
+ ra as nn,
2987
+ ba as nt,
2988
+ Rr as o,
2989
+ Jr as on,
2990
+ Fa as ot,
2991
+ Za as p,
2992
+ Xr as pn,
2993
+ ha as pt,
2993
2994
  ce as q,
2994
- Ae as qt,
2995
- cn as r,
2996
- m as rn,
2997
- Ta as rt,
2998
- Rr as s,
2999
- et as sn,
3000
- Da as st,
3001
- un as t,
3002
- ra as tn,
3003
- ba as tt,
2995
+ oa as qt,
2996
+ dn as r,
2997
+ aa as rn,
2998
+ Ma as rt,
2999
+ Cr as s,
3000
+ Qr as sn,
3001
+ Ea as st,
3002
+ fn as t,
3003
+ nt as tn,
3004
+ va as tt,
3004
3005
  x as u,
3005
- be as un,
3006
- La as ut,
3007
- Xa as v,
3008
- Z as vt,
3006
+ qr as un,
3007
+ d as ut,
3008
+ qa as v,
3009
+ pa as vt,
3009
3010
  Q as w,
3010
- ma as wt,
3011
- Qa as x,
3012
- ya as xt,
3013
- qa as y,
3014
- Bt as yt,
3015
- Va as z,
3016
- we as zt
3011
+ fa as wt,
3012
+ Ja as x,
3013
+ xt,
3014
+ Qa as y,
3015
+ Z as yt,
3016
+ ja as z,
3017
+ W as zt
3017
3018
  };