@konoui/mjimage 0.9.0 → 0.11.0

package/dist/index.js

@@ -1,4 +1,4 @@
-const vn = "MS Gothic, sans-serif", wt = {
+const Sn = "MS Gothic, sans-serif", wt = {
   WIDTH: 66,
   HEIGHT: 90,
   TEXT_SCALE: 0.8,
@@ -6,7 +6,7 @@ const vn = "MS Gothic, sans-serif", wt = {
 }, en = {
   WIDTH: 125,
   HEIGHT: 27.5
-}, bs = { BASE: 40 }, X = ",", p = {
+}, Is = { BASE: 40 }, X = ",", p = {
   /**
    * 萬子
    */
@@ -27,7 +27,7 @@ const vn = "MS Gothic, sans-serif", wt = {
    * 裏牌
    */
   BACK: "_"
-}, g = {
+}, m = {
   /**
    * ツモ牌を表す
    */
@@ -148,7 +148,7 @@ const vn = "MS Gothic, sans-serif", wt = {
   [_.S]: "南",
   [_.W]: "西",
   [_.N]: "北"
-}, Sn = {
+}, On = {
   [k.E1]: "東１局",
   [k.E2]: "東２局",
   [k.E3]: "東３局",
@@ -170,7 +170,7 @@ function I(s, t) {
   if (!s)
     throw new Error(t);
 }
-class Lo {
+class Go {
   ctx = null;
   strText;
   numText;
@@ -197,13 +197,13 @@ class Lo {
   };
   measureTableFontContext = (t) => {
     const e = this.measureFontContext(
-      vn,
-      bs.BASE * t
+      Sn,
+      Is.BASE * t
     );
     return e.textHeight = e.textWidth, e.numHeight = e.numWidth, e;
   };
 }
-class As {
+class Ns {
   input;
   position;
   nextPosition;
@@ -237,29 +237,29 @@ class As {
 const fe = (s, t) => {
   if (s.t == t.t) {
     if (O(s) && O(t)) {
-      if (s.has(g.RED)) return -1;
-      if (t.has(g.RED)) return 1;
+      if (s.has(m.RED)) return -1;
+      if (t.has(m.RED)) return 1;
     }
     return s.n - t.n;
   }
   const e = [p.M, p.P, p.S, p.Z, p.BACK];
   return e.indexOf(s.t) - e.indexOf(t.t);
-}, Is = (s, t) => {
+}, Ts = (s, t) => {
   const e = [
-    g.HORIZONTAL,
-    g.TSUMO,
-    g.RON,
-    g.IMAGE_DORA,
-    g.COLOR_GRAYSCALE,
-    g.RED
+    m.HORIZONTAL,
+    m.TSUMO,
+    m.RON,
+    m.IMAGE_DORA,
+    m.COLOR_GRAYSCALE,
+    m.RED
   ];
   return e.indexOf(s) - e.indexOf(t);
-}, Ns = (s) => {
+}, vs = (s) => {
   const t = [];
   s.forEach((n, i) => {
-    n.has(g.HORIZONTAL) && t.push(i);
+    n.has(m.HORIZONTAL) && t.push(i);
   });
-  const e = s.filter((n) => !n.has(g.HORIZONTAL)).sort(fe);
+  const e = s.filter((n) => !n.has(m.HORIZONTAL)).sort(fe);
   return t.forEach((n) => {
     e.splice(n, 0, s[n]);
   }), e;
@@ -267,7 +267,7 @@ const fe = (s, t) => {
 function O(s) {
   return s.isNum() && s.n == 5;
 }
-function Ts(s) {
+function Ss(s) {
   const t = Object.values(p).find((e) => e === s);
   return t ? [t, !0] : [p.BACK, !1];
 }
@@ -287,7 +287,7 @@ class y {
    * 文字列の牌を返す。
    */
   toString() {
-    return this.t === p.BACK ? this.t : `${[...this.ops].sort(Is).join("")}${this.n}${this.t}`;
+    return this.t === p.BACK ? this.t : `${[...this.ops].sort(Ts).join("")}${this.n}${this.t}`;
   }
   toJSON() {
     return this.toString();
@@ -327,7 +327,7 @@ class T {
   _type;
   constructor(t, e) {
     if (this._tiles = t, this._type = e, this.isCalled()) {
-      this._tiles = Ns(this._tiles);
+      this._tiles = vs(this._tiles);
       return;
     }
     if (this._type != E.IMAGE_DISCARD) {
@@ -414,7 +414,7 @@ class T {
     return e && (n[e.idx] = e.tile), ne(n, this._type);
   }
 }
-const _t = (s) => s[0].t === p.BACK ? s.join("") : `${s.map((e) => e.toString().slice(0, -1)).join("")}${s[0].t}`, De = (s) => {
+const bt = (s) => s[0].t === p.BACK ? s.join("") : `${s.map((e) => e.toString().slice(0, -1)).join("")}${s[0].t}`, De = (s) => {
   if (s.length == 0) return "";
   let t = s[0].t, e = "";
   for (const i of s) {
@@ -432,7 +432,7 @@ class V extends T {
     return T.deserialize({ tiles: t, type: E.CHI });
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
 class U extends T {
@@ -443,7 +443,7 @@ class U extends T {
     return T.deserialize({ tiles: t, type: E.PON });
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
 class R extends T {
@@ -452,7 +452,7 @@ class R extends T {
     if (e.length < t.length) {
       if (O(n)) {
         const i = new y(n.t, 5);
-        super([i.clone({ add: g.RED }), i, i, i], E.AN_KAN);
+        super([i.clone({ add: m.RED }), i, i, i], E.AN_KAN);
         return;
       }
       super([n, n, n, n], E.AN_KAN);
@@ -470,7 +470,7 @@ class R extends T {
    * ブロックを構成する裏返しの牌を含む牌の配列を返す。
    */
   get tilesWithBack() {
-    const t = this.tiles[0].clone({ remove: g.RED }), e = O(t) ? t.clone({ add: g.RED }) : t;
+    const t = this.tiles[0].clone({ remove: m.RED }), e = O(t) ? t.clone({ add: m.RED }) : t;
     return [new y(p.BACK, 0), e, t, new y(p.BACK, 0)];
   }
   static from(t) {
@@ -488,10 +488,10 @@ class z extends T {
     return T.deserialize({ tiles: t, type: E.DAI_KAN });
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
-class H extends T {
+class P extends T {
   constructor(t) {
     super(t, E.SHO_KAN);
   }
@@ -503,11 +503,11 @@ class H extends T {
    * カカンした牌はポンした牌の前に追加される。
    */
   static fromPon(t, e) {
-    const n = t.tiles.findIndex((r) => r.has(g.HORIZONTAL)), i = [...t.tiles];
-    return i.splice(n, 0, e.clone({ add: g.HORIZONTAL })), new H(i);
+    const n = t.tiles.findIndex((r) => r.has(m.HORIZONTAL)), i = [...t.tiles];
+    return i.splice(n, 0, e.clone({ add: m.HORIZONTAL })), new P(i);
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
 class C extends T {
@@ -515,13 +515,13 @@ class C extends T {
     super([t, e], E.PAIR);
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
   static from(t) {
     return T.deserialize({ tiles: t, type: E.PAIR });
   }
 }
-class K extends T {
+class L extends T {
   constructor(t) {
     super(t, E.THREE);
   }
@@ -529,7 +529,7 @@ class K extends T {
     return T.deserialize({ tiles: t, type: E.THREE });
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
 class gt extends T {
@@ -540,10 +540,10 @@ class gt extends T {
     return T.deserialize({ tiles: t, type: E.RUN });
   }
   toString() {
-    return _t(this.tiles);
+    return bt(this.tiles);
   }
 }
-class On extends T {
+class kn extends T {
   constructor(t) {
     super([t], E.ISOLATED);
   }
@@ -568,7 +568,7 @@ class Tt extends T {
     return De(this.tiles);
   }
 }
-class Ke extends T {
+class Le extends T {
   constructor(t, e) {
     super(t, e);
   }
@@ -579,9 +579,9 @@ class Ke extends T {
 const ne = (s, t) => {
   switch (t) {
     case E.CHI:
-      const e = s.find((i) => i.has(g.HORIZONTAL));
+      const e = s.find((i) => i.has(m.HORIZONTAL));
       I(e != null, `chi block does not have horizontal ops: ${s}`);
-      const n = s.filter((i) => !i.has(g.HORIZONTAL));
+      const n = s.filter((i) => !i.has(m.HORIZONTAL));
       return new V([e, n[0], n[1]]);
     case E.PON:
       return new U([s[0], s[1], s[2]]);
@@ -590,19 +590,19 @@ const ne = (s, t) => {
     case E.DAI_KAN:
       return new z(s);
     case E.SHO_KAN:
-      return new H(s);
+      return new P(s);
     case E.THREE:
-      return new K(s);
+      return new L(s);
     case E.RUN:
       return new gt(s);
     case E.PAIR:
       return new C(s[0], s[1]);
     case E.ISOLATED:
-      return new On(s[0]);
+      return new kn(s[0]);
     case E.HAND:
       return new Tt(s);
     default:
-      return new Ke(s, t);
+      return new Le(s, t);
   }
 };
 class D {
@@ -630,7 +630,7 @@ class D {
    * セパレータ前後は一つのブロックを意味する。
    */
   tileSeparators() {
-    const t = new As(this.input), e = [];
+    const t = new Ns(this.input), e = [];
     let n = [];
     for (this.validate(this.input); ; ) {
       t.skipWhitespace();
@@ -646,15 +646,15 @@ class D {
           e.push(new y(r, 0)), t.readChar();
           continue;
         }
-        e.push(...Ss(n, r)), n = [], t.readChar();
+        e.push(...ks(n, r)), n = [], t.readChar();
         continue;
       } else {
-        const [a, c] = Os(t);
+        const [a, c] = Cs(t);
         if (c) {
           n.push(a), t.readChar();
           continue;
         }
-        const [l, d] = kn(i);
+        const [l, d] = Cn(i);
         if (!d) throw new Error(`expected a number but got: ${i}`);
         n.push({ n: l });
       }
@@ -666,12 +666,12 @@ class D {
   }
   reconstruct(t) {
     if (t.length > 18) return t;
-    const e = t.findIndex((a) => a instanceof y && a.has(g.TSUMO));
+    const e = t.findIndex((a) => a instanceof y && a.has(m.TSUMO));
     if (e < 0) return t;
     const n = t.findIndex((a) => a === X);
     if (n > -1 && e > n) return t;
     const i = n < 0 ? t.length : n, r = t.slice(0, i), o = r[e];
-    return r.some((a) => a instanceof y && a.has(g.HORIZONTAL)) ? t : [
+    return r.some((a) => a instanceof y && a.has(m.HORIZONTAL)) ? t : [
       ...r.slice(0, e),
       ...r.slice(e + 1, i),
       X,
@@ -708,14 +708,14 @@ class D {
 function nn(s) {
   if (s.length === 0) return E.UNKNOWN;
   if (s.length === 1)
-    return s[0].has(g.IMAGE_DORA) ? E.IMAGE_DORA : s[0].has(g.TSUMO) ? E.TSUMO : E.HAND;
-  const t = s.every((r) => r.equals(s[0])), e = s.filter((r) => r.has(g.HORIZONTAL)).length, n = s.filter(
-    (r) => r.has(g.TSUMO) || r.has(g.IMAGE_DORA)
+    return s[0].has(m.IMAGE_DORA) ? E.IMAGE_DORA : s[0].has(m.TSUMO) ? E.TSUMO : E.HAND;
+  const t = s.every((r) => r.equals(s[0])), e = s.filter((r) => r.has(m.HORIZONTAL)).length, n = s.filter(
+    (r) => r.has(m.TSUMO) || r.has(m.IMAGE_DORA)
   ).length, i = s.filter((r) => r.t == p.BACK).length;
   if (n > 0) return E.UNKNOWN;
   if (e == 0 && i == 0) return E.HAND;
   if (s.length === 3 && i === 0)
-    return t ? E.PON : e == 1 && vs(s) ? E.CHI : E.IMAGE_DISCARD;
+    return t ? E.PON : e == 1 && Os(s) ? E.CHI : E.IMAGE_DISCARD;
   if (s.length == 4 && i == 2) return E.AN_KAN;
   if (s.length == 4 && t) {
     if (e == 1) return E.DAI_KAN;
@@ -723,7 +723,7 @@ function nn(s) {
   }
   return e == 1 || n == 0 ? E.IMAGE_DISCARD : E.UNKNOWN;
 }
-function vs(s) {
+function Os(s) {
   const t = [...s].sort(fe);
   if (t.some((n) => t[0].t != n.t)) return !1;
   const e = t.map((n) => n.n);
@@ -731,14 +731,14 @@ function vs(s) {
     if (e[n] != e[n + 1] - 1) return !1;
   return !0;
 }
-function Ss(s, t) {
+function ks(s, t) {
   return s.map((e) => {
     let n = new y(t, e.n, e.ops);
-    return n.isNum() && n.n == 0 && (n = n.clone({ n: 5, add: g.RED })), n;
+    return n.isNum() && n.n == 0 && (n = n.clone({ n: 5, add: m.RED })), n;
   });
 }
 function sn(s, t) {
-  const [e, n] = Ts(s);
+  const [e, n] = Ss(s);
   if (n) return [e, !0];
   if ((s === "w" || s === "d") && t.length > 0) {
     for (let r = 0; r < t.length; r++) {
@@ -749,49 +749,46 @@ function sn(s, t) {
   }
   return [p.BACK, !1];
 }
-function kn(s) {
+function Cn(s) {
   const t = Number(s), e = 0 <= t && t <= 9;
   return [t, e];
 }
-function Os(s) {
-  const t = Object.values(g);
+function Cs(s) {
+  const t = Object.values(m);
   if (!t.includes(s.char)) return [new y(p.BACK, 0), !1];
   const e = [];
   for (let n = 0; n < 4; n++) {
     const i = s.peekCharN(n);
     if (t.includes(i)) e.push(i);
     else {
-      const [r, o] = kn(i);
+      const [r, o] = Cn(i);
       if (!o) break;
       for (const c of e) s.readChar();
       const a = new y(p.BACK, r, e);
-      if (a.has(g.RED) && a.n != 5)
+      if (a.has(m.RED) && a.n != 5)
         throw new Error(`red dora operator can only be used with 5, got: ${r}`);
-      if (a.has(g.IMAGE_DORA) && a.has(g.TSUMO))
+      if (a.has(m.IMAGE_DORA) && a.has(m.TSUMO))
         throw new Error("cannot specify both dora and tsumo operators");
       return [a, !0];
     }
   }
   return [new y(p.BACK, 0), !1];
 }
-function W(s, t = !1) {
-  const e = {
-    [_.E]: s,
-    [_.S]: s,
-    [_.W]: s,
-    [_.N]: s
+function W(s) {
+  return {
+    [_.E]: s(),
+    [_.S]: s(),
+    [_.W]: s(),
+    [_.N]: s()
   };
-  if (t)
-    for (let n of Object.values(_)) e[n] = structuredClone(s);
-  return e;
 }
 const te = (s) => {
   let t = s.substring(0, 2), e = Number(s.substring(2, 3));
   return e == 4 ? (e = 1, t = vt(t)) : e++, `${t}${e}`;
-}, zo = (s) => te(te(te(s))), ks = (s) => s.substring(0, 2), vt = (s) => {
+}, Zo = (s) => te(te(te(s))), Rs = (s) => s.substring(0, 2), vt = (s) => {
   let t = Number(s.toString()[0]);
   return t = t % 4 + 1, `${t}${p.Z}`;
-}, Le = (s) => {
+}, Ke = (s) => {
   let t = Number(s.toString()[0]);
   const e = [1, 4, 3, 2], n = e.indexOf(t);
   return `${e[(n + 1) % e.length]}${p.Z}`;
@@ -835,12 +832,12 @@ function ze(...s) {
     }
   }
 }
-function Cs(...s) {
+function Ms(...s) {
   return ze(...s);
 }
-const { cos: Rs, sin: Ms, PI: xs } = Math;
-function $s(s, t, e) {
-  const n = Rs(s), i = Ms(s), r = {
+const { cos: xs, sin: $s, PI: Ps } = Math;
+function Hs(s, t, e) {
+  const n = xs(s), i = $s(s), r = {
     a: n,
     c: -i,
     e: 0,
@@ -854,17 +851,17 @@ function $s(s, t, e) {
     Ne(-t, -e)
   ]);
 }
-function Hs(s, t = void 0, e = void 0) {
-  return $s(s * xs / 180, t, e);
+function Bs(s, t = void 0, e = void 0) {
+  return Hs(s * Ps / 180, t, e);
 }
-function Ps(s) {
-  return Bs(s);
+function Ws(s) {
+  return Ds(s);
 }
-function Bs(s) {
+function Ds(s) {
   return `matrix(${s.a},${s.b},${s.c},${s.d},${s.e},${s.f})`;
 }
-const Cn = ":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD", Ws = Cn + "\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040", Ds = "[" + Cn + "][" + Ws + "]*", Ks = new RegExp("^" + Ds + "$");
-function Rn(s, t) {
+const Rn = ":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD", Ls = Rn + "\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040", Ks = "[" + Rn + "][" + Ls + "]*", zs = new RegExp("^" + Ks + "$");
+function Mn(s, t) {
   const e = [];
   let n = t.exec(s);
   for (; n; ) {
@@ -878,19 +875,19 @@ function Rn(s, t) {
   return e;
 }
 const pe = function(s) {
-  const t = Ks.exec(s);
+  const t = zs.exec(s);
   return !(t === null || typeof t > "u");
 };
-function Ls(s) {
+function Us(s) {
   return typeof s < "u";
 }
-const zs = {
+const js = {
   allowBooleanAttributes: !1,
   //A tag can have attributes without any value
   unpairedTags: []
 };
-function Us(s, t) {
-  t = Object.assign({}, zs, t);
+function Fs(s, t) {
+  t = Object.assign({}, js, t);
   const e = [];
   let n = !1, i = !1;
   s[0] === "\uFEFF" && (s = s.substr(1));
@@ -909,11 +906,11 @@ function Us(s, t) {
         for (; r < s.length && s[r] !== ">" && s[r] !== " " && s[r] !== "	" && s[r] !== `
 ` && s[r] !== "\r"; r++)
           c += s[r];
-        if (c = c.trim(), c[c.length - 1] === "/" && (c = c.substring(0, c.length - 1), r--), !Xs(c)) {
+        if (c = c.trim(), c[c.length - 1] === "/" && (c = c.substring(0, c.length - 1), r--), !Qs(c)) {
           let h;
           return c.trim().length === 0 ? h = "Invalid space after '<'." : h = "Tag '" + c + "' is an invalid name.", v("InvalidTag", h, $(s, r));
         }
-        const l = Gs(s, r);
+        const l = Ys(s, r);
         if (l === !1)
           return v("InvalidAttr", "Attributes for '" + c + "' have open quote.", $(s, r));
         let d = l.value;
@@ -962,7 +959,7 @@ function Us(s, t) {
             } else
               break;
           else if (s[r] === "&") {
-            const h = Vs(s, r);
+            const h = Xs(s, r);
             if (h == -1)
               return v("InvalidChar", "char '&' is not expected.", $(s, r));
             r = h;
@@ -1025,11 +1022,11 @@ function ln(s, t) {
   }
   return t;
 }
-const js = '"', Fs = "'";
-function Gs(s, t) {
+const Gs = '"', Zs = "'";
+function Ys(s, t) {
   let e = "", n = "", i = !1;
   for (; t < s.length; t++) {
-    if (s[t] === js || s[t] === Fs)
+    if (s[t] === Gs || s[t] === Zs)
       n === "" ? n = s[t] : n !== s[t] || (n = "");
     else if (s[t] === ">" && n === "") {
       i = !0;
@@ -1043,9 +1040,9 @@ function Gs(s, t) {
     tagClosed: i
   };
 }
-const Zs = new RegExp(`(\\s*)([^\\s=]+)(\\s*=)?(\\s*(['"])(([\\s\\S])*?)\\5)?`, "g");
+const Vs = new RegExp(`(\\s*)([^\\s=]+)(\\s*=)?(\\s*(['"])(([\\s\\S])*?)\\5)?`, "g");
 function hn(s, t) {
-  const e = Rn(s, Zs), n = {};
+  const e = Mn(s, Vs), n = {};
   for (let i = 0; i < e.length; i++) {
     if (e[i][1].length === 0)
       return v("InvalidAttr", "Attribute '" + e[i][2] + "' has no space in starting.", Wt(e[i]));
@@ -1054,7 +1051,7 @@ function hn(s, t) {
     if (e[i][3] === void 0 && !t.allowBooleanAttributes)
       return v("InvalidAttr", "boolean attribute '" + e[i][2] + "' is not allowed.", Wt(e[i]));
     const r = e[i][2];
-    if (!Js(r))
+    if (!qs(r))
       return v("InvalidAttr", "Attribute '" + r + "' is an invalid name.", Wt(e[i]));
     if (!n.hasOwnProperty(r))
       n[r] = 1;
@@ -1063,7 +1060,7 @@ function hn(s, t) {
   }
   return !0;
 }
-function Ys(s, t) {
+function Js(s, t) {
   let e = /\d/;
   for (s[t] === "x" && (t++, e = /[\da-fA-F]/); t < s.length; t++) {
     if (s[t] === ";")
@@ -1073,11 +1070,11 @@ function Ys(s, t) {
   }
   return -1;
 }
-function Vs(s, t) {
+function Xs(s, t) {
   if (t++, s[t] === ";")
     return -1;
   if (s[t] === "#")
-    return t++, Ys(s, t);
+    return t++, Js(s, t);
   let e = 0;
   for (; t < s.length; t++, e++)
     if (!(s[t].match(/\w/) && e < 20)) {
@@ -1097,10 +1094,10 @@ function v(s, t, e) {
     }
   };
 }
-function Js(s) {
+function qs(s) {
   return pe(s);
 }
-function Xs(s) {
+function Qs(s) {
   return pe(s);
 }
 function $(s, t) {
@@ -1114,7 +1111,7 @@ function $(s, t) {
 function Wt(s) {
   return s.startIndex + s[1].length;
 }
-const qs = {
+const ti = {
   preserveOrder: !1,
   attributeNamePrefix: "@_",
   attributesGroupName: !1,
@@ -1158,11 +1155,11 @@ const qs = {
   },
   // skipEmptyListItem: false
   captureMetaData: !1
-}, Qs = function(s) {
-  return Object.assign({}, qs, s);
+}, ei = function(s) {
+  return Object.assign({}, ti, s);
 };
 let se;
-typeof Symbol != "function" ? se = "@@xmlMetadata" : se = Symbol("XML Node Metadata");
+typeof Symbol != "function" ? se = "@@xmlMetadata" : se = /* @__PURE__ */ Symbol("XML Node Metadata");
 class ft {
   constructor(t) {
     this.tagname = t, this.child = [], this[":@"] = {};
@@ -1178,7 +1175,7 @@ class ft {
     return se;
   }
 }
-class ti {
+class ni {
   constructor(t) {
     this.suppressValidationErr = !t;
   }
@@ -1192,10 +1189,13 @@ class ti {
           if (r && lt(t, "!ENTITY", e)) {
             e += 7;
             let c, l;
-            [c, l, e] = this.readEntityExp(t, e + 1, this.suppressValidationErr), l.indexOf("&") === -1 && (n[c] = {
-              regx: RegExp(`&${c};`, "g"),
-              val: l
-            });
+            if ([c, l, e] = this.readEntityExp(t, e + 1, this.suppressValidationErr), l.indexOf("&") === -1) {
+              const d = c.replace(/[.\-+*:]/g, "\\.");
+              n[c] = {
+                regx: RegExp(`&${d};`, "g"),
+                val: l
+              };
+            }
           } else if (r && lt(t, "!ELEMENT", e)) {
             e += 8;
             const { index: c } = this.readElementExp(t, e + 1);
@@ -1220,11 +1220,11 @@ class ti {
     return { entities: n, i: e };
   }
   readEntityExp(t, e) {
-    e = P(t, e);
+    e = H(t, e);
     let n = "";
     for (; e < t.length && !/\s/.test(t[e]) && t[e] !== '"' && t[e] !== "'"; )
       n += t[e], e++;
-    if (Dt(n), e = P(t, e), !this.suppressValidationErr) {
+    if (Dt(n), e = H(t, e), !this.suppressValidationErr) {
       if (t.substring(e, e + 6).toUpperCase() === "SYSTEM")
         throw new Error("External entities are not supported");
       if (t[e] === "%")
@@ -1234,18 +1234,18 @@ class ti {
     return [e, i] = this.readIdentifierVal(t, e, "entity"), e--, [n, i, e];
   }
   readNotationExp(t, e) {
-    e = P(t, e);
+    e = H(t, e);
     let n = "";
     for (; e < t.length && !/\s/.test(t[e]); )
       n += t[e], e++;
-    !this.suppressValidationErr && Dt(n), e = P(t, e);
+    !this.suppressValidationErr && Dt(n), e = H(t, e);
     const i = t.substring(e, e + 6).toUpperCase();
     if (!this.suppressValidationErr && i !== "SYSTEM" && i !== "PUBLIC")
       throw new Error(`Expected SYSTEM or PUBLIC, found "${i}"`);
-    e += i.length, e = P(t, e);
+    e += i.length, e = H(t, e);
     let r = null, o = null;
     if (i === "PUBLIC")
-      [e, r] = this.readIdentifierVal(t, e, "publicIdentifier"), e = P(t, e), (t[e] === '"' || t[e] === "'") && ([e, o] = this.readIdentifierVal(t, e, "systemIdentifier"));
+      [e, r] = this.readIdentifierVal(t, e, "publicIdentifier"), e = H(t, e), (t[e] === '"' || t[e] === "'") && ([e, o] = this.readIdentifierVal(t, e, "systemIdentifier"));
     else if (i === "SYSTEM" && ([e, o] = this.readIdentifierVal(t, e, "systemIdentifier"), !this.suppressValidationErr && !o))
       throw new Error("Missing mandatory system identifier for SYSTEM notation");
     return { notationName: n, publicIdentifier: r, systemIdentifier: o, index: --e };
@@ -1262,13 +1262,13 @@ class ti {
     return e++, [e, i];
   }
   readElementExp(t, e) {
-    e = P(t, e);
+    e = H(t, e);
     let n = "";
     for (; e < t.length && !/\s/.test(t[e]); )
       n += t[e], e++;
     if (!this.suppressValidationErr && !pe(n))
       throw new Error(`Invalid element name: "${n}"`);
-    e = P(t, e);
+    e = H(t, e);
     let i = "";
     if (t[e] === "E" && lt(t, "MPTY", e)) e += 4;
     else if (t[e] === "A" && lt(t, "NY", e)) e += 2;
@@ -1286,20 +1286,20 @@ class ti {
     };
   }
   readAttlistExp(t, e) {
-    e = P(t, e);
+    e = H(t, e);
     let n = "";
     for (; e < t.length && !/\s/.test(t[e]); )
       n += t[e], e++;
-    Dt(n), e = P(t, e);
+    Dt(n), e = H(t, e);
     let i = "";
     for (; e < t.length && !/\s/.test(t[e]); )
       i += t[e], e++;
     if (!Dt(i))
       throw new Error(`Invalid attribute name: "${i}"`);
-    e = P(t, e);
+    e = H(t, e);
     let r = "";
     if (t.substring(e, e + 8).toUpperCase() === "NOTATION") {
-      if (r = "NOTATION", e += 8, e = P(t, e), t[e] !== "(")
+      if (r = "NOTATION", e += 8, e = H(t, e), t[e] !== "(")
         throw new Error(`Expected '(', found "${t[e]}"`);
       e++;
       let a = [];
@@ -1309,7 +1309,7 @@ class ti {
           c += t[e], e++;
         if (c = c.trim(), !Dt(c))
           throw new Error(`Invalid notation name: "${c}"`);
-        a.push(c), t[e] === "|" && (e++, e = P(t, e));
+        a.push(c), t[e] === "|" && (e++, e = H(t, e));
       }
       if (t[e] !== ")")
         throw new Error("Unterminated list of notations");
@@ -1321,7 +1321,7 @@ class ti {
       if (!this.suppressValidationErr && !a.includes(r.toUpperCase()))
         throw new Error(`Invalid attribute type: "${r}"`);
     }
-    e = P(t, e);
+    e = H(t, e);
     let o = "";
     return t.substring(e, e + 8).toUpperCase() === "#REQUIRED" ? (o = "#REQUIRED", e += 8) : t.substring(e, e + 7).toUpperCase() === "#IMPLIED" ? (o = "#IMPLIED", e += 7) : [e, o] = this.readIdentifierVal(t, e, "ATTLIST"), {
       elementName: n,
@@ -1332,7 +1332,7 @@ class ti {
     };
   }
 }
-const P = (s, t) => {
+const H = (s, t) => {
   for (; t < s.length && /\s/.test(s[t]); )
     t++;
   return t;
@@ -1347,7 +1347,7 @@ function Dt(s) {
     return s;
   throw new Error(`Invalid entity name ${s}`);
 }
-const ei = /^[-+]?0x[a-fA-F0-9]+$/, ni = /^([\-\+])?(0*)([0-9]*(\.[0-9]*)?)$/, si = {
+const si = /^[-+]?0x[a-fA-F0-9]+$/, ii = /^([\-\+])?(0*)([0-9]*(\.[0-9]*)?)$/, ri = {
   hex: !0,
   // oct: false,
   leadingZeros: !0,
@@ -1355,20 +1355,20 @@ const ei = /^[-+]?0x[a-fA-F0-9]+$/, ni = /^([\-\+])?(0*)([0-9]*(\.[0-9]*)?)$/, s
   eNotation: !0
   //skipLike: /regex/
 };
-function ii(s, t = {}) {
-  if (t = Object.assign({}, si, t), !s || typeof s != "string") return s;
+function oi(s, t = {}) {
+  if (t = Object.assign({}, ri, t), !s || typeof s != "string") return s;
   let e = s.trim();
   if (t.skipLike !== void 0 && t.skipLike.test(e)) return s;
   if (s === "0") return 0;
-  if (t.hex && ei.test(e))
-    return ci(e, 16);
-  if (e.search(/.+[eE].+/) !== -1)
-    return oi(s, e, t);
+  if (t.hex && si.test(e))
+    return hi(e, 16);
+  if (e.includes("e") || e.includes("E"))
+    return ci(s, e, t);
   {
-    const n = ni.exec(e);
+    const n = ii.exec(e);
     if (n) {
       const i = n[1] || "", r = n[2];
-      let o = ai(n[3]);
+      let o = li(n[3]);
       const a = i ? (
         // 0., -00., 000.
         s[r.length + 1] === "."
@@ -1389,10 +1389,10 @@ function ii(s, t = {}) {
       return s;
   }
 }
-const ri = /^([-+])?(0*)(\d*(\.\d*)?[eE][-\+]?\d+)$/;
-function oi(s, t, e) {
+const ai = /^([-+])?(0*)(\d*(\.\d*)?[eE][-\+]?\d+)$/;
+function ci(s, t, e) {
   if (!e.eNotation) return s;
-  const n = t.match(ri);
+  const n = t.match(ai);
   if (n) {
     let i = n[1] || "";
     const r = n[3].indexOf("e") === -1 ? "E" : "e", o = n[2], a = i ? (
@@ -1403,23 +1403,23 @@ function oi(s, t, e) {
   } else
     return s;
 }
-function ai(s) {
+function li(s) {
   return s && s.indexOf(".") !== -1 && (s = s.replace(/0+$/, ""), s === "." ? s = "0" : s[0] === "." ? s = "0" + s : s[s.length - 1] === "." && (s = s.substring(0, s.length - 1))), s;
 }
-function ci(s, t) {
+function hi(s, t) {
   if (parseInt) return parseInt(s, t);
   if (Number.parseInt) return Number.parseInt(s, t);
   if (window && window.parseInt) return window.parseInt(s, t);
   throw new Error("parseInt, Number.parseInt, window.parseInt are not supported");
 }
-function Mn(s) {
+function xn(s) {
   return typeof s == "function" ? s : Array.isArray(s) ? (t) => {
     for (const e of s)
       if (typeof e == "string" && t === e || e instanceof RegExp && e.test(t))
         return !0;
   } : () => !1;
 }
-class li {
+class di {
   constructor(t) {
     if (this.options = t, this.currentNode = null, this.tagsNodeStack = [], this.docTypeEntities = {}, this.lastEntities = {
       apos: { regex: /&(apos|#39|#x27);/g, val: "'" },
@@ -1440,9 +1440,9 @@ class li {
       copyright: { regex: /&(copy|#169);/g, val: "©" },
       reg: { regex: /&(reg|#174);/g, val: "®" },
       inr: { regex: /&(inr|#8377);/g, val: "₹" },
-      num_dec: { regex: /&#([0-9]{1,7});/g, val: (e, n) => String.fromCodePoint(Number.parseInt(n, 10)) },
-      num_hex: { regex: /&#x([0-9a-fA-F]{1,6});/g, val: (e, n) => String.fromCodePoint(Number.parseInt(n, 16)) }
-    }, this.addExternalEntities = hi, this.parseXml = gi, this.parseTextData = di, this.resolveNameSpace = ui, this.buildAttributesMap = pi, this.isItStopNode = Ei, this.replaceEntitiesValue = yi, this.readStopNodeData = bi, this.saveTextToParentTag = wi, this.addChild = mi, this.ignoreAttributesFn = Mn(this.options.ignoreAttributes), this.options.stopNodes && this.options.stopNodes.length > 0) {
+      num_dec: { regex: /&#([0-9]{1,7});/g, val: (e, n) => dn(n, 10, "&#") },
+      num_hex: { regex: /&#x([0-9a-fA-F]{1,6});/g, val: (e, n) => dn(n, 16, "&#x") }
+    }, this.addExternalEntities = ui, this.parseXml = yi, this.parseTextData = fi, this.resolveNameSpace = pi, this.buildAttributesMap = mi, this.isItStopNode = _i, this.replaceEntitiesValue = Ei, this.readStopNodeData = Ii, this.saveTextToParentTag = bi, this.addChild = wi, this.ignoreAttributesFn = xn(this.options.ignoreAttributes), this.options.stopNodes && this.options.stopNodes.length > 0) {
       this.stopNodesExact = /* @__PURE__ */ new Set(), this.stopNodesWildcard = /* @__PURE__ */ new Set();
       for (let e = 0; e < this.options.stopNodes.length; e++) {
         const n = this.options.stopNodes[e];
@@ -1451,24 +1451,24 @@ class li {
     }
   }
 }
-function hi(s) {
+function ui(s) {
   const t = Object.keys(s);
   for (let e = 0; e < t.length; e++) {
-    const n = t[e];
+    const n = t[e], i = n.replace(/[.\-+*:]/g, "\\.");
     this.lastEntities[n] = {
-      regex: new RegExp("&" + n + ";", "g"),
+      regex: new RegExp("&" + i + ";", "g"),
       val: s[n]
     };
   }
 }
-function di(s, t, e, n, i, r, o) {
+function fi(s, t, e, n, i, r, o) {
   if (s !== void 0 && (this.options.trimValues && !n && (s = s.trim()), s.length > 0)) {
     o || (s = this.replaceEntitiesValue(s));
     const a = this.options.tagValueProcessor(t, s, e, i, r);
     return a == null ? s : typeof a != typeof s || a !== s ? a : this.options.trimValues ? ve(s, this.options.parseTagValue, this.options.numberParseOptions) : s.trim() === s ? ve(s, this.options.parseTagValue, this.options.numberParseOptions) : s;
   }
 }
-function ui(s) {
+function pi(s) {
   if (this.options.removeNSPrefix) {
     const t = s.split(":"), e = s.charAt(0) === "/" ? "/" : "";
     if (t[0] === "xmlns")
@@ -1477,41 +1477,41 @@ function ui(s) {
   }
   return s;
 }
-const fi = new RegExp(`([^\\s=]+)\\s*(=\\s*(['"])([\\s\\S]*?)\\3)?`, "gm");
-function pi(s, t, e) {
+const gi = new RegExp(`([^\\s=]+)\\s*(=\\s*(['"])([\\s\\S]*?)\\3)?`, "gm");
+function mi(s, t) {
   if (this.options.ignoreAttributes !== !0 && typeof s == "string") {
-    const n = Rn(s, fi), i = n.length, r = {};
-    for (let o = 0; o < i; o++) {
-      const a = this.resolveNameSpace(n[o][1]);
-      if (this.ignoreAttributesFn(a, t))
+    const e = Mn(s, gi), n = e.length, i = {};
+    for (let r = 0; r < n; r++) {
+      const o = this.resolveNameSpace(e[r][1]);
+      if (this.ignoreAttributesFn(o, t))
         continue;
-      let c = n[o][4], l = this.options.attributeNamePrefix + a;
-      if (a.length)
-        if (this.options.transformAttributeName && (l = this.options.transformAttributeName(l)), l === "__proto__" && (l = "#__proto__"), c !== void 0) {
-          this.options.trimValues && (c = c.trim()), c = this.replaceEntitiesValue(c);
-          const d = this.options.attributeValueProcessor(a, c, t);
-          d == null ? r[l] = c : typeof d != typeof c || d !== c ? r[l] = d : r[l] = ve(
-            c,
+      let a = e[r][4], c = this.options.attributeNamePrefix + o;
+      if (o.length)
+        if (this.options.transformAttributeName && (c = this.options.transformAttributeName(c)), c === "__proto__" && (c = "#__proto__"), a !== void 0) {
+          this.options.trimValues && (a = a.trim()), a = this.replaceEntitiesValue(a);
+          const l = this.options.attributeValueProcessor(o, a, t);
+          l == null ? i[c] = a : typeof l != typeof a || l !== a ? i[c] = l : i[c] = ve(
+            a,
             this.options.parseAttributeValue,
             this.options.numberParseOptions
           );
-        } else this.options.allowBooleanAttributes && (r[l] = !0);
+        } else this.options.allowBooleanAttributes && (i[c] = !0);
     }
-    if (!Object.keys(r).length)
+    if (!Object.keys(i).length)
       return;
     if (this.options.attributesGroupName) {
-      const o = {};
-      return o[this.options.attributesGroupName] = r, o;
+      const r = {};
+      return r[this.options.attributesGroupName] = i, r;
     }
-    return r;
+    return i;
   }
 }
-const gi = function(s) {
+const yi = function(s) {
   s = s.replace(/\r\n?/g, `
 `);
   const t = new ft("!xml");
   let e = t, n = "", i = "";
-  const r = new ti(this.options.processEntities);
+  const r = new ni(this.options.processEntities);
   for (let o = 0; o < s.length; o++)
     if (s[o] === "<")
       if (s[o + 1] === "/") {
@@ -1532,7 +1532,7 @@ const gi = function(s) {
         if (!c) throw new Error("Pi Tag is not closed.");
         if (n = this.saveTextToParentTag(n, e, i), !(this.options.ignoreDeclaration && c.tagName === "?xml" || this.options.ignorePiTags)) {
           const l = new ft(c.tagName);
-          l.add(this.options.textNodeName, ""), c.tagName !== c.tagExp && c.attrExpPresent && (l[":@"] = this.buildAttributesMap(c.tagExp, i, c.tagName)), this.addChild(e, l, i, o);
+          l.add(this.options.textNodeName, ""), c.tagName !== c.tagExp && c.attrExpPresent && (l[":@"] = this.buildAttributesMap(c.tagExp, i)), this.addChild(e, l, i, o);
         }
         o = c.closeIndex + 1;
       } else if (s.substr(o + 1, 3) === "!--") {
@@ -1553,8 +1553,12 @@ const gi = function(s) {
       } else {
         let c = Te(s, o, this.options.removeNSPrefix), l = c.tagName;
         const d = c.rawTagName;
-        let h = c.tagExp, u = c.attrExpPresent, m = c.closeIndex;
-        this.options.transformTagName && (l = this.options.transformTagName(l)), e && n && e.tagname !== "!xml" && (n = this.saveTextToParentTag(n, e, i, !1));
+        let h = c.tagExp, u = c.attrExpPresent, g = c.closeIndex;
+        if (this.options.transformTagName) {
+          const b = this.options.transformTagName(l);
+          h === l && (h = b), l = b;
+        }
+        e && n && e.tagname !== "!xml" && (n = this.saveTextToParentTag(n, e, i, !1));
         const f = e;
         f && this.options.unpairedTags.indexOf(f.tagname) !== -1 && (e = this.tagsNodeStack.pop(), i = i.substring(0, i.lastIndexOf("."))), l !== t.tagname && (i += i ? "." + l : l);
         const w = o;
@@ -1565,34 +1569,40 @@ const gi = function(s) {
           else if (this.options.unpairedTags.indexOf(l) !== -1)
             o = c.closeIndex;
           else {
-            const S = this.readStopNodeData(s, d, m + 1);
+            const S = this.readStopNodeData(s, d, g + 1);
             if (!S) throw new Error(`Unexpected end of ${d}`);
             o = S.i, b = S.tagContent;
           }
           const A = new ft(l);
-          l !== h && u && (A[":@"] = this.buildAttributesMap(h, i, l)), b && (b = this.parseTextData(b, l, i, !0, u, !0, !0)), i = i.substr(0, i.lastIndexOf(".")), A.add(this.options.textNodeName, b), this.addChild(e, A, i, w);
+          l !== h && u && (A[":@"] = this.buildAttributesMap(
+            h,
+            i
+          )), b && (b = this.parseTextData(b, l, i, !0, u, !0, !0)), i = i.substr(0, i.lastIndexOf(".")), A.add(this.options.textNodeName, b), this.addChild(e, A, i, w);
         } else {
           if (h.length > 0 && h.lastIndexOf("/") === h.length - 1) {
-            l[l.length - 1] === "/" ? (l = l.substr(0, l.length - 1), i = i.substr(0, i.length - 1), h = l) : h = h.substr(0, h.length - 1), this.options.transformTagName && (l = this.options.transformTagName(l));
+            if (l[l.length - 1] === "/" ? (l = l.substr(0, l.length - 1), i = i.substr(0, i.length - 1), h = l) : h = h.substr(0, h.length - 1), this.options.transformTagName) {
+              const A = this.options.transformTagName(l);
+              h === l && (h = A), l = A;
+            }
             const b = new ft(l);
-            l !== h && u && (b[":@"] = this.buildAttributesMap(h, i, l)), this.addChild(e, b, i, w), i = i.substr(0, i.lastIndexOf("."));
+            l !== h && u && (b[":@"] = this.buildAttributesMap(h, i)), this.addChild(e, b, i, w), i = i.substr(0, i.lastIndexOf("."));
           } else {
             const b = new ft(l);
-            this.tagsNodeStack.push(e), l !== h && u && (b[":@"] = this.buildAttributesMap(h, i, l)), this.addChild(e, b, i, w), e = b;
+            this.tagsNodeStack.push(e), l !== h && u && (b[":@"] = this.buildAttributesMap(h, i)), this.addChild(e, b, i, w), e = b;
           }
-          n = "", o = m;
+          n = "", o = g;
         }
       }
     else
       n += s[o];
   return t.child;
 };
-function mi(s, t, e, n) {
+function wi(s, t, e, n) {
   this.options.captureMetaData || (n = void 0);
   const i = this.options.updateTag(t.tagname, e, t[":@"]);
   i === !1 || (typeof i == "string" && (t.tagname = i), s.addChild(t, n));
 }
-const yi = function(s) {
+const Ei = function(s) {
   if (this.options.processEntities) {
     for (let t in this.docTypeEntities) {
       const e = this.docTypeEntities[t];
@@ -1611,7 +1621,7 @@ const yi = function(s) {
   }
   return s;
 };
-function wi(s, t, e, n) {
+function bi(s, t, e, n) {
   return s && (n === void 0 && (n = t.child.length === 0), s = this.parseTextData(
     s,
     t.tagname,
@@ -1621,10 +1631,10 @@ function wi(s, t, e, n) {
     n
   ), s !== void 0 && s !== "" && t.add(this.options.textNodeName, s), s = ""), s;
 }
-function Ei(s, t, e, n) {
+function _i(s, t, e, n) {
   return !!(t && t.has(n) || s && s.has(e));
 }
-function _i(s, t, e = ">") {
+function Ai(s, t, e = ">") {
   let n, i = "";
   for (let r = t; r < s.length; r++) {
     let o = s[r];
@@ -1655,7 +1665,7 @@ function mt(s, t, e, n) {
   return i + t.length - 1;
 }
 function Te(s, t, e, n = ">") {
-  const i = _i(s, t + 1, n);
+  const i = Ai(s, t + 1, n);
   if (!i) return;
   let r = i.data;
   const o = i.index, a = r.search(/\s/);
@@ -1674,7 +1684,7 @@ function Te(s, t, e, n = ">") {
     rawTagName: d
   };
 }
-function bi(s, t, e) {
+function Ii(s, t, e) {
   const n = e;
   let i = 1;
   for (; e < s.length; e++)
@@ -1701,19 +1711,23 @@ function bi(s, t, e) {
 function ve(s, t, e) {
   if (t && typeof s == "string") {
     const n = s.trim();
-    return n === "true" ? !0 : n === "false" ? !1 : ii(s, e);
+    return n === "true" ? !0 : n === "false" ? !1 : oi(s, e);
   } else
-    return Ls(s) ? s : "";
+    return Us(s) ? s : "";
+}
+function dn(s, t, e) {
+  const n = Number.parseInt(s, t);
+  return n >= 0 && n <= 1114111 ? String.fromCodePoint(n) : e + s + ";";
 }
 const we = ft.getMetaDataSymbol();
-function Ai(s, t) {
-  return xn(s, t);
+function Ni(s, t) {
+  return $n(s, t);
 }
-function xn(s, t, e) {
+function $n(s, t, e) {
   let n;
   const i = {};
   for (let r = 0; r < s.length; r++) {
-    const o = s[r], a = Ii(o);
+    const o = s[r], a = Ti(o);
     let c = "";
     if (e === void 0 ? c = a : c = e + "." + a, a === t.textNodeName)
       n === void 0 ? n = o[a] : n += "" + o[a];
@@ -1721,22 +1735,22 @@ function xn(s, t, e) {
       if (a === void 0)
         continue;
       if (o[a]) {
-        let l = xn(o[a], t, c);
-        const d = Ti(l, t);
-        o[we] !== void 0 && (l[we] = o[we]), o[":@"] ? Ni(l, o[":@"], c, t) : Object.keys(l).length === 1 && l[t.textNodeName] !== void 0 && !t.alwaysCreateTextNode ? l = l[t.textNodeName] : Object.keys(l).length === 0 && (t.alwaysCreateTextNode ? l[t.textNodeName] = "" : l = ""), i[a] !== void 0 && i.hasOwnProperty(a) ? (Array.isArray(i[a]) || (i[a] = [i[a]]), i[a].push(l)) : t.isArray(a, c, d) ? i[a] = [l] : i[a] = l;
+        let l = $n(o[a], t, c);
+        const d = Si(l, t);
+        o[we] !== void 0 && (l[we] = o[we]), o[":@"] ? vi(l, o[":@"], c, t) : Object.keys(l).length === 1 && l[t.textNodeName] !== void 0 && !t.alwaysCreateTextNode ? l = l[t.textNodeName] : Object.keys(l).length === 0 && (t.alwaysCreateTextNode ? l[t.textNodeName] = "" : l = ""), i[a] !== void 0 && i.hasOwnProperty(a) ? (Array.isArray(i[a]) || (i[a] = [i[a]]), i[a].push(l)) : t.isArray(a, c, d) ? i[a] = [l] : i[a] = l;
       }
     }
   }
   return typeof n == "string" ? n.length > 0 && (i[t.textNodeName] = n) : n !== void 0 && (i[t.textNodeName] = n), i;
 }
-function Ii(s) {
+function Ti(s) {
   const t = Object.keys(s);
   for (let e = 0; e < t.length; e++) {
     const n = t[e];
     if (n !== ":@") return n;
   }
 }
-function Ni(s, t, e, n) {
+function vi(s, t, e, n) {
   if (t) {
     const i = Object.keys(t), r = i.length;
     for (let o = 0; o < r; o++) {
@@ -1745,13 +1759,13 @@ function Ni(s, t, e, n) {
     }
   }
 }
-function Ti(s, t) {
+function Si(s, t) {
   const { textNodeName: e } = t, n = Object.keys(s).length;
   return !!(n === 0 || n === 1 && (s[e] || typeof s[e] == "boolean" || s[e] === 0));
 }
-class vi {
+class Oi {
   constructor(t) {
-    this.externalEntities = {}, this.options = Qs(t);
+    this.externalEntities = {}, this.options = ei(t);
   }
   /**
    * Parse XML dats to JS object 
@@ -1765,14 +1779,14 @@ class vi {
       throw new Error("XML data is accepted in String or Bytes[] form.");
     if (e) {
       e === !0 && (e = {});
-      const r = Us(t, e);
+      const r = Fs(t, e);
       if (r !== !0)
         throw Error(`${r.err.msg}:${r.err.line}:${r.err.col}`);
     }
-    const n = new li(this.options);
+    const n = new di(this.options);
     n.addExternalEntities(this.externalEntities);
     const i = n.parseXml(t);
-    return this.options.preserveOrder || i === void 0 ? i : Ai(i, this.options);
+    return this.options.preserveOrder || i === void 0 ? i : Ni(i, this.options);
   }
   /**
    * Add Entity which is not by default supported by this library
@@ -1802,21 +1816,21 @@ class vi {
     return ft.getMetaDataSymbol();
   }
 }
-const Si = `
+const ki = `
 `;
-function Oi(s, t) {
+function Ci(s, t) {
   let e = "";
-  return t.format && t.indentBy.length > 0 && (e = Si), $n(s, t, "", e);
+  return t.format && t.indentBy.length > 0 && (e = ki), Pn(s, t, "", e);
 }
-function $n(s, t, e, n) {
+function Pn(s, t, e, n) {
   let i = "", r = !1;
   for (let o = 0; o < s.length; o++) {
-    const a = s[o], c = ki(a);
+    const a = s[o], c = Ri(a);
     if (c === void 0) continue;
     let l = "";
     if (e.length === 0 ? l = c : l = `${e}.${c}`, c === t.textNodeName) {
       let f = a[c];
-      Ci(l, t) || (f = t.tagValueProcessor(c, f), f = Hn(f, t)), r && (i += n), i += f, r = !1;
+      Mi(l, t) || (f = t.tagValueProcessor(c, f), f = Hn(f, t)), r && (i += n), i += f, r = !1;
       continue;
     } else if (c === t.cdataPropName) {
       r && (i += n), i += `<![CDATA[${a[c][0][t.textNodeName]}]]>`, r = !1;
@@ -1825,19 +1839,19 @@ function $n(s, t, e, n) {
       i += n + `<!--${a[c][0][t.textNodeName]}-->`, r = !0;
       continue;
     } else if (c[0] === "?") {
-      const f = dn(a[":@"], t), w = c === "?xml" ? "" : n;
+      const f = un(a[":@"], t), w = c === "?xml" ? "" : n;
       let b = a[c][0][t.textNodeName];
       b = b.length !== 0 ? " " + b : "", i += w + `<${c}${b}${f}?>`, r = !0;
       continue;
     }
     let d = n;
     d !== "" && (d += t.indentBy);
-    const h = dn(a[":@"], t), u = n + `<${c}${h}`, m = $n(a[c], t, l, d);
-    t.unpairedTags.indexOf(c) !== -1 ? t.suppressUnpairedNode ? i += u + ">" : i += u + "/>" : (!m || m.length === 0) && t.suppressEmptyNode ? i += u + "/>" : m && m.endsWith(">") ? i += u + `>${m}${n}</${c}>` : (i += u + ">", m && n !== "" && (m.includes("/>") || m.includes("</")) ? i += n + t.indentBy + m + n : i += m, i += `</${c}>`), r = !0;
+    const h = un(a[":@"], t), u = n + `<${c}${h}`, g = Pn(a[c], t, l, d);
+    t.unpairedTags.indexOf(c) !== -1 ? t.suppressUnpairedNode ? i += u + ">" : i += u + "/>" : (!g || g.length === 0) && t.suppressEmptyNode ? i += u + "/>" : g && g.endsWith(">") ? i += u + `>${g}${n}</${c}>` : (i += u + ">", g && n !== "" && (g.includes("/>") || g.includes("</")) ? i += n + t.indentBy + g + n : i += g, i += `</${c}>`), r = !0;
   }
   return i;
 }
-function ki(s) {
+function Ri(s) {
   const t = Object.keys(s);
   for (let e = 0; e < t.length; e++) {
     const n = t[e];
@@ -1845,7 +1859,7 @@ function ki(s) {
       return n;
   }
 }
-function dn(s, t) {
+function un(s, t) {
   let e = "";
   if (s && !t.ignoreAttributes)
     for (let n in s) {
@@ -1855,7 +1869,7 @@ function dn(s, t) {
     }
   return e;
 }
-function Ci(s, t) {
+function Mi(s, t) {
   s = s.substr(0, s.length - t.textNodeName.length - 1);
   let e = s.substr(s.lastIndexOf(".") + 1);
   for (let n in t.stopNodes)
@@ -1870,7 +1884,7 @@ function Hn(s, t) {
     }
   return s;
 }
-const Ri = {
+const xi = {
   attributeNamePrefix: "@_",
   attributesGroupName: !1,
   textNodeName: "#text",
@@ -1905,16 +1919,16 @@ const Ri = {
   oneListGroup: !1
 };
 function ot(s) {
-  this.options = Object.assign({}, Ri, s), this.options.ignoreAttributes === !0 || this.options.attributesGroupName ? this.isAttribute = function() {
+  this.options = Object.assign({}, xi, s), this.options.ignoreAttributes === !0 || this.options.attributesGroupName ? this.isAttribute = function() {
     return !1;
-  } : (this.ignoreAttributesFn = Mn(this.options.ignoreAttributes), this.attrPrefixLen = this.options.attributeNamePrefix.length, this.isAttribute = $i), this.processTextOrObjNode = Mi, this.options.format ? (this.indentate = xi, this.tagEndChar = `>
+  } : (this.ignoreAttributesFn = xn(this.options.ignoreAttributes), this.attrPrefixLen = this.options.attributeNamePrefix.length, this.isAttribute = Hi), this.processTextOrObjNode = $i, this.options.format ? (this.indentate = Pi, this.tagEndChar = `>
 `, this.newLine = `
 `) : (this.indentate = function() {
     return "";
   }, this.tagEndChar = ">", this.newLine = "");
 }
 ot.prototype.build = function(s) {
-  return this.options.preserveOrder ? Oi(s, this.options) : (Array.isArray(s) && this.options.arrayNodeName && this.options.arrayNodeName.length > 1 && (s = {
+  return this.options.preserveOrder ? Ci(s, this.options) : (Array.isArray(s) && this.options.arrayNodeName && this.options.arrayNodeName.length > 1 && (s = {
     [this.options.arrayNodeName]: s
   }), this.j2x(s, 0, []).val);
 };
@@ -1970,7 +1984,7 @@ ot.prototype.j2x = function(s, t, e) {
 ot.prototype.buildAttrPairStr = function(s, t) {
   return t = this.options.attributeValueProcessor(s, "" + t), t = this.replaceEntitiesValue(t), this.options.suppressBooleanAttributes && t === "true" ? " " + s : " " + s + '="' + t + '"';
 };
-function Mi(s, t, e, n) {
+function $i(s, t, e, n) {
   const i = this.j2x(s, e + 1, n.concat(t));
   return s[this.options.textNodeName] !== void 0 && Object.keys(s).length === 1 ? this.buildTextValNode(s[this.options.textNodeName], t, i.attrStr, e) : this.buildObjectNode(i.val, t, i.attrStr, e);
 }
@@ -2006,13 +2020,13 @@ ot.prototype.replaceEntitiesValue = function(s) {
     }
   return s;
 };
-function xi(s) {
+function Pi(s) {
   return this.options.indentBy.repeat(s);
 }
-function $i(s) {
+function Hi(s) {
   return s.startsWith(this.options.attributeNamePrefix) && s !== this.options.textNodeName ? s.substr(this.attrPrefixLen) : !1;
 }
-class bt {
+class _t {
   type;
   attrs = {};
   styles = {};
@@ -2041,8 +2055,8 @@ class bt {
   left(...t) {
     return `<${[
       this.type,
-      Dn(this.attrs),
-      Li(this.styles),
+      Ln(this.attrs),
+      Ui(this.styles),
       ...t
     ].filter((e) => e != "").join(" ")}>`;
   }
@@ -2069,7 +2083,7 @@ class bt {
     return this.toString();
   }
 }
-class Pn extends bt {
+class Bn extends _t {
   attrs = {};
   constructor(t) {
     super("image"), this.attrs = { ...this.attrs, href: t };
@@ -2078,7 +2092,7 @@ class Pn extends bt {
     return this.attrs.href = t, this;
   }
 }
-class Ue extends bt {
+class Ue extends _t {
   attrs = {};
   constructor(t) {
     super("use"), this.attrs = { ...this.attrs, href: this.make(t) };
@@ -2090,7 +2104,7 @@ class Ue extends bt {
     return t == null ? t : `#${t}`;
   }
 }
-class Bn extends bt {
+class Wn extends _t {
   attrs = {};
   constructor() {
     super("rect");
@@ -2102,7 +2116,7 @@ class Bn extends bt {
     return this.attrs.stroke = t, this;
   }
 }
-class St extends bt {
+class St extends _t {
   attrs;
   _text = "";
   constructor(t = "") {
@@ -2118,7 +2132,7 @@ class St extends bt {
     return this._text;
   }
 }
-let Wn = class extends bt {
+let Dn = class extends _t {
   raw;
   constructor(t) {
     super("symbol"), this.raw = t;
@@ -2130,7 +2144,7 @@ let Wn = class extends bt {
     return this.raw;
   }
 };
-class N extends bt {
+class N extends _t {
   children = [];
   rotateMatrix;
   translateMatrix;
@@ -2141,7 +2155,7 @@ class N extends bt {
     return this.children.push(t), this;
   }
   rotate(t, e, n) {
-    return this.rotateMatrix = Hs(t, e, n), this;
+    return this.rotateMatrix = Bs(t, e, n), this;
   }
   translate(t, e) {
     return this.translateMatrix = Ne(t, e), this;
@@ -2153,7 +2167,7 @@ class N extends bt {
     const e = [this.translateMatrix, this.rotateMatrix].filter(
       (n) => n != null
     );
-    return e.length == 0 ? super.left() : super.left(Ki(Cs(e)));
+    return e.length == 0 ? super.left() : super.left(zi(Ms(e)));
   }
   each(t, e) {
     for (let n = 0; n < this.children.length; n++) {
@@ -2162,12 +2176,12 @@ class N extends bt {
     }
   }
 }
-const Hi = [
+const Bi = [
   'xmlns="http://www.w3.org/2000/svg"',
   'version="1.1"',
   'xmlns:xlink="http://www.w3.org/1999/xlink"'
 ];
-class Pi extends bt {
+class Wi extends _t {
   children = [];
   constructor() {
     super("svg");
@@ -2182,16 +2196,16 @@ class Pi extends bt {
   left(...t) {
     return `<${[
       this.type,
-      ...Hi,
-      Dn(this.attrs),
-      Di(this.viewBox)
+      ...Bi,
+      Ln(this.attrs),
+      Ki(this.viewBox)
     ].filter((e) => e != "").join(" ")}>`;
   }
   viewbox(t, e, n, i) {
     return this.viewBox = { x: t, y: e, width: n, height: i }, this;
   }
   importSymbol(t) {
-    for (const e of zi(t))
+    for (const e of ji(t))
       this.add(e);
     return this;
   }
@@ -2214,32 +2228,32 @@ class Pi extends bt {
     }
   }
 }
-function Bi() {
-  return new Pi();
+function Di() {
+  return new Wi();
 }
-const jo = Bi, Fo = N, Go = Pn, Zo = Ue, Yo = Bn, Vo = St;
-function Wi(s) {
+const Vo = Di, Jo = N, Xo = Bn, qo = Ue, Qo = Wn, ta = St;
+function Li(s) {
   return s.replace(/[A-Z]/g, (t) => "-" + t.toLowerCase());
 }
-function Di(s) {
+function Ki(s) {
   return s == null ? "" : `viewBox="${s.x} ${s.y} ${s.width} ${s.height}"`;
 }
-function Ki(s) {
-  return s == null ? "" : `transform="${Ps(s)}"`;
+function zi(s) {
+  return s == null ? "" : `transform="${Ws(s)}"`;
 }
-function Dn(s) {
-  return Object.entries(s).filter(([t, e]) => e !== void 0).map(([t, e]) => `${Wi(t)}="${e}"`).join(" ");
+function Ln(s) {
+  return Object.entries(s).filter(([t, e]) => e !== void 0).map(([t, e]) => `${Li(t)}="${e}"`).join(" ");
 }
-function Li(s) {
+function Ui(s) {
   const t = Object.entries(s).map(([e, n]) => `${e}: ${n};`).join(" ");
   return t != "" ? `style="${t}"` : "";
 }
-function* zi(s) {
-  const t = new vi({ ignoreAttributes: !1 }), e = new ot({
+function* ji(s) {
+  const t = new Oi({ ignoreAttributes: !1 }), e = new ot({
     ignoreAttributes: !1
   }), n = t.parse(s);
   for (const i of n.svg.symbol) {
-    const r = e.build(i), o = new Wn(r);
+    const r = e.build(i), o = new Dn(r);
     for (const [a, c] of Object.entries(i))
       a.startsWith("@_") && (o.attrs[a.substring(2)] = c);
     yield o;
@@ -2255,8 +2269,8 @@ const Ee = (s, t) => {
   }, 0);
   return { width: s.tiles.reduce((a, c) => a + J(c, t).width, 0), height: r };
 }, J = (s, t) => {
-  const e = parseFloat((wt.HEIGHT * t).toPrecision(5)), n = parseFloat((wt.WIDTH * t).toPrecision(5)), i = s.has(g.HORIZONTAL) ? { width: e, height: n, baseWidth: n, baseHeight: e } : { width: n, height: e, w: n, baseWidth: n, baseHeight: e };
-  return (s.has(g.TSUMO) || s.has(g.IMAGE_DORA)) && (i.width += n * wt.TEXT_SCALE), i;
+  const e = parseFloat((wt.HEIGHT * t).toPrecision(5)), n = parseFloat((wt.WIDTH * t).toPrecision(5)), i = s.has(m.HORIZONTAL) ? { width: e, height: n, baseWidth: n, baseHeight: e } : { width: n, height: e, w: n, baseWidth: n, baseHeight: e };
+  return (s.has(m.TSUMO) || s.has(m.IMAGE_DORA)) && (i.width += n * wt.TEXT_SCALE), i;
 };
 class kt {
   tileWidth;
@@ -2275,8 +2289,8 @@ class kt {
   }
   // image wrapper
   image(t) {
-    let e = this.svgSprite ? new Ue().use(kt.buildID(t)) : new Pn().load(this.buildURL(t));
-    return t instanceof y && t.has(g.COLOR_GRAYSCALE) && e.css({ filter: "contrast(65%)" }), e;
+    let e = this.svgSprite ? new Ue().use(kt.buildID(t)) : new Bn().load(this.buildURL(t));
+    return t instanceof y && t.has(m.COLOR_GRAYSCALE) && e.css({ filter: "contrast(65%)" }), e;
   }
   createImage(t, e, n) {
     const i = J(t, this.scale);
@@ -2285,7 +2299,7 @@ class kt {
   createTextImage(t, e, n, i) {
     const r = this.createImage(t, e, n), o = J(t, this.scale), a = o.baseHeight * 0.2, c = o.baseWidth, l = o.baseHeight, d = new St().plain(i);
     d.size(o.baseWidth, o.baseHeight).font({
-      family: vn,
+      family: Sn,
       size: a
     }).dx(c).dy(l);
     const h = new N();
@@ -2301,7 +2315,7 @@ class kt {
   static buildID(t) {
     if (t === 100) return "stick100";
     if (t === 1e3) return "stick1000";
-    const e = t.t == p.BACK || t.has(g.RED) ? 0 : t.n;
+    const e = t.t == p.BACK || t.has(m.RED) ? 0 : t.n;
     return `${t.t}${e}`;
   }
   buildURL(t) {
@@ -2343,15 +2357,15 @@ class Kn extends kt {
     const e = this.findHorizontalIndex(t);
     let n = 0;
     const i = new N(), r = t.tiles.reduce(
-      (o, a, c) => a.has(g.HORIZONTAL) ? c : o,
+      (o, a, c) => a.has(m.HORIZONTAL) ? c : o,
       e
     );
     for (let o = 0; o < t.tiles.length; o++) {
       const a = J(t.tiles[o], this.scale);
       if (o == r) continue;
       if (o == e) {
-        const d = t.tiles[e], h = t.tiles[r], u = J(d, this.scale), m = this.createRotate90Image(d, 0, 0, !0), f = this.createRotate90Image(h, 0, u.height, !0);
-        i.add(new N().translate(n, 0).add(m).add(f)), n += u.width;
+        const d = t.tiles[e], h = t.tiles[r], u = J(d, this.scale), g = this.createRotate90Image(d, 0, 0, !0), f = this.createRotate90Image(h, 0, u.height, !0);
+        i.add(new N().translate(n, 0).add(g).add(f)), n += u.width;
         continue;
       }
       const c = a.width * 2 - a.height, l = this.createImage(t.tiles[o], n, c);
@@ -2399,7 +2413,7 @@ class Kn extends kt {
     for (const i of t) {
       const r = J(i, this.scale);
       let o;
-      if (i.has(g.HORIZONTAL)) {
+      if (i.has(m.HORIZONTAL)) {
         const a = this.getHorizontalTileYOffset(i);
         o = this.createRotate90Image(i, e, a);
       } else o = this.createImage(i, e, 0);
@@ -2408,38 +2422,38 @@ class Kn extends kt {
     return n;
   }
   findHorizontalIndex(t) {
-    const e = t.tiles.findIndex((n) => n.has(g.HORIZONTAL));
+    const e = t.tiles.findIndex((n) => n.has(m.HORIZONTAL));
     if (e < 0)
       throw new Error(`unable to find horizontal operator in block: ${t}`);
     return e;
   }
 }
-function Ui(s, t, e) {
+function Fi(s, t, e) {
   const { enableDoraText: n, enableTsumoText: i } = e;
   let r = Ee(s, t.scale), o;
   if (s instanceof U) o = t.createBlockPon(s);
   else if (s instanceof V) o = t.createBlockChi(s);
   else if (s instanceof R) o = t.createBlockAnKan(s);
-  else if (s instanceof H) o = t.createBlockShoKan(s);
+  else if (s instanceof P) o = t.createBlockShoKan(s);
   else if (s instanceof z) o = t.createBlockDaiKan(s);
   else if (s instanceof Tt) o = t.createBlockHand(s);
-  else if (s instanceof Ke)
+  else if (s instanceof Le)
     switch (s.type) {
       case E.IMAGE_DISCARD:
         o = t.createBlockDiscard(s);
         break;
       case E.IMAGE_DORA: {
-        const a = n == !1 ? new Tt([s.tiles[0].clone({ remove: g.IMAGE_DORA })]) : s;
+        const a = n == !1 ? new Tt([s.tiles[0].clone({ remove: m.IMAGE_DORA })]) : s;
         r = Ee(a, t.scale), o = t.createBlockDora(a, n);
         break;
       }
       case E.TSUMO: {
-        const a = i == !1 ? new Tt([s.tiles[0].clone({ remove: g.TSUMO })]) : s;
+        const a = i == !1 ? new Tt([s.tiles[0].clone({ remove: m.TSUMO })]) : s;
         r = Ee(a, t.scale), o = t.createBlockTsumo(a, i);
         break;
       }
       default:
-        if (s.tiles.some((a) => a.has(g.TSUMO) || a.has(g.IMAGE_DORA)))
+        if (s.tiles.some((a) => a.has(m.TSUMO) || a.has(m.IMAGE_DORA)))
           throw new Error(
             `found an unknown block with operator tiles. block: ${s}, type: ${s.type}`
           );
@@ -2451,25 +2465,25 @@ function Ui(s, t, e) {
     );
   return { ...r, e: o };
 }
-const Lt = (s, t, e = Ln) => {
-  const n = t.map((d) => Ui(d, s, e)), i = n.reduce((d, h) => d + h.width, 0), o = n.reduce((d, h) => Math.max(d, h.height), 0), a = i + (t.length - 1) * s.blockMargin, c = new N();
+const Kt = (s, t, e = zn) => {
+  const n = t.map((d) => Fi(d, s, e)), i = n.reduce((d, h) => d + h.width, 0), o = n.reduce((d, h) => Math.max(d, h.height), 0), a = i + (t.length - 1) * s.blockMargin, c = new N();
   let l = 0;
   for (const d of n) {
     const h = o - d.height, u = new N().translate(l, h);
     u.add(d.e), c.add(u), l += d.width + s.blockMargin;
   }
   return { e: c, width: a, height: o };
-}, Ln = {
+}, zn = {
   enableDoraText: !0,
   enableTsumoText: !0
-}, Jo = (s, t, e = {}, n = Ln) => {
-  const i = new Kn(e), r = Lt(i, t, n);
+}, ea = (s, t, e = {}, n = zn) => {
+  const i = new Kn(e), r = Kt(i, t, n);
   n.responsive || s.size(r.width, r.height), s.viewbox(0, 0, r.width, r.height), s.add(r.e);
-}, zn = () => {
+}, Un = () => {
   const s = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
   return Object.values(p).flatMap((t) => t === p.BACK ? [kt.buildID(new y(t, 0))] : s.map((e) => kt.buildID(new y(t, e))));
-}, ji = (s) => {
-  const t = zn(), e = [];
+}, Gi = (s) => {
+  const t = Un(), e = [];
   return s.each((n, i) => {
     const r = i[n];
     if (r instanceof Ue) {
@@ -2477,13 +2491,13 @@ const Lt = (s, t, e = Ln) => {
       t.includes(a) && e.push(a);
     }
   }, !0), e;
-}, Xo = (s) => {
-  const t = zn(), e = ji(s);
+}, na = (s) => {
+  const t = Un(), e = Gi(s);
   s.each((n, i) => {
     const r = i[n];
-    r instanceof Wn && (t.includes(r.id()) && e.includes(r.id()) || r.remove());
+    r instanceof Dn && (t.includes(r.id()) && e.includes(r.id()) || r.remove());
   }, !0);
-}, Fi = (s, t = 6) => Array.from(
+}, Zi = (s, t = 6) => Array.from(
   { length: Math.ceil(s.length / t) },
   (e, n) => s.slice(n * t, (n + 1) * t)
 ), j = (s, t, e, n, i = 0, r = 0) => {
@@ -2502,9 +2516,9 @@ const Lt = (s, t, e = Ln) => {
   }
   return new N().add(o);
 }, Zt = (s, t) => {
-  const e = new N(), n = Fi(s);
+  const e = new N(), n = Zi(s);
   for (let i = 0; i < n.length; i++) {
-    const r = n[i], o = i * t.tileHeight, a = t.createBlockDiscard(new Ke(r, E.IMAGE_DISCARD)).translate(0, o);
+    const r = n[i], o = i * t.tileHeight, a = t.createBlockDiscard(new Le(r, E.IMAGE_DISCARD)).translate(0, o);
     e.add(a);
   }
   return {
@@ -2512,19 +2526,19 @@ const Lt = (s, t, e = Ln) => {
     width: t.tileWidth * 5 + t.tileHeight * 1,
     height: t.tileHeight * n.length
   };
-}, Gi = (s, t, e) => {
-  const n = t.font, i = t.textWidth, r = t.textHeight, o = e.sticks.dead, a = e.sticks.reach, c = en.WIDTH * s.scale, l = en.HEIGHT * s.scale, d = i * 3, h = r + 25 * s.scale, u = (c + s.tileWidth + i - d) / 2, m = new St().plain(e.round).font(n).x(u).y(0), f = s.tileHeight, w = new N().size(c, f).translate(0, h), b = { family: n.family, size: n.size * 0.7 }, A = s.createStick(1e3).size(c, l).x(0).y(0), S = new St().plain(a.toString()).font(b).dx(c).dy(l), x = s.createStick(100).size(c, l).x(0).y(l + l), at = new St().plain(o.toString()).font(b).dx(c).dy(l * 3);
+}, Yi = (s, t, e) => {
+  const n = t.font, i = t.textWidth, r = t.textHeight, o = e.sticks.dead, a = e.sticks.reach, c = en.WIDTH * s.scale, l = en.HEIGHT * s.scale, d = i * 3, h = r + 25 * s.scale, u = (c + s.tileWidth + i - d) / 2, g = new St().plain(e.round).font(n).x(u).y(0), f = s.tileHeight, w = new N().size(c, f).translate(0, h), b = { family: n.family, size: n.size * 0.7 }, A = s.createStick(1e3).size(c, l).x(0).y(0), S = new St().plain(a.toString()).font(b).dx(c).dy(l), x = s.createStick(100).size(c, l).x(0).y(l + l), at = new St().plain(o.toString()).font(b).dx(c).dy(l * 3);
   w.add(A), w.add(S), w.add(x), w.add(at);
-  const Q = s.createImage(e.doras[0], 0, 0).x(c + i).y(0);
+  const Q = s.createImage(e.doraIndicators[0], 0, 0).x(c + i).y(0);
   w.add(Q);
   const tt = new N();
-  return tt.add(m), tt.add(w), {
+  return tt.add(g), tt.add(w), {
     e: tt,
     width: c + s.tileWidth + i,
     height: h + s.tileHeight
   };
-}, Zi = (s, t, e = 0) => {
-  const n = Lt(s, t.front), i = Lt(s, t.right), r = Lt(s, t.opposite), o = Lt(s, t.left), a = [n.width, i.width, r.width, o.width].reduce(
+}, Vi = (s, t, e = 0) => {
+  const n = Kt(s, t.front), i = Kt(s, t.right), r = Kt(s, t.opposite), o = Kt(s, t.left), a = [n.width, i.width, r.width, o.width].reduce(
     (w, b) => Math.max(w, b)
   ), c = Math.max(
     e + s.tileHeight * 2 + s.blockMargin * 2,
@@ -2538,28 +2552,28 @@ const Lt = (s, t, e = Ln) => {
   ), u = j(r.e, r.width, r.height, 180).translate(
     (c - r.width) / 2,
     0
-  ), m = j(o.e, o.width, o.height, 90).translate(
+  ), g = j(o.e, o.width, o.height, 90).translate(
     0,
     (c - o.width) / 2
   ), f = new N().size(c, l);
-  return f.add(d), f.add(h), f.add(u), f.add(m), { e: new N().add(f), width: c, height: l };
-}, Yi = (s) => {
+  return f.add(d), f.add(h), f.add(u), f.add(g), { e: new N().add(f), width: c, height: l };
+}, Ji = (s) => {
   const t = Object.values(We), e = t.indexOf(s);
   return [...t.slice(e), ...t.slice(0, e)];
-}, Vi = (s, t, e) => {
-  const n = s.tileWidth * 5 + s.tileHeight * 1, i = t.font, r = t.textWidth, o = t.textHeight, a = t.numWidth, c = Gi(s, t, e);
+}, Xi = (s, t, e) => {
+  const n = s.tileWidth * 5 + s.tileHeight * 1, i = t.font, r = t.textWidth, o = t.textHeight, a = t.numWidth, c = Yi(s, t, e);
   c.e.translate(
     n / 2 - c.width / 2,
     n / 2 - c.height / 2
   );
-  const l = (ys, tn, ws) => {
-    const Es = `${ys} ${tn}`, _s = new St().plain(Es).font(i).attr(ws);
+  const l = (Es, tn, bs) => {
+    const _s = `${Es} ${tn}`, As = new St().plain(_s).font(i).attr(bs);
     return {
-      e: new N().add(_s),
+      e: new N().add(As),
       width: r + a * tn.toString().length,
       height: o
     };
-  }, [d, h, u, m] = Yi(
+  }, [d, h, u, g] = Ji(
     e.frontPlace
   ), f = e.scores, b = l(d, f.front, {
     x: n / 2,
@@ -2580,23 +2594,23 @@ const Lt = (s, t, e = Ln) => {
   const at = j(x.e, x.width, x.height, 180).translate(
     n / 2 - x.width,
     -x.height
-  ), Q = l(m, f.left, {
+  ), Q = l(g, f.left, {
     "dominant-baseline": "ideographic",
     "text-anchor": "middle"
   }), tt = j(Q.e, Q.width, Q.height, 90).translate(
     -Q.height,
     n / 2
-  ), ct = new N(), ms = new Bn().size(n, n).x(0).y(0).fill("none").stroke("#000000");
-  return ct.add(ms), ct.add(c.e), ct.add(b), ct.add(S), ct.add(at), ct.add(tt), { e: ct, width: n, height: n };
-}, Ji = (s, t) => {
+  ), ct = new N(), ws = new Wn().size(n, n).x(0).y(0).fill("none").stroke("#000000");
+  return ct.add(ws), ct.add(c.e), ct.add(b), ct.add(S), ct.add(at), ct.add(tt), { e: ct, width: n, height: n };
+}, qi = (s, t) => {
   const e = Zt(t.front, s), n = Zt(t.right, s), i = Zt(t.opposite, s), r = Zt(t.left, s), o = [e.height, n.height, i.height, r.height].reduce(
     (S, x) => Math.max(S, x)
-  ), a = s.tileWidth * 5 + s.tileHeight * 1, c = o, l = a + o * 2 + s.blockMargin, d = l, h = new N().size(l, d), u = l / 2 - a / 2, m = d / 2 - a / 2, f = j(e.e, a, c, 0).translate(
+  ), a = s.tileWidth * 5 + s.tileHeight * 1, c = o, l = a + o * 2 + s.blockMargin, d = l, h = new N().size(l, d), u = l / 2 - a / 2, g = d / 2 - a / 2, f = j(e.e, a, c, 0).translate(
     u,
     d - c
   ), w = j(n.e, a, c, 270).translate(
     l - c,
-    m
+    g
   ), b = j(
     i.e,
     a,
@@ -2604,11 +2618,11 @@ const Lt = (s, t, e = Ln) => {
     180
   ).translate(u, 0), A = j(r.e, a, c, 90).translate(
     0,
-    m
+    g
   );
   return h.add(f), h.add(w), h.add(b), h.add(A), { e: new N().add(h), width: l, height: d };
-}, Xi = (s, t, e, n, i) => {
-  const r = new N(), o = Ji(s, n), a = Zi(s, e, o.height), c = Vi(s, t, i);
+}, Qi = (s, t, e, n, i) => {
+  const r = new N(), o = qi(s, n), a = Vi(s, e, o.height), c = Xi(s, t, i);
   return o.e.translate(
     (a.width - o.width) / 2,
     (a.height - o.height) / 2
@@ -2616,34 +2630,34 @@ const Lt = (s, t, e = Ln) => {
     (a.width - c.width) / 2,
     (a.height - c.height) / 2
   ), r.add(a.e), r.add(o.e), r.add(c.e), { e: r, width: a.width, height: a.height };
-}, qo = (s, t, e = {}, n, i = { responsive: !1 }) => {
-  const r = new Kn(e), o = n, { discards: a, hands: c, scoreBoard: l } = hr(t), d = Xi(r, o, c, a, l);
+}, sa = (s, t, e = {}, n, i = { responsive: !1 }) => {
+  const r = new Kn(e), o = n, { discards: a, hands: c, scoreBoard: l } = ur(t), d = Qi(r, o, c, a, l);
   i.responsive || s.size(d.width, d.height), s.viewbox(0, 0, d.width, d.height), s.add(d.e);
 };
-var _e;
+let be;
 // @__NO_SIDE_EFFECTS__
-function Un(s) {
+function jn(s) {
   return {
-    lang: s?.lang ?? _e?.lang,
+    lang: s?.lang ?? be?.lang,
     message: s?.message,
-    abortEarly: s?.abortEarly ?? _e?.abortEarly,
-    abortPipeEarly: s?.abortPipeEarly ?? _e?.abortPipeEarly
+    abortEarly: s?.abortEarly ?? be?.abortEarly,
+    abortPipeEarly: s?.abortPipeEarly ?? be?.abortPipeEarly
   };
 }
-var qi;
-// @__NO_SIDE_EFFECTS__
-function Qi(s) {
-  return qi?.get(s);
-}
-var tr;
+let tr;
 // @__NO_SIDE_EFFECTS__
 function er(s) {
   return tr?.get(s);
 }
-var nr;
+let nr;
+// @__NO_SIDE_EFFECTS__
+function sr(s) {
+  return nr?.get(s);
+}
+let ir;
 // @__NO_SIDE_EFFECTS__
-function sr(s, t) {
-  return nr?.get(s)?.get(t);
+function rr(s, t) {
+  return ir?.get(s)?.get(t);
 }
 // @__NO_SIDE_EFFECTS__
 function Ct(s) {
@@ -2664,11 +2678,8 @@ function it(s, t, e, n, i) {
     lang: n.lang,
     abortEarly: n.abortEarly,
     abortPipeEarly: n.abortPipeEarly
-  }, l = s.kind === "schema", d = i?.message ?? s.message ?? /* @__PURE__ */ sr(s.reference, c.lang) ?? (l ? /* @__PURE__ */ er(c.lang) : null) ?? n.message ?? /* @__PURE__ */ Qi(c.lang);
-  d !== void 0 && (c.message = typeof d == "function" ? (
-    // @ts-expect-error
-    d(c)
-  ) : d), l && (e.typed = !1), e.issues ? e.issues.push(c) : e.issues = [c];
+  }, l = s.kind === "schema", d = i?.message ?? s.message ?? /* @__PURE__ */ rr(s.reference, c.lang) ?? (l ? /* @__PURE__ */ sr(c.lang) : null) ?? n.message ?? /* @__PURE__ */ er(c.lang);
+  d !== void 0 && (c.message = typeof d == "function" ? d(c) : d), l && (e.typed = !1), e.issues ? e.issues.push(c) : e.issues = [c];
 }
 // @__NO_SIDE_EFFECTS__
 function Bt(s) {
@@ -2676,12 +2687,12 @@ function Bt(s) {
     version: 1,
     vendor: "valibot",
     validate(t) {
-      return s["~run"]({ value: t }, /* @__PURE__ */ Un());
+      return s["~run"]({ value: t }, /* @__PURE__ */ jn());
     }
   };
 }
 // @__NO_SIDE_EFFECTS__
-function ir(s, t) {
+function or(s, t) {
   const e = [...new Set(s)];
   return e.length > 1 ? `(${e.join(` ${t} `)})` : e[0] ?? "never";
 }
@@ -2696,9 +2707,7 @@ function Se(s, t) {
     requirement: s,
     message: t,
     "~run"(e, n) {
-      return e.typed && !(e.value <= this.requirement) && it(this, "value", e, n, {
-        received: e.value instanceof Date ? e.value.toJSON() : /* @__PURE__ */ Ct(e.value)
-      }), e;
+      return e.typed && !(e.value <= this.requirement) && it(this, "value", e, n, { received: e.value instanceof Date ? e.value.toJSON() : /* @__PURE__ */ Ct(e.value) }), e;
     }
   };
 }
@@ -2713,31 +2722,17 @@ function Oe(s, t) {
     requirement: s,
     message: t,
     "~run"(e, n) {
-      return e.typed && !(e.value >= this.requirement) && it(this, "value", e, n, {
-        received: e.value instanceof Date ? e.value.toJSON() : /* @__PURE__ */ Ct(e.value)
-      }), e;
+      return e.typed && !(e.value >= this.requirement) && it(this, "value", e, n, { received: e.value instanceof Date ? e.value.toJSON() : /* @__PURE__ */ Ct(e.value) }), e;
     }
   };
 }
 // @__NO_SIDE_EFFECTS__
-function rr(s, t, e) {
-  return typeof s.fallback == "function" ? (
-    // @ts-expect-error
-    s.fallback(t, e)
-  ) : (
-    // @ts-expect-error
-    s.fallback
-  );
+function ar(s, t, e) {
+  return typeof s.fallback == "function" ? s.fallback(t, e) : s.fallback;
 }
 // @__NO_SIDE_EFFECTS__
-function jn(s, t, e) {
-  return typeof s.default == "function" ? (
-    // @ts-expect-error
-    s.default(t, e)
-  ) : (
-    // @ts-expect-error
-    s.default
-  );
+function Fn(s, t, e) {
+  return typeof s.default == "function" ? s.default(t, e) : s.default;
 }
 // @__NO_SIDE_EFFECTS__
 function ie(s) {
@@ -2757,11 +2752,11 @@ function ie(s) {
   };
 }
 // @__NO_SIDE_EFFECTS__
-function L(s, t) {
+function K(s, t) {
   return {
     kind: "schema",
     type: "optional",
-    reference: L,
+    reference: K,
     expects: `(${s.expects} | undefined)`,
     async: !1,
     wrapped: s,
@@ -2770,7 +2765,7 @@ function L(s, t) {
       return /* @__PURE__ */ Bt(this);
     },
     "~run"(e, n) {
-      return e.value === void 0 && (this.default !== void 0 && (e.value = /* @__PURE__ */ jn(this, e, n)), e.value === void 0) ? (e.typed = !0, e) : this.wrapped["~run"](e, n);
+      return e.value === void 0 && (this.default !== void 0 && (e.value = /* @__PURE__ */ Fn(this, e, n)), e.value === void 0) ? (e.typed = !0, e) : this.wrapped["~run"](e, n);
     }
   };
 }
@@ -2780,7 +2775,7 @@ function ke(s, t) {
     kind: "schema",
     type: "picklist",
     reference: ke,
-    expects: /* @__PURE__ */ ir(s.map(Ct), "|"),
+    expects: /* @__PURE__ */ or(s.map(Ct), "|"),
     async: !1,
     options: s,
     message: t,
@@ -2811,12 +2806,8 @@ function Rt(s, t) {
         e.typed = !0, e.value = {};
         for (const r in this.entries) {
           const o = this.entries[r];
-          if (r in i || (o.type === "exact_optional" || o.type === "optional" || o.type === "nullish") && // @ts-expect-error
-          o.default !== void 0) {
-            const a = r in i ? (
-              // @ts-expect-error
-              i[r]
-            ) : /* @__PURE__ */ jn(o), c = o["~run"]({ value: a }, n);
+          if (r in i || (o.type === "exact_optional" || o.type === "optional" || o.type === "nullish") && o.default !== void 0) {
+            const a = r in i ? i[r] : /* @__PURE__ */ Fn(o), c = o["~run"]({ value: a }, n);
             if (c.issues) {
               const l = {
                 type: "object",
@@ -2833,46 +2824,37 @@ function Rt(s, t) {
               }
             }
             c.typed || (e.typed = !1), e.value[r] = c.value;
-          } else if (o.fallback !== void 0)
-            e.value[r] = /* @__PURE__ */ rr(o);
+          } else if (o.fallback !== void 0) e.value[r] = /* @__PURE__ */ ar(o);
           else if (o.type !== "exact_optional" && o.type !== "optional" && o.type !== "nullish" && (it(this, "key", e, n, {
             input: void 0,
             expected: `"${r}"`,
-            path: [
-              {
+            path: [{
+              type: "object",
+              origin: "key",
+              input: i,
+              key: r,
+              value: i[r]
+            }]
+          }), n.abortEarly))
+            break;
+        }
+        if (!e.issues || !n.abortEarly) {
+          for (const r in i) if (!(r in this.entries)) {
+            it(this, "key", e, n, {
+              input: r,
+              expected: "never",
+              path: [{
                 type: "object",
                 origin: "key",
                 input: i,
                 key: r,
-                // @ts-expect-error
                 value: i[r]
-              }
-            ]
-          }), n.abortEarly))
+              }]
+            });
             break;
+          }
         }
-        if (!e.issues || !n.abortEarly) {
-          for (const r in i)
-            if (!(r in this.entries)) {
-              it(this, "key", e, n, {
-                input: r,
-                expected: "never",
-                path: [
-                  {
-                    type: "object",
-                    origin: "key",
-                    input: i,
-                    key: r,
-                    // @ts-expect-error
-                    value: i[r]
-                  }
-                ]
-              });
-              break;
-            }
-        }
-      } else
-        it(this, "type", e, n);
+      } else it(this, "type", e, n);
       return e;
     }
   };
@@ -2895,7 +2877,7 @@ function re(s) {
   };
 }
 // @__NO_SIDE_EFFECTS__
-function un(...s) {
+function fn(...s) {
   return {
     ...s[0],
     pipe: s,
@@ -2903,21 +2885,20 @@ function un(...s) {
       return /* @__PURE__ */ Bt(this);
     },
     "~run"(t, e) {
-      for (const n of s)
-        if (n.kind !== "metadata") {
-          if (t.issues && (n.kind === "schema" || n.kind === "transformation")) {
-            t.typed = !1;
-            break;
-          }
-          (!t.issues || !e.abortEarly && !e.abortPipeEarly) && (t = n["~run"](t, e));
+      for (const n of s) if (n.kind !== "metadata") {
+        if (t.issues && (n.kind === "schema" || n.kind === "transformation")) {
+          t.typed = !1;
+          break;
         }
+        (!t.issues || !e.abortEarly && !e.abortPipeEarly) && (t = n["~run"](t, e));
+      }
       return t;
     }
   };
 }
 // @__NO_SIDE_EFFECTS__
-function or(s, t, e) {
-  const n = s["~run"]({ value: t }, /* @__PURE__ */ Un(e));
+function cr(s, t, e) {
+  const n = s["~run"]({ value: t }, /* @__PURE__ */ jn(e));
   return {
     typed: n.typed,
     success: !n.issues,
@@ -2925,14 +2906,14 @@ function or(s, t, e) {
     issues: n.issues
   };
 }
-const Yt = /* @__PURE__ */ L(
+const Yt = /* @__PURE__ */ K(
   /* @__PURE__ */ Rt({
-    discard: /* @__PURE__ */ L(/* @__PURE__ */ re(), ""),
-    hand: /* @__PURE__ */ L(/* @__PURE__ */ re(), ""),
-    score: /* @__PURE__ */ L(/* @__PURE__ */ ie(), 25e3)
+    discard: /* @__PURE__ */ K(/* @__PURE__ */ re(), ""),
+    hand: /* @__PURE__ */ K(/* @__PURE__ */ re(), ""),
+    score: /* @__PURE__ */ K(/* @__PURE__ */ ie(), 25e3)
   }),
   { discard: "", hand: "", score: 25e3 }
-), ar = /* @__PURE__ */ Rt({
+), lr = /* @__PURE__ */ Rt({
   [_.E]: Yt,
   [_.S]: Yt,
   [_.W]: Yt,
@@ -2940,46 +2921,51 @@ const Yt = /* @__PURE__ */ L(
 }), ht = {
   round: k.E1,
   sticks: { reach: 0, dead: 0 },
-  doras: _.S,
+  doraIndicators: _.S,
   front: _.E
-}, cr = /* @__PURE__ */ L(
+}, hr = /* @__PURE__ */ K(
   /* @__PURE__ */ Rt({
-    round: /* @__PURE__ */ L(
-      /* @__PURE__ */ ke(Object.keys(Sn)),
+    round: /* @__PURE__ */ K(
+      /* @__PURE__ */ ke(Object.keys(On)),
       ht.round
     ),
-    sticks: /* @__PURE__ */ L(
+    sticks: /* @__PURE__ */ K(
       /* @__PURE__ */ Rt({
-        reach: /* @__PURE__ */ L(
-          /* @__PURE__ */ un(/* @__PURE__ */ ie(), /* @__PURE__ */ Oe(0, ""), /* @__PURE__ */ Se(9, "")),
+        reach: /* @__PURE__ */ K(
+          /* @__PURE__ */ fn(/* @__PURE__ */ ie(), /* @__PURE__ */ Oe(0, ""), /* @__PURE__ */ Se(9, "")),
           ht.sticks.reach
         ),
-        dead: /* @__PURE__ */ L(
-          /* @__PURE__ */ un(/* @__PURE__ */ ie(), /* @__PURE__ */ Oe(0, ""), /* @__PURE__ */ Se(9, "")),
+        dead: /* @__PURE__ */ K(
+          /* @__PURE__ */ fn(/* @__PURE__ */ ie(), /* @__PURE__ */ Oe(0, ""), /* @__PURE__ */ Se(9, "")),
           ht.sticks.dead
         )
       }),
       ht.sticks
     ),
-    doras: /* @__PURE__ */ L(/* @__PURE__ */ re(), ht.doras),
-    front: /* @__PURE__ */ L(
+    doraIndicators: /* @__PURE__ */ K(/* @__PURE__ */ re(), ht.doraIndicators),
+    front: /* @__PURE__ */ K(
       /* @__PURE__ */ ke(Object.keys(We)),
       ht.front
     )
   }),
   ht
-), lr = /* @__PURE__ */ Rt({
-  ...ar.entries,
-  board: cr
-}), hr = (s) => {
-  const t = dr(s);
-  return gr(t);
-}, dr = (s) => {
-  const t = ur(s), e = /* @__PURE__ */ or(lr, t);
-  if (!e.success)
-    throw e.issues;
-  return e.output;
-}, ur = (s) => {
+), dr = /* @__PURE__ */ Rt({
+  ...lr.entries,
+  board: hr
+}), ur = (s) => {
+  const t = fr(s);
+  return wr(t);
+}, fr = (s) => {
+  const t = gr(s);
+  return pr(t);
+};
+function pr(s) {
+  const t = /* @__PURE__ */ cr(dr, s);
+  if (!t.success)
+    throw t.issues;
+  return t.output;
+}
+const gr = (s) => {
   const t = "table", e = "board", n = s.split(`
 `).map((a) => a.trim()).filter((a) => a != "");
   if (n.length == 0) throw new Error("empty input");
@@ -2994,15 +2980,15 @@ const Yt = /* @__PURE__ */ L(
     const c = o.find((l) => a.startsWith(l));
     if (c == null) throw new Error(`encountered unexpected line ${a}`);
     if (o = o.filter((l) => !a.startsWith(l)), c == e) {
-      const [l, d] = pr([...n]);
+      const [l, d] = yr([...n]);
       r.board = l, n.splice(0, d);
     } else {
-      const [l, d] = fr([...n]);
+      const [l, d] = mr([...n]);
       r[c] = l, n.splice(0, d);
     }
   }
   return r;
-}, Z = (s, t) => s.replace(t, "").replace(":", "").trim(), fr = (s) => {
+}, Z = (s, t) => s.replace(t, "").replace(":", "").trim(), mr = (s) => {
   const t = "hand", e = "discard", n = "score", i = {};
   let r = 0;
   for (; r < s.length; r++) {
@@ -3015,13 +3001,13 @@ const Yt = /* @__PURE__ */ L(
     else break;
   }
   return [i, r];
-}, pr = (s) => {
-  const t = "doras", e = "round", n = "front", i = "sticks", r = "reach", o = "dead", a = {};
+}, yr = (s) => {
+  const t = "dora_indicators", e = "round", n = "front", i = "sticks", r = "reach", o = "dead", a = {};
   let c = 0;
   for (; c < s.length; c++) {
     const l = s[c];
     if (l.startsWith(t))
-      a.doras = Z(l, t);
+      a.doraIndicators = Z(l, t);
     else if (l.startsWith(e))
       a.round = Z(l, e);
     else if (l.startsWith(n))
@@ -3033,8 +3019,8 @@ const Yt = /* @__PURE__ */ L(
     } else break;
   }
   return [a, c];
-}, gr = (s) => {
-  const t = s.board.front, e = mr(t), n = (a) => s[a].discard.replace(/\r?\n/g, ""), i = {
+}, wr = (s) => {
+  const t = s.board.front, e = Er(t), n = (a) => s[a].discard.replace(/\r?\n/g, ""), i = {
     front: new D(n(e.front)).tiles(),
     right: new D(n(e.right)).tiles(),
     opposite: new D(n(e.opposite)).tiles(),
@@ -3045,10 +3031,10 @@ const Yt = /* @__PURE__ */ L(
     opposite: new D(s[e.opposite].hand).parse(),
     left: new D(s[e.left].hand).parse()
   }, o = {
-    round: Sn[s.board.round],
+    round: On[s.board.round],
     frontPlace: We[t],
     sticks: s.board.sticks,
-    doras: new D(s.board.doras).tiles(),
+    doraIndicators: new D(s.board.doraIndicators).tiles(),
     scores: {
       front: s[e.front].score,
       right: s[e.right].score,
@@ -3057,11 +3043,11 @@ const Yt = /* @__PURE__ */ L(
     }
   };
   return { discards: i, hands: r, scoreBoard: o };
-}, mr = (s) => ({
+}, Er = (s) => ({
   front: s,
   right: vt(s),
   opposite: vt(vt(s)),
-  left: Le(s)
+  left: Ke(s)
 });
 function* F(s) {
   const t = s?.filterBy && s.filterBy.length > 0 ? s?.filterBy : Object.values(p);
@@ -3116,18 +3102,18 @@ class je {
     const t = [];
     for (const [e, n] of F()) {
       let i = this.get(e, n);
-      e != p.Z && n == 5 && this.get(e, 0) > 0 && (i -= this.get(e, 0), t.push(new y(e, n, [g.RED])));
+      e != p.Z && n == 5 && this.get(e, 0) > 0 && (i -= this.get(e, 0), t.push(new y(e, n, [m.RED])));
       for (let r = 0; r < i; r++)
         t.push(new y(e, n));
     }
     if (this.drawn != null) {
       const e = this.drawn, n = t.findIndex(
-        (i) => i.equals(e) && e.has(g.RED) == i.has(g.RED)
+        (i) => i.equals(e) && e.has(m.RED) == i.has(m.RED)
       );
       I(
         n >= 0,
         `drawn tile ${this.drawn} not found in hand: ${t.join("")}`
-      ), t[n] = t[n].clone({ add: g.TSUMO });
+      ), t[n] = t[n].clone({ add: m.TSUMO });
     }
     return t;
   }
@@ -3135,7 +3121,7 @@ class je {
    * 晒された牌を含む手牌を整形した文字列で返す。
    */
   toString() {
-    const t = this.called.length > 0 ? `${X}${this.called.join(X)}` : "", e = this.drawn ? `${X}${this.drawn.toString()}` : "", n = this.hands.filter((r) => !r.has(g.TSUMO));
+    const t = this.called.length > 0 ? `${X}${this.called.join(X)}` : "", e = this.drawn ? `${X}${this.drawn.toString()}` : "", n = this.hands.filter((r) => !r.has(m.TSUMO));
     return `${new Tt(n).toString()}${e}${t}`;
   }
   /**
@@ -3185,13 +3171,13 @@ class je {
   inc(t) {
     const e = [];
     for (const n of t) {
-      const i = n.t != p.BACK && this.get(n.t, n.n) >= 4, r = n.has(g.RED) && this.get(n.t, 0) > 0;
+      const i = n.t != p.BACK && this.get(n.t, n.n) >= 4, r = n.has(m.RED) && this.get(n.t, 0) > 0;
       if (i || r) {
         this.dec(e);
         const o = i ? `tile ${n} exists more than 4 times` : `red tile ${n} appears more than once`;
         throw new Error(`invalid hand: ${o} in hand: ${this.toString()}`);
       }
-      e.push(n), n.t == p.BACK ? this.data[n.t][1] += 1 : (this.data[n.t][n.n] += 1, n.has(g.RED) && (this.data[n.t][0] += 1));
+      e.push(n), n.t == p.BACK ? this.data[n.t][1] += 1 : (this.data[n.t][n.n] += 1, n.has(m.RED) && (this.data[n.t][0] += 1));
     }
     return e;
   }
@@ -3201,15 +3187,15 @@ class je {
   dec(t) {
     const e = [];
     for (const n of t) {
-      const i = this.get(n.t, n.n) < 1, r = n.has(g.RED) && this.get(n.t, 0) <= 0;
+      const i = this.get(n.t, n.n) < 1, r = n.has(m.RED) && this.get(n.t, 0) <= 0;
       if (i || r) {
         this.inc(e);
         const o = i ? `tile ${n} does not exist` : `red tile ${n} does not exist`;
         throw new Error(`invalid hand: ${o} in hand: ${this.toString()}`);
       }
-      if (e.push(n), n.t == p.BACK ? this.data[n.t][1] -= 1 : (this.data[n.t][n.n] -= 1, n.has(g.RED) && (this.data[n.t][0] -= 1)), O(n) && this.get(n.t, 5) == 0 && this.get(n.t, 0) > 0) {
+      if (e.push(n), n.t == p.BACK ? this.data[n.t][1] -= 1 : (this.data[n.t][n.n] -= 1, n.has(m.RED) && (this.data[n.t][0] -= 1)), O(n) && this.get(n.t, 5) == 0 && this.get(n.t, 0) > 0) {
         this.data[n.t][0] = 0;
-        const o = e.pop().clone({ add: g.RED });
+        const o = e.pop().clone({ add: m.RED });
         e.push(o);
       }
     }
@@ -3219,7 +3205,7 @@ class je {
    * ツモ牌として手牌に加える。
    */
   draw(t) {
-    const e = t.clone({ add: g.TSUMO });
+    const e = t.clone({ add: m.TSUMO });
     this.inc([e]), this.data.tsumo = e;
   }
   /**
@@ -3240,7 +3226,7 @@ class je {
    * 他家の打牌を指定したブロックで鳴く。鳴く牌はブロック内で表現する。
    */
   call(t) {
-    const e = t.tiles.filter((n) => !n.has(g.HORIZONTAL));
+    const e = t.tiles.filter((n) => !n.has(m.HORIZONTAL));
     if (e.length != t.tiles.length - 1)
       throw new Error(`invalid block: removal tiles: ${e}, block: ${t}`);
     this.dec(e), this.data.called = [...this.called, t], this.data.tsumo = null;
@@ -3253,7 +3239,7 @@ class je {
       this.dec(t.tiles), this.data.called = [...this.called, t], this.data.tsumo = null;
       return;
     }
-    if (t instanceof H) {
+    if (t instanceof P) {
       const e = this.data.called.findIndex(
         (i) => i.is(E.PON) && i.tiles[0].equals(t.tiles[0])
       );
@@ -3262,7 +3248,7 @@ class je {
           `cannot find pon block ${t.tiles[0]} to call shokan: ${t}`
         );
       let n = t.tiles[0];
-      n = O(n) ? n.clone({ remove: g.RED }) : n, this.dec([n]), this.data.called = [
+      n = O(n) ? n.clone({ remove: m.RED }) : n, this.dec([n]), this.data.called = [
         ...this.called.slice(0, e),
         ...this.called.slice(e + 1),
         t
@@ -3321,18 +3307,18 @@ class ge {
   standardType() {
     const t = (n) => {
       const i = [0, 0, 0];
-      for (const [u, m] of F({ filterBy: [p.Z] }))
-        this.hand.get(u, m) >= 3 ? i[0]++ : this.hand.get(u, m) == 2 ? i[1]++ : this.hand.get(u, m) == 1 && i[2]++;
+      for (const [u, g] of F({ filterBy: [p.Z] }))
+        this.hand.get(u, g) >= 3 ? i[0]++ : this.hand.get(u, g) == 2 ? i[1]++ : this.hand.get(u, g) == 1 && i[2]++;
       const r = [0, 0, 0], o = this.hand.get(p.BACK, 0), a = o % 3;
       r[0] = Math.floor(o / 3), a == 2 ? r[1] = 1 : a == 1 && (r[2] = 1);
       let c = 13;
       const l = this.calcNumberTilePatterns(p.M), d = this.calcNumberTilePatterns(p.P), h = this.calcNumberTilePatterns(p.S);
       for (const u of [l.patternA, l.patternB])
-        for (const m of [d.patternA, d.patternB])
+        for (const g of [d.patternA, d.patternB])
           for (const f of [h.patternA, h.patternB]) {
             const w = [this.hand.called.length, 0, 0];
             for (let A = 0; A < 3; A++)
-              w[A] += u[A] + m[A] + f[A] + i[A] + r[A];
+              w[A] += u[A] + g[A] + f[A] + i[A] + r[A];
             const b = this.getStandardTypeShanten(w[0], w[1], w[2], n);
             b < c && (c = b);
           }
@@ -3377,7 +3363,7 @@ class ge {
     return t > 4 && (e += t - 4, t = 4), t + e > 4 && (n += t + e - 4, e = 4 - t), t + e + n > r && (n = r - t - e), i && e++, 13 - t * 3 - e * 2 - n;
   }
 }
-class yr {
+class br {
   hand;
   constructor(t) {
     this.hand = t;
@@ -3408,12 +3394,12 @@ class yr {
    */
   markedHand(t, e) {
     if (t.length == 0) return [];
-    const n = this.hand.drawn != null || e.has(g.TSUMO) ? g.TSUMO : g.RON, i = [], r = {};
+    const n = this.hand.drawn != null || e.has(m.TSUMO) ? m.TSUMO : m.RON, i = [], r = {};
     for (let a = 0; a < t.length; a++) {
       const c = t[a];
       if (c.isCalled()) continue;
       const l = c.tiles.findIndex(
-        (h) => h.equals(e) && e.has(g.RED) == h.has(g.RED)
+        (h) => h.equals(e) && e.has(m.RED) == h.has(m.RED)
       );
       if (l < 0) continue;
       const d = zt(c);
@@ -3461,7 +3447,7 @@ class yr {
       const i = n == p.Z ? jt : q;
       for (let r of i)
         if (this.hand.get(n, r) == 1)
-          t.push(new On(new y(n, r)));
+          t.push(new kn(new y(n, r)));
         else if (this.hand.get(n, r) == 2 && e == !1)
           t.unshift(new C(new y(n, r), new y(n, r))), e = !0;
         else return [];
@@ -3491,7 +3477,7 @@ class yr {
     for (const [e, n] of F())
       if (this.hand.get(e, n) >= 2) {
         const i = new Array(2).fill(new y(e, n));
-        n == 5 && this.hand.get(e, 0) > 0 && this.hand.get(e, n) >= 3 && (i[1] = new y(e, n, [g.RED]));
+        n == 5 && this.hand.get(e, 0) > 0 && this.hand.get(e, n) >= 3 && (i[1] = new y(e, n, [m.RED]));
         const r = this.hand.dec(i), o = this.calcAllBlockCombinations().filter((a) => a.length == 4).map((a) => [new C(r[0], r[1]), ...a]);
         t = [...t, ...o], this.hand.inc(r);
       }
@@ -3514,7 +3500,7 @@ class yr {
   handleBack() {
     const t = p.BACK, e = this.hand.get(t, 0);
     if (e < 3) return [];
-    const n = new y(t, 0), i = Array(Math.floor(e / 3)).fill(new K([n, n, n]));
+    const n = new y(t, 0), i = Array(Math.floor(e / 3)).fill(new L([n, n, n]));
     return i.length == 0 ? [] : [i];
   }
   handleZ() {
@@ -3523,7 +3509,7 @@ class yr {
       if (this.hand.get(e, n) == 0) continue;
       if (this.hand.get(e, n) != 3) return [];
       const i = new y(e, n);
-      t.push(new K([i, i, i]));
+      t.push(new L([i, i, i]));
     }
     return t.length == 0 ? [] : [t];
   }
@@ -3531,14 +3517,14 @@ class yr {
    * 一つの手牌の構成において、赤牌ごとの手牌（晒したブロックを含まない）の構成を生成する。
    */
   addRedPattern(t, e) {
-    const n = new y(t, 5), i = new y(t, 5, [g.RED]), r = [];
+    const n = new y(t, 5), i = new y(t, 5, [m.RED]), r = [];
     let o = null;
     const a = {};
     for (let l = 0; l < e.length; l++) {
-      const d = e[l], h = d.tiles.findIndex((f) => O(f) && !f.has(g.RED)), u = d.tiles.findIndex((f) => O(f) && f.has(g.RED));
+      const d = e[l], h = d.tiles.findIndex((f) => O(f) && !f.has(m.RED)), u = d.tiles.findIndex((f) => O(f) && f.has(m.RED));
       if (u > -1 && (o = [l, u]), u > -1 && h > -1 || h < 0) continue;
-      const m = zt(d);
-      a[m] || (a[m] = !0, r.push([l, h]));
+      const g = zt(d);
+      a[g] || (a[g] = !0, r.push([l, h]));
     }
     if (o == null) return [e];
     const c = [e];
@@ -3547,10 +3533,10 @@ class yr {
       h[l] = u.clone({
         replace: { idx: d, tile: i }
       });
-      const m = h[o[0]];
-      h[o[0]] = m.clone({
+      const g = h[o[0]];
+      h[o[0]] = g.clone({
         replace: { idx: o[1], tile: n }
-      }), zt(u) != zt(m) && c.push(h);
+      }), zt(u) != zt(g) && c.push(h);
     }
     return c;
   }
@@ -3582,7 +3568,7 @@ class yr {
       let r = this.handleNumType(t, e);
       this.hand.inc(i), r.length == 0 && (r = [[]]);
       for (const o of r)
-        n.push([new K([i[0], i[1], i[2]]), ...o]);
+        n.push([new L([i[0], i[1], i[2]]), ...o]);
     }
     return n;
   }
@@ -3607,14 +3593,14 @@ const jt = [1, 2, 3, 4, 5, 6, 7], q = [1, 9], Vt = (s) => {
   DOUBLE_YAKUMAN: 16e3,
   DEAD_STICK: 300,
   REACH_STICK: 1e3
-}, wr = [
+}, _r = [
   { minHan: 26, points: M.DOUBLE_YAKUMAN },
   { minHan: 13, points: M.YAKUMAN },
   { minHan: 11, points: M.TRIPLE },
   { minHan: 8, points: M.DOUBLE },
   { minHan: 6, points: M.HANEMAN },
   { minHan: 5, points: M.MANGAN }
-], Er = {
+], Ar = {
   [M.MANGAN]: "満貫",
   [M.HANEMAN]: "跳満",
   [M.DOUBLE]: "倍満",
@@ -3626,17 +3612,17 @@ const jt = [1, 2, 3, 4, 5, 6, 7], q = [1, 9], Vt = (s) => {
   CHILD_TUMO_FROM_PARENT: 2,
   CHILD_TUMO_FROM_CHILD: 1
 };
-function _r(s) {
+function Ir(s) {
   if (s.isYakuman) return "役満";
   if (s.isCountableYakuman) return "数え役満";
-  const t = br(
+  const t = Nr(
     s.base,
     s.isTsumo,
     s.isParent
-  ), e = Er[s.base];
+  ), e = Ar[s.base];
   return e ? `${s.fu}符${s.han}飜 ${e}${t}` : `${s.fu}符${s.han}飜 ${t}`;
 }
-function br(s, t, e) {
+function Nr(s, t, e) {
   if (t)
     return e ? `${nt(s * Y.PARENT_TSUMO)}` : `${nt(s * Y.CHILD_TUMO_FROM_CHILD)}-${nt(
       s * Y.CHILD_TUMO_FROM_PARENT
@@ -3647,15 +3633,15 @@ function br(s, t, e) {
   }
 }
 const nt = (s, t = 100) => Math.ceil(s / t) * t;
-class Fn {
+class Gn {
   hand;
   cfg;
   constructor(t, e) {
     this.hand = t, this.cfg = {
-      doras: e.doraIndicators.map((n) => pn(n)),
+      doras: e.doraIndicators.map((n) => gn(n)),
       // convert to dora
-      hiddenDoras: e.hiddenDoraIndicators == null ? [] : e.hiddenDoraIndicators.map((n) => pn(n)),
-      roundWind: y.from(ks(e.round)),
+      hiddenDoras: e.hiddenDoraIndicators == null ? [] : e.hiddenDoraIndicators.map((n) => gn(n)),
+      roundWind: y.from(Rs(e.round)),
       myWind: y.from(e.myWind),
       reached: e.doubleReached ? 2 : t.reached ? 1 : 0,
       sticks: e.sticks ?? { dead: 0, reach: 0 },
@@ -3684,7 +3670,7 @@ class Fn {
       this.cfg.orig.ronWind
     ), o = r[i.myWind];
     this.addStickPoints(r, i.myWind, this.cfg.orig.ronWind);
-    const a = _r({
+    const a = Ir({
       base: i.base,
       fu: i.fu,
       han: i.han,
@@ -3799,13 +3785,13 @@ class Fn {
     return t === 30 && e === 4 || t === 60 && e === 3;
   }
   isTsumoWin(t) {
-    return t.some((e) => e.tiles.some((n) => n.has(g.TSUMO)));
+    return t.some((e) => e.tiles.some((n) => n.has(m.TSUMO)));
   }
   /**
    * Wind をキーとした点数移動の構成を返す
    */
   calculateDeltas(t, e, n, i, r) {
-    const o = W(0);
+    const o = W(() => 0);
     return e ? this.calculateTsumoDeltas(o, t, n, i) : (I(r != null, "tumo is false but ron wind is null"), this.calculateRonDeltas(o, t, n, i, r)), o;
   }
   calculateRonDeltas(t, e, n, i, r) {
@@ -3835,7 +3821,7 @@ class Fn {
       r == e ? t[r] += i : t[r] -= i / 3;
   }
   getBasePoints(t, e) {
-    for (const { minHan: n, points: i } of wr)
+    for (const { minHan: n, points: i } of _r)
       if (t >= n) return i;
     return Math.min(e * 2 ** (t + 2), M.MANGAN);
   }
@@ -3846,12 +3832,12 @@ class Fn {
     return this.cfg.reached == 1 ? [{ name: "立直", han: 1 }] : this.cfg.reached == 2 ? [{ name: "ダブル立直", han: 2 }] : [];
   }
   dB1(t) {
-    return this.hand.drawn == null, this.getCalledPenalty() != 0 ? [] : t.some((n) => n.tiles.some((i) => i.has(g.TSUMO))) ? [{ name: "門前清自摸和", han: 1 }] : [];
+    return this.hand.drawn == null, this.getCalledPenalty() != 0 ? [] : t.some((n) => n.tiles.some((i) => i.has(m.TSUMO))) ? [{ name: "門前清自摸和", han: 1 }] : [];
   }
   dC1(t) {
     if (this.getCalledPenalty() != 0) return [];
     const e = "平和", n = this.calcFu(t);
-    return n == 20 ? [{ name: e, han: 1 }] : !t.some((i) => i.tiles.some((r) => r.has(g.TSUMO))) && n == 30 ? [{ name: e, han: 1 }] : [];
+    return n == 20 ? [{ name: e, han: 1 }] : !t.some((i) => i.tiles.some((r) => r.has(m.TSUMO))) && n == 30 ? [{ name: e, han: 1 }] : [];
   }
   dD1(t) {
     return t.some(
@@ -3859,7 +3845,7 @@ class Fn {
     ) ? [] : [{ name: "断么九", han: 1 }];
   }
   dE1(t) {
-    return this.getCalledPenalty() != 0 ? [] : fn(t) == 1 ? [{ name: "一盃口", han: 1 }] : [];
+    return this.getCalledPenalty() != 0 ? [] : pn(t) == 1 ? [{ name: "一盃口", han: 1 }] : [];
   }
   dF1(t) {
     const e = [];
@@ -3891,7 +3877,7 @@ class Fn {
     ), i = e.reduce(
       (a, c) => a + this.cfg.hiddenDoras.filter((l) => c.equals(l)).length,
       0
-    ), r = e.filter((a) => a.has(g.RED)).length, o = [];
+    ), r = e.filter((a) => a.has(m.RED)).length, o = [];
     return n > 0 && o.push({ name: "ドラ", han: n }), r > 0 && o.push({ name: "赤ドラ", han: r }), this.hand.reached && i > 0 && o.push({ name: "裏ドラ", han: i }), o;
   }
   dA2(t) {
@@ -3915,19 +3901,19 @@ class Fn {
   }
   dC2(t) {
     return t.length == 7 ? [] : t.every(
-      (n) => n instanceof R || n instanceof H || n instanceof z || n instanceof K || n instanceof U || n instanceof C
+      (n) => n instanceof R || n instanceof P || n instanceof z || n instanceof L || n instanceof U || n instanceof C
     ) ? [{ name: "対々和", han: 2 }] : [];
   }
   dD2(t) {
-    return t.filter((n) => (n instanceof R || n instanceof K) && !n.tiles.some((i) => i.has(g.RON))).length >= 3 ? [{ name: "三暗刻", han: 2 }] : [];
+    return t.filter((n) => (n instanceof R || n instanceof L) && !n.tiles.some((i) => i.has(m.RON))).length >= 3 ? [{ name: "三暗刻", han: 2 }] : [];
   }
   dE2(t) {
     return t.filter(
-      (n) => n instanceof R || n instanceof H || n instanceof z
+      (n) => n instanceof R || n instanceof P || n instanceof z
     ).length >= 3 ? [{ name: "三槓子", han: 2 }] : [];
   }
   dF2(t) {
-    const e = (n) => n instanceof R || n instanceof H || n instanceof z || n instanceof K || n instanceof U;
+    const e = (n) => n instanceof R || n instanceof P || n instanceof z || n instanceof L || n instanceof U;
     for (const n of t) {
       if (!e(n)) continue;
       const i = dt(n);
@@ -3952,7 +3938,7 @@ class Fn {
   dH2(t) {
     return t.every((n) => {
       const i = n.tiles[0], r = i.t == p.Z ? jt : q;
-      return (n instanceof R || n instanceof H || n instanceof z || n instanceof K || n instanceof U || n instanceof C) && r.includes(i.n);
+      return (n instanceof R || n instanceof P || n instanceof z || n instanceof L || n instanceof U || n instanceof C) && r.includes(i.n);
     }) ? [{ name: "混老頭", han: 2 }] : [];
   }
   dI2(t) {
@@ -3987,7 +3973,7 @@ class Fn {
     return t.length == 7 ? [] : t.some((n) => n instanceof gt || n instanceof V) ? t.some((n) => n.tiles[0].t == p.Z) ? [] : t.every((n) => n.tiles.some((i) => q.includes(i.n))) ? [{ name: "純全帯么九色", han: 3 - this.getCalledPenalty() }] : [] : [];
   }
   dC3(t) {
-    return this.getCalledPenalty() != 0 ? [] : fn(t) == 2 ? [{ name: "ニ盃口", han: 3 }] : [];
+    return this.getCalledPenalty() != 0 ? [] : pn(t) == 2 ? [{ name: "ニ盃口", han: 3 }] : [];
   }
   dA6(t) {
     if (t.some((e) => e.tiles[0].t == p.Z)) return [];
@@ -3999,7 +3985,7 @@ class Fn {
   }
   dA13(t) {
     return t.length != 13 ? [] : t.some(
-      (n) => n instanceof C && n.tiles.some((i) => i.has(g.TSUMO) || i.has(g.RON))
+      (n) => n instanceof C && n.tiles.some((i) => i.has(m.TSUMO) || i.has(m.RON))
     ) ? [{ name: "国士無双13面待ち", han: 26, isYakuman: !0 }] : [{ name: "国士無双", han: 13, isYakuman: !0 }];
   }
   dB13(t) {
@@ -4007,9 +3993,9 @@ class Fn {
   }
   dC13(t) {
     return t.length == 7 ? [] : t.every(
-      (i) => i instanceof R || i instanceof K && i.tiles.every((r) => !r.has(g.RON)) || i instanceof C
+      (i) => i instanceof R || i instanceof L && i.tiles.every((r) => !r.has(m.RON)) || i instanceof C
     ) ? t.some(
-      (i) => i instanceof C && i.tiles.some((r) => r.has(g.TSUMO) || r.has(g.RON))
+      (i) => i instanceof C && i.tiles.some((r) => r.has(m.TSUMO) || r.has(m.RON))
     ) ? [{ name: "四暗刻単騎待ち", han: 26, isYakuman: !0 }] : [{ name: "四暗刻", han: 13, isYakuman: !0 }] : [];
   }
   dD13(t) {
@@ -4024,12 +4010,12 @@ class Fn {
   }
   dF13(t) {
     return t.every(
-      (n) => (n instanceof R || n instanceof H || n instanceof z || n instanceof K || n instanceof U || n instanceof C) && q.includes(n.tiles[0].n)
+      (n) => (n instanceof R || n instanceof P || n instanceof z || n instanceof L || n instanceof U || n instanceof C) && q.includes(n.tiles[0].n)
     ) ? [{ name: "清老頭", han: 13, isYakuman: !0 }] : [];
   }
   dG13(t) {
     return t.length == 7 ? [] : t.every(
-      (n) => n instanceof R || n instanceof H || n instanceof z || n instanceof C
+      (n) => n instanceof R || n instanceof P || n instanceof z || n instanceof C
     ) ? [{ name: "四槓子", han: 13, isYakuman: !0 }] : [];
   }
   dH13(t) {
@@ -4060,21 +4046,21 @@ class Fn {
     const e = 20;
     let n = e;
     const i = this.cfg.myWind.n, r = this.cfg.roundWind.n, o = t.find(
-      (f) => f.tiles.some((w) => w.has(g.TSUMO) || w.has(g.RON))
-    ), a = this.getCalledPenalty() == 1, c = o.tiles.some((f) => f.has(g.TSUMO)), l = (f, w) => {
+      (f) => f.tiles.some((w) => w.has(m.TSUMO) || w.has(m.RON))
+    ), a = this.getCalledPenalty() == 1, c = o.tiles.some((f) => f.has(m.TSUMO)), l = (f, w) => {
       const b = f.tiles[0];
       return b.t == p.Z || q.includes(b.n) ? w * 2 : w;
     };
     for (const f of t)
       switch (!0) {
-        case f instanceof K:
-          const w = f.tiles.some((b) => b.has(g.RON)) ? 2 : 4;
+        case f instanceof L:
+          const w = f.tiles.some((b) => b.has(m.RON)) ? 2 : 4;
           n += l(f, w);
           break;
         case f instanceof U:
           n += l(f, 2);
           break;
-        case (f instanceof z || f instanceof H):
+        case (f instanceof z || f instanceof P):
           n += l(f, 8);
           break;
         case f instanceof R:
@@ -4082,24 +4068,24 @@ class Fn {
           break;
       }
     n += ((f) => {
-      if (f instanceof K) return 0;
+      if (f instanceof L) return 0;
       if (f instanceof C) return 2;
-      const w = f.tiles, b = w.findIndex((A) => A.has(g.TSUMO) || A.has(g.RON));
+      const w = f.tiles, b = w.findIndex((A) => A.has(m.TSUMO) || A.has(m.RON));
       return b == 1 || b == 0 && w[2].n == 9 || b == 2 && w[0].n == 1 ? 2 : 0;
     })(o);
     const u = t.find((f) => f instanceof C).tiles[0];
     u.t == p.Z && ([5, 6, 7].includes(u.n) && (n += 2), (u.n == r || u.n == i) && (n += 2));
-    let m = !1;
-    return !a && n == e && (m = !0), c && !m && (n += 2), !c && !a && (n += 10), !c && !a && n == 30 && (m = !0), a && n == e && (n = 30), n;
+    let g = !1;
+    return !a && n == e && (g = !0), c && !g && (n += 2), !c && !a && (n += 10), !c && !a && n == 30 && (g = !0), a && n == e && (n = 30), n;
   }
 }
-const zt = (s) => s.tiles.reduce((t, e) => `${t}${e.n}${e.t}`, ""), fn = (s) => {
+const zt = (s) => s.tiles.reduce((t, e) => `${t}${e.n}${e.t}`, ""), pn = (s) => {
   const t = s.filter((e) => e instanceof gt).reduce((e, n) => {
     const i = zt(n);
     return e[i] = (e[i] || 0) + 1, e;
   }, {});
   return Object.values(t).filter((e) => e >= 2).length;
-}, dt = (s) => [...s.tiles].sort(fe)[0], pn = (s) => {
+}, dt = (s) => [...s.tiles].sort(fe)[0], gn = (s) => {
   const t = s.n, e = s.t;
   if (e == p.Z) {
     if (t == 4) return new y(e, 1);
@@ -4119,7 +4105,7 @@ class Ft {
     for (const o of e) {
       const a = t.dec([o]), c = Ft.getEffectiveTiles(t, n);
       t.inc(a);
-      const l = n?.arrangeRed && o.has(g.RED) ? o.clone({ removeAll: !0 }) : o.has(g.RED) ? o.clone({ removeAll: !0, add: g.RED }) : o.clone({ removeAll: !0 });
+      const l = n?.arrangeRed && o.has(m.RED) ? o.clone({ removeAll: !0 }) : o.has(m.RED) ? o.clone({ removeAll: !0, add: m.RED }) : o.clone({ removeAll: !0 });
       c.shanten < r ? (i.clear(), i.set(l.toString(), {
         shanten: c.shanten,
         effectiveTiles: c.effectiveTiles,
@@ -4170,14 +4156,14 @@ const Re = () => {
     }
   };
 };
-function Ar(s) {
-  const t = ["RON", "DAI_KAN", "PON", "CHI"], e = s.map((r) => r.choices), i = Gn(e, t).map((r) => s[r]);
+function Tr(s) {
+  const t = ["RON", "DAI_KAN", "PON", "CHI"], e = s.map((r) => r.choices), i = Zn(e, t).map((r) => s[r]);
   return {
     events: i,
-    type: Zn(t, i[0]?.choices)
+    type: Yn(t, i[0]?.choices)
   };
 }
-function Ir(s) {
+function vr(s) {
   const t = [
     "TSUMO",
     "REACH",
@@ -4185,34 +4171,34 @@ function Ir(s) {
     "SHO_KAN",
     "DRAWN_GAME_BY_NINE_TERMINALS",
     "DISCARD"
-  ], e = s.map((r) => r.choices), i = Gn(e, t).map((r) => s[r]);
+  ], e = s.map((r) => r.choices), i = Zn(e, t).map((r) => s[r]);
   return {
     events: i,
-    type: Zn(t, i[0]?.choices)
+    type: Yn(t, i[0]?.choices)
   };
 }
-function Gn(s, t) {
+function Zn(s, t) {
   let e = [], n = Number.POSITIVE_INFINITY;
   for (let i = 0; i < s.length; i++) {
     const r = s[i];
-    if (Nr(r, t)) {
-      const o = Tr(t, r);
+    if (Sr(r, t)) {
+      const o = Or(t, r);
       o < n ? (n = o, e = [i]) : o === n && e.push(i);
     }
   }
   return e;
 }
-function Nr(s, t) {
+function Sr(s, t) {
   return t.some((e) => !!s[e]);
 }
-function Tr(s, t) {
+function Or(s, t) {
   for (let e = 0; e < s.length; e++) {
     const n = s[e];
     if (t[n]) return e;
   }
   return Number.POSITIVE_INFINITY;
 }
-function Zn(s, t) {
+function Yn(s, t) {
   if (t == null) return !1;
   for (const e of s)
     if (t[e]) return e;
@@ -4227,7 +4213,7 @@ const Jt = () => {
     on: (i) => s.on(i)
   };
   return [e, n];
-}, vr = () => {
+}, kr = () => {
   const s = Re();
   return {
     emit: (n) => {
@@ -4259,7 +4245,7 @@ class oe {
 }
 class ae {
   playerToWind = {};
-  windToPlayer = W("");
+  windToPlayer = W(() => "");
   _round;
   _sticks;
   constructor(t, e) {
@@ -4275,7 +4261,7 @@ class ae {
   }
   update() {
     for (let t in this.playerToWind) {
-      const e = Le(this.playerToWind[t]);
+      const e = Ke(this.playerToWind[t]);
       this.playerToWind[t] = e, this.windToPlayer[e] = t;
     }
   }
@@ -4308,19 +4294,21 @@ class ae {
     return this.playerToWind;
   }
 }
-function Yn(s) {
+function Vn(s) {
   for (let t = s.length - 1; t > 0; t--) {
     const e = Math.floor(Math.random() * (t + 1));
     [s[t], s[e]] = [s[e], s[t]];
   }
   return s;
 }
-class Sr {
+class Cr {
   constructor(t = !1) {
     this.disabled = t, this.c = this.initial();
   }
   c;
-  safeTileMap = W({}, !0);
+  safeTileMap = W(
+    () => ({})
+  );
   get(t) {
     return t.t == p.BACK ? 0 : this.c[t.t][t.n];
   }
@@ -4330,7 +4318,7 @@ class Sr {
         if (e.t != p.BACK) {
           if (this.get(e) <= 0)
             throw new Error(`[counter] tile ${e} appears more than 4 times`);
-          if (this.c[e.t][e.n] -= 1, e.has(g.RED)) {
+          if (this.c[e.t][e.n] -= 1, e.has(m.RED)) {
             if (this.c[e.t][0] <= 0)
               throw new Error(`[counter] red tile ${e} appears more than once`);
             this.c[e.t][0] -= 1;
@@ -4338,9 +4326,15 @@ class Sr {
         }
     }
   }
+  /**
+   * @deprecated 非推奨にします。
+   */
   addTileToSafeMap(t, e) {
     this.disabled || (this.safeTileMap[e][this.key(t.t, t.n)] = !0);
   }
+  /**
+   * @deprecated 非推奨にします。
+   */
   isSafeTile(t, e, n) {
     return this.safeTileMap[n][this.key(t, e)];
   }
@@ -4359,36 +4353,38 @@ class Sr {
     };
   }
 }
-class Vn {
-  m = [];
-  constructor() {
-  }
+class Jn {
+  all = [];
+  byWind = /* @__PURE__ */ new Map();
   discard(t, e) {
-    this.m.push({ w: e, t });
+    const n = { w: e, t };
+    this.all.push(n);
+    const i = this.byWind.get(e);
+    i ? i.push(n) : this.byWind.set(e, [n]);
   }
   discards(t) {
-    return t == null ? [...this.m] : this.m.filter((e) => e.w == t);
+    return t == null ? this.all : this.byWind.get(t) ?? [];
   }
   get lastTile() {
-    const t = this.m.at(-1);
+    const t = this.all.at(-1);
     return I(
       t != null,
-      `lastTile is null(${t}). river: ${JSON.stringify(this.m, null, 2)}`
+      `lastTile is null. river: ${JSON.stringify(this.all, null, 2)}`
     ), t;
   }
   markCalled() {
     this.lastTile.callMarker = !0;
   }
   isFourWindsAbort() {
-    const t = this.discards();
-    if (t.length != 4) return !1;
-    let e = t[0].t;
-    if (e.isNum()) return !1;
-    for (let n = 0; n < 4; n++) if (!e.equals(t[n].t)) return !1;
-    return !0;
+    if (this.all.length != 4) return !1;
+    const t = this.all[0].t;
+    return t.isNum() ? !1 : this.all.every((e) => t.equals(e.t));
+  }
+  reset() {
+    this.all = [], this.byWind.clear();
   }
 }
-function Or() {
+function Rr() {
   if (typeof globalThis < "u")
     return globalThis;
   if (typeof self < "u")
@@ -4398,18 +4394,18 @@ function Or() {
   if (typeof global < "u")
     return global;
 }
-function kr() {
-  const s = Or();
+function Mr() {
+  const s = Rr();
   if (s.__xstate__)
     return s.__xstate__;
 }
-const Cr = (s) => {
+const xr = (s) => {
   if (typeof window > "u")
     return;
-  const t = kr();
+  const t = Mr();
   t && t.register(s);
 };
-class gn {
+class mn {
   constructor(t) {
     this._process = t, this._active = !1, this._current = null, this._last = null;
   }
@@ -4438,8 +4434,8 @@ class gn {
     this._last = null;
   }
 }
-const Jn = ".", Rr = "", Xn = "", Mr = "#", xr = "*", qn = "xstate.init", Me = "xstate.stop";
-function $r(s, t) {
+const Xn = ".", $r = "", qn = "", Pr = "#", Hr = "*", Qn = "xstate.init", Me = "xstate.stop";
+function Br(s, t) {
   return {
     type: `xstate.after.${s}.${t}`
   };
@@ -4450,23 +4446,23 @@ function xe(s, t) {
     output: t
   };
 }
-function Hr(s, t) {
+function Wr(s, t) {
   return {
     type: `xstate.done.actor.${s}`,
     output: t,
     actorId: s
   };
 }
-function Pr(s, t) {
+function Dr(s, t) {
   return {
     type: `xstate.error.actor.${s}`,
     error: t,
     actorId: s
   };
 }
-function Qn(s) {
+function ts(s) {
   return {
-    type: qn,
+    type: Qn,
     input: s
   };
 }
@@ -4475,13 +4471,13 @@ function G(s) {
     throw s;
   });
 }
-const Br = typeof Symbol == "function" && Symbol.observable || "@@observable";
-function ts(s, t) {
-  const e = mn(s), n = mn(t);
-  return typeof n == "string" ? typeof e == "string" ? n === e : !1 : typeof e == "string" ? e in n : Object.keys(e).every((i) => i in n ? ts(e[i], n[i]) : !1);
+const Lr = typeof Symbol == "function" && Symbol.observable || "@@observable";
+function es(s, t) {
+  const e = yn(s), n = yn(t);
+  return typeof n == "string" ? typeof e == "string" ? n === e : !1 : typeof e == "string" ? e in n : Object.keys(e).every((i) => i in n ? es(e[i], n[i]) : !1);
 }
 function Fe(s) {
-  if (ns(s))
+  if (ss(s))
     return s;
   const t = [];
   let e = "";
@@ -4500,15 +4496,15 @@ function Fe(s) {
   }
   return t.push(e), t;
 }
-function mn(s) {
-  if (wo(s))
+function yn(s) {
+  if (Io(s))
     return s.value;
   if (typeof s != "string")
     return s;
   const t = Fe(s);
-  return Wr(t);
+  return Kr(t);
 }
-function Wr(s) {
+function Kr(s) {
   if (s.length === 1)
     return s[0];
   const t = {};
@@ -4522,7 +4518,7 @@ function Wr(s) {
     }
   return t;
 }
-function yn(s, t) {
+function wn(s, t) {
   const e = {}, n = Object.keys(s);
   for (let i = 0; i < n.length; i++) {
     const r = n[i];
@@ -4530,11 +4526,11 @@ function yn(s, t) {
   }
   return e;
 }
-function es(s) {
-  return ns(s) ? s : [s];
+function ns(s) {
+  return ss(s) ? s : [s];
 }
 function st(s) {
-  return s === void 0 ? [] : es(s);
+  return s === void 0 ? [] : ns(s);
 }
 function $e(s, t, e, n) {
   return typeof s == "function" ? s({
@@ -4543,22 +4539,22 @@ function $e(s, t, e, n) {
     self: n
   }) : s;
 }
-function ns(s) {
+function ss(s) {
   return Array.isArray(s);
 }
-function Dr(s) {
+function zr(s) {
   return s.type.startsWith("xstate.error.actor");
 }
 function It(s) {
-  return es(s).map((t) => typeof t > "u" || typeof t == "string" ? {
+  return ns(s).map((t) => typeof t > "u" || typeof t == "string" ? {
     target: t
   } : t);
 }
-function ss(s) {
-  if (!(s === void 0 || s === Rr))
+function is(s) {
+  if (!(s === void 0 || s === $r))
     return st(s);
 }
-function He(s, t, e) {
+function Pe(s, t, e) {
   const n = typeof s == "object", i = n ? s : void 0;
   return {
     next: (n ? s.next : s)?.bind(i),
@@ -4566,7 +4562,7 @@ function He(s, t, e) {
     complete: (n ? s.complete : e)?.bind(i)
   };
 }
-function wn(s, t) {
+function En(s, t) {
   return `${t}.${s}`;
 }
 function Ge(s, t) {
@@ -4576,83 +4572,98 @@ function Ge(s, t) {
   const [, n, i] = e, o = s.getStateNodeById(i).config.invoke;
   return (Array.isArray(o) ? o[n] : o).src;
 }
-function En(s, t) {
+function Ur(s, t) {
+  if (t === s || t === Hr)
+    return !0;
+  if (!t.endsWith(".*"))
+    return !1;
+  const e = t.split("."), n = s.split(".");
+  for (let i = 0; i < e.length; i++) {
+    const r = e[i], o = n[i];
+    if (r === "*")
+      return i === e.length - 1;
+    if (r !== o)
+      return !1;
+  }
+  return !0;
+}
+function bn(s, t) {
   return `${s.sessionId}.${t}`;
 }
-let Kr = 0;
-function Lr(s, t) {
+let jr = 0;
+function Fr(s, t) {
   const e = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new WeakMap(), r = /* @__PURE__ */ new Set(), o = {}, {
     clock: a,
     logger: c
   } = t, l = {
-    schedule: (u, m, f, w, b = Math.random().toString(36).slice(2)) => {
+    schedule: (u, g, f, w, b = Math.random().toString(36).slice(2)) => {
       const A = {
         source: u,
-        target: m,
+        target: g,
         event: f,
         delay: w,
         id: b,
         startedAt: Date.now()
-      }, S = En(u, b);
+      }, S = bn(u, b);
       h._snapshot._scheduledEvents[S] = A;
       const x = a.setTimeout(() => {
-        delete o[S], delete h._snapshot._scheduledEvents[S], h._relay(u, m, f);
+        delete o[S], delete h._snapshot._scheduledEvents[S], h._relay(u, g, f);
       }, w);
       o[S] = x;
     },
-    cancel: (u, m) => {
-      const f = En(u, m), w = o[f];
+    cancel: (u, g) => {
+      const f = bn(u, g), w = o[f];
       delete o[f], delete h._snapshot._scheduledEvents[f], w !== void 0 && a.clearTimeout(w);
     },
     cancelAll: (u) => {
-      for (const m in h._snapshot._scheduledEvents) {
-        const f = h._snapshot._scheduledEvents[m];
+      for (const g in h._snapshot._scheduledEvents) {
+        const f = h._snapshot._scheduledEvents[g];
         f.source === u && l.cancel(u, f.id);
       }
     }
   }, d = (u) => {
     if (!r.size)
       return;
-    const m = {
+    const g = {
       ...u,
       rootId: s.sessionId
     };
-    r.forEach((f) => f.next?.(m));
+    r.forEach((f) => f.next?.(g));
   }, h = {
     _snapshot: {
       _scheduledEvents: (t?.snapshot && t.snapshot.scheduler) ?? {}
     },
-    _bookId: () => `x:${Kr++}`,
-    _register: (u, m) => (e.set(u, m), u),
+    _bookId: () => `x:${jr++}`,
+    _register: (u, g) => (e.set(u, g), u),
     _unregister: (u) => {
       e.delete(u.sessionId);
-      const m = i.get(u);
-      m !== void 0 && (n.delete(m), i.delete(u));
+      const g = i.get(u);
+      g !== void 0 && (n.delete(g), i.delete(u));
     },
     get: (u) => n.get(u),
     getAll: () => Object.fromEntries(n.entries()),
-    _set: (u, m) => {
+    _set: (u, g) => {
       const f = n.get(u);
-      if (f && f !== m)
+      if (f && f !== g)
         throw new Error(`Actor with system ID '${u}' already exists.`);
-      n.set(u, m), i.set(m, u);
+      n.set(u, g), i.set(g, u);
     },
     inspect: (u) => {
-      const m = He(u);
-      return r.add(m), {
+      const g = Pe(u);
+      return r.add(g), {
         unsubscribe() {
-          r.delete(m);
+          r.delete(g);
         }
       };
     },
     _sendInspectionEvent: d,
-    _relay: (u, m, f) => {
+    _relay: (u, g, f) => {
       h._sendInspectionEvent({
         type: "@xstate.event",
         sourceRef: u,
-        actorRef: m,
+        actorRef: g,
         event: f
-      }), m._send(f);
+      }), g._send(f);
     },
     scheduler: l,
     getSnapshot: () => ({
@@ -4663,14 +4674,14 @@ function Lr(s, t) {
     start: () => {
       const u = h._snapshot._scheduledEvents;
       h._snapshot._scheduledEvents = {};
-      for (const m in u) {
+      for (const g in u) {
         const {
           source: f,
           target: w,
           event: b,
           delay: A,
           id: S
-        } = u[m];
+        } = u[g];
         l.schedule(f, w, b, A, S);
       }
     },
@@ -4679,12 +4690,12 @@ function Lr(s, t) {
   };
   return h;
 }
-let be = !1;
+let _e = !1;
 const Ze = 1;
 let B = /* @__PURE__ */ (function(s) {
   return s[s.NotStarted = 0] = "NotStarted", s[s.Running = 1] = "Running", s[s.Stopped = 2] = "Stopped", s;
 })({});
-const zr = {
+const Gr = {
   clock: {
     setTimeout: (s, t) => setTimeout(s, t),
     clearTimeout: (s) => clearTimeout(s)
@@ -4692,7 +4703,7 @@ const zr = {
   logger: console.log.bind(console),
   devTools: !1
 };
-class Ur {
+class Zr {
   /**
    * Creates a new actor instance for the given logic with the provided options,
    * if any.
@@ -4701,9 +4712,9 @@ class Ur {
    * @param options Actor options
    */
   constructor(t, e) {
-    this.logic = t, this._snapshot = void 0, this.clock = void 0, this.options = void 0, this.id = void 0, this.mailbox = new gn(this._process.bind(this)), this.observers = /* @__PURE__ */ new Set(), this.eventListeners = /* @__PURE__ */ new Map(), this.logger = void 0, this._processingStatus = B.NotStarted, this._parent = void 0, this._syncSnapshot = void 0, this.ref = void 0, this._actorScope = void 0, this.systemId = void 0, this.sessionId = void 0, this.system = void 0, this._doneEvent = void 0, this.src = void 0, this._deferred = [];
+    this.logic = t, this._snapshot = void 0, this.clock = void 0, this.options = void 0, this.id = void 0, this.mailbox = new mn(this._process.bind(this)), this.observers = /* @__PURE__ */ new Set(), this.eventListeners = /* @__PURE__ */ new Map(), this.logger = void 0, this._processingStatus = B.NotStarted, this._parent = void 0, this._syncSnapshot = void 0, this.ref = void 0, this._actorScope = void 0, this.systemId = void 0, this.sessionId = void 0, this.system = void 0, this._doneEvent = void 0, this.src = void 0, this._deferred = [];
     const n = {
-      ...zr,
+      ...Gr,
       ...e
     }, {
       clock: i,
@@ -4714,10 +4725,10 @@ class Ur {
       systemId: l,
       inspect: d
     } = n;
-    this.system = o ? o.system : Lr(this, {
+    this.system = o ? o.system : Fr(this, {
       clock: i,
       logger: r
-    }), d && !o && this.system.inspect(He(d)), this.sessionId = this.system._bookId(), this.id = c ?? this.sessionId, this.logger = e?.logger ?? this.system._logger, this.clock = e?.clock ?? this.system._clock, this._parent = o, this._syncSnapshot = a, this.options = n, this.src = n.src ?? t, this.ref = this, this._actorScope = {
+    }), d && !o && this.system.inspect(Pe(d)), this.sessionId = this.system._bookId(), this.id = c ?? this.sessionId, this.logger = e?.logger ?? this.system._logger, this.clock = e?.clock ?? this.system._clock, this._parent = o, this._syncSnapshot = a, this.options = n, this.src = n.src ?? t, this.ref = this, this._actorScope = {
       self: this,
       id: this.id,
       sessionId: this.sessionId,
@@ -4732,10 +4743,10 @@ class Ur {
         h._stop();
       },
       emit: (h) => {
-        const u = this.eventListeners.get(h.type), m = this.eventListeners.get("*");
-        if (!u && !m)
+        const u = this.eventListeners.get(h.type), g = this.eventListeners.get("*");
+        if (!u && !g)
           return;
-        const f = [...u ? u.values() : [], ...m ? m.values() : []];
+        const f = [...u ? u.values() : [], ...g ? g.values() : []];
         for (const w of f)
           try {
             w(h);
@@ -4754,11 +4765,11 @@ class Ur {
             }
           }), !h.exec)
             return;
-          const m = be;
+          const g = _e;
           try {
-            be = !0, h.exec(h.info, h.params);
+            _e = !0, h.exec(h.info, h.params);
           } finally {
-            be = m;
+            _e = g;
           }
         };
         this._processingStatus === B.Running ? u() : this._deferred.push(u);
@@ -4808,7 +4819,7 @@ class Ur {
           } catch (r) {
             G(r);
           }
-        this._stopProcedure(), this._complete(), this._doneEvent = Hr(this.id, this._snapshot.output), this._parent && this.system._relay(this, this._parent, this._doneEvent);
+        this._stopProcedure(), this._complete(), this._doneEvent = Wr(this.id, this._snapshot.output), this._parent && this.system._relay(this, this._parent, this._doneEvent);
         break;
       case "error":
         this._error(this._snapshot.error);
@@ -4881,7 +4892,7 @@ class Ur {
    *   the latest snapshot
    */
   subscribe(t, e, n) {
-    const i = He(t, e, n);
+    const i = Pe(t, e, n);
     if (this._processingStatus !== B.Stopped)
       this.observers.add(i);
     else
@@ -4936,7 +4947,7 @@ class Ur {
       error: () => {
       }
     }), this.system._register(this.sessionId, this), this.systemId && this.system._set(this.systemId, this), this._processingStatus = B.Running;
-    const t = Qn(this.options.input);
+    const t = ts(this.options.input);
     switch (this.system._sendInspectionEvent({
       type: "@xstate.event",
       sourceRef: this._parent,
@@ -5000,11 +5011,11 @@ class Ur {
       } catch (e) {
         G(e);
       }
-    this.observers.clear();
+    this.observers.clear(), this.eventListeners.clear();
   }
   _reportError(t) {
     if (!this.observers.size) {
-      this._parent || G(t);
+      this._parent || G(t), this.eventListeners.clear();
       return;
     }
     let e = !1;
@@ -5017,10 +5028,10 @@ class Ur {
         G(r);
       }
     }
-    this.observers.clear(), e && G(t);
+    this.observers.clear(), this.eventListeners.clear(), e && G(t);
   }
   _error(t) {
-    this._stopProcedure(), this._reportError(t), this._parent && this.system._relay(this, this._parent, Pr(this.id, t));
+    this._stopProcedure(), this._reportError(t), this._parent && this.system._relay(this, this._parent, Dr(this.id, t));
   }
   // TODO: atm children don't belong entirely to the actor so
   // in a way - it's not even super aware of them
@@ -5028,7 +5039,7 @@ class Ur {
   // right now, they are being stopped within the machine's transition
   // but that could throw and leave us with "orphaned" active actors
   _stopProcedure() {
-    return this._processingStatus !== B.Running ? this : (this.system.scheduler.cancelAll(this), this.mailbox.clear(), this.mailbox = new gn(this._process.bind(this)), this._processingStatus = B.Stopped, this.system._unregister(this), this);
+    return this._processingStatus !== B.Running ? this : (this.system.scheduler.cancelAll(this), this.mailbox.clear(), this.mailbox = new mn(this._process.bind(this)), this._processingStatus = B.Stopped, this.system._unregister(this), this);
   }
   /** @internal */
   _send(t) {
@@ -5046,7 +5057,7 @@ class Ur {
     const {
       devTools: t
     } = this.options;
-    t && (typeof t == "function" ? t : Cr)(this);
+    t && (typeof t == "function" ? t : xr)(this);
   }
   toJSON() {
     return {
@@ -5070,7 +5081,7 @@ class Ur {
   getPersistedSnapshot(t) {
     return this.logic.getPersistedSnapshot(this._snapshot, t);
   }
-  [Br]() {
+  [Lr]() {
     return this;
   }
   /**
@@ -5092,9 +5103,9 @@ class Ur {
   }
 }
 function Mt(s, ...[t]) {
-  return new Ur(s, t);
+  return new Zr(s, t);
 }
-function jr(s, t, e, n, {
+function Yr(s, t, e, n, {
   sendId: i
 }) {
   const r = typeof i == "function" ? i(e, n) : i;
@@ -5102,17 +5113,17 @@ function jr(s, t, e, n, {
     sendId: r
   }, void 0];
 }
-function Fr(s, t) {
+function Vr(s, t) {
   s.defer(() => {
     s.system.scheduler.cancel(s.self, t.sendId);
   });
 }
-function Gr(s) {
+function Jr(s) {
   function t(e, n) {
   }
-  return t.type = "xstate.cancel", t.sendId = s, t.resolve = jr, t.execute = Fr, t;
+  return t.type = "xstate.cancel", t.sendId = s, t.resolve = Yr, t.execute = Vr, t;
 }
-function Zr(s, t, e, n, {
+function Xr(s, t, e, n, {
   id: i,
   systemId: r,
   src: o,
@@ -5145,14 +5156,14 @@ function Zr(s, t, e, n, {
     input: u
   }, void 0];
 }
-function Yr(s, {
+function qr(s, {
   actorRef: t
 }) {
   t && s.defer(() => {
     t._processingStatus !== B.Stopped && t.start();
   });
 }
-function Vr(...[s, {
+function Qr(...[s, {
   id: t,
   systemId: e,
   input: n,
@@ -5160,9 +5171,9 @@ function Vr(...[s, {
 } = {}]) {
   function r(o, a) {
   }
-  return r.type = "xstate.spawnChild", r.id = t, r.systemId = e, r.src = s, r.input = n, r.syncSnapshot = i, r.resolve = Zr, r.execute = Yr, r;
+  return r.type = "xstate.spawnChild", r.id = t, r.systemId = e, r.src = s, r.input = n, r.syncSnapshot = i, r.resolve = Xr, r.execute = qr, r;
 }
-function Jr(s, t, e, n, {
+function to(s, t, e, n, {
   actorRef: i
 }) {
   const r = typeof i == "function" ? i(e, n) : i, o = typeof r == "string" ? t.children[r] : r;
@@ -5173,9 +5184,16 @@ function Jr(s, t, e, n, {
     children: a
   }), o, void 0];
 }
-function Xr(s, t) {
+function rs(s, t) {
+  const e = t.getSnapshot();
+  if (e && "children" in e)
+    for (const n of Object.values(e.children))
+      rs(s, n);
+  s.system._unregister(t);
+}
+function eo(s, t) {
   if (t) {
-    if (s.system._unregister(t), t._processingStatus !== B.Running) {
+    if (rs(s, t), t._processingStatus !== B.Running) {
       s.stopChild(t);
       return;
     }
@@ -5184,10 +5202,10 @@ function Xr(s, t) {
     });
   }
 }
-function is(s) {
+function os(s) {
   function t(e, n) {
   }
-  return t.type = "xstate.stopChild", t.actorRef = s, t.resolve = Jr, t.execute = Xr, t;
+  return t.type = "xstate.stopChild", t.actorRef = s, t.resolve = to, t.execute = eo, t;
 }
 function Ye(s, t, e, n) {
   const {
@@ -5211,7 +5229,9 @@ function Ye(s, t, e, n) {
     // this holds all params
   ) : o(a, c);
 }
-const Ve = (s) => s.type === "atomic" || s.type === "final";
+function Ve(s) {
+  return s.type === "atomic" || s.type === "final";
+}
 function xt(s) {
   return Object.values(s.states).filter((t) => t.type !== "history");
 }
@@ -5225,7 +5245,7 @@ function Gt(s, t) {
   return e;
 }
 function ce(s) {
-  const t = new Set(s), e = os(t);
+  const t = new Set(s), e = cs(t);
   for (const n of t)
     if (n.type === "compound" && (!e.get(n) || !e.get(n).length))
       _n(n).forEach((i) => t.add(i));
@@ -5244,7 +5264,7 @@ function ce(s) {
   }
   return t;
 }
-function rs(s, t) {
+function as(s, t) {
   const e = t.get(s);
   if (!e)
     return {};
@@ -5258,50 +5278,36 @@ function rs(s, t) {
   }
   const n = {};
   for (const i of e)
-    n[i.key] = rs(i, t);
+    n[i.key] = as(i, t);
   return n;
 }
-function os(s) {
+function cs(s) {
   const t = /* @__PURE__ */ new Map();
   for (const e of s)
     t.has(e) || t.set(e, []), e.parent && (t.has(e.parent) || t.set(e.parent, []), t.get(e.parent).push(e));
   return t;
 }
-function as(s, t) {
+function ls(s, t) {
   const e = ce(t);
-  return rs(s, os(e));
+  return as(s, cs(e));
 }
 function Je(s, t) {
   return t.type === "compound" ? xt(t).some((e) => e.type === "final" && s.has(e)) : t.type === "parallel" ? xt(t).every((e) => Je(s, e)) : t.type === "final";
 }
-const me = (s) => s[0] === Mr;
-function qr(s, t) {
-  return s.transitions.get(t) || [...s.transitions.keys()].filter((n) => {
-    if (n === xr)
-      return !0;
-    if (!n.endsWith(".*"))
-      return !1;
-    const i = n.split("."), r = t.split(".");
-    for (let o = 0; o < i.length; o++) {
-      const a = i[o], c = r[o];
-      if (a === "*")
-        return o === i.length - 1;
-      if (a !== c)
-        return !1;
-    }
-    return !0;
-  }).sort((n, i) => i.length - n.length).flatMap((n) => s.transitions.get(n));
+const me = (s) => s[0] === Pr;
+function no(s, t) {
+  return s.transitions.get(t) || [...s.transitions.keys()].filter((n) => Ur(t, n)).sort((n, i) => i.length - n.length).flatMap((n) => s.transitions.get(n));
 }
-function Qr(s) {
+function so(s) {
   const t = s.config.after;
   if (!t)
     return [];
   const e = (i) => {
-    const r = $r(i, s.id), o = r.type;
-    return s.entry.push(Oo(r, {
+    const r = Br(i, s.id), o = r.type;
+    return s.entry.push(xo(r, {
       id: o,
       delay: i
-    })), s.exit.push(Gr(o)), o;
+    })), s.exit.push(Jr(o)), o;
   };
   return Object.keys(t).flatMap((i) => {
     const r = t[i], o = typeof r == "string" ? {
@@ -5323,7 +5329,7 @@ function Qr(s) {
   });
 }
 function pt(s, t, e) {
-  const n = ss(e.target), i = e.reenter ?? !1, r = no(s, n), o = {
+  const n = is(e.target), i = e.reenter ?? !1, r = oo(s, n), o = {
     ...e,
     actions: st(e.actions),
     guard: e.guard,
@@ -5339,11 +5345,11 @@ function pt(s, t, e) {
   };
   return o;
 }
-function to(s) {
+function io(s) {
   const t = /* @__PURE__ */ new Map();
   if (s.config.on)
     for (const e of Object.keys(s.config.on)) {
-      if (e === Xn)
+      if (e === qn)
         throw new Error('Null events ("") cannot be specified as a transition key. Use `always: { ... }` instead.');
       const n = s.config.on[e];
       t.set(e, It(n).map((i) => pt(s, e, i)));
@@ -5372,7 +5378,7 @@ function to(s) {
   }
   return t;
 }
-function eo(s, t) {
+function ro(s, t) {
   const e = typeof t == "string" ? s.states[t] : t ? s.states[t.target] : void 0;
   if (!e && t)
     throw new Error(
@@ -5393,14 +5399,14 @@ function eo(s, t) {
   };
   return n;
 }
-function no(s, t) {
+function oo(s, t) {
   if (t !== void 0)
     return t.map((e) => {
       if (typeof e != "string")
         return e;
       if (me(e))
         return s.machine.getStateNodeById(e);
-      const n = e[0] === Jn;
+      const n = e[0] === Xn;
       if (n && !s.parent)
         return le(s, e.slice(1));
       const i = n ? s.key + e : e;
@@ -5415,8 +5421,8 @@ ${r.message}`);
         throw new Error(`Invalid target: "${e}" is not a valid target from the root node. Did you mean ".${e}"?`);
     });
 }
-function cs(s) {
-  const t = ss(s.config.target);
+function hs(s) {
+  const t = is(s.config.target);
   return t ? {
     target: t.map((e) => typeof e == "string" ? le(s.parent, e) : e)
   } : s.parent.initial;
@@ -5425,13 +5431,13 @@ function yt(s) {
   return s.type === "history";
 }
 function _n(s) {
-  const t = ls(s);
+  const t = ds(s);
   for (const e of t)
     for (const n of Gt(e, s))
       t.add(n);
   return t;
 }
-function ls(s) {
+function ds(s) {
   const t = /* @__PURE__ */ new Set();
   function e(n) {
     if (!t.has(n)) {
@@ -5486,15 +5492,15 @@ function he(s, t) {
     return i.concat(a);
   }, []));
 }
-function so(s, t, e, n) {
+function ao(s, t, e, n) {
   const r = $t(s, t).next(e, n);
   return !r || !r.length ? s.next(e, n) : r;
 }
-function io(s, t, e, n) {
+function co(s, t, e, n) {
   const i = Object.keys(t), r = $t(s, i[0]), o = Xe(r, t[i[0]], e, n);
   return !o || !o.length ? s.next(e, n) : o;
 }
-function ro(s, t, e, n) {
+function lo(s, t, e, n) {
   const i = [];
   for (const r of Object.keys(t)) {
     const o = t[r];
@@ -5506,9 +5512,9 @@ function ro(s, t, e, n) {
   return i.length ? i : s.next(e, n);
 }
 function Xe(s, t, e, n) {
-  return typeof t == "string" ? so(s, t, e, n) : Object.keys(t).length === 1 ? io(s, t, e, n) : ro(s, t, e, n);
+  return typeof t == "string" ? ao(s, t, e, n) : Object.keys(t).length === 1 ? co(s, t, e, n) : lo(s, t, e, n);
 }
-function oo(s) {
+function ho(s) {
   return Object.keys(s.states).map((t) => s.states[t]).filter((t) => t.type === "history");
 }
 function rt(s, t) {
@@ -5517,7 +5523,7 @@ function rt(s, t) {
     e = e.parent;
   return e.parent === t;
 }
-function ao(s, t) {
+function uo(s, t) {
   const e = new Set(s), n = new Set(t);
   for (const i of e)
     if (n.has(i))
@@ -5527,13 +5533,13 @@ function ao(s, t) {
       return !0;
   return !1;
 }
-function hs(s, t, e) {
+function us(s, t, e) {
   const n = /* @__PURE__ */ new Set();
   for (const i of s) {
     let r = !1;
     const o = /* @__PURE__ */ new Set();
     for (const a of n)
-      if (ao(Pe([i], t, e), Pe([a], t, e)))
+      if (uo(He([i], t, e), He([a], t, e)))
         if (rt(i.source, a.source))
           o.add(a);
         else {
@@ -5548,7 +5554,7 @@ function hs(s, t, e) {
   }
   return Array.from(n);
 }
-function co(s) {
+function fo(s) {
   const [t, ...e] = s;
   for (const n of Gt(t, void 0))
     if (e.every((i) => rt(i, n)))
@@ -5564,36 +5570,36 @@ function qe(s, t) {
         for (const i of t[n.id])
           e.add(i);
       else
-        for (const i of qe(cs(n), t))
+        for (const i of qe(hs(n), t))
           e.add(i);
     else
       e.add(n);
   return [...e];
 }
-function ds(s, t) {
+function fs(s, t) {
   const e = qe(s, t);
   if (!e)
     return;
   if (!s.reenter && e.every((i) => i === s.source || rt(i, s.source)))
     return s.source;
-  const n = co(e.concat(s.source));
+  const n = fo(e.concat(s.source));
   if (n)
     return n;
   if (!s.reenter)
     return s.source.machine.root;
 }
-function Pe(s, t, e) {
+function He(s, t, e) {
   const n = /* @__PURE__ */ new Set();
   for (const i of s)
     if (i.target?.length) {
-      const r = ds(i, e);
+      const r = fs(i, e);
       i.reenter && i.source === r && n.add(r);
       for (const o of t)
         rt(o, r) && n.add(o);
     }
   return [...n];
 }
-function lo(s, t) {
+function po(s, t) {
   if (s.length !== t.size)
     return !1;
   for (const e of s)
@@ -5601,50 +5607,69 @@ function lo(s, t) {
       return !1;
   return !0;
 }
+function go(s, t, e, n, i) {
+  return Be([{
+    target: [...ds(s)],
+    source: s,
+    reenter: !0,
+    actions: [],
+    eventType: null,
+    toJSON: null
+  }], t, e, n, !0, i);
+}
 function Be(s, t, e, n, i, r) {
+  const o = [];
   if (!s.length)
-    return t;
-  const o = new Set(t._nodes);
-  let a = t.historyValue;
-  const c = hs(s, o, a);
-  let l = t;
-  i || ([l, a] = po(l, n, e, c, o, a, r, e.actionExecutor)), l = Ht(l, n, e, c.flatMap((h) => h.actions), r, void 0), l = uo(l, n, e, c, o, r, a, i);
-  const d = [...o];
-  l.status === "done" && (l = Ht(l, n, e, d.sort((h, u) => u.order - h.order).flatMap((h) => h.exit), r, void 0));
+    return [t, o];
+  const a = e.actionExecutor;
+  e.actionExecutor = (c) => {
+    o.push(c), a(c);
+  };
   try {
-    return a === t.historyValue && lo(t._nodes, o) ? l : Et(l, {
-      _nodes: d,
-      historyValue: a
-    });
-  } catch (h) {
-    throw h;
+    const c = new Set(t._nodes);
+    let l = t.historyValue;
+    const d = us(s, c, l);
+    let h = t;
+    i || ([h, l] = Eo(h, n, e, d, c, l, r, e.actionExecutor)), h = Pt(h, n, e, d.flatMap((g) => g.actions), r, void 0), h = yo(h, n, e, d, c, r, l, i);
+    const u = [...c];
+    h.status === "done" && (h = Pt(h, n, e, u.sort((g, f) => f.order - g.order).flatMap((g) => g.exit), r, void 0));
+    try {
+      return l === t.historyValue && po(t._nodes, c) ? [h, o] : [Et(h, {
+        _nodes: u,
+        historyValue: l
+      }), o];
+    } catch (g) {
+      throw g;
+    }
+  } finally {
+    e.actionExecutor = a;
   }
 }
-function ho(s, t, e, n, i) {
+function mo(s, t, e, n, i) {
   if (n.output === void 0)
     return;
   const r = xe(i.id, i.output !== void 0 && i.parent ? $e(i.output, s.context, t, e.self) : void 0);
   return $e(n.output, s.context, r, e.self);
 }
-function uo(s, t, e, n, i, r, o, a) {
+function yo(s, t, e, n, i, r, o, a) {
   let c = s;
   const l = /* @__PURE__ */ new Set(), d = /* @__PURE__ */ new Set();
-  fo(n, o, d, l), a && d.add(s.machine.root);
+  wo(n, o, d, l), a && d.add(s.machine.root);
   const h = /* @__PURE__ */ new Set();
-  for (const u of [...l].sort((m, f) => m.order - f.order)) {
+  for (const u of [...l].sort((g, f) => g.order - f.order)) {
     i.add(u);
-    const m = [];
-    m.push(...u.entry);
+    const g = [];
+    g.push(...u.entry);
     for (const f of u.invoke)
-      m.push(Vr(f.src, {
+      g.push(Qr(f.src, {
         ...f,
         syncSnapshot: !!f.onSnapshot
       }));
     if (d.has(u)) {
       const f = u.initial.actions;
-      m.push(...f);
+      g.push(...f);
     }
-    if (c = Ht(c, t, e, m, r, u.invoke.map((f) => f.id)), u.type === "final") {
+    if (c = Pt(c, t, e, g, r, u.invoke.map((f) => f.id)), u.type === "final") {
       const f = u.parent;
       let w = f?.type === "parallel" ? f : f?.parent, b = w || u;
       for (f?.type === "compound" && r.push(xe(f.id, u.output !== void 0 ? $e(u.output, c.context, t, e.self) : void 0)); w?.type === "parallel" && !h.has(w) && Je(i, w); )
@@ -5653,15 +5678,15 @@ function uo(s, t, e, n, i, r, o, a) {
         continue;
       c = Et(c, {
         status: "done",
-        output: ho(c, t, e, c.machine.root, b)
+        output: mo(c, t, e, c.machine.root, b)
       });
     }
   }
   return c;
 }
-function fo(s, t, e, n) {
+function wo(s, t, e, n) {
   for (const i of s) {
-    const r = ds(i, t);
+    const r = fs(i, t);
     for (const a of i.target || [])
       !yt(a) && // if the target is different than the source then it will *definitely* be entered
       (i.source !== a || // we know that the domain can't lie within the source
@@ -5671,7 +5696,7 @@ function fo(s, t, e, n) {
     const o = qe(i, t);
     for (const a of o) {
       const c = Gt(a, r);
-      r?.type === "parallel" && c.push(r), us(n, t, e, c, !i.source.parent && i.reenter ? void 0 : r);
+      r?.type === "parallel" && c.push(r), ps(n, t, e, c, !i.source.parent && i.reenter ? void 0 : r);
     }
   }
 }
@@ -5684,7 +5709,7 @@ function Nt(s, t, e, n) {
       for (const r of i)
         Ae(r, s.parent, n, t, e);
     } else {
-      const i = cs(s);
+      const i = hs(s);
       for (const r of i.target)
         n.add(r), i === s.parent?.initial && e.add(s.parent), Nt(r, t, e, n);
       for (const r of i.target)
@@ -5697,35 +5722,35 @@ function Nt(s, t, e, n) {
     for (const i of xt(s).filter((r) => !yt(r)))
       [...n].some((r) => rt(r, i)) || (yt(i) || (n.add(i), e.add(i)), Nt(i, t, e, n));
 }
-function us(s, t, e, n, i) {
+function ps(s, t, e, n, i) {
   for (const r of n)
     if ((!i || rt(r, i)) && s.add(r), r.type === "parallel")
       for (const o of xt(r).filter((a) => !yt(a)))
         [...s].some((a) => rt(a, o)) || (s.add(o), Nt(o, t, e, s));
 }
 function Ae(s, t, e, n, i) {
-  us(e, n, i, Gt(s, t));
+  ps(e, n, i, Gt(s, t));
 }
-function po(s, t, e, n, i, r, o, a) {
+function Eo(s, t, e, n, i, r, o, a) {
   let c = s;
-  const l = Pe(n, i, r);
+  const l = He(n, i, r);
   l.sort((h, u) => u.order - h.order);
   let d;
   for (const h of l)
-    for (const u of oo(h)) {
-      let m;
-      u.history === "deep" ? m = (f) => Ve(f) && rt(f, h) : m = (f) => f.parent === h, d ??= {
+    for (const u of ho(h)) {
+      let g;
+      u.history === "deep" ? g = (f) => Ve(f) && rt(f, h) : g = (f) => f.parent === h, d ??= {
         ...r
-      }, d[u.id] = Array.from(i).filter(m);
+      }, d[u.id] = Array.from(i).filter(g);
     }
   for (const h of l)
-    c = Ht(c, t, e, [...h.exit, ...h.invoke.map((u) => is(u.id))], o, void 0), i.delete(h);
+    c = Pt(c, t, e, [...h.exit, ...h.invoke.map((u) => os(u.id))], o, void 0), i.delete(h);
   return [c, d || r];
 }
-function go(s, t) {
+function bo(s, t) {
   return s.implementations.actions[t];
 }
-function fs(s, t, e, n, i, r) {
+function gs(s, t, e, n, i, r) {
   const {
     machine: o
   } = s;
@@ -5735,7 +5760,7 @@ function fs(s, t, e, n, i, r) {
       // the existing type of `.actions` assumes non-nullable `TExpressionAction`
       // it's fine to cast this here to get a common type and lack of errors in the rest of the code
       // our logic below makes sure that we call those 2 "variants" correctly
-      go(o, typeof c == "string" ? c : c.type)
+      bo(o, typeof c == "string" ? c : c.type)
     ), h = {
       context: a.context,
       event: t,
@@ -5754,7 +5779,7 @@ function fs(s, t, e, n, i, r) {
       });
       continue;
     }
-    const m = d, [f, w, b] = m.resolve(
+    const g = d, [f, w, b] = g.resolve(
       e,
       a,
       h,
@@ -5763,17 +5788,17 @@ function fs(s, t, e, n, i, r) {
       // this holds all params
       i
     );
-    a = f, "retryResolve" in m && r?.push([m, w]), "execute" in m && e.actionExecutor({
-      type: m.type,
+    a = f, "retryResolve" in g && r?.push([g, w]), "execute" in g && e.actionExecutor({
+      type: g.type,
       info: h,
       params: w,
-      exec: m.execute.bind(null, e, w)
-    }), b && (a = fs(a, t, e, b, i, r));
+      exec: g.execute.bind(null, e, w)
+    }), b && (a = gs(a, t, e, b, i, r));
   }
   return a;
 }
-function Ht(s, t, e, n, i, r) {
-  const o = r ? [] : void 0, a = fs(s, t, e, n, {
+function Pt(s, t, e, n, i, r) {
+  const o = r ? [] : void 0, a = gs(s, t, e, n, {
     internalQueue: i,
     deferredActorIds: r
   }, o);
@@ -5789,29 +5814,29 @@ function Ie(s, t, e, n) {
       type: "@xstate.microstep",
       actorRef: e.self,
       event: d,
-      snapshot: l,
+      snapshot: l[0],
       _transitions: h
     }), r.push(l);
   }
   if (t.type === Me)
-    return i = Et(bn(i, t, e), {
+    return i = Et(An(i, t, e), {
       status: "stopped"
-    }), o(i, t, []), {
+    }), o([i, []], t, []), {
       snapshot: i,
-      microstates: r
+      microsteps: r
     };
   let a = t;
-  if (a.type !== qn) {
-    const l = a, d = Dr(l), h = An(l, i);
+  if (a.type !== Qn) {
+    const l = a, d = zr(l), h = In(l, i);
     if (d && !h.length)
       return i = Et(s, {
         status: "error",
         error: l.error
-      }), o(i, l, []), {
+      }), o([i, []], l, []), {
         snapshot: i,
-        microstates: r
+        microsteps: r
       };
-    i = Be(
+    const u = Be(
       h,
       s,
       e,
@@ -5819,31 +5844,33 @@ function Ie(s, t, e, n) {
       !1,
       // isInitial
       n
-    ), o(i, l, h);
+    );
+    i = u[0], o(u, l, h);
   }
   let c = !0;
   for (; i.status === "active"; ) {
-    let l = c ? mo(i, a) : [];
+    let l = c ? _o(i, a) : [];
     const d = l.length ? i : void 0;
     if (!l.length) {
       if (!n.length)
         break;
-      a = n.shift(), l = An(a, i);
+      a = n.shift(), l = In(a, i);
     }
-    i = Be(l, i, e, a, !1, n), c = i !== d, o(i, a, l);
+    const h = Be(l, i, e, a, !1, n);
+    i = h[0], c = i !== d, o(h, a, l);
   }
-  return i.status !== "active" && bn(i, a, e), {
+  return i.status !== "active" && An(i, a, e), {
     snapshot: i,
-    microstates: r
+    microsteps: r
   };
 }
-function bn(s, t, e) {
-  return Ht(s, t, e, Object.values(s.children).map((n) => is(n)), [], void 0);
+function An(s, t, e) {
+  return Pt(s, t, e, Object.values(s.children).map((n) => os(n)), [], void 0);
 }
-function An(s, t) {
+function In(s, t) {
   return t.machine.getTransitionData(t, s);
 }
-function mo(s, t) {
+function _o(s, t) {
   const e = /* @__PURE__ */ new Set(), n = s._nodes.filter(Ve);
   for (const i of n)
     t: for (const r of [i].concat(Gt(i, void 0)))
@@ -5854,24 +5881,24 @@ function mo(s, t) {
             break t;
           }
       }
-  return hs(Array.from(e), new Set(s._nodes), s.historyValue);
+  return us(Array.from(e), new Set(s._nodes), s.historyValue);
 }
-function yo(s, t) {
+function Ao(s, t) {
   const e = ce(he(s, t));
-  return as(s, [...e]);
+  return ls(s, [...e]);
 }
-function wo(s) {
+function Io(s) {
   return !!s && typeof s == "object" && "machine" in s && "value" in s;
 }
-const Eo = function(t) {
-  return ts(t, this.value);
-}, _o = function(t) {
+const No = function(t) {
+  return es(t, this.value);
+}, To = function(t) {
   return this.tags.has(t);
-}, bo = function(t) {
+}, vo = function(t) {
   const e = this.machine.getTransitionData(this, t);
   return !!e?.length && // Check that at least one transition is not forbidden
   e.some((n) => n.target !== void 0 || n.actions.length);
-}, Ao = function() {
+}, So = function() {
   const {
     _nodes: t,
     tags: e,
@@ -5887,7 +5914,7 @@ const Eo = function(t) {
     ...l,
     tags: Array.from(e)
   };
-}, Io = function() {
+}, Oo = function() {
   return this._nodes.reduce((t, e) => (e.meta !== void 0 && (t[e.id] = e.meta), t), {});
 };
 function ee(s, t) {
@@ -5898,15 +5925,15 @@ function ee(s, t) {
     machine: t,
     context: s.context,
     _nodes: s._nodes,
-    value: as(t.root, s._nodes),
+    value: ls(t.root, s._nodes),
     tags: new Set(s._nodes.flatMap((e) => e.tags)),
     children: s.children,
     historyValue: s.historyValue || {},
-    matches: Eo,
-    hasTag: _o,
-    can: bo,
-    getMeta: Io,
-    toJSON: Ao
+    matches: No,
+    hasTag: To,
+    can: vo,
+    getMeta: Oo,
+    toJSON: So
   };
 }
 function Et(s, t = {}) {
@@ -5915,7 +5942,7 @@ function Et(s, t = {}) {
     ...t
   }, s.machine);
 }
-function No(s) {
+function ko(s) {
   if (typeof s != "object" || s === null)
     return {};
   const t = {};
@@ -5927,7 +5954,7 @@ function No(s) {
   }
   return t;
 }
-function To(s, t) {
+function Co(s, t) {
   const {
     _nodes: e,
     tags: n,
@@ -5940,10 +5967,10 @@ function To(s, t) {
     getMeta: d,
     toJSON: h,
     ...u
-  } = s, m = {};
+  } = s, g = {};
   for (const w in r) {
     const b = r[w];
-    m[w] = {
+    g[w] = {
       snapshot: b.getPersistedSnapshot(t),
       src: b.src,
       systemId: b.systemId,
@@ -5952,12 +5979,12 @@ function To(s, t) {
   }
   return {
     ...u,
-    context: ps(o),
-    children: m,
-    historyValue: No(u.historyValue)
+    context: ms(o),
+    children: g,
+    historyValue: ko(u.historyValue)
   };
 }
-function ps(s) {
+function ms(s) {
   let t;
   for (const e in s) {
     const n = s[e];
@@ -5970,7 +5997,7 @@ function ps(s) {
           id: n.id
         };
       else {
-        const i = ps(n);
+        const i = ms(n);
         i !== n && (t ??= Array.isArray(s) ? s.slice() : {
           ...s
         }, t[e] = i);
@@ -5978,7 +6005,7 @@ function ps(s) {
   }
   return t ?? s;
 }
-function vo(s, t, e, n, {
+function Ro(s, t, e, n, {
   event: i,
   id: r,
   delay: o
@@ -6004,7 +6031,7 @@ function vo(s, t, e, n, {
     delay: d
   }, void 0];
 }
-function So(s, t) {
+function Mo(s, t) {
   const {
     event: e,
     delay: n,
@@ -6018,12 +6045,12 @@ function So(s, t) {
     return;
   }
 }
-function Oo(s, t) {
+function xo(s, t) {
   function e(n, i) {
   }
-  return e.type = "xstate.raise", e.event = s, e.id = t?.id, e.delay = t?.delay, e.resolve = vo, e.execute = So, e;
+  return e.type = "xstate.raise", e.event = s, e.id = t?.id, e.delay = t?.delay, e.resolve = Ro, e.execute = Mo, e;
 }
-function ko(s, {
+function $o(s, {
   machine: t,
   context: e
 }, n, i) {
@@ -6062,7 +6089,7 @@ function ko(s, {
     }), c;
   };
 }
-function Co(s, t, e, n, {
+function Po(s, t, e, n, {
   assignment: i
 }) {
   if (!t.context)
@@ -6070,7 +6097,7 @@ function Co(s, t, e, n, {
   const r = {}, o = {
     context: t.context,
     event: e.event,
-    spawn: ko(s, t, e.event, r),
+    spawn: $o(s, t, e.event, r),
     self: s.self,
     system: s.system
   };
@@ -6091,19 +6118,19 @@ function Co(s, t, e, n, {
     } : t.children
   }), void 0, void 0];
 }
-function Ro(s) {
+function Ho(s) {
   function t(e, n) {
   }
-  return t.type = "xstate.assign", t.assignment = s, t.resolve = Co, t;
+  return t.type = "xstate.assign", t.assignment = s, t.resolve = Po, t;
 }
-const In = /* @__PURE__ */ new WeakMap();
+const Nn = /* @__PURE__ */ new WeakMap();
 function At(s, t, e) {
-  let n = In.get(s);
+  let n = Nn.get(s);
   return n ? t in n || (n[t] = e()) : (n = {
     [t]: e()
-  }, In.set(s, n)), n[t];
+  }, Nn.set(s, n)), n[t];
 }
-const Mo = {}, Kt = (s) => typeof s == "string" ? {
+const Bo = {}, Lt = (s) => typeof s == "string" ? {
   type: s
 } : typeof s == "function" ? "resolve" in s ? {
   type: s.type
@@ -6112,17 +6139,17 @@ const Mo = {}, Kt = (s) => typeof s == "string" ? {
 } : s;
 class de {
   constructor(t, e) {
-    if (this.config = t, this.key = void 0, this.id = void 0, this.type = void 0, this.path = void 0, this.states = void 0, this.history = void 0, this.entry = void 0, this.exit = void 0, this.parent = void 0, this.machine = void 0, this.meta = void 0, this.output = void 0, this.order = -1, this.description = void 0, this.tags = [], this.transitions = void 0, this.always = void 0, this.parent = e._parent, this.key = e._key, this.machine = e._machine, this.path = this.parent ? this.parent.path.concat(this.key) : [], this.id = this.config.id || [this.machine.id, ...this.path].join(Jn), this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? "compound" : this.config.history ? "history" : "atomic"), this.description = this.config.description, this.order = this.machine.idMap.size, this.machine.idMap.set(this.id, this), this.states = this.config.states ? yn(this.config.states, (n, i) => new de(n, {
+    if (this.config = t, this.key = void 0, this.id = void 0, this.type = void 0, this.path = void 0, this.states = void 0, this.history = void 0, this.entry = void 0, this.exit = void 0, this.parent = void 0, this.machine = void 0, this.meta = void 0, this.output = void 0, this.order = -1, this.description = void 0, this.tags = [], this.transitions = void 0, this.always = void 0, this.parent = e._parent, this.key = e._key, this.machine = e._machine, this.path = this.parent ? this.parent.path.concat(this.key) : [], this.id = this.config.id || [this.machine.id, ...this.path].join(Xn), this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? "compound" : this.config.history ? "history" : "atomic"), this.description = this.config.description, this.order = this.machine.idMap.size, this.machine.idMap.set(this.id, this), this.states = this.config.states ? wn(this.config.states, (n, i) => new de(n, {
       _parent: this,
       _key: i,
       _machine: this.machine
-    })) : Mo, this.type === "compound" && !this.config.initial)
+    })) : Bo, this.type === "compound" && !this.config.initial)
       throw new Error(`No initial state specified for compound state node "#${this.id}". Try adding { initial: "${Object.keys(this.states)[0]}" } to the state config.`);
     this.history = this.config.history === !0 ? "shallow" : this.config.history || !1, this.entry = st(this.config.entry).slice(), this.exit = st(this.config.exit).slice(), this.meta = this.config.meta, this.output = this.type === "final" || !this.parent ? this.config.output : void 0, this.tags = st(t.tags).slice();
   }
   /** @internal */
   _initialize() {
-    this.transitions = to(this), this.config.always && (this.always = It(this.config.always).map((t) => pt(this, Xn, t))), Object.keys(this.states).forEach((t) => {
+    this.transitions = io(this), this.config.always && (this.always = It(this.config.always).map((t) => pt(this, qn, t))), Object.keys(this.states).forEach((t) => {
       this.states[t]._initialize();
     });
   }
@@ -6136,25 +6163,25 @@ class de {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions.map(Kt),
+        actions: this.initial.actions.map(Lt),
         eventType: null,
         reenter: !1,
         toJSON: () => ({
           target: this.initial.target.map((t) => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions.map(Kt),
+          actions: this.initial.actions.map(Lt),
           eventType: null
         })
       } : void 0,
       history: this.history,
-      states: yn(this.states, (t) => t.definition),
+      states: wn(this.states, (t) => t.definition),
       on: this.on,
       transitions: [...this.transitions.values()].flat().map((t) => ({
         ...t,
-        actions: t.actions.map(Kt)
+        actions: t.actions.map(Lt)
       })),
-      entry: this.entry.map(Kt),
-      exit: this.exit.map(Kt),
+      entry: this.entry.map(Lt),
+      exit: this.exit.map(Lt),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -6173,7 +6200,7 @@ class de {
       const {
         src: n,
         systemId: i
-      } = t, r = t.id ?? wn(this.id, e), o = typeof n == "string" ? n : `xstate.invoke.${wn(this.id, e)}`;
+      } = t, r = t.id ?? En(this.id, e), o = typeof n == "string" ? n : `xstate.invoke.${En(this.id, e)}`;
       return {
         ...t,
         src: o,
@@ -6200,16 +6227,16 @@ class de {
     return At(this, "on", () => [...this.transitions].flatMap(([e, n]) => n.map((i) => [e, i])).reduce((e, [n, i]) => (e[n] = e[n] || [], e[n].push(i), e), {}));
   }
   get after() {
-    return At(this, "delayedTransitions", () => Qr(this));
+    return At(this, "delayedTransitions", () => so(this));
   }
   get initial() {
-    return At(this, "initial", () => eo(this, this.config.initial));
+    return At(this, "initial", () => ro(this, this.config.initial));
   }
   /** @internal */
   next(t, e) {
     const n = e.type, i = [];
     let r;
-    const o = At(this, `candidates-${n}`, () => qr(this, n));
+    const o = At(this, `candidates-${n}`, () => no(this, n));
     for (const a of o) {
       const {
         guard: c
@@ -6251,11 +6278,11 @@ ${h.message}`);
    * Excludes any inert events.
    */
   get ownEvents() {
-    const t = new Set([...this.transitions.keys()].filter((e) => this.transitions.get(e).some((n) => !(!n.target && !n.actions.length && !n.reenter))));
-    return Array.from(t);
+    const t = Object.keys(Object.fromEntries(this.transitions)), e = new Set(t.filter((n) => this.transitions.get(n).some((i) => !(!i.target && !i.actions.length && !i.reenter))));
+    return Array.from(e);
   }
 }
-const xo = "#";
+const Wo = "#";
 class Qe {
   constructor(t, e) {
     this.config = t, this.version = void 0, this.schemas = void 0, this.implementations = void 0, this.__xstatenode = !0, this.idMap = /* @__PURE__ */ new Map(), this.root = void 0, this.id = void 0, this.states = void 0, this.events = void 0, this.id = t.id || "(machine)", this.implementations = {
@@ -6302,7 +6329,7 @@ class Qe {
     });
   }
   resolveState(t) {
-    const e = yo(this.root, t.value), n = ce(he(this.root, e));
+    const e = Ao(this.root, t.value), n = ce(he(this.root, e));
     return ee({
       _nodes: [...n],
       context: t.context || {},
@@ -6331,7 +6358,7 @@ class Qe {
    * @param event The received event
    */
   microstep(t, e, n) {
-    return Ie(t, e, n, []).microstates;
+    return Ie(t, e, n, []).microsteps.map(([i]) => i);
   }
   getTransitionData(t, e) {
     return Xe(this.root, t.value, t, e) || [];
@@ -6339,8 +6366,10 @@ class Qe {
   /**
    * The initial state _before_ evaluating any microsteps. This "pre-initial"
    * state is provided to initial actions executed in the initial state.
+   *
+   * @internal
    */
-  getPreInitialState(t, e, n) {
+  _getPreInitialState(t, e, n) {
     const {
       context: i
     } = this.config, r = ee({
@@ -6349,7 +6378,7 @@ class Qe {
       children: {},
       status: "active"
     }, this);
-    return typeof i == "function" ? Ht(r, e, t, [Ro(({
+    return typeof i == "function" ? Pt(r, e, t, [Ho(({
       spawn: a,
       event: c,
       self: l
@@ -6364,15 +6393,7 @@ class Qe {
    * `ActorRef`.
    */
   getInitialSnapshot(t, e) {
-    const n = Qn(e), i = [], r = this.getPreInitialState(t, n, i), o = Be([{
-      target: [...ls(this.root)],
-      source: this.root,
-      reenter: !0,
-      actions: [],
-      eventType: null,
-      toJSON: null
-      // TODO: fix
-    }], r, t, n, !0, i), {
+    const n = ts(e), i = [], r = this._getPreInitialState(t, n, i), [o] = go(this.root, r, t, n, i), {
       snapshot: a
     } = Ie(o, n, t, i);
     return a;
@@ -6383,7 +6404,7 @@ class Qe {
     });
   }
   getStateNodeById(t) {
-    const e = Fe(t), n = e.slice(1), i = me(e[0]) ? e[0].slice(xo.length) : e[0], r = this.idMap.get(i);
+    const e = Fe(t), n = e.slice(1), i = me(e[0]) ? e[0].slice(Wo.length) : e[0], r = this.idMap.get(i);
     if (!r)
       throw new Error(`Child state node '#${i}' does not exist on machine '${this.id}'`);
     return le(r, n);
@@ -6395,19 +6416,19 @@ class Qe {
     return this.definition;
   }
   getPersistedSnapshot(t, e) {
-    return To(t, e);
+    return Co(t, e);
   }
   restoreSnapshot(t, e) {
     const n = {}, i = t.children;
     Object.keys(i).forEach((h) => {
-      const u = i[h], m = u.snapshot, f = u.src, w = typeof f == "string" ? Ge(this, f) : f;
+      const u = i[h], g = u.snapshot, f = u.src, w = typeof f == "string" ? Ge(this, f) : f;
       if (!w)
         return;
       const b = Mt(w, {
         id: h,
         parent: e.self,
         syncSnapshot: u.syncSnapshot,
-        snapshot: m,
+        snapshot: g,
         src: f,
         systemId: u.systemId
       });
@@ -6424,15 +6445,15 @@ class Qe {
     function o(h, u) {
       if (!u || typeof u != "object")
         return {};
-      const m = {};
+      const g = {};
       for (const f in u) {
         const w = u[f];
         for (const b of w) {
           const A = r(h, b);
-          A && (m[f] ??= [], m[f].push(A));
+          A && (g[f] ??= [], g[f].push(A));
         }
       }
-      return m;
+      return g;
     }
     const a = o(this.root, t.historyValue), c = ee({
       ...t,
@@ -6443,11 +6464,11 @@ class Qe {
     function d(h, u) {
       if (!l.has(h)) {
         l.add(h);
-        for (const m in h) {
-          const f = h[m];
+        for (const g in h) {
+          const f = h[g];
           if (f && typeof f == "object") {
             if ("xstate$$type" in f && f.xstate$$type === Ze) {
-              h[m] = u[f.id];
+              h[g] = u[f.id];
               continue;
             }
             d(f, u);
@@ -6458,23 +6479,23 @@ class Qe {
     return d(c.context, n), c;
   }
 }
-function $o(s, t) {
+function Do(s, t) {
   return new Qe(s, t);
 }
-const Xt = (s) => s === !1 ? !1 : s.map((t) => t.serialize()), Ho = (s) => s === !1 ? !1 : s.serialize(), Po = (s) => s === !1 ? !1 : s.map((t) => ({
+const Xt = (s) => s === !1 ? !1 : s.map((t) => t.serialize()), Lo = (s) => s === !1 ? !1 : s.serialize(), Ko = (s) => s === !1 ? !1 : s.map((t) => ({
   tile: t.tile.toString(),
   effectiveTiles: t.effectiveTiles.map((e) => e.toString()),
   shanten: t.shanten
-})), qt = (s) => s === !1 ? !1 : Ce(s), Nn = (s) => $o(
+})), qt = (s) => s === !1 ? !1 : Ce(s), Tn = (s) => Do(
   {
     id: "Untitled",
     initial: "distribute",
     context: {
       currentWind: _.E,
-      oneShotMap: W(!1),
-      missingMap: W(!1),
+      oneShotMap: W(() => !1),
+      missingMap: W(() => !1),
       controller: s,
-      genEventID: Bo()
+      genEventID: zo()
     },
     states: {
       distribute: {
@@ -6791,7 +6812,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
       notify_distribution: ({ context: t, event: e }) => {
         const n = t.genEventID(), i = t.controller.initialHands();
         for (const r of Object.values(_)) {
-          const o = W("_____________");
+          const o = W(() => "_____________");
           o[r] = i[r].toString();
           const a = {
             id: n,
@@ -6822,7 +6843,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
                 replacementWin: n?.replacementWin
               })
             ),
-            REACH: Po(t.controller.doReach(i)),
+            REACH: Ko(t.controller.doReach(i)),
             AN_KAN: Xt(t.controller.doAnKan(i)),
             SHO_KAN: Xt(t.controller.doShoKan(i)),
             DISCARD: t.controller.doDiscard(i).map((c) => c.toString()),
@@ -6832,7 +6853,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
         t.controller.emit(a), t.controller.pollReplies(o, [i]);
       },
       notify_choice_after_discarded: ({ context: t, event: e }) => {
-        const n = t.genEventID(), i = t.controller.river.lastTile, r = i.t.clone({ add: g.HORIZONTAL });
+        const n = t.genEventID(), i = t.controller.river.lastTile, r = i.t.clone({ add: m.HORIZONTAL });
         for (const o of Object.values(_)) {
           const a = {
             id: n,
@@ -6856,7 +6877,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
               CHI: Xt(
                 t.controller.doChi(o, i.w, r)
               ),
-              DAI_KAN: Ho(
+              DAI_KAN: Lo(
                 t.controller.doDaiKan(o, i.w, r)
               )
             }
@@ -6881,7 +6902,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
         t.controller.emit(c), t.controller.pollReplies(i, [r]);
       },
       notify_choice_for_reach_acceptance: ({ context: t, event: e }) => {
-        const n = t.genEventID(), i = t.controller.river.lastTile, r = i.t.clone({ add: g.HORIZONTAL });
+        const n = t.genEventID(), i = t.controller.river.lastTile, r = i.t.clone({ add: m.HORIZONTAL });
         for (const o of Object.values(_)) {
           const a = {
             id: n,
@@ -6907,11 +6928,11 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
           e.type == "SHO_KAN" || e.type == "AN_KAN",
           `unexpected event ${e.type}`
         );
-        const n = t.genEventID(), i = e.block.tiles[0].clone({ remove: g.HORIZONTAL });
+        const n = t.genEventID(), i = e.block.tiles[0].clone({ remove: m.HORIZONTAL });
         for (const r of Object.values(_)) {
           const o = t.controller.doWin(
             r,
-            e.block.tiles[0].clone({ remove: g.HORIZONTAL }),
+            e.block.tiles[0].clone({ remove: m.HORIZONTAL }),
             {
               discardedBy: e.iam,
               quadWin: !0,
@@ -6969,7 +6990,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
         const i = t.genEventID(), r = n?.action, o = r == "kan" ? t.controller.wall.kan() : t.controller.wall.draw(), a = t.currentWind;
         t.controller.hand(a).reached || (t.missingMap[a] = !1);
         for (const c of Object.values(_)) {
-          const l = c == a ? o : new y(p.BACK, 0, [g.TSUMO]), d = {
+          const l = c == a ? o : new y(p.BACK, 0, [m.TSUMO]), d = {
             id: i,
             type: "DRAW",
             subType: r,
@@ -7016,7 +7037,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
       },
       notify_reach: ({ context: t, event: e }) => {
         I(e.type == "REACH", `unexpected event ${e.type}`);
-        const n = t.genEventID(), i = e.iam, r = e.tile.clone({ add: g.HORIZONTAL });
+        const n = t.genEventID(), i = e.iam, r = e.tile.clone({ add: m.HORIZONTAL });
         t.oneShotMap[i] = !0;
         for (const o of Object.values(_)) {
           const a = {
@@ -7069,7 +7090,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
         t.oneShotMap[t.currentWind] = !1;
       },
       notify_end: ({ context: t, event: e }) => {
-        const n = t.genEventID(), i = W("");
+        const n = t.genEventID(), i = W(() => "");
         if (e.type == "DRAWN_GAME_BY_NINE_TERMINALS") {
           i[e.iam] = t.controller.hand(e.iam).toString();
           for (const r of Object.values(_)) {
@@ -7081,7 +7102,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
               shouldContinue: !0,
               sticks: t.controller.placeManager.sticks,
               scores: t.controller.scoreManager.summary,
-              deltas: W(0),
+              deltas: W(() => 0),
               hands: i
             };
             t.controller.emit(o);
@@ -7117,8 +7138,8 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
               shouldContinue: !0,
               sticks: t.controller.placeManager.sticks,
               scores: t.controller.scoreManager.summary,
-              deltas: W(0),
-              hands: W("")
+              deltas: W(() => 0),
+              hands: W(() => "")
             };
             t.controller.emit(a);
           }
@@ -7131,7 +7152,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
               const d = t.controller.hand(l);
               new ge(d).calc() == 0 && (r.push(l), i[l] = d.toString());
             }
-            const o = r.length == 0 || r.length == 4, a = W(0);
+            const o = r.length == 0 || r.length == 4, a = W(() => 0);
             for (const l of Object.values(_))
               r.includes(l) ? a[l] += o ? 0 : 3e3 / r.length : a[l] -= o ? 0 : 3e3 / (4 - r.length);
             const c = r.length == 4 || a[_.E] > 0;
@@ -7172,7 +7193,7 @@ CHI/PON の場合は鳴ける組み合わせの一覧`
     delays: {}
   }
 );
-function Bo(s = 0) {
+function zo(s = 0) {
   let t = s;
   return () => (t++).toString();
 }
@@ -7217,7 +7238,7 @@ class Ot {
     return this.walls.drawable.length > 0;
   }
   initialHands() {
-    const t = W("");
+    const t = W(() => "");
     for (let e = 0; e < 3; e++)
       for (const n of Object.values(_))
         for (let i = 0; i < 4; i++)
@@ -7236,10 +7257,10 @@ class Ot {
         for (let i = 0; i < 4; i++)
           for (let r of n) {
             let o = new y(e, r);
-            e != p.Z && i == 3 && r == 5 && (o = o.clone({ add: g.RED })), this.walls.drawable.push(o.toString());
+            e != p.Z && i == 3 && r == 5 && (o = o.clone({ add: m.RED })), this.walls.drawable.push(o.toString());
           }
       }
-      Yn(this.walls.drawable);
+      Vn(this.walls.drawable);
     }
     for (let e = 0; e < 14; e++)
       this.walls.dead.push(this.walls.drawable.pop());
@@ -7266,7 +7287,7 @@ class Ot {
 class ye {
   wall = new Ot();
   playerIDs;
-  actor = Mt(Nn(this), {});
+  actor = Mt(Tn(this), {});
   observer;
   handlers = {};
   // TODO 同じイベント ID は同じ特定イベントの配列になるので特定イベント ID の配列の union が良さそう
@@ -7278,14 +7299,14 @@ class ye {
       (o) => o.handler.on((a) => this.enqueue(a))
       // bind
     );
-    const n = vr();
-    this.observer = new Do(n), this.observer.eventHandler.on(
+    const n = kr();
+    this.observer = new jo(n), this.observer.eventHandler.on(
       (o) => this.observer.handleEvent(o)
       // bind
     );
     const i = Object.fromEntries(this.playerIDs.map((o) => [o, 25e3]));
     this.observer.scoreManager = new oe(i);
-    const r = e?.shuffle == !1 ? this.playerIDs : Yn([...this.playerIDs]);
+    const r = e?.shuffle == !1 ? this.playerIDs : Vn([...this.playerIDs]);
     this.observer.placeManager = new ae({
       [r[0]]: _.E,
       [r[1]]: _.S,
@@ -7342,7 +7363,7 @@ class ye {
     }
     const i = n[0];
     if (i.type == "CHOICE_AFTER_DISCARDED") {
-      const r = Ar(
+      const r = Tr(
         n
       );
       if (r.events.length == 0) {
@@ -7385,7 +7406,7 @@ class ye {
           break;
       }
     } else if (i.type == "CHOICE_AFTER_DRAWN") {
-      const r = Ir(n);
+      const r = vr(n);
       I(
         r.events.length == 1,
         `found more than one selected: ${JSON.stringify(r, null, 2)}`
@@ -7412,7 +7433,7 @@ class ye {
           const l = o.choices[r.type];
           I(l, `${r.type} choice is not available`), this.actor.send({
             type: r.type,
-            tile: y.from(l[0]).clone({ remove: g.TSUMO }),
+            tile: y.from(l[0]).clone({ remove: m.TSUMO }),
             iam: a
           });
           break;
@@ -7429,7 +7450,7 @@ class ye {
           const d = o.choices[r.type];
           I(d, `${r.type} choice is not available`), this.actor.send({
             type: r.type,
-            block: H.from(d[0].tiles),
+            block: P.from(d[0].tiles),
             iam: a
           });
           break;
@@ -7528,11 +7549,11 @@ class ye {
       );
   }
   startGame() {
-    for (; console.debug(`start========${this.placeManager.round}=============`), this.start(), this.wall = new Ot(), this.observer.applied = {}, this.mailBox = {}, this.actor = Mt(Nn(this)), !this.placeManager.is(k.W1); )
+    for (; console.debug(`start========${this.placeManager.round}=============`), this.start(), this.wall = new Ot(), this.observer.applied = {}, this.mailBox = {}, this.actor = Mt(Tn(this)), !this.placeManager.is(k.W1); )
       ;
   }
   finalResult(t, e) {
-    const n = this.hand(e), i = n.reached ? this.wall.hiddenDoraIndicators : void 0, r = new Fn(n, {
+    const n = this.hand(e), i = n.reached ? this.wall.hiddenDoraIndicators : void 0, r = new Gn(n, {
       ...t.boardContext,
       sticks: this.placeManager.sticks,
       hiddenDoraIndicators: i
@@ -7550,7 +7571,7 @@ class ye {
       o = o.clone(), c.ronWind = n.discardedBy, c.finalDiscardWin = !this.wall.canDraw, c.quadWin = n.quadWin, o.inc([e]);
     } else
       c.finalWallWin = !this.wall.canDraw, c.replacementWin = n?.replacementWin;
-    return c.oneShotWin = n?.oneShot, c.doubleReached = r.length == 0 || r.length == 1 && r[0].t.has(g.HORIZONTAL), et.doWin(i, c, e, r);
+    return c.oneShotWin = n?.oneShot, c.doubleReached = r.length == 0 || r.length == 1 && r[0].t.has(m.HORIZONTAL), et.doWin(i, c, e, r);
   }
   doPon(t, e, n) {
     if (n == null) return !1;
@@ -7602,11 +7623,11 @@ class et {
   static doWin(t, e, n, i) {
     const r = e.ronWind != null, o = r ? t.clone() : t;
     r && o.inc([n]);
-    const a = new yr(o), c = new Fn(o, e), l = a.calc(n), d = c.calc(...l);
+    const a = new br(o), c = new Gn(o, e), l = a.calc(n), d = c.calc(...l);
     if (!d) return !1;
     if (r) {
       const h = Ft.getEffectiveTiles(t).effectiveTiles;
-      if (i.some((u) => h.some((m) => m.equals(u.t))))
+      if (i.some((u) => h.some((g) => g.equals(u.t))))
         return !1;
     }
     return d;
@@ -7614,8 +7635,8 @@ class et {
   static doChi(t, e, n, i) {
     if (!i.isNum() || vt(n) != e || t.reached || t.hands.length < 3) return !1;
     const r = i.clone({
-      remove: g.TSUMO,
-      add: [g.HORIZONTAL]
+      remove: m.TSUMO,
+      add: [m.HORIZONTAL]
     }), o = [];
     r.n - 2 >= 1 && t.get(i.t, r.n - 2) > 0 && t.get(i.t, r.n - 1) > 0 && o.push(
       new V([
@@ -7637,10 +7658,10 @@ class et {
       ])
     );
     for (let f = 0; f < o.length; f++) {
-      const w = o[f], b = Tn(w), A = [];
+      const w = o[f], b = vn(w), A = [];
       for (const at of b) {
         const Q = t.get(at.t, at.n);
-        for (let tt = 0; tt < Q; tt++) A.push(at.clone({ remove: g.RED }));
+        for (let tt = 0; tt < Q; tt++) A.push(at.clone({ remove: m.RED }));
       }
       const S = t.dec([...A, w.tiles[1], w.tiles[2]]), x = t.hands.length == 0;
       t.inc(S), x && o.splice(f, 1);
@@ -7654,27 +7675,27 @@ class et {
       (f) => !O(f.tiles[1]) && !O(f.tiles[2])
     ), u = t.get(i.t, 0) > 0;
     if (!u) return o;
-    const m = u ? Wo(d) : [];
-    return m.length > 0 && u && t.get(i.t, 5) == 1 ? [...h, ...m] : [...o, ...m];
+    const g = u ? Uo(d) : [];
+    return g.length > 0 && u && t.get(i.t, 5) == 1 ? [...h, ...g] : [...o, ...g];
   }
   static doPon(t, e, n, i) {
     if (e == n || t.reached || t.hands.length < 3 || t.get(i.t, i.n) < 2) return !1;
     const r = i.clone({ removeAll: !0 }), o = rn(e, n, E.PON), a = new U([r, r, r]).clone({
-      replace: { idx: o, tile: i.clone({ add: g.HORIZONTAL }) }
+      replace: { idx: o, tile: i.clone({ add: m.HORIZONTAL }) }
     });
-    if (O(i) && i.has(g.RED))
+    if (O(i) && i.has(m.RED))
       return [a.clone({
         replace: {
           idx: o,
           tile: r.clone({
-            add: [g.RED, g.HORIZONTAL]
+            add: [m.RED, m.HORIZONTAL]
           })
         }
       })];
     const c = o % 2 + 1;
     if (O(i) && t.get(i.t, 0) > 0) {
       const l = a.clone({
-        replace: { idx: c, tile: r.clone({ add: g.RED }) }
+        replace: { idx: c, tile: r.clone({ add: m.RED }) }
       });
       if (t.get(r.t, 5) == 3) {
         const d = a.clone({
@@ -7694,7 +7715,7 @@ class et {
     if (e == null) return n;
     if (e instanceof U)
       return n.filter((o) => !o.equals(e.tiles[0]));
-    const i = Tn(e), r = n.filter((o) => !i.some((a) => o.equals(a)));
+    const i = vn(e), r = n.filter((o) => !i.some((a) => o.equals(a)));
     return I(
       r.length > 0,
       `[bug] no tiles to discard. hand: ${t}, forbidden tiles: ${i}, block-chi: ${e}`
@@ -7705,28 +7726,28 @@ class et {
     const r = i.clone({ removeAll: !0 });
     if (t.get(r.t, r.n) != 3) return !1;
     const o = rn(e, n, E.DAI_KAN), a = new z([r, r, r, r]).clone({
-      replace: { idx: o, tile: r.clone({ add: g.HORIZONTAL }) }
+      replace: { idx: o, tile: r.clone({ add: m.HORIZONTAL }) }
     });
     let c = a;
-    if (O(i) && i.has(g.RED))
+    if (O(i) && i.has(m.RED))
       c = a.clone({
         replace: {
           idx: o,
-          tile: r.clone({ add: [g.HORIZONTAL, g.RED] })
+          tile: r.clone({ add: [m.HORIZONTAL, m.RED] })
         }
       });
-    else if (O(i) && !i.has(g.RED)) {
+    else if (O(i) && !i.has(m.RED)) {
       I(
         t.get(i.t, 0) > 0,
         `[bug] hand does not have red tile to daikan: ${t.toString()}`
       );
       const l = o % 3 + 1;
       c = a.clone({
-        replace: { idx: l, tile: r.clone({ add: g.RED }) }
+        replace: { idx: l, tile: r.clone({ add: m.RED }) }
       });
     }
     return I(
-      c.tiles.filter((l) => l.has(g.HORIZONTAL)).length == 1,
+      c.tiles.filter((l) => l.has(m.HORIZONTAL)).length == 1,
       `[bug] daikan has unexpected horizontal operators: ${c.toString()}`
     ), c;
   }
@@ -7736,12 +7757,12 @@ class et {
     for (const [n, i] of F())
       if (t.get(n, i) == 4) {
         const r = new y(n, i), o = [r, r, r, r];
-        O(r) && (o[1] = r.clone({ add: g.RED })), e.push(new R(o));
+        O(r) && (o[1] = r.clone({ add: m.RED })), e.push(new R(o));
       }
     if (e.length == 0) return !1;
     for (const n of e)
       I(
-        n.tiles.filter((i) => i.has(g.HORIZONTAL)).length == 0,
+        n.tiles.filter((i) => i.has(m.HORIZONTAL)).length == 0,
         `[bug] ankan has horizontal op: ${n.toString()}`
       );
     return e;
@@ -7754,38 +7775,38 @@ class et {
     for (const i of e) {
       const r = i.tiles[0].clone({
         removeAll: !0,
-        add: g.HORIZONTAL
+        add: m.HORIZONTAL
       });
       if (t.get(r.t, r.n) == 1) {
-        const o = O(r) && t.get(r.t, 0) > 0 ? r.clone({ add: g.RED }) : r;
-        n.push(H.fromPon(i, o));
+        const o = O(r) && t.get(r.t, 0) > 0 ? r.clone({ add: m.RED }) : r;
+        n.push(P.fromPon(i, o));
       }
     }
     if (n.length == 0) return !1;
     for (const i of n)
       I(
-        i.tiles.filter((r) => r.has(g.HORIZONTAL)).length == 2,
+        i.tiles.filter((r) => r.has(m.HORIZONTAL)).length == 2,
         `[bug] shokan has unexpected horizontal operators: ${i.toString()}`
       );
     return n;
   }
 }
-function Wo(s) {
+function Uo(s) {
   return s.length == 0 ? [] : s.map((t) => {
     if (O(t.tiles[1])) {
-      const e = t.tiles[1].clone({ add: g.RED });
+      const e = t.tiles[1].clone({ add: m.RED });
       return t.clone({ replace: { idx: 1, tile: e } });
     } else if (O(t.tiles[2])) {
-      const e = t.tiles[2].clone({ add: g.RED });
+      const e = t.tiles[2].clone({ add: m.RED });
       return t.clone({ replace: { idx: 2, tile: e } });
     }
   }).filter((t) => t != null);
 }
-function Tn(s) {
+function vn(s) {
   const t = s.tiles[0], e = s.tiles[1].n;
   return e != 1 && t.n - 2 == e ? [new y(t.t, t.n - 3), t] : e != 8 && t.n + 1 == e ? [new y(t.t, t.n + 3), t] : [t];
 }
-class Pt extends je {
+class Ht extends je {
   isBackHand() {
     for (const t of Object.values(p))
       if (t != p.BACK && this.sum(t) > 0)
@@ -7793,23 +7814,23 @@ class Pt extends je {
     return this.sum(p.BACK) > 0;
   }
   clone() {
-    const t = new Pt(this.toString());
+    const t = new Ht(this.toString());
     return t.data.reached = this.data.reached, t;
   }
   dec(t) {
     return this.isBackHand() ? (super.dec(t.map(() => new y(p.BACK, 0))), [...t]) : super.dec(t);
   }
 }
-class gs {
+class ys {
   id;
-  river = new Vn();
+  river = new Jn();
   placeManager = new ae({});
   // empty for init
   scoreManager = new oe({});
   // empty for init
-  hands = W(new Pt(""));
+  hands = W(() => new Ht(""));
   // empty for init
-  counter = new Sr();
+  counter = new Cr();
   _doraIndicators = [];
   // empty for init
   eventHandler;
@@ -7859,17 +7880,17 @@ class gs {
       case "CHI":
       case "DAI_KAN": {
         const i = T.deserialize(t.block);
-        this.hands[t.iam].call(i), this.river.markCalled(), t.iam != t.wind && this.counter.dec(...i.tiles.filter((r) => !r.has(g.HORIZONTAL)));
+        this.hands[t.iam].call(i), this.river.markCalled(), t.iam != t.wind && this.counter.dec(...i.tiles.filter((r) => !r.has(m.HORIZONTAL)));
         break;
       }
       case "SHO_KAN": {
-        const i = H.from(t.block.tiles);
-        this.hands[t.iam].kan(i), t.iam != t.wind && this.counter.dec(i.tiles.filter((r) => r.has(g.HORIZONTAL))[0]);
+        const i = P.from(t.block.tiles);
+        this.hands[t.iam].kan(i), t.iam != t.wind && this.counter.dec(i.tiles.filter((r) => r.has(m.HORIZONTAL))[0]);
         break;
       }
       case "AN_KAN": {
         const i = R.from(t.block.tiles);
-        this.hands[t.iam].kan(i), t.iam != t.wind && this.counter.dec(...i.tiles.filter((r) => !r.has(g.HORIZONTAL)));
+        this.hands[t.iam].kan(i), t.iam != t.wind && this.counter.dec(...i.tiles.filter((r) => !r.has(m.HORIZONTAL)));
         break;
       }
       case "REACH": {
@@ -7919,13 +7940,13 @@ class gs {
     }
   }
 }
-class Do extends gs {
+class jo extends ys {
   applied = {};
   constructor(t) {
-    super("observer", t), this.counter.disabled = !0, this.hands = W(new Pt("_____________"));
+    super("observer", t), this.counter.disabled = !0, this.hands = W(() => new Ht("_____________"));
   }
   setHands(t) {
-    this.hands[t.wind] = new Pt(t.hands[t.wind]);
+    this.hands[t.wind] = new Ht(t.hands[t.wind]);
   }
   handleEvent(t) {
     switch (super.handleEvent(t), t.type) {
@@ -7990,7 +8011,7 @@ class Do extends gs {
       case "END_GAME":
         for (const n of Object.values(_))
           console.debug(
-            `${this.placeManager.playerID(n)}(${Le(n)})`,
+            `${this.placeManager.playerID(n)}(${Ke(n)})`,
             `end hand: ${this.hand(n).toString()}`
           );
         console.debug(
@@ -8003,8 +8024,8 @@ class Do extends gs {
     }
   }
 }
-class Qt extends gs {
-  river = new Vn();
+class Qt extends ys {
+  river = new Jn();
   doras = [];
   constructor(t, e) {
     super(t, e), this.eventHandler.on((n) => this.handleEvent(n));
@@ -8014,7 +8035,7 @@ class Qt extends gs {
   }
   setHands(t) {
     for (const e of Object.values(_))
-      this.hands[e] = new Pt(t.hands[e]);
+      this.hands[e] = new Ht(t.hands[e]);
   }
   handleDiscard(t) {
     const e = Object.values(_).filter((l) => l == this.myWind ? !1 : this.hand(l).reached), n = new ge(this.hand(this.myWind)).calc();
@@ -8054,7 +8075,7 @@ class Qt extends gs {
     }
   }
 }
-class Qo {
+class ia {
   index = 0;
   histories = [];
   constructor(t) {
@@ -8074,8 +8095,8 @@ class Qo {
       this.start();
   }
 }
-const ta = (s) => {
-  const [t, e] = Jt(), [n, i] = Jt(), [r, o] = Jt(), [a, c] = Jt(), l = ["player-1", "player-2", "player-3", "player-4"], d = s?.playerInjection, h = d?.p1 ?? Qt, u = d?.p2 ?? Qt, m = d?.p3 ?? Qt, f = d?.p4 ?? Qt, w = new h(l[0], e), b = new u(l[1], i), A = new m(l[2], o), S = new f(l[3], c), x = [
+const ra = (s) => {
+  const [t, e] = Jt(), [n, i] = Jt(), [r, o] = Jt(), [a, c] = Jt(), l = ["player-1", "player-2", "player-3", "player-4"], d = s?.playerInjection, h = d?.p1 ?? Qt, u = d?.p2 ?? Qt, g = d?.p3 ?? Qt, f = d?.p4 ?? Qt, w = new h(l[0], e), b = new u(l[1], i), A = new g(l[2], o), S = new f(l[3], c), x = [
     { handler: t, id: l[0] },
     { handler: n, id: l[1] },
     { handler: r, id: l[2] },
@@ -8135,7 +8156,7 @@ class ue {
     {
       const o = t.get(i);
       r += o * ut(i, n);
-      const a = t.get(new y(i.t, i.n + 1)), c = t.get(new y(i.t, i.n + 2)), l = t.get(new y(i.t, i.n - 1)), d = t.get(new y(i.t, i.n - 2)), h = i.n - 2 > 0 ? Math.min(l, d) : 0, u = i.n + 2 <= 9 ? Math.min(a, c) : 0, m = i.n - 1 >= 1 && i.n + 1 <= 9 ? Math.min(a, l) : 0, f = Math.max(h, m), w = Math.max(m, u);
+      const a = t.get(new y(i.t, i.n + 1)), c = t.get(new y(i.t, i.n + 2)), l = t.get(new y(i.t, i.n - 1)), d = t.get(new y(i.t, i.n - 2)), h = i.n - 2 > 0 ? Math.min(l, d) : 0, u = i.n + 2 <= 9 ? Math.min(a, c) : 0, g = i.n - 1 >= 1 && i.n + 1 <= 9 ? Math.min(a, l) : 0, f = Math.max(h, g), w = Math.max(g, u);
       return r += o * ut(i, n), r += h * ut(new y(i.t, i.n - 2), n), r += u * ut(new y(i.t, i.n + 2), n), r += f * ut(new y(i.t, i.n - 1), n), r += w * ut(new y(i.t, i.n + 1), n), i.n == 0, r;
     }
   }
@@ -8180,61 +8201,61 @@ class Ut {
 }
 export {
   et as ActionLogic,
-  Pt as ActorHand,
+  Ht as ActorHand,
   E as BLOCK,
-  gs as BaseActor,
+  ys as BaseActor,
   T as Block,
   R as BlockAnKan,
-  yr as BlockCalculator,
+  br as BlockCalculator,
   V as BlockChi,
   z as BlockDaiKan,
   Tt as BlockHand,
-  On as BlockIsolated,
-  Ke as BlockOther,
+  kn as BlockIsolated,
+  Le as BlockOther,
   C as BlockPair,
   U as BlockPon,
   gt as BlockRun,
-  H as BlockShoKan,
-  K as BlockThree,
+  P as BlockShoKan,
+  L as BlockThree,
   ye as Controller,
-  Sr as Counter,
+  Cr as Counter,
   Ft as Efficiency,
-  vn as FONT_FAMILY,
+  Sn as FONT_FAMILY,
   N as G,
   je as Hand,
   X as INPUT_SEPARATOR,
-  Pn as Image,
+  Bn as Image,
   Kn as ImageHelper,
-  bt as Mark,
-  Lo as MeasureText,
-  Fo as MyG,
-  Go as MyImage,
-  Yo as MyRect,
-  jo as MySVG,
-  Vo as MyText,
-  Zo as MyUse,
+  _t as Mark,
+  Go as MeasureText,
+  Jo as MyG,
+  Xo as MyImage,
+  Qo as MyRect,
+  Vo as MySVG,
+  ta as MyText,
+  qo as MyUse,
   q as N19,
   jt as NZ,
-  g as OP,
-  Do as Observer,
+  m as OP,
+  jo as Observer,
   D as Parser,
   ae as PlaceManager,
   Qt as Player,
   ue as PlayerEfficiency,
-  Fn as PointCalculator,
+  Gn as PointCalculator,
   k as ROUND,
-  Sn as ROUND_MAP,
-  Bn as Rect,
-  Qo as Replayer,
+  On as ROUND_MAP,
+  Wn as Rect,
+  ia as Replayer,
   Ut as RiskRank,
-  Vn as River,
+  Jn as River,
   en as STICK_CONTEXT,
-  Bi as SVG,
+  Di as SVG,
   oe as ScoreManager,
   ge as ShantenCalculator,
-  Pi as Svg,
-  Wn as Symbol,
-  bs as TABLE_CONTEXT,
+  Wi as Svg,
+  Dn as Symbol,
+  Is as TABLE_CONTEXT,
   wt as TILE_CONTEXT,
   p as TYPE,
   St as Text,
@@ -8243,35 +8264,36 @@ export {
   _ as WIND,
   We as WIND_MAP,
   Ot as Wall,
+  vs as compareCalledTiles,
   fe as compareTiles,
-  gr as convertInput,
-  Lt as createBlockHand,
-  Nn as createControllerMachine,
-  vr as createEventEmitter,
+  wr as convertTableInput,
+  Kt as createBlockHand,
+  Tn as createControllerMachine,
+  kr as createEventEmitter,
   Jt as createEventPipe,
-  ta as createLocalGame,
-  Xi as createTable,
+  ra as createLocalGame,
+  Qi as createTable,
   W as createWindMap,
   Vt as deserializeWinResult,
-  Jo as drawBlocks,
-  qo as drawTable,
+  ea as drawBlocks,
+  sa as drawTable,
   F as forHand,
   rn as getCallBlockIndex,
-  _r as getPointDescription,
-  Bo as incrementalIDGenerator,
+  Ir as getPointDescription,
+  zo as incrementalIDGenerator,
   O as is5Tile,
   te as nextRound,
   vt as nextWind,
-  Xo as optimizeSVG,
-  hr as parse,
-  dr as parseTableInput,
-  zo as prevRound,
-  Le as prevWind,
-  Ar as prioritizeDiscardedEvents,
-  Ir as prioritizeDrawnEvents,
-  ks as roundWind,
+  na as optimizeSVG,
+  ur as parse,
+  pr as parseRawTableInput,
+  fr as parseYamlStringInput,
+  Zo as prevRound,
+  Ke as prevWind,
+  Tr as prioritizeDiscardedEvents,
+  vr as prioritizeDrawnEvents,
+  Rs as roundWind,
   Ce as serializeWinResult,
-  Yn as shuffle,
-  Ns as sortCalledTiles,
-  pn as toDora
+  Vn as shuffle,
+  gn as toDora
 };