haori 0.7.0 → 0.9.0

package/dist/haori.es.js

@@ -1,23 +1,23 @@
-const q = class q {
+const z = class z {
   /**
    * 開発モードの状態を取得します。
    *
    * @returns 開発モードならtrue、そうでなければfalse
    */
   static isEnabled() {
-    return q.devMode;
+    return z.devMode;
   }
   /**
    * 開発モードを有効化します。
    */
   static enable() {
-    q.devMode = !0;
+    z.devMode = !0;
   }
   /**
    * 開発モードを無効化します。
    */
   static disable() {
-    q.devMode = !1;
+    z.devMode = !1;
   }
   /**
    * 開発モードを切り替えます。
@@ -25,17 +25,17 @@ const q = class q {
    * @param enabled trueで有効化、falseで無効化
    */
   static set(e) {
-    q.devMode = e;
+    z.devMode = e;
   }
 };
-q.devMode = !1;
-let U = q;
+z.devMode = !1;
+let L = z;
 const se = "embedded";
-function ue(D) {
-  return D === "embedded" || D === "demo";
+function ce(T) {
+  return T === "embedded" || T === "demo";
 }
-function he(D) {
-  return D === null ? null : ue(D) ? D : se;
+function de(T) {
+  return T === null ? null : ce(T) ? T : se;
 }
 const $ = class $ {
   /**
@@ -53,7 +53,7 @@ const $ = class $ {
    * @return 戻り値はありません。
    */
   static setRuntime(e) {
-    $._runtime = ue(e) ? e : se;
+    $._runtime = ce(e) ? e : se;
   }
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
@@ -67,21 +67,21 @@ const $ = class $ {
       if (e instanceof HTMLScriptElement) {
         const r = e.getAttribute("data-prefix") || $._prefix;
         $._prefix = r.endsWith("-") ? r : r + "-";
-        const i = he(
+        const i = de(
           e.getAttribute("data-runtime")
         );
         i !== null && ($._runtime = i);
       }
       if (e instanceof HTMLScriptElement && e.hasAttribute(`${$._prefix}dev`)) {
-        U.set(!0);
+        L.set(!0);
         return;
       }
       const t = window.location.hostname;
       if (t === "localhost" || t.endsWith(".localhost") || t === "127.0.0.1" || t === "::1" || t.endsWith(".local")) {
-        U.set(!0);
+        L.set(!0);
         return;
       }
-      U.set(!1);
+      L.set(!1);
     } catch {
     }
   }
@@ -97,7 +97,7 @@ const $ = class $ {
 $._prefix = "data-", $._runtime = se;
 let l = $;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", l.detect) : l.detect();
-class g {
+class p {
   /**
    * 開発モードでのみコンソールに情報を出力します。
    *
@@ -105,7 +105,7 @@ class g {
    * @param args 追加の引数
    */
   static info(e, ...t) {
-    U.isEnabled() && console.log && console.log(e, ...t);
+    L.isEnabled() && console.log && console.log(e, ...t);
   }
   /**
    * 開発モードでのみコンソールに警告を出力します。
@@ -114,7 +114,7 @@ class g {
    * @param args 追加の引数
    */
   static warn(e, ...t) {
-    U.isEnabled() && console.warn && console.warn(e, ...t);
+    L.isEnabled() && console.warn && console.warn(e, ...t);
   }
   /**
    * モードに関係なくコンソールにエラーを出力します。
@@ -126,7 +126,7 @@ class g {
     console.error(e, ...t);
   }
 }
-const C = class C {
+const I = class I {
   /**
    * 明示バインド内に持ち込まれてはならない危険値を返します。
    *
@@ -197,18 +197,18 @@ const C = class C {
    */
   static evaluateDetailed(e, t = {}) {
     if (this.scheduleForbiddenBindingValueCacheReset(), e.trim() === "")
-      return g.warn("[Haori]", e, "Expression is empty"), { value: null, unresolvedReference: !1 };
+      return p.warn("[Haori]", e, "Expression is empty"), { value: null, unresolvedReference: !1 };
     if (this.containsDangerousPatterns(e))
-      return g.warn("[Haori]", e, "Expression contains dangerous patterns"), { value: null, unresolvedReference: !1 };
+      return p.warn("[Haori]", e, "Expression contains dangerous patterns"), { value: null, unresolvedReference: !1 };
     if (this.containsForbiddenKeys(t))
-      return g.warn("[Haori]", t, "Binded values contain forbidden keys"), { value: null, unresolvedReference: !1 };
+      return p.warn("[Haori]", t, "Binded values contain forbidden keys"), { value: null, unresolvedReference: !1 };
     const r = this.getForbiddenBindingValueSet();
     if (this.containsForbiddenBindingValues(
       t,
       /* @__PURE__ */ new WeakSet(),
       r
     ))
-      return g.warn(
+      return p.warn(
         "[Haori]",
         t,
         "Binded values contain forbidden values"
@@ -236,10 +236,10 @@ const C = class C {
             continue;
           }
         }
-        return g.error("[Haori]", "Expression evaluation error:", e, o), o instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
+        return p.error("[Haori]", "Expression evaluation error:", e, o), o instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
       }
     }
-    return g.error(
+    return p.error(
       "[Haori]",
       "Failed to recover missing identifiers:",
       e,
@@ -273,7 +273,7 @@ return (${e});`;
         compileFailed: !1
       };
     } catch (o) {
-      return g.error(
+      return p.error(
         "[Haori]",
         "Failed to compile expression:",
         e,
@@ -755,7 +755,7 @@ return (${e});`;
     return this.forbiddenBindingValueCache.set(e, !1), !1;
   }
 };
-C.MAX_IDENTIFIER_RECOVERY_COUNT = 8, C.forbiddenBindingValueCache = /* @__PURE__ */ new WeakMap(), C.forbiddenBindingValueCacheResetScheduled = !1, C.FORBIDDEN_NAMES = [
+I.MAX_IDENTIFIER_RECOVERY_COUNT = 8, I.forbiddenBindingValueCache = /* @__PURE__ */ new WeakMap(), I.forbiddenBindingValueCacheResetScheduled = !1, I.FORBIDDEN_NAMES = [
   // グローバルオブジェクト
   "window",
   "self",
@@ -787,23 +787,23 @@ C.MAX_IDENTIFIER_RECOVERY_COUNT = 8, C.forbiddenBindingValueCache = /* @__PURE__
   "sessionStorage",
   "IndexedDB",
   "history"
-], C.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], C.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set(["location"]), C.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
-  ...C.FORBIDDEN_NAMES.filter(
-    (e) => !C.REBINDABLE_FORBIDDEN_NAMES.has(e)
+], I.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], I.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set(["location"]), I.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
+  ...I.FORBIDDEN_NAMES.filter(
+    (e) => !I.REBINDABLE_FORBIDDEN_NAMES.has(e)
   ),
   "constructor",
   "__proto__",
   "prototype",
-  ...C.STRICT_FORBIDDEN_NAMES
-]), C.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
+  ...I.STRICT_FORBIDDEN_NAMES
+]), I.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
   "constructor",
   "__proto__",
   "prototype"
-]), C.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
+]), I.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
   "get",
   "set",
   "async"
-]), C.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
+]), I.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
   "await",
   "break",
   "case",
@@ -837,9 +837,9 @@ C.MAX_IDENTIFIER_RECOVERY_COUNT = 8, C.forbiddenBindingValueCache = /* @__PURE__
   "while",
   "with",
   "yield"
-]), C.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
-let W = C;
-class de {
+]), I.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
+let Y = I;
+class ae {
   constructor() {
     this.MAX_BUDGET = 8, this.queue = [], this.processing = !1;
   }
@@ -881,13 +881,13 @@ class de {
             const r = await t.task();
             t.resolve(r);
           } catch (r) {
-            t.reject(r), g.error("[Haori]", `Task ${t.timestamp} failed:`, r);
+            t.reject(r), p.error("[Haori]", `Task ${t.timestamp} failed:`, r);
           }
           if (performance.now() - e > this.MAX_BUDGET)
             break;
         }
       } catch (e) {
-        g.error("[Haori]", "Error processing queue:", e);
+        p.error("[Haori]", "Error processing queue:", e);
       } finally {
         this.processing = !1, this.queue.length > 0 && this.scheduleProcessing();
       }
@@ -914,8 +914,35 @@ class de {
     const e = this.queue.map((t) => t.promise);
     e.length > 0 && await Promise.allSettled(e);
   }
+  /**
+   * 現在処理中・待機中のタスクに加えて、その完了に追従して投入されるタスクも含め、
+   * キューが安定して空になるまで待機します。
+   *
+   * `wait()` は呼び出し時点のキュー内容だけを待つため、複数フレームに分割される描画
+   * （`data-each` の大量行など）では完了前に解決し得ます。本メソッドは、空かつ非処理の
+   * 状態が 1 フレームを跨いでも維持されるまでループして待つことで、レンダリング全体の
+   * 完了を待てるようにします。
+   *
+   * @param maxIterations 無限ループ防止の最大反復回数（連続アニメーション等への保険）
+   * @returns レンダリングが安定するまで解決されない Promise
+   */
+  async waitForIdle(e = 1e3) {
+    let t = 0, r = 0;
+    for (; t < 2 && r < e; )
+      this.processing || this.queue.length > 0 ? (await this.wait(), t = 0) : t += 1, await ae.nextTick(), r += 1;
+  }
+  /**
+   * 次のフレーム（または 1 マクロタスク）まで待機します。
+   *
+   * @returns 次フレームで解決される Promise
+   */
+  static nextTick() {
+    return new Promise((e) => {
+      typeof requestAnimationFrame < "u" ? requestAnimationFrame(() => e()) : setTimeout(e, 0);
+    });
+  }
 }
-const oe = class oe {
+const le = class le {
   /**
    * タスクをキューに追加します。
    *
@@ -932,10 +959,19 @@ const oe = class oe {
   static wait() {
     return this.ASYNC_QUEUE.wait();
   }
+  /**
+   * レンダリング（追従して投入されるタスクを含む）が安定して完了するまで待機します。
+   *
+   * @param maxIterations 無限ループ防止の最大反復回数
+   * @returns レンダリングが安定するまで解決されない Promise
+   */
+  static waitForIdle(e = 1e3) {
+    return this.ASYNC_QUEUE.waitForIdle(e);
+  }
 };
-oe.ASYNC_QUEUE = new de();
-let x = oe;
-class te {
+le.ASYNC_QUEUE = new ae();
+let M = le;
+class J {
   /**
    * 実行モードを取得します。
    *
@@ -953,6 +989,20 @@ class te {
   static setRuntime(e) {
     l.setRuntime(e);
   }
+  /**
+   * 進行中・追従して投入されるものを含め、すべてのレンダリングタスクの完了を待ちます。
+   *
+   * `data-each` の大量行のように複数フレームに分割される描画でも、安定して完了する
+   * まで待機します。Playwright などの外部テストから、タブ切り替えやクリック後に
+   * 描画完了を安全に待機するために利用できます。
+   *
+   * 例: `await page.evaluate(() => Haori.waitForRenders())`
+   *
+   * @return すべてのレンダリングが完了したら解決される Promise
+   */
+  static waitForRenders() {
+    return M.waitForIdle();
+  }
   /**
    * 通知ダイアログを表示します。
    *
@@ -960,7 +1010,7 @@ class te {
    * @returns 通知が閉じられると解決されるPromise
    */
   static dialog(e) {
-    return x.enqueue(() => {
+    return M.enqueue(() => {
       window.alert(e);
     }, !0);
   }
@@ -988,7 +1038,7 @@ class te {
    * @returns ユーザーがOKをクリックした場合はtrue、キャンセルした場合はfalseが解決されるPromise
    */
   static confirm(e) {
-    return x.enqueue(() => window.confirm(e), !0);
+    return M.enqueue(() => window.confirm(e), !0);
   }
   /**
    * ダイアログを開きます。
@@ -996,8 +1046,8 @@ class te {
    * @param element 開くダイアログのHTML要素
    */
   static openDialog(e) {
-    return x.enqueue(() => {
-      e instanceof HTMLDialogElement ? e.showModal() : g.error("[Haori]", "Element is not a dialog: ", e);
+    return M.enqueue(() => {
+      e instanceof HTMLDialogElement ? e.showModal() : p.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
   /**
@@ -1006,8 +1056,8 @@ class te {
    * @param element 閉じるダイアログのHTML要素
    */
   static closeDialog(e) {
-    return x.enqueue(() => {
-      e instanceof HTMLDialogElement ? e.close() : g.error("[Haori]", "Element is not a dialog: ", e);
+    return M.enqueue(() => {
+      e instanceof HTMLDialogElement ? e.close() : p.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
   /**
@@ -1017,7 +1067,7 @@ class te {
    * @param message エラーメッセージ
    */
   static addErrorMessage(e, t) {
-    return te.addMessage(e, t, "error");
+    return J.addMessage(e, t, "error");
   }
   /**
    * メッセージをレベル付きで追加します。
@@ -1027,7 +1077,7 @@ class te {
    * @param level メッセージのレベル（省略可能）
    */
   static addMessage(e, t, r) {
-    return x.enqueue(() => {
+    return M.enqueue(() => {
       const i = e instanceof HTMLFormElement ? e : e.parentElement ?? e;
       i.setAttribute("data-message", t), r !== void 0 ? i.setAttribute("data-message-level", r) : i.removeAttribute("data-message-level");
     }, !0);
@@ -1038,7 +1088,7 @@ class te {
    * @param parent メッセージをクリアする親要素
    */
   static clearMessages(e) {
-    return x.enqueue(() => {
+    return M.enqueue(() => {
       e.removeAttribute("data-message"), e.removeAttribute("data-message-level"), e.querySelectorAll("[data-message]").forEach((t) => {
         t.removeAttribute("data-message"), t.removeAttribute("data-message-level");
       });
@@ -1046,13 +1096,13 @@ class te {
   }
 }
 const fe = ["addErrorMessage", "clearMessages"];
-function le() {
+function ue() {
   const e = globalThis.window?.Haori;
   return fe.every(
     (r) => typeof e?.[r] == "function"
-  ) ? e : te;
+  ) ? e : J;
 }
-class E {
+class A {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -1063,7 +1113,7 @@ class E {
    */
   static getValues(e) {
     const t = {};
-    return E.getPartValues(e, t);
+    return A.getPartValues(e, t);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -1076,17 +1126,17 @@ class E {
   static getPartValues(e, t) {
     const r = e.getAttribute("name"), i = e.getAttribute(`${l.prefix}form-object`), s = e.getAttribute(`${l.prefix}form-list`);
     if (r) {
-      s ? Array.isArray(t[String(r)]) ? t[String(r)].push(e.getValue()) : t[String(r)] = [e.getValue()] : t[String(r)] = e.getValue(), i && g.warn(
+      s ? Array.isArray(t[String(r)]) ? t[String(r)].push(e.getValue()) : t[String(r)] = [e.getValue()] : t[String(r)] = e.getValue(), i && p.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-object and name attributes.`
       );
       for (const n of e.getChildElementFragments())
-        E.getPartValues(n, t);
+        A.getPartValues(n, t);
     } else if (i) {
       const n = {};
       for (const a of e.getChildElementFragments())
-        E.getPartValues(a, n);
-      Object.keys(n).length > 0 && (t[String(i)] = n), s && g.warn(
+        A.getPartValues(a, n);
+      Object.keys(n).length > 0 && (t[String(i)] = n), s && p.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
       );
@@ -1094,12 +1144,12 @@ class E {
       const n = [];
       for (const a of e.getChildElementFragments()) {
         const o = {};
-        E.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
+        A.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
       }
       n.length > 0 && (t[String(s)] = n);
     } else
       for (const n of e.getChildElementFragments())
-        E.getPartValues(n, t);
+        A.getPartValues(n, t);
     return t;
   }
   /**
@@ -1112,7 +1162,7 @@ class E {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(e, t, r = !1) {
-    return E.setPartValues(e, t, null, r, !0);
+    return A.setPartValues(e, t, null, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -1124,7 +1174,7 @@ class E {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(e, t, r = !1) {
-    return E.setPartValues(e, t, null, r, !1);
+    return A.setPartValues(e, t, null, r, !1);
   }
   /**
    * 単一フラグメントへ値を設定します。
@@ -1152,18 +1202,18 @@ class E {
       if (!d || i) {
         const f = t[String(a)];
         c && Array.isArray(f) && r !== null ? n.push(
-          E.applyFragmentValue(e, f[r] ?? null, s)
-        ) : typeof f > "u" || (typeof f == "string" || typeof f == "number" || typeof f == "boolean" || f === null ? n.push(E.applyFragmentValue(e, f, s)) : n.push(
-          E.applyFragmentValue(e, String(f), s)
+          A.applyFragmentValue(e, f[r] ?? null, s)
+        ) : typeof f > "u" || (typeof f == "string" || typeof f == "number" || typeof f == "boolean" || f === null ? n.push(A.applyFragmentValue(e, f, s)) : n.push(
+          A.applyFragmentValue(e, String(f), s)
         ));
       }
     } else if (o) {
       const f = t[String(o)];
       if (f && typeof f == "object")
-        for (const m of e.getChildElementFragments())
+        for (const g of e.getChildElementFragments())
           n.push(
-            E.setPartValues(
-              m,
+            A.setPartValues(
+              g,
               f,
               null,
               i,
@@ -1173,24 +1223,24 @@ class E {
     } else if (c) {
       const f = t[String(c)];
       if (Array.isArray(f)) {
-        const m = e.getChildElementFragments();
-        for (let v = 0; v < m.length; v++) {
-          const p = m[v];
-          f.length > v ? n.push(
-            E.setPartValues(
-              p,
-              f[v],
-              v,
+        const g = e.getChildElementFragments();
+        for (let b = 0; b < g.length; b++) {
+          const S = g[b];
+          f.length > b ? n.push(
+            A.setPartValues(
+              S,
+              f[b],
+              b,
               i,
               s
             )
-          ) : n.push(E.setPartValues(p, {}, v, i, s));
+          ) : n.push(A.setPartValues(S, {}, b, i, s));
         }
       }
     } else
       for (const f of e.getChildElementFragments())
         n.push(
-          E.setPartValues(f, t, null, i, s)
+          A.setPartValues(f, t, null, i, s)
         );
     return Promise.all(n).then(() => {
     });
@@ -1203,10 +1253,10 @@ class E {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(e) {
-    E.clearValues(e), await Promise.all([
-      E.clearMessages(e),
-      E.clearEachClones(e)
-    ]), await x.enqueue(() => {
+    A.clearValues(e), await Promise.all([
+      A.clearMessages(e),
+      A.clearEachClones(e)
+    ]), await M.enqueue(() => {
       const t = e.getTarget();
       if (t instanceof HTMLFormElement)
         t.reset();
@@ -1217,7 +1267,7 @@ class E {
           s.appendChild(t), s.reset(), r.insertBefore(t, i);
         }
       }
-    }), await M.evaluateAll(e);
+    }), await P.evaluateAll(e);
   }
   /**
    * data-each によって生成された複製（テンプレート以外）を削除します。
@@ -1251,7 +1301,7 @@ class E {
   static clearValues(e) {
     e.clearValue();
     for (const t of e.getChildElementFragments())
-      E.clearValues(t);
+      A.clearValues(t);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -1260,7 +1310,7 @@ class E {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(e) {
-    return le().clearMessages(
+    return ue().clearMessages(
       e.getTarget()
     );
   }
@@ -1274,7 +1324,7 @@ class E {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(e, t, r) {
-    return E.addMessage(e, t, r, "error");
+    return A.addMessage(e, t, r, "error");
   }
   /**
    * キーに一致するフラグメントにレベル付きメッセージを追加します。
@@ -1287,7 +1337,7 @@ class E {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(e, t, r, i) {
-    const s = [], n = le(), a = n.addMessage, o = (d) => typeof a == "function" ? a.call(n, d, r, i) : n.addErrorMessage(d, r), c = E.findFragmentsByKey(e, t);
+    const s = [], n = ue(), a = n.addMessage, o = (d) => typeof a == "function" ? a.call(n, d, r, i) : n.addErrorMessage(d, r), c = A.findFragmentsByKey(e, t);
     return c.forEach((d) => {
       s.push(o(d.getTarget()));
     }), c.length === 0 && s.push(o(e.getTarget())), Promise.all(s).then(() => {
@@ -1301,7 +1351,7 @@ class E {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(e, t) {
-    return E.findFragmentByKeyParts(e, t.split("."));
+    return A.findFragmentByKeyParts(e, t.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -1315,7 +1365,7 @@ class E {
     const r = [], i = t[0];
     if (t.length == 1 && e.getAttribute("name") === i && r.push(e), e.hasAttribute(`${l.prefix}form-object`))
       t.length > 1 && e.getAttribute(`${l.prefix}form-object`) === i && e.getChildElementFragments().forEach((n) => {
-        r.push(...E.findFragmentByKeyParts(n, t.slice(1)));
+        r.push(...A.findFragmentByKeyParts(n, t.slice(1)));
       });
     else if (e.hasAttribute(`${l.prefix}form-list`)) {
       if (t.length > 1) {
@@ -1325,11 +1375,11 @@ class E {
           if (s === o) {
             const c = i.substring(n + 1, a), d = Number(c);
             if (isNaN(d))
-              g.error("Haori", `Invalid index: ${i}`);
+              p.error("Haori", `Invalid index: ${i}`);
             else {
-              const f = e.getChildElementFragments().filter((m) => m.hasAttribute(`${l.prefix}row`));
+              const f = e.getChildElementFragments().filter((g) => g.hasAttribute(`${l.prefix}row`));
               d < f.length && r.push(
-                ...E.findFragmentByKeyParts(f[d], t.slice(1))
+                ...A.findFragmentByKeyParts(f[d], t.slice(1))
               );
             }
           }
@@ -1337,29 +1387,35 @@ class E {
       }
     } else
       e.getChildElementFragments().forEach((s) => {
-        r.push(...E.findFragmentByKeyParts(s, t));
+        r.push(...A.findFragmentByKeyParts(s, t));
       });
     return r;
   }
   /**
-   * 対象のフラグメントがフォームフラグメントであればそれを返し、
-   * そうでなければ先祖要素をたどってフォームフラグメントを探します。
+   * 対象のフラグメントがフォームコンテナであればそれを返し、
+   * そうでなければ先祖要素をたどってフォームコンテナを探します。
+   *
+   * フォームコンテナは `<form>` 要素、または `data-form` 属性を持つ任意の要素です。
+   * 後者は `<table>` 内など `<form>` を直接置けない箇所で、`<tr>` などを値収集の
+   * コンテナとして扱うために使用します（`data-click-form` 等が対象を探す際に利用）。
    *
-   * @param fragment
+   * @param fragment 探索の起点フラグメント
+   * @returns フォームコンテナのフラグメント。見つからなければ null
    */
   static getFormFragment(e) {
-    if (e.getTarget() instanceof HTMLFormElement)
+    const t = e.getTarget();
+    if (t instanceof HTMLFormElement || t instanceof HTMLElement && t.hasAttribute(`${l.prefix}form`))
       return e;
     const r = e.getParent();
     return r ? this.getFormFragment(r) : null;
   }
 }
-const N = class N {
+const x = class x {
   /**
    * 集計状態を初期化します。
    */
   static reset() {
-    N.ELEMENT_STORES.clear(), N.ensureGlobalAccess();
+    x.ELEMENT_STORES.clear(), x.ensureGlobalAccess();
   }
   /**
    * 現在の集計結果スナップショットを返します。
@@ -1367,7 +1423,7 @@ const N = class N {
    * @returns エレメントごとの集計結果
    */
   static snapshot() {
-    return N.ensureGlobalAccess(), [...N.ELEMENT_STORES.entries()].map(([e, t]) => ({
+    return x.ensureGlobalAccess(), [...x.ELEMENT_STORES.entries()].map(([e, t]) => ({
       elementId: e,
       tagName: t.tagName,
       attributes: [...t.attributes.entries()].map(([r, i]) => ({
@@ -1376,7 +1432,7 @@ const N = class N {
         calls: i.calls,
         totalDurationMs: i.totalDurationMs,
         maxDurationMs: i.maxDurationMs,
-        placeholders: N.sortPlaceholders(
+        placeholders: x.sortPlaceholders(
           i.placeholders
         )
       })).sort((r, i) => i.calls - r.calls),
@@ -1386,7 +1442,7 @@ const N = class N {
         calls: i.calls,
         totalDurationMs: i.totalDurationMs,
         maxDurationMs: i.maxDurationMs,
-        placeholders: N.sortPlaceholders(
+        placeholders: x.sortPlaceholders(
           i.placeholders
         )
       })).sort((r, i) => i.calls - r.calls)
@@ -1402,31 +1458,31 @@ const N = class N {
    * @param expressions 今回評価した式一覧
    */
   static record(e, t, r) {
-    if (!U.isEnabled() || !e || t.length === 0)
+    if (!L.isEnabled() || !e || t.length === 0)
       return;
-    N.ensureGlobalAccess();
-    const i = N.getOrCreateElementStore(
+    x.ensureGlobalAccess();
+    const i = x.getOrCreateElementStore(
       e.element
     );
     if (e.kind === "attribute") {
-      const n = N.getOrCreateCounter(
+      const n = x.getOrCreateCounter(
         i.attributes,
         e.rawName,
         e.template
       );
-      N.updateCounter(
+      x.updateCounter(
         n,
         t,
         r
       );
       return;
     }
-    const s = N.getOrCreateCounter(
+    const s = x.getOrCreateCounter(
       i.texts,
       String(e.childIndex),
       e.template
     );
-    N.updateCounter(
+    x.updateCounter(
       s,
       t,
       r
@@ -1436,12 +1492,12 @@ const N = class N {
    * globalThis から dev-only の取得窓口を参照できるようにします。
    */
   static ensureGlobalAccess() {
-    if (!U.isEnabled())
+    if (!L.isEnabled())
       return;
     const e = globalThis;
-    e[N.GLOBAL_KEY] === void 0 && (e[N.GLOBAL_KEY] = {
-      reset: () => N.reset(),
-      snapshot: () => N.snapshot()
+    e[x.GLOBAL_KEY] === void 0 && (e[x.GLOBAL_KEY] = {
+      reset: () => x.reset(),
+      snapshot: () => x.snapshot()
     });
   }
   /**
@@ -1451,7 +1507,7 @@ const N = class N {
    * @returns 集計ストア
    */
   static getOrCreateElementStore(e) {
-    const t = N.createElementId(e), r = N.ELEMENT_STORES.get(t);
+    const t = x.createElementId(e), r = x.ELEMENT_STORES.get(t);
     if (r)
       return r;
     const i = {
@@ -1459,7 +1515,7 @@ const N = class N {
       attributes: /* @__PURE__ */ new Map(),
       texts: /* @__PURE__ */ new Map()
     };
-    return N.ELEMENT_STORES.set(t, i), i;
+    return x.ELEMENT_STORES.set(t, i), i;
   }
   /**
    * カウンタを取得または初期化します。
@@ -1509,7 +1565,7 @@ const N = class N {
    */
   static updateCounter(e, t, r) {
     e.calls += 1, e.totalDurationMs += r, e.maxDurationMs = Math.max(e.maxDurationMs, r), t.forEach((i) => {
-      const s = N.getOrCreatePlaceholder(
+      const s = x.getOrCreatePlaceholder(
         e.placeholders,
         i.expression
       );
@@ -1548,10 +1604,10 @@ const N = class N {
    * @returns 結果と所要時間
    */
   static measure(e) {
-    const t = N.now();
+    const t = x.now();
     return {
       value: e(),
-      durationMs: N.now() - t
+      durationMs: x.now() - t
     };
   }
   /**
@@ -1578,35 +1634,35 @@ const N = class N {
     return t.join(" > ");
   }
 };
-N.GLOBAL_KEY = "__HAORI_EVALUATION_PROFILE__", N.ELEMENT_STORES = /* @__PURE__ */ new Map();
-let J = N;
-const K = class K {
+x.GLOBAL_KEY = "__HAORI_EVALUATION_PROFILE__", x.ELEMENT_STORES = /* @__PURE__ */ new Map();
+let X = x;
+const G = class G {
   /**
    * フラグメントのコンストラクタ。
    *
    * @param target 対象ノード
    */
   constructor(e) {
-    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = e, K.FRAGMENT_CACHE.set(e, this);
+    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = e, G.FRAGMENT_CACHE.set(e, this);
   }
   static get(e) {
     if (e == null)
       return null;
-    if (K.FRAGMENT_CACHE.has(e))
-      return K.FRAGMENT_CACHE.get(e);
+    if (G.FRAGMENT_CACHE.has(e))
+      return G.FRAGMENT_CACHE.get(e);
     let t;
     switch (e.nodeType) {
       case Node.ELEMENT_NODE:
-        t = new P(e);
+        t = new C(e);
         break;
       case Node.TEXT_NODE:
         t = new H(e);
         break;
       case Node.COMMENT_NODE:
-        t = new ae(e);
+        t = new oe(e);
         break;
       default:
-        return g.warn("[Haori]", "Unsupported node type:", e.nodeType), null;
+        return p.warn("[Haori]", "Unsupported node type:", e.nodeType), null;
     }
     return t;
   }
@@ -1628,7 +1684,7 @@ const K = class K {
       return Promise.resolve();
     if (this.parent) {
       const e = this.parent, t = e.skipMutationNodes;
-      return x.enqueue(() => {
+      return M.enqueue(() => {
         e.skipMutationNodes = !0, this.target.parentNode === e.getTarget() && e.getTarget().removeChild(this.target), this.mounted = !1;
       }).finally(() => {
         e.skipMutationNodes = t;
@@ -1636,7 +1692,7 @@ const K = class K {
     } else {
       const e = this.target.parentNode;
       if (e)
-        return x.enqueue(() => {
+        return M.enqueue(() => {
           this.target.parentNode === e && e.removeChild(this.target), this.mounted = !1;
         });
       this.mounted = !1;
@@ -1653,7 +1709,7 @@ const K = class K {
       return Promise.resolve();
     if (this.parent) {
       const e = this.parent, t = e.skipMutationNodes;
-      return x.enqueue(() => {
+      return M.enqueue(() => {
         e.skipMutationNodes = !0, this.target.parentNode !== e.getTarget() && e.getTarget().appendChild(this.target), this.mounted = !0;
       }).finally(() => {
         e.skipMutationNodes = t;
@@ -1684,7 +1740,7 @@ const K = class K {
    * @return 除去のPromise
    */
   remove(e = !0) {
-    return this.parent && this.parent.removeChild(this), K.FRAGMENT_CACHE.delete(this.target), e ? this.unmount() : Promise.resolve();
+    return this.parent && this.parent.removeChild(this), G.FRAGMENT_CACHE.delete(this.target), e ? this.unmount() : Promise.resolve();
   }
   /**
    * 対象ノードを取得します。
@@ -1711,8 +1767,8 @@ const K = class K {
     this.parent = e;
   }
 };
-K.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let w = K;
+G.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
+let w = G;
 const V = class V extends w {
   /**
    * エレメントフラグメントのコンストラクタ。
@@ -1739,7 +1795,7 @@ const V = class V extends w {
     ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.derivedBindingData = null, this.bindingDataCache = null, this.descendantBindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.renderSignature = null, this.eachInputSignature = null, this.deriveSubtreeSignature = null, this.deriveInputSignature = null, this.freshInitializationSkippable = !1, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.syncValue(), e.getAttributeNames().forEach((t) => {
       const r = e.getAttribute(t);
       if (r !== null && !this.attributeMap.has(t)) {
-        const i = new X(t, r);
+        const i = new Q(t, r);
         this.attributeMap.set(t, i);
       }
     }), e.childNodes.forEach((t) => {
@@ -1783,7 +1839,7 @@ const V = class V extends w {
   removeChild(e) {
     const t = this.children.indexOf(e);
     if (t < 0) {
-      g.warn("[Haori]", "Child fragment not found.", e);
+      p.warn("[Haori]", "Child fragment not found.", e);
       return;
     }
     this.children.splice(t, 1), e.setParent(null);
@@ -2047,16 +2103,16 @@ const V = class V extends w {
     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 = e === !0 || e === "true" : i === "false" ? n = e === !1 : n = i === String(e), this.value = s ? n : n ? e : null, r.checked === n ? Promise.resolve() : (this.skipChangeValue = !0, x.enqueue(() => {
+      return s ? n = e === !0 || e === "true" : i === "false" ? n = e === !1 : n = i === String(e), this.value = s ? n : n ? e : null, r.checked === n ? Promise.resolve() : (this.skipChangeValue = !0, M.enqueue(() => {
         r.checked = n, t && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
-    } else return r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement ? (this.value = e, this.skipChangeValue = !0, x.enqueue(() => {
+    } else return r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement ? (this.value = e, this.skipChangeValue = !0, M.enqueue(() => {
       r.value = e === null ? "" : String(e), t && ((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;
-    })) : (g.warn(
+    })) : (p.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
       r
@@ -2138,7 +2194,7 @@ const V = class V extends w {
       return Promise.resolve();
     this.attributeMap.delete(e), this.skipMutationAttributes = !0;
     const r = this.getTarget();
-    return x.enqueue(() => {
+    return M.enqueue(() => {
       r.removeAttribute(e), t !== e && r.removeAttribute(t);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2158,11 +2214,11 @@ const V = class V extends w {
       return Promise.resolve();
     if (r === null)
       return e === t ? this.removeAttribute(e) : this.removeAliasedAttribute(e, t);
-    const n = new X(e, r);
+    const n = new Q(e, r);
     if (s) {
-      const L = this.attributeMap.get(e);
-      if (L && (L.isEvaluate || L.isForceEvaluation()) && !n.isEvaluate && !n.isForceEvaluation())
-        return this.skipMutationAttributes = !0, x.enqueue(() => {
+      const U = this.attributeMap.get(e);
+      if (U && (U.isEvaluate || U.isForceEvaluation()) && !n.isEvaluate && !n.isForceEvaluation())
+        return this.skipMutationAttributes = !0, M.enqueue(() => {
         }).finally(() => {
           this.skipMutationAttributes = !1;
         });
@@ -2173,9 +2229,9 @@ const V = class V extends w {
       element: a,
       rawName: e,
       template: r
-    }), c = n.isEvaluate || n.isRawEvaluate, d = e === t && V.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), f = n.isSingleExpression(), m = j.joinEvaluateResults(o.results), v = o.results.length === 1 ? o.results[0] : m, p = !n.isForceEvaluation() && (t !== e || d || f ? o.hasUnresolvedReference || v === null || v === void 0 || v === !1 : c && m === ""), b = n.isForceEvaluation() ? r : f ? v : m, S = i && n.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), A = p || b === null || b === !1 ? null : String(b), y = e !== t && a.getAttribute(e) !== r, R = A === null ? a.hasAttribute(t) : a.getAttribute(t) !== A, B = S && A !== null && a.value !== A;
-    return !y && !R && !B ? (S && A !== null && (this.value = A), Promise.resolve()) : (this.skipMutationAttributes = !0, x.enqueue(() => {
-      y && a.setAttribute(e, r), A === null ? a.removeAttribute(t) : (R && a.setAttribute(t, A), S && (this.value = A, B && (a.value = A)));
+    }), c = n.isEvaluate || n.isRawEvaluate, d = e === t && V.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), f = n.isSingleExpression(), g = j.joinEvaluateResults(o.results), b = o.results.length === 1 ? o.results[0] : g, S = !n.isForceEvaluation() && (t !== e || d || f ? o.hasUnresolvedReference || b === null || b === void 0 || b === !1 : c && g === ""), m = n.isForceEvaluation() ? r : f ? b : g, v = i && n.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), E = S || m === null || m === !1 ? null : String(m), y = e !== t && a.getAttribute(e) !== r, F = E === null ? a.hasAttribute(t) : a.getAttribute(t) !== E, N = v && E !== null && a.value !== E;
+    return !y && !F && !N ? (v && E !== null && (this.value = E), Promise.resolve()) : (this.skipMutationAttributes = !0, M.enqueue(() => {
+      y && a.setAttribute(e, r), E === null ? a.removeAttribute(t) : (F && a.setAttribute(t, E), v && (this.value = E, N && (a.value = E)));
     }).finally(() => {
       this.skipMutationAttributes = !1;
     }));
@@ -2191,7 +2247,7 @@ const V = class V extends w {
       return Promise.resolve();
     this.attributeMap.delete(e), this.skipMutationAttributes = !0;
     const t = this.getTarget();
-    return x.enqueue(() => {
+    return M.enqueue(() => {
       t.removeAttribute(e);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2294,13 +2350,13 @@ const V = class V extends w {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (e === this)
-      return g.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
+      return p.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();
     if (i.has(e))
-      return g.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
+      return p.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
     const n = e.getParent() === this;
     let a = -1, o = -1;
     n && (a = this.children.indexOf(e), t !== null && (o = this.children.indexOf(t)));
@@ -2310,23 +2366,23 @@ const V = class V extends w {
     if (t === null)
       this.children.push(e);
     else {
-      let m;
-      if (n ? a !== -1 && a < o ? m = o - 1 : m = o : m = this.children.indexOf(t), m === -1) {
-        const v = this.resolveInsertionPointFromDom(
+      let g;
+      if (n ? a !== -1 && a < o ? g = o - 1 : g = o : g = this.children.indexOf(t), g === -1) {
+        const b = this.resolveInsertionPointFromDom(
           t,
           !1
         );
-        v === null ? (g.warn(
+        b === null ? (p.warn(
           "[Haori]",
           "Reference child not found in children.",
           t
-        ), this.children.push(e)) : (this.children.splice(v.index, 0, e), d = v.referenceNode);
+        ), this.children.push(e)) : (this.children.splice(b.index, 0, e), d = b.referenceNode);
       } else
-        this.children.splice(m, 0, e);
+        this.children.splice(g, 0, e);
     }
     e.setParent(this), e.setMounted(this.mounted);
     const f = this.skipMutationNodes;
-    return this.skipMutationNodes = !0, x.enqueue(() => {
+    return this.skipMutationNodes = !0, M.enqueue(() => {
       this.target.insertBefore(e.getTarget(), d);
     }).finally(() => {
       this.skipMutationNodes = f;
@@ -2348,7 +2404,7 @@ const V = class V extends w {
         t,
         !0
       );
-      return i === null ? (g.warn(
+      return i === null ? (p.warn(
         "[Haori]",
         "Reference child not found in children.",
         t
@@ -2460,7 +2516,7 @@ V.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "reversed",
   "selected"
 ]);
-let P = V;
+let C = V;
 class H extends w {
   /**
    * テキストフラグメントのコンストラクタ。
@@ -2513,7 +2569,7 @@ class H extends w {
   evaluate() {
     return this.contents.isRawEvaluate && this.parent === null ? Promise.reject(
       new Error("Parent fragment is required for raw evaluation")
-    ) : x.enqueue(() => {
+    ) : M.enqueue(() => {
       this.skipMutation = !0;
       let e = this.text;
       this.contents.isRawEvaluate ? e = this.contents.evaluate(
@@ -2539,7 +2595,7 @@ class H extends w {
     });
   }
 }
-class ae extends w {
+class oe extends w {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -2555,7 +2611,7 @@ class ae extends w {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const e = new ae(this.target.cloneNode(!0));
+    const e = new oe(this.target.cloneNode(!0));
     return e.mounted = !1, e.text = this.text, e;
   }
   /**
@@ -2573,14 +2629,14 @@ class ae extends w {
    * @return 更新のPromise
    */
   setContent(e) {
-    return this.skipMutation || this.text === e ? Promise.resolve() : (this.text = e, x.enqueue(() => {
+    return this.skipMutation || this.text === e ? Promise.resolve() : (this.text = e, M.enqueue(() => {
       this.skipMutation = !0, this.target.textContent = this.text;
     }).finally(() => {
       this.skipMutation = !1;
     }));
   }
 }
-const Z = class Z {
+const _ = class _ {
   /**
    * コンストラクタ。
    *
@@ -2588,7 +2644,7 @@ const Z = class Z {
    */
   constructor(e) {
     this.contents = [], this.isEvaluate = !1, this.isRawEvaluate = !1, this.value = e;
-    const t = [...e.matchAll(Z.PLACEHOLDER_REGEX)];
+    const t = [...e.matchAll(_.PLACEHOLDER_REGEX)];
     let r = 0, i = !1, s = !1;
     for (const n of t) {
       n.index > r && this.contents.push({
@@ -2639,7 +2695,7 @@ const Z = class Z {
    */
   checkRawExpressions() {
     for (let e = 0; e < this.contents.length; e++)
-      this.contents[e].type === 2 && this.contents.length > 1 && (g.error(
+      this.contents[e].type === 2 && this.contents.length > 1 && (p.error(
         "[Haori]",
         "Raw expressions are not allowed in multi-content expressions."
       ), this.contents[e].type = 1);
@@ -2685,8 +2741,8 @@ const Z = class Z {
     return this.contents.forEach((c) => {
       try {
         if (r(c)) {
-          const d = J.measure(
-            () => W.evaluateDetailed(c.text, e)
+          const d = X.measure(
+            () => Y.evaluateDetailed(c.text, e)
           ), f = d.value;
           a += d.durationMs, n.push({
             expression: c.text,
@@ -2695,7 +2751,7 @@ const Z = class Z {
         } else
           s.push(c.text);
       } catch (d) {
-        g.error(
+        p.error(
           "[Haori]",
           `Error evaluating ${i} expression: ${c.text}`,
           d
@@ -2704,16 +2760,16 @@ const Z = class Z {
           durationMs: 0
         }), s.push("");
       }
-    }), J.record(
+    }), X.record(
       t,
       n,
       a
     ), { results: s, hasUnresolvedReference: o };
   }
 };
-Z.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let j = Z;
-const _ = class _ extends j {
+_.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
+let j = _;
+const ee = class ee extends j {
   /**
    * コンストラクタ。
    *
@@ -2721,7 +2777,7 @@ const _ = class _ extends j {
    * @param text 属性値
    */
   constructor(e, t) {
-    super(t), this.forceEvaluation = _.FORCE_EVALUATION_ATTRIBUTES.includes(e);
+    super(t), this.forceEvaluation = ee.FORCE_EVALUATION_ATTRIBUTES.includes(e);
   }
   /**
    * 強制評価フラグを取得します。
@@ -2758,7 +2814,7 @@ const _ = class _ extends j {
       (i) => this.forceEvaluation && i.type === 0 || i.type === 1 || i.type === 2,
       "attribute"
     );
-    return this.forceEvaluation && r.results.length > 1 ? (g.error(
+    return this.forceEvaluation && r.results.length > 1 ? (p.error(
       "[Haori]",
       "each or if expressions must have a single content.",
       r.results
@@ -2768,7 +2824,7 @@ const _ = class _ extends j {
     }) : r;
   }
 };
-_.FORCE_EVALUATION_ATTRIBUTES = [
+ee.FORCE_EVALUATION_ATTRIBUTES = [
   "data-if",
   "hor-if",
   "data-each",
@@ -2776,8 +2832,8 @@ _.FORCE_EVALUATION_ATTRIBUTES = [
   "data-derive",
   "hor-derive"
 ];
-let X = _;
-class F {
+let Q = ee;
+class R {
   /**
    * カスタムイベントを発火します。
    *
@@ -2801,7 +2857,7 @@ class F {
    * @param version ライブラリバージョン
    */
   static ready(e) {
-    F.dispatch(document, "ready", { version: e });
+    R.dispatch(document, "ready", { version: e });
   }
   /**
    * renderイベントを発火します。
@@ -2809,7 +2865,7 @@ class F {
    * @param target 評価対象要素
    */
   static render(e) {
-    F.dispatch(e, "render", { target: e });
+    R.dispatch(e, "render", { target: e });
   }
   /**
    * importstartイベントを発火します。
@@ -2818,7 +2874,7 @@ class F {
    * @param url インポート対象URL
    */
   static importStart(e, t) {
-    F.dispatch(e, "importstart", {
+    R.dispatch(e, "importstart", {
       url: t,
       startedAt: performance.now()
     });
@@ -2832,7 +2888,7 @@ class F {
    * @param startedAt 開始時刻
    */
   static importEnd(e, t, r, i) {
-    F.dispatch(e, "importend", {
+    R.dispatch(e, "importend", {
       url: t,
       bytes: r,
       durationMs: performance.now() - i
@@ -2846,7 +2902,7 @@ class F {
    * @param error エラー内容
    */
   static importError(e, t, r) {
-    F.dispatch(e, "importerror", { url: t, error: r });
+    R.dispatch(e, "importerror", { url: t, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -2862,13 +2918,27 @@ class F {
       const d = t?.[c], f = r[c];
       d !== f && s.push(c);
     }
-    F.dispatch(e, "bindchange", {
+    R.dispatch(e, "bindchange", {
       previous: t || {},
       next: r,
       changedKeys: s,
       reason: i
     });
   }
+  /**
+   * bindcompleteイベントを発火します。
+   *
+   * Procedure（data-*-bind / data-*-bind-arg など）によるバインドと、それに伴う
+   * 対象要素配下の再評価（data-if / data-each 等）が完了したタイミングで発火します。
+   * 外部スクリプトがバインド完了を契機に同期処理を行うために利用できます。
+   *
+   * @param target バインド対象要素
+   * @param bindArg バインド時に使用したネストキー（指定がない場合は null）
+   * @param reason 変更理由
+   */
+  static bindComplete(e, t = null, r = "other") {
+    R.dispatch(e, "bindcomplete", { bindArg: t, reason: r });
+  }
   /**
    * eachupdateイベントを発火します。
    *
@@ -2878,7 +2948,7 @@ class F {
    * @param order 現在の順序
    */
   static eachUpdate(e, t, r, i) {
-    F.dispatch(e, "eachupdate", {
+    R.dispatch(e, "eachupdate", {
       added: t,
       removed: r,
       order: i,
@@ -2894,7 +2964,7 @@ class F {
    * @param item 行データ
    */
   static rowAdd(e, t, r, i) {
-    F.dispatch(e, "rowadd", { key: t, index: r, item: i });
+    R.dispatch(e, "rowadd", { key: t, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -2904,7 +2974,7 @@ class F {
    * @param index インデックス
    */
   static rowRemove(e, t, r) {
-    F.dispatch(e, "rowremove", { key: t, index: r });
+    R.dispatch(e, "rowremove", { key: t, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -2915,7 +2985,7 @@ class F {
    * @param to 移動後インデックス
    */
   static rowMove(e, t, r, i) {
-    F.dispatch(e, "rowmove", { key: t, from: r, to: i });
+    R.dispatch(e, "rowmove", { key: t, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -2923,7 +2993,7 @@ class F {
    * @param target data-if要素
    */
   static show(e) {
-    F.dispatch(e, "show", { visible: !0 });
+    R.dispatch(e, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -2931,7 +3001,7 @@ class F {
    * @param target data-if要素
    */
   static hide(e) {
-    F.dispatch(e, "hide", { visible: !1 });
+    R.dispatch(e, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -2944,7 +3014,7 @@ class F {
    * @return 戻り値はありません。
    */
   static fetchStart(e, t, r, i, s) {
-    F.dispatch(e, "fetchstart", {
+    R.dispatch(e, "fetchstart", {
       url: t,
       options: r || {},
       payload: i,
@@ -2961,7 +3031,7 @@ class F {
    * @param startedAt 開始時刻
    */
   static fetchEnd(e, t, r, i) {
-    F.dispatch(e, "fetchend", {
+    R.dispatch(e, "fetchend", {
       url: t,
       status: r,
       durationMs: performance.now() - i
@@ -2977,7 +3047,7 @@ class F {
    * @param startedAt 開始時刻（存在する場合）
    */
   static fetchError(e, t, r, i, s) {
-    F.dispatch(e, "fetcherror", {
+    R.dispatch(e, "fetcherror", {
       url: t,
       status: i,
       error: r,
@@ -2997,24 +3067,24 @@ function ie() {
   const e = globalThis.window?.Haori;
   return pe.every(
     (r) => typeof e?.[r] == "function"
-  ) ? e : te;
+  ) ? e : J;
 }
 const me = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
-function be(D) {
-  return me.has(D.toUpperCase());
+function be(T) {
+  return me.has(T.toUpperCase());
 }
-function ve(D, e) {
+function ve(T, e) {
   for (const [t, r] of Object.entries(e))
-    r !== void 0 && (r === null ? D.append(t, "") : Array.isArray(r) ? r.forEach((i) => {
-      D.append(t, String(i));
-    }) : typeof r == "object" || typeof r == "function" ? D.append(t, JSON.stringify(r)) : D.append(t, String(r)));
+    r !== void 0 && (r === null ? T.append(t, "") : Array.isArray(r) ? r.forEach((i) => {
+      T.append(t, String(i));
+    }) : typeof r == "object" || typeof r == "function" ? T.append(t, JSON.stringify(r)) : T.append(t, String(r)));
 }
-function ye(D, e) {
-  const t = new URL(D, window.location.href), r = new URLSearchParams(t.search);
+function ye(T, e) {
+  const t = new URL(T, window.location.href), r = new URLSearchParams(t.search);
   return ve(r, e), t.search = r.toString(), t.toString();
 }
-function Ee(D) {
-  return D == null ? null : typeof D == "string" ? D : D instanceof URLSearchParams ? D.toString() : D instanceof FormData ? Array.from(D.entries()).map(([e, t]) => t instanceof File ? [
+function Ee(T) {
+  return T == null ? null : typeof T == "string" ? T : T instanceof URLSearchParams ? T.toString() : T instanceof FormData ? Array.from(T.entries()).map(([e, t]) => t instanceof File ? [
     e,
     {
       type: "file",
@@ -3022,16 +3092,16 @@ function Ee(D) {
       size: t.size,
       mimeType: t.type
     }
-  ] : [e, String(t)]) : String(D);
+  ] : [e, String(t)]) : String(T);
 }
-function Ae(D, e) {
+function Ae(T, e) {
   const t = new Headers(
     e.headers || void 0
   ), r = Array.from(t.entries()).sort(
     ([i], [s]) => i.localeCompare(s)
   );
   return JSON.stringify({
-    url: D,
+    url: T,
     method: String(e.method || "GET").toUpperCase(),
     headers: r,
     body: Ee(e.body || null)
@@ -3070,7 +3140,7 @@ const h = class h {
     return { value: e.replace(
       h.DATA_PLACEHOLDER_REGEX,
       (s, n, a) => {
-        const o = W.evaluateDetailed(
+        const o = Y.evaluateDetailed(
           n ?? a ?? "",
           t
         );
@@ -3150,7 +3220,7 @@ const h = class h {
     return { value: e.replace(
       h.DATA_PLACEHOLDER_REGEX,
       (s, n, a, o) => {
-        const c = W.evaluateDetailed(
+        const c = Y.evaluateDetailed(
           n ?? a ?? "",
           t
         );
@@ -3187,7 +3257,7 @@ const h = class h {
     const a = r.trim();
     if (h.SINGLE_PLACEHOLDER_REGEX.test(a))
       return {
-        value: M.parseDataBind(s),
+        value: P.parseDataBind(s),
         hasUnresolvedReference: n
       };
     if (a.startsWith("{") || a.startsWith("[")) {
@@ -3196,7 +3266,7 @@ const h = class h {
         e.getBindingData()
       );
       return {
-        value: M.parseDataBind(c.value),
+        value: P.parseDataBind(c.value),
         hasUnresolvedReference: n || c.hasUnresolvedReference
       };
     }
@@ -3205,7 +3275,7 @@ const h = class h {
       e.getBindingData()
     );
     return {
-      value: M.parseDataBind(o.value),
+      value: P.parseDataBind(o.value),
       hasUnresolvedReference: n || o.hasUnresolvedReference
     };
   }
@@ -3223,22 +3293,22 @@ const h = class h {
     if (t) {
       if (e.hasAttribute(h.attrName(t, "validate")) && (r.valid = !0), e.hasAttribute(h.attrName(t, "confirm")) && (r.confirmMessage = e.getAttribute(h.attrName(t, "confirm")).replace(/\\n/g, `
 `)), e.hasAttribute(h.attrName(t, "data")) && (r.dataAttrName = h.attrName(t, "data")), e.hasAttribute(h.attrName(t, "form"))) {
-        const p = e.getRawAttribute(
+        const m = e.getRawAttribute(
           h.attrName(t, "form")
         );
-        if (p) {
-          const b = document.body.querySelector(p);
-          b !== null ? r.formFragment = E.getFormFragment(
-            w.get(b)
-          ) : g.error(
+        if (m) {
+          const v = document.body.querySelector(m);
+          v !== null ? r.formFragment = A.getFormFragment(
+            w.get(v)
+          ) : p.error(
             "Haori",
-            `Form element not found: ${p} (${h.attrName(t, "form")})`
+            `Form element not found: ${m} (${h.attrName(t, "form")})`
           );
         } else
-          r.formFragment = E.getFormFragment(e);
-      } else t === "change" && (r.formFragment = E.getFormFragment(e));
+          r.formFragment = A.getFormFragment(e);
+      } else t === "change" && (r.formFragment = A.getFormFragment(e));
       if (e.hasAttribute(`${l.prefix}${t}-before-run`)) {
-        const p = e.getRawAttribute(
+        const m = e.getRawAttribute(
           `${l.prefix}${t}-before-run`
         );
         try {
@@ -3247,75 +3317,75 @@ const h = class h {
             "fetchOptions",
             `
 "use strict";
-${p}
+${m}
 `
           );
-        } catch (b) {
-          g.error("Haori", `Invalid before script: ${b}`);
+        } catch (v) {
+          p.error("Haori", `Invalid before script: ${v}`);
         }
       }
     }
     const i = h.attrName(t, "fetch"), s = e.hasAttribute(i);
     if (s) {
-      const p = e.getAttributeEvaluation(i);
-      p && (r.fetchHasUnresolvedReference = p.hasUnresolvedReference, r.fetchUrl = p.hasUnresolvedReference ? null : p.value);
+      const m = e.getAttributeEvaluation(i);
+      m && (r.fetchHasUnresolvedReference = m.hasUnresolvedReference, r.fetchUrl = m.hasUnresolvedReference ? null : m.value);
     }
     const n = {};
     if (t) {
-      const p = h.attrName(t, "fetch-method");
-      if (e.hasAttribute(p)) {
-        const b = e.getAttributeEvaluation(p);
-        b?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : n.method = b?.value;
+      const m = h.attrName(t, "fetch-method");
+      if (e.hasAttribute(m)) {
+        const v = e.getAttributeEvaluation(m);
+        v?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : n.method = v?.value;
       }
     } else {
-      const p = h.attrName(null, "method", !0);
-      if (e.hasAttribute(p)) {
-        const b = e.getAttributeEvaluation(
-          p
+      const m = h.attrName(null, "method", !0);
+      if (e.hasAttribute(m)) {
+        const v = e.getAttributeEvaluation(
+          m
         );
-        b?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : n.method = b?.value;
+        v?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : n.method = v?.value;
       }
     }
     if (t) {
-      const p = h.attrName(t, "fetch-headers");
-      if (e.hasAttribute(p)) {
-        const b = e.getRawAttribute(
-          p
+      const m = h.attrName(t, "fetch-headers");
+      if (e.hasAttribute(m)) {
+        const v = e.getRawAttribute(
+          m
         );
         try {
-          n.headers = M.parseDataBind(b);
-        } catch (S) {
-          g.error("Haori", `Invalid fetch headers: ${S}`);
+          n.headers = P.parseDataBind(v);
+        } catch (E) {
+          p.error("Haori", `Invalid fetch headers: ${E}`);
         }
       }
     } else {
-      const p = h.attrName(
+      const m = h.attrName(
         null,
         "headers",
         !0
       );
-      if (e.hasAttribute(p)) {
-        const b = e.getRawAttribute(
-          p
+      if (e.hasAttribute(m)) {
+        const v = e.getRawAttribute(
+          m
         );
         try {
-          n.headers = M.parseDataBind(b);
-        } catch (S) {
-          g.error("Haori", `Invalid fetch headers: ${S}`);
+          n.headers = P.parseDataBind(v);
+        } catch (E) {
+          p.error("Haori", `Invalid fetch headers: ${E}`);
         }
       }
     }
     if (t) {
-      const p = h.attrName(t, "fetch-content-type");
-      if (e.hasAttribute(p)) {
-        const b = e.getAttributeEvaluation(p);
-        b?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), n.headers = {
+      const m = h.attrName(t, "fetch-content-type");
+      if (e.hasAttribute(m)) {
+        const v = e.getAttributeEvaluation(m);
+        v?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), n.headers = {
           ...n.headers,
-          "Content-Type": b?.value
+          "Content-Type": v?.value
         };
       } else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let b = !1;
-        n.headers && typeof n.headers == "object" && (b = "Content-Type" in n.headers), b || (n.headers = {
+        let v = !1;
+        n.headers && typeof n.headers == "object" && (v = "Content-Type" in n.headers), v || (n.headers = {
           ...n.headers,
           "Content-Type": "application/json"
         });
@@ -3324,20 +3394,20 @@ ${p}
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const p = h.attrName(
+      const m = h.attrName(
         null,
         "content-type",
         !0
       );
-      if (e.hasAttribute(p)) {
-        const b = e.getAttributeEvaluation(p);
-        b?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), n.headers = {
+      if (e.hasAttribute(m)) {
+        const v = e.getAttributeEvaluation(m);
+        v?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), n.headers = {
           ...n.headers,
-          "Content-Type": b?.value
+          "Content-Type": v?.value
         };
       } else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let b = !1;
-        n.headers && typeof n.headers == "object" && (b = "Content-Type" in n.headers), b || (n.headers = {
+        let v = !1;
+        n.headers && typeof n.headers == "object" && (v = "Content-Type" in n.headers), v || (n.headers = {
           ...n.headers,
           "Content-Type": "application/json"
         });
@@ -3349,15 +3419,15 @@ ${p}
     Object.keys(n).length > 0 && (r.fetchOptions = n);
     const a = t ? h.attrName(t, "bind") : h.attrName(null, "bind", !0);
     if (e.hasAttribute(a)) {
-      const p = e.getRawAttribute(a);
-      if (p) {
-        const b = document.body.querySelectorAll(p);
-        b.length > 0 ? (r.bindFragments = [], b.forEach((S) => {
-          const A = w.get(S);
-          A && r.bindFragments.push(A);
-        })) : g.error(
+      const m = e.getRawAttribute(a);
+      if (m) {
+        const v = document.body.querySelectorAll(m);
+        v.length > 0 ? (r.bindFragments = [], v.forEach((E) => {
+          const y = w.get(E);
+          y && r.bindFragments.push(y);
+        })) : p.error(
           "Haori",
-          `Bind element not found: ${p} (${a})`
+          `Bind element not found: ${m} (${a})`
         );
       }
     }
@@ -3375,43 +3445,45 @@ ${p}
     ) : e.hasAttribute(d) && (r.bindArg = e.getRawAttribute(d));
     const f = t ? h.attrName(t, "bind-params") : h.attrName(null, "bind-params", !0);
     if (e.hasAttribute(f)) {
-      const p = e.getRawAttribute(f);
-      r.bindParams = p.split("&").map((b) => b.trim());
+      const m = e.getRawAttribute(f);
+      r.bindParams = m.split("&").map((v) => v.trim());
     }
-    const m = t ? h.attrName(t, "bind-append") : h.attrName(null, "bind-append", !0);
-    if (e.hasAttribute(m)) {
-      const p = e.getRawAttribute(m);
-      r.bindAppendParams = p.split("&").map((b) => b.trim()).filter(Boolean);
+    const g = t ? h.attrName(t, "bind-append") : h.attrName(null, "bind-append", !0);
+    if (e.hasAttribute(g)) {
+      const m = e.getRawAttribute(g);
+      r.bindAppendParams = m.split("&").map((v) => v.trim()).filter(Boolean);
     }
-    const v = t ? h.attrName(t, "copy-params") : null;
-    if (v && e.hasAttribute(v)) {
-      const p = e.getRawAttribute(v);
-      r.copyParams = p.split("&").map((b) => b.trim()).filter(Boolean);
+    const b = t ? h.attrName(t, "bind-merge") : h.attrName(null, "bind-merge", !0);
+    e.hasAttribute(b) && (r.bindMerge = !0);
+    const S = t ? h.attrName(t, "copy-params") : null;
+    if (S && e.hasAttribute(S)) {
+      const m = e.getRawAttribute(S);
+      r.copyParams = m.split("&").map((v) => v.trim()).filter(Boolean);
     }
     if (t) {
       if (e.hasAttribute(h.attrName(t, "adjust"))) {
-        const S = e.getRawAttribute(
+        const E = e.getRawAttribute(
           h.attrName(t, "adjust")
         );
-        if (S) {
-          const A = document.body.querySelectorAll(S);
-          A.length > 0 ? (r.adjustFragments = [], A.forEach((y) => {
-            const R = w.get(y);
-            R && r.adjustFragments.push(R);
-          })) : g.error(
+        if (E) {
+          const y = document.body.querySelectorAll(E);
+          y.length > 0 ? (r.adjustFragments = [], y.forEach((F) => {
+            const N = w.get(F);
+            N && r.adjustFragments.push(N);
+          })) : p.error(
             "Haori",
-            `Adjust element not found: ${S} (${h.attrName(t, "adjust")})`
+            `Adjust element not found: ${E} (${h.attrName(t, "adjust")})`
           );
         }
         if (e.hasAttribute(h.attrName(t, "adjust-value"))) {
-          const A = e.getRawAttribute(
+          const y = e.getRawAttribute(
             h.attrName(t, "adjust-value")
-          ), y = Number(A);
-          isNaN(y) || (r.adjustValue = y);
+          ), F = Number(y);
+          isNaN(F) || (r.adjustValue = F);
         }
       }
       if (e.hasAttribute(h.attrName(t, "row-add")) && (r.rowAdd = !0), e.hasAttribute(h.attrName(t, "row-remove")) && (r.rowRemove = !0), e.hasAttribute(h.attrName(t, "row-prev")) && (r.rowMovePrev = !0), e.hasAttribute(h.attrName(t, "row-next")) && (r.rowMoveNext = !0), e.hasAttribute(`${l.prefix}${t}-after-run`)) {
-        const S = e.getRawAttribute(
+        const E = e.getRawAttribute(
           `${l.prefix}${t}-after-run`
         );
         try {
@@ -3419,11 +3491,11 @@ ${p}
             "response",
             `
 "use strict";
-${S}
+${E}
 `
           );
-        } catch (A) {
-          g.error("Haori", `Invalid after script: ${A}`);
+        } catch (y) {
+          p.error("Haori", `Invalid after script: ${y}`);
         }
       }
       if (e.hasAttribute(h.attrName(t, "dialog")) && (r.dialogMessage = e.getAttribute(h.attrName(t, "dialog")).replace(/\\n/g, `
@@ -3431,10 +3503,10 @@ ${S}
         r.toastMessage = e.getAttribute(
           h.attrName(t, "toast")
         );
-        const S = e.getRawAttribute(
+        const E = e.getRawAttribute(
           h.attrName(t, "toast-level")
-        ), y = ["info", "warning", "error", "success"].includes(S);
-        r.toastLevel = y ? S : null;
+        ), F = ["info", "warning", "error", "success"].includes(E);
+        r.toastLevel = F ? E : null;
       }
       if (e.hasAttribute(h.attrName(t, "redirect")) && (r.redirectUrl = e.getAttribute(
         h.attrName(t, "redirect")
@@ -3443,19 +3515,19 @@ ${S}
       )), e.hasAttribute(h.attrName(t, "history")) && (r.historyUrl = e.getAttribute(
         h.attrName(t, "history")
       )), e.hasAttribute(h.attrName(t, "history-data")) && (r.historyDataAttrName = h.attrName(t, "history-data")), e.hasAttribute(h.attrName(t, "history-form"))) {
-        const S = e.getRawAttribute(
+        const E = e.getRawAttribute(
           h.attrName(t, "history-form")
         );
-        if (S) {
-          const A = document.body.querySelector(S);
-          A !== null ? r.historyFormFragment = E.getFormFragment(
-            w.get(A)
-          ) : g.error(
+        if (E) {
+          const y = document.body.querySelector(E);
+          y !== null ? r.historyFormFragment = A.getFormFragment(
+            w.get(y)
+          ) : p.error(
             "Haori",
-            `Form element not found: ${S} (${h.attrName(t, "history-form")})`
+            `Form element not found: ${E} (${h.attrName(t, "history-form")})`
           );
         } else
-          r.historyFormFragment = E.getFormFragment(e);
+          r.historyFormFragment = A.getFormFragment(e);
       }
       [
         "reset-before",
@@ -3465,75 +3537,75 @@ ${S}
         "copy",
         "open",
         "close"
-      ].forEach((S) => {
-        const A = h.attrName(t, S);
-        if (!e.hasAttribute(A))
+      ].forEach((E) => {
+        const y = h.attrName(t, E);
+        if (!e.hasAttribute(y))
           return;
-        const y = e.getRawAttribute(A), R = [];
-        if (y ? (document.body.querySelectorAll(y).forEach((L) => {
-          const k = w.get(L);
-          k && R.push(k);
-        }), R.length === 0 && g.error("Haori", `Element not found: ${y} (${A})`)) : R.push(e), R.length > 0)
-          switch (S) {
+        const F = e.getRawAttribute(y), N = [];
+        if (F ? (document.body.querySelectorAll(F).forEach((B) => {
+          const K = w.get(B);
+          K && N.push(K);
+        }), N.length === 0 && p.error("Haori", `Element not found: ${F} (${y})`)) : N.push(e), N.length > 0)
+          switch (E) {
             case "reset-before":
-              r.resetBeforeFragments = R;
+              r.resetBeforeFragments = N;
               break;
             case "reset":
-              r.resetFragments = R;
+              r.resetFragments = N;
               break;
             case "refetch":
-              r.refetchFragments = R;
+              r.refetchFragments = N;
               break;
             case "click":
-              r.clickFragments = R;
+              r.clickFragments = N;
               break;
             case "copy":
-              r.copyFragments = R;
+              r.copyFragments = N;
               break;
             case "open":
-              r.openFragments = R;
+              r.openFragments = N;
               break;
             case "close":
-              r.closeFragments = R;
+              r.closeFragments = N;
               break;
           }
       });
-      const b = h.attrName(t, "copy-source");
-      if (e.hasAttribute(b)) {
-        const S = e.getRawAttribute(
-          b
+      const v = h.attrName(t, "copy-source");
+      if (e.hasAttribute(v)) {
+        const E = e.getRawAttribute(
+          v
         );
-        if (S) {
-          const A = document.body.querySelector(S);
-          if (A !== null) {
-            const y = w.get(A);
-            y ? r.copySourceFragment = y : g.error(
+        if (E) {
+          const y = document.body.querySelector(E);
+          if (y !== null) {
+            const F = w.get(y);
+            F ? r.copySourceFragment = F : p.error(
               "Haori",
-              `Element is not managed by Haori: ${S} (${b})`
+              `Element is not managed by Haori: ${E} (${v})`
             );
           } else
-            g.error(
+            p.error(
               "Haori",
-              `Element not found: ${S} (${b})`
+              `Element not found: ${E} (${v})`
             );
         } else
           r.copySourceFragment = e;
       }
     }
     if (!t && (e.hasAttribute(h.attrName(null, "data", !0)) && (r.dataAttrName = h.attrName(null, "data", !0)), e.hasAttribute(h.attrName(null, "form", !0)))) {
-      const p = e.getRawAttribute(
+      const m = e.getRawAttribute(
         h.attrName(null, "form", !0)
       );
-      if (p) {
-        const b = document.body.querySelector(p);
-        b !== null ? r.formFragment = E.getFormFragment(
-          w.get(b)
-        ) : g.error(
+      if (m) {
+        const v = document.body.querySelector(m);
+        v !== null ? r.formFragment = A.getFormFragment(
+          w.get(v)
+        ) : p.error(
           "Haori",
-          `Form element not found: ${p} (${h.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${m} (${h.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = E.getFormFragment(e);
+        r.formFragment = A.getFormFragment(e);
     }
     return s && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [e]), r;
   }
@@ -3598,7 +3670,7 @@ ${S}
         return !1;
       this.options.resetBeforeFragments && this.options.resetBeforeFragments.length > 0 && (await Promise.all(
         this.options.resetBeforeFragments.map(
-          (d) => E.reset(d)
+          (d) => A.reset(d)
         )
       ), this.captureHistorySnapshots());
       const r = this.prepareFetchRequest(), i = r.payload;
@@ -3616,48 +3688,48 @@ ${S}
       }
       const a = Object.keys(i).length > 0;
       if (s) {
-        const d = { ...n || {} }, f = r.requestedMethod, m = r.effectiveMethod, v = r.transportMode === "query-get", p = r.queryString;
-        if (v && g.info("Haori demo fetch normalization", {
+        const d = { ...n || {} }, f = r.requestedMethod, g = r.effectiveMethod, b = r.transportMode === "query-get", S = r.queryString;
+        if (b && p.info("Haori demo fetch normalization", {
           runtime: l.runtime,
           requestedMethod: f,
-          effectiveMethod: m,
+          effectiveMethod: g,
           transportMode: "query-get",
           url: s,
           payload: a ? i : void 0,
-          queryString: p
+          queryString: S
         }), this.options.targetFragment && s) {
-          const b = performance.now(), S = {
+          const m = performance.now(), v = {
             runtime: l.runtime,
             requestedMethod: f,
-            effectiveMethod: m,
-            transportMode: v ? "query-get" : "http",
-            ...v ? { queryString: p } : {}
+            effectiveMethod: g,
+            transportMode: b ? "query-get" : "http",
+            ...b ? { queryString: S } : {}
           };
-          return F.fetchStart(
+          return R.fetchStart(
             this.options.targetFragment.getTarget(),
             s,
             d,
             a ? i : void 0,
-            S
-          ), fetch(s, d).then((A) => this.handleFetchResult(
-            A,
+            v
+          ), fetch(s, d).then((E) => this.handleFetchResult(
+            E,
             s || void 0,
-            b
-          )).catch((A) => {
-            throw s && F.fetchError(
+            m
+          )).catch((E) => {
+            throw s && R.fetchError(
               this.options.targetFragment.getTarget(),
               s,
-              A
-            ), A;
+              E
+            ), E;
           });
         }
-        return fetch(s, d).then((b) => this.handleFetchResult(b, s || void 0));
+        return fetch(s, d).then((m) => this.handleFetchResult(m, s || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && a) {
-        const d = this.options.formFragment, f = d.getTarget(), m = /* @__PURE__ */ new Set();
-        e && e.appliedDisabledAttribute && this.options.targetFragment && m.add(this.options.targetFragment), f.setAttribute(`${l.prefix}bind`, JSON.stringify(i));
-        const v = d.getBindingData();
-        Object.assign(v, i), await M.setBindingData(f, v, m);
+        const d = this.options.formFragment, f = d.getTarget(), g = /* @__PURE__ */ new Set();
+        e && e.appliedDisabledAttribute && this.options.targetFragment && g.add(this.options.targetFragment), f.setAttribute(`${l.prefix}bind`, JSON.stringify(i));
+        const b = d.getBindingData();
+        Object.assign(b, i), await P.setBindingData(f, b, g);
       }
       const o = a ? i : {}, c = new Response(JSON.stringify(o), {
         headers: { "Content-Type": "application/json" }
@@ -3676,10 +3748,15 @@ ${S}
     if (this.eventType !== "click" || !this.options.targetFragment)
       return null;
     const t = this.options.targetFragment.getTarget();
-    return h.RUNNING_CLICK_TARGETS.has(t) || t.matches(":disabled") || t.hasAttribute("disabled") || t.hasAttribute(re) ? !1 : (h.RUNNING_CLICK_TARGETS.add(t), t.setAttribute(re, ""), t.setAttribute("disabled", ""), {
+    if (h.RUNNING_CLICK_TARGETS.has(t) || t.matches(":disabled") || t.hasAttribute("disabled") || t.hasAttribute(re))
+      return !1;
+    const r = t.hasAttribute(
+      `${l.prefix}click-no-disabled`
+    );
+    return h.RUNNING_CLICK_TARGETS.add(t), t.setAttribute(re, ""), r || t.setAttribute("disabled", ""), {
       target: t,
-      appliedDisabledAttribute: !0
-    });
+      appliedDisabledAttribute: !r
+    };
   }
   /**
    * 取得済みの実行ロックを解放します。
@@ -3688,7 +3765,7 @@ ${S}
    * @returns 戻り値はありません。
    */
   releaseExecutionLock(e) {
-    e && (h.RUNNING_CLICK_TARGETS.delete(e.target), e.appliedDisabledAttribute && (e.target.removeAttribute("disabled"), e.target.removeAttribute(re)));
+    e && (h.RUNNING_CLICK_TARGETS.delete(e.target), e.target.removeAttribute(re), e.appliedDisabledAttribute && e.target.removeAttribute("disabled"));
   }
   /**
    * フェッチ後の処理を実行します。
@@ -3696,14 +3773,14 @@ ${S}
   async handleFetchResult(e, t, r) {
     const i = ie();
     if (!e.ok)
-      return this.options.targetFragment && t && F.fetchError(
+      return this.options.targetFragment && t && R.fetchError(
         this.options.targetFragment.getTarget(),
         t,
         new Error(`${e.status} ${e.statusText}`),
         e.status,
         r
       ), await this.handleFetchError(e), !1;
-    if (this.options.targetFragment && t && r && F.fetchEnd(
+    if (this.options.targetFragment && t && r && R.fetchEnd(
       this.options.targetFragment.getTarget(),
       t,
       e.status,
@@ -3718,14 +3795,14 @@ ${S}
     }
     const s = [];
     s.push(this.bindResult(e)), 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) => E.reset(a))
+      this.options.resetFragments.map((a) => A.reset(a))
     ), await this.copy();
     const n = [];
     if (this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((a) => {
       n.push(new h(a, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0)
       for (const a of this.options.clickFragments) {
-        await M.evaluateAll(a);
+        await P.evaluateAll(a);
         const o = a.getTarget();
         typeof o.click == "function" ? o.click() : o.dispatchEvent(
           new MouseEvent("click", { bubbles: !0, cancelable: !0 })
@@ -3733,10 +3810,10 @@ ${S}
       }
     return 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)) : g.error("Haori", "Element is not an HTML element: ", o);
+      o instanceof HTMLElement ? n.push(i.openDialog(o)) : p.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)) : g.error("Haori", "Element is not an HTML element: ", o);
+      o instanceof HTMLElement ? n.push(i.closeDialog(o)) : p.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,
       this.options.toastLevel ?? "info"
@@ -3756,12 +3833,12 @@ ${S}
         const n = e ? this.options.historyUrl : window.location.pathname, a = new URL(n, window.location.href);
         if (a.origin !== window.location.origin) {
           const c = "history.pushState: cross-origin URL is not allowed: " + a.toString();
-          g.error("Haori", c);
+          p.error("Haori", c);
           return;
         }
         const o = (c) => {
           for (const [d, f] of Object.entries(c))
-            f != null && (Array.isArray(f) ? f.forEach((m) => a.searchParams.append(d, String(m))) : typeof f == "object" ? a.searchParams.set(d, JSON.stringify(f)) : a.searchParams.set(d, String(f)));
+            f != null && (Array.isArray(f) ? f.forEach((g) => a.searchParams.append(d, String(g))) : typeof f == "object" ? a.searchParams.set(d, JSON.stringify(f)) : a.searchParams.set(d, String(f)));
         };
         i && o(t), s && o(r), history.pushState(
           { [ge]: !0 },
@@ -3769,7 +3846,7 @@ ${S}
           a.toString()
         );
       } catch (n) {
-        g.error("Haori", `history.pushState failed: ${n}`);
+        p.error("Haori", `history.pushState failed: ${n}`);
       }
   }
   /**
@@ -3777,7 +3854,7 @@ ${S}
    */
   async handleFetchError(e) {
     let t = null;
-    this.options.formFragment ? t = this.options.formFragment : this.options.targetFragment && (t = E.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? t = this.options.formFragment : this.options.targetFragment && (t = A.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (n) => {
       const a = t ? t.getTarget() : document.body;
       await ie().addErrorMessage(a, n);
@@ -3806,7 +3883,7 @@ ${S}
         if (a.length === 0)
           return await r(`${e.status} ${e.statusText}`), i(), !1;
         for (const o of a)
-          o.key && t ? await E.addErrorMessage(t, o.key, o.message) : await r(o.message);
+          o.key && t ? await A.addErrorMessage(t, o.key, o.message) : await r(o.message);
         return i(), !1;
       } catch {
       }
@@ -3893,24 +3970,26 @@ ${S}
             );
           } else
             n[a] = r;
-          i.push(M.setBindingData(s.getTarget(), n));
+          i.push(P.setBindingData(s.getTarget(), n));
         });
       else {
         if (typeof r == "string")
-          return g.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
+          return p.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,
             r
-          );
-          i.push(
-            M.setBindingData(s.getTarget(), n)
-          );
+          ), a = this.options.bindMerge ? { ...s.getRawBindingData() ?? {}, ...n } : n;
+          i.push(P.setBindingData(s.getTarget(), a));
         });
       }
       return Promise.all(i).then(() => {
+        const s = this.options.bindArg ?? null;
+        this.options.bindFragments.forEach((n) => {
+          R.bindComplete(n.getTarget(), s);
+        });
       });
     });
   }
@@ -3938,7 +4017,7 @@ ${S}
         ...i.getBindingData(),
         ...t
       };
-      return M.setBindingData(i.getTarget(), s);
+      return P.setBindingData(i.getTarget(), s);
     });
     return Promise.all(r).then(() => {
     });
@@ -3947,7 +4026,7 @@ ${S}
    * copy のコピー元データを取得します。
    */
   resolveCopySourceData() {
-    return this.options.copySourceFragment ? this.options.copySourceFragment.getTarget().tagName === "FORM" ? E.getValues(this.options.copySourceFragment) : { ...this.options.copySourceFragment.getBindingData() } : this.options.formFragment ? E.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
+    return this.options.copySourceFragment ? this.options.copySourceFragment.getTarget().tagName === "FORM" ? A.getValues(this.options.copySourceFragment) : { ...this.options.copySourceFragment.getBindingData() } : this.options.formFragment ? A.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
   }
   /**
    * data 属性とフォーム値を統合した送信データを作成します。
@@ -3965,7 +4044,7 @@ ${S}
   buildPayloadResolution() {
     const e = {};
     let t = !1;
-    if (this.options.formFragment && Object.assign(e, E.getValues(this.options.formFragment)), this.options.data && typeof this.options.data == "object" && Object.assign(e, this.options.data), this.options.targetFragment && this.options.dataAttrName) {
+    if (this.options.formFragment && Object.assign(e, A.getValues(this.options.formFragment)), this.options.data && typeof this.options.data == "object" && Object.assign(e, this.options.data), this.options.targetFragment && this.options.dataAttrName) {
       const r = h.resolveDataAttributeDetailed(
         this.options.targetFragment,
         this.options.dataAttrName
@@ -4014,15 +4093,15 @@ ${S}
       const f = n.get("Content-Type") || "";
       if (/multipart\/form-data/i.test(f)) {
         n.delete("Content-Type");
-        const m = new FormData();
-        for (const [v, p] of Object.entries(t))
-          p == null ? m.append(v, "") : p instanceof Blob ? m.append(v, p) : Array.isArray(p) ? p.forEach((b) => m.append(v, String(b))) : typeof p == "object" ? m.append(v, JSON.stringify(p)) : m.append(v, String(p));
-        s.body = m;
+        const g = new FormData();
+        for (const [b, S] of Object.entries(t))
+          S == null ? g.append(b, "") : S instanceof Blob ? g.append(b, S) : Array.isArray(S) ? S.forEach((m) => g.append(b, String(m))) : typeof S == "object" ? g.append(b, JSON.stringify(S)) : g.append(b, String(S));
+        s.body = g;
       } else if (/application\/x-www-form-urlencoded/i.test(f)) {
-        const m = new URLSearchParams();
-        for (const [v, p] of Object.entries(t))
-          p !== void 0 && (p === null ? m.append(v, "") : Array.isArray(p) ? p.forEach((b) => m.append(v, String(b))) : typeof p == "object" ? m.append(v, JSON.stringify(p)) : m.append(v, String(p)));
-        s.body = m;
+        const g = new URLSearchParams();
+        for (const [b, S] of Object.entries(t))
+          S !== void 0 && (S === null ? g.append(b, "") : Array.isArray(S) ? S.forEach((m) => g.append(b, String(m))) : typeof S == "object" ? g.append(b, JSON.stringify(S)) : g.append(b, String(S)));
+        s.body = g;
       } else
         n.set("Content-Type", "application/json"), s.body = JSON.stringify(t);
     }
@@ -4047,7 +4126,7 @@ ${S}
     this.options.targetFragment && this.options.historyDataAttrName ? this.historyDataSnapshot = h.resolveDataAttribute(
       this.options.targetFragment,
       this.options.historyDataAttrName
-    ) : this.historyDataSnapshot = void 0, this.historyFormSnapshot = this.options.historyFormFragment ? E.getValues(this.options.historyFormFragment) : void 0;
+    ) : this.historyDataSnapshot = void 0, this.historyFormSnapshot = this.options.historyFormFragment ? A.getValues(this.options.historyFormFragment) : void 0;
   }
   /**
    * history-data の評価値を取得します。
@@ -4069,7 +4148,7 @@ ${S}
     if (this.historyFormSnapshot !== void 0)
       return this.historyFormSnapshot;
     if (this.options.historyFormFragment)
-      return E.getValues(this.options.historyFormFragment);
+      return A.getValues(this.options.historyFormFragment);
   }
   /**
    * copy-params が指定されている場合は include / exclude を考慮して抽出します。
@@ -4117,11 +4196,11 @@ ${S}
    */
   getRowFragment() {
     if (!this.options.targetFragment)
-      return g.error("Haori", "Target fragment is not specified for row operation."), null;
+      return p.error("Haori", "Target fragment is not specified for row operation."), null;
     const e = this.options.targetFragment.closestByAttribute(
       `${l.prefix}row`
     );
-    return e || (g.error("Haori", "Row fragment not found."), null);
+    return e || (p.error("Haori", "Row fragment not found."), null);
   }
   /**
    * 行を追加します。
@@ -4137,7 +4216,7 @@ ${S}
     const t = [], r = e.clone();
     return t.push(
       e.getParent().insertAfter(r, e)
-    ), t.push(M.evaluateAll(r)), t.push(E.reset(r)), Promise.all(t).then(() => {
+    ), t.push(P.evaluateAll(r)), t.push(A.reset(r)), Promise.all(t).then(() => {
     });
   }
   /**
@@ -4190,7 +4269,7 @@ ${S}
   }
 };
 h.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, h.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/, h.RUNNING_CLICK_TARGETS = /* @__PURE__ */ new WeakSet();
-let z = h;
+let q = h;
 class Se {
   /**
    * URLのクエリパラメータを取得します。
@@ -4204,7 +4283,7 @@ class Se {
     }), e;
   }
 }
-class De {
+class Te {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -4222,23 +4301,23 @@ class De {
     try {
       r = await fetch(e, t);
     } catch (s) {
-      throw g.error("[Haori]", "Failed to fetch import source:", e, s), new Error(`Failed to fetch: ${e}`);
+      throw p.error("[Haori]", "Failed to fetch import source:", e, s), new Error(`Failed to fetch: ${e}`);
     }
     if (!r.ok) {
       const s = `${r.status} ${r.statusText}`;
-      throw g.error("[Haori]", "Import HTTP error:", e, s), new Error(`Failed to load ${e}: ${s}`);
+      throw p.error("[Haori]", "Import HTTP error:", e, s), new Error(`Failed to load ${e}: ${s}`);
     }
     let i;
     try {
       i = await r.text();
     } catch (s) {
-      throw g.error("[Haori]", "Failed to read response text:", e, s), new Error(`Failed to read response from: ${e}`);
+      throw p.error("[Haori]", "Failed to read response text:", e, s), new Error(`Failed to read response from: ${e}`);
     }
     try {
       const n = new DOMParser().parseFromString(i, "text/html");
-      return n && n.body ? n.body.innerHTML : (g.warn("[Haori]", "No body found in imported document:", e), i);
+      return n && n.body ? n.body.innerHTML : (p.warn("[Haori]", "No body found in imported document:", e), i);
     } catch (s) {
-      return g.error("[Haori]", "Failed to parse imported HTML:", e, s), i;
+      return p.error("[Haori]", "Failed to parse imported HTML:", e, s), i;
     }
   }
 }
@@ -4294,7 +4373,7 @@ const u = class u {
    */
   static isAliasedAttributeReflection(e, t) {
     const r = w.get(e);
-    return r instanceof P ? r.hasAttribute(
+    return r instanceof C ? r.hasAttribute(
       `${l.prefix}${u.ATTRIBUTE_ALIAS_SUFFIX}${t}`
     ) : !1;
   }
@@ -4325,7 +4404,7 @@ const u = class u {
   static reevaluateChildren(e) {
     const t = [];
     return e.getChildren().forEach((r) => {
-      r instanceof P ? t.push(u.evaluateAll(r)) : r instanceof H && t.push(u.evaluateText(r));
+      r instanceof C ? t.push(u.evaluateAll(r)) : r instanceof H && t.push(u.evaluateText(r));
     }), Promise.all(t).then(() => {
     });
   }
@@ -4375,7 +4454,7 @@ const u = class u {
       return Promise.resolve();
     const r = [];
     return e.hasAttribute(`${l.prefix}fetch`) && r.push(u.executeManagedFetch(e)), e.hasAttribute(`${l.prefix}import`) && r.push(u.executeManagedImport(e)), e.getChildren().forEach((i) => {
-      i instanceof P && r.push(
+      i instanceof C && r.push(
         u.reevaluateReactiveSpecialAttributes(i, t)
       );
     }), Promise.all(r).then(() => {
@@ -4388,8 +4467,8 @@ const u = class u {
    * @returns 実行完了の Promise
    */
   static executeManagedFetch(e) {
-    const t = e.getTarget(), r = u.getReactiveFetchState(t), i = z.resolveAutoFetchSignature(e);
-    return r.running ? ((i.hasUnresolvedReference || i.signature !== r.lastSignature) && (r.rerunRequested = !0), Promise.resolve()) : i.hasUnresolvedReference || i.signature === null ? (r.lastSignature = null, Promise.resolve()) : r.lastSignature === i.signature ? Promise.resolve() : (r.lastSignature = i.signature, r.running = !0, new z(e, null).runWithResult().then(() => {
+    const t = e.getTarget(), r = u.getReactiveFetchState(t), i = q.resolveAutoFetchSignature(e);
+    return r.running ? ((i.hasUnresolvedReference || i.signature !== r.lastSignature) && (r.rerunRequested = !0), Promise.resolve()) : i.hasUnresolvedReference || i.signature === null ? (r.lastSignature = null, Promise.resolve()) : r.lastSignature === i.signature ? Promise.resolve() : (r.lastSignature = i.signature, r.running = !0, new q(e, null).runWithResult().then(() => {
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
         return r.rerunRequested = !1, u.executeManagedFetch(e);
@@ -4413,22 +4492,22 @@ const u = class u {
       return Promise.resolve();
     r.lastUrl = s, r.running = !0;
     const n = performance.now();
-    return t.setAttribute(`${l.prefix}importing`, ""), F.importStart(t, s), De.load(s).then((a) => {
+    return t.setAttribute(`${l.prefix}importing`, ""), R.importStart(t, s), Te.load(s).then((a) => {
       const o = new TextEncoder().encode(a).length;
-      return x.enqueue(() => {
+      return M.enqueue(() => {
         t.innerHTML = a;
       }).then(() => {
-        if (t.removeAttribute(`${l.prefix}importing`), F.importEnd(t, s, o, n), !document.body.hasAttribute("data-haori-ready")) {
+        if (t.removeAttribute(`${l.prefix}importing`), R.importEnd(t, s, o, n), !document.body.hasAttribute("data-haori-ready")) {
           const c = [];
           return t.childNodes.forEach((d) => {
             const f = w.get(d);
-            f instanceof P ? c.push(u.scan(f.getTarget())) : f instanceof H && c.push(u.evaluateText(f));
+            f instanceof C ? c.push(u.scan(f.getTarget())) : f instanceof H && c.push(u.evaluateText(f));
           }), Promise.all(c).then(() => {
           });
         }
       });
     }).catch((a) => {
-      t.removeAttribute(`${l.prefix}importing`), F.importError(t, s, a), g.error("[Haori]", "Failed to import HTML:", s, a);
+      t.removeAttribute(`${l.prefix}importing`), R.importError(t, s, a), p.error("[Haori]", "Failed to import HTML:", s, a);
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
         return r.rerunRequested = !1, u.executeManagedImport(e);
@@ -4471,7 +4550,7 @@ const u = class u {
       }
       const r = [];
       return e.getChildren().forEach((i) => {
-        i instanceof P ? r.push(u.initializeElementFragment(i, t)) : i instanceof H && r.push(u.evaluateText(i));
+        i instanceof C ? r.push(u.initializeElementFragment(i, t)) : i instanceof H && r.push(u.evaluateText(i));
       }), Promise.all(r).then(() => {
         u.refreshDerivedSubtreeSignature(e);
       });
@@ -4543,7 +4622,7 @@ const u = class u {
    */
   static shouldSkipChildInitialization(e, t) {
     const r = e.getAttribute(`${l.prefix}if`);
-    return e.hasAttribute(`${l.prefix}if`) && (r === !1 || r === void 0 || r === null || Number.isNaN(r)) ? !0 : t && e.hasAttribute(`${l.prefix}each`);
+    return e.hasAttribute(`${l.prefix}if`) && u.isHiddenIfCondition(r) ? !0 : t && e.hasAttribute(`${l.prefix}each`);
   }
   /**
    * エレメントに属性を設定します。
@@ -4611,8 +4690,8 @@ const u = class u {
         if (d === null)
           a.push(u.setBindingData(e, f));
         else {
-          const m = s.getRawBindingData() || {};
-          m[String(d)] = f, a.push(u.setBindingData(e, m));
+          const g = s.getRawBindingData() || {};
+          g[String(d)] = f, a.push(u.setBindingData(e, g));
         }
         break;
       }
@@ -4643,13 +4722,50 @@ const u = class u {
     );
     if (e.tagName === "FORM") {
       const a = i.getAttribute(`${l.prefix}form-arg`), o = a && t[String(a)] && typeof t[String(a)] == "object" && !Array.isArray(t[String(a)]) ? t[String(a)] : a ? {} : t;
-      n = n.then(() => E.syncValues(i, o));
+      n = n.then(() => A.syncValues(i, o));
     }
     return n = n.then(() => u.evaluateAll(i, r)), n = n.then(
       () => u.reevaluateReactiveSpecialAttributes(i, r)
-    ), F.bindChange(e, s, t, "manual"), n.then(() => {
+    ), R.bindChange(e, s, t, "manual"), n.then(() => {
     });
   }
+  /**
+   * 指定要素の式評価で見えるバインディングスコープをダンプします（デバッグ用）。
+   *
+   * 式（`data-if` / `{{...}}` など）の識別子は、その要素を起点に DOM のネストを
+   * たどって解決されます（内側のスコープが外側を上書き）。本メソッドは解決済みの
+   * スコープ（`resolved`）と、各キーがどの要素・どの種類（`bind` または `derive`）に
+   * 由来するか（`sources`）を返します。開発モード時はコンソールにも出力します。
+   *
+   * 注意: フォームの入力値（`name` 属性）は、変更（change）や明示的な同期が行われる
+   * までフォームの binding data に反映されません。したがって初期表示時点では、入力名と
+   * 同名の識別子は**外側のスコープ**にフォールバックして解決されます。
+   *
+   * @param element 対象要素
+   * @return 解決済みスコープと各キーの由来情報
+   */
+  static dumpScope(e) {
+    const t = w.get(e);
+    if (!t)
+      return { resolved: {}, sources: {} };
+    const r = t.getBindingData(), i = {}, s = (c) => {
+      const d = c.getTarget();
+      return d.id ? `#${d.id}` : d.tagName.toLowerCase();
+    }, n = (c, d, f, g) => {
+      if (c)
+        for (const b of Object.keys(c))
+          b in i || (i[b] = {
+            value: c[b],
+            source: s(d),
+            kind: f,
+            depth: g
+          });
+    };
+    let a = t, o = 0;
+    for (; a; )
+      a !== t && n(a.getRawDerivedBindingData(), a, "derive", o), n(a.getRawBindingData(), a, "bind", o), a = a.getParent(), o += 1;
+    return L.isEnabled() && p.info("[Haori]", "scope dump for", e, { resolved: r, sources: i }), { resolved: r, sources: i };
+  }
   /**
    * data-bind 属性の値をパースします。
    *
@@ -4661,7 +4777,7 @@ const u = class u {
       try {
         return JSON.parse(e);
       } catch (t) {
-        return g.error("[Haori]", "Invalid JSON in data-bind:", t), {};
+        return p.error("[Haori]", "Invalid JSON in data-bind:", t), {};
       }
     else {
       const t = new URLSearchParams(e), r = {};
@@ -4681,7 +4797,7 @@ const u = class u {
     if (r.isSkipMutationNodes())
       return;
     const i = w.get(t.nextSibling), s = w.get(t);
-    s && (r.insertBefore(s, i), s instanceof P ? u.scan(s.getTarget()) : s instanceof H && u.evaluateText(s));
+    s && (r.insertBefore(s, i), s instanceof C ? u.scan(s.getTarget()) : s instanceof H && u.evaluateText(s));
   }
   /**
    * ノードを親要素から削除します。
@@ -4723,7 +4839,7 @@ const u = class u {
     i.push(r.setValue(t));
     const s = u.getFormFragment(r);
     if (s) {
-      const n = E.getValues(s), a = s.getAttribute(`${l.prefix}form-arg`);
+      const n = A.getValues(s), a = s.getAttribute(`${l.prefix}form-arg`);
       let o;
       a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(u.setBindingData(s.getTarget(), o));
     }
@@ -4755,22 +4871,22 @@ const u = class u {
     const i = e.hasAttribute(`${l.prefix}derive`), s = e.hasAttribute(`${l.prefix}if`), n = e.hasAttribute(`${l.prefix}each`), a = e.getRawAttribute(`${l.prefix}derive`), o = e.getRawAttribute(`${l.prefix}derive-name`);
     let c = !1, d = !1, f = null;
     if (!i && e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), !i && e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), i) {
-      const m = u.createDeriveInputSignature(
+      const g = u.createDeriveInputSignature(
         e,
         a,
         o
       );
-      m === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
+      g === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
         () => u.evaluateDerive(e, a, o).then(
           () => {
           }
         )
-      )) : e.getDeriveInputSignature() !== m && (r = r.then(() => u.evaluateDerive(
+      )) : e.getDeriveInputSignature() !== g && (r = r.then(() => u.evaluateDerive(
         e,
         a,
         o
       ).then(() => {
-        e.setDeriveInputSignature(m);
+        e.setDeriveInputSignature(g);
       })));
     }
     return s && (r = r.then(() => u.evaluateIf(e))), n ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => u.evaluateEach(e))) : s ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => {
@@ -4789,14 +4905,14 @@ const u = class u {
     })), r.then(() => {
       if (c)
         return;
-      const m = [];
-      return e.getChildren().forEach((v) => {
-        if (v instanceof P) {
-          if (u.canSkipUnchangedNestedEach(v))
+      const g = [];
+      return e.getChildren().forEach((b) => {
+        if (b instanceof C) {
+          if (u.canSkipUnchangedNestedEach(b))
             return;
-          m.push(u.evaluateAll(v, t));
-        } else v instanceof H && m.push(u.evaluateText(v));
-      }), Promise.all(m).then(() => {
+          g.push(u.evaluateAll(b, t));
+        } else b instanceof H && g.push(u.evaluateText(b));
+      }), Promise.all(g).then(() => {
       });
     }).then(() => {
       d && f !== null && e.setDeriveSubtreeSignature(f);
@@ -4818,7 +4934,7 @@ const u = class u {
     const i = e.getRawDerivedBindingData(), s = typeof r == "string" ? r.trim() : "";
     if (!t || s === "")
       return i === null ? Promise.resolve(!1) : (e.setDerivedBindingData(null), Promise.resolve(!0));
-    const n = W.evaluateDetailed(
+    const n = Y.evaluateDetailed(
       t,
       e.getBindingData()
     );
@@ -4838,46 +4954,125 @@ const u = class u {
   static evaluateText(e) {
     return e.evaluate();
   }
+  /**
+   * data-if の評価値が「非表示」とみなされるかどうかを判定します。
+   *
+   * JavaScript の falsy 判定に準拠し、`false`・`null`・`undefined`・`NaN` に加えて
+   * `0`・空文字列 `''` も非表示とします（例: `data-if="items.length"` は要素数 0 で
+   * 非表示）。空配列 `[]` や空オブジェクト `{}` は JavaScript 同様 truthy なので表示されます。
+   *
+   * @param condition data-if の評価結果
+   * @return 非表示とみなす場合は true
+   */
+  static isHiddenIfCondition(e) {
+    return !e;
+  }
   /**
    * if要素を評価します。
-   * 値がfalse、null、undefined、NaNの場合は非表示にし、それ以外の場合は表示します。
+   * 値が falsy（false・null・undefined・NaN・0・空文字列）の場合は非表示にし、
+   * それ以外の場合は表示します。
    *
    * @param fragment 対象フラグメント
    * @return Promise (DOM操作が完了したときに解決される)
    */
   static evaluateIf(e) {
     const t = [], r = e.getAttribute(`${l.prefix}if`);
-    if (r === !1 || r === void 0 || r === null || Number.isNaN(r))
+    if (u.isHiddenIfCondition(r))
       t.push(
         e.hide().then(() => {
-          F.hide(e.getTarget());
+          R.hide(e.getTarget());
         })
       );
     else {
-      const i = [];
-      e.getChildren().forEach((s) => {
-        s instanceof P ? i.push(
-          s.isMounted() ? u.evaluateAll(s) : u.scan(s.getTarget())
-        ) : s instanceof H && i.push(u.evaluateText(s));
+      const i = e.isVisible(), s = [];
+      e.getChildren().forEach((n) => {
+        n instanceof C ? s.push(
+          n.isMounted() ? u.evaluateAll(n) : u.scan(n.getTarget())
+        ) : n instanceof H && s.push(u.evaluateText(n));
       }), t.push(
         e.show().then(() => {
-          F.show(e.getTarget());
+          R.show(e.getTarget()), i || u.triggerLoadOnShow(e);
         })
-      ), t.push(Promise.all(i).then(() => {
+      ), t.push(Promise.all(s).then(() => {
       }));
     }
     return Promise.all(t).then(() => {
     });
   }
+  /**
+   * data-if 表示時に data-load-* 手続きを発火します。
+   *
+   * 対象要素が data-load-* 属性を持つ場合のみ、load 種別の Procedure を1回実行します。
+   * 結果は待機せず（fire-and-forget）、表示処理の完了をブロックしません。
+   *
+   * @param fragment 対象フラグメント
+   * @return 戻り値はありません。
+   */
+  static triggerLoadOnShow(e) {
+    const t = `${l.prefix}load-`;
+    e.getTarget().getAttributeNames().some((i) => i.startsWith(t)) && new q(e, "load").run().catch((i) => {
+      p.error("[Haori]", "data-load procedure error (on show):", i);
+    });
+  }
+  /**
+   * data-each フラグメントの差分更新の再入制御状態を取得します。
+   *
+   * @param fragment 対象フラグメント
+   * @return 再入制御状態
+   */
+  static getEachUpdateState(e) {
+    let t = u.EACH_UPDATE_STATES.get(e);
+    return t || (t = { running: !1, rerunRequested: !1, settled: null }, u.EACH_UPDATE_STATES.set(e, t)), t;
+  }
   /**
    * each要素を評価します。
    * 非表示または未マウントの場合は処理をスキップします。
    *
+   * 同一フラグメントに対する差分更新が並行・再入しないように直列化します。
+   * 実行中に再度呼び出された場合は再評価要求を記録し、現在進行中の更新の完了
+   * Promise（後続の再実行も含む）を返します。これにより、bind 直後のリアクティブ
+   * 再評価が重なっても data-each の描画が破壊されず、かつ呼び出し元（`evaluateAll`→
+   * `setBindingData`→`haori:bindcomplete`）が**最終的な DOM 反映まで確実に待機**できます。
+   *
    * @param fragment 対象フラグメント
+   * @return 差分更新（再実行を含む）の完了 Promise
    */
   static evaluateEach(e) {
     if (!e.isVisible() || !e.isMounted())
       return Promise.resolve();
+    const t = u.getEachUpdateState(e);
+    return t.running ? (t.rerunRequested = !0, t.settled ?? Promise.resolve()) : u.runEachUpdateLoop(e, t);
+  }
+  /**
+   * data-each の差分更新を、再評価要求が無くなるまで直列に繰り返し実行します。
+   * 進行中・後続の再実行を含む完了 Promise を state に保持し、再入した呼び出し元が
+   * 同じ Promise を待てるようにします。
+   *
+   * @param fragment 対象フラグメント
+   * @param state 再入制御状態
+   * @return すべての差分更新が安定するまでの完了 Promise
+   */
+  static runEachUpdateLoop(e, t) {
+    t.running = !0, e.getTarget().removeAttribute(`${l.prefix}each-done`);
+    const r = (async () => {
+      try {
+        do
+          t.rerunRequested = !1, await u.performEachUpdate(e);
+        while (t.rerunRequested);
+        e.getTarget().setAttribute(`${l.prefix}each-done`, "");
+      } finally {
+        t.running = !1, t.settled = null;
+      }
+    })();
+    return t.settled = r, r;
+  }
+  /**
+   * data-each の差分更新本体を実行します（再入制御は呼び出し側で行います）。
+   *
+   * @param fragment 対象フラグメント
+   * @return 差分更新完了の Promise
+   */
+  static performEachUpdate(e) {
     const t = u.resolveEachItems(e);
     if (t === null)
       return Promise.reject(new Error("Invalid each attribute."));
@@ -4889,7 +5084,7 @@ const u = class u {
     if (r === null) {
       let n = !1;
       return e.getChildren().forEach((a) => {
-        if (!n && a instanceof P) {
+        if (!n && a instanceof C) {
           if (a.hasAttribute(`${l.prefix}each-before`) || a.hasAttribute(`${l.prefix}each-after`))
             return;
           r = a.clone(), u.markFreshInitializationSkippable(r), e.setTemplate(r), n = !0, e.removeChild(a);
@@ -4912,7 +5107,7 @@ const u = class u {
    */
   static resolveEachItems(e) {
     const t = e.getAttributeEvaluation(`${l.prefix}each`), r = t?.value;
-    return t?.hasUnresolvedReference || r === !1 || r === null || r === void 0 ? [] : Array.isArray(r) ? r : (g.error("[Haori]", "Invalid each attribute:", r), null);
+    return t?.hasUnresolvedReference || r === !1 || r === null || r === void 0 ? [] : Array.isArray(r) ? r : (p.error("[Haori]", "Invalid each attribute:", r), null);
   }
   /**
    * nested data-each の入力が同値で、要素自身に他の動的要素が無い場合は
@@ -4953,7 +5148,7 @@ const u = class u {
    * @returns 含むなら true
    */
   static hasDisallowedDerivedSubtreeDescendant(e) {
-    return e.getChildren().some((t) => t instanceof P ? t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}derive-name`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !0 : u.hasDisallowedDerivedSubtreeDescendant(t) : !1);
+    return e.getChildren().some((t) => t instanceof C ? t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}derive-name`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !0 : u.hasDisallowedDerivedSubtreeDescendant(t) : !1);
   }
   /**
    * data-derive host が子孫要素へ公開している binding の署名を返します。
@@ -5001,7 +5196,7 @@ const u = class u {
    * @returns プロファイル
    */
   static getOrCreateDerivedSubtreeProfile(e) {
-    if (!U.isEnabled() || !e.hasAttribute(`${l.prefix}derive`))
+    if (!L.isEnabled() || !e.hasAttribute(`${l.prefix}derive`))
       return null;
     const t = u.DERIVE_SUBTREE_PROFILES.get(e);
     if (t)
@@ -5039,7 +5234,7 @@ const u = class u {
       typeof n == "string" && n.trim() !== "" && (s += `[${l.prefix}derive-name="${n.trim()}"]`);
       const a = r.getParent();
       if (a) {
-        const o = a.getChildren().filter((c) => c instanceof P).findIndex((c) => c === r);
+        const o = a.getChildren().filter((c) => c instanceof C).findIndex((c) => c === r);
         s += `:nth-child(${o + 1})`;
       }
       t.unshift(s), r = a;
@@ -5070,7 +5265,7 @@ const u = class u {
    */
   static logDerivedSubtreeProfileSnapshot(e, t) {
     const r = u.getOrCreateDerivedSubtreeProfile(e);
-    r !== null && (t === "skip-hit" ? r.skipHitCount += 1 : t === "skip-miss" ? r.skipMissCount += 1 : t === "skip-ineligible" && (r.skipIneligibleCount += 1), g.info("[Haori][derive-profile]", {
+    r !== null && (t === "skip-hit" ? r.skipHitCount += 1 : t === "skip-miss" ? r.skipMissCount += 1 : t === "skip-ineligible" && (r.skipIneligibleCount += 1), p.info("[Haori][derive-profile]", {
       reason: t,
       hostId: r.hostId,
       signatureComputeTotal: r.signatureComputeTotal,
@@ -5112,7 +5307,7 @@ const u = class u {
    * @returns subtree 全体を省略可能なら true
    */
   static markFreshInitializationSkippable(e) {
-    const t = e.getAttributeNames().some((s) => u.isFreshInitializationDynamicAttribute(e, s)), r = e.getChildren().some((s) => s instanceof P ? !u.markFreshInitializationSkippable(s) : s instanceof H ? s.hasDynamicContent() : !1), i = !t && !r;
+    const t = e.getAttributeNames().some((s) => u.isFreshInitializationDynamicAttribute(e, s)), r = e.getChildren().some((s) => s instanceof C ? !u.markFreshInitializationSkippable(s) : s instanceof H ? s.hasDynamicContent() : !1), i = !t && !r;
     return e.setFreshInitializationSkippable(i), i;
   }
   /**
@@ -5137,84 +5332,84 @@ const u = class u {
   static updateDiff(e, t) {
     const r = e.getTemplate();
     if (r === null)
-      return g.error("[Haori]", "Template is not set for each element."), Promise.resolve();
+      return p.error("[Haori]", "Template is not set for each element."), Promise.resolve();
     let i = e.getAttribute(`${l.prefix}each-index`);
     i && (i = String(i));
     const s = e.getAttribute(`${l.prefix}each-key`), n = e.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    t.forEach((y, R) => {
-      const B = u.createListKey(
+    t.forEach((y, F) => {
+      const N = u.createListKey(
         y,
         s ? String(s) : null,
-        R
+        F
       );
-      o.push(B), a.set(B, { item: y, itemIndex: R });
+      o.push(N), a.set(N, { item: y, itemIndex: F });
     });
     const c = new Set(o), d = [];
-    let f = e.getChildren().filter((y) => y instanceof P).filter(
+    let f = e.getChildren().filter((y) => y instanceof C).filter(
       (y) => !y.hasAttribute(`${l.prefix}each-before`) && !y.hasAttribute(`${l.prefix}each-after`)
     );
-    const m = f.map((y) => y.getListKey());
+    const g = f.map((y) => y.getListKey());
     f = f.filter((y) => c.has(String(y.getListKey())) ? !0 : (d.push(y.remove()), !1));
-    const v = f.map((y) => y.getListKey()), p = /* @__PURE__ */ new Map();
+    const b = f.map((y) => y.getListKey()), S = /* @__PURE__ */ new Map();
     f.forEach((y) => {
-      const R = y.getListKey();
-      R !== null && !p.has(R) && p.set(R, y);
+      const F = y.getListKey();
+      F !== null && !S.has(F) && S.set(F, y);
     });
-    const b = e.getChildElementFragments().slice(), S = b.filter(
+    const m = e.getChildElementFragments().slice(), v = m.filter(
       (y) => y.hasAttribute(`${l.prefix}each-before`)
     ).length;
-    let A = Promise.resolve();
-    return o.forEach((y, R) => {
-      const { item: B, itemIndex: L } = a.get(y);
-      let k;
-      const Y = p.get(y);
-      if (Y)
-        k = Y, A = A.then(
+    let E = Promise.resolve();
+    return o.forEach((y, F) => {
+      const { item: N, itemIndex: U } = a.get(y);
+      let B;
+      const K = S.get(y);
+      if (K)
+        B = K, E = E.then(
           () => u.updateRowFragment(
-            k,
             B,
+            N,
             i,
-            L,
+            U,
             n ? String(n) : null,
             y
-          ).then((I) => {
-            if (I)
-              return u.evaluateAll(k);
+          ).then((k) => {
+            if (k)
+              return u.evaluateAll(B);
           })
         );
       else {
-        k = r.clone();
-        const I = S + R;
-        A = A.then(
+        B = r.clone();
+        const k = v + F;
+        E = E.then(
           () => u.updateRowFragment(
-            k,
             B,
+            N,
             i,
-            L,
+            U,
             n ? String(n) : null,
             y
           ).then(() => {
-            const ce = b[I] ?? null;
-            return e.insertBefore(k, ce).then(() => {
-              b.splice(I, 0, k);
-            }).then(() => u.initializeFreshEachRow(k));
+            const he = m[k] ?? null;
+            return e.insertBefore(B, he).then(() => {
+              m.splice(k, 0, B);
+            }).then(() => u.initializeFreshEachRow(B));
           })
         );
       }
-    }), Promise.all(d).then(() => A).then(() => {
+    }), Promise.all(d).then(() => E).then(() => {
       const y = o.filter(
-        (I) => I !== null
-      ), R = v.filter(
-        (I) => I !== null
-      ), B = new Set(R), L = y.filter((I) => !B.has(I)), Y = m.filter(
-        (I) => I !== null
+        (k) => k !== null
+      ), F = b.filter(
+        (k) => k !== null
+      ), N = new Set(F), U = y.filter((k) => !N.has(k)), K = g.filter(
+        (k) => k !== null
       ).filter(
-        (I) => !c.has(I)
+        (k) => !c.has(k)
       );
-      F.eachUpdate(
+      R.eachUpdate(
         e.getTarget(),
-        L,
-        Y,
+        U,
+        K,
         y
       );
     });
@@ -5261,7 +5456,7 @@ const u = class u {
         [s]: t
       }, r && (a[r] = i);
     else
-      return g.error(
+      return p.error(
         "[Haori]",
         `Primitive value requires '${l.prefix}each-arg' attribute: ${t}`
       ), Promise.resolve(!1);
@@ -5371,9 +5566,9 @@ u.ATTRIBUTE_ALIAS_SUFFIX = "attr-", u.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "fetch",
   "import",
   "url-param"
-], u.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, u.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), u.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), u.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap();
-let M = u;
-const ee = class ee {
+], u.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, u.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), u.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), u.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), u.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap();
+let P = u;
+const te = class te {
   /**
    * コンストラクタ。
    *
@@ -5382,10 +5577,10 @@ const ee = class ee {
   constructor(e = document) {
     this.onClick = (t) => this.delegate(t, "click"), this.onChange = (t) => this.delegate(t, "change"), this.onLoadCapture = (t) => this.delegate(t, "load"), this.onWindowLoad = () => {
       const t = document.documentElement, r = w.get(t);
-      r && new z(r, "load").run();
+      r && new q(r, "load").run();
     }, this.onPopstate = (t) => {
       const r = t.state;
-      !r || r[ee.HISTORY_STATE_KEY] !== !0 || location.reload();
+      !r || r[te.HISTORY_STATE_KEY] !== !0 || location.reload();
     }, this.root = e;
   }
   /**
@@ -5412,8 +5607,8 @@ const ee = class ee {
     if (!r)
       return;
     const i = w.get(r);
-    i && (t === "change" && i instanceof P && i.syncValue(), new z(i, t).run().catch((s) => {
-      g.error("[Haori]", "Procedure execution error:", s);
+    i && (t === "change" && i instanceof C && i.syncValue(), new q(i, t).run().catch((s) => {
+      p.error("[Haori]", "Procedure execution error:", s);
     }));
   }
   /**
@@ -5450,9 +5645,9 @@ const ee = class ee {
     return null;
   }
 };
-ee.HISTORY_STATE_KEY = "__haoriHistoryState__";
-let ne = ee;
-const T = class T {
+te.HISTORY_STATE_KEY = "__haoriHistoryState__";
+let ne = te;
+const D = class D {
   /**
    * ノードが現在の Window に属する HTMLElement かどうかを判定します。
    *
@@ -5466,42 +5661,42 @@ const T = class T {
     return typeof t < "u" && e instanceof t;
   }
   static syncTree(e) {
-    (e instanceof Element || e instanceof DocumentFragment) && (T.isHtmlElement(e) && T.syncElement(e), e.querySelectorAll("*").forEach((t) => {
-      T.syncElement(t);
+    (e instanceof Element || e instanceof DocumentFragment) && (D.isHtmlElement(e) && D.syncElement(e), e.querySelectorAll("*").forEach((t) => {
+      D.syncElement(t);
     }));
   }
   static syncElement(e) {
-    const t = T.registrations.get(e), r = w.get(e);
-    if (!r || !T.shouldObserve(r)) {
-      t && (t.observer.disconnect(), T.registrations.delete(e));
+    const t = D.registrations.get(e), r = w.get(e);
+    if (!r || !D.shouldObserve(r)) {
+      t && (t.observer.disconnect(), D.registrations.delete(e));
       return;
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = T.resolveRoot(r), s = T.resolveRootMargin(r), n = T.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
-    if (t && t.observer.root === i && t.observer.rootMargin === s && T.sameThreshold(
+    const i = D.resolveRoot(r), s = D.resolveRootMargin(r), n = D.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
+    if (t && t.observer.root === i && t.observer.rootMargin === s && D.sameThreshold(
       t.observer.thresholds,
       n
     ) && t.once === a) {
       t.fragment = r;
       return;
     }
-    t && (t.observer.disconnect(), T.registrations.delete(e));
+    t && (t.observer.disconnect(), D.registrations.delete(e));
     const o = new IntersectionObserver(
       (c) => {
-        const d = T.registrations.get(e);
+        const d = D.registrations.get(e);
         d && c.forEach((f) => {
-          !f.isIntersecting || d.running || T.isDisabled(d.fragment) || (d.running = !0, new z(d.fragment, "intersect").runWithResult().then((m) => {
-            m && d.once && (d.observer.disconnect(), T.registrations.delete(e));
-          }).catch((m) => {
-            g.error(
+          !f.isIntersecting || d.running || D.isDisabled(d.fragment) || (d.running = !0, new q(d.fragment, "intersect").runWithResult().then((g) => {
+            g && d.once && (d.observer.disconnect(), D.registrations.delete(e));
+          }).catch((g) => {
+            p.error(
               "[Haori]",
               "Intersect procedure execution error:",
-              m
+              g
             );
           }).finally(() => {
-            const m = T.registrations.get(e);
-            m && (m.running = !1);
+            const g = D.registrations.get(e);
+            g && (g.running = !1);
           }));
         });
       },
@@ -5511,7 +5706,7 @@ const T = class T {
         threshold: n
       }
     );
-    o.observe(e), T.registrations.set(e, {
+    o.observe(e), D.registrations.set(e, {
       fragment: r,
       observer: o,
       once: a,
@@ -5519,26 +5714,26 @@ const T = class T {
     });
   }
   static cleanupTree(e) {
-    if (T.isHtmlElement(e)) {
-      const t = T.registrations.get(e);
-      t && (t.observer.disconnect(), T.registrations.delete(e));
+    if (D.isHtmlElement(e)) {
+      const t = D.registrations.get(e);
+      t && (t.observer.disconnect(), D.registrations.delete(e));
     }
     (e instanceof Element || e instanceof DocumentFragment) && e.querySelectorAll("*").forEach((t) => {
-      const r = T.registrations.get(t);
-      r && (r.observer.disconnect(), T.registrations.delete(t));
+      const r = D.registrations.get(t);
+      r && (r.observer.disconnect(), D.registrations.delete(t));
     });
   }
   static disconnectAll() {
-    T.registrations.forEach((e) => {
+    D.registrations.forEach((e) => {
       e.observer.disconnect();
-    }), T.registrations.clear();
+    }), D.registrations.clear();
   }
   static shouldObserve(e) {
     return e.getAttributeNames().some((t) => {
       if (!t.startsWith(`${l.prefix}intersect-`))
         return !1;
       const r = t.slice(`${l.prefix}intersect-`.length);
-      return !T.CONFIG_KEYS.has(r);
+      return !D.CONFIG_KEYS.has(r);
     });
   }
   static resolveRoot(e) {
@@ -5549,7 +5744,7 @@ const T = class T {
     if (typeof r != "string" || r.trim() === "")
       return null;
     const i = document.querySelector(r);
-    return T.isHtmlElement(i) ? i : (g.error("[Haori]", `Intersect root element not found: ${r}`), null);
+    return D.isHtmlElement(i) ? i : (p.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(e) {
     const t = `${l.prefix}intersect-root-margin`, r = e.getAttribute(t);
@@ -5572,14 +5767,14 @@ const T = class T {
     return e.length === 1 && e[0] === t;
   }
 };
-T.CONFIG_KEYS = /* @__PURE__ */ new Set([
+D.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "root",
   "root-margin",
   "threshold",
   "disabled",
   "once"
-]), T.registrations = /* @__PURE__ */ new Map();
-let G = T;
+]), D.registrations = /* @__PURE__ */ new Map();
+let W = D;
 const O = class O {
   /**
    * 既存の MutationObserver をすべて停止します。
@@ -5598,10 +5793,10 @@ const O = class O {
       return;
     O._initialized = !0, O.disconnectMutationObservers();
     const e = await Promise.allSettled([
-      M.scan(document.head),
-      M.scan(document.body)
+      P.scan(document.head),
+      P.scan(document.body)
     ]), [t, r] = e;
-    t.status !== "fulfilled" && g.error("[Haori]", "Failed to build head fragment:", t.reason), r.status !== "fulfilled" && g.error("[Haori]", "Failed to build body fragment:", r.reason), await x.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ne().start(), G.syncTree(document.body);
+    t.status !== "fulfilled" && p.error("[Haori]", "Failed to build head fragment:", t.reason), r.status !== "fulfilled" && p.error("[Haori]", "Failed to build body fragment:", r.reason), await M.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ne().start(), W.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -5615,29 +5810,29 @@ const O = class O {
           switch (i.type) {
             case "attributes": {
               const s = i.target;
-              if (i.attributeName && s.hasAttribute("data-haori-click-lock") && (i.attributeName === "disabled" || i.attributeName === "data-haori-click-lock") || i.attributeName && M.isAliasedAttributeReflection(
+              if (i.attributeName && s.hasAttribute("data-haori-click-lock") && (i.attributeName === "disabled" || i.attributeName === "data-haori-click-lock") || i.attributeName && P.isAliasedAttributeReflection(
                 s,
                 i.attributeName
               ))
                 break;
-              M.setAttribute(
+              P.setAttribute(
                 s,
                 i.attributeName,
                 s.getAttribute(i.attributeName),
                 !0
-              ), G.syncElement(s);
+              ), W.syncElement(s);
               break;
             }
             case "childList": {
               Array.from(i.removedNodes).forEach((s) => {
-                G.cleanupTree(s), M.removeNode(s);
+                W.cleanupTree(s), P.removeNode(s);
               }), Array.from(i.addedNodes).forEach((s) => {
-                s.parentElement instanceof Element && (M.addNode(s.parentElement, s), G.syncTree(s));
+                s.parentElement instanceof Element && (P.addNode(s.parentElement, s), W.syncTree(s));
               });
               break;
             }
             case "characterData": {
-              i.target instanceof Text || i.target instanceof Comment ? M.changeText(i.target, i.target.textContent) : g.warn(
+              i.target instanceof Text || i.target instanceof Comment ? P.changeText(i.target, i.target.textContent) : p.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -5645,11 +5840,11 @@ const O = class O {
               break;
             }
             default:
-              g.warn("[Haori]", "Unknown mutation type:", i.type);
+              p.warn("[Haori]", "Unknown mutation type:", i.type);
               continue;
           }
         } catch (s) {
-          g.error("[Haori]", "Error processing mutation:", s);
+          p.error("[Haori]", "Error processing mutation:", s);
         }
     });
     t.observe(e, {
@@ -5661,18 +5856,19 @@ const O = class O {
   }
 };
 O._initialized = !1, O._mutationObservers = [];
-let Q = O;
-document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", Q.init) : Q.init();
-const Te = "0.4.13";
+let Z = O;
+document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", Z.init) : Z.init();
+const De = () => J.waitForRenders(), Re = "0.9.0";
 export {
-  M as Core,
+  P as Core,
   l as Env,
-  E as Form,
+  A as Form,
   w as Fragment,
-  te as Haori,
-  g as Log,
-  x as Queue,
-  te as default,
-  Te as version
+  J as Haori,
+  p as Log,
+  M as Queue,
+  J as default,
+  Re as version,
+  De as waitForRenders
 };
 //# sourceMappingURL=haori.es.js.map