haori 0.4.5 → 0.4.7

package/dist/haori.es.js

@@ -1,23 +1,23 @@
-const O = class O {
+const C = class C {
   /**
    * 開発モードの状態を取得します。
    *
    * @returns 開発モードならtrue、そうでなければfalse
    */
   static isEnabled() {
-    return O.devMode;
+    return C.devMode;
   }
   /**
    * 開発モードを有効化します。
    */
   static enable() {
-    O.devMode = !0;
+    C.devMode = !0;
   }
   /**
    * 開発モードを無効化します。
    */
   static disable() {
-    O.devMode = !1;
+    C.devMode = !1;
   }
   /**
    * 開発モードを切り替えます。
@@ -25,11 +25,11 @@ const O = class O {
    * @param enabled trueで有効化、falseで無効化
    */
   static set(t) {
-    O.devMode = t;
+    C.devMode = t;
   }
 };
-O.devMode = !1;
-let B = O;
+C.devMode = !1;
+let B = C;
 const z = "embedded";
 function rt(F) {
   return F === "embedded" || F === "demo";
@@ -95,8 +95,8 @@ const D = class D {
   }
 };
 D._prefix = "data-", D._runtime = z;
-let c = D;
-document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", c.detect) : c.detect();
+let l = D;
+document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", l.detect) : l.detect();
 class d {
   /**
    * 開発モードでのみコンソールに情報を出力します。
@@ -222,14 +222,14 @@ const _ = class _ {
 };
 _.ASYNC_QUEUE = new st();
 let P = _;
-class J {
+class X {
   /**
    * 実行モードを取得します。
    *
    * @return 実行モード。
    */
   static get runtime() {
-    return c.runtime;
+    return l.runtime;
   }
   /**
    * 実行モードを設定します。
@@ -238,7 +238,7 @@ class J {
    * @return 戻り値はありません。
    */
   static setRuntime(t) {
-    c.setRuntime(t);
+    l.setRuntime(t);
   }
   /**
    * 通知ダイアログを表示します。
@@ -304,7 +304,7 @@ class J {
    * @param message エラーメッセージ
    */
   static addErrorMessage(t, e) {
-    return J.addMessage(t, e, "error");
+    return X.addMessage(t, e, "error");
   }
   /**
    * メッセージをレベル付きで追加します。
@@ -337,9 +337,9 @@ function et() {
   const t = globalThis.window?.Haori;
   return nt.every(
     (r) => typeof t?.[r] == "function"
-  ) ? t : J;
+  ) ? t : X;
 }
-class b {
+class y {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -350,7 +350,7 @@ class b {
    */
   static getValues(t) {
     const e = {};
-    return b.getPartValues(t, e);
+    return y.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -361,32 +361,32 @@ class b {
    * @returns values と同じオブジェクト
    */
   static getPartValues(t, e) {
-    const r = t.getAttribute("name"), i = t.getAttribute(`${c.prefix}form-object`), n = t.getAttribute(`${c.prefix}form-list`);
+    const r = t.getAttribute("name"), i = t.getAttribute(`${l.prefix}form-object`), n = t.getAttribute(`${l.prefix}form-list`);
     if (r) {
       n ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), i && d.warn(
         "Haori",
-        `Element cannot have both ${c.prefix}form-object and name attributes.`
+        `Element cannot have both ${l.prefix}form-object and name attributes.`
       );
       for (const s of t.getChildElementFragments())
-        b.getPartValues(s, e);
+        y.getPartValues(s, e);
     } else if (i) {
       const s = {};
       for (const a of t.getChildElementFragments())
-        b.getPartValues(a, s);
+        y.getPartValues(a, s);
       Object.keys(s).length > 0 && (e[String(i)] = s), n && d.warn(
         "Haori",
-        `Element cannot have both ${c.prefix}form-list and ${c.prefix}form-object attributes.`
+        `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
       );
     } else if (n) {
       const s = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        b.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
+        y.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
       }
       s.length > 0 && (e[String(n)] = s);
     } else
       for (const s of t.getChildElementFragments())
-        b.getPartValues(s, e);
+        y.getPartValues(s, e);
     return e;
   }
   /**
@@ -399,7 +399,7 @@ class b {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return b.setPartValues(t, e, null, r, !0);
+    return y.setPartValues(t, e, null, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -411,7 +411,7 @@ class b {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(t, e, r = !1) {
-    return b.setPartValues(t, e, null, r, !1);
+    return y.setPartValues(t, e, null, r, !1);
   }
   /**
    * 単一フラグメントへ値を設定します。
@@ -434,50 +434,50 @@ class b {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setPartValues(t, e, r = null, i = !1, n = !0) {
-    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${c.prefix}form-object`), u = t.getAttribute(`${c.prefix}form-list`), m = t.getAttribute(`${c.prefix}form-detach`);
+    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), h = t.getAttribute(`${l.prefix}form-list`), m = t.getAttribute(`${l.prefix}form-detach`);
     if (a) {
       if (!m || i) {
-        const y = e[String(a)];
-        u && Array.isArray(y) && r !== null ? s.push(
-          b.applyFragmentValue(t, y[r] ?? null, n)
-        ) : typeof y > "u" || (typeof y == "string" || typeof y == "number" || typeof y == "boolean" || y === null ? s.push(b.applyFragmentValue(t, y, n)) : s.push(
-          b.applyFragmentValue(t, String(y), n)
+        const b = e[String(a)];
+        h && Array.isArray(b) && r !== null ? s.push(
+          y.applyFragmentValue(t, b[r] ?? null, n)
+        ) : typeof b > "u" || (typeof b == "string" || typeof b == "number" || typeof b == "boolean" || b === null ? s.push(y.applyFragmentValue(t, b, n)) : s.push(
+          y.applyFragmentValue(t, String(b), n)
         ));
       }
     } else if (o) {
-      const y = e[String(o)];
-      if (y && typeof y == "object")
+      const b = e[String(o)];
+      if (b && typeof b == "object")
         for (const E of t.getChildElementFragments())
           s.push(
-            b.setPartValues(
+            y.setPartValues(
               E,
-              y,
+              b,
               null,
               i,
               n
             )
           );
-    } else if (u) {
-      const y = e[String(u)];
-      if (Array.isArray(y)) {
+    } else if (h) {
+      const b = e[String(h)];
+      if (Array.isArray(b)) {
         const E = t.getChildElementFragments();
         for (let S = 0; S < E.length; S++) {
-          const h = E[S];
-          y.length > S ? s.push(
-            b.setPartValues(
-              h,
-              y[S],
+          const c = E[S];
+          b.length > S ? s.push(
+            y.setPartValues(
+              c,
+              b[S],
               S,
               i,
               n
             )
-          ) : s.push(b.setPartValues(h, {}, S, i, n));
+          ) : s.push(y.setPartValues(c, {}, S, i, n));
         }
       }
     } else
-      for (const y of t.getChildElementFragments())
+      for (const b of t.getChildElementFragments())
         s.push(
-          b.setPartValues(y, e, null, i, n)
+          y.setPartValues(b, e, null, i, n)
         );
     return Promise.all(s).then(() => {
     });
@@ -490,9 +490,9 @@ class b {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    b.clearValues(t), await Promise.all([
-      b.clearMessages(t),
-      b.clearEachClones(t)
+    y.clearValues(t), await Promise.all([
+      y.clearMessages(t),
+      y.clearEachClones(t)
     ]), await P.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
@@ -514,9 +514,9 @@ class b {
    */
   static clearEachClones(t) {
     const e = [], r = (n) => {
-      if (n.hasAttribute(`${c.prefix}each`))
+      if (n.hasAttribute(`${l.prefix}each`))
         for (const s of n.getChildElementFragments()) {
-          const a = s.hasAttribute(`${c.prefix}each-before`), o = s.hasAttribute(`${c.prefix}each-after`);
+          const a = s.hasAttribute(`${l.prefix}each-before`), o = s.hasAttribute(`${l.prefix}each-after`);
           !a && !o && e.push(s.remove());
         }
     }, i = (n) => {
@@ -538,7 +538,7 @@ class b {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      b.clearValues(e);
+      y.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -561,7 +561,7 @@ class b {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    return b.addMessage(t, e, r, "error");
+    return y.addMessage(t, e, r, "error");
   }
   /**
    * キーに一致するフラグメントにレベル付きメッセージを追加します。
@@ -574,10 +574,10 @@ class b {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(t, e, r, i) {
-    const n = [], s = et(), a = s.addMessage, o = (m) => typeof a == "function" ? a.call(s, m, r, i) : s.addErrorMessage(m, r), u = b.findFragmentsByKey(t, e);
-    return u.forEach((m) => {
+    const n = [], s = et(), a = s.addMessage, o = (m) => typeof a == "function" ? a.call(s, m, r, i) : s.addErrorMessage(m, r), h = y.findFragmentsByKey(t, e);
+    return h.forEach((m) => {
       n.push(o(m.getTarget()));
-    }), u.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
+    }), h.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
     });
   }
   /**
@@ -588,7 +588,7 @@ class b {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return b.findFragmentByKeyParts(t, e.split("."));
+    return y.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -600,23 +600,23 @@ class b {
    */
   static findFragmentByKeyParts(t, e) {
     const r = [], i = e[0];
-    if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${c.prefix}form-object`))
-      e.length > 1 && t.getAttribute(`${c.prefix}form-object`) === i && t.getChildElementFragments().forEach((s) => {
-        r.push(...b.findFragmentByKeyParts(s, e.slice(1)));
+    if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${l.prefix}form-object`))
+      e.length > 1 && t.getAttribute(`${l.prefix}form-object`) === i && t.getChildElementFragments().forEach((s) => {
+        r.push(...y.findFragmentByKeyParts(s, e.slice(1)));
       });
-    else if (t.hasAttribute(`${c.prefix}form-list`)) {
+    else if (t.hasAttribute(`${l.prefix}form-list`)) {
       if (e.length > 1) {
-        const n = t.getAttribute(`${c.prefix}form-list`), s = i.lastIndexOf("["), a = i.lastIndexOf("]");
+        const n = t.getAttribute(`${l.prefix}form-list`), s = i.lastIndexOf("["), a = i.lastIndexOf("]");
         if (s !== -1 && a !== -1 && s < a) {
           const o = i.substring(0, s);
           if (n === o) {
-            const u = i.substring(s + 1, a), m = Number(u);
+            const h = i.substring(s + 1, a), m = Number(h);
             if (isNaN(m))
               d.error("Haori", `Invalid index: ${i}`);
             else {
-              const y = t.getChildElementFragments().filter((E) => E.hasAttribute(`${c.prefix}row`));
-              m < y.length && r.push(
-                ...b.findFragmentByKeyParts(y[m], e.slice(1))
+              const b = t.getChildElementFragments().filter((E) => E.hasAttribute(`${l.prefix}row`));
+              m < b.length && r.push(
+                ...y.findFragmentByKeyParts(b[m], e.slice(1))
               );
             }
           }
@@ -624,7 +624,7 @@ class b {
       }
     } else
       t.getChildElementFragments().forEach((n) => {
-        r.push(...b.findFragmentByKeyParts(n, e));
+        r.push(...y.findFragmentByKeyParts(n, e));
       });
     return r;
   }
@@ -753,8 +753,15 @@ return (${t});`;
     const r = [];
     let i = null;
     for (let n = 0; n < e.length; n++) {
-      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null;
-      if (s.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(s.value) || this.STRICT_FORBIDDEN_NAMES.includes(s.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(s.value)) || o === "member" && s.value !== "]" && s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, h = e[n - 2] || null, m = e[n - 3] || null;
+      if (this.startsObjectKey(
+        o,
+        i,
+        h,
+        m
+      ) && (s.value === "[" || s.type === "identifier" && this.FORBIDDEN_PROPERTY_NAMES.has(s.value) || s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+        this.decodeStringLiteral(s.value)
+      )) || s.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(s.value) || this.STRICT_FORBIDDEN_NAMES.includes(s.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(s.value)) || o === "member" && s.value !== "]" && s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
         this.decodeStringLiteral(s.value)
       ) || s.value === "." && a?.type !== "identifier" || s.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
         return !1;
@@ -768,15 +775,23 @@ return (${t});`;
           break;
         }
         case "[": {
-          const u = this.startsMemberAccess(i) ? "member" : "array";
-          r.push(u);
+          const b = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(b);
           break;
         }
+        case "{":
+          r.push("object");
+          break;
         case "]": {
           if (r.pop() === void 0)
             return !1;
           break;
         }
+        case "}": {
+          if (r.pop() !== "object")
+            return !1;
+          break;
+        }
       }
       i = s;
     }
@@ -804,6 +819,8 @@ return (${t});`;
     ], i = /* @__PURE__ */ new Set([
       "(",
       ")",
+      "{",
+      "}",
       "[",
       "]",
       ".",
@@ -941,6 +958,16 @@ return (${t});`;
   static startsMemberAccess(t) {
     return t === null ? !1 : t.type === "identifier" || t.type === "number" ? !0 : t.value === ")" || t.value === "]" || t.value === "?.";
   }
+  /**
+   * object literal 内で次のトークンがキー位置かどうかを判定します。
+   *
+   * @param activeGroup 現在のグループ種別
+   * @param previous 直前のトークン
+   * @returns object literal のキー位置であれば true
+   */
+  static startsObjectKey(t, e, r, i) {
+    return t !== "object" ? !1 : e?.value === "{" || e?.value === "," || e?.type === "identifier" && this.OBJECT_PROPERTY_MODIFIERS.has(e.value) && (r?.value === "{" || r?.value === ",") ? !0 : e?.value !== "*" ? !1 : r?.value === "{" || r?.value === "," ? !0 : r?.type === "identifier" && r.value === "async" && (i?.value === "{" || i?.value === ",");
+  }
   /**
    * 文字列リテラルをプレーン文字列へ変換します。
    *
@@ -949,6 +976,9 @@ return (${t});`;
    */
   static decodeStringLiteral(t) {
     return t.slice(1, -1).replace(
+      /\\u\{([0-9a-fA-F]+)\}/g,
+      (e, r) => String.fromCodePoint(parseInt(r, 16))
+    ).replace(
       /\\u([0-9a-fA-F]{4})/g,
       (e, r) => String.fromCharCode(parseInt(r, 16))
     ).replace(
@@ -1005,9 +1035,9 @@ return (${t});`;
       get: (s, a, o) => {
         if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
           return;
-        const u = Reflect.get(s, a, o);
-        return typeof a == "symbol" ? u : this.wrapBoundValue(
-          u,
+        const h = Reflect.get(s, a, o);
+        return typeof a == "symbol" ? h : this.wrapBoundValue(
+          h,
           e
         );
       },
@@ -1017,12 +1047,12 @@ return (${t});`;
           return Reflect.getOwnPropertyDescriptor(s, a);
       },
       apply: (s, a, o) => {
-        const u = Reflect.apply(
+        const h = Reflect.apply(
           s,
           a,
           o
         );
-        return this.isIteratorLike(u) ? u : this.wrapBoundValue(u, e);
+        return this.isIteratorLike(h) ? h : this.wrapBoundValue(h, e);
       },
       construct: (s, a, o) => this.wrapBoundValue(
         Reflect.construct(
@@ -1178,6 +1208,10 @@ M.FORBIDDEN_NAMES = [
   "constructor",
   "__proto__",
   "prototype"
+]), M.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
+  "get",
+  "set",
+  "async"
 ]), M.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
   "await",
   "break",
@@ -1214,27 +1248,27 @@ M.FORBIDDEN_NAMES = [
   "yield"
 ]), M.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
 let j = M;
-const C = class C {
+const I = class I {
   /**
    * フラグメントのコンストラクタ。
    *
    * @param target 対象ノード
    */
   constructor(t) {
-    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = t, C.FRAGMENT_CACHE.set(t, this);
+    this.parent = null, this.mounted = !1, this.skipMutationNodes = !1, this.target = t, I.FRAGMENT_CACHE.set(t, this);
   }
   static get(t) {
     if (t == null)
       return null;
-    if (C.FRAGMENT_CACHE.has(t))
-      return C.FRAGMENT_CACHE.get(t);
+    if (I.FRAGMENT_CACHE.has(t))
+      return I.FRAGMENT_CACHE.get(t);
     let e;
     switch (t.nodeType) {
       case Node.ELEMENT_NODE:
         e = new x(t);
         break;
       case Node.TEXT_NODE:
-        e = new H(t);
+        e = new O(t);
         break;
       case Node.COMMENT_NODE:
         e = new Z(t);
@@ -1318,7 +1352,7 @@ const C = class C {
    * @return 除去のPromise
    */
   remove(t = !0) {
-    return this.parent && this.parent.removeChild(this), C.FRAGMENT_CACHE.delete(this.target), t ? this.unmount() : Promise.resolve();
+    return this.parent && this.parent.removeChild(this), I.FRAGMENT_CACHE.delete(this.target), t ? this.unmount() : Promise.resolve();
   }
   /**
    * 対象ノードを取得します。
@@ -1345,9 +1379,9 @@ const C = class C {
     this.parent = t;
   }
 };
-C.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let T = C;
-class x extends T {
+I.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
+let w = I;
+class x extends w {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1377,7 +1411,7 @@ class x extends T {
         this.attributeMap.set(e, i);
       }
     }), t.childNodes.forEach((e) => {
-      const r = T.get(e);
+      const r = w.get(e);
       r.setParent(this), this.children.push(r);
     });
   }
@@ -1436,7 +1470,15 @@ class x extends T {
     }), this.children.forEach((e) => {
       const r = e.clone();
       t.getTarget().appendChild(r.getTarget()), t.pushChild(r);
-    }), t.mounted = !1, t.bindingData = this.bindingData, t.clearBindingDataCache(), t.visible = this.visible, t.display = this.display, t.template = this.template, t;
+    }), t.mounted = !1, t.bindingData = this.bindingData, t.clearBindingDataCache(), t.visible = !0, t.display = this.display, t.template = this.template, t.normalizeClonedVisibilityState(), t;
+  }
+  /**
+   * clone 時に runtime の hidden 状態だけを落とします。
+   */
+  normalizeClonedVisibilityState() {
+    (this.visible === !1 || this.getTarget().style.display === "none" || this.getTarget().hasAttribute(`${l.prefix}if-false`)) && (this.visible = !0, this.display = "", this.getTarget().style.display = "", this.getTarget().removeAttribute(`${l.prefix}if-false`)), this.children.forEach((t) => {
+      t instanceof x && t.normalizeClonedVisibilityState();
+    });
   }
   /**
    * フラグメントとノードを削除します。
@@ -1714,7 +1756,7 @@ class x extends T {
     if (e === void 0)
       return null;
     const r = e.evaluate(this.getBindingData());
-    return r.length === 1 ? r[0] : L.joinEvaluateResults(r);
+    return r.length === 1 ? r[0] : $.joinEvaluateResults(r);
   }
   /**
    * 属性の生の値を取得します。
@@ -1757,7 +1799,7 @@ class x extends T {
     const i = e ? r.nextSibling : r;
     let n = e ? r.nextSibling : r;
     for (; n !== null; ) {
-      const s = T.get(n);
+      const s = w.get(n);
       if (s !== null) {
         const a = this.children.indexOf(s);
         if (a !== -1)
@@ -1789,8 +1831,8 @@ class x extends T {
     const s = t.getParent() === this;
     let a = -1, o = -1;
     s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
-    const u = t.getParent();
-    u !== null && u.removeChild(t);
+    const h = t.getParent();
+    h !== null && h.removeChild(t);
     let m = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
@@ -1810,11 +1852,11 @@ class x extends T {
         this.children.splice(E, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const y = this.skipMutationNodes;
+    const b = this.skipMutationNodes;
     return this.skipMutationNodes = !0, P.enqueue(() => {
       this.target.insertBefore(t.getTarget(), m);
     }).finally(() => {
-      this.skipMutationNodes = y;
+      this.skipMutationNodes = b;
     });
   }
   /**
@@ -1885,7 +1927,7 @@ class x extends T {
    * @returns エレメントの非表示のPromise
    */
   hide() {
-    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${c.prefix}if-false`, ""), Promise.resolve();
+    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${l.prefix}if-false`, ""), Promise.resolve();
   }
   /**
    * エレメントを表示します。
@@ -1893,7 +1935,7 @@ class x extends T {
    * @return エレメントの表示のPromise
    */
   show() {
-    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${c.prefix}if-false`), this.visible = !0, Promise.resolve();
+    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${l.prefix}if-false`), this.visible = !0, Promise.resolve();
   }
   /**
    * 指定した属性名を持つ最も近い親要素を返します。
@@ -1909,7 +1951,7 @@ class x extends T {
     return e === null ? null : e.closestByAttribute(t);
   }
 }
-class H extends T {
+class O extends w {
   /**
    * テキストフラグメントのコンストラクタ。
    * 対象テキストノードの内容を初期化します。
@@ -1917,7 +1959,7 @@ class H extends T {
    * @param target 対象テキストノード
    */
   constructor(t) {
-    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new L(this.text);
+    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new $(this.text);
   }
   /**
    * フラグメントをクローンします。
@@ -1925,7 +1967,7 @@ class H extends T {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new H(this.target.cloneNode(!0));
+    const t = new O(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t.contents = this.contents, t;
   }
   /**
@@ -1943,7 +1985,7 @@ class H extends T {
    * @returns 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new L(t), this.evaluate());
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new $(t), this.evaluate());
   }
   /**
    * フラグメントを評価します。
@@ -1956,7 +1998,7 @@ class H extends T {
     ) : P.enqueue(() => {
       this.skipMutation = !0, this.contents.isRawEvaluate ? this.parent.getTarget().innerHTML = this.contents.evaluate(
         this.parent.getBindingData()
-      )[0] : this.contents.isEvaluate ? this.target.textContent = L.joinEvaluateResults(
+      )[0] : this.contents.isEvaluate ? this.target.textContent = $.joinEvaluateResults(
         this.contents.evaluate(this.parent.getBindingData())
       ) : this.target.textContent = this.text;
     }).finally(() => {
@@ -1964,7 +2006,7 @@ class H extends T {
     });
   }
 }
-class Z extends T {
+class Z extends w {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -2089,8 +2131,8 @@ const K = class K {
   }
 };
 K.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let L = K;
-const G = class G extends L {
+let $ = K;
+const G = class G extends $ {
   /**
    * コンストラクタ。
    *
@@ -2146,7 +2188,7 @@ G.FORCE_EVALUATION_ATTRIBUTES = [
   "hor-each"
 ];
 let U = G;
-class w {
+class T {
   /**
    * カスタムイベントを発火します。
    *
@@ -2170,7 +2212,7 @@ class w {
    * @param version ライブラリバージョン
    */
   static ready(t) {
-    w.dispatch(document, "ready", { version: t });
+    T.dispatch(document, "ready", { version: t });
   }
   /**
    * renderイベントを発火します。
@@ -2178,7 +2220,7 @@ class w {
    * @param target 評価対象要素
    */
   static render(t) {
-    w.dispatch(t, "render", { target: t });
+    T.dispatch(t, "render", { target: t });
   }
   /**
    * importstartイベントを発火します。
@@ -2187,7 +2229,7 @@ class w {
    * @param url インポート対象URL
    */
   static importStart(t, e) {
-    w.dispatch(t, "importstart", {
+    T.dispatch(t, "importstart", {
       url: e,
       startedAt: performance.now()
     });
@@ -2201,7 +2243,7 @@ class w {
    * @param startedAt 開始時刻
    */
   static importEnd(t, e, r, i) {
-    w.dispatch(t, "importend", {
+    T.dispatch(t, "importend", {
       url: e,
       bytes: r,
       durationMs: performance.now() - i
@@ -2215,7 +2257,7 @@ class w {
    * @param error エラー内容
    */
   static importError(t, e, r) {
-    w.dispatch(t, "importerror", { url: e, error: r });
+    T.dispatch(t, "importerror", { url: e, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -2227,11 +2269,11 @@ class w {
    */
   static bindChange(t, e, r, i = "other") {
     const n = [], s = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...s, ...a]);
-    for (const u of o) {
-      const m = e?.[u], y = r[u];
-      m !== y && n.push(u);
+    for (const h of o) {
+      const m = e?.[h], b = r[h];
+      m !== b && n.push(h);
     }
-    w.dispatch(t, "bindchange", {
+    T.dispatch(t, "bindchange", {
       previous: e || {},
       next: r,
       changedKeys: n,
@@ -2247,7 +2289,7 @@ class w {
    * @param order 現在の順序
    */
   static eachUpdate(t, e, r, i) {
-    w.dispatch(t, "eachupdate", {
+    T.dispatch(t, "eachupdate", {
       added: e,
       removed: r,
       order: i,
@@ -2263,7 +2305,7 @@ class w {
    * @param item 行データ
    */
   static rowAdd(t, e, r, i) {
-    w.dispatch(t, "rowadd", { key: e, index: r, item: i });
+    T.dispatch(t, "rowadd", { key: e, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -2273,7 +2315,7 @@ class w {
    * @param index インデックス
    */
   static rowRemove(t, e, r) {
-    w.dispatch(t, "rowremove", { key: e, index: r });
+    T.dispatch(t, "rowremove", { key: e, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -2284,7 +2326,7 @@ class w {
    * @param to 移動後インデックス
    */
   static rowMove(t, e, r, i) {
-    w.dispatch(t, "rowmove", { key: e, from: r, to: i });
+    T.dispatch(t, "rowmove", { key: e, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -2292,7 +2334,7 @@ class w {
    * @param target data-if要素
    */
   static show(t) {
-    w.dispatch(t, "show", { visible: !0 });
+    T.dispatch(t, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -2300,7 +2342,7 @@ class w {
    * @param target data-if要素
    */
   static hide(t) {
-    w.dispatch(t, "hide", { visible: !1 });
+    T.dispatch(t, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -2313,7 +2355,7 @@ class w {
     * @return 戻り値はありません。
    */
   static fetchStart(t, e, r, i, n) {
-    w.dispatch(t, "fetchstart", {
+    T.dispatch(t, "fetchstart", {
       url: e,
       options: r || {},
       payload: i,
@@ -2330,7 +2372,7 @@ class w {
    * @param startedAt 開始時刻
    */
   static fetchEnd(t, e, r, i) {
-    w.dispatch(t, "fetchend", {
+    T.dispatch(t, "fetchend", {
       url: e,
       status: r,
       durationMs: performance.now() - i
@@ -2346,7 +2388,7 @@ class w {
    * @param startedAt 開始時刻（存在する場合）
    */
   static fetchError(t, e, r, i, n) {
-    w.dispatch(t, "fetcherror", {
+    T.dispatch(t, "fetcherror", {
       url: e,
       status: i,
       error: r,
@@ -2362,17 +2404,17 @@ const at = [
   "openDialog",
   "toast"
 ], ot = "__haoriHistoryState__";
-function Y() {
+function W() {
   const t = globalThis.window?.Haori;
   return at.every(
     (r) => typeof t?.[r] == "function"
-  ) ? t : J;
+  ) ? t : X;
 }
 const lt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
-function ct(F) {
+function ut(F) {
   return lt.has(F.toUpperCase());
 }
-function ut(F, t) {
+function ct(F, t) {
   for (const [e, r] of Object.entries(t))
     r !== void 0 && (r === null ? F.append(e, "") : Array.isArray(r) ? r.forEach((i) => {
       F.append(e, String(i));
@@ -2380,9 +2422,9 @@ function ut(F, t) {
 }
 function ht(F, t) {
   const e = new URL(F, window.location.href), r = new URLSearchParams(e.search);
-  return ut(r, t), e.search = r.toString(), e.toString();
+  return ct(r, t), e.search = r.toString(), e.toString();
 }
-const l = class l {
+const u = class u {
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -2391,7 +2433,7 @@ const l = class l {
    * 非イベント変種が "data-fetch-xxx" として存在するものについては、event が null の場合にそちらを返します。
    */
   static attrName(t, e, r = !1) {
-    return t ? `${c.prefix}${t}-${e}` : r ? `${c.prefix}fetch-${e}` : `${c.prefix}${e}`;
+    return t ? `${l.prefix}${t}-${e}` : r ? `${l.prefix}fetch-${e}` : `${l.prefix}${e}`;
   }
   /**
    * data 属性のテンプレート式評価結果を URLSearchParams 向けに組み立てます。
@@ -2402,7 +2444,7 @@ const l = class l {
    */
   static resolveDataParamString(t, e) {
     return t.replace(
-      l.DATA_PLACEHOLDER_REGEX,
+      u.DATA_PLACEHOLDER_REGEX,
       (r, i, n) => {
         const s = j.evaluate(
           i ?? n ?? "",
@@ -2459,7 +2501,7 @@ const l = class l {
   static stringifyJsonTemplateStringContent(t) {
     if (t == null || Number.isNaN(t))
       return "";
-    const e = typeof t == "object" ? l.stringifyJsonTemplateValue(t) : String(t);
+    const e = typeof t == "object" ? u.stringifyJsonTemplateValue(t) : String(t);
     return JSON.stringify(e).slice(1, -1);
   }
   /**
@@ -2471,13 +2513,13 @@ const l = class l {
    */
   static resolveDataJsonString(t, e) {
     return t.replace(
-      l.DATA_PLACEHOLDER_REGEX,
+      u.DATA_PLACEHOLDER_REGEX,
       (r, i, n, s) => {
         const a = j.evaluate(
           i ?? n ?? "",
           e
         );
-        return l.isJsonStringContext(t, s) ? l.stringifyJsonTemplateStringContent(a) : l.stringifyJsonTemplateValue(a);
+        return u.isJsonStringContext(t, s) ? u.stringifyJsonTemplateStringContent(a) : u.stringifyJsonTemplateValue(a);
       }
     );
   }
@@ -2495,13 +2537,13 @@ const l = class l {
     if (typeof i != "string" || r === null)
       return null;
     const n = r.trim();
-    return l.SINGLE_PLACEHOLDER_REGEX.test(n) ? R.parseDataBind(i) : n.startsWith("{") || n.startsWith("[") ? R.parseDataBind(
-      l.resolveDataJsonString(
+    return u.SINGLE_PLACEHOLDER_REGEX.test(n) ? R.parseDataBind(i) : n.startsWith("{") || n.startsWith("[") ? R.parseDataBind(
+      u.resolveDataJsonString(
         r,
         t.getBindingData()
       )
     ) : R.parseDataBind(
-      l.resolveDataParamString(r, t.getBindingData())
+      u.resolveDataParamString(r, t.getBindingData())
     );
   }
   /**
@@ -2516,30 +2558,30 @@ const l = class l {
       targetFragment: t
     };
     if (e) {
-      if (t.hasAttribute(l.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(l.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
-        l.attrName(e, "confirm")
+      if (t.hasAttribute(u.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(u.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
+        u.attrName(e, "confirm")
       ).replace(/\\n/g, `
-`)), t.hasAttribute(l.attrName(e, "data")) && (r.data = l.resolveDataAttribute(
+`)), t.hasAttribute(u.attrName(e, "data")) && (r.data = u.resolveDataAttribute(
         t,
-        l.attrName(e, "data")
-      )), t.hasAttribute(l.attrName(e, "form"))) {
-        const h = t.getRawAttribute(
-          l.attrName(e, "form")
+        u.attrName(e, "data")
+      )), t.hasAttribute(u.attrName(e, "form"))) {
+        const c = t.getRawAttribute(
+          u.attrName(e, "form")
         );
-        if (h) {
-          const f = document.body.querySelector(h);
-          f !== null ? r.formFragment = b.getFormFragment(
-            T.get(f)
+        if (c) {
+          const f = document.body.querySelector(c);
+          f !== null ? r.formFragment = y.getFormFragment(
+            w.get(f)
           ) : d.error(
             "Haori",
-            `Form element not found: ${h} (${l.attrName(e, "form")})`
+            `Form element not found: ${c} (${u.attrName(e, "form")})`
           );
         } else
-          r.formFragment = b.getFormFragment(t);
-      } else e === "change" && (r.formFragment = b.getFormFragment(t));
-      if (t.hasAttribute(`${c.prefix}${e}-before-run`)) {
-        const h = t.getRawAttribute(
-          `${c.prefix}${e}-before-run`
+          r.formFragment = y.getFormFragment(t);
+      } else e === "change" && (r.formFragment = y.getFormFragment(t));
+      if (t.hasAttribute(`${l.prefix}${e}-before-run`)) {
+        const c = t.getRawAttribute(
+          `${l.prefix}${e}-before-run`
         );
         try {
           r.beforeCallback = new Function(
@@ -2547,7 +2589,7 @@ const l = class l {
             "fetchOptions",
             `
 "use strict";
-${h}
+${c}
 `
           );
         } catch (f) {
@@ -2555,25 +2597,25 @@ ${h}
         }
       }
     }
-    const i = l.attrName(e, "fetch"), n = t.hasAttribute(i);
+    const i = u.attrName(e, "fetch"), n = t.hasAttribute(i);
     n && (r.fetchUrl = t.getAttribute(i));
     const s = {};
     if (e) {
-      const h = l.attrName(e, "fetch-method");
-      t.hasAttribute(h) && (s.method = t.getAttribute(
-        h
+      const c = u.attrName(e, "fetch-method");
+      t.hasAttribute(c) && (s.method = t.getAttribute(
+        c
       ));
     } else {
-      const h = l.attrName(null, "method", !0);
-      t.hasAttribute(h) && (s.method = t.getAttribute(
-        h
+      const c = u.attrName(null, "method", !0);
+      t.hasAttribute(c) && (s.method = t.getAttribute(
+        c
       ));
     }
     if (e) {
-      const h = l.attrName(e, "fetch-headers");
-      if (t.hasAttribute(h)) {
+      const c = u.attrName(e, "fetch-headers");
+      if (t.hasAttribute(c)) {
         const f = t.getRawAttribute(
-          h
+          c
         );
         try {
           s.headers = R.parseDataBind(f);
@@ -2582,14 +2624,14 @@ ${h}
         }
       }
     } else {
-      const h = l.attrName(
+      const c = u.attrName(
         null,
         "headers",
         !0
       );
-      if (t.hasAttribute(h)) {
+      if (t.hasAttribute(c)) {
         const f = t.getRawAttribute(
-          h
+          c
         );
         try {
           s.headers = R.parseDataBind(f);
@@ -2599,14 +2641,14 @@ ${h}
       }
     }
     if (e) {
-      const h = l.attrName(
+      const c = u.attrName(
         e,
         "fetch-content-type"
       );
-      if (t.hasAttribute(h))
+      if (t.hasAttribute(c))
         s.headers = {
           ...s.headers,
-          "Content-Type": t.getAttribute(h)
+          "Content-Type": t.getAttribute(c)
         };
       else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let f = !1;
@@ -2619,15 +2661,15 @@ ${h}
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const h = l.attrName(
+      const c = u.attrName(
         null,
         "content-type",
         !0
       );
-      if (t.hasAttribute(h))
+      if (t.hasAttribute(c))
         s.headers = {
           ...s.headers,
-          "Content-Type": t.getAttribute(h)
+          "Content-Type": t.getAttribute(c)
         };
       else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let f = !1;
@@ -2641,74 +2683,74 @@ ${h}
       });
     }
     Object.keys(s).length > 0 && (r.fetchOptions = s);
-    const a = e ? l.attrName(e, "bind") : l.attrName(null, "bind", !0);
+    const a = e ? u.attrName(e, "bind") : u.attrName(null, "bind", !0);
     if (t.hasAttribute(a)) {
-      const h = t.getRawAttribute(a);
-      if (h) {
-        const f = document.body.querySelectorAll(h);
+      const c = t.getRawAttribute(a);
+      if (c) {
+        const f = document.body.querySelectorAll(c);
         f.length > 0 ? (r.bindFragments = [], f.forEach((g) => {
-          const A = T.get(g);
+          const A = w.get(g);
           A && r.bindFragments.push(A);
         })) : d.error(
           "Haori",
-          `Bind element not found: ${h} (${a})`
+          `Bind element not found: ${c} (${a})`
         );
       }
     }
-    const o = l.attrName(e, "bind-arg"), u = l.attrName(
+    const o = u.attrName(e, "bind-arg"), h = u.attrName(
       null,
       "arg",
       !0
-    ), m = l.attrName(
+    ), m = u.attrName(
       null,
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(u) ? r.bindArg = t.getRawAttribute(
-      u
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(h) ? r.bindArg = t.getRawAttribute(
+      h
     ) : t.hasAttribute(m) && (r.bindArg = t.getRawAttribute(m));
-    const y = e ? l.attrName(e, "bind-params") : l.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(y)) {
-      const h = t.getRawAttribute(y);
-      r.bindParams = h.split("&").map((f) => f.trim());
+    const b = e ? u.attrName(e, "bind-params") : u.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(b)) {
+      const c = t.getRawAttribute(b);
+      r.bindParams = c.split("&").map((f) => f.trim());
     }
-    const E = e ? l.attrName(e, "bind-append") : l.attrName(null, "bind-append", !0);
+    const E = e ? u.attrName(e, "bind-append") : u.attrName(null, "bind-append", !0);
     if (t.hasAttribute(E)) {
-      const h = t.getRawAttribute(E);
-      r.bindAppendParams = h.split("&").map((f) => f.trim()).filter(Boolean);
+      const c = t.getRawAttribute(E);
+      r.bindAppendParams = c.split("&").map((f) => f.trim()).filter(Boolean);
     }
-    const S = e ? l.attrName(e, "copy-params") : null;
+    const S = e ? u.attrName(e, "copy-params") : null;
     if (S && t.hasAttribute(S)) {
-      const h = t.getRawAttribute(
+      const c = t.getRawAttribute(
         S
       );
-      r.copyParams = h.split("&").map((f) => f.trim()).filter(Boolean);
+      r.copyParams = c.split("&").map((f) => f.trim()).filter(Boolean);
     }
     if (e) {
-      if (t.hasAttribute(l.attrName(e, "adjust"))) {
+      if (t.hasAttribute(u.attrName(e, "adjust"))) {
         const f = t.getRawAttribute(
-          l.attrName(e, "adjust")
+          u.attrName(e, "adjust")
         );
         if (f) {
           const g = document.body.querySelectorAll(f);
           g.length > 0 ? (r.adjustFragments = [], g.forEach((A) => {
-            const v = T.get(A);
+            const v = w.get(A);
             v && r.adjustFragments.push(v);
           })) : d.error(
             "Haori",
-            `Adjust element not found: ${f} (${l.attrName(e, "adjust")})`
+            `Adjust element not found: ${f} (${u.attrName(e, "adjust")})`
           );
         }
-        if (t.hasAttribute(l.attrName(e, "adjust-value"))) {
+        if (t.hasAttribute(u.attrName(e, "adjust-value"))) {
           const g = t.getRawAttribute(
-            l.attrName(e, "adjust-value")
+            u.attrName(e, "adjust-value")
           ), A = Number(g);
           isNaN(A) || (r.adjustValue = A);
         }
       }
-      if (t.hasAttribute(l.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(l.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(l.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(l.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${c.prefix}${e}-after-run`)) {
+      if (t.hasAttribute(u.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(u.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(u.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(u.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${l.prefix}${e}-after-run`)) {
         const f = t.getRawAttribute(
-          `${c.prefix}${e}-after-run`
+          `${l.prefix}${e}-after-run`
         );
         try {
           r.afterCallback = new Function(
@@ -2722,41 +2764,41 @@ ${f}
           d.error("Haori", `Invalid after script: ${g}`);
         }
       }
-      if (t.hasAttribute(l.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
-        l.attrName(e, "dialog")
+      if (t.hasAttribute(u.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
+        u.attrName(e, "dialog")
       ).replace(/\\n/g, `
-`)), t.hasAttribute(l.attrName(e, "toast"))) {
+`)), t.hasAttribute(u.attrName(e, "toast"))) {
         r.toastMessage = t.getAttribute(
-          l.attrName(e, "toast")
+          u.attrName(e, "toast")
         );
         const f = t.getRawAttribute(
-          l.attrName(e, "toast-level")
+          u.attrName(e, "toast-level")
         ), A = ["info", "warning", "error", "success"].includes(f);
         r.toastLevel = A ? f : null;
       }
-      if (t.hasAttribute(l.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
-        l.attrName(e, "redirect")
-      )), t.hasAttribute(l.attrName(e, "scroll-error")) && (r.scrollOnError = !0), t.hasAttribute(l.attrName(e, "scroll")) && (r.scrollTarget = t.getAttribute(
-        l.attrName(e, "scroll")
-      )), t.hasAttribute(l.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
-        l.attrName(e, "history")
-      )), t.hasAttribute(l.attrName(e, "history-data")) && (r.historyData = l.resolveDataAttribute(
+      if (t.hasAttribute(u.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
+        u.attrName(e, "redirect")
+      )), t.hasAttribute(u.attrName(e, "scroll-error")) && (r.scrollOnError = !0), t.hasAttribute(u.attrName(e, "scroll")) && (r.scrollTarget = t.getAttribute(
+        u.attrName(e, "scroll")
+      )), t.hasAttribute(u.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
+        u.attrName(e, "history")
+      )), t.hasAttribute(u.attrName(e, "history-data")) && (r.historyData = u.resolveDataAttribute(
         t,
-        l.attrName(e, "history-data")
-      )), t.hasAttribute(l.attrName(e, "history-form"))) {
+        u.attrName(e, "history-data")
+      )), t.hasAttribute(u.attrName(e, "history-form"))) {
         const f = t.getRawAttribute(
-          l.attrName(e, "history-form")
+          u.attrName(e, "history-form")
         );
         if (f) {
           const g = document.body.querySelector(f);
-          g !== null ? r.historyFormFragment = b.getFormFragment(
-            T.get(g)
+          g !== null ? r.historyFormFragment = y.getFormFragment(
+            w.get(g)
           ) : d.error(
             "Haori",
-            `Form element not found: ${f} (${l.attrName(e, "history-form")})`
+            `Form element not found: ${f} (${u.attrName(e, "history-form")})`
           );
         } else
-          r.historyFormFragment = b.getFormFragment(t);
+          r.historyFormFragment = y.getFormFragment(t);
       }
       [
         "reset",
@@ -2766,12 +2808,12 @@ ${f}
         "open",
         "close"
       ].forEach((f) => {
-        const g = l.attrName(e, f);
+        const g = u.attrName(e, f);
         if (!t.hasAttribute(g))
           return;
         const A = t.getRawAttribute(g), v = [];
-        if (A ? (document.body.querySelectorAll(A).forEach((W) => {
-          const tt = T.get(W);
+        if (A ? (document.body.querySelectorAll(A).forEach((J) => {
+          const tt = w.get(J);
           tt && v.push(tt);
         }), v.length === 0 && d.error("Haori", `Element not found: ${A} (${g})`)) : v.push(t), v.length > 0)
           switch (f) {
@@ -2796,23 +2838,23 @@ ${f}
           }
       });
     }
-    if (!e && (t.hasAttribute(l.attrName(null, "data", !0)) && (r.data = l.resolveDataAttribute(
+    if (!e && (t.hasAttribute(u.attrName(null, "data", !0)) && (r.data = u.resolveDataAttribute(
       t,
-      l.attrName(null, "data", !0)
-    )), t.hasAttribute(l.attrName(null, "form", !0)))) {
-      const h = t.getRawAttribute(
-        l.attrName(null, "form", !0)
+      u.attrName(null, "data", !0)
+    )), t.hasAttribute(u.attrName(null, "form", !0)))) {
+      const c = t.getRawAttribute(
+        u.attrName(null, "form", !0)
       );
-      if (h) {
-        const f = document.body.querySelector(h);
-        f !== null ? r.formFragment = b.getFormFragment(
-          T.get(f)
+      if (c) {
+        const f = document.body.querySelector(c);
+        f !== null ? r.formFragment = y.getFormFragment(
+          w.get(f)
         ) : d.error(
           "Haori",
-          `Form element not found: ${h} (${l.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${c} (${u.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = b.getFormFragment(t);
+        r.formFragment = y.getFormFragment(t);
     }
     return n && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
   }
@@ -2835,7 +2877,7 @@ ${f}
    * @param arg2 イベント名
    */
   constructor(t, e = null) {
-    l.isElementFragment(t) ? this.options = l.buildOptions(t, e) : this.options = t;
+    u.isElementFragment(t) ? this.options = u.buildOptions(t, e) : this.options = t;
   }
   /**
    * 一連の処理を実行します。オプションが空の場合は即座にresolveされます。
@@ -2876,37 +2918,37 @@ ${f}
     }
     const i = {};
     if (this.options.formFragment) {
-      const o = b.getValues(this.options.formFragment);
+      const o = y.getValues(this.options.formFragment);
       Object.assign(i, o);
     }
     this.options.data && typeof this.options.data == "object" && Object.assign(i, this.options.data);
     const n = Object.keys(i).length > 0;
     if (e) {
-      const o = { ...r || {} }, u = new Headers(
+      const o = { ...r || {} }, h = new Headers(
         o.headers || void 0
-      ), m = (o.method || "GET").toUpperCase(), y = c.runtime === "demo" && !ct(m), E = y ? "GET" : m;
+      ), m = (o.method || "GET").toUpperCase(), b = l.runtime === "demo" && !ut(m), E = b ? "GET" : m;
       if (o.method = E, E === "GET" || E === "HEAD" || E === "OPTIONS")
         n && (e = ht(e, i));
       else if (n) {
-        const h = u.get("Content-Type") || "";
-        if (/multipart\/form-data/i.test(h)) {
-          u.delete("Content-Type");
+        const c = h.get("Content-Type") || "";
+        if (/multipart\/form-data/i.test(c)) {
+          h.delete("Content-Type");
           const f = new FormData();
           for (const [g, A] of Object.entries(i))
             A == null ? f.append(g, "") : A instanceof Blob ? f.append(g, A) : Array.isArray(A) ? A.forEach((v) => f.append(g, String(v))) : typeof A == "object" ? f.append(g, JSON.stringify(A)) : f.append(g, String(A));
           o.body = f;
-        } else if (/application\/x-www-form-urlencoded/i.test(h)) {
+        } else if (/application\/x-www-form-urlencoded/i.test(c)) {
           const f = new URLSearchParams();
           for (const [g, A] of Object.entries(i))
             A !== void 0 && (A === null ? f.append(g, "") : Array.isArray(A) ? A.forEach((v) => f.append(g, String(v))) : typeof A == "object" ? f.append(g, JSON.stringify(A)) : f.append(g, String(A)));
           o.body = f;
         } else
-          u.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
+          h.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
       }
-      o.headers = u;
+      o.headers = h;
       let S;
-      if (y && (S = e && new URL(e, window.location.href).search || void 0, u.delete("Content-Type"), d.info("Haori demo fetch normalization", {
-        runtime: c.runtime,
+      if (b && (S = e && new URL(e, window.location.href).search || void 0, h.delete("Content-Type"), d.info("Haori demo fetch normalization", {
+        runtime: l.runtime,
         requestedMethod: m,
         effectiveMethod: E,
         transportMode: "query-get",
@@ -2914,14 +2956,14 @@ ${f}
         payload: n ? i : void 0,
         queryString: S
       })), this.options.targetFragment && e) {
-        const h = performance.now(), f = {
-          runtime: c.runtime,
+        const c = performance.now(), f = {
+          runtime: l.runtime,
           requestedMethod: m,
           effectiveMethod: E,
-          transportMode: y ? "query-get" : "http",
-          ...y ? { queryString: S } : {}
+          transportMode: b ? "query-get" : "http",
+          ...b ? { queryString: S } : {}
         };
-        return w.fetchStart(
+        return T.fetchStart(
           this.options.targetFragment.getTarget(),
           e,
           o,
@@ -2930,25 +2972,25 @@ ${f}
         ), fetch(e, o).then((g) => this.handleFetchResult(
           g,
           e || void 0,
-          h
+          c
         )).catch((g) => {
-          throw e && w.fetchError(
+          throw e && T.fetchError(
             this.options.targetFragment.getTarget(),
             e,
             g
           ), g;
         });
       }
-      return fetch(e, o).then((h) => this.handleFetchResult(h, e || void 0));
+      return fetch(e, o).then((c) => this.handleFetchResult(c, e || void 0));
     }
     if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && n) {
-      const o = this.options.formFragment, u = o.getTarget();
-      u.setAttribute(
-        `${c.prefix}bind`,
+      const o = this.options.formFragment, h = o.getTarget();
+      h.setAttribute(
+        `${l.prefix}bind`,
         JSON.stringify(i)
       );
       const m = o.getBindingData();
-      Object.assign(m, i), await R.setBindingData(u, m);
+      Object.assign(m, i), await R.setBindingData(h, m);
     }
     const s = n ? i : {}, a = new Response(JSON.stringify(s), {
       headers: { "Content-Type": "application/json" }
@@ -2959,16 +3001,16 @@ ${f}
    * フェッチ後の処理を実行します。
    */
   async handleFetchResult(t, e, r) {
-    const i = Y();
+    const i = W();
     if (!t.ok)
-      return this.options.targetFragment && e && w.fetchError(
+      return this.options.targetFragment && e && T.fetchError(
         this.options.targetFragment.getTarget(),
         e,
         new Error(`${t.status} ${t.statusText}`),
         t.status,
         r
       ), await this.handleFetchError(t), !1;
-    if (this.options.targetFragment && e && r && w.fetchEnd(
+    if (this.options.targetFragment && e && r && T.fetchEnd(
       this.options.targetFragment.getTarget(),
       e,
       t.status,
@@ -2983,11 +3025,11 @@ ${f}
     }
     const n = [];
     n.push(this.bindResult(t)), n.push(this.adjust()), n.push(this.addRow()), n.push(this.removeRow()), n.push(this.movePrevRow()), n.push(this.moveNextRow()), await Promise.all(n), this.options.resetFragments && this.options.resetFragments.length > 0 && await Promise.all(
-      this.options.resetFragments.map((a) => b.reset(a))
+      this.options.resetFragments.map((a) => y.reset(a))
     ), await this.copy();
     const s = [];
     return this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((a) => {
-      s.push(new l(a, null).run());
+      s.push(new u(a, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((a) => {
       const o = a.getTarget();
       typeof o.click == "function" ? o.click() : o.dispatchEvent(
@@ -3025,11 +3067,11 @@ ${f}
           return;
         }
         const s = (a) => {
-          for (const [o, u] of Object.entries(a))
-            u != null && (Array.isArray(u) ? u.forEach((m) => n.searchParams.append(o, String(m))) : typeof u == "object" ? n.searchParams.set(o, JSON.stringify(u)) : n.searchParams.set(o, String(u)));
+          for (const [o, h] of Object.entries(a))
+            h != null && (Array.isArray(h) ? h.forEach((m) => n.searchParams.append(o, String(m))) : typeof h == "object" ? n.searchParams.set(o, JSON.stringify(h)) : n.searchParams.set(o, String(h)));
         };
         e && s(this.options.historyData), r && s(
-          b.getValues(
+          y.getValues(
             this.options.historyFormFragment
           )
         ), history.pushState(
@@ -3046,10 +3088,10 @@ ${f}
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = b.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = y.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (s) => {
       const a = e ? e.getTarget() : document.body;
-      await Y().addErrorMessage(a, s);
+      await W().addErrorMessage(a, s);
     }, i = () => {
       if (!this.options.scrollOnError)
         return;
@@ -3064,18 +3106,18 @@ ${f}
             for (const o of s.messages)
               typeof o == "string" && a.push({ message: o });
           if (s.errors && typeof s.errors == "object")
-            for (const [o, u] of Object.entries(s.errors))
-              Array.isArray(u) ? a.push({ key: o, message: u.join(`
-`) }) : typeof u == "string" ? a.push({ key: o, message: u }) : u != null && a.push({ key: o, message: String(u) });
+            for (const [o, h] of Object.entries(s.errors))
+              Array.isArray(h) ? a.push({ key: o, message: h.join(`
+`) }) : typeof h == "string" ? a.push({ key: o, message: h }) : h != null && a.push({ key: o, message: String(h) });
           if (a.length === 0)
-            for (const [o, u] of Object.entries(s))
-              o === "message" || o === "messages" || o === "errors" || (Array.isArray(u) ? a.push({ key: o, message: u.join(`
-`) }) : typeof u == "string" && a.push({ key: o, message: u }));
+            for (const [o, h] of Object.entries(s))
+              o === "message" || o === "messages" || o === "errors" || (Array.isArray(h) ? a.push({ key: o, message: h.join(`
+`) }) : typeof h == "string" && a.push({ key: o, message: h }));
         }
         if (a.length === 0)
           return await r(`${t.status} ${t.statusText}`), i(), !1;
         for (const o of a)
-          o.key && e ? await b.addErrorMessage(e, o.key, o.message) : await r(o.message);
+          o.key && e ? await y.addErrorMessage(e, o.key, o.message) : await r(o.message);
         return i(), !1;
       } catch {
       }
@@ -3134,7 +3176,7 @@ ${f}
    */
   confirm() {
     const t = this.options.confirmMessage;
-    return t == null ? Promise.resolve(!0) : Y().confirm(t);
+    return t == null ? Promise.resolve(!0) : W().confirm(t);
   }
   /**
    * 結果データを対象のフラグメントにバインドします。
@@ -3154,11 +3196,11 @@ ${f}
         this.options.bindFragments.forEach((n) => {
           const s = n.getBindingData(), a = this.options.bindArg;
           if (r && typeof r == "object" && !Array.isArray(r)) {
-            const o = s[a], u = o && typeof o == "object" && !Array.isArray(o) ? o : {};
+            const o = s[a], h = o && typeof o == "object" && !Array.isArray(o) ? o : {};
             s[a] = this.mergeAppendBindingData(
               n,
               r,
-              u
+              h
             );
           } else
             s[a] = r;
@@ -3219,7 +3261,7 @@ ${f}
    * copy のコピー元データを取得します。
    */
   resolveCopySourceData() {
-    return this.options.formFragment ? b.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
+    return this.options.formFragment ? y.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
   }
   /**
    * copy-params が指定されている場合は対象キーだけ抽出します。
@@ -3257,7 +3299,7 @@ ${f}
     if (!this.options.targetFragment)
       return d.error("Haori", "Target fragment is not specified for row operation."), null;
     const t = this.options.targetFragment.closestByAttribute(
-      `${c.prefix}row`
+      `${l.prefix}row`
     );
     return t || (d.error("Haori", "Row fragment not found."), null);
   }
@@ -3275,7 +3317,7 @@ ${f}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(R.evaluateAll(r)), e.push(b.reset(r)), Promise.all(e).then(() => {
+    ), e.push(R.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3290,7 +3332,7 @@ ${f}
     if (!t)
       return Promise.reject(new Error("Row fragment not found."));
     const e = t.getParent();
-    return e && e.getChildElementFragments().filter((i) => !i.hasAttribute(`${c.prefix}each-before`) && !i.hasAttribute(`${c.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
+    return e && e.getChildElementFragments().filter((i) => !i.hasAttribute(`${l.prefix}each-before`) && !i.hasAttribute(`${l.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
   }
   /**
    * 前の行へ移動します。
@@ -3327,8 +3369,8 @@ ${f}
     return r ? r.insertAfter(t, e) : Promise.resolve();
   }
 };
-l.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, l.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
-let V = l;
+u.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, u.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
+let V = u;
 class ft {
   /**
    * URLのクエリパラメータを取得します。
@@ -3389,7 +3431,7 @@ const p = class p {
    */
   static isDeferredAttributeName(t) {
     return p.DEFERRED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${c.prefix}${e}`
+      (e) => t === `${l.prefix}${e}`
     );
   }
   /**
@@ -3400,7 +3442,7 @@ const p = class p {
    */
   static isEvaluateAllExcludedAttributeName(t) {
     return p.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${c.prefix}${e}`
+      (e) => t === `${l.prefix}${e}`
     );
   }
   /**
@@ -3420,7 +3462,7 @@ const p = class p {
    * @returns 実際の属性名。data-attr-* でない場合は null
    */
   static getAliasedAttributeName(t) {
-    const e = `${c.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}`;
+    const e = `${l.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}`;
     return !t.startsWith(e) || t.length <= e.length ? null : t.slice(e.length);
   }
   /**
@@ -3431,9 +3473,9 @@ const p = class p {
    * @returns data-attr-* の内部反映なら true
    */
   static isAliasedAttributeReflection(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     return r instanceof x ? r.hasAttribute(
-      `${c.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}${e}`
+      `${l.prefix}${p.ATTRIBUTE_ALIAS_SUFFIX}${e}`
     ) : !1;
   }
   /**
@@ -3461,14 +3503,14 @@ const p = class p {
    * @returns Promise (スキャンが完了したときに解決される)
    */
   static scan(t) {
-    const e = T.get(t);
+    const e = w.get(t);
     if (!e)
       return Promise.resolve();
-    t.parentNode && (T.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
+    t.parentNode && (w.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
     let r = Promise.resolve();
     const i = /* @__PURE__ */ new Set();
     for (const n of p.PRIORITY_ATTRIBUTE_SUFFIXES) {
-      const s = c.prefix + n;
+      const s = l.prefix + n;
       e.hasAttribute(s) && (r = r.then(
         () => p.setAttribute(
           e.getTarget(),
@@ -3486,7 +3528,7 @@ const p = class p {
       ));
     }
     for (const n of p.DEFERRED_ATTRIBUTE_SUFFIXES) {
-      const s = c.prefix + n;
+      const s = l.prefix + n;
       e.hasAttribute(s) && (r = r.then(
         () => p.setAttribute(
           e.getTarget(),
@@ -3498,7 +3540,7 @@ const p = class p {
     return r.then(() => {
       const n = [];
       return e.getChildren().forEach((s) => {
-        s instanceof x ? n.push(p.scan(s.getTarget())) : s instanceof H && n.push(p.evaluateText(s));
+        s instanceof x ? n.push(p.scan(s.getTarget())) : s instanceof O && n.push(p.evaluateText(s));
       }), Promise.all(n).then(() => {
       });
     }).then(() => {
@@ -3514,52 +3556,52 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r) {
-    const i = T.get(t), n = p.getAliasedAttributeName(e);
+    const i = w.get(t), n = p.getAliasedAttributeName(e);
     if (n !== null)
       return r === null ? i.removeAliasedAttribute(e, n) : i.setAliasedAttribute(e, n, r);
     const s = [];
     switch (e) {
-      case `${c.prefix}bind`: {
+      case `${l.prefix}bind`: {
         r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(p.parseDataBind(r));
         break;
       }
-      case `${c.prefix}if`:
+      case `${l.prefix}if`:
         s.push(p.evaluateIf(i));
         break;
-      case `${c.prefix}each`:
+      case `${l.prefix}each`:
         s.push(p.evaluateEach(i));
         break;
-      case `${c.prefix}fetch`:
+      case `${l.prefix}fetch`:
         s.push(
           new V(i, null).run().then(() => {
           })
         );
         break;
-      case `${c.prefix}import`: {
+      case `${l.prefix}import`: {
         if (typeof r == "string") {
           const a = i.getTarget(), o = performance.now();
-          w.importStart(a, r), s.push(
-            dt.load(r).then((u) => {
-              const m = new TextEncoder().encode(u).length;
+          a.setAttribute(`${l.prefix}importing`, ""), T.importStart(a, r), s.push(
+            dt.load(r).then((h) => {
+              const m = new TextEncoder().encode(h).length;
               return P.enqueue(() => {
-                a.innerHTML = u;
+                a.innerHTML = h;
               }).then(() => {
-                w.importEnd(a, r, m, o);
+                a.removeAttribute(`${l.prefix}importing`), T.importEnd(a, r, m, o);
               });
-            }).catch((u) => {
-              w.importError(a, r, u), d.error("[Haori]", "Failed to import HTML:", r, u);
+            }).catch((h) => {
+              a.removeAttribute(`${l.prefix}importing`), T.importError(a, r, h), d.error("[Haori]", "Failed to import HTML:", r, h);
             })
           );
         }
         break;
       }
-      case `${c.prefix}url-param`: {
-        const a = i.getAttribute(`${c.prefix}url-arg`), o = ft.readParams();
+      case `${l.prefix}url-param`: {
+        const a = i.getAttribute(`${l.prefix}url-arg`), o = ft.readParams();
         if (a === null)
           s.push(p.setBindingData(t, o));
         else {
-          const u = i.getRawBindingData() || {};
-          u[String(a)] = o, s.push(p.setBindingData(t, u));
+          const h = i.getRawBindingData() || {};
+          h[String(a)] = o, s.push(p.setBindingData(t, h));
         }
         break;
       }
@@ -3576,17 +3618,17 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setBindingData(t, e) {
-    const r = T.get(t), i = r.getRawBindingData();
+    const r = w.get(t), i = r.getRawBindingData();
     r.setBindingData(e);
     let n = r.setAttribute(
-      `${c.prefix}bind`,
+      `${l.prefix}bind`,
       JSON.stringify(e)
     );
     if (t.tagName === "FORM") {
-      const s = r.getAttribute(`${c.prefix}form-arg`), a = s && e[String(s)] && typeof e[String(s)] == "object" && !Array.isArray(e[String(s)]) ? e[String(s)] : s ? {} : e;
-      n = n.then(() => b.syncValues(r, a));
+      const s = r.getAttribute(`${l.prefix}form-arg`), a = s && e[String(s)] && typeof e[String(s)] == "object" && !Array.isArray(e[String(s)]) ? e[String(s)] : s ? {} : e;
+      n = n.then(() => y.syncValues(r, a));
     }
-    return n = n.then(() => p.evaluateAll(r)), w.bindChange(t, i, e, "manual"), n.then(() => {
+    return n = n.then(() => p.evaluateAll(r)), T.bindChange(t, i, e, "manual"), n.then(() => {
     });
   }
   /**
@@ -3616,11 +3658,11 @@ const p = class p {
    * @param node 追加するノード
    */
   static addNode(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     if (r.isSkipMutationNodes())
       return;
-    const i = T.get(e.nextSibling), n = T.get(e);
-    n && (r.insertBefore(n, i), n instanceof x ? p.scan(n.getTarget()) : n instanceof H && p.evaluateText(n));
+    const i = w.get(e.nextSibling), n = w.get(e);
+    n && (r.insertBefore(n, i), n instanceof x ? p.scan(n.getTarget()) : n instanceof O && p.evaluateText(n));
   }
   /**
    * ノードを親要素から削除します。
@@ -3628,7 +3670,7 @@ const p = class p {
    * @param node 削除するノード
    */
   static removeNode(t) {
-    const e = T.get(t);
+    const e = w.get(t);
     if (e) {
       const r = e.getParent();
       if (r && r.isSkipMutationNodes())
@@ -3643,7 +3685,7 @@ const p = class p {
    * @param text 新しいテキスト
    */
   static changeText(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     r && r.setContent(e);
   }
   /**
@@ -3655,14 +3697,14 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static changeValue(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     if (r.getValue() === e)
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
     const n = p.getFormFragment(r);
     if (n) {
-      const s = b.getValues(n), a = n.getAttribute(`${c.prefix}form-arg`);
+      const s = y.getValues(n), a = n.getAttribute(`${l.prefix}form-arg`);
       let o;
       a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(p.setBindingData(n.getTarget(), o));
     }
@@ -3689,14 +3731,14 @@ const p = class p {
    */
   static evaluateAll(t) {
     const e = [];
-    return e.push(p.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${c.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${c.prefix}each`) ? Promise.all(e).then(() => p.evaluateEach(t)).then(() => {
+    return e.push(p.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${l.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${l.prefix}each`) ? Promise.all(e).then(() => p.evaluateEach(t)).then(() => {
       const r = [];
       return t.getChildren().forEach((i) => {
-        i instanceof x ? r.push(p.evaluateAll(i)) : i instanceof H && r.push(p.evaluateText(i));
+        i instanceof x ? r.push(p.evaluateAll(i)) : i instanceof O && r.push(p.evaluateText(i));
       }), Promise.all(r).then(() => {
       });
     }) : (t.getChildren().forEach((r) => {
-      r instanceof x ? e.push(p.evaluateAll(r)) : r instanceof H && e.push(p.evaluateText(r));
+      r instanceof x ? e.push(p.evaluateAll(r)) : r instanceof O && e.push(p.evaluateText(r));
     }), Promise.all(e).then(() => {
     }));
   }
@@ -3717,16 +3759,25 @@ const p = class p {
    * @return Promise (DOM操作が完了したときに解決される)
    */
   static evaluateIf(t) {
-    const e = [], r = t.getAttribute(`${c.prefix}if`);
-    return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
-      t.hide().then(() => {
-        w.hide(t.getTarget());
-      })
-    ) : t.isVisible() || (e.push(
-      t.show().then(() => {
-        w.show(t.getTarget());
-      })
-    ), e.push(p.evaluateAll(t))), Promise.all(e).then(() => {
+    const e = [], r = t.getAttribute(`${l.prefix}if`);
+    if (r === !1 || r === void 0 || r === null || Number.isNaN(r))
+      e.push(
+        t.hide().then(() => {
+          T.hide(t.getTarget());
+        })
+      );
+    else {
+      const i = [];
+      t.getChildren().forEach((n) => {
+        n instanceof x ? i.push(p.evaluateAll(n)) : n instanceof O && i.push(p.evaluateText(n));
+      }), e.push(
+        t.show().then(() => {
+          T.show(t.getTarget());
+        })
+      ), e.push(Promise.all(i).then(() => {
+      }));
+    }
+    return Promise.all(e).then(() => {
     });
   }
   /**
@@ -3743,17 +3794,17 @@ const p = class p {
       let i = !1;
       t.getChildren().forEach((s) => {
         if (!i && s instanceof x) {
-          if (s.hasAttribute(`${c.prefix}each-before`) || s.hasAttribute(`${c.prefix}each-after`))
+          if (s.hasAttribute(`${l.prefix}each-before`) || s.hasAttribute(`${l.prefix}each-after`))
             return;
           e = s.clone(), t.setTemplate(e), i = !0, t.removeChild(s);
           const a = s.getTarget();
           a.parentNode && a.parentNode.removeChild(a), s.setMounted(!1);
         }
       });
-      const n = t.getAttribute(`${c.prefix}each`);
+      const n = t.getAttribute(`${l.prefix}each`);
       return Array.isArray(n) ? this.updateDiff(t, n) : (d.error("[Haori]", "Invalid each attribute:", n), Promise.reject(new Error("Invalid each attribute.")));
     }
-    const r = t.getAttribute(`${c.prefix}each`);
+    const r = t.getAttribute(`${l.prefix}each`);
     return Array.isArray(r) ? this.updateDiff(t, r) : (d.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
   }
   /**
@@ -3766,26 +3817,26 @@ const p = class p {
     const r = t.getTemplate();
     if (r === null)
       return d.error("[Haori]", "Template is not set for each element."), Promise.resolve();
-    let i = t.getAttribute(`${c.prefix}each-index`);
+    let i = t.getAttribute(`${l.prefix}each-index`);
     i && (i = String(i));
-    const n = t.getAttribute(`${c.prefix}each-key`), s = t.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    e.forEach((h, f) => {
+    const n = t.getAttribute(`${l.prefix}each-key`), s = t.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
+    e.forEach((c, f) => {
       const g = p.createListKey(
-        h,
+        c,
         n ? String(n) : null,
         f
       );
-      o.push(g), a.set(g, { item: h, itemIndex: f });
+      o.push(g), a.set(g, { item: c, itemIndex: f });
     });
-    const u = [];
-    let m = t.getChildren().filter((h) => h instanceof x).filter(
-      (h) => !h.hasAttribute(`${c.prefix}each-before`) && !h.hasAttribute(`${c.prefix}each-after`)
+    const h = [];
+    let m = t.getChildren().filter((c) => c instanceof x).filter(
+      (c) => !c.hasAttribute(`${l.prefix}each-before`) && !c.hasAttribute(`${l.prefix}each-after`)
     );
-    m = m.filter((h) => o.indexOf(String(h.getListKey())) === -1 ? (u.push(h.remove()), !1) : !0);
-    const y = m.map((h) => h.getListKey()), E = t.getChildren().filter((h) => h instanceof x).filter((h) => h.hasAttribute(`${c.prefix}each-before`)).length;
+    m = m.filter((c) => o.indexOf(String(c.getListKey())) === -1 ? (h.push(c.remove()), !1) : !0);
+    const b = m.map((c) => c.getListKey()), E = t.getChildren().filter((c) => c instanceof x).filter((c) => c.hasAttribute(`${l.prefix}each-before`)).length;
     let S = Promise.resolve();
-    return o.forEach((h, f) => {
-      const g = y.indexOf(h), { item: A, itemIndex: v } = a.get(h);
+    return o.forEach((c, f) => {
+      const g = b.indexOf(c), { item: A, itemIndex: v } = a.get(c);
       let k;
       if (g !== -1)
         k = m[g], S = S.then(
@@ -3795,12 +3846,12 @@ const p = class p {
             i,
             v,
             s ? String(s) : null,
-            h
-          ).then(() => p.evaluateAll(k))
+            c
+          ).then(() => p.evaluateAll(k)).then(() => p.scheduleEvaluateAll(k))
         );
       else {
         k = r.clone();
-        const W = E + f;
+        const J = E + f;
         S = S.then(
           () => p.updateRowFragment(
             k,
@@ -3808,30 +3859,30 @@ const p = class p {
             i,
             v,
             s ? String(s) : null,
-            h
+            c
           ).then(
             () => t.insertBefore(
               k,
-              t.getChildren()[W] || null
-            ).then(() => p.evaluateAll(k))
+              t.getChildren()[J] || null
+            ).then(() => p.evaluateAll(k)).then(() => p.scheduleEvaluateAll(k))
           )
         );
       }
-    }), Promise.all(u).then(() => S).then(() => {
-      const h = o.filter(
+    }), Promise.all(h).then(() => S).then(() => {
+      const c = o.filter(
         (v) => v !== null
-      ), f = y.filter(
+      ), f = b.filter(
         (v) => v !== null
-      ), g = h.filter(
+      ), g = c.filter(
         (v) => !f.includes(v)
       ), A = f.filter(
-        (v) => !h.includes(v)
+        (v) => !c.includes(v)
       );
-      w.eachUpdate(
+      T.eachUpdate(
         t.getTarget(),
         g,
         A,
-        h
+        c
       );
     });
   }
@@ -3879,9 +3930,19 @@ const p = class p {
     else
       return d.error(
         "[Haori]",
-        `Primitive value requires '${c.prefix}each-arg' attribute: ${e}`
+        `Primitive value requires '${l.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve();
-    return t.setListKey(s), t.setBindingData(a), t.setAttribute(`${c.prefix}row`, s);
+    return t.setListKey(s), t.setBindingData(a), t.setAttribute(`${l.prefix}row`, s);
+  }
+  /**
+   * フラグメントの再評価を次のイベントループで実行します。
+   *
+   * @param fragment 再評価対象のフラグメント
+   */
+  static scheduleEvaluateAll(t) {
+    setTimeout(() => {
+      p.evaluateAll(t);
+    }, 100);
   }
 };
 p.ATTRIBUTE_ALIAS_SUFFIX = "attr-", p.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], p.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], p.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
@@ -3893,7 +3954,7 @@ p.ATTRIBUTE_ALIAS_SUFFIX = "attr-", p.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if
   "url-param"
 ], p.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
 let R = p;
-const X = class X {
+const Y = class Y {
   /**
    * コンストラクタ。
    *
@@ -3901,11 +3962,11 @@ const X = class X {
    */
   constructor(t = document) {
     this.onClick = (e) => this.delegate(e, "click"), this.onChange = (e) => this.delegate(e, "change"), this.onLoadCapture = (e) => this.delegate(e, "load"), this.onWindowLoad = () => {
-      const e = document.documentElement, r = T.get(e);
+      const e = document.documentElement, r = w.get(e);
       r && new V(r, "load").run();
     }, this.onPopstate = (e) => {
       const r = e.state;
-      !r || r[X.HISTORY_STATE_KEY] !== !0 || location.reload();
+      !r || r[Y.HISTORY_STATE_KEY] !== !0 || location.reload();
     }, this.root = t;
   }
   /**
@@ -3931,7 +3992,7 @@ const X = class X {
     const r = this.getElementFromTarget(t.target);
     if (!r)
       return;
-    const i = T.get(r);
+    const i = w.get(r);
     i && (e === "change" && i instanceof x && i.syncValue(), new V(i, e).run().catch((n) => {
       d.error("[Haori]", "Procedure execution error:", n);
     }));
@@ -3946,8 +4007,8 @@ const X = class X {
     return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
   }
 };
-X.HISTORY_STATE_KEY = "__haoriHistoryState__";
-let Q = X;
+Y.HISTORY_STATE_KEY = "__haoriHistoryState__";
+let Q = Y;
 const N = class N {
   static syncTree(t) {
     (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && N.syncElement(t), t.querySelectorAll("*").forEach((e) => {
@@ -3955,14 +4016,14 @@ const N = class N {
     }));
   }
   static syncElement(t) {
-    const e = N.registrations.get(t), r = T.get(t);
+    const e = N.registrations.get(t), r = w.get(t);
     if (!r || !N.shouldObserve(r)) {
       e && (e.observer.disconnect(), N.registrations.delete(t));
       return;
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = N.resolveRoot(r), n = N.resolveRootMargin(r), s = N.resolveThreshold(r), a = r.hasAttribute(`${c.prefix}intersect-once`);
+    const i = N.resolveRoot(r), n = N.resolveRootMargin(r), s = N.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
     if (e && e.observer.root === i && e.observer.rootMargin === n && N.sameThreshold(
       e.observer.thresholds,
       s
@@ -3972,10 +4033,10 @@ const N = class N {
     }
     e && (e.observer.disconnect(), N.registrations.delete(t));
     const o = new IntersectionObserver(
-      (u) => {
+      (h) => {
         const m = N.registrations.get(t);
-        m && u.forEach((y) => {
-          !y.isIntersecting || m.running || N.isDisabled(m.fragment) || (m.running = !0, new V(m.fragment, "intersect").runWithResult().then((E) => {
+        m && h.forEach((b) => {
+          !b.isIntersecting || m.running || N.isDisabled(m.fragment) || (m.running = !0, new V(m.fragment, "intersect").runWithResult().then((E) => {
             E && m.once && (m.observer.disconnect(), N.registrations.delete(t));
           }).catch((E) => {
             d.error(
@@ -4019,14 +4080,14 @@ const N = class N {
   }
   static shouldObserve(t) {
     return t.getAttributeNames().some((e) => {
-      if (!e.startsWith(`${c.prefix}intersect-`))
+      if (!e.startsWith(`${l.prefix}intersect-`))
         return !1;
-      const r = e.slice(`${c.prefix}intersect-`.length);
+      const r = e.slice(`${l.prefix}intersect-`.length);
       return !N.CONFIG_KEYS.has(r);
     });
   }
   static resolveRoot(t) {
-    const e = `${c.prefix}intersect-root`;
+    const e = `${l.prefix}intersect-root`;
     if (!t.hasAttribute(e))
       return null;
     const r = t.getAttribute(e);
@@ -4036,15 +4097,15 @@ const N = class N {
     return i instanceof HTMLElement ? i : (d.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(t) {
-    const e = `${c.prefix}intersect-root-margin`, r = t.getAttribute(e);
+    const e = `${l.prefix}intersect-root-margin`, r = t.getAttribute(e);
     return r === null || r === !1 || r === "" ? "0px" : String(r);
   }
   static resolveThreshold(t) {
-    const e = `${c.prefix}intersect-threshold`, r = t.getAttribute(e), i = typeof r == "number" ? r : Number.parseFloat(String(r ?? 0));
+    const e = `${l.prefix}intersect-threshold`, r = t.getAttribute(e), i = typeof r == "number" ? r : Number.parseFloat(String(r ?? 0));
     return Number.isNaN(i) ? 0 : Math.min(1, Math.max(0, i));
   }
   static isDisabled(t) {
-    const e = `${c.prefix}intersect-disabled`, r = t.getAttribute(e);
+    const e = `${l.prefix}intersect-disabled`, r = t.getAttribute(e);
     if (r === null || r === !1)
       return !1;
     if (typeof r == "boolean")
@@ -4063,21 +4124,21 @@ N.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "disabled",
   "once"
 ]), N.registrations = /* @__PURE__ */ new Map();
-let $ = N;
-const I = class I {
+let L = N;
+const H = class H {
   /**
    * 初期化メソッド。
    * ドキュメントのheadとbodyを監視対象として設定します。
    */
   static async init() {
-    if (I._initialized)
+    if (H._initialized)
       return;
-    I._initialized = !0;
+    H._initialized = !0;
     const t = await Promise.allSettled([
       R.scan(document.head),
       R.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && d.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && d.error("[Haori]", "Failed to build body fragment:", r.reason), I.observe(document.head), I.observe(document.body), new Q().start(), $.syncTree(document.body);
+    e.status !== "fulfilled" && d.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && d.error("[Haori]", "Failed to build body fragment:", r.reason), H.observe(document.head), H.observe(document.body), new Q().start(), L.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -4106,7 +4167,7 @@ const I = class I {
                 n,
                 i.attributeName,
                 n.getAttribute(i.attributeName)
-              ), $.syncElement(n);
+              ), L.syncElement(n);
               break;
             }
             case "childList": {
@@ -4116,9 +4177,9 @@ const I = class I {
                 Array.from(i.removedNodes).map((n) => n.nodeName),
                 Array.from(i.addedNodes).map((n) => n.nodeName)
               ), Array.from(i.removedNodes).forEach((n) => {
-                $.cleanupTree(n), R.removeNode(n);
+                L.cleanupTree(n), R.removeNode(n);
               }), Array.from(i.addedNodes).forEach((n) => {
-                n.parentElement instanceof HTMLElement && (R.addNode(n.parentElement, n), $.syncTree(n));
+                n.parentElement instanceof HTMLElement && (R.addNode(n.parentElement, n), L.syncTree(n));
               });
               break;
             }
@@ -4150,19 +4211,19 @@ const I = class I {
     }), d.info("[Haori]", "Observer initialized for", t);
   }
 };
-I._initialized = !1;
-let q = I;
+H._initialized = !1;
+let q = H;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", q.init) : q.init();
-const pt = "0.4.3";
+const pt = "0.4.7";
 export {
   R as Core,
-  c as Env,
-  b as Form,
-  T as Fragment,
-  J as Haori,
+  l as Env,
+  y as Form,
+  w as Fragment,
+  X as Haori,
   d as Log,
   P as Queue,
-  J as default,
+  X as default,
   pt as version
 };
 //# sourceMappingURL=haori.es.js.map