haori 0.4.4 → 0.4.6

package/dist/haori.es.js

@@ -30,12 +30,12 @@ const O = class O {
 };
 O.devMode = !1;
 let B = O;
-const Y = "embedded";
-function tt(F) {
+const z = "embedded";
+function rt(F) {
   return F === "embedded" || F === "demo";
 }
-function et(F) {
-  return F === null ? null : tt(F) ? F : Y;
+function it(F) {
+  return F === null ? null : rt(F) ? F : z;
 }
 const D = class D {
   /**
@@ -53,7 +53,7 @@ const D = class D {
    * @return 戻り値はありません。
    */
   static setRuntime(t) {
-    D._runtime = tt(t) ? t : Y;
+    D._runtime = rt(t) ? t : z;
   }
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
@@ -67,7 +67,7 @@ const D = class D {
       if (t instanceof HTMLScriptElement) {
         const r = t.getAttribute("data-prefix") || D._prefix;
         D._prefix = r.endsWith("-") ? r : r + "-";
-        const i = et(
+        const i = it(
           t.getAttribute("data-runtime")
         );
         i !== null && (D._runtime = i);
@@ -94,10 +94,10 @@ const D = class D {
     return D._prefix;
   }
 };
-D._prefix = "data-", D._runtime = Y;
-let l = D;
-document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", l.detect) : l.detect();
-class f {
+D._prefix = "data-", D._runtime = z;
+let u = D;
+document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", u.detect) : u.detect();
+class d {
   /**
    * 開発モードでのみコンソールに情報を出力します。
    *
@@ -126,7 +126,7 @@ class f {
     console.error(t, ...e);
   }
 }
-class rt {
+class st {
   constructor() {
     this.MAX_BUDGET = 8, this.queue = [], this.processing = !1;
   }
@@ -139,16 +139,16 @@ class rt {
    */
   enqueue(t, e = !1) {
     let r, i;
-    const s = new Promise((a, o) => {
+    const n = new Promise((a, o) => {
       r = a, i = o;
-    }), n = {
+    }), s = {
       task: t,
       timestamp: performance.now(),
-      promise: s,
+      promise: n,
       resolve: r,
       reject: i
     };
-    return e ? this.queue.unshift(n) : this.queue.push(n), this.scheduleProcessing(), s;
+    return e ? this.queue.unshift(s) : this.queue.push(s), this.scheduleProcessing(), n;
   }
   /**
    * キューを処理します。
@@ -168,13 +168,13 @@ class rt {
             const r = await e.task();
             e.resolve(r);
           } catch (r) {
-            e.reject(r), f.error("[Haori]", `Task ${e.timestamp} failed:`, r);
+            e.reject(r), d.error("[Haori]", `Task ${e.timestamp} failed:`, r);
           }
           if (performance.now() - t > this.MAX_BUDGET)
             break;
         }
       } catch (t) {
-        f.error("[Haori]", "Error processing queue:", t);
+        d.error("[Haori]", "Error processing queue:", t);
       } finally {
         this.processing = !1, this.queue.length > 0 && this.scheduleProcessing();
       }
@@ -202,7 +202,7 @@ class rt {
     t.length > 0 && await Promise.allSettled(t);
   }
 }
-const Q = class Q {
+const _ = class _ {
   /**
    * タスクをキューに追加します。
    *
@@ -220,8 +220,8 @@ const Q = class Q {
     return this.ASYNC_QUEUE.wait();
   }
 };
-Q.ASYNC_QUEUE = new rt();
-let P = Q;
+_.ASYNC_QUEUE = new st();
+let R = _;
 class X {
   /**
    * 実行モードを取得します。
@@ -229,7 +229,7 @@ class X {
    * @return 実行モード。
    */
   static get runtime() {
-    return l.runtime;
+    return u.runtime;
   }
   /**
    * 実行モードを設定します。
@@ -238,7 +238,7 @@ class X {
    * @return 戻り値はありません。
    */
   static setRuntime(t) {
-    l.setRuntime(t);
+    u.setRuntime(t);
   }
   /**
    * 通知ダイアログを表示します。
@@ -247,7 +247,7 @@ class X {
    * @returns 通知が閉じられると解決されるPromise
    */
   static dialog(t) {
-    return P.enqueue(() => {
+    return R.enqueue(() => {
       window.alert(t);
     }, !0);
   }
@@ -275,7 +275,7 @@ class X {
    * @returns ユーザーがOKをクリックした場合はtrue、キャンセルした場合はfalseが解決されるPromise
    */
   static confirm(t) {
-    return P.enqueue(() => window.confirm(t), !0);
+    return R.enqueue(() => window.confirm(t), !0);
   }
   /**
    * ダイアログを開きます。
@@ -283,8 +283,8 @@ class X {
    * @param element 開くダイアログのHTML要素
    */
   static openDialog(t) {
-    return P.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.showModal() : f.error("[Haori]", "Element is not a dialog: ", t);
+    return R.enqueue(() => {
+      t instanceof HTMLDialogElement ? t.showModal() : d.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -293,8 +293,8 @@ class X {
    * @param element 閉じるダイアログのHTML要素
    */
   static closeDialog(t) {
-    return P.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.close() : f.error("[Haori]", "Element is not a dialog: ", t);
+    return R.enqueue(() => {
+      t instanceof HTMLDialogElement ? t.close() : d.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -314,7 +314,7 @@ class X {
    * @param level メッセージのレベル（省略可能）
    */
   static addMessage(t, e, r) {
-    return P.enqueue(() => {
+    return R.enqueue(() => {
       const i = t instanceof HTMLFormElement ? t : t.parentElement ?? t;
       i.setAttribute("data-message", e), r !== void 0 ? i.setAttribute("data-message-level", r) : i.removeAttribute("data-message-level");
     }, !0);
@@ -325,21 +325,21 @@ class X {
    * @param parent メッセージをクリアする親要素
    */
   static clearMessages(t) {
-    return P.enqueue(() => {
+    return R.enqueue(() => {
       t.removeAttribute("data-message"), t.removeAttribute("data-message-level"), t.querySelectorAll("[data-message]").forEach((e) => {
         e.removeAttribute("data-message"), e.removeAttribute("data-message-level");
       });
     }, !0);
   }
 }
-const it = ["addErrorMessage", "clearMessages"];
-function _() {
+const nt = ["addErrorMessage", "clearMessages"];
+function et() {
   const t = globalThis.window?.Haori;
-  return it.every(
+  return nt.every(
     (r) => typeof t?.[r] == "function"
   ) ? t : X;
 }
-class b {
+class y {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -350,7 +350,7 @@ class b {
    */
   static getValues(t) {
     const e = {};
-    return b.getPartValues(t, e);
+    return y.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -361,32 +361,32 @@ class b {
    * @returns values と同じオブジェクト
    */
   static getPartValues(t, e) {
-    const r = t.getAttribute("name"), i = t.getAttribute(`${l.prefix}form-object`), s = t.getAttribute(`${l.prefix}form-list`);
+    const r = t.getAttribute("name"), i = t.getAttribute(`${u.prefix}form-object`), n = t.getAttribute(`${u.prefix}form-list`);
     if (r) {
-      s ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), i && f.warn(
+      n ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), i && d.warn(
         "Haori",
-        `Element cannot have both ${l.prefix}form-object and name attributes.`
+        `Element cannot have both ${u.prefix}form-object and name attributes.`
       );
-      for (const n of t.getChildElementFragments())
-        b.getPartValues(n, e);
+      for (const s of t.getChildElementFragments())
+        y.getPartValues(s, e);
     } else if (i) {
-      const n = {};
+      const s = {};
       for (const a of t.getChildElementFragments())
-        b.getPartValues(a, n);
-      Object.keys(n).length > 0 && (e[String(i)] = n), s && f.warn(
+        y.getPartValues(a, s);
+      Object.keys(s).length > 0 && (e[String(i)] = s), n && d.warn(
         "Haori",
-        `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
+        `Element cannot have both ${u.prefix}form-list and ${u.prefix}form-object attributes.`
       );
-    } else if (s) {
-      const n = [];
+    } else if (n) {
+      const s = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        b.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
+        y.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
       }
-      n.length > 0 && (e[String(s)] = n);
+      s.length > 0 && (e[String(n)] = s);
     } else
-      for (const n of t.getChildElementFragments())
-        b.getPartValues(n, e);
+      for (const s of t.getChildElementFragments())
+        y.getPartValues(s, e);
     return e;
   }
   /**
@@ -399,7 +399,7 @@ class b {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return b.setPartValues(t, e, null, r, !0);
+    return y.setPartValues(t, e, null, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -411,7 +411,7 @@ class b {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(t, e, r = !1) {
-    return b.setPartValues(t, e, null, r, !1);
+    return y.setPartValues(t, e, null, r, !1);
   }
   /**
    * 単一フラグメントへ値を設定します。
@@ -433,53 +433,53 @@ class b {
    * @param force data-form-detach属性があるエレメントにも値を反映するかどうか
    * @returns Promise（DOMの更新が完了したら解決される）
    */
-  static setPartValues(t, e, r = null, i = !1, s = !0) {
-    const n = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), d = t.getAttribute(`${l.prefix}form-list`), m = t.getAttribute(`${l.prefix}form-detach`);
+  static setPartValues(t, e, r = null, i = !1, n = !0) {
+    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${u.prefix}form-object`), h = t.getAttribute(`${u.prefix}form-list`), m = t.getAttribute(`${u.prefix}form-detach`);
     if (a) {
       if (!m || i) {
-        const y = e[String(a)];
-        d && Array.isArray(y) && r !== null ? n.push(
-          b.applyFragmentValue(t, y[r] ?? null, s)
-        ) : typeof y > "u" || (typeof y == "string" || typeof y == "number" || typeof y == "boolean" || y === null ? n.push(b.applyFragmentValue(t, y, s)) : n.push(
-          b.applyFragmentValue(t, String(y), s)
+        const b = e[String(a)];
+        h && Array.isArray(b) && r !== null ? s.push(
+          y.applyFragmentValue(t, b[r] ?? null, n)
+        ) : typeof b > "u" || (typeof b == "string" || typeof b == "number" || typeof b == "boolean" || b === null ? s.push(y.applyFragmentValue(t, b, n)) : s.push(
+          y.applyFragmentValue(t, String(b), n)
         ));
       }
     } else if (o) {
-      const y = e[String(o)];
-      if (y && typeof y == "object")
+      const b = e[String(o)];
+      if (b && typeof b == "object")
         for (const E of t.getChildElementFragments())
-          n.push(
-            b.setPartValues(
+          s.push(
+            y.setPartValues(
               E,
-              y,
+              b,
               null,
               i,
-              s
+              n
             )
           );
-    } else if (d) {
-      const y = e[String(d)];
-      if (Array.isArray(y)) {
+    } else if (h) {
+      const b = e[String(h)];
+      if (Array.isArray(b)) {
         const E = t.getChildElementFragments();
         for (let S = 0; S < E.length; S++) {
-          const u = E[S];
-          y.length > S ? n.push(
-            b.setPartValues(
-              u,
-              y[S],
+          const c = E[S];
+          b.length > S ? s.push(
+            y.setPartValues(
+              c,
+              b[S],
               S,
               i,
-              s
+              n
             )
-          ) : n.push(b.setPartValues(u, {}, S, i, s));
+          ) : s.push(y.setPartValues(c, {}, S, i, n));
         }
       }
     } else
-      for (const y of t.getChildElementFragments())
-        n.push(
-          b.setPartValues(y, e, null, i, s)
+      for (const b of t.getChildElementFragments())
+        s.push(
+          y.setPartValues(b, e, null, i, n)
         );
-    return Promise.all(n).then(() => {
+    return Promise.all(s).then(() => {
     });
   }
   /**
@@ -490,21 +490,21 @@ class b {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    b.clearValues(t), await Promise.all([
-      b.clearMessages(t),
-      b.clearEachClones(t)
-    ]), await P.enqueue(() => {
+    y.clearValues(t), await Promise.all([
+      y.clearMessages(t),
+      y.clearEachClones(t)
+    ]), await R.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
         e.reset();
       else {
         const r = e.parentElement;
         if (r) {
-          const i = e.nextElementSibling, s = document.createElement("form");
-          s.appendChild(e), s.reset(), r.insertBefore(e, i);
+          const i = e.nextElementSibling, n = document.createElement("form");
+          n.appendChild(e), n.reset(), r.insertBefore(e, i);
         }
       }
-    }), await x.evaluateAll(t);
+    }), await P.evaluateAll(t);
   }
   /**
    * data-each によって生成された複製（テンプレート以外）を削除します。
@@ -513,20 +513,20 @@ class b {
    * 対象エレメント自体は削除しません。
    */
   static clearEachClones(t) {
-    const e = [], r = (s) => {
-      if (s.hasAttribute(`${l.prefix}each`))
-        for (const n of s.getChildElementFragments()) {
-          const a = n.hasAttribute(`${l.prefix}each-before`), o = n.hasAttribute(`${l.prefix}each-after`);
-          !a && !o && e.push(n.remove());
+    const e = [], r = (n) => {
+      if (n.hasAttribute(`${u.prefix}each`))
+        for (const s of n.getChildElementFragments()) {
+          const a = s.hasAttribute(`${u.prefix}each-before`), o = s.hasAttribute(`${u.prefix}each-after`);
+          !a && !o && e.push(s.remove());
         }
-    }, i = (s) => {
-      r(s);
-      for (const n of s.getChildElementFragments())
-        i(n);
+    }, i = (n) => {
+      r(n);
+      for (const s of n.getChildElementFragments())
+        i(s);
     };
     r(t);
-    for (const s of t.getChildElementFragments())
-      i(s);
+    for (const n of t.getChildElementFragments())
+      i(n);
     return Promise.all(e).then(() => {
     });
   }
@@ -538,7 +538,7 @@ class b {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      b.clearValues(e);
+      y.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -547,7 +547,7 @@ class b {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(t) {
-    return _().clearMessages(
+    return et().clearMessages(
       t.getTarget()
     );
   }
@@ -561,7 +561,7 @@ class b {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    return b.addMessage(t, e, r, "error");
+    return y.addMessage(t, e, r, "error");
   }
   /**
    * キーに一致するフラグメントにレベル付きメッセージを追加します。
@@ -574,10 +574,10 @@ class b {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(t, e, r, i) {
-    const s = [], n = _(), a = n.addMessage, o = (m) => typeof a == "function" ? a.call(n, m, r, i) : n.addErrorMessage(m, r), d = b.findFragmentsByKey(t, e);
-    return d.forEach((m) => {
-      s.push(o(m.getTarget()));
-    }), d.length === 0 && s.push(o(t.getTarget())), Promise.all(s).then(() => {
+    const n = [], s = et(), a = s.addMessage, o = (m) => typeof a == "function" ? a.call(s, m, r, i) : s.addErrorMessage(m, r), h = y.findFragmentsByKey(t, e);
+    return h.forEach((m) => {
+      n.push(o(m.getTarget()));
+    }), h.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
     });
   }
   /**
@@ -588,7 +588,7 @@ class b {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return b.findFragmentByKeyParts(t, e.split("."));
+    return y.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -600,31 +600,31 @@ class b {
    */
   static findFragmentByKeyParts(t, e) {
     const r = [], i = e[0];
-    if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${l.prefix}form-object`))
-      e.length > 1 && t.getAttribute(`${l.prefix}form-object`) === i && t.getChildElementFragments().forEach((n) => {
-        r.push(...b.findFragmentByKeyParts(n, e.slice(1)));
+    if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${u.prefix}form-object`))
+      e.length > 1 && t.getAttribute(`${u.prefix}form-object`) === i && t.getChildElementFragments().forEach((s) => {
+        r.push(...y.findFragmentByKeyParts(s, e.slice(1)));
       });
-    else if (t.hasAttribute(`${l.prefix}form-list`)) {
+    else if (t.hasAttribute(`${u.prefix}form-list`)) {
       if (e.length > 1) {
-        const s = t.getAttribute(`${l.prefix}form-list`), n = i.lastIndexOf("["), a = i.lastIndexOf("]");
-        if (n !== -1 && a !== -1 && n < a) {
-          const o = i.substring(0, n);
-          if (s === o) {
-            const d = i.substring(n + 1, a), m = Number(d);
+        const n = t.getAttribute(`${u.prefix}form-list`), s = i.lastIndexOf("["), a = i.lastIndexOf("]");
+        if (s !== -1 && a !== -1 && s < a) {
+          const o = i.substring(0, s);
+          if (n === o) {
+            const h = i.substring(s + 1, a), m = Number(h);
             if (isNaN(m))
-              f.error("Haori", `Invalid index: ${i}`);
+              d.error("Haori", `Invalid index: ${i}`);
             else {
-              const y = t.getChildElementFragments().filter((E) => E.hasAttribute(`${l.prefix}row`));
-              m < y.length && r.push(
-                ...b.findFragmentByKeyParts(y[m], e.slice(1))
+              const b = t.getChildElementFragments().filter((E) => E.hasAttribute(`${u.prefix}row`));
+              m < b.length && r.push(
+                ...y.findFragmentByKeyParts(b[m], e.slice(1))
               );
             }
           }
         }
       }
     } else
-      t.getChildElementFragments().forEach((s) => {
-        r.push(...b.findFragmentByKeyParts(s, e));
+      t.getChildElementFragments().forEach((n) => {
+        r.push(...y.findFragmentByKeyParts(n, e));
       });
     return r;
   }
@@ -686,28 +686,28 @@ const M = class M {
    */
   static evaluate(t, e = {}) {
     if (t.trim() === "")
-      return f.warn("[Haori]", t, "Expression is empty"), null;
+      return d.warn("[Haori]", t, "Expression is empty"), null;
     if (this.containsDangerousPatterns(t))
-      return f.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
+      return d.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
     if (this.containsForbiddenKeys(e))
-      return f.warn("[Haori]", e, "Binded values contain forbidden keys"), null;
+      return d.warn("[Haori]", e, "Binded values contain forbidden keys"), null;
     if (this.containsForbiddenBindingValues(e))
-      return f.warn(
+      return d.warn(
         "[Haori]",
         e,
         "Binded values contain forbidden values"
       ), null;
-    const r = Object.keys(e).filter((n) => !this.FORBIDDEN_BINDING_NAMES.has(n)).sort(), i = `${t}:${r.join(",")}`;
-    let s = this.EXPRESSION_CACHE.get(i);
-    if (!s) {
-      const n = this.buildAssignments(r), a = n ? `"use strict";
-${n};
+    const r = Object.keys(e).filter((s) => !this.FORBIDDEN_BINDING_NAMES.has(s)).sort(), i = `${t}:${r.join(",")}`;
+    let n = this.EXPRESSION_CACHE.get(i);
+    if (!n) {
+      const s = this.buildAssignments(r), a = s ? `"use strict";
+${s};
 return (${t});` : `"use strict";
 return (${t});`;
       try {
-        s = new Function(...r, a), this.EXPRESSION_CACHE.set(i, s);
+        n = new Function(...r, a), this.EXPRESSION_CACHE.set(i, n);
       } catch (o) {
-        return f.error(
+        return d.error(
           "[Haori]",
           "Failed to compile expression:",
           t,
@@ -716,12 +716,12 @@ return (${t});`;
       }
     }
     try {
-      const n = [], a = this.wrapBoundValues(e);
+      const s = [], a = this.wrapBoundValues(e);
       return r.forEach((o) => {
-        n.push(a[o]);
-      }), this.withBlockedPropertyAccess(() => s(...n));
-    } catch (n) {
-      return f.error("[Haori]", "Expression evaluation error:", t, n), n instanceof ReferenceError ? void 0 : null;
+        s.push(a[o]);
+      }), this.withBlockedPropertyAccess(() => n(...s));
+    } catch (s) {
+      return d.error("[Haori]", "Expression evaluation error:", t, s), s instanceof ReferenceError ? void 0 : null;
     }
   }
   /**
@@ -752,13 +752,20 @@ return (${t});`;
       return !1;
     const r = [];
     let i = null;
-    for (let s = 0; s < e.length; s++) {
-      const n = e[s], a = e[s + 1] || null, o = r[r.length - 1] || null;
-      if (n.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(n.value) || this.STRICT_FORBIDDEN_NAMES.includes(n.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(n.value)) || o === "member" && n.value !== "]" && n.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
-        this.decodeStringLiteral(n.value)
-      ) || n.value === "." && a?.type !== "identifier" || n.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
+    for (let n = 0; n < e.length; n++) {
+      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, h = e[n - 2] || null, m = e[n - 3] || null;
+      if (this.startsObjectKey(
+        o,
+        i,
+        h,
+        m
+      ) && (s.value === "[" || s.type === "identifier" && this.FORBIDDEN_PROPERTY_NAMES.has(s.value) || s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+        this.decodeStringLiteral(s.value)
+      )) || s.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(s.value) || this.STRICT_FORBIDDEN_NAMES.includes(s.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(s.value)) || o === "member" && s.value !== "]" && s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+        this.decodeStringLiteral(s.value)
+      ) || s.value === "." && a?.type !== "identifier" || s.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
         return !1;
-      switch (n.value) {
+      switch (s.value) {
         case "(":
           r.push("paren");
           break;
@@ -768,17 +775,25 @@ return (${t});`;
           break;
         }
         case "[": {
-          const d = this.startsMemberAccess(i) ? "member" : "array";
-          r.push(d);
+          const b = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(b);
           break;
         }
+        case "{":
+          r.push("object");
+          break;
         case "]": {
           if (r.pop() === void 0)
             return !1;
           break;
         }
+        case "}": {
+          if (r.pop() !== "object")
+            return !1;
+          break;
+        }
       }
-      i = n;
+      i = s;
     }
     return r.length === 0;
   }
@@ -804,6 +819,8 @@ return (${t});`;
     ], i = /* @__PURE__ */ new Set([
       "(",
       ")",
+      "{",
+      "}",
       "[",
       "]",
       ".",
@@ -819,41 +836,41 @@ return (${t});`;
       ">",
       "<"
     ]);
-    let s = 0;
-    for (; s < t.length; ) {
-      const n = t[s];
-      if (/\s/.test(n)) {
-        s += 1;
+    let n = 0;
+    for (; n < t.length; ) {
+      const s = t[n];
+      if (/\s/.test(s)) {
+        n += 1;
         continue;
       }
-      if (n === "/" && (t[s + 1] === "/" || t[s + 1] === "*"))
+      if (s === "/" && (t[n + 1] === "/" || t[n + 1] === "*"))
         return null;
-      if (n === '"' || n === "'") {
-        const o = this.readStringToken(t, s);
+      if (s === '"' || s === "'") {
+        const o = this.readStringToken(t, n);
         if (o === null)
           return null;
-        e.push(o.token), s = o.nextIndex;
+        e.push(o.token), n = o.nextIndex;
         continue;
       }
       const a = r.find(
-        (o) => t.startsWith(o, s)
+        (o) => t.startsWith(o, n)
       );
       if (a) {
-        e.push({ type: "operator", value: a, position: s }), s += a.length;
+        e.push({ type: "operator", value: a, position: n }), n += a.length;
         continue;
       }
-      if (/[0-9]/.test(n)) {
-        const o = this.readNumberToken(t, s);
-        e.push(o.token), s = o.nextIndex;
+      if (/[0-9]/.test(s)) {
+        const o = this.readNumberToken(t, n);
+        e.push(o.token), n = o.nextIndex;
         continue;
       }
-      if (/[A-Za-z_$]/.test(n)) {
-        const o = this.readIdentifierToken(t, s);
-        e.push(o.token), s = o.nextIndex;
+      if (/[A-Za-z_$]/.test(s)) {
+        const o = this.readIdentifierToken(t, n);
+        e.push(o.token), n = o.nextIndex;
         continue;
       }
-      if (i.has(n)) {
-        e.push({ type: "operator", value: n, position: s }), s += 1;
+      if (i.has(s)) {
+        e.push({ type: "operator", value: s, position: n }), n += 1;
         continue;
       }
       return null;
@@ -871,12 +888,12 @@ return (${t});`;
     const r = t[e];
     let i = e + 1;
     for (; i < t.length; ) {
-      const s = t[i];
-      if (s === "\\") {
+      const n = t[i];
+      if (n === "\\") {
         i += 2;
         continue;
       }
-      if (s === r)
+      if (n === r)
         return {
           token: {
             type: "string",
@@ -941,6 +958,16 @@ return (${t});`;
   static startsMemberAccess(t) {
     return t === null ? !1 : t.type === "identifier" || t.type === "number" ? !0 : t.value === ")" || t.value === "]" || t.value === "?.";
   }
+  /**
+   * object literal 内で次のトークンがキー位置かどうかを判定します。
+   *
+   * @param activeGroup 現在のグループ種別
+   * @param previous 直前のトークン
+   * @returns object literal のキー位置であれば true
+   */
+  static startsObjectKey(t, e, r, i) {
+    return t !== "object" ? !1 : e?.value === "{" || e?.value === "," || e?.type === "identifier" && this.OBJECT_PROPERTY_MODIFIERS.has(e.value) && (r?.value === "{" || r?.value === ",") ? !0 : e?.value !== "*" ? !1 : r?.value === "{" || r?.value === "," ? !0 : r?.type === "identifier" && r.value === "async" && (i?.value === "{" || i?.value === ",");
+  }
   /**
    * 文字列リテラルをプレーン文字列へ変換します。
    *
@@ -949,6 +976,9 @@ return (${t});`;
    */
   static decodeStringLiteral(t) {
     return t.slice(1, -1).replace(
+      /\\u\{([0-9a-fA-F]+)\}/g,
+      (e, r) => String.fromCodePoint(parseInt(r, 16))
+    ).replace(
       /\\u([0-9a-fA-F]{4})/g,
       (e, r) => String.fromCharCode(parseInt(r, 16))
     ).replace(
@@ -984,8 +1014,8 @@ return (${t});`;
    */
   static wrapBoundValues(t) {
     const e = /* @__PURE__ */ new WeakMap(), r = {};
-    return Object.entries(t).forEach(([i, s]) => {
-      r[i] = this.wrapBoundValue(s, e);
+    return Object.entries(t).forEach(([i, n]) => {
+      r[i] = this.wrapBoundValue(n, e);
     }), r;
   }
   /**
@@ -1001,39 +1031,39 @@ return (${t});`;
     const r = t, i = e.get(r);
     if (i !== void 0)
       return i;
-    const s = new Proxy(r, {
-      get: (n, a, o) => {
+    const n = new Proxy(r, {
+      get: (s, a, o) => {
         if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
           return;
-        const d = Reflect.get(n, a, o);
-        return typeof a == "symbol" ? d : this.wrapBoundValue(
-          d,
+        const h = Reflect.get(s, a, o);
+        return typeof a == "symbol" ? h : this.wrapBoundValue(
+          h,
           e
         );
       },
-      has: (n, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(n, a),
-      getOwnPropertyDescriptor: (n, a) => {
+      has: (s, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(s, a),
+      getOwnPropertyDescriptor: (s, a) => {
         if (!(typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a)))
-          return Reflect.getOwnPropertyDescriptor(n, a);
+          return Reflect.getOwnPropertyDescriptor(s, a);
       },
-      apply: (n, a, o) => {
-        const d = Reflect.apply(
-          n,
+      apply: (s, a, o) => {
+        const h = Reflect.apply(
+          s,
           a,
           o
         );
-        return this.isIteratorLike(d) ? d : this.wrapBoundValue(d, e);
+        return this.isIteratorLike(h) ? h : this.wrapBoundValue(h, e);
       },
-      construct: (n, a, o) => this.wrapBoundValue(
+      construct: (s, a, o) => this.wrapBoundValue(
         Reflect.construct(
-          n,
+          s,
           a,
           o
         ),
         e
       )
     });
-    return e.set(r, s), s;
+    return e.set(r, n), n;
   }
   /**
    * Proxy ラップ対象の値かどうかを判定します。
@@ -1066,8 +1096,8 @@ return (${t});`;
       ...i,
       descriptor: Object.getOwnPropertyDescriptor(i.target, i.property)
     })).filter((i) => i.descriptor?.configurable === !0);
-    r.forEach(({ target: i, property: s }) => {
-      Object.defineProperty(i, s, {
+    r.forEach(({ target: i, property: n }) => {
+      Object.defineProperty(i, n, {
         configurable: !0,
         enumerable: !1,
         get: () => {
@@ -1079,8 +1109,8 @@ return (${t});`;
     try {
       return t();
     } finally {
-      r.forEach(({ target: i, property: s, descriptor: n }) => {
-        n !== void 0 && Object.defineProperty(i, s, n);
+      r.forEach(({ target: i, property: n, descriptor: s }) => {
+        s !== void 0 && Object.defineProperty(i, n, s);
       });
     }
   }
@@ -1178,6 +1208,10 @@ M.FORBIDDEN_NAMES = [
   "constructor",
   "__proto__",
   "prototype"
+]), M.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
+  "get",
+  "set",
+  "async"
 ]), M.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
   "await",
   "break",
@@ -1214,33 +1248,33 @@ M.FORBIDDEN_NAMES = [
   "yield"
 ]), M.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
 let j = M;
-const C = class C {
+const I = class I {
   /**
    * フラグメントのコンストラクタ。
    *
    * @param target 対象ノード
    */
   constructor(t) {
-    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = t, C.FRAGMENT_CACHE.set(t, this);
+    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = t, I.FRAGMENT_CACHE.set(t, this);
   }
   static get(t) {
     if (t == null)
       return null;
-    if (C.FRAGMENT_CACHE.has(t))
-      return C.FRAGMENT_CACHE.get(t);
+    if (I.FRAGMENT_CACHE.has(t))
+      return I.FRAGMENT_CACHE.get(t);
     let e;
     switch (t.nodeType) {
       case Node.ELEMENT_NODE:
-        e = new R(t);
+        e = new x(t);
         break;
       case Node.TEXT_NODE:
         e = new H(t);
         break;
       case Node.COMMENT_NODE:
-        e = new z(t);
+        e = new Z(t);
         break;
       default:
-        return f.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
+        return d.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
     }
     return e;
   }
@@ -1262,7 +1296,7 @@ const C = class C {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return P.enqueue(() => {
+      return R.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode === t.getTarget() && t.getTarget().removeChild(this.target), this.mounted = !1;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1270,7 +1304,7 @@ const C = class C {
     } else {
       const t = this.target.parentNode;
       if (t)
-        return P.enqueue(() => {
+        return R.enqueue(() => {
           this.target.parentNode === t && t.removeChild(this.target), this.mounted = !1;
         });
       this.mounted = !1;
@@ -1287,7 +1321,7 @@ const C = class C {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return P.enqueue(() => {
+      return R.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode !== t.getTarget() && t.getTarget().appendChild(this.target), this.mounted = !0;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1318,7 +1352,7 @@ const C = class C {
    * @return 除去のPromise
    */
   remove(t = !0) {
-    return this.parent && this.parent.removeChild(this), C.FRAGMENT_CACHE.delete(this.target), t ? this.unmount() : Promise.resolve();
+    return this.parent && this.parent.removeChild(this), I.FRAGMENT_CACHE.delete(this.target), t ? this.unmount() : Promise.resolve();
   }
   /**
    * 対象ノードを取得します。
@@ -1345,9 +1379,9 @@ const C = class C {
     this.parent = t;
   }
 };
-C.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let T = C;
-class R extends T {
+I.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
+let T = I;
+class x extends T {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1396,7 +1430,7 @@ class R extends T {
    */
   getChildElementFragments() {
     return this.children.filter(
-      (t) => t instanceof R
+      (t) => t instanceof x
     );
   }
   /**
@@ -1417,7 +1451,7 @@ class R extends T {
   removeChild(t) {
     const e = this.children.indexOf(t);
     if (e < 0) {
-      f.warn("[Haori]", "Child fragment not found.", t);
+      d.warn("[Haori]", "Child fragment not found.", t);
       return;
     }
     this.children.splice(e, 1), t.setParent(null);
@@ -1428,7 +1462,7 @@ class R extends T {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new R(
+    const t = new x(
       this.target.cloneNode(!1)
     );
     return this.attributeMap.forEach((e, r) => {
@@ -1496,7 +1530,7 @@ class R extends T {
    */
   clearBindingDataCache() {
     this.bindingDataCache = null, this.children.forEach((t) => {
-      t instanceof R && t.clearBindingDataCache();
+      t instanceof x && t.clearBindingDataCache();
     });
   }
   /**
@@ -1564,18 +1598,18 @@ class R extends T {
       return Promise.resolve();
     const r = this.getTarget();
     if (r instanceof HTMLInputElement && (r.type === "checkbox" || r.type === "radio")) {
-      const i = this.getAttribute("value"), s = r.type === "checkbox" && i === "true";
-      let n;
-      return s ? n = t === !0 || t === "true" : i === "false" ? n = t === !1 : n = i === String(t), this.value = s ? n : n ? t : null, r.checked === n ? Promise.resolve() : (this.skipChangeValue = !0, P.enqueue(() => {
-        r.checked = n, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
+      const i = this.getAttribute("value"), n = r.type === "checkbox" && i === "true";
+      let s;
+      return n ? s = t === !0 || t === "true" : i === "false" ? s = t === !1 : s = i === String(t), this.value = n ? s : s ? t : null, r.checked === s ? Promise.resolve() : (this.skipChangeValue = !0, R.enqueue(() => {
+        r.checked = s, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
-    } else return r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement ? (this.value = t, this.skipChangeValue = !0, P.enqueue(() => {
+    } else return r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement ? (this.value = t, this.skipChangeValue = !0, R.enqueue(() => {
       r.value = t === null ? "" : String(t), e && ((r instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(r.type) || r instanceof HTMLTextAreaElement) && r.dispatchEvent(new Event("input", { bubbles: !0 })), r.dispatchEvent(new Event("change", { bubbles: !0 })));
     }).finally(() => {
       this.skipChangeValue = !1;
-    })) : (f.warn(
+    })) : (d.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
       r
@@ -1651,7 +1685,7 @@ class R extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const r = this.getTarget();
-    return P.enqueue(() => {
+    return R.enqueue(() => {
       r.removeAttribute(t), e !== t && r.removeAttribute(e);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1671,15 +1705,15 @@ class R extends T {
       return Promise.resolve();
     if (r === null)
       return t === e ? this.removeAttribute(t) : this.removeAliasedAttribute(t, e);
-    const s = new U(t, r);
-    this.attributeMap.set(t, s), this.skipMutationAttributes = !0;
-    const n = this.getTarget(), a = s.isForceEvaluation() ? r : this.getAttribute(t);
-    return P.enqueue(() => {
-      if (n.getAttribute(t) !== r && n.setAttribute(t, r), a === null || a === !1)
-        n.removeAttribute(e);
+    const n = new U(t, r);
+    this.attributeMap.set(t, n), this.skipMutationAttributes = !0;
+    const s = this.getTarget(), a = n.isForceEvaluation() ? r : this.getAttribute(t);
+    return R.enqueue(() => {
+      if (s.getAttribute(t) !== r && s.setAttribute(t, r), a === null || a === !1)
+        s.removeAttribute(e);
       else {
         const o = String(a);
-        n.getAttribute(e) !== o && n.setAttribute(e, o), i && s.isEvaluate && e === "value" && (n instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(n.type) || n instanceof HTMLTextAreaElement || n instanceof HTMLSelectElement) && (this.value = o, n.value !== o && (n.value = o));
+        s.getAttribute(e) !== o && s.setAttribute(e, o), i && n.isEvaluate && e === "value" && (s instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(s.type) || s instanceof HTMLTextAreaElement || s instanceof HTMLSelectElement) && (this.value = o, s.value !== o && (s.value = o));
       }
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1696,7 +1730,7 @@ class R extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const e = this.getTarget();
-    return P.enqueue(() => {
+    return R.enqueue(() => {
       e.removeAttribute(t);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1714,7 +1748,7 @@ class R extends T {
     if (e === void 0)
       return null;
     const r = e.evaluate(this.getBindingData());
-    return r.length === 1 ? r[0] : $.joinEvaluateResults(r);
+    return r.length === 1 ? r[0] : L.joinEvaluateResults(r);
   }
   /**
    * 属性の生の値を取得します。
@@ -1755,15 +1789,15 @@ class R extends T {
     if (r.parentNode !== this.target)
       return null;
     const i = e ? r.nextSibling : r;
-    let s = e ? r.nextSibling : r;
-    for (; s !== null; ) {
-      const n = T.get(s);
-      if (n !== null) {
-        const a = this.children.indexOf(n);
+    let n = e ? r.nextSibling : r;
+    for (; n !== null; ) {
+      const s = T.get(n);
+      if (s !== null) {
+        const a = this.children.indexOf(s);
         if (a !== -1)
           return { index: a, referenceNode: i };
       }
-      s = s.nextSibling;
+      n = n.nextSibling;
     }
     return { index: this.children.length, referenceNode: i };
   }
@@ -1779,29 +1813,29 @@ class R extends T {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (t === this)
-      return f.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
+      return d.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
     const i = /* @__PURE__ */ new Set();
-    let s = this.parent;
-    for (; s; )
-      i.add(s), s = s.getParent();
+    let n = this.parent;
+    for (; n; )
+      i.add(n), n = n.getParent();
     if (i.has(t))
-      return f.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
-    const n = t.getParent() === this;
+      return d.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
+    const s = t.getParent() === this;
     let a = -1, o = -1;
-    n && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
-    const d = t.getParent();
-    d !== null && d.removeChild(t);
+    s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
+    const h = t.getParent();
+    h !== null && h.removeChild(t);
     let m = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
     else {
       let E;
-      if (n ? a !== -1 && a < o ? E = o - 1 : E = o : E = this.children.indexOf(e), E === -1) {
+      if (s ? a !== -1 && a < o ? E = o - 1 : E = o : E = this.children.indexOf(e), E === -1) {
         const S = this.resolveInsertionPointFromDom(
           e,
           !1
         );
-        S === null ? (f.warn(
+        S === null ? (d.warn(
           "[Haori]",
           "Reference child not found in children.",
           e
@@ -1810,11 +1844,11 @@ class R extends T {
         this.children.splice(E, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const y = this.skipMutationNodes;
-    return this.skipMutationNodes = !0, P.enqueue(() => {
+    const b = this.skipMutationNodes;
+    return this.skipMutationNodes = !0, R.enqueue(() => {
       this.target.insertBefore(t.getTarget(), m);
     }).finally(() => {
-      this.skipMutationNodes = y;
+      this.skipMutationNodes = b;
     });
   }
   /**
@@ -1833,7 +1867,7 @@ class R extends T {
         e,
         !0
       );
-      return i === null ? (f.warn(
+      return i === null ? (d.warn(
         "[Haori]",
         "Reference child not found in children.",
         e
@@ -1885,7 +1919,7 @@ class R extends T {
    * @returns エレメントの非表示のPromise
    */
   hide() {
-    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${l.prefix}if-false`, ""), Promise.resolve();
+    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${u.prefix}if-false`, ""), Promise.resolve();
   }
   /**
    * エレメントを表示します。
@@ -1893,7 +1927,7 @@ class R extends T {
    * @return エレメントの表示のPromise
    */
   show() {
-    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${l.prefix}if-false`), this.visible = !0, Promise.resolve();
+    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${u.prefix}if-false`), this.visible = !0, Promise.resolve();
   }
   /**
    * 指定した属性名を持つ最も近い親要素を返します。
@@ -1917,7 +1951,7 @@ class H extends T {
    * @param target 対象テキストノード
    */
   constructor(t) {
-    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new $(this.text);
+    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new L(this.text);
   }
   /**
    * フラグメントをクローンします。
@@ -1943,7 +1977,7 @@ class H extends T {
    * @returns 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new $(t), this.evaluate());
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new L(t), this.evaluate());
   }
   /**
    * フラグメントを評価します。
@@ -1953,10 +1987,10 @@ class H extends T {
   evaluate() {
     return this.contents.isRawEvaluate && this.parent === null ? Promise.reject(
       new Error("Parent fragment is required for raw evaluation")
-    ) : P.enqueue(() => {
+    ) : R.enqueue(() => {
       this.skipMutation = !0, this.contents.isRawEvaluate ? this.parent.getTarget().innerHTML = this.contents.evaluate(
         this.parent.getBindingData()
-      )[0] : this.contents.isEvaluate ? this.target.textContent = $.joinEvaluateResults(
+      )[0] : this.contents.isEvaluate ? this.target.textContent = L.joinEvaluateResults(
         this.contents.evaluate(this.parent.getBindingData())
       ) : this.target.textContent = this.text;
     }).finally(() => {
@@ -1964,7 +1998,7 @@ class H extends T {
     });
   }
 }
-class z extends T {
+class Z extends T {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -1980,7 +2014,7 @@ class z extends T {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new z(this.target.cloneNode(!0));
+    const t = new Z(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t;
   }
   /**
@@ -1998,14 +2032,14 @@ class z extends T {
    * @return 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, P.enqueue(() => {
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, R.enqueue(() => {
       this.skipMutation = !0, this.target.textContent = this.text;
     }).finally(() => {
       this.skipMutation = !1;
     }));
   }
 }
-const G = class G {
+const K = class K {
   /**
    * コンストラクタ。
    *
@@ -2013,26 +2047,26 @@ const G = class G {
    */
   constructor(t) {
     this.contents = [], this.isEvaluate = !1, this.isRawEvaluate = !1, this.value = t;
-    const e = [...t.matchAll(G.PLACEHOLDER_REGEX)];
-    let r = 0, i = !1, s = !1;
-    for (const n of e) {
-      n.index > r && this.contents.push({
-        text: t.slice(r, n.index),
+    const e = [...t.matchAll(K.PLACEHOLDER_REGEX)];
+    let r = 0, i = !1, n = !1;
+    for (const s of e) {
+      s.index > r && this.contents.push({
+        text: t.slice(r, s.index),
         type: 0
         /* TEXT */
       });
       const a = {
-        text: n[1] ?? n[2],
-        type: n[1] ? 2 : 1
+        text: s[1] ?? s[2],
+        type: s[1] ? 2 : 1
         /* EXPRESSION */
       };
-      i = !0, s = s || a.type === 2, this.contents.push(a), r = n.index + n[0].length;
+      i = !0, n = n || a.type === 2, this.contents.push(a), r = s.index + s[0].length;
     }
     r < t.length && this.contents.push({
       text: t.slice(r),
       type: 0
       /* TEXT */
-    }), this.isEvaluate = i, this.isRawEvaluate = s, this.checkRawExpressions();
+    }), this.isEvaluate = i, this.isRawEvaluate = n, this.checkRawExpressions();
   }
   /**
    * 評価結果を結合して文字列にします。
@@ -2056,7 +2090,7 @@ const G = class G {
    */
   checkRawExpressions() {
     for (let t = 0; t < this.contents.length; t++)
-      this.contents[t].type === 2 && this.contents.length > 1 && (f.error(
+      this.contents[t].type === 2 && this.contents.length > 1 && (d.error(
         "[Haori]",
         "Raw expressions are not allowed in multi-content expressions."
       ), this.contents[t].type = 1);
@@ -2079,7 +2113,7 @@ const G = class G {
         } else
           e.push(r.text);
       } catch (i) {
-        f.error(
+        d.error(
           "[Haori]",
           `Error evaluating text expression: ${r.text}`,
           i
@@ -2088,9 +2122,9 @@ const G = class G {
     }), e;
   }
 };
-G.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let $ = G;
-const K = class K extends $ {
+K.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
+let L = K;
+const G = class G extends L {
   /**
    * コンストラクタ。
    *
@@ -2098,7 +2132,7 @@ const K = class K extends $ {
    * @param text 属性値
    */
   constructor(t, e) {
-    super(e), this.forceEvaluation = K.FORCE_EVALUATION_ATTRIBUTES.includes(t);
+    super(e), this.forceEvaluation = G.FORCE_EVALUATION_ATTRIBUTES.includes(t);
   }
   /**
    * 強制評価フラグを取得します。
@@ -2126,26 +2160,26 @@ const K = class K extends $ {
         } else
           e.push(r.text);
       } catch (i) {
-        f.error(
+        d.error(
           "[Haori]",
           `Error evaluating attribute expression: ${r.text}`,
           i
         ), e.push("");
       }
-    }), this.forceEvaluation && e.length > 1 ? (f.error(
+    }), this.forceEvaluation && e.length > 1 ? (d.error(
       "[Haori]",
       "each or if expressions must have a single content.",
       e
     ), [e[0]]) : e;
   }
 };
-K.FORCE_EVALUATION_ATTRIBUTES = [
+G.FORCE_EVALUATION_ATTRIBUTES = [
   "data-if",
   "hor-if",
   "data-each",
   "hor-each"
 ];
-let U = K;
+let U = G;
 class w {
   /**
    * カスタムイベントを発火します。
@@ -2156,13 +2190,13 @@ class w {
    * @param options イベントオプション
    */
   static dispatch(t, e, r, i) {
-    const s = new CustomEvent(`haori:${e}`, {
+    const n = new CustomEvent(`haori:${e}`, {
       bubbles: i?.bubbles ?? !0,
       cancelable: i?.cancelable ?? !1,
       composed: i?.composed ?? !0,
       detail: r
     });
-    return t.dispatchEvent(s);
+    return t.dispatchEvent(n);
   }
   /**
    * readyイベントを発火します。
@@ -2226,15 +2260,15 @@ class w {
    * @param reason 変更理由
    */
   static bindChange(t, e, r, i = "other") {
-    const s = [], n = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...n, ...a]);
-    for (const d of o) {
-      const m = e?.[d], y = r[d];
-      m !== y && s.push(d);
+    const n = [], s = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...s, ...a]);
+    for (const h of o) {
+      const m = e?.[h], b = r[h];
+      m !== b && n.push(h);
     }
     w.dispatch(t, "bindchange", {
       previous: e || {},
       next: r,
-      changedKeys: s,
+      changedKeys: n,
       reason: i
     });
   }
@@ -2312,13 +2346,13 @@ class w {
     * @param metadata runtime とメソッド変換情報。
     * @return 戻り値はありません。
    */
-  static fetchStart(t, e, r, i, s) {
+  static fetchStart(t, e, r, i, n) {
     w.dispatch(t, "fetchstart", {
       url: e,
       options: r || {},
       payload: i,
       startedAt: performance.now(),
-      ...s
+      ...n
     });
   }
   /**
@@ -2345,44 +2379,44 @@ class w {
    * @param status HTTPステータス（存在する場合）
    * @param startedAt 開始時刻（存在する場合）
    */
-  static fetchError(t, e, r, i, s) {
+  static fetchError(t, e, r, i, n) {
     w.dispatch(t, "fetcherror", {
       url: e,
       status: i,
       error: r,
-      durationMs: s ? performance.now() - s : void 0
+      durationMs: n ? performance.now() - n : void 0
     });
   }
 }
-const st = [
+const at = [
   "addErrorMessage",
   "closeDialog",
   "confirm",
   "dialog",
   "openDialog",
   "toast"
-];
+], ot = "__haoriHistoryState__";
 function W() {
   const t = globalThis.window?.Haori;
-  return st.every(
+  return at.every(
     (r) => typeof t?.[r] == "function"
   ) ? t : X;
 }
-const nt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
-function at(F) {
-  return nt.has(F.toUpperCase());
+const lt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
+function ut(F) {
+  return lt.has(F.toUpperCase());
 }
-function ot(F, t) {
+function ct(F, t) {
   for (const [e, r] of Object.entries(t))
     r !== void 0 && (r === null ? F.append(e, "") : Array.isArray(r) ? r.forEach((i) => {
       F.append(e, String(i));
     }) : typeof r == "object" || typeof r == "function" ? F.append(e, JSON.stringify(r)) : F.append(e, String(r)));
 }
-function lt(F, t) {
+function ht(F, t) {
   const e = new URL(F, window.location.href), r = new URLSearchParams(e.search);
-  return ot(r, t), e.search = r.toString(), e.toString();
+  return ct(r, t), e.search = r.toString(), e.toString();
 }
-const c = class c {
+const l = class l {
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -2391,7 +2425,7 @@ const c = class c {
    * 非イベント変種が "data-fetch-xxx" として存在するものについては、event が null の場合にそちらを返します。
    */
   static attrName(t, e, r = !1) {
-    return t ? `${l.prefix}${t}-${e}` : r ? `${l.prefix}fetch-${e}` : `${l.prefix}${e}`;
+    return t ? `${u.prefix}${t}-${e}` : r ? `${u.prefix}fetch-${e}` : `${u.prefix}${e}`;
   }
   /**
    * data 属性のテンプレート式評価結果を URLSearchParams 向けに組み立てます。
@@ -2402,13 +2436,13 @@ const c = class c {
    */
   static resolveDataParamString(t, e) {
     return t.replace(
-      c.DATA_PLACEHOLDER_REGEX,
-      (r, i, s) => {
-        const n = j.evaluate(
-          i ?? s ?? "",
+      l.DATA_PLACEHOLDER_REGEX,
+      (r, i, n) => {
+        const s = j.evaluate(
+          i ?? n ?? "",
           e
         );
-        return n == null || Number.isNaN(n) ? "" : encodeURIComponent(typeof n == "object" ? JSON.stringify(n) : String(n));
+        return s == null || Number.isNaN(s) ? "" : encodeURIComponent(typeof s == "object" ? JSON.stringify(s) : String(s));
       }
     );
   }
@@ -2421,17 +2455,17 @@ const c = class c {
    */
   static isJsonStringContext(t, e) {
     let r = !1, i = !1;
-    for (let s = 0; s < e; s += 1) {
-      const n = t[s];
+    for (let n = 0; n < e; n += 1) {
+      const s = t[n];
       if (i) {
         i = !1;
         continue;
       }
-      if (n === "\\") {
+      if (s === "\\") {
         i = !0;
         continue;
       }
-      n === '"' && (r = !r);
+      s === '"' && (r = !r);
     }
     return r;
   }
@@ -2459,7 +2493,7 @@ const c = class c {
   static stringifyJsonTemplateStringContent(t) {
     if (t == null || Number.isNaN(t))
       return "";
-    const e = typeof t == "object" ? c.stringifyJsonTemplateValue(t) : String(t);
+    const e = typeof t == "object" ? l.stringifyJsonTemplateValue(t) : String(t);
     return JSON.stringify(e).slice(1, -1);
   }
   /**
@@ -2471,13 +2505,13 @@ const c = class c {
    */
   static resolveDataJsonString(t, e) {
     return t.replace(
-      c.DATA_PLACEHOLDER_REGEX,
-      (r, i, s, n) => {
+      l.DATA_PLACEHOLDER_REGEX,
+      (r, i, n, s) => {
         const a = j.evaluate(
-          i ?? s ?? "",
+          i ?? n ?? "",
           e
         );
-        return c.isJsonStringContext(t, n) ? c.stringifyJsonTemplateStringContent(a) : c.stringifyJsonTemplateValue(a);
+        return l.isJsonStringContext(t, s) ? l.stringifyJsonTemplateStringContent(a) : l.stringifyJsonTemplateValue(a);
       }
     );
   }
@@ -2494,14 +2528,14 @@ const c = class c {
       return i;
     if (typeof i != "string" || r === null)
       return null;
-    const s = r.trim();
-    return c.SINGLE_PLACEHOLDER_REGEX.test(s) ? x.parseDataBind(i) : s.startsWith("{") || s.startsWith("[") ? x.parseDataBind(
-      c.resolveDataJsonString(
+    const n = r.trim();
+    return l.SINGLE_PLACEHOLDER_REGEX.test(n) ? P.parseDataBind(i) : n.startsWith("{") || n.startsWith("[") ? P.parseDataBind(
+      l.resolveDataJsonString(
         r,
         t.getBindingData()
       )
-    ) : x.parseDataBind(
-      c.resolveDataParamString(r, t.getBindingData())
+    ) : P.parseDataBind(
+      l.resolveDataParamString(r, t.getBindingData())
     );
   }
   /**
@@ -2516,30 +2550,30 @@ const c = class c {
       targetFragment: t
     };
     if (e) {
-      if (t.hasAttribute(c.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(c.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
-        c.attrName(e, "confirm")
+      if (t.hasAttribute(l.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(l.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
+        l.attrName(e, "confirm")
       ).replace(/\\n/g, `
-`)), t.hasAttribute(c.attrName(e, "data")) && (r.data = c.resolveDataAttribute(
+`)), t.hasAttribute(l.attrName(e, "data")) && (r.data = l.resolveDataAttribute(
         t,
-        c.attrName(e, "data")
-      )), t.hasAttribute(c.attrName(e, "form"))) {
-        const u = t.getRawAttribute(
-          c.attrName(e, "form")
+        l.attrName(e, "data")
+      )), t.hasAttribute(l.attrName(e, "form"))) {
+        const c = t.getRawAttribute(
+          l.attrName(e, "form")
         );
-        if (u) {
-          const h = document.body.querySelector(u);
-          h !== null ? r.formFragment = b.getFormFragment(
-            T.get(h)
-          ) : f.error(
+        if (c) {
+          const f = document.body.querySelector(c);
+          f !== null ? r.formFragment = y.getFormFragment(
+            T.get(f)
+          ) : d.error(
             "Haori",
-            `Form element not found: ${u} (${c.attrName(e, "form")})`
+            `Form element not found: ${c} (${l.attrName(e, "form")})`
           );
         } else
-          r.formFragment = b.getFormFragment(t);
-      } else e === "change" && (r.formFragment = b.getFormFragment(t));
-      if (t.hasAttribute(`${l.prefix}${e}-before-run`)) {
-        const u = t.getRawAttribute(
-          `${l.prefix}${e}-before-run`
+          r.formFragment = y.getFormFragment(t);
+      } else e === "change" && (r.formFragment = y.getFormFragment(t));
+      if (t.hasAttribute(`${u.prefix}${e}-before-run`)) {
+        const c = t.getRawAttribute(
+          `${u.prefix}${e}-before-run`
         );
         try {
           r.beforeCallback = new Function(
@@ -2547,214 +2581,216 @@ const c = class c {
             "fetchOptions",
             `
 "use strict";
-${u}
+${c}
 `
           );
-        } catch (h) {
-          f.error("Haori", `Invalid before script: ${h}`);
+        } catch (f) {
+          d.error("Haori", `Invalid before script: ${f}`);
         }
       }
     }
-    const i = c.attrName(e, "fetch"), s = t.hasAttribute(i);
-    s && (r.fetchUrl = t.getAttribute(i));
-    const n = {};
+    const i = l.attrName(e, "fetch"), n = t.hasAttribute(i);
+    n && (r.fetchUrl = t.getAttribute(i));
+    const s = {};
     if (e) {
-      const u = c.attrName(e, "fetch-method");
-      t.hasAttribute(u) && (n.method = t.getAttribute(
-        u
+      const c = l.attrName(e, "fetch-method");
+      t.hasAttribute(c) && (s.method = t.getAttribute(
+        c
       ));
     } else {
-      const u = c.attrName(null, "method", !0);
-      t.hasAttribute(u) && (n.method = t.getAttribute(
-        u
+      const c = l.attrName(null, "method", !0);
+      t.hasAttribute(c) && (s.method = t.getAttribute(
+        c
       ));
     }
     if (e) {
-      const u = c.attrName(e, "fetch-headers");
-      if (t.hasAttribute(u)) {
-        const h = t.getRawAttribute(
-          u
+      const c = l.attrName(e, "fetch-headers");
+      if (t.hasAttribute(c)) {
+        const f = t.getRawAttribute(
+          c
         );
         try {
-          n.headers = x.parseDataBind(h);
+          s.headers = P.parseDataBind(f);
         } catch (g) {
-          f.error("Haori", `Invalid fetch headers: ${g}`);
+          d.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     } else {
-      const u = c.attrName(
+      const c = l.attrName(
         null,
         "headers",
         !0
       );
-      if (t.hasAttribute(u)) {
-        const h = t.getRawAttribute(
-          u
+      if (t.hasAttribute(c)) {
+        const f = t.getRawAttribute(
+          c
         );
         try {
-          n.headers = x.parseDataBind(h);
+          s.headers = P.parseDataBind(f);
         } catch (g) {
-          f.error("Haori", `Invalid fetch headers: ${g}`);
+          d.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     }
     if (e) {
-      const u = c.attrName(
+      const c = l.attrName(
         e,
         "fetch-content-type"
       );
-      if (t.hasAttribute(u))
-        n.headers = {
-          ...n.headers,
-          "Content-Type": t.getAttribute(u)
+      if (t.hasAttribute(c))
+        s.headers = {
+          ...s.headers,
+          "Content-Type": t.getAttribute(c)
         };
-      else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let h = !1;
-        n.headers && typeof n.headers == "object" && (h = "Content-Type" in n.headers), h || (n.headers = {
-          ...n.headers,
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
+        let f = !1;
+        s.headers && typeof s.headers == "object" && (f = "Content-Type" in s.headers), f || (s.headers = {
+          ...s.headers,
           "Content-Type": "application/json"
         });
-      } else n.method && (n.method === "GET" || n.method === "HEAD" || n.method === "OPTIONS") && (n.headers = {
-        ...n.headers,
+      } else s.method && (s.method === "GET" || s.method === "HEAD" || s.method === "OPTIONS") && (s.headers = {
+        ...s.headers,
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const u = c.attrName(
+      const c = l.attrName(
         null,
         "content-type",
         !0
       );
-      if (t.hasAttribute(u))
-        n.headers = {
-          ...n.headers,
-          "Content-Type": t.getAttribute(u)
+      if (t.hasAttribute(c))
+        s.headers = {
+          ...s.headers,
+          "Content-Type": t.getAttribute(c)
         };
-      else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let h = !1;
-        n.headers && typeof n.headers == "object" && (h = "Content-Type" in n.headers), h || (n.headers = {
-          ...n.headers,
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
+        let f = !1;
+        s.headers && typeof s.headers == "object" && (f = "Content-Type" in s.headers), f || (s.headers = {
+          ...s.headers,
           "Content-Type": "application/json"
         });
-      } else n.method && (n.method === "GET" || n.method === "HEAD" || n.method === "OPTIONS") && (n.headers = {
-        ...n.headers,
+      } else s.method && (s.method === "GET" || s.method === "HEAD" || s.method === "OPTIONS") && (s.headers = {
+        ...s.headers,
         "Content-Type": "application/x-www-form-urlencoded"
       });
     }
-    Object.keys(n).length > 0 && (r.fetchOptions = n);
-    const a = e ? c.attrName(e, "bind") : c.attrName(null, "bind", !0);
+    Object.keys(s).length > 0 && (r.fetchOptions = s);
+    const a = e ? l.attrName(e, "bind") : l.attrName(null, "bind", !0);
     if (t.hasAttribute(a)) {
-      const u = t.getRawAttribute(a);
-      if (u) {
-        const h = document.body.querySelectorAll(u);
-        h.length > 0 ? (r.bindFragments = [], h.forEach((g) => {
+      const c = t.getRawAttribute(a);
+      if (c) {
+        const f = document.body.querySelectorAll(c);
+        f.length > 0 ? (r.bindFragments = [], f.forEach((g) => {
           const A = T.get(g);
           A && r.bindFragments.push(A);
-        })) : f.error(
+        })) : d.error(
           "Haori",
-          `Bind element not found: ${u} (${a})`
+          `Bind element not found: ${c} (${a})`
         );
       }
     }
-    const o = c.attrName(e, "bind-arg"), d = c.attrName(
+    const o = l.attrName(e, "bind-arg"), h = l.attrName(
       null,
       "arg",
       !0
-    ), m = c.attrName(
+    ), m = l.attrName(
       null,
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(d) ? r.bindArg = t.getRawAttribute(
-      d
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(h) ? r.bindArg = t.getRawAttribute(
+      h
     ) : t.hasAttribute(m) && (r.bindArg = t.getRawAttribute(m));
-    const y = e ? c.attrName(e, "bind-params") : c.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(y)) {
-      const u = t.getRawAttribute(y);
-      r.bindParams = u.split("&").map((h) => h.trim());
+    const b = e ? l.attrName(e, "bind-params") : l.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(b)) {
+      const c = t.getRawAttribute(b);
+      r.bindParams = c.split("&").map((f) => f.trim());
     }
-    const E = e ? c.attrName(e, "bind-append") : c.attrName(null, "bind-append", !0);
+    const E = e ? l.attrName(e, "bind-append") : l.attrName(null, "bind-append", !0);
     if (t.hasAttribute(E)) {
-      const u = t.getRawAttribute(E);
-      r.bindAppendParams = u.split("&").map((h) => h.trim()).filter(Boolean);
+      const c = t.getRawAttribute(E);
+      r.bindAppendParams = c.split("&").map((f) => f.trim()).filter(Boolean);
     }
-    const S = e ? c.attrName(e, "copy-params") : null;
+    const S = e ? l.attrName(e, "copy-params") : null;
     if (S && t.hasAttribute(S)) {
-      const u = t.getRawAttribute(
+      const c = t.getRawAttribute(
         S
       );
-      r.copyParams = u.split("&").map((h) => h.trim()).filter(Boolean);
+      r.copyParams = c.split("&").map((f) => f.trim()).filter(Boolean);
     }
     if (e) {
-      if (t.hasAttribute(c.attrName(e, "adjust"))) {
-        const h = t.getRawAttribute(
-          c.attrName(e, "adjust")
+      if (t.hasAttribute(l.attrName(e, "adjust"))) {
+        const f = t.getRawAttribute(
+          l.attrName(e, "adjust")
         );
-        if (h) {
-          const g = document.body.querySelectorAll(h);
+        if (f) {
+          const g = document.body.querySelectorAll(f);
           g.length > 0 ? (r.adjustFragments = [], g.forEach((A) => {
             const v = T.get(A);
             v && r.adjustFragments.push(v);
-          })) : f.error(
+          })) : d.error(
             "Haori",
-            `Adjust element not found: ${h} (${c.attrName(e, "adjust")})`
+            `Adjust element not found: ${f} (${l.attrName(e, "adjust")})`
           );
         }
-        if (t.hasAttribute(c.attrName(e, "adjust-value"))) {
+        if (t.hasAttribute(l.attrName(e, "adjust-value"))) {
           const g = t.getRawAttribute(
-            c.attrName(e, "adjust-value")
+            l.attrName(e, "adjust-value")
           ), A = Number(g);
           isNaN(A) || (r.adjustValue = A);
         }
       }
-      if (t.hasAttribute(c.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(c.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(c.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(c.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${l.prefix}${e}-after-run`)) {
-        const h = t.getRawAttribute(
-          `${l.prefix}${e}-after-run`
+      if (t.hasAttribute(l.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(l.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(l.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(l.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${u.prefix}${e}-after-run`)) {
+        const f = t.getRawAttribute(
+          `${u.prefix}${e}-after-run`
         );
         try {
           r.afterCallback = new Function(
             "response",
             `
 "use strict";
-${h}
+${f}
 `
           );
         } catch (g) {
-          f.error("Haori", `Invalid after script: ${g}`);
+          d.error("Haori", `Invalid after script: ${g}`);
         }
       }
-      if (t.hasAttribute(c.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
-        c.attrName(e, "dialog")
+      if (t.hasAttribute(l.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
+        l.attrName(e, "dialog")
       ).replace(/\\n/g, `
-`)), t.hasAttribute(c.attrName(e, "toast"))) {
+`)), t.hasAttribute(l.attrName(e, "toast"))) {
         r.toastMessage = t.getAttribute(
-          c.attrName(e, "toast")
+          l.attrName(e, "toast")
         );
-        const h = t.getRawAttribute(
-          c.attrName(e, "toast-level")
-        ), A = ["info", "warning", "error", "success"].includes(h);
-        r.toastLevel = A ? h : null;
+        const f = t.getRawAttribute(
+          l.attrName(e, "toast-level")
+        ), A = ["info", "warning", "error", "success"].includes(f);
+        r.toastLevel = A ? f : null;
       }
-      if (t.hasAttribute(c.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
-        c.attrName(e, "redirect")
-      )), t.hasAttribute(c.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
-        c.attrName(e, "history")
-      )), t.hasAttribute(c.attrName(e, "history-data")) && (r.historyData = c.resolveDataAttribute(
+      if (t.hasAttribute(l.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
+        l.attrName(e, "redirect")
+      )), t.hasAttribute(l.attrName(e, "scroll-error")) && (r.scrollOnError = !0), t.hasAttribute(l.attrName(e, "scroll")) && (r.scrollTarget = t.getAttribute(
+        l.attrName(e, "scroll")
+      )), t.hasAttribute(l.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
+        l.attrName(e, "history")
+      )), t.hasAttribute(l.attrName(e, "history-data")) && (r.historyData = l.resolveDataAttribute(
         t,
-        c.attrName(e, "history-data")
-      )), t.hasAttribute(c.attrName(e, "history-form"))) {
-        const h = t.getRawAttribute(
-          c.attrName(e, "history-form")
+        l.attrName(e, "history-data")
+      )), t.hasAttribute(l.attrName(e, "history-form"))) {
+        const f = t.getRawAttribute(
+          l.attrName(e, "history-form")
         );
-        if (h) {
-          const g = document.body.querySelector(h);
-          g !== null ? r.historyFormFragment = b.getFormFragment(
+        if (f) {
+          const g = document.body.querySelector(f);
+          g !== null ? r.historyFormFragment = y.getFormFragment(
             T.get(g)
-          ) : f.error(
+          ) : d.error(
             "Haori",
-            `Form element not found: ${h} (${c.attrName(e, "history-form")})`
+            `Form element not found: ${f} (${l.attrName(e, "history-form")})`
           );
         } else
-          r.historyFormFragment = b.getFormFragment(t);
+          r.historyFormFragment = y.getFormFragment(t);
       }
       [
         "reset",
@@ -2763,16 +2799,16 @@ ${h}
         "copy",
         "open",
         "close"
-      ].forEach((h) => {
-        const g = c.attrName(e, h);
+      ].forEach((f) => {
+        const g = l.attrName(e, f);
         if (!t.hasAttribute(g))
           return;
         const A = t.getRawAttribute(g), v = [];
         if (A ? (document.body.querySelectorAll(A).forEach((J) => {
-          const Z = T.get(J);
-          Z && v.push(Z);
-        }), v.length === 0 && f.error("Haori", `Element not found: ${A} (${g})`)) : v.push(t), v.length > 0)
-          switch (h) {
+          const tt = T.get(J);
+          tt && v.push(tt);
+        }), v.length === 0 && d.error("Haori", `Element not found: ${A} (${g})`)) : v.push(t), v.length > 0)
+          switch (f) {
             case "reset":
               r.resetFragments = v;
               break;
@@ -2794,25 +2830,25 @@ ${h}
           }
       });
     }
-    if (!e && (t.hasAttribute(c.attrName(null, "data", !0)) && (r.data = c.resolveDataAttribute(
+    if (!e && (t.hasAttribute(l.attrName(null, "data", !0)) && (r.data = l.resolveDataAttribute(
       t,
-      c.attrName(null, "data", !0)
-    )), t.hasAttribute(c.attrName(null, "form", !0)))) {
-      const u = t.getRawAttribute(
-        c.attrName(null, "form", !0)
+      l.attrName(null, "data", !0)
+    )), t.hasAttribute(l.attrName(null, "form", !0)))) {
+      const c = t.getRawAttribute(
+        l.attrName(null, "form", !0)
       );
-      if (u) {
-        const h = document.body.querySelector(u);
-        h !== null ? r.formFragment = b.getFormFragment(
-          T.get(h)
-        ) : f.error(
+      if (c) {
+        const f = document.body.querySelector(c);
+        f !== null ? r.formFragment = y.getFormFragment(
+          T.get(f)
+        ) : d.error(
           "Haori",
-          `Form element not found: ${u} (${c.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${c} (${l.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = b.getFormFragment(t);
+        r.formFragment = y.getFormFragment(t);
     }
-    return s && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
+    return n && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
   }
   /**
    * ElementFragment の構造的タイプガード。
@@ -2833,7 +2869,7 @@ ${h}
    * @param arg2 イベント名
    */
   constructor(t, e = null) {
-    c.isElementFragment(t) ? this.options = c.buildOptions(t, e) : this.options = t;
+    l.isElementFragment(t) ? this.options = l.buildOptions(t, e) : this.options = t;
   }
   /**
    * 一連の処理を実行します。オプションが空の場合は即座にresolveされます。
@@ -2874,61 +2910,61 @@ ${h}
     }
     const i = {};
     if (this.options.formFragment) {
-      const o = b.getValues(this.options.formFragment);
+      const o = y.getValues(this.options.formFragment);
       Object.assign(i, o);
     }
     this.options.data && typeof this.options.data == "object" && Object.assign(i, this.options.data);
-    const s = Object.keys(i).length > 0;
+    const n = Object.keys(i).length > 0;
     if (e) {
-      const o = { ...r || {} }, d = new Headers(
+      const o = { ...r || {} }, h = new Headers(
         o.headers || void 0
-      ), m = (o.method || "GET").toUpperCase(), y = l.runtime === "demo" && !at(m), E = y ? "GET" : m;
+      ), m = (o.method || "GET").toUpperCase(), b = u.runtime === "demo" && !ut(m), E = b ? "GET" : m;
       if (o.method = E, E === "GET" || E === "HEAD" || E === "OPTIONS")
-        s && (e = lt(e, i));
-      else if (s) {
-        const u = d.get("Content-Type") || "";
-        if (/multipart\/form-data/i.test(u)) {
-          d.delete("Content-Type");
-          const h = new FormData();
+        n && (e = ht(e, i));
+      else if (n) {
+        const c = h.get("Content-Type") || "";
+        if (/multipart\/form-data/i.test(c)) {
+          h.delete("Content-Type");
+          const f = new FormData();
           for (const [g, A] of Object.entries(i))
-            A == null ? h.append(g, "") : A instanceof Blob ? h.append(g, A) : Array.isArray(A) ? A.forEach((v) => h.append(g, String(v))) : typeof A == "object" ? h.append(g, JSON.stringify(A)) : h.append(g, String(A));
-          o.body = h;
-        } else if (/application\/x-www-form-urlencoded/i.test(u)) {
-          const h = new URLSearchParams();
+            A == null ? f.append(g, "") : A instanceof Blob ? f.append(g, A) : Array.isArray(A) ? A.forEach((v) => f.append(g, String(v))) : typeof A == "object" ? f.append(g, JSON.stringify(A)) : f.append(g, String(A));
+          o.body = f;
+        } else if (/application\/x-www-form-urlencoded/i.test(c)) {
+          const f = new URLSearchParams();
           for (const [g, A] of Object.entries(i))
-            A !== void 0 && (A === null ? h.append(g, "") : Array.isArray(A) ? A.forEach((v) => h.append(g, String(v))) : typeof A == "object" ? h.append(g, JSON.stringify(A)) : h.append(g, String(A)));
-          o.body = h;
+            A !== void 0 && (A === null ? f.append(g, "") : Array.isArray(A) ? A.forEach((v) => f.append(g, String(v))) : typeof A == "object" ? f.append(g, JSON.stringify(A)) : f.append(g, String(A)));
+          o.body = f;
         } else
-          d.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
+          h.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
       }
-      o.headers = d;
+      o.headers = h;
       let S;
-      if (y && (S = e && new URL(e, window.location.href).search || void 0, d.delete("Content-Type"), f.info("Haori demo fetch normalization", {
-        runtime: l.runtime,
+      if (b && (S = e && new URL(e, window.location.href).search || void 0, h.delete("Content-Type"), d.info("Haori demo fetch normalization", {
+        runtime: u.runtime,
         requestedMethod: m,
         effectiveMethod: E,
         transportMode: "query-get",
         url: e,
-        payload: s ? i : void 0,
+        payload: n ? i : void 0,
         queryString: S
       })), this.options.targetFragment && e) {
-        const u = performance.now(), h = {
-          runtime: l.runtime,
+        const c = performance.now(), f = {
+          runtime: u.runtime,
           requestedMethod: m,
           effectiveMethod: E,
-          transportMode: y ? "query-get" : "http",
-          ...y ? { queryString: S } : {}
+          transportMode: b ? "query-get" : "http",
+          ...b ? { queryString: S } : {}
         };
         return w.fetchStart(
           this.options.targetFragment.getTarget(),
           e,
           o,
-          s ? i : void 0,
-          h
+          n ? i : void 0,
+          f
         ), fetch(e, o).then((g) => this.handleFetchResult(
           g,
           e || void 0,
-          u
+          c
         )).catch((g) => {
           throw e && w.fetchError(
             this.options.targetFragment.getTarget(),
@@ -2937,18 +2973,18 @@ ${h}
           ), g;
         });
       }
-      return fetch(e, o).then((u) => this.handleFetchResult(u, e || void 0));
+      return fetch(e, o).then((c) => this.handleFetchResult(c, e || void 0));
     }
-    if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && s) {
-      const o = this.options.formFragment, d = o.getTarget();
-      d.setAttribute(
-        `${l.prefix}bind`,
+    if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && n) {
+      const o = this.options.formFragment, h = o.getTarget();
+      h.setAttribute(
+        `${u.prefix}bind`,
         JSON.stringify(i)
       );
       const m = o.getBindingData();
-      Object.assign(m, i), await x.setBindingData(d, m);
+      Object.assign(m, i), await P.setBindingData(h, m);
     }
-    const n = s ? i : {}, a = new Response(JSON.stringify(n), {
+    const s = n ? i : {}, a = new Response(JSON.stringify(s), {
       headers: { "Content-Type": "application/json" }
     });
     return this.handleFetchResult(a);
@@ -2979,13 +3015,13 @@ ${h}
         typeof a == "object" && "response" in a && (t = "response" in a ? a.response : t);
       }
     }
-    const s = [];
-    s.push(this.bindResult(t)), s.push(this.adjust()), s.push(this.addRow()), s.push(this.removeRow()), s.push(this.movePrevRow()), s.push(this.moveNextRow()), await Promise.all(s), this.options.resetFragments && this.options.resetFragments.length > 0 && await Promise.all(
-      this.options.resetFragments.map((a) => b.reset(a))
-    ), await this.copy();
     const n = [];
+    n.push(this.bindResult(t)), n.push(this.adjust()), n.push(this.addRow()), n.push(this.removeRow()), n.push(this.movePrevRow()), n.push(this.moveNextRow()), await Promise.all(n), this.options.resetFragments && this.options.resetFragments.length > 0 && await Promise.all(
+      this.options.resetFragments.map((a) => y.reset(a))
+    ), await this.copy();
+    const s = [];
     return this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((a) => {
-      n.push(new c(a, null).run());
+      s.push(new l(a, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((a) => {
       const o = a.getTarget();
       typeof o.click == "function" ? o.click() : o.dispatchEvent(
@@ -2993,14 +3029,14 @@ ${h}
       );
     }), this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((a) => {
       const o = a.getTarget();
-      o instanceof HTMLElement ? n.push(i.openDialog(o)) : f.error("Haori", "Element is not an HTML element: ", o);
+      o instanceof HTMLElement ? s.push(i.openDialog(o)) : d.error("Haori", "Element is not an HTML element: ", o);
     }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((a) => {
       const o = a.getTarget();
-      o instanceof HTMLElement ? n.push(i.closeDialog(o)) : f.error("Haori", "Element is not an HTML element: ", o);
-    }), await Promise.all(n), this.options.dialogMessage && await i.dialog(this.options.dialogMessage), this.options.toastMessage && await i.toast(
+      o instanceof HTMLElement ? s.push(i.closeDialog(o)) : d.error("Haori", "Element is not an HTML element: ", o);
+    }), await Promise.all(s), this.options.dialogMessage && await i.dialog(this.options.dialogMessage), this.options.toastMessage && await i.toast(
       this.options.toastMessage,
       this.options.toastLevel ?? "info"
-    ), this.pushHistory(), this.options.redirectUrl && (window.location.href = this.options.redirectUrl), !0;
+    ), this.pushHistory(), this.options.scrollTarget && document.querySelector(this.options.scrollTarget)?.scrollIntoView({ behavior: "smooth", block: "nearest" }), this.options.redirectUrl && (window.location.href = this.options.redirectUrl), !0;
   }
   /**
    * history.pushState を実行します。
@@ -3013,26 +3049,30 @@ ${h}
     const t = this.options.historyUrl !== void 0 && this.options.historyUrl !== null, e = this.options.historyData !== void 0 && this.options.historyData !== null, r = this.options.historyFormFragment !== void 0 && this.options.historyFormFragment !== null;
     if (!(!t && !e && !r))
       try {
-        const i = t ? this.options.historyUrl : window.location.pathname, s = new URL(i, window.location.href);
-        if (s.origin !== window.location.origin) {
-          const a = "history.pushState: cross-origin URL is not allowed: " + s.toString();
-          f.error(
+        const i = t ? this.options.historyUrl : window.location.pathname, n = new URL(i, window.location.href);
+        if (n.origin !== window.location.origin) {
+          const a = "history.pushState: cross-origin URL is not allowed: " + n.toString();
+          d.error(
             "Haori",
             a
           );
           return;
         }
-        const n = (a) => {
-          for (const [o, d] of Object.entries(a))
-            d != null && (Array.isArray(d) ? d.forEach((m) => s.searchParams.append(o, String(m))) : typeof d == "object" ? s.searchParams.set(o, JSON.stringify(d)) : s.searchParams.set(o, String(d)));
+        const s = (a) => {
+          for (const [o, h] of Object.entries(a))
+            h != null && (Array.isArray(h) ? h.forEach((m) => n.searchParams.append(o, String(m))) : typeof h == "object" ? n.searchParams.set(o, JSON.stringify(h)) : n.searchParams.set(o, String(h)));
         };
-        e && n(this.options.historyData), r && n(
-          b.getValues(
+        e && s(this.options.historyData), r && s(
+          y.getValues(
             this.options.historyFormFragment
           )
-        ), history.pushState({}, "", s.toString());
+        ), history.pushState(
+          { [ot]: !0 },
+          "",
+          n.toString()
+        );
       } catch (i) {
-        f.error("Haori", `history.pushState failed: ${i}`);
+        d.error("Haori", `history.pushState failed: ${i}`);
       }
   }
   /**
@@ -3040,32 +3080,37 @@ ${h}
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = b.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = y.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (s) => {
-      const n = e ? e.getTarget() : document.body;
-      await W().addErrorMessage(n, s);
+      const a = e ? e.getTarget() : document.body;
+      await W().addErrorMessage(a, s);
+    }, i = () => {
+      if (!this.options.scrollOnError)
+        return;
+      const s = e ? e.getTarget() : document.body;
+      (s.getAttribute("data-message-level") === "error" ? s : s.parentElement?.getAttribute("data-message-level") === "error" ? s.parentElement : s.querySelector('[data-message-level="error"]'))?.scrollIntoView({ behavior: "smooth", block: "nearest" });
     };
     if ((t.headers.get("Content-Type") || "").includes("application/json"))
       try {
-        const s = await t.json(), n = [];
+        const s = await t.json(), a = [];
         if (s && typeof s == "object") {
-          if (typeof s.message == "string" && n.push({ message: s.message }), Array.isArray(s.messages))
-            for (const a of s.messages)
-              typeof a == "string" && n.push({ message: a });
+          if (typeof s.message == "string" && a.push({ message: s.message }), Array.isArray(s.messages))
+            for (const o of s.messages)
+              typeof o == "string" && a.push({ message: o });
           if (s.errors && typeof s.errors == "object")
-            for (const [a, o] of Object.entries(s.errors))
-              Array.isArray(o) ? n.push({ key: a, message: o.join(`
-`) }) : typeof o == "string" ? n.push({ key: a, message: o }) : o != null && n.push({ key: a, message: String(o) });
-          if (n.length === 0)
-            for (const [a, o] of Object.entries(s))
-              a === "message" || a === "messages" || a === "errors" || (Array.isArray(o) ? n.push({ key: a, message: o.join(`
-`) }) : typeof o == "string" && n.push({ key: a, message: o }));
+            for (const [o, h] of Object.entries(s.errors))
+              Array.isArray(h) ? a.push({ key: o, message: h.join(`
+`) }) : typeof h == "string" ? a.push({ key: o, message: h }) : h != null && a.push({ key: o, message: String(h) });
+          if (a.length === 0)
+            for (const [o, h] of Object.entries(s))
+              o === "message" || o === "messages" || o === "errors" || (Array.isArray(h) ? a.push({ key: o, message: h.join(`
+`) }) : typeof h == "string" && a.push({ key: o, message: h }));
         }
-        if (n.length === 0)
-          return await r(`${t.status} ${t.statusText}`), !1;
-        for (const a of n)
-          a.key && e ? await b.addErrorMessage(e, a.key, a.message) : await r(a.message);
-        return !1;
+        if (a.length === 0)
+          return await r(`${t.status} ${t.statusText}`), i(), !1;
+        for (const o of a)
+          o.key && e ? await y.addErrorMessage(e, o.key, o.message) : await r(o.message);
+        return i(), !1;
       } catch {
       }
     try {
@@ -3074,7 +3119,7 @@ ${h}
     } catch {
       await r(`${t.status} ${t.statusText}`);
     }
-    return !1;
+    return i(), !1;
   }
   /**
    * 対象のフラグメント以下の入力要素に対してバリデーションを実行します。
@@ -3086,21 +3131,34 @@ ${h}
   validate(t) {
     if (this.options.valid !== !0)
       return !0;
-    const e = t.getTarget();
-    let r = this.validateOne(t);
-    return r || e.focus(), t.getChildElementFragments().reverse().forEach((i) => {
-      r &&= this.validate(i);
-    }), r;
+    const e = this.findFirstInvalid(t);
+    return e === null ? !0 : (e.reportValidity(), e.focus(), this.options.scrollOnError && e.scrollIntoView({ behavior: "smooth", block: "nearest" }), !1);
   }
   /**
-   * 対象のフラグメントに対してバリデーションを実行します。
+   * 対象フラグメント以下で DOM 順の最上部にある invalid 要素を返します。
+   * 副作用のない checkValidity のみを使用し、検出のみを行います。
    *
    * @param fragment 対象のフラグメント
-   * @returns バリデーション結果（true: 成功, false: 失敗）
+   * @returns 最初の invalid 要素、なければ null
    */
-  validateOne(t) {
+  findFirstInvalid(t) {
+    let e = null;
+    for (const r of t.getChildElementFragments().reverse()) {
+      const i = this.findFirstInvalid(r);
+      i !== null && (e = i);
+    }
+    return this.checkOne(t) ? e : t.getTarget();
+  }
+  /**
+   * 対象のフラグメントに対して、副作用なく有効性を検査します。
+   * reportValidity は使わず checkValidity のみ呼び出します。
+   *
+   * @param fragment 対象のフラグメント
+   * @returns 有効なら true、無効なら false
+   */
+  checkOne(t) {
     const e = t.getTarget();
-    return e instanceof HTMLInputElement || e instanceof HTMLSelectElement || e instanceof HTMLTextAreaElement ? e.reportValidity() : !0;
+    return e instanceof HTMLInputElement || e instanceof HTMLSelectElement || e instanceof HTMLTextAreaElement ? e.checkValidity() : !0;
   }
   /**
    * 確認メッセージを表示し、ユーザーの確認を求めます。
@@ -3120,40 +3178,40 @@ ${h}
   bindResult(t) {
     return !this.options.bindFragments || this.options.bindFragments.length === 0 ? Promise.resolve() : (t.headers.get("Content-Type")?.includes("application/json") ? t.json() : t.text()).then((r) => {
       if (this.options.bindParams) {
-        const s = {};
-        this.options.bindParams.forEach((n) => {
-          r && typeof r == "object" && n in r && (s[n] = r[n]);
-        }), r = s;
+        const n = {};
+        this.options.bindParams.forEach((s) => {
+          r && typeof r == "object" && s in r && (n[s] = r[s]);
+        }), r = n;
       }
       const i = [];
       if (this.options.bindArg)
-        this.options.bindFragments.forEach((s) => {
-          const n = s.getBindingData(), a = this.options.bindArg;
+        this.options.bindFragments.forEach((n) => {
+          const s = n.getBindingData(), a = this.options.bindArg;
           if (r && typeof r == "object" && !Array.isArray(r)) {
-            const o = n[a], d = o && typeof o == "object" && !Array.isArray(o) ? o : {};
-            n[a] = this.mergeAppendBindingData(
-              s,
+            const o = s[a], h = o && typeof o == "object" && !Array.isArray(o) ? o : {};
+            s[a] = this.mergeAppendBindingData(
+              n,
               r,
-              d
+              h
             );
           } else
-            n[a] = r;
-          i.push(x.setBindingData(s.getTarget(), n));
+            s[a] = r;
+          i.push(P.setBindingData(n.getTarget(), s));
         });
       else {
         if (typeof r == "string")
-          return f.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
+          return d.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
             new Error("string data cannot be bound without a bindArg.")
           );
-        this.options.bindFragments.forEach((s) => {
-          const n = this.mergeAppendBindingData(
-            s,
+        this.options.bindFragments.forEach((n) => {
+          const s = this.mergeAppendBindingData(
+            n,
             r
           );
           i.push(
-            x.setBindingData(
-              s.getTarget(),
-              n
+            P.setBindingData(
+              n.getTarget(),
+              s
             )
           );
         });
@@ -3168,10 +3226,10 @@ ${h}
   mergeAppendBindingData(t, e, r = t.getBindingData()) {
     if (!this.options.bindAppendParams || this.options.bindAppendParams.length === 0)
       return e;
-    const i = { ...e }, s = r;
-    for (const n of this.options.bindAppendParams) {
-      const a = i[n], o = s[n];
-      Array.isArray(o) && Array.isArray(a) && (i[n] = o.concat(a));
+    const i = { ...e }, n = r;
+    for (const s of this.options.bindAppendParams) {
+      const a = i[s], o = n[s];
+      Array.isArray(o) && Array.isArray(a) && (i[s] = o.concat(a));
     }
     return i;
   }
@@ -3182,11 +3240,11 @@ ${h}
     if (!this.options.copyFragments || this.options.copyFragments.length === 0)
       return Promise.resolve();
     const t = this.resolveCopySourceData(), e = this.pickCopyData(t), r = this.options.copyFragments.map((i) => {
-      const s = {
+      const n = {
         ...i.getBindingData(),
         ...e
       };
-      return x.setBindingData(i.getTarget(), s);
+      return P.setBindingData(i.getTarget(), n);
     });
     return Promise.all(r).then(() => {
     });
@@ -3195,7 +3253,7 @@ ${h}
    * copy のコピー元データを取得します。
    */
   resolveCopySourceData() {
-    return this.options.formFragment ? b.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
+    return this.options.formFragment ? y.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
   }
   /**
    * copy-params が指定されている場合は対象キーだけ抽出します。
@@ -3218,8 +3276,8 @@ ${h}
     for (const r of this.options.adjustFragments) {
       let i = r.getValue();
       (i == null || i === "") && (i = "0");
-      let s = Number(i);
-      isNaN(s) && (s = 0), s += t, e.push(r.setValue(String(s)));
+      let n = Number(i);
+      isNaN(n) && (n = 0), n += t, e.push(r.setValue(String(n)));
     }
     return Promise.all(e).then(() => {
     });
@@ -3231,11 +3289,11 @@ ${h}
    */
   getRowFragment() {
     if (!this.options.targetFragment)
-      return f.error("Haori", "Target fragment is not specified for row operation."), null;
+      return d.error("Haori", "Target fragment is not specified for row operation."), null;
     const t = this.options.targetFragment.closestByAttribute(
-      `${l.prefix}row`
+      `${u.prefix}row`
     );
-    return t || (f.error("Haori", "Row fragment not found."), null);
+    return t || (d.error("Haori", "Row fragment not found."), null);
   }
   /**
    * 行を追加します。
@@ -3251,7 +3309,7 @@ ${h}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(x.evaluateAll(r)), e.push(b.reset(r)), Promise.all(e).then(() => {
+    ), e.push(P.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3266,7 +3324,7 @@ ${h}
     if (!t)
       return Promise.reject(new Error("Row fragment not found."));
     const e = t.getParent();
-    return e && e.getChildElementFragments().filter((i) => !i.hasAttribute(`${l.prefix}each-before`) && !i.hasAttribute(`${l.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
+    return e && e.getChildElementFragments().filter((i) => !i.hasAttribute(`${u.prefix}each-before`) && !i.hasAttribute(`${u.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
   }
   /**
    * 前の行へ移動します。
@@ -3303,9 +3361,9 @@ ${h}
     return r ? r.insertAfter(t, e) : Promise.resolve();
   }
 };
-c.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, c.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
-let V = c;
-class ut {
+l.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, l.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
+let V = l;
+class ft {
   /**
    * URLのクエリパラメータを取得します。
    *
@@ -3313,12 +3371,12 @@ class ut {
    */
   static readParams() {
     const t = {}, e = window.location.search;
-    return new URLSearchParams(e).forEach((i, s) => {
-      t[s] = i;
+    return new URLSearchParams(e).forEach((i, n) => {
+      t[n] = i;
     }), t;
   }
 }
-class ct {
+class dt {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -3335,24 +3393,24 @@ class ct {
     let r;
     try {
       r = await fetch(t, e);
-    } catch (s) {
-      throw f.error("[Haori]", "Failed to fetch import source:", t, s), new Error(`Failed to fetch: ${t}`);
+    } catch (n) {
+      throw d.error("[Haori]", "Failed to fetch import source:", t, n), new Error(`Failed to fetch: ${t}`);
     }
     if (!r.ok) {
-      const s = `${r.status} ${r.statusText}`;
-      throw f.error("[Haori]", "Import HTTP error:", t, s), new Error(`Failed to load ${t}: ${s}`);
+      const n = `${r.status} ${r.statusText}`;
+      throw d.error("[Haori]", "Import HTTP error:", t, n), new Error(`Failed to load ${t}: ${n}`);
     }
     let i;
     try {
       i = await r.text();
-    } catch (s) {
-      throw f.error("[Haori]", "Failed to read response text:", t, s), new Error(`Failed to read response from: ${t}`);
+    } catch (n) {
+      throw d.error("[Haori]", "Failed to read response text:", t, n), new Error(`Failed to read response from: ${t}`);
     }
     try {
-      const n = new DOMParser().parseFromString(i, "text/html");
-      return n && n.body ? n.body.innerHTML : (f.warn("[Haori]", "No body found in imported document:", t), i);
-    } catch (s) {
-      return f.error("[Haori]", "Failed to parse imported HTML:", t, s), i;
+      const s = new DOMParser().parseFromString(i, "text/html");
+      return s && s.body ? s.body.innerHTML : (d.warn("[Haori]", "No body found in imported document:", t), i);
+    } catch (n) {
+      return d.error("[Haori]", "Failed to parse imported HTML:", t, n), i;
     }
   }
 }
@@ -3365,7 +3423,7 @@ const p = class p {
    */
   static isDeferredAttributeName(t) {
     return p.DEFERRED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${l.prefix}${e}`
+      (e) => t === `${u.prefix}${e}`
     );
   }
   /**
@@ -3376,7 +3434,7 @@ const p = class p {
    */
   static isEvaluateAllExcludedAttributeName(t) {
     return p.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${l.prefix}${e}`
+      (e) => t === `${u.prefix}${e}`
     );
   }
   /**
@@ -3396,7 +3454,7 @@ const p = class p {
    * @returns 実際の属性名。data-attr-* でない場合は null
    */
   static getAliasedAttributeName(t) {
-    const e = `${l.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}`;
+    const e = `${u.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}`;
     return !t.startsWith(e) || t.length <= e.length ? null : t.slice(e.length);
   }
   /**
@@ -3408,8 +3466,8 @@ const p = class p {
    */
   static isAliasedAttributeReflection(t, e) {
     const r = T.get(t);
-    return r instanceof R ? r.hasAttribute(
-      `${l.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}${e}`
+    return r instanceof x ? r.hasAttribute(
+      `${u.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}${e}`
     ) : !1;
   }
   /**
@@ -3443,39 +3501,39 @@ const p = class p {
     t.parentNode && (T.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
     let r = Promise.resolve();
     const i = /* @__PURE__ */ new Set();
-    for (const s of p.PRIORITY_ATTRIBUTE_SUFFIXES) {
-      const n = l.prefix + s;
-      e.hasAttribute(n) && (r = r.then(
+    for (const n of p.PRIORITY_ATTRIBUTE_SUFFIXES) {
+      const s = u.prefix + n;
+      e.hasAttribute(s) && (r = r.then(
         () => p.setAttribute(
           e.getTarget(),
-          n,
-          e.getRawAttribute(n)
+          s,
+          e.getRawAttribute(s)
         )
-      ), i.add(n));
+      ), i.add(s));
     }
-    for (const s of e.getAttributeNames()) {
-      if (i.has(s) || p.isDeferredAttributeName(s))
+    for (const n of e.getAttributeNames()) {
+      if (i.has(n) || p.isDeferredAttributeName(n))
         continue;
-      const n = e.getRawAttribute(s);
-      n !== null && (r = r.then(
-        () => p.setAttribute(e.getTarget(), s, n)
+      const s = e.getRawAttribute(n);
+      s !== null && (r = r.then(
+        () => p.setAttribute(e.getTarget(), n, s)
       ));
     }
-    for (const s of p.DEFERRED_ATTRIBUTE_SUFFIXES) {
-      const n = l.prefix + s;
-      e.hasAttribute(n) && (r = r.then(
+    for (const n of p.DEFERRED_ATTRIBUTE_SUFFIXES) {
+      const s = u.prefix + n;
+      e.hasAttribute(s) && (r = r.then(
         () => p.setAttribute(
           e.getTarget(),
-          n,
-          e.getRawAttribute(n)
+          s,
+          e.getRawAttribute(s)
         )
-      ), i.add(n));
+      ), i.add(s));
     }
     return r.then(() => {
-      const s = [];
-      return e.getChildren().forEach((n) => {
-        n instanceof R ? s.push(p.scan(n.getTarget())) : n instanceof H && s.push(p.evaluateText(n));
-      }), Promise.all(s).then(() => {
+      const n = [];
+      return e.getChildren().forEach((s) => {
+        s instanceof x ? n.push(p.scan(s.getTarget())) : s instanceof H && n.push(p.evaluateText(s));
+      }), Promise.all(n).then(() => {
       });
     }).then(() => {
     });
@@ -3490,57 +3548,57 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r) {
-    const i = T.get(t), s = p.getAliasedAttributeName(e);
-    if (s !== null)
-      return r === null ? i.removeAliasedAttribute(e, s) : i.setAliasedAttribute(e, s, r);
-    const n = [];
+    const i = T.get(t), n = p.getAliasedAttributeName(e);
+    if (n !== null)
+      return r === null ? i.removeAliasedAttribute(e, n) : i.setAliasedAttribute(e, n, r);
+    const s = [];
     switch (e) {
-      case `${l.prefix}bind`: {
+      case `${u.prefix}bind`: {
         r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(p.parseDataBind(r));
         break;
       }
-      case `${l.prefix}if`:
-        n.push(p.evaluateIf(i));
+      case `${u.prefix}if`:
+        s.push(p.evaluateIf(i));
         break;
-      case `${l.prefix}each`:
-        n.push(p.evaluateEach(i));
+      case `${u.prefix}each`:
+        s.push(p.evaluateEach(i));
         break;
-      case `${l.prefix}fetch`:
-        n.push(
+      case `${u.prefix}fetch`:
+        s.push(
           new V(i, null).run().then(() => {
           })
         );
         break;
-      case `${l.prefix}import`: {
+      case `${u.prefix}import`: {
         if (typeof r == "string") {
           const a = i.getTarget(), o = performance.now();
-          w.importStart(a, r), n.push(
-            ct.load(r).then((d) => {
-              const m = new TextEncoder().encode(d).length;
-              return P.enqueue(() => {
-                a.innerHTML = d;
+          w.importStart(a, r), s.push(
+            dt.load(r).then((h) => {
+              const m = new TextEncoder().encode(h).length;
+              return R.enqueue(() => {
+                a.innerHTML = h;
               }).then(() => {
                 w.importEnd(a, r, m, o);
               });
-            }).catch((d) => {
-              w.importError(a, r, d), f.error("[Haori]", "Failed to import HTML:", r, d);
+            }).catch((h) => {
+              w.importError(a, r, h), d.error("[Haori]", "Failed to import HTML:", r, h);
             })
           );
         }
         break;
       }
-      case `${l.prefix}url-param`: {
-        const a = i.getAttribute(`${l.prefix}url-arg`), o = ut.readParams();
+      case `${u.prefix}url-param`: {
+        const a = i.getAttribute(`${u.prefix}url-arg`), o = ft.readParams();
         if (a === null)
-          n.push(p.setBindingData(t, o));
+          s.push(p.setBindingData(t, o));
         else {
-          const d = i.getRawBindingData() || {};
-          d[String(a)] = o, n.push(p.setBindingData(t, d));
+          const h = i.getRawBindingData() || {};
+          h[String(a)] = o, s.push(p.setBindingData(t, h));
         }
         break;
       }
     }
-    return r === null ? n.push(i.removeAttribute(e)) : n.push(i.setAttribute(e, r)), Promise.all(n).then(() => {
+    return r === null ? s.push(i.removeAttribute(e)) : s.push(i.setAttribute(e, r)), Promise.all(s).then(() => {
     });
   }
   /**
@@ -3554,15 +3612,15 @@ const p = class p {
   static setBindingData(t, e) {
     const r = T.get(t), i = r.getRawBindingData();
     r.setBindingData(e);
-    let s = r.setAttribute(
-      `${l.prefix}bind`,
+    let n = r.setAttribute(
+      `${u.prefix}bind`,
       JSON.stringify(e)
     );
     if (t.tagName === "FORM") {
-      const n = r.getAttribute(`${l.prefix}form-arg`), a = n && e[String(n)] && typeof e[String(n)] == "object" && !Array.isArray(e[String(n)]) ? e[String(n)] : n ? {} : e;
-      s = s.then(() => b.syncValues(r, a));
+      const s = r.getAttribute(`${u.prefix}form-arg`), a = s && e[String(s)] && typeof e[String(s)] == "object" && !Array.isArray(e[String(s)]) ? e[String(s)] : s ? {} : e;
+      n = n.then(() => y.syncValues(r, a));
     }
-    return s = s.then(() => p.evaluateAll(r)), w.bindChange(t, i, e, "manual"), s.then(() => {
+    return n = n.then(() => p.evaluateAll(r)), w.bindChange(t, i, e, "manual"), n.then(() => {
     });
   }
   /**
@@ -3576,12 +3634,12 @@ const p = class p {
       try {
         return JSON.parse(t);
       } catch (e) {
-        return f.error("[Haori]", "Invalid JSON in data-bind:", e), {};
+        return d.error("[Haori]", "Invalid JSON in data-bind:", e), {};
       }
     else {
       const e = new URLSearchParams(t), r = {};
-      for (const [i, s] of e.entries())
-        r[i] !== void 0 ? Array.isArray(r[i]) ? r[i].push(s) : r[i] = [r[i], s] : r[i] = s;
+      for (const [i, n] of e.entries())
+        r[i] !== void 0 ? Array.isArray(r[i]) ? r[i].push(n) : r[i] = [r[i], n] : r[i] = n;
       return r;
     }
   }
@@ -3595,8 +3653,8 @@ const p = class p {
     const r = T.get(t);
     if (r.isSkipMutationNodes())
       return;
-    const i = T.get(e.nextSibling), s = T.get(e);
-    s && (r.insertBefore(s, i), s instanceof R ? p.scan(s.getTarget()) : s instanceof H && p.evaluateText(s));
+    const i = T.get(e.nextSibling), n = T.get(e);
+    n && (r.insertBefore(n, i), n instanceof x ? p.scan(n.getTarget()) : n instanceof H && p.evaluateText(n));
   }
   /**
    * ノードを親要素から削除します。
@@ -3636,11 +3694,11 @@ const p = class p {
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
-    const s = p.getFormFragment(r);
-    if (s) {
-      const n = b.getValues(s), a = s.getAttribute(`${l.prefix}form-arg`);
+    const n = p.getFormFragment(r);
+    if (n) {
+      const s = y.getValues(n), a = n.getAttribute(`${u.prefix}form-arg`);
       let o;
-      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(p.setBindingData(s.getTarget(), o));
+      a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(p.setBindingData(n.getTarget(), o));
     }
     return Promise.all(i).then(() => {
     });
@@ -3665,14 +3723,14 @@ const p = class p {
    */
   static evaluateAll(t) {
     const e = [];
-    return e.push(p.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${l.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${l.prefix}each`) ? Promise.all(e).then(() => p.evaluateEach(t)).then(() => {
+    return e.push(p.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${u.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${u.prefix}each`) ? Promise.all(e).then(() => p.evaluateEach(t)).then(() => {
       const r = [];
       return t.getChildren().forEach((i) => {
-        i instanceof R ? r.push(p.evaluateAll(i)) : i instanceof H && r.push(p.evaluateText(i));
+        i instanceof x ? r.push(p.evaluateAll(i)) : i instanceof H && r.push(p.evaluateText(i));
       }), Promise.all(r).then(() => {
       });
     }) : (t.getChildren().forEach((r) => {
-      r instanceof R ? e.push(p.evaluateAll(r)) : r instanceof H && e.push(p.evaluateText(r));
+      r instanceof x ? e.push(p.evaluateAll(r)) : r instanceof H && e.push(p.evaluateText(r));
     }), Promise.all(e).then(() => {
     }));
   }
@@ -3693,7 +3751,7 @@ const p = class p {
    * @return Promise (DOM操作が完了したときに解決される)
    */
   static evaluateIf(t) {
-    const e = [], r = t.getAttribute(`${l.prefix}if`);
+    const e = [], r = t.getAttribute(`${u.prefix}if`);
     return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
       t.hide().then(() => {
         w.hide(t.getTarget());
@@ -3717,20 +3775,20 @@ const p = class p {
     let e = t.getTemplate();
     if (e === null) {
       let i = !1;
-      t.getChildren().forEach((n) => {
-        if (!i && n instanceof R) {
-          if (n.hasAttribute(`${l.prefix}each-before`) || n.hasAttribute(`${l.prefix}each-after`))
+      t.getChildren().forEach((s) => {
+        if (!i && s instanceof x) {
+          if (s.hasAttribute(`${u.prefix}each-before`) || s.hasAttribute(`${u.prefix}each-after`))
             return;
-          e = n.clone(), t.setTemplate(e), i = !0, t.removeChild(n);
-          const a = n.getTarget();
-          a.parentNode && a.parentNode.removeChild(a), n.setMounted(!1);
+          e = s.clone(), t.setTemplate(e), i = !0, t.removeChild(s);
+          const a = s.getTarget();
+          a.parentNode && a.parentNode.removeChild(a), s.setMounted(!1);
         }
       });
-      const s = t.getAttribute(`${l.prefix}each`);
-      return Array.isArray(s) ? this.updateDiff(t, s) : (f.error("[Haori]", "Invalid each attribute:", s), Promise.reject(new Error("Invalid each attribute.")));
+      const n = t.getAttribute(`${u.prefix}each`);
+      return Array.isArray(n) ? this.updateDiff(t, n) : (d.error("[Haori]", "Invalid each attribute:", n), Promise.reject(new Error("Invalid each attribute.")));
     }
-    const r = t.getAttribute(`${l.prefix}each`);
-    return Array.isArray(r) ? this.updateDiff(t, r) : (f.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
+    const r = t.getAttribute(`${u.prefix}each`);
+    return Array.isArray(r) ? this.updateDiff(t, r) : (d.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
   }
   /**
    * 差分を更新します。
@@ -3741,27 +3799,27 @@ const p = class p {
   static updateDiff(t, e) {
     const r = t.getTemplate();
     if (r === null)
-      return f.error("[Haori]", "Template is not set for each element."), Promise.resolve();
-    let i = t.getAttribute(`${l.prefix}each-index`);
+      return d.error("[Haori]", "Template is not set for each element."), Promise.resolve();
+    let i = t.getAttribute(`${u.prefix}each-index`);
     i && (i = String(i));
-    const s = t.getAttribute(`${l.prefix}each-key`), n = t.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    e.forEach((u, h) => {
+    const n = t.getAttribute(`${u.prefix}each-key`), s = t.getAttribute(`${u.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
+    e.forEach((c, f) => {
       const g = p.createListKey(
-        u,
-        s ? String(s) : null,
-        h
+        c,
+        n ? String(n) : null,
+        f
       );
-      o.push(g), a.set(g, { item: u, itemIndex: h });
+      o.push(g), a.set(g, { item: c, itemIndex: f });
     });
-    const d = [];
-    let m = t.getChildren().filter((u) => u instanceof R).filter(
-      (u) => !u.hasAttribute(`${l.prefix}each-before`) && !u.hasAttribute(`${l.prefix}each-after`)
+    const h = [];
+    let m = t.getChildren().filter((c) => c instanceof x).filter(
+      (c) => !c.hasAttribute(`${u.prefix}each-before`) && !c.hasAttribute(`${u.prefix}each-after`)
     );
-    m = m.filter((u) => o.indexOf(String(u.getListKey())) === -1 ? (d.push(u.remove()), !1) : !0);
-    const y = m.map((u) => u.getListKey()), E = t.getChildren().filter((u) => u instanceof R).filter((u) => u.hasAttribute(`${l.prefix}each-before`)).length;
+    m = m.filter((c) => o.indexOf(String(c.getListKey())) === -1 ? (h.push(c.remove()), !1) : !0);
+    const b = m.map((c) => c.getListKey()), E = t.getChildren().filter((c) => c instanceof x).filter((c) => c.hasAttribute(`${u.prefix}each-before`)).length;
     let S = Promise.resolve();
-    return o.forEach((u, h) => {
-      const g = y.indexOf(u), { item: A, itemIndex: v } = a.get(u);
+    return o.forEach((c, f) => {
+      const g = b.indexOf(c), { item: A, itemIndex: v } = a.get(c);
       let k;
       if (g !== -1)
         k = m[g], S = S.then(
@@ -3770,21 +3828,21 @@ const p = class p {
             A,
             i,
             v,
-            n ? String(n) : null,
-            u
+            s ? String(s) : null,
+            c
           ).then(() => p.evaluateAll(k))
         );
       else {
         k = r.clone();
-        const J = E + h;
+        const J = E + f;
         S = S.then(
           () => p.updateRowFragment(
             k,
             A,
             i,
             v,
-            n ? String(n) : null,
-            u
+            s ? String(s) : null,
+            c
           ).then(
             () => t.insertBefore(
               k,
@@ -3793,21 +3851,21 @@ const p = class p {
           )
         );
       }
-    }), Promise.all(d).then(() => S).then(() => {
-      const u = o.filter(
+    }), Promise.all(h).then(() => S).then(() => {
+      const c = o.filter(
         (v) => v !== null
-      ), h = y.filter(
+      ), f = b.filter(
         (v) => v !== null
-      ), g = u.filter(
-        (v) => !h.includes(v)
-      ), A = h.filter(
-        (v) => !u.includes(v)
+      ), g = c.filter(
+        (v) => !f.includes(v)
+      ), A = f.filter(
+        (v) => !c.includes(v)
       );
       w.eachUpdate(
         t.getTarget(),
         g,
         A,
-        u
+        c
       );
     });
   }
@@ -3823,8 +3881,8 @@ const p = class p {
     let i;
     if (typeof t == "object" && t !== null)
       if (e) {
-        const s = t[e];
-        s == null ? i = `__index_${r}` : typeof s == "object" ? i = JSON.stringify(s) : i = String(s);
+        const n = t[e];
+        n == null ? i = `__index_${r}` : typeof n == "object" ? i = JSON.stringify(n) : i = String(n);
       } else
         i = `__index_${r}`;
     else
@@ -3842,22 +3900,22 @@ const p = class p {
    * @param listKey リストキー
    * @returns 行メタデータの更新完了 Promise
    */
-  static updateRowFragment(t, e, r, i, s, n) {
+  static updateRowFragment(t, e, r, i, n, s) {
     let a = e;
     if (typeof e == "object" && e !== null)
-      a = { ...e }, r && (a[r] = i), s && (a = {
-        [s]: a
+      a = { ...e }, r && (a[r] = i), n && (a = {
+        [n]: a
       });
-    else if (s)
+    else if (n)
       a = {
-        [s]: e
+        [n]: e
       }, r && (a[r] = i);
     else
-      return f.error(
+      return d.error(
         "[Haori]",
-        `Primitive value requires '${l.prefix}each-arg' attribute: ${e}`
+        `Primitive value requires '${u.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve();
-    return t.setListKey(n), t.setBindingData(a), t.setAttribute(`${l.prefix}row`, n);
+    return t.setListKey(s), t.setBindingData(a), t.setAttribute(`${u.prefix}row`, s);
   }
 };
 p.ATTRIBUTE_ALIAS_SUFFIX = "attr-", p.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], p.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], p.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
@@ -3868,8 +3926,8 @@ p.ATTRIBUTE_ALIAS_SUFFIX = "attr-", p.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if
   "import",
   "url-param"
 ], p.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
-let x = p;
-class ht {
+let P = p;
+const Y = class Y {
   /**
    * コンストラクタ。
    *
@@ -3879,20 +3937,23 @@ class ht {
     this.onClick = (e) => this.delegate(e, "click"), this.onChange = (e) => this.delegate(e, "change"), this.onLoadCapture = (e) => this.delegate(e, "load"), this.onWindowLoad = () => {
       const e = document.documentElement, r = T.get(e);
       r && new V(r, "load").run();
+    }, this.onPopstate = (e) => {
+      const r = e.state;
+      !r || r[Y.HISTORY_STATE_KEY] !== !0 || location.reload();
     }, this.root = t;
   }
   /**
    * イベントリスナーの登録を開始します。
-   * クリック、変更、ロードイベントを監視し、対応するProcedureを実行します。
+   * クリック、変更、ロード、popstate イベントを監視し、対応するProcedureを実行します。
    */
   start() {
-    this.root.addEventListener("click", this.onClick), this.root.addEventListener("change", this.onChange), this.root.addEventListener("load", this.onLoadCapture, !0), window.addEventListener("load", this.onWindowLoad, { once: !0 });
+    this.root.addEventListener("click", this.onClick), this.root.addEventListener("change", this.onChange), this.root.addEventListener("load", this.onLoadCapture, !0), window.addEventListener("load", this.onWindowLoad, { once: !0 }), window.addEventListener("popstate", this.onPopstate);
   }
   /**
    * イベントリスナーの登録を停止します。
    */
   stop() {
-    this.root.removeEventListener("click", this.onClick), this.root.removeEventListener("change", this.onChange), this.root.removeEventListener("load", this.onLoadCapture, !0), window.removeEventListener("load", this.onWindowLoad);
+    this.root.removeEventListener("click", this.onClick), this.root.removeEventListener("change", this.onChange), this.root.removeEventListener("load", this.onLoadCapture, !0), window.removeEventListener("load", this.onWindowLoad), window.removeEventListener("popstate", this.onPopstate);
   }
   /**
    * イベントを処理し、対応するProcedureを実行します。
@@ -3905,8 +3966,8 @@ class ht {
     if (!r)
       return;
     const i = T.get(r);
-    i && (e === "change" && i instanceof R && i.syncValue(), new V(i, e).run().catch((s) => {
-      f.error("[Haori]", "Procedure execution error:", s);
+    i && (e === "change" && i instanceof x && i.syncValue(), new V(i, e).run().catch((n) => {
+      d.error("[Haori]", "Procedure execution error:", n);
     }));
   }
   /**
@@ -3918,7 +3979,9 @@ class ht {
   getElementFromTarget(t) {
     return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
   }
-}
+};
+Y.HISTORY_STATE_KEY = "__haoriHistoryState__";
+let Q = Y;
 const N = class N {
   static syncTree(t) {
     (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && N.syncElement(t), t.querySelectorAll("*").forEach((e) => {
@@ -3933,23 +3996,23 @@ const N = class N {
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = N.resolveRoot(r), s = N.resolveRootMargin(r), n = N.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
-    if (e && e.observer.root === i && e.observer.rootMargin === s && N.sameThreshold(
+    const i = N.resolveRoot(r), n = N.resolveRootMargin(r), s = N.resolveThreshold(r), a = r.hasAttribute(`${u.prefix}intersect-once`);
+    if (e && e.observer.root === i && e.observer.rootMargin === n && N.sameThreshold(
       e.observer.thresholds,
-      n
+      s
     ) && e.once === a) {
       e.fragment = r;
       return;
     }
     e && (e.observer.disconnect(), N.registrations.delete(t));
     const o = new IntersectionObserver(
-      (d) => {
+      (h) => {
         const m = N.registrations.get(t);
-        m && d.forEach((y) => {
-          !y.isIntersecting || m.running || N.isDisabled(m.fragment) || (m.running = !0, new V(m.fragment, "intersect").runWithResult().then((E) => {
+        m && h.forEach((b) => {
+          !b.isIntersecting || m.running || N.isDisabled(m.fragment) || (m.running = !0, new V(m.fragment, "intersect").runWithResult().then((E) => {
             E && m.once && (m.observer.disconnect(), N.registrations.delete(t));
           }).catch((E) => {
-            f.error(
+            d.error(
               "[Haori]",
               "Intersect procedure execution error:",
               E
@@ -3962,8 +4025,8 @@ const N = class N {
       },
       {
         root: i,
-        rootMargin: s,
-        threshold: n
+        rootMargin: n,
+        threshold: s
       }
     );
     o.observe(t), N.registrations.set(t, {
@@ -3990,32 +4053,32 @@ const N = class N {
   }
   static shouldObserve(t) {
     return t.getAttributeNames().some((e) => {
-      if (!e.startsWith(`${l.prefix}intersect-`))
+      if (!e.startsWith(`${u.prefix}intersect-`))
         return !1;
-      const r = e.slice(`${l.prefix}intersect-`.length);
+      const r = e.slice(`${u.prefix}intersect-`.length);
       return !N.CONFIG_KEYS.has(r);
     });
   }
   static resolveRoot(t) {
-    const e = `${l.prefix}intersect-root`;
+    const e = `${u.prefix}intersect-root`;
     if (!t.hasAttribute(e))
       return null;
     const r = t.getAttribute(e);
     if (typeof r != "string" || r.trim() === "")
       return null;
     const i = document.querySelector(r);
-    return i instanceof HTMLElement ? i : (f.error("[Haori]", `Intersect root element not found: ${r}`), null);
+    return i instanceof HTMLElement ? i : (d.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(t) {
-    const e = `${l.prefix}intersect-root-margin`, r = t.getAttribute(e);
+    const e = `${u.prefix}intersect-root-margin`, r = t.getAttribute(e);
     return r === null || r === !1 || r === "" ? "0px" : String(r);
   }
   static resolveThreshold(t) {
-    const e = `${l.prefix}intersect-threshold`, r = t.getAttribute(e), i = typeof r == "number" ? r : Number.parseFloat(String(r ?? 0));
+    const e = `${u.prefix}intersect-threshold`, r = t.getAttribute(e), i = typeof r == "number" ? r : Number.parseFloat(String(r ?? 0));
     return Number.isNaN(i) ? 0 : Math.min(1, Math.max(0, i));
   }
   static isDisabled(t) {
-    const e = `${l.prefix}intersect-disabled`, r = t.getAttribute(e);
+    const e = `${u.prefix}intersect-disabled`, r = t.getAttribute(e);
     if (r === null || r === !1)
       return !1;
     if (typeof r == "boolean")
@@ -4034,21 +4097,21 @@ N.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "disabled",
   "once"
 ]), N.registrations = /* @__PURE__ */ new Map();
-let L = N;
-const I = class I {
+let $ = N;
+const C = class C {
   /**
    * 初期化メソッド。
    * ドキュメントのheadとbodyを監視対象として設定します。
    */
   static async init() {
-    if (I._initialized)
+    if (C._initialized)
       return;
-    I._initialized = !0;
+    C._initialized = !0;
     const t = await Promise.allSettled([
-      x.scan(document.head),
-      x.scan(document.body)
+      P.scan(document.head),
+      P.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && f.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && f.error("[Haori]", "Failed to build body fragment:", r.reason), I.observe(document.head), I.observe(document.body), new ht().start(), L.syncTree(document.body);
+    e.status !== "fulfilled" && d.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && d.error("[Haori]", "Failed to build body fragment:", r.reason), C.observe(document.head), C.observe(document.body), new Q().start(), $.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -4061,45 +4124,45 @@ const I = class I {
         try {
           switch (i.type) {
             case "attributes": {
-              f.info(
+              d.info(
                 "[Haori]",
                 "Attribute changed:",
                 i.target,
                 i.attributeName
               );
-              const s = i.target;
-              if (i.attributeName && x.isAliasedAttributeReflection(
-                s,
+              const n = i.target;
+              if (i.attributeName && P.isAliasedAttributeReflection(
+                n,
                 i.attributeName
               ))
                 break;
-              x.setAttribute(
-                s,
+              P.setAttribute(
+                n,
                 i.attributeName,
-                s.getAttribute(i.attributeName)
-              ), L.syncElement(s);
+                n.getAttribute(i.attributeName)
+              ), $.syncElement(n);
               break;
             }
             case "childList": {
-              f.info(
+              d.info(
                 "[Haori]",
                 "Child list changed:",
-                Array.from(i.removedNodes).map((s) => s.nodeName),
-                Array.from(i.addedNodes).map((s) => s.nodeName)
-              ), Array.from(i.removedNodes).forEach((s) => {
-                L.cleanupTree(s), x.removeNode(s);
-              }), Array.from(i.addedNodes).forEach((s) => {
-                s.parentElement instanceof HTMLElement && (x.addNode(s.parentElement, s), L.syncTree(s));
+                Array.from(i.removedNodes).map((n) => n.nodeName),
+                Array.from(i.addedNodes).map((n) => n.nodeName)
+              ), Array.from(i.removedNodes).forEach((n) => {
+                $.cleanupTree(n), P.removeNode(n);
+              }), Array.from(i.addedNodes).forEach((n) => {
+                n.parentElement instanceof HTMLElement && (P.addNode(n.parentElement, n), $.syncTree(n));
               });
               break;
             }
             case "characterData": {
-              f.info(
+              d.info(
                 "[Haori]",
                 "Character data changed:",
                 i.target,
                 i.target.textContent
-              ), i.target instanceof Text || i.target instanceof Comment ? x.changeText(i.target, i.target.textContent) : f.warn(
+              ), i.target instanceof Text || i.target instanceof Comment ? P.changeText(i.target, i.target.textContent) : d.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -4107,33 +4170,33 @@ const I = class I {
               break;
             }
             default:
-              f.warn("[Haori]", "Unknown mutation type:", i.type);
+              d.warn("[Haori]", "Unknown mutation type:", i.type);
               continue;
           }
-        } catch (s) {
-          f.error("[Haori]", "Error processing mutation:", s);
+        } catch (n) {
+          d.error("[Haori]", "Error processing mutation:", n);
         }
     }).observe(t, {
       childList: !0,
       subtree: !0,
       attributes: !0,
       characterData: !0
-    }), f.info("[Haori]", "Observer initialized for", t);
+    }), d.info("[Haori]", "Observer initialized for", t);
   }
 };
-I._initialized = !1;
-let q = I;
+C._initialized = !1;
+let q = C;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", q.init) : q.init();
-const ft = "0.4.3";
+const pt = "0.4.6";
 export {
-  x as Core,
-  l as Env,
-  b as Form,
+  P as Core,
+  u as Env,
+  y as Form,
   T as Fragment,
   X as Haori,
-  f as Log,
-  P as Queue,
+  d as Log,
+  R as Queue,
   X as default,
-  ft as version
+  pt as version
 };
 //# sourceMappingURL=haori.es.js.map