haori 0.4.3 → 0.4.5

package/dist/haori.es.js

@@ -30,21 +30,21 @@ const O = class O {
 };
 O.devMode = !1;
 let B = O;
-const W = "embedded";
-function _(F) {
+const z = "embedded";
+function rt(F) {
   return F === "embedded" || F === "demo";
 }
-function et(F) {
-  return F === null ? null : _(F) ? F : W;
+function it(F) {
+  return F === null ? null : rt(F) ? F : z;
 }
-const M = class M {
+const D = class D {
   /**
    * 実行モードを取得します。
    *
    * @returns 実行モード。
    */
   static get runtime() {
-    return M._runtime;
+    return D._runtime;
   }
   /**
    * 実行モードを設定します。
@@ -53,7 +53,7 @@ const M = class M {
    * @return 戻り値はありません。
    */
   static setRuntime(t) {
-    M._runtime = _(t) ? t : W;
+    D._runtime = rt(t) ? t : z;
   }
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
@@ -65,14 +65,14 @@ const M = class M {
     try {
       const t = document.currentScript || document.querySelector('script[src*="haori"]');
       if (t instanceof HTMLScriptElement) {
-        const r = t.getAttribute("data-prefix") || M._prefix;
-        M._prefix = r.endsWith("-") ? r : r + "-";
-        const i = et(
+        const r = t.getAttribute("data-prefix") || D._prefix;
+        D._prefix = r.endsWith("-") ? r : r + "-";
+        const i = it(
           t.getAttribute("data-runtime")
         );
-        i !== null && (M._runtime = i);
+        i !== null && (D._runtime = i);
       }
-      if (t instanceof HTMLScriptElement && t.hasAttribute(`${M._prefix}dev`)) {
+      if (t instanceof HTMLScriptElement && t.hasAttribute(`${D._prefix}dev`)) {
         B.set(!0);
         return;
       }
@@ -91,13 +91,13 @@ const M = class M {
    * @returns プレフィックス
    */
   static get prefix() {
-    return M._prefix;
+    return D._prefix;
   }
 };
-M._prefix = "data-", M._runtime = W;
-let c = M;
+D._prefix = "data-", D._runtime = z;
+let c = D;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", c.detect) : c.detect();
-class h {
+class d {
   /**
    * 開発モードでのみコンソールに情報を出力します。
    *
@@ -126,7 +126,7 @@ class h {
     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), h.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) {
-        h.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 z = class z {
+const _ = class _ {
   /**
    * タスクをキューに追加します。
    *
@@ -220,9 +220,9 @@ const z = class z {
     return this.ASYNC_QUEUE.wait();
   }
 };
-z.ASYNC_QUEUE = new rt();
-let P = z;
-class tt {
+_.ASYNC_QUEUE = new st();
+let P = _;
+class J {
   /**
    * 実行モードを取得します。
    *
@@ -255,12 +255,12 @@ class tt {
    * 通知トーストを表示します。
    *
    * @param message 表示メッセージ
-   * @param level メッセージのレベル（'info' | 'warning' | 'error'）
+   * @param level メッセージのレベル（省略時は 'info'）
    * @return 通知が表示されると解決されるPromise
    */
-  static async toast(t, e) {
+  static async toast(t, e = "info") {
     const r = document.createElement("div");
-    r.className = `haori-toast haori-toast-${e}`, r.textContent = t, r.setAttribute("popover", "manual"), r.setAttribute("role", "status"), r.setAttribute("aria-live", "polite"), document.body.appendChild(r), r.showPopover(), setTimeout(() => {
+    r.className = `haori-toast haori-toast-${e}`, r.textContent = t, r.setAttribute("popover", "manual"), r.setAttribute("role", "status"), r.setAttribute("aria-live", e === "error" ? "assertive" : "polite"), document.body.appendChild(r), r.showPopover(), setTimeout(() => {
       try {
         r.hidePopover();
       } finally {
@@ -284,7 +284,7 @@ class tt {
    */
   static openDialog(t) {
     return P.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.showModal() : h.error("[Haori]", "Element is not a dialog: ", t);
+      t instanceof HTMLDialogElement ? t.showModal() : d.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -294,7 +294,7 @@ class tt {
    */
   static closeDialog(t) {
     return P.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.close() : h.error("[Haori]", "Element is not a dialog: ", t);
+      t instanceof HTMLDialogElement ? t.close() : d.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -304,16 +304,19 @@ class tt {
    * @param message エラーメッセージ
    */
   static addErrorMessage(t, e) {
+    return J.addMessage(t, e, "error");
+  }
+  /**
+   * メッセージをレベル付きで追加します。
+   *
+   * @param target メッセージを表示する要素
+   * @param message メッセージ
+   * @param level メッセージのレベル（省略可能）
+   */
+  static addMessage(t, e, r) {
     return P.enqueue(() => {
-      if (t instanceof HTMLFormElement) {
-        t.setAttribute("data-message", e);
-        return;
-      }
-      if (t.parentElement) {
-        t.parentElement.setAttribute("data-message", e);
-        return;
-      }
-      t.setAttribute("data-message", e);
+      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);
   }
   /**
@@ -323,20 +326,20 @@ class tt {
    */
   static clearMessages(t) {
     return P.enqueue(() => {
-      t.removeAttribute("data-message"), t.querySelectorAll("[data-message]").forEach((e) => {
-        e.removeAttribute("data-message");
+      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 Z() {
+const nt = ["addErrorMessage", "clearMessages"];
+function et() {
   const t = globalThis.window?.Haori;
-  return it.every(
+  return nt.every(
     (r) => typeof t?.[r] == "function"
-  ) ? t : tt;
+  ) ? t : J;
 }
-class m {
+class b {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -347,7 +350,7 @@ class m {
    */
   static getValues(t) {
     const e = {};
-    return m.getPartValues(t, e);
+    return b.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -358,32 +361,32 @@ class m {
    * @returns values と同じオブジェクト
    */
   static getPartValues(t, e) {
-    const r = t.getAttribute("name"), i = t.getAttribute(`${c.prefix}form-object`), s = t.getAttribute(`${c.prefix}form-list`);
+    const r = t.getAttribute("name"), i = t.getAttribute(`${c.prefix}form-object`), n = t.getAttribute(`${c.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 && h.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 ${c.prefix}form-object and name attributes.`
       );
-      for (const n of t.getChildElementFragments())
-        m.getPartValues(n, e);
+      for (const s of t.getChildElementFragments())
+        b.getPartValues(s, e);
     } else if (i) {
-      const n = {};
+      const s = {};
       for (const a of t.getChildElementFragments())
-        m.getPartValues(a, n);
-      Object.keys(n).length > 0 && (e[String(i)] = n), s && h.warn(
+        b.getPartValues(a, s);
+      Object.keys(s).length > 0 && (e[String(i)] = s), n && d.warn(
         "Haori",
         `Element cannot have both ${c.prefix}form-list and ${c.prefix}form-object attributes.`
       );
-    } else if (s) {
-      const n = [];
+    } else if (n) {
+      const s = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        m.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
+        b.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())
-        m.getPartValues(n, e);
+      for (const s of t.getChildElementFragments())
+        b.getPartValues(s, e);
     return e;
   }
   /**
@@ -396,7 +399,7 @@ class m {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return m.setPartValues(t, e, null, r, !0);
+    return b.setPartValues(t, e, null, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -408,7 +411,7 @@ class m {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(t, e, r = !1) {
-    return m.setPartValues(t, e, null, r, !1);
+    return b.setPartValues(t, e, null, r, !1);
   }
   /**
    * 単一フラグメントへ値を設定します。
@@ -430,53 +433,53 @@ class m {
    * @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(`${c.prefix}form-object`), d = t.getAttribute(`${c.prefix}form-list`), y = t.getAttribute(`${c.prefix}form-detach`);
+  static setPartValues(t, e, r = null, i = !1, n = !0) {
+    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${c.prefix}form-object`), u = t.getAttribute(`${c.prefix}form-list`), m = t.getAttribute(`${c.prefix}form-detach`);
     if (a) {
-      if (!y || i) {
-        const b = e[String(a)];
-        d && Array.isArray(b) && r !== null ? n.push(
-          m.applyFragmentValue(t, b[r] ?? null, s)
-        ) : typeof b > "u" || (typeof b == "string" || typeof b == "number" || typeof b == "boolean" || b === null ? n.push(m.applyFragmentValue(t, b, s)) : n.push(
-          m.applyFragmentValue(t, String(b), s)
+      if (!m || i) {
+        const y = e[String(a)];
+        u && Array.isArray(y) && r !== null ? s.push(
+          b.applyFragmentValue(t, y[r] ?? null, n)
+        ) : typeof y > "u" || (typeof y == "string" || typeof y == "number" || typeof y == "boolean" || y === null ? s.push(b.applyFragmentValue(t, y, n)) : s.push(
+          b.applyFragmentValue(t, String(y), n)
         ));
       }
     } else if (o) {
-      const b = e[String(o)];
-      if (b && typeof b == "object")
-        for (const A of t.getChildElementFragments())
-          n.push(
-            m.setPartValues(
-              A,
-              b,
+      const y = e[String(o)];
+      if (y && typeof y == "object")
+        for (const E of t.getChildElementFragments())
+          s.push(
+            b.setPartValues(
+              E,
+              y,
               null,
               i,
-              s
+              n
             )
           );
-    } else if (d) {
-      const b = e[String(d)];
-      if (Array.isArray(b)) {
-        const A = t.getChildElementFragments();
-        for (let S = 0; S < A.length; S++) {
-          const l = A[S];
-          b.length > S ? n.push(
-            m.setPartValues(
-              l,
-              b[S],
+    } else if (u) {
+      const y = e[String(u)];
+      if (Array.isArray(y)) {
+        const E = t.getChildElementFragments();
+        for (let S = 0; S < E.length; S++) {
+          const h = E[S];
+          y.length > S ? s.push(
+            b.setPartValues(
+              h,
+              y[S],
               S,
               i,
-              s
+              n
             )
-          ) : n.push(m.setPartValues(l, {}, S, i, s));
+          ) : s.push(b.setPartValues(h, {}, S, i, n));
         }
       }
     } else
-      for (const b of t.getChildElementFragments())
-        n.push(
-          m.setPartValues(b, e, null, i, s)
+      for (const y of t.getChildElementFragments())
+        s.push(
+          b.setPartValues(y, e, null, i, n)
         );
-    return Promise.all(n).then(() => {
+    return Promise.all(s).then(() => {
     });
   }
   /**
@@ -487,9 +490,9 @@ class m {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    m.clearValues(t), await Promise.all([
-      m.clearMessages(t),
-      m.clearEachClones(t)
+    b.clearValues(t), await Promise.all([
+      b.clearMessages(t),
+      b.clearEachClones(t)
     ]), await P.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
@@ -497,11 +500,11 @@ class m {
       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 R.evaluateAll(t);
   }
   /**
    * data-each によって生成された複製（テンプレート以外）を削除します。
@@ -510,20 +513,20 @@ class m {
    * 対象エレメント自体は削除しません。
    */
   static clearEachClones(t) {
-    const e = [], r = (s) => {
-      if (s.hasAttribute(`${c.prefix}each`))
-        for (const n of s.getChildElementFragments()) {
-          const a = n.hasAttribute(`${c.prefix}each-before`), o = n.hasAttribute(`${c.prefix}each-after`);
-          !a && !o && e.push(n.remove());
+    const e = [], r = (n) => {
+      if (n.hasAttribute(`${c.prefix}each`))
+        for (const s of n.getChildElementFragments()) {
+          const a = s.hasAttribute(`${c.prefix}each-before`), o = s.hasAttribute(`${c.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(() => {
     });
   }
@@ -535,7 +538,7 @@ class m {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      m.clearValues(e);
+      b.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -544,7 +547,7 @@ class m {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(t) {
-    return Z().clearMessages(
+    return et().clearMessages(
       t.getTarget()
     );
   }
@@ -554,18 +557,27 @@ class m {
    *
    * @param fragment 対象フラグメント
    * @param key キー（ドット区切りの文字列）
-   * @param message 追加するエラーメッセージ]
+   * @param message 追加するエラーメッセージ
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    const i = [], s = Z(), n = m.findFragmentsByKey(t, e);
-    return n.forEach((a) => {
-      i.push(
-        s.addErrorMessage(a.getTarget(), r)
-      );
-    }), n.length === 0 && i.push(
-      s.addErrorMessage(t.getTarget(), r)
-    ), Promise.all(i).then(() => {
+    return b.addMessage(t, e, r, "error");
+  }
+  /**
+   * キーに一致するフラグメントにレベル付きメッセージを追加します。
+   * キーに一致するフラグメントが見つからない場合は、指定されたフラグメントにメッセージを追加します。
+   *
+   * @param fragment 対象フラグメント
+   * @param key キー（ドット区切りの文字列）
+   * @param message 追加するメッセージ
+   * @param level メッセージのレベル（省略可能）
+   * @return Promise（メッセージの追加が完了したら解決される）
+   */
+  static addMessage(t, e, r, i) {
+    const n = [], s = et(), a = s.addMessage, o = (m) => typeof a == "function" ? a.call(s, m, r, i) : s.addErrorMessage(m, r), u = b.findFragmentsByKey(t, e);
+    return u.forEach((m) => {
+      n.push(o(m.getTarget()));
+    }), u.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
     });
   }
   /**
@@ -576,7 +588,7 @@ class m {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return m.findFragmentByKeyParts(t, e.split("."));
+    return b.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -589,30 +601,30 @@ class m {
   static findFragmentByKeyParts(t, e) {
     const r = [], i = e[0];
     if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${c.prefix}form-object`))
-      e.length > 1 && t.getAttribute(`${c.prefix}form-object`) === i && t.getChildElementFragments().forEach((n) => {
-        r.push(...m.findFragmentByKeyParts(n, e.slice(1)));
+      e.length > 1 && t.getAttribute(`${c.prefix}form-object`) === i && t.getChildElementFragments().forEach((s) => {
+        r.push(...b.findFragmentByKeyParts(s, e.slice(1)));
       });
     else if (t.hasAttribute(`${c.prefix}form-list`)) {
       if (e.length > 1) {
-        const s = t.getAttribute(`${c.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), y = Number(d);
-            if (isNaN(y))
-              h.error("Haori", `Invalid index: ${i}`);
+        const n = t.getAttribute(`${c.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 u = i.substring(s + 1, a), m = Number(u);
+            if (isNaN(m))
+              d.error("Haori", `Invalid index: ${i}`);
             else {
-              const b = t.getChildElementFragments().filter((A) => A.hasAttribute(`${c.prefix}row`));
-              y < b.length && r.push(
-                ...m.findFragmentByKeyParts(b[y], e.slice(1))
+              const y = t.getChildElementFragments().filter((E) => E.hasAttribute(`${c.prefix}row`));
+              m < y.length && r.push(
+                ...b.findFragmentByKeyParts(y[m], e.slice(1))
               );
             }
           }
         }
       }
     } else
-      t.getChildElementFragments().forEach((s) => {
-        r.push(...m.findFragmentByKeyParts(s, e));
+      t.getChildElementFragments().forEach((n) => {
+        r.push(...b.findFragmentByKeyParts(n, e));
       });
     return r;
   }
@@ -629,7 +641,7 @@ class m {
     return r ? this.getFormFragment(r) : null;
   }
 }
-const R = class R {
+const M = class M {
   /**
    * 明示バインド内に持ち込まれてはならない危険値を返します。
    *
@@ -674,28 +686,28 @@ const R = class R {
    */
   static evaluate(t, e = {}) {
     if (t.trim() === "")
-      return h.warn("[Haori]", t, "Expression is empty"), null;
+      return d.warn("[Haori]", t, "Expression is empty"), null;
     if (this.containsDangerousPatterns(t))
-      return h.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
+      return d.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
     if (this.containsForbiddenKeys(e))
-      return h.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 h.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 h.error(
+        return d.error(
           "[Haori]",
           "Failed to compile expression:",
           t,
@@ -704,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 h.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;
     }
   }
   /**
@@ -740,13 +752,13 @@ 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;
+      if (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;
@@ -756,8 +768,8 @@ return (${t});`;
           break;
         }
         case "[": {
-          const d = this.startsMemberAccess(i) ? "member" : "array";
-          r.push(d);
+          const u = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(u);
           break;
         }
         case "]": {
@@ -766,7 +778,7 @@ return (${t});`;
           break;
         }
       }
-      i = n;
+      i = s;
     }
     return r.length === 0;
   }
@@ -807,41 +819,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;
@@ -859,12 +871,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",
@@ -972,8 +984,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;
   }
   /**
@@ -989,39 +1001,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 u = Reflect.get(s, a, o);
+        return typeof a == "symbol" ? u : this.wrapBoundValue(
+          u,
           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 u = Reflect.apply(
+          s,
           a,
           o
         );
-        return this.isIteratorLike(d) ? d : this.wrapBoundValue(d, e);
+        return this.isIteratorLike(u) ? u : this.wrapBoundValue(u, 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 ラップ対象の値かどうかを判定します。
@@ -1054,8 +1066,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: () => {
@@ -1067,8 +1079,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);
       });
     }
   }
@@ -1122,7 +1134,7 @@ return (${t});`;
     return !1;
   }
 };
-R.FORBIDDEN_NAMES = [
+M.FORBIDDEN_NAMES = [
   // グローバルオブジェクト
   "window",
   "self",
@@ -1154,19 +1166,19 @@ R.FORBIDDEN_NAMES = [
   "sessionStorage",
   "IndexedDB",
   "history"
-], R.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], R.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set(["location"]), R.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
-  ...R.FORBIDDEN_NAMES.filter(
-    (t) => !R.REBINDABLE_FORBIDDEN_NAMES.has(t)
+], M.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], M.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set(["location"]), M.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
+  ...M.FORBIDDEN_NAMES.filter(
+    (t) => !M.REBINDABLE_FORBIDDEN_NAMES.has(t)
   ),
   "constructor",
   "__proto__",
   "prototype",
-  ...R.STRICT_FORBIDDEN_NAMES
-]), R.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
+  ...M.STRICT_FORBIDDEN_NAMES
+]), M.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
   "constructor",
   "__proto__",
   "prototype"
-]), R.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
+]), M.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
   "await",
   "break",
   "case",
@@ -1200,8 +1212,8 @@ R.FORBIDDEN_NAMES = [
   "while",
   "with",
   "yield"
-]), R.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
-let j = R;
+]), M.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
+let j = M;
 const C = class C {
   /**
    * フラグメントのコンストラクタ。
@@ -1219,16 +1231,16 @@ const C = class C {
     let e;
     switch (t.nodeType) {
       case Node.ELEMENT_NODE:
-        e = new D(t);
+        e = new x(t);
         break;
       case Node.TEXT_NODE:
-        e = new L(t);
+        e = new H(t);
         break;
       case Node.COMMENT_NODE:
-        e = new Y(t);
+        e = new Z(t);
         break;
       default:
-        return h.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
+        return d.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
     }
     return e;
   }
@@ -1334,8 +1346,8 @@ const C = class C {
   }
 };
 C.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let N = C;
-class D extends N {
+let T = C;
+class x extends T {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1365,7 +1377,7 @@ class D extends N {
         this.attributeMap.set(e, i);
       }
     }), t.childNodes.forEach((e) => {
-      const r = N.get(e);
+      const r = T.get(e);
       r.setParent(this), this.children.push(r);
     });
   }
@@ -1384,7 +1396,7 @@ class D extends N {
    */
   getChildElementFragments() {
     return this.children.filter(
-      (t) => t instanceof D
+      (t) => t instanceof x
     );
   }
   /**
@@ -1405,7 +1417,7 @@ class D extends N {
   removeChild(t) {
     const e = this.children.indexOf(t);
     if (e < 0) {
-      h.warn("[Haori]", "Child fragment not found.", t);
+      d.warn("[Haori]", "Child fragment not found.", t);
       return;
     }
     this.children.splice(e, 1), t.setParent(null);
@@ -1416,7 +1428,7 @@ class D extends N {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new D(
+    const t = new x(
       this.target.cloneNode(!1)
     );
     return this.attributeMap.forEach((e, r) => {
@@ -1484,7 +1496,7 @@ class D extends N {
    */
   clearBindingDataCache() {
     this.bindingDataCache = null, this.children.forEach((t) => {
-      t instanceof D && t.clearBindingDataCache();
+      t instanceof x && t.clearBindingDataCache();
     });
   }
   /**
@@ -1552,10 +1564,10 @@ class D extends N {
       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, P.enqueue(() => {
+        r.checked = s, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
@@ -1563,7 +1575,7 @@ class D extends N {
       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;
-    })) : (h.warn(
+    })) : (d.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
       r
@@ -1614,19 +1626,60 @@ class D extends N {
    * @returns 属性の更新のPromise
    */
   setAttribute(t, e) {
+    return this.setAttributeInternal(t, t, e, !0);
+  }
+  /**
+   * data-attr-* の生値を保持しつつ、別名の属性へ評価結果を反映します。
+   *
+   * @param rawName 生の属性名
+   * @param targetName 反映先の属性名
+   * @param value 生の属性値
+   * @returns 属性更新の Promise
+   */
+  setAliasedAttribute(t, e, r) {
+    return this.setAttributeInternal(t, e, r, !1);
+  }
+  /**
+   * data-attr-* の生属性と反映先属性を同時に削除します。
+   *
+   * @param rawName 生の属性名
+   * @param targetName 反映先の属性名
+   * @returns 属性削除の Promise
+   */
+  removeAliasedAttribute(t, e) {
     if (this.skipMutationAttributes)
       return Promise.resolve();
-    if (e === null)
-      return this.removeAttribute(t);
-    const r = new U(t, e);
-    this.attributeMap.set(t, r), this.skipMutationAttributes = !0;
-    const i = this.getTarget(), s = r.isForceEvaluation() ? e : this.getAttribute(t);
+    this.attributeMap.delete(t), this.skipMutationAttributes = !0;
+    const r = this.getTarget();
     return P.enqueue(() => {
-      if (s === null || s === !1)
-        i.removeAttribute(t);
+      r.removeAttribute(t), e !== t && r.removeAttribute(e);
+    }).finally(() => {
+      this.skipMutationAttributes = !1;
+    });
+  }
+  /**
+   * 生の属性値を保持しつつ、必要に応じて別名属性へ評価結果を反映します。
+   *
+   * @param rawName 生の属性名
+   * @param targetName 反映先の属性名
+   * @param value 生の属性値
+   * @param syncValueProperty value 属性更新時に DOM property も同期するかどうか
+   * @returns 属性更新の Promise
+   */
+  setAttributeInternal(t, e, r, i) {
+    if (this.skipMutationAttributes)
+      return Promise.resolve();
+    if (r === null)
+      return t === e ? this.removeAttribute(t) : this.removeAliasedAttribute(t, 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 P.enqueue(() => {
+      if (s.getAttribute(t) !== r && s.setAttribute(t, r), a === null || a === !1)
+        s.removeAttribute(e);
       else {
-        const n = String(s);
-        i.getAttribute(t) !== n && i.setAttribute(t, n), t === "value" && (i instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(i.type) || i instanceof HTMLTextAreaElement || i instanceof HTMLSelectElement) && (this.value = n, i.value !== n && (i.value = n));
+        const o = String(a);
+        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;
@@ -1661,7 +1714,7 @@ class D extends N {
     if (e === void 0)
       return null;
     const r = e.evaluate(this.getBindingData());
-    return r.length === 1 ? r[0] : I.joinEvaluateResults(r);
+    return r.length === 1 ? r[0] : L.joinEvaluateResults(r);
   }
   /**
    * 属性の生の値を取得します。
@@ -1702,15 +1755,15 @@ class D extends N {
     if (r.parentNode !== this.target)
       return null;
     const i = e ? r.nextSibling : r;
-    let s = e ? r.nextSibling : r;
-    for (; s !== null; ) {
-      const n = N.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 };
   }
@@ -1726,42 +1779,42 @@ class D extends N {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (t === this)
-      return h.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 h.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);
-    let y = r === void 0 ? e?.getTarget() || null : r;
+    s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
+    const u = t.getParent();
+    u !== null && u.removeChild(t);
+    let m = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
     else {
-      let A;
-      if (n ? a !== -1 && a < o ? A = o - 1 : A = o : A = this.children.indexOf(e), A === -1) {
+      let E;
+      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 ? (h.warn(
+        S === null ? (d.warn(
           "[Haori]",
           "Reference child not found in children.",
           e
-        ), this.children.push(t)) : (this.children.splice(S.index, 0, t), y = S.referenceNode);
+        ), this.children.push(t)) : (this.children.splice(S.index, 0, t), m = S.referenceNode);
       } else
-        this.children.splice(A, 0, t);
+        this.children.splice(E, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const b = this.skipMutationNodes;
+    const y = this.skipMutationNodes;
     return this.skipMutationNodes = !0, P.enqueue(() => {
-      this.target.insertBefore(t.getTarget(), y);
+      this.target.insertBefore(t.getTarget(), m);
     }).finally(() => {
-      this.skipMutationNodes = b;
+      this.skipMutationNodes = y;
     });
   }
   /**
@@ -1780,7 +1833,7 @@ class D extends N {
         e,
         !0
       );
-      return i === null ? (h.warn(
+      return i === null ? (d.warn(
         "[Haori]",
         "Reference child not found in children.",
         e
@@ -1856,7 +1909,7 @@ class D extends N {
     return e === null ? null : e.closestByAttribute(t);
   }
 }
-class L extends N {
+class H extends T {
   /**
    * テキストフラグメントのコンストラクタ。
    * 対象テキストノードの内容を初期化します。
@@ -1864,7 +1917,7 @@ class L extends N {
    * @param target 対象テキストノード
    */
   constructor(t) {
-    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new I(this.text);
+    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new L(this.text);
   }
   /**
    * フラグメントをクローンします。
@@ -1872,7 +1925,7 @@ class L extends N {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new L(this.target.cloneNode(!0));
+    const t = new H(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t.contents = this.contents, t;
   }
   /**
@@ -1890,7 +1943,7 @@ class L extends N {
    * @returns 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new I(t), this.evaluate());
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new L(t), this.evaluate());
   }
   /**
    * フラグメントを評価します。
@@ -1903,7 +1956,7 @@ class L extends N {
     ) : P.enqueue(() => {
       this.skipMutation = !0, this.contents.isRawEvaluate ? this.parent.getTarget().innerHTML = this.contents.evaluate(
         this.parent.getBindingData()
-      )[0] : this.contents.isEvaluate ? this.target.textContent = I.joinEvaluateResults(
+      )[0] : this.contents.isEvaluate ? this.target.textContent = L.joinEvaluateResults(
         this.contents.evaluate(this.parent.getBindingData())
       ) : this.target.textContent = this.text;
     }).finally(() => {
@@ -1911,7 +1964,7 @@ class L extends N {
     });
   }
 }
-class Y extends N {
+class Z extends T {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -1927,7 +1980,7 @@ class Y extends N {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new Y(this.target.cloneNode(!0));
+    const t = new Z(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t;
   }
   /**
@@ -1952,7 +2005,7 @@ class Y extends N {
     }));
   }
 }
-const G = class G {
+const K = class K {
   /**
    * コンストラクタ。
    *
@@ -1960,26 +2013,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();
   }
   /**
    * 評価結果を結合して文字列にします。
@@ -2003,7 +2056,7 @@ const G = class G {
    */
   checkRawExpressions() {
     for (let t = 0; t < this.contents.length; t++)
-      this.contents[t].type === 2 && this.contents.length > 1 && (h.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);
@@ -2026,7 +2079,7 @@ const G = class G {
         } else
           e.push(r.text);
       } catch (i) {
-        h.error(
+        d.error(
           "[Haori]",
           `Error evaluating text expression: ${r.text}`,
           i
@@ -2035,9 +2088,9 @@ const G = class G {
     }), e;
   }
 };
-G.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let I = G;
-const K = class K extends I {
+K.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
+let L = K;
+const G = class G extends L {
   /**
    * コンストラクタ。
    *
@@ -2045,7 +2098,7 @@ const K = class K extends I {
    * @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);
   }
   /**
    * 強制評価フラグを取得します。
@@ -2073,27 +2126,27 @@ const K = class K extends I {
         } else
           e.push(r.text);
       } catch (i) {
-        h.error(
+        d.error(
           "[Haori]",
           `Error evaluating attribute expression: ${r.text}`,
           i
         ), e.push("");
       }
-    }), this.forceEvaluation && e.length > 1 ? (h.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;
-class v {
+let U = G;
+class w {
   /**
    * カスタムイベントを発火します。
    *
@@ -2103,13 +2156,13 @@ class v {
    * @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イベントを発火します。
@@ -2117,7 +2170,7 @@ class v {
    * @param version ライブラリバージョン
    */
   static ready(t) {
-    v.dispatch(document, "ready", { version: t });
+    w.dispatch(document, "ready", { version: t });
   }
   /**
    * renderイベントを発火します。
@@ -2125,7 +2178,7 @@ class v {
    * @param target 評価対象要素
    */
   static render(t) {
-    v.dispatch(t, "render", { target: t });
+    w.dispatch(t, "render", { target: t });
   }
   /**
    * importstartイベントを発火します。
@@ -2134,7 +2187,7 @@ class v {
    * @param url インポート対象URL
    */
   static importStart(t, e) {
-    v.dispatch(t, "importstart", {
+    w.dispatch(t, "importstart", {
       url: e,
       startedAt: performance.now()
     });
@@ -2148,7 +2201,7 @@ class v {
    * @param startedAt 開始時刻
    */
   static importEnd(t, e, r, i) {
-    v.dispatch(t, "importend", {
+    w.dispatch(t, "importend", {
       url: e,
       bytes: r,
       durationMs: performance.now() - i
@@ -2162,7 +2215,7 @@ class v {
    * @param error エラー内容
    */
   static importError(t, e, r) {
-    v.dispatch(t, "importerror", { url: e, error: r });
+    w.dispatch(t, "importerror", { url: e, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -2173,15 +2226,15 @@ class v {
    * @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 y = e?.[d], b = r[d];
-      y !== b && 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 u of o) {
+      const m = e?.[u], y = r[u];
+      m !== y && n.push(u);
     }
-    v.dispatch(t, "bindchange", {
+    w.dispatch(t, "bindchange", {
       previous: e || {},
       next: r,
-      changedKeys: s,
+      changedKeys: n,
       reason: i
     });
   }
@@ -2194,7 +2247,7 @@ class v {
    * @param order 現在の順序
    */
   static eachUpdate(t, e, r, i) {
-    v.dispatch(t, "eachupdate", {
+    w.dispatch(t, "eachupdate", {
       added: e,
       removed: r,
       order: i,
@@ -2210,7 +2263,7 @@ class v {
    * @param item 行データ
    */
   static rowAdd(t, e, r, i) {
-    v.dispatch(t, "rowadd", { key: e, index: r, item: i });
+    w.dispatch(t, "rowadd", { key: e, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -2220,7 +2273,7 @@ class v {
    * @param index インデックス
    */
   static rowRemove(t, e, r) {
-    v.dispatch(t, "rowremove", { key: e, index: r });
+    w.dispatch(t, "rowremove", { key: e, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -2231,7 +2284,7 @@ class v {
    * @param to 移動後インデックス
    */
   static rowMove(t, e, r, i) {
-    v.dispatch(t, "rowmove", { key: e, from: r, to: i });
+    w.dispatch(t, "rowmove", { key: e, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -2239,7 +2292,7 @@ class v {
    * @param target data-if要素
    */
   static show(t) {
-    v.dispatch(t, "show", { visible: !0 });
+    w.dispatch(t, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -2247,7 +2300,7 @@ class v {
    * @param target data-if要素
    */
   static hide(t) {
-    v.dispatch(t, "hide", { visible: !1 });
+    w.dispatch(t, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -2259,13 +2312,13 @@ class v {
     * @param metadata runtime とメソッド変換情報。
     * @return 戻り値はありません。
    */
-  static fetchStart(t, e, r, i, s) {
-    v.dispatch(t, "fetchstart", {
+  static fetchStart(t, e, r, i, n) {
+    w.dispatch(t, "fetchstart", {
       url: e,
       options: r || {},
       payload: i,
       startedAt: performance.now(),
-      ...s
+      ...n
     });
   }
   /**
@@ -2277,7 +2330,7 @@ class v {
    * @param startedAt 開始時刻
    */
   static fetchEnd(t, e, r, i) {
-    v.dispatch(t, "fetchend", {
+    w.dispatch(t, "fetchend", {
       url: e,
       status: r,
       durationMs: performance.now() - i
@@ -2292,44 +2345,44 @@ class v {
    * @param status HTTPステータス（存在する場合）
    * @param startedAt 開始時刻（存在する場合）
    */
-  static fetchError(t, e, r, i, s) {
-    v.dispatch(t, "fetcherror", {
+  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"
-];
-function X() {
+], ot = "__haoriHistoryState__";
+function Y() {
   const t = globalThis.window?.Haori;
-  return st.every(
+  return at.every(
     (r) => typeof t?.[r] == "function"
-  ) ? t : tt;
+  ) ? t : J;
 }
-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 ct(F) {
+  return lt.has(F.toUpperCase());
 }
-function ot(F, t) {
+function ut(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 ut(r, t), e.search = r.toString(), e.toString();
 }
-const u = class u {
+const l = class l {
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -2349,13 +2402,13 @@ const u = class u {
    */
   static resolveDataParamString(t, e) {
     return t.replace(
-      u.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));
       }
     );
   }
@@ -2368,17 +2421,17 @@ const u = class u {
    */
   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;
   }
@@ -2406,7 +2459,7 @@ const u = class u {
   static stringifyJsonTemplateStringContent(t) {
     if (t == null || Number.isNaN(t))
       return "";
-    const e = typeof t == "object" ? u.stringifyJsonTemplateValue(t) : String(t);
+    const e = typeof t == "object" ? l.stringifyJsonTemplateValue(t) : String(t);
     return JSON.stringify(e).slice(1, -1);
   }
   /**
@@ -2418,13 +2471,13 @@ const u = class u {
    */
   static resolveDataJsonString(t, e) {
     return t.replace(
-      u.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 u.isJsonStringContext(t, n) ? u.stringifyJsonTemplateStringContent(a) : u.stringifyJsonTemplateValue(a);
+        return l.isJsonStringContext(t, s) ? l.stringifyJsonTemplateStringContent(a) : l.stringifyJsonTemplateValue(a);
       }
     );
   }
@@ -2441,14 +2494,14 @@ const u = class u {
       return i;
     if (typeof i != "string" || r === null)
       return null;
-    const s = r.trim();
-    return u.SINGLE_PLACEHOLDER_REGEX.test(s) ? x.parseDataBind(i) : s.startsWith("{") || s.startsWith("[") ? x.parseDataBind(
-      u.resolveDataJsonString(
+    const n = r.trim();
+    return l.SINGLE_PLACEHOLDER_REGEX.test(n) ? R.parseDataBind(i) : n.startsWith("{") || n.startsWith("[") ? R.parseDataBind(
+      l.resolveDataJsonString(
         r,
         t.getBindingData()
       )
-    ) : x.parseDataBind(
-      u.resolveDataParamString(r, t.getBindingData())
+    ) : R.parseDataBind(
+      l.resolveDataParamString(r, t.getBindingData())
     );
   }
   /**
@@ -2463,28 +2516,29 @@ const u = class u {
       targetFragment: t
     };
     if (e) {
-      if (t.hasAttribute(u.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(u.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
-        u.attrName(e, "confirm")
-      )), t.hasAttribute(u.attrName(e, "data")) && (r.data = u.resolveDataAttribute(
+      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(l.attrName(e, "data")) && (r.data = l.resolveDataAttribute(
         t,
-        u.attrName(e, "data")
-      )), t.hasAttribute(u.attrName(e, "form"))) {
-        const l = t.getRawAttribute(
-          u.attrName(e, "form")
+        l.attrName(e, "data")
+      )), t.hasAttribute(l.attrName(e, "form"))) {
+        const h = t.getRawAttribute(
+          l.attrName(e, "form")
         );
-        if (l) {
-          const f = document.body.querySelector(l);
-          f !== null ? r.formFragment = m.getFormFragment(
-            N.get(f)
-          ) : h.error(
+        if (h) {
+          const f = document.body.querySelector(h);
+          f !== null ? r.formFragment = b.getFormFragment(
+            T.get(f)
+          ) : d.error(
             "Haori",
-            `Form element not found: ${l} (${u.attrName(e, "form")})`
+            `Form element not found: ${h} (${l.attrName(e, "form")})`
           );
         } else
-          r.formFragment = m.getFormFragment(t);
-      } else e === "change" && (r.formFragment = m.getFormFragment(t));
+          r.formFragment = b.getFormFragment(t);
+      } else e === "change" && (r.formFragment = b.getFormFragment(t));
       if (t.hasAttribute(`${c.prefix}${e}-before-run`)) {
-        const l = t.getRawAttribute(
+        const h = t.getRawAttribute(
           `${c.prefix}${e}-before-run`
         );
         try {
@@ -2493,166 +2547,166 @@ const u = class u {
             "fetchOptions",
             `
 "use strict";
-${l}
+${h}
 `
           );
         } catch (f) {
-          h.error("Haori", `Invalid before script: ${f}`);
+          d.error("Haori", `Invalid before script: ${f}`);
         }
       }
     }
-    const i = u.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 l = u.attrName(e, "fetch-method");
-      t.hasAttribute(l) && (n.method = t.getAttribute(
-        l
+      const h = l.attrName(e, "fetch-method");
+      t.hasAttribute(h) && (s.method = t.getAttribute(
+        h
       ));
     } else {
-      const l = u.attrName(null, "method", !0);
-      t.hasAttribute(l) && (n.method = t.getAttribute(
-        l
+      const h = l.attrName(null, "method", !0);
+      t.hasAttribute(h) && (s.method = t.getAttribute(
+        h
       ));
     }
     if (e) {
-      const l = u.attrName(e, "fetch-headers");
-      if (t.hasAttribute(l)) {
+      const h = l.attrName(e, "fetch-headers");
+      if (t.hasAttribute(h)) {
         const f = t.getRawAttribute(
-          l
+          h
         );
         try {
-          n.headers = x.parseDataBind(f);
-        } catch (p) {
-          h.error("Haori", `Invalid fetch headers: ${p}`);
+          s.headers = R.parseDataBind(f);
+        } catch (g) {
+          d.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     } else {
-      const l = u.attrName(
+      const h = l.attrName(
         null,
         "headers",
         !0
       );
-      if (t.hasAttribute(l)) {
+      if (t.hasAttribute(h)) {
         const f = t.getRawAttribute(
-          l
+          h
         );
         try {
-          n.headers = x.parseDataBind(f);
-        } catch (p) {
-          h.error("Haori", `Invalid fetch headers: ${p}`);
+          s.headers = R.parseDataBind(f);
+        } catch (g) {
+          d.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     }
     if (e) {
-      const l = u.attrName(
+      const h = l.attrName(
         e,
         "fetch-content-type"
       );
-      if (t.hasAttribute(l))
-        n.headers = {
-          ...n.headers,
-          "Content-Type": t.getAttribute(l)
+      if (t.hasAttribute(h))
+        s.headers = {
+          ...s.headers,
+          "Content-Type": t.getAttribute(h)
         };
-      else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let f = !1;
-        n.headers && typeof n.headers == "object" && (f = "Content-Type" in n.headers), f || (n.headers = {
-          ...n.headers,
+        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 l = u.attrName(
+      const h = l.attrName(
         null,
         "content-type",
         !0
       );
-      if (t.hasAttribute(l))
-        n.headers = {
-          ...n.headers,
-          "Content-Type": t.getAttribute(l)
+      if (t.hasAttribute(h))
+        s.headers = {
+          ...s.headers,
+          "Content-Type": t.getAttribute(h)
         };
-      else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let f = !1;
-        n.headers && typeof n.headers == "object" && (f = "Content-Type" in n.headers), f || (n.headers = {
-          ...n.headers,
+        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 ? u.attrName(e, "bind") : u.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 l = t.getRawAttribute(a);
-      if (l) {
-        const f = document.body.querySelectorAll(l);
-        f.length > 0 ? (r.bindFragments = [], f.forEach((p) => {
-          const E = N.get(p);
-          E && r.bindFragments.push(E);
-        })) : h.error(
+      const h = t.getRawAttribute(a);
+      if (h) {
+        const f = document.body.querySelectorAll(h);
+        f.length > 0 ? (r.bindFragments = [], f.forEach((g) => {
+          const A = T.get(g);
+          A && r.bindFragments.push(A);
+        })) : d.error(
           "Haori",
-          `Bind element not found: ${l} (${a})`
+          `Bind element not found: ${h} (${a})`
         );
       }
     }
-    const o = u.attrName(e, "bind-arg"), d = u.attrName(
+    const o = l.attrName(e, "bind-arg"), u = l.attrName(
       null,
       "arg",
       !0
-    ), y = u.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
-    ) : t.hasAttribute(y) && (r.bindArg = t.getRawAttribute(y));
-    const b = e ? u.attrName(e, "bind-params") : u.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(b)) {
-      const l = t.getRawAttribute(b);
-      r.bindParams = l.split("&").map((f) => f.trim());
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(u) ? r.bindArg = t.getRawAttribute(
+      u
+    ) : t.hasAttribute(m) && (r.bindArg = t.getRawAttribute(m));
+    const y = e ? l.attrName(e, "bind-params") : l.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(y)) {
+      const h = t.getRawAttribute(y);
+      r.bindParams = h.split("&").map((f) => f.trim());
     }
-    const A = e ? u.attrName(e, "bind-append") : u.attrName(null, "bind-append", !0);
-    if (t.hasAttribute(A)) {
-      const l = t.getRawAttribute(A);
-      r.bindAppendParams = l.split("&").map((f) => f.trim()).filter(Boolean);
+    const E = e ? l.attrName(e, "bind-append") : l.attrName(null, "bind-append", !0);
+    if (t.hasAttribute(E)) {
+      const h = t.getRawAttribute(E);
+      r.bindAppendParams = h.split("&").map((f) => f.trim()).filter(Boolean);
     }
-    const S = e ? u.attrName(e, "copy-params") : null;
+    const S = e ? l.attrName(e, "copy-params") : null;
     if (S && t.hasAttribute(S)) {
-      const l = t.getRawAttribute(
+      const h = t.getRawAttribute(
         S
       );
-      r.copyParams = l.split("&").map((f) => f.trim()).filter(Boolean);
+      r.copyParams = h.split("&").map((f) => f.trim()).filter(Boolean);
     }
     if (e) {
-      if (t.hasAttribute(u.attrName(e, "adjust"))) {
+      if (t.hasAttribute(l.attrName(e, "adjust"))) {
         const f = t.getRawAttribute(
-          u.attrName(e, "adjust")
+          l.attrName(e, "adjust")
         );
         if (f) {
-          const p = document.body.querySelectorAll(f);
-          p.length > 0 ? (r.adjustFragments = [], p.forEach((E) => {
-            const w = N.get(E);
-            w && r.adjustFragments.push(w);
-          })) : h.error(
+          const g = document.body.querySelectorAll(f);
+          g.length > 0 ? (r.adjustFragments = [], g.forEach((A) => {
+            const v = T.get(A);
+            v && r.adjustFragments.push(v);
+          })) : d.error(
             "Haori",
-            `Adjust element not found: ${f} (${u.attrName(e, "adjust")})`
+            `Adjust element not found: ${f} (${l.attrName(e, "adjust")})`
           );
         }
-        if (t.hasAttribute(u.attrName(e, "adjust-value"))) {
-          const p = t.getRawAttribute(
-            u.attrName(e, "adjust-value")
-          ), E = Number(p);
-          isNaN(E) || (r.adjustValue = E);
+        if (t.hasAttribute(l.attrName(e, "adjust-value"))) {
+          const g = t.getRawAttribute(
+            l.attrName(e, "adjust-value")
+          ), A = Number(g);
+          isNaN(A) || (r.adjustValue = A);
         }
       }
-      if (t.hasAttribute(u.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(u.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(u.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(u.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${c.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(`${c.prefix}${e}-after-run`)) {
         const f = t.getRawAttribute(
           `${c.prefix}${e}-after-run`
         );
@@ -2664,35 +2718,45 @@ ${l}
 ${f}
 `
           );
-        } catch (p) {
-          h.error("Haori", `Invalid after script: ${p}`);
+        } catch (g) {
+          d.error("Haori", `Invalid after script: ${g}`);
         }
       }
-      if (t.hasAttribute(u.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
-        u.attrName(e, "dialog")
-      )), t.hasAttribute(u.attrName(e, "toast")) && (r.toastMessage = t.getAttribute(
-        u.attrName(e, "toast")
-      )), t.hasAttribute(u.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
-        u.attrName(e, "redirect")
-      )), t.hasAttribute(u.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
-        u.attrName(e, "history")
-      )), t.hasAttribute(u.attrName(e, "history-data")) && (r.historyData = u.resolveDataAttribute(
+      if (t.hasAttribute(l.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
+        l.attrName(e, "dialog")
+      ).replace(/\\n/g, `
+`)), t.hasAttribute(l.attrName(e, "toast"))) {
+        r.toastMessage = t.getAttribute(
+          l.attrName(e, "toast")
+        );
+        const f = t.getRawAttribute(
+          l.attrName(e, "toast-level")
+        ), A = ["info", "warning", "error", "success"].includes(f);
+        r.toastLevel = A ? f : null;
+      }
+      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,
-        u.attrName(e, "history-data")
-      )), t.hasAttribute(u.attrName(e, "history-form"))) {
+        l.attrName(e, "history-data")
+      )), t.hasAttribute(l.attrName(e, "history-form"))) {
         const f = t.getRawAttribute(
-          u.attrName(e, "history-form")
+          l.attrName(e, "history-form")
         );
         if (f) {
-          const p = document.body.querySelector(f);
-          p !== null ? r.historyFormFragment = m.getFormFragment(
-            N.get(p)
-          ) : h.error(
+          const g = document.body.querySelector(f);
+          g !== null ? r.historyFormFragment = b.getFormFragment(
+            T.get(g)
+          ) : d.error(
             "Haori",
-            `Form element not found: ${f} (${u.attrName(e, "history-form")})`
+            `Form element not found: ${f} (${l.attrName(e, "history-form")})`
           );
         } else
-          r.historyFormFragment = m.getFormFragment(t);
+          r.historyFormFragment = b.getFormFragment(t);
       }
       [
         "reset",
@@ -2702,55 +2766,55 @@ ${f}
         "open",
         "close"
       ].forEach((f) => {
-        const p = u.attrName(e, f);
-        if (!t.hasAttribute(p))
+        const g = l.attrName(e, f);
+        if (!t.hasAttribute(g))
           return;
-        const E = t.getRawAttribute(p), w = [];
-        if (E ? (document.body.querySelectorAll(E).forEach((J) => {
-          const Q = N.get(J);
-          Q && w.push(Q);
-        }), w.length === 0 && h.error("Haori", `Element not found: ${E} (${p})`)) : w.push(t), w.length > 0)
+        const A = t.getRawAttribute(g), v = [];
+        if (A ? (document.body.querySelectorAll(A).forEach((W) => {
+          const tt = T.get(W);
+          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 = w;
+              r.resetFragments = v;
               break;
             case "refetch":
-              r.refetchFragments = w;
+              r.refetchFragments = v;
               break;
             case "click":
-              r.clickFragments = w;
+              r.clickFragments = v;
               break;
             case "copy":
-              r.copyFragments = w;
+              r.copyFragments = v;
               break;
             case "open":
-              r.openFragments = w;
+              r.openFragments = v;
               break;
             case "close":
-              r.closeFragments = w;
+              r.closeFragments = v;
               break;
           }
       });
     }
-    if (!e && (t.hasAttribute(u.attrName(null, "data", !0)) && (r.data = u.resolveDataAttribute(
+    if (!e && (t.hasAttribute(l.attrName(null, "data", !0)) && (r.data = l.resolveDataAttribute(
       t,
-      u.attrName(null, "data", !0)
-    )), t.hasAttribute(u.attrName(null, "form", !0)))) {
-      const l = t.getRawAttribute(
-        u.attrName(null, "form", !0)
+      l.attrName(null, "data", !0)
+    )), t.hasAttribute(l.attrName(null, "form", !0)))) {
+      const h = t.getRawAttribute(
+        l.attrName(null, "form", !0)
       );
-      if (l) {
-        const f = document.body.querySelector(l);
-        f !== null ? r.formFragment = m.getFormFragment(
-          N.get(f)
-        ) : h.error(
+      if (h) {
+        const f = document.body.querySelector(h);
+        f !== null ? r.formFragment = b.getFormFragment(
+          T.get(f)
+        ) : d.error(
           "Haori",
-          `Form element not found: ${l} (${u.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${h} (${l.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = m.getFormFragment(t);
+        r.formFragment = b.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 の構造的タイプガード。
@@ -2771,7 +2835,7 @@ ${f}
    * @param arg2 イベント名
    */
   constructor(t, e = null) {
-    u.isElementFragment(t) ? this.options = u.buildOptions(t, e) : this.options = t;
+    l.isElementFragment(t) ? this.options = l.buildOptions(t, e) : this.options = t;
   }
   /**
    * 一連の処理を実行します。オプションが空の場合は即座にresolveされます。
@@ -2812,81 +2876,81 @@ ${f}
     }
     const i = {};
     if (this.options.formFragment) {
-      const o = m.getValues(this.options.formFragment);
+      const o = b.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 || {} }, u = new Headers(
         o.headers || void 0
-      ), y = (o.method || "GET").toUpperCase(), b = c.runtime === "demo" && !at(y), A = b ? "GET" : y;
-      if (o.method = A, A === "GET" || A === "HEAD" || A === "OPTIONS")
-        s && (e = lt(e, i));
-      else if (s) {
-        const l = d.get("Content-Type") || "";
-        if (/multipart\/form-data/i.test(l)) {
-          d.delete("Content-Type");
+      ), m = (o.method || "GET").toUpperCase(), y = c.runtime === "demo" && !ct(m), E = y ? "GET" : m;
+      if (o.method = E, E === "GET" || E === "HEAD" || E === "OPTIONS")
+        n && (e = ht(e, i));
+      else if (n) {
+        const h = u.get("Content-Type") || "";
+        if (/multipart\/form-data/i.test(h)) {
+          u.delete("Content-Type");
           const f = new FormData();
-          for (const [p, E] of Object.entries(i))
-            E == null ? f.append(p, "") : E instanceof Blob ? f.append(p, E) : Array.isArray(E) ? E.forEach((w) => f.append(p, String(w))) : typeof E == "object" ? f.append(p, JSON.stringify(E)) : f.append(p, String(E));
+          for (const [g, A] of Object.entries(i))
+            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(l)) {
+        } else if (/application\/x-www-form-urlencoded/i.test(h)) {
           const f = new URLSearchParams();
-          for (const [p, E] of Object.entries(i))
-            E !== void 0 && (E === null ? f.append(p, "") : Array.isArray(E) ? E.forEach((w) => f.append(p, String(w))) : typeof E == "object" ? f.append(p, JSON.stringify(E)) : f.append(p, String(E)));
+          for (const [g, A] of Object.entries(i))
+            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);
+          u.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
       }
-      o.headers = d;
+      o.headers = u;
       let S;
-      if (b && (S = e && new URL(e, window.location.href).search || void 0, d.delete("Content-Type"), h.info("Haori demo fetch normalization", {
+      if (y && (S = e && new URL(e, window.location.href).search || void 0, u.delete("Content-Type"), d.info("Haori demo fetch normalization", {
         runtime: c.runtime,
-        requestedMethod: y,
-        effectiveMethod: A,
+        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 l = performance.now(), f = {
+        const h = performance.now(), f = {
           runtime: c.runtime,
-          requestedMethod: y,
-          effectiveMethod: A,
-          transportMode: b ? "query-get" : "http",
-          ...b ? { queryString: S } : {}
+          requestedMethod: m,
+          effectiveMethod: E,
+          transportMode: y ? "query-get" : "http",
+          ...y ? { queryString: S } : {}
         };
-        return v.fetchStart(
+        return w.fetchStart(
           this.options.targetFragment.getTarget(),
           e,
           o,
-          s ? i : void 0,
+          n ? i : void 0,
           f
-        ), fetch(e, o).then((p) => this.handleFetchResult(
-          p,
+        ), fetch(e, o).then((g) => this.handleFetchResult(
+          g,
           e || void 0,
-          l
-        )).catch((p) => {
-          throw e && v.fetchError(
+          h
+        )).catch((g) => {
+          throw e && w.fetchError(
             this.options.targetFragment.getTarget(),
             e,
-            p
-          ), p;
+            g
+          ), g;
         });
       }
-      return fetch(e, o).then((l) => this.handleFetchResult(l, e || void 0));
+      return fetch(e, o).then((h) => this.handleFetchResult(h, 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(
+    if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && n) {
+      const o = this.options.formFragment, u = o.getTarget();
+      u.setAttribute(
         `${c.prefix}bind`,
         JSON.stringify(i)
       );
-      const y = o.getBindingData();
-      Object.assign(y, i), await x.setBindingData(d, y);
+      const m = o.getBindingData();
+      Object.assign(m, i), await R.setBindingData(u, 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);
@@ -2895,16 +2959,16 @@ ${f}
    * フェッチ後の処理を実行します。
    */
   async handleFetchResult(t, e, r) {
-    const i = X();
+    const i = Y();
     if (!t.ok)
-      return this.options.targetFragment && e && v.fetchError(
+      return this.options.targetFragment && e && w.fetchError(
         this.options.targetFragment.getTarget(),
         e,
         new Error(`${t.status} ${t.statusText}`),
         t.status,
         r
       ), await this.handleFetchError(t), !1;
-    if (this.options.targetFragment && e && r && v.fetchEnd(
+    if (this.options.targetFragment && e && r && w.fetchEnd(
       this.options.targetFragment.getTarget(),
       e,
       t.status,
@@ -2917,13 +2981,13 @@ ${f}
         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) => m.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) => b.reset(a))
+    ), await this.copy();
+    const s = [];
     return this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((a) => {
-      n.push(new u(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(
@@ -2931,11 +2995,14 @@ ${f}
       );
     }), 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)) : h.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)) : h.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(this.options.toastMessage, "info"), this.pushHistory(), this.options.redirectUrl && (window.location.href = this.options.redirectUrl), !0;
+      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.scrollTarget && document.querySelector(this.options.scrollTarget)?.scrollIntoView({ behavior: "smooth", block: "nearest" }), this.options.redirectUrl && (window.location.href = this.options.redirectUrl), !0;
   }
   /**
    * history.pushState を実行します。
@@ -2948,26 +3015,30 @@ ${f}
     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();
-          h.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((y) => s.searchParams.append(o, String(y))) : typeof d == "object" ? s.searchParams.set(o, JSON.stringify(d)) : s.searchParams.set(o, String(d)));
+        const s = (a) => {
+          for (const [o, u] of Object.entries(a))
+            u != null && (Array.isArray(u) ? u.forEach((m) => n.searchParams.append(o, String(m))) : typeof u == "object" ? n.searchParams.set(o, JSON.stringify(u)) : n.searchParams.set(o, String(u)));
         };
-        e && n(this.options.historyData), r && n(
-          m.getValues(
+        e && s(this.options.historyData), r && s(
+          b.getValues(
             this.options.historyFormFragment
           )
-        ), history.pushState({}, "", s.toString());
+        ), history.pushState(
+          { [ot]: !0 },
+          "",
+          n.toString()
+        );
       } catch (i) {
-        h.error("Haori", `history.pushState failed: ${i}`);
+        d.error("Haori", `history.pushState failed: ${i}`);
       }
   }
   /**
@@ -2975,32 +3046,37 @@ ${f}
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = m.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = b.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (s) => {
-      const n = e ? e.getTarget() : document.body;
-      await X().addErrorMessage(n, s);
+      const a = e ? e.getTarget() : document.body;
+      await Y().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, u] of Object.entries(s.errors))
+              Array.isArray(u) ? a.push({ key: o, message: u.join(`
+`) }) : typeof u == "string" ? a.push({ key: o, message: u }) : u != null && a.push({ key: o, message: String(u) });
+          if (a.length === 0)
+            for (const [o, u] of Object.entries(s))
+              o === "message" || o === "messages" || o === "errors" || (Array.isArray(u) ? a.push({ key: o, message: u.join(`
+`) }) : typeof u == "string" && a.push({ key: o, message: u }));
         }
-        if (n.length === 0)
-          return await r(`${t.status} ${t.statusText}`), !1;
-        for (const a of n)
-          a.key && e ? await m.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 b.addErrorMessage(e, o.key, o.message) : await r(o.message);
+        return i(), !1;
       } catch {
       }
     try {
@@ -3009,7 +3085,7 @@ ${f}
     } catch {
       await r(`${t.status} ${t.statusText}`);
     }
-    return !1;
+    return i(), !1;
   }
   /**
    * 対象のフラグメント以下の入力要素に対してバリデーションを実行します。
@@ -3021,21 +3097,34 @@ ${f}
   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;
   }
   /**
    * 確認メッセージを表示し、ユーザーの確認を求めます。
@@ -3045,7 +3134,7 @@ ${f}
    */
   confirm() {
     const t = this.options.confirmMessage;
-    return t == null ? Promise.resolve(!0) : X().confirm(t);
+    return t == null ? Promise.resolve(!0) : Y().confirm(t);
   }
   /**
    * 結果データを対象のフラグメントにバインドします。
@@ -3055,40 +3144,40 @@ ${f}
   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], u = o && typeof o == "object" && !Array.isArray(o) ? o : {};
+            s[a] = this.mergeAppendBindingData(
+              n,
               r,
-              d
+              u
             );
           } else
-            n[a] = r;
-          i.push(x.setBindingData(s.getTarget(), n));
+            s[a] = r;
+          i.push(R.setBindingData(n.getTarget(), s));
         });
       else {
         if (typeof r == "string")
-          return h.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
+            R.setBindingData(
+              n.getTarget(),
+              s
             )
           );
         });
@@ -3103,10 +3192,10 @@ ${f}
   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;
   }
@@ -3117,11 +3206,11 @@ ${f}
     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 R.setBindingData(i.getTarget(), n);
     });
     return Promise.all(r).then(() => {
     });
@@ -3130,7 +3219,7 @@ ${f}
    * copy のコピー元データを取得します。
    */
   resolveCopySourceData() {
-    return this.options.formFragment ? m.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
+    return this.options.formFragment ? b.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
   }
   /**
    * copy-params が指定されている場合は対象キーだけ抽出します。
@@ -3153,8 +3242,8 @@ ${f}
     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(() => {
     });
@@ -3166,11 +3255,11 @@ ${f}
    */
   getRowFragment() {
     if (!this.options.targetFragment)
-      return h.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(
       `${c.prefix}row`
     );
-    return t || (h.error("Haori", "Row fragment not found."), null);
+    return t || (d.error("Haori", "Row fragment not found."), null);
   }
   /**
    * 行を追加します。
@@ -3186,7 +3275,7 @@ ${f}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(x.evaluateAll(r)), e.push(m.reset(r)), Promise.all(e).then(() => {
+    ), e.push(R.evaluateAll(r)), e.push(b.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3238,9 +3327,9 @@ ${f}
     return r ? r.insertAfter(t, e) : Promise.resolve();
   }
 };
-u.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, u.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
-let V = u;
-class ct {
+l.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, l.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
+let V = l;
+class ft {
   /**
    * URLのクエリパラメータを取得します。
    *
@@ -3248,12 +3337,12 @@ class ct {
    */
   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 ut {
+class dt {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -3270,28 +3359,28 @@ class ut {
     let r;
     try {
       r = await fetch(t, e);
-    } catch (s) {
-      throw h.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 h.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 h.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 : (h.warn("[Haori]", "No body found in imported document:", t), i);
-    } catch (s) {
-      return h.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;
     }
   }
 }
-const g = class g {
+const p = class p {
   /**
    * 遅延属性かどうか（完全名で判定）を判定します。
    *
@@ -3299,7 +3388,7 @@ const g = class g {
    * @returns 遅延属性かどうか
    */
   static isDeferredAttributeName(t) {
-    return g.DEFERRED_ATTRIBUTE_SUFFIXES.some(
+    return p.DEFERRED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${c.prefix}${e}`
     );
   }
@@ -3310,7 +3399,7 @@ const g = class g {
    * @returns 除外対象かどうか
    */
   static isEvaluateAllExcludedAttributeName(t) {
-    return g.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
+    return p.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${c.prefix}${e}`
     );
   }
@@ -3322,7 +3411,30 @@ const g = class g {
    * @returns 再評価する場合は true
    */
   static shouldReevaluateAttribute(t, e) {
-    return e !== null && !g.isEvaluateAllExcludedAttributeName(t) && g.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
+    return e !== null && !p.isEvaluateAllExcludedAttributeName(t) && p.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
+  }
+  /**
+   * data-attr-* 形式の属性名から実際に更新する属性名を取得します。
+   *
+   * @param name 属性名
+   * @returns 実際の属性名。data-attr-* でない場合は null
+   */
+  static getAliasedAttributeName(t) {
+    const e = `${c.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}`;
+    return !t.startsWith(e) || t.length <= e.length ? null : t.slice(e.length);
+  }
+  /**
+   * 実属性の変更が data-attr-* の内部反映かどうかを判定します。
+   *
+   * @param element 対象要素
+   * @param name 変更された属性名
+   * @returns data-attr-* の内部反映なら true
+   */
+  static isAliasedAttributeReflection(t, e) {
+    const r = T.get(t);
+    return r instanceof x ? r.hasAttribute(
+      `${c.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}${e}`
+    ) : !1;
   }
   /**
    * プレースホルダを含む通常属性を再評価します。
@@ -3335,7 +3447,9 @@ const g = class g {
     let e = Promise.resolve();
     for (const r of t.getAttributeNames()) {
       const i = t.getRawAttribute(r);
-      g.shouldReevaluateAttribute(r, i) && (e = e.then(() => t.setAttribute(r, i)));
+      p.shouldReevaluateAttribute(r, i) && (e = e.then(
+        () => p.setAttribute(t.getTarget(), r, i)
+      ));
     }
     return e.then(() => {
     });
@@ -3347,40 +3461,47 @@ const g = class g {
    * @returns Promise (スキャンが完了したときに解決される)
    */
   static scan(t) {
-    const e = N.get(t);
+    const e = T.get(t);
     if (!e)
       return Promise.resolve();
-    t.parentNode && (N.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
-    const r = [], i = /* @__PURE__ */ new Set();
-    for (const s of g.PRIORITY_ATTRIBUTE_SUFFIXES) {
-      const n = c.prefix + s;
-      e.hasAttribute(n) && (r.push(
-        g.setAttribute(
+    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 n of p.PRIORITY_ATTRIBUTE_SUFFIXES) {
+      const s = c.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) || g.isDeferredAttributeName(s))
+    for (const n of e.getAttributeNames()) {
+      if (i.has(n) || p.isDeferredAttributeName(n))
         continue;
-      const n = e.getRawAttribute(s);
-      n !== null && r.push(g.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 g.DEFERRED_ATTRIBUTE_SUFFIXES) {
-      const n = c.prefix + s;
-      e.hasAttribute(n) && (r.push(
-        g.setAttribute(
+    for (const n of p.DEFERRED_ATTRIBUTE_SUFFIXES) {
+      const s = c.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 e.getChildren().forEach((s) => {
-      s instanceof D ? r.push(g.scan(s.getTarget())) : s instanceof L && r.push(g.evaluateText(s));
-    }), Promise.all(r).then(() => {
+    return r.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(() => {
     });
   }
   /**
@@ -3393,17 +3514,20 @@ const g = class g {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r) {
-    const i = N.get(t), s = [];
+    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 `${c.prefix}bind`: {
-        r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(g.parseDataBind(r));
+        r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(p.parseDataBind(r));
         break;
       }
       case `${c.prefix}if`:
-        s.push(g.evaluateIf(i));
+        s.push(p.evaluateIf(i));
         break;
       case `${c.prefix}each`:
-        s.push(g.evaluateEach(i));
+        s.push(p.evaluateEach(i));
         break;
       case `${c.prefix}fetch`:
         s.push(
@@ -3413,29 +3537,29 @@ const g = class g {
         break;
       case `${c.prefix}import`: {
         if (typeof r == "string") {
-          const n = i.getTarget(), a = performance.now();
-          v.importStart(n, r), s.push(
-            ut.load(r).then((o) => {
-              const d = new TextEncoder().encode(o).length;
+          const a = i.getTarget(), o = performance.now();
+          w.importStart(a, r), s.push(
+            dt.load(r).then((u) => {
+              const m = new TextEncoder().encode(u).length;
               return P.enqueue(() => {
-                n.innerHTML = o;
+                a.innerHTML = u;
               }).then(() => {
-                v.importEnd(n, r, d, a);
+                w.importEnd(a, r, m, o);
               });
-            }).catch((o) => {
-              v.importError(n, r, o), h.error("[Haori]", "Failed to import HTML:", r, o);
+            }).catch((u) => {
+              w.importError(a, r, u), d.error("[Haori]", "Failed to import HTML:", r, u);
             })
           );
         }
         break;
       }
       case `${c.prefix}url-param`: {
-        const n = i.getAttribute(`${c.prefix}url-arg`), a = ct.readParams();
-        if (n === null)
-          g.setBindingData(t, a);
+        const a = i.getAttribute(`${c.prefix}url-arg`), o = ft.readParams();
+        if (a === null)
+          s.push(p.setBindingData(t, o));
         else {
-          const o = i.getRawBindingData() || {};
-          o[String(n)] = a, g.setBindingData(t, o);
+          const u = i.getRawBindingData() || {};
+          u[String(a)] = o, s.push(p.setBindingData(t, u));
         }
         break;
       }
@@ -3452,16 +3576,17 @@ const g = class g {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setBindingData(t, e) {
-    const r = N.get(t), i = r.getRawBindingData();
+    const r = T.get(t), i = r.getRawBindingData();
     r.setBindingData(e);
-    const s = [];
-    if (s.push(
-      r.setAttribute(`${c.prefix}bind`, JSON.stringify(e))
-    ), t.tagName === "FORM") {
-      const n = r.getAttribute(`${c.prefix}form-arg`), a = n && e[String(n)] && typeof e[String(n)] == "object" && !Array.isArray(e[String(n)]) ? e[String(n)] : n ? {} : e;
-      s.push(m.syncValues(r, a));
+    let n = r.setAttribute(
+      `${c.prefix}bind`,
+      JSON.stringify(e)
+    );
+    if (t.tagName === "FORM") {
+      const s = r.getAttribute(`${c.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(() => b.syncValues(r, a));
     }
-    return s.push(g.evaluateAll(r)), v.bindChange(t, i, e, "manual"), Promise.all(s).then(() => {
+    return n = n.then(() => p.evaluateAll(r)), w.bindChange(t, i, e, "manual"), n.then(() => {
     });
   }
   /**
@@ -3475,12 +3600,12 @@ const g = class g {
       try {
         return JSON.parse(t);
       } catch (e) {
-        return h.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;
     }
   }
@@ -3491,11 +3616,11 @@ const g = class g {
    * @param node 追加するノード
    */
   static addNode(t, e) {
-    const r = N.get(t);
+    const r = T.get(t);
     if (r.isSkipMutationNodes())
       return;
-    const i = N.get(e.nextSibling), s = N.get(e);
-    s && (r.insertBefore(s, i), s instanceof D ? g.scan(s.getTarget()) : s instanceof L && g.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));
   }
   /**
    * ノードを親要素から削除します。
@@ -3503,7 +3628,7 @@ const g = class g {
    * @param node 削除するノード
    */
   static removeNode(t) {
-    const e = N.get(t);
+    const e = T.get(t);
     if (e) {
       const r = e.getParent();
       if (r && r.isSkipMutationNodes())
@@ -3518,7 +3643,7 @@ const g = class g {
    * @param text 新しいテキスト
    */
   static changeText(t, e) {
-    const r = N.get(t);
+    const r = T.get(t);
     r && r.setContent(e);
   }
   /**
@@ -3530,16 +3655,16 @@ const g = class g {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static changeValue(t, e) {
-    const r = N.get(t);
+    const r = T.get(t);
     if (r.getValue() === e)
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
-    const s = g.getFormFragment(r);
-    if (s) {
-      const n = m.getValues(s), a = s.getAttribute(`${c.prefix}form-arg`);
+    const n = p.getFormFragment(r);
+    if (n) {
+      const s = b.getValues(n), a = n.getAttribute(`${c.prefix}form-arg`);
       let o;
-      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(g.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(() => {
     });
@@ -3554,7 +3679,7 @@ const g = class g {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
     const e = t.getParent();
-    return e ? g.getFormFragment(e) : null;
+    return e ? p.getFormFragment(e) : null;
   }
   /**
    * フラグメントとその子要素を評価します。
@@ -3564,10 +3689,16 @@ const g = class g {
    */
   static evaluateAll(t) {
     const e = [];
-    return e.push(g.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${c.prefix}if`) && e.push(g.evaluateIf(t)), t.hasAttribute(`${c.prefix}each`) && e.push(g.evaluateEach(t)), t.getChildren().forEach((r) => {
-      r instanceof D ? e.push(g.evaluateAll(r)) : r instanceof L && e.push(g.evaluateText(r));
+    return e.push(p.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${c.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${c.prefix}each`) ? Promise.all(e).then(() => p.evaluateEach(t)).then(() => {
+      const r = [];
+      return t.getChildren().forEach((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 x ? e.push(p.evaluateAll(r)) : r instanceof H && e.push(p.evaluateText(r));
     }), Promise.all(e).then(() => {
-    });
+    }));
   }
   /**
    * テキストフラグメントを評価します。
@@ -3589,13 +3720,13 @@ const g = class g {
     const e = [], r = t.getAttribute(`${c.prefix}if`);
     return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
       t.hide().then(() => {
-        v.hide(t.getTarget());
+        w.hide(t.getTarget());
       })
     ) : t.isVisible() || (e.push(
       t.show().then(() => {
-        v.show(t.getTarget());
+        w.show(t.getTarget());
       })
-    ), e.push(g.evaluateAll(t))), Promise.all(e).then(() => {
+    ), e.push(p.evaluateAll(t))), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3610,20 +3741,20 @@ const g = class g {
     let e = t.getTemplate();
     if (e === null) {
       let i = !1;
-      t.getChildren().forEach((n) => {
-        if (!i && n instanceof D) {
-          if (n.hasAttribute(`${c.prefix}each-before`) || n.hasAttribute(`${c.prefix}each-after`))
+      t.getChildren().forEach((s) => {
+        if (!i && s instanceof x) {
+          if (s.hasAttribute(`${c.prefix}each-before`) || s.hasAttribute(`${c.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(`${c.prefix}each`);
-      return Array.isArray(s) ? this.updateDiff(t, s) : (h.error("[Haori]", "Invalid each attribute:", s), Promise.reject(new Error("Invalid each attribute.")));
+      const n = t.getAttribute(`${c.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(`${c.prefix}each`);
-    return Array.isArray(r) ? this.updateDiff(t, r) : (h.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
+    return Array.isArray(r) ? this.updateDiff(t, r) : (d.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
   }
   /**
    * 差分を更新します。
@@ -3634,73 +3765,73 @@ const g = class g {
   static updateDiff(t, e) {
     const r = t.getTemplate();
     if (r === null)
-      return h.error("[Haori]", "Template is not set for each element."), Promise.resolve();
+      return d.error("[Haori]", "Template is not set for each element."), Promise.resolve();
     let i = t.getAttribute(`${c.prefix}each-index`);
     i && (i = String(i));
-    const s = t.getAttribute(`${c.prefix}each-key`), n = t.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    e.forEach((l, f) => {
-      const p = g.createListKey(
-        l,
-        s ? String(s) : null,
+    const n = t.getAttribute(`${c.prefix}each-key`), s = t.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
+    e.forEach((h, f) => {
+      const g = p.createListKey(
+        h,
+        n ? String(n) : null,
         f
       );
-      o.push(p), a.set(p, { item: l, itemIndex: f });
+      o.push(g), a.set(g, { item: h, itemIndex: f });
     });
-    const d = [];
-    let y = t.getChildren().filter((l) => l instanceof D).filter(
-      (l) => !l.hasAttribute(`${c.prefix}each-before`) && !l.hasAttribute(`${c.prefix}each-after`)
+    const u = [];
+    let m = t.getChildren().filter((h) => h instanceof x).filter(
+      (h) => !h.hasAttribute(`${c.prefix}each-before`) && !h.hasAttribute(`${c.prefix}each-after`)
     );
-    y = y.filter((l) => o.indexOf(String(l.getListKey())) === -1 ? (d.push(l.remove()), !1) : !0);
-    const b = y.map((l) => l.getListKey()), A = t.getChildren().filter((l) => l instanceof D).filter((l) => l.hasAttribute(`${c.prefix}each-before`)).length;
+    m = m.filter((h) => o.indexOf(String(h.getListKey())) === -1 ? (u.push(h.remove()), !1) : !0);
+    const y = m.map((h) => h.getListKey()), E = t.getChildren().filter((h) => h instanceof x).filter((h) => h.hasAttribute(`${c.prefix}each-before`)).length;
     let S = Promise.resolve();
-    return o.forEach((l, f) => {
-      const p = b.indexOf(l), { item: E, itemIndex: w } = a.get(l);
+    return o.forEach((h, f) => {
+      const g = y.indexOf(h), { item: A, itemIndex: v } = a.get(h);
       let k;
-      if (p !== -1)
-        k = y[p], S = S.then(
-          () => g.updateRowFragment(
+      if (g !== -1)
+        k = m[g], S = S.then(
+          () => p.updateRowFragment(
             k,
-            E,
+            A,
             i,
-            w,
-            n ? String(n) : null,
-            l
-          ).then(() => g.evaluateAll(k))
+            v,
+            s ? String(s) : null,
+            h
+          ).then(() => p.evaluateAll(k))
         );
       else {
         k = r.clone();
-        const J = A + f;
+        const W = E + f;
         S = S.then(
-          () => g.updateRowFragment(
+          () => p.updateRowFragment(
             k,
-            E,
+            A,
             i,
-            w,
-            n ? String(n) : null,
-            l
+            v,
+            s ? String(s) : null,
+            h
           ).then(
             () => t.insertBefore(
               k,
-              t.getChildren()[J] || null
-            ).then(() => g.evaluateAll(k))
+              t.getChildren()[W] || null
+            ).then(() => p.evaluateAll(k))
           )
         );
       }
-    }), Promise.all(d).then(() => S).then(() => {
-      const l = o.filter(
-        (w) => w !== null
-      ), f = b.filter(
-        (w) => w !== null
-      ), p = l.filter(
-        (w) => !f.includes(w)
-      ), E = f.filter(
-        (w) => !l.includes(w)
+    }), Promise.all(u).then(() => S).then(() => {
+      const h = o.filter(
+        (v) => v !== null
+      ), f = y.filter(
+        (v) => v !== null
+      ), g = h.filter(
+        (v) => !f.includes(v)
+      ), A = f.filter(
+        (v) => !h.includes(v)
       );
-      v.eachUpdate(
+      w.eachUpdate(
         t.getTarget(),
-        p,
-        E,
-        l
+        g,
+        A,
+        h
       );
     });
   }
@@ -3716,8 +3847,8 @@ const g = class g {
     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
@@ -3735,34 +3866,34 @@ const g = class g {
    * @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 h.error(
+      return d.error(
         "[Haori]",
         `Primitive value requires '${c.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve();
-    return t.setListKey(n), t.setBindingData(a), t.setAttribute(`${c.prefix}row`, n);
+    return t.setListKey(s), t.setBindingData(a), t.setAttribute(`${c.prefix}row`, s);
   }
 };
-g.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], g.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], g.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
+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 = [
   "bind",
   "if",
   "each",
   "fetch",
   "import",
   "url-param"
-], g.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
-let x = g;
-class ht {
+], p.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
+let R = p;
+const X = class X {
   /**
    * コンストラクタ。
    *
@@ -3770,22 +3901,25 @@ class ht {
    */
   constructor(t = document) {
     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 = N.get(e);
+      const e = document.documentElement, r = T.get(e);
       r && new V(r, "load").run();
+    }, this.onPopstate = (e) => {
+      const r = e.state;
+      !r || r[X.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を実行します。
@@ -3797,9 +3931,9 @@ class ht {
     const r = this.getElementFromTarget(t.target);
     if (!r)
       return;
-    const i = N.get(r);
-    i && (e === "change" && i instanceof D && i.syncValue(), new V(i, e).run().catch((s) => {
-      h.error("[Haori]", "Procedure execution error:", s);
+    const i = T.get(r);
+    i && (e === "change" && i instanceof x && i.syncValue(), new V(i, e).run().catch((n) => {
+      d.error("[Haori]", "Procedure execution error:", n);
     }));
   }
   /**
@@ -3811,55 +3945,57 @@ class ht {
   getElementFromTarget(t) {
     return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
   }
-}
-const T = class T {
+};
+X.HISTORY_STATE_KEY = "__haoriHistoryState__";
+let Q = X;
+const N = class N {
   static syncTree(t) {
-    (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && T.syncElement(t), t.querySelectorAll("*").forEach((e) => {
-      T.syncElement(e);
+    (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && N.syncElement(t), t.querySelectorAll("*").forEach((e) => {
+      N.syncElement(e);
     }));
   }
   static syncElement(t) {
-    const e = T.registrations.get(t), r = N.get(t);
-    if (!r || !T.shouldObserve(r)) {
-      e && (e.observer.disconnect(), T.registrations.delete(t));
+    const e = N.registrations.get(t), r = T.get(t);
+    if (!r || !N.shouldObserve(r)) {
+      e && (e.observer.disconnect(), N.registrations.delete(t));
       return;
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = T.resolveRoot(r), s = T.resolveRootMargin(r), n = T.resolveThreshold(r), a = r.hasAttribute(`${c.prefix}intersect-once`);
-    if (e && e.observer.root === i && e.observer.rootMargin === s && T.sameThreshold(
+    const i = N.resolveRoot(r), n = N.resolveRootMargin(r), s = N.resolveThreshold(r), a = r.hasAttribute(`${c.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(), T.registrations.delete(t));
+    e && (e.observer.disconnect(), N.registrations.delete(t));
     const o = new IntersectionObserver(
-      (d) => {
-        const y = T.registrations.get(t);
-        y && d.forEach((b) => {
-          !b.isIntersecting || y.running || T.isDisabled(y.fragment) || (y.running = !0, new V(y.fragment, "intersect").runWithResult().then((A) => {
-            A && y.once && (y.observer.disconnect(), T.registrations.delete(t));
-          }).catch((A) => {
-            h.error(
+      (u) => {
+        const m = N.registrations.get(t);
+        m && u.forEach((y) => {
+          !y.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) => {
+            d.error(
               "[Haori]",
               "Intersect procedure execution error:",
-              A
+              E
             );
           }).finally(() => {
-            const A = T.registrations.get(t);
-            A && (A.running = !1);
+            const E = N.registrations.get(t);
+            E && (E.running = !1);
           }));
         });
       },
       {
         root: i,
-        rootMargin: s,
-        threshold: n
+        rootMargin: n,
+        threshold: s
       }
     );
-    o.observe(t), T.registrations.set(t, {
+    o.observe(t), N.registrations.set(t, {
       fragment: r,
       observer: o,
       once: a,
@@ -3868,25 +4004,25 @@ const T = class T {
   }
   static cleanupTree(t) {
     if (t instanceof HTMLElement) {
-      const e = T.registrations.get(t);
-      e && (e.observer.disconnect(), T.registrations.delete(t));
+      const e = N.registrations.get(t);
+      e && (e.observer.disconnect(), N.registrations.delete(t));
     }
     (t instanceof Element || t instanceof DocumentFragment) && t.querySelectorAll("*").forEach((e) => {
-      const r = T.registrations.get(e);
-      r && (r.observer.disconnect(), T.registrations.delete(e));
+      const r = N.registrations.get(e);
+      r && (r.observer.disconnect(), N.registrations.delete(e));
     });
   }
   static disconnectAll() {
-    T.registrations.forEach((t) => {
+    N.registrations.forEach((t) => {
       t.observer.disconnect();
-    }), T.registrations.clear();
+    }), N.registrations.clear();
   }
   static shouldObserve(t) {
     return t.getAttributeNames().some((e) => {
       if (!e.startsWith(`${c.prefix}intersect-`))
         return !1;
       const r = e.slice(`${c.prefix}intersect-`.length);
-      return !T.CONFIG_KEYS.has(r);
+      return !N.CONFIG_KEYS.has(r);
     });
   }
   static resolveRoot(t) {
@@ -3897,7 +4033,7 @@ const T = class T {
     if (typeof r != "string" || r.trim() === "")
       return null;
     const i = document.querySelector(r);
-    return i instanceof HTMLElement ? i : (h.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 = `${c.prefix}intersect-root-margin`, r = t.getAttribute(e);
@@ -3920,28 +4056,28 @@ const T = class T {
     return t.length === 1 && t[0] === e;
   }
 };
-T.CONFIG_KEYS = /* @__PURE__ */ new Set([
+N.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "root",
   "root-margin",
   "threshold",
   "disabled",
   "once"
-]), T.registrations = /* @__PURE__ */ new Map();
-let $ = T;
-const H = class H {
+]), N.registrations = /* @__PURE__ */ new Map();
+let $ = N;
+const I = class I {
   /**
    * 初期化メソッド。
    * ドキュメントのheadとbodyを監視対象として設定します。
    */
   static async init() {
-    if (H._initialized)
+    if (I._initialized)
       return;
-    H._initialized = !0;
+    I._initialized = !0;
     const t = await Promise.allSettled([
-      x.scan(document.head),
-      x.scan(document.body)
+      R.scan(document.head),
+      R.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", r.reason), H.observe(document.head), H.observe(document.body), new ht().start(), $.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), I.observe(document.head), I.observe(document.body), new Q().start(), $.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -3954,40 +4090,45 @@ const H = class H {
         try {
           switch (i.type) {
             case "attributes": {
-              h.info(
+              d.info(
                 "[Haori]",
                 "Attribute changed:",
                 i.target,
                 i.attributeName
               );
-              const s = i.target;
-              x.setAttribute(
-                s,
+              const n = i.target;
+              if (i.attributeName && R.isAliasedAttributeReflection(
+                n,
+                i.attributeName
+              ))
+                break;
+              R.setAttribute(
+                n,
                 i.attributeName,
-                s.getAttribute(i.attributeName)
-              ), $.syncElement(s);
+                n.getAttribute(i.attributeName)
+              ), $.syncElement(n);
               break;
             }
             case "childList": {
-              h.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) => {
-                $.cleanupTree(s), x.removeNode(s);
-              }), Array.from(i.addedNodes).forEach((s) => {
-                s.parentElement instanceof HTMLElement && (x.addNode(s.parentElement, s), $.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), R.removeNode(n);
+              }), Array.from(i.addedNodes).forEach((n) => {
+                n.parentElement instanceof HTMLElement && (R.addNode(n.parentElement, n), $.syncTree(n));
               });
               break;
             }
             case "characterData": {
-              h.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) : h.warn(
+              ), i.target instanceof Text || i.target instanceof Comment ? R.changeText(i.target, i.target.textContent) : d.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -3995,33 +4136,33 @@ const H = class H {
               break;
             }
             default:
-              h.warn("[Haori]", "Unknown mutation type:", i.type);
+              d.warn("[Haori]", "Unknown mutation type:", i.type);
               continue;
           }
-        } catch (s) {
-          h.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
-    }), h.info("[Haori]", "Observer initialized for", t);
+    }), d.info("[Haori]", "Observer initialized for", t);
   }
 };
-H._initialized = !1;
-let q = H;
+I._initialized = !1;
+let q = I;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", q.init) : q.init();
-const ft = "0.4.3";
+const pt = "0.4.3";
 export {
-  x as Core,
+  R as Core,
   c as Env,
-  m as Form,
-  N as Fragment,
-  tt as Haori,
-  h as Log,
+  b as Form,
+  T as Fragment,
+  J as Haori,
+  d as Log,
   P as Queue,
-  tt as default,
-  ft as version
+  J as default,
+  pt as version
 };
 //# sourceMappingURL=haori.es.js.map