haori 0.1.5 → 0.2.0

package/dist/haori.es.js

@@ -67,9 +67,9 @@ const M = class M {
   }
 };
 M._prefix = "data-";
-let h = M;
-document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", h.detect) : h.detect();
-class f {
+let f = M;
+document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", f.detect) : f.detect();
+class h {
   /**
    * 開発モードでのみコンソールに情報を出力します。
    *
@@ -111,16 +111,16 @@ class z {
    */
   enqueue(t, e = !1) {
     let r, n;
-    const s = new Promise((a, o) => {
+    const i = new Promise((a, o) => {
       r = a, n = o;
-    }), i = {
+    }), s = {
       task: t,
       timestamp: performance.now(),
-      promise: s,
+      promise: i,
       resolve: r,
       reject: n
     };
-    return e ? this.queue.unshift(i) : this.queue.push(i), this.scheduleProcessing(), s;
+    return e ? this.queue.unshift(s) : this.queue.push(s), this.scheduleProcessing(), i;
   }
   /**
    * キューを処理します。
@@ -140,13 +140,13 @@ class z {
             const r = await e.task();
             e.resolve(r);
           } catch (r) {
-            e.reject(r), f.error("[Haori]", `Task ${e.timestamp} failed:`, r);
+            e.reject(r), h.error("[Haori]", `Task ${e.timestamp} failed:`, r);
           }
           if (performance.now() - t > this.MAX_BUDGET)
             break;
         }
       } catch (t) {
-        f.error("[Haori]", "Error processing queue:", t);
+        h.error("[Haori]", "Error processing queue:", t);
       } finally {
         this.processing = !1, this.queue.length > 0 && this.scheduleProcessing();
       }
@@ -174,7 +174,7 @@ class z {
     t.length > 0 && await Promise.allSettled(t);
   }
 }
-const X = class X {
+const J = class J {
   /**
    * タスクをキューに追加します。
    *
@@ -192,8 +192,8 @@ const X = class X {
     return this.ASYNC_QUEUE.wait();
   }
 };
-X.ASYNC_QUEUE = new z();
-let N = X;
+J.ASYNC_QUEUE = new z();
+let N = J;
 class W {
   /**
    * 通知ダイアログを表示します。
@@ -239,7 +239,7 @@ class W {
    */
   static openDialog(t) {
     return N.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.showModal() : f.error("[Haori]", "Element is not a dialog: ", t);
+      t instanceof HTMLDialogElement ? t.showModal() : h.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -249,7 +249,7 @@ class W {
    */
   static closeDialog(t) {
     return N.enqueue(() => {
-      t instanceof HTMLDialogElement ? t.close() : f.error("[Haori]", "Element is not a dialog: ", t);
+      t instanceof HTMLDialogElement ? t.close() : h.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
   /**
@@ -285,13 +285,13 @@ class W {
   }
 }
 const Q = ["addErrorMessage", "clearMessages"];
-function J() {
+function X() {
   const t = globalThis.window?.Haori;
   return Q.every(
     (r) => typeof t?.[r] == "function"
   ) ? t : W;
 }
-class E {
+class b {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -302,7 +302,7 @@ class E {
    */
   static getValues(t) {
     const e = {};
-    return E.getPartValues(t, e);
+    return b.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -313,32 +313,32 @@ class E {
    * @returns values と同じオブジェクト
    */
   static getPartValues(t, e) {
-    const r = t.getAttribute("name"), n = t.getAttribute(`${h.prefix}form-object`), s = t.getAttribute(`${h.prefix}form-list`);
+    const r = t.getAttribute("name"), n = t.getAttribute(`${f.prefix}form-object`), i = t.getAttribute(`${f.prefix}form-list`);
     if (r) {
-      s ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), n && f.warn(
+      i ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), n && h.warn(
         "Haori",
-        `Element cannot have both ${h.prefix}form-object and name attributes.`
+        `Element cannot have both ${f.prefix}form-object and name attributes.`
       );
-      for (const i of t.getChildElementFragments())
-        E.getPartValues(i, e);
+      for (const s of t.getChildElementFragments())
+        b.getPartValues(s, e);
     } else if (n) {
-      const i = {};
+      const s = {};
       for (const a of t.getChildElementFragments())
-        E.getPartValues(a, i);
-      Object.keys(i).length > 0 && (e[String(n)] = i), s && f.warn(
+        b.getPartValues(a, s);
+      Object.keys(s).length > 0 && (e[String(n)] = s), i && h.warn(
         "Haori",
-        `Element cannot have both ${h.prefix}form-list and ${h.prefix}form-object attributes.`
+        `Element cannot have both ${f.prefix}form-list and ${f.prefix}form-object attributes.`
       );
-    } else if (s) {
-      const i = [];
+    } else if (i) {
+      const s = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        E.getPartValues(a, o), Object.keys(o).length > 0 && i.push(o);
+        b.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
       }
-      i.length > 0 && (e[String(s)] = i);
+      s.length > 0 && (e[String(i)] = s);
     } else
-      for (const i of t.getChildElementFragments())
-        E.getPartValues(i, e);
+      for (const s of t.getChildElementFragments())
+        b.getPartValues(s, e);
     return e;
   }
   /**
@@ -351,7 +351,7 @@ class E {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return E.setPartValues(t, e, null, r);
+    return b.setPartValues(t, e, null, r);
   }
   /**
    * フラグメント内にある各入力エレメントに値を設定します。
@@ -363,44 +363,44 @@ class E {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setPartValues(t, e, r = null, n = !1) {
-    const s = [], i = t.getAttribute("name"), a = t.getAttribute(`${h.prefix}form-object`), o = t.getAttribute(`${h.prefix}form-list`), g = t.getAttribute(`${h.prefix}form-detach`);
-    if (i) {
-      if (!g || n) {
-        const u = e[String(i)];
-        o && Array.isArray(u) && r !== null ? s.push(t.setValue(u[r])) : typeof u == "string" || typeof u == "number" || typeof u == "boolean" || u === null ? s.push(t.setValue(u)) : s.push(t.setValue(String(u)));
+    const i = [], s = t.getAttribute("name"), a = t.getAttribute(`${f.prefix}form-object`), o = t.getAttribute(`${f.prefix}form-list`), p = t.getAttribute(`${f.prefix}form-detach`);
+    if (s) {
+      if (!p || n) {
+        const c = e[String(s)];
+        o && Array.isArray(c) && r !== null ? i.push(t.setValue(c[r])) : typeof c == "string" || typeof c == "number" || typeof c == "boolean" || c === null ? i.push(t.setValue(c)) : i.push(t.setValue(String(c)));
       }
     } else if (a) {
-      const u = e[String(a)];
-      if (u && typeof u == "object")
-        for (const b of t.getChildElementFragments())
-          s.push(
-            E.setPartValues(
-              b,
-              u,
+      const c = e[String(a)];
+      if (c && typeof c == "object")
+        for (const y of t.getChildElementFragments())
+          i.push(
+            b.setPartValues(
+              y,
+              c,
               null,
               n
             )
           );
     } else if (o) {
-      const u = e[String(o)];
-      if (Array.isArray(u)) {
-        const b = t.getChildElementFragments();
-        for (let l = 0; l < b.length; l++) {
-          const d = b[l];
-          u.length > l ? s.push(
-            E.setPartValues(
+      const c = e[String(o)];
+      if (Array.isArray(c)) {
+        const y = t.getChildElementFragments();
+        for (let l = 0; l < y.length; l++) {
+          const d = y[l];
+          c.length > l ? i.push(
+            b.setPartValues(
               d,
-              u[l],
+              c[l],
               l,
               n
             )
-          ) : s.push(E.setPartValues(d, {}, l, n));
+          ) : i.push(b.setPartValues(d, {}, l, n));
         }
       }
     } else
-      for (const u of t.getChildElementFragments())
-        s.push(E.setPartValues(u, e, null, n));
-    return Promise.all(s).then(() => {
+      for (const c of t.getChildElementFragments())
+        i.push(b.setPartValues(c, e, null, n));
+    return Promise.all(i).then(() => {
     });
   }
   /**
@@ -411,9 +411,9 @@ class E {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    E.clearValues(t), await Promise.all([
-      E.clearMessages(t),
-      E.clearEachClones(t)
+    b.clearValues(t), await Promise.all([
+      b.clearMessages(t),
+      b.clearEachClones(t)
     ]), await N.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
@@ -421,8 +421,8 @@ class E {
       else {
         const r = e.parentElement;
         if (r) {
-          const n = e.nextElementSibling, s = document.createElement("form");
-          s.appendChild(e), s.reset(), r.insertBefore(e, n);
+          const n = e.nextElementSibling, i = document.createElement("form");
+          i.appendChild(e), i.reset(), r.insertBefore(e, n);
         }
       }
     }), await T.evaluateAll(t);
@@ -434,20 +434,20 @@ class E {
    * 対象エレメント自体は削除しません。
    */
   static clearEachClones(t) {
-    const e = [], r = (s) => {
-      if (s.hasAttribute(`${h.prefix}each`))
-        for (const i of s.getChildElementFragments()) {
-          const a = i.hasAttribute(`${h.prefix}each-before`), o = i.hasAttribute(`${h.prefix}each-after`);
-          !a && !o && e.push(i.remove());
+    const e = [], r = (i) => {
+      if (i.hasAttribute(`${f.prefix}each`))
+        for (const s of i.getChildElementFragments()) {
+          const a = s.hasAttribute(`${f.prefix}each-before`), o = s.hasAttribute(`${f.prefix}each-after`);
+          !a && !o && e.push(s.remove());
         }
-    }, n = (s) => {
-      r(s);
-      for (const i of s.getChildElementFragments())
-        n(i);
+    }, n = (i) => {
+      r(i);
+      for (const s of i.getChildElementFragments())
+        n(s);
     };
     r(t);
-    for (const s of t.getChildElementFragments())
-      n(s);
+    for (const i of t.getChildElementFragments())
+      n(i);
     return Promise.all(e).then(() => {
     });
   }
@@ -459,7 +459,7 @@ class E {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      E.clearValues(e);
+      b.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -468,7 +468,7 @@ class E {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(t) {
-    return J().clearMessages(
+    return X().clearMessages(
       t.getTarget()
     );
   }
@@ -482,13 +482,13 @@ class E {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    const n = [], s = J(), i = E.findFragmentsByKey(t, e);
-    return i.forEach((a) => {
+    const n = [], i = X(), s = b.findFragmentsByKey(t, e);
+    return s.forEach((a) => {
       n.push(
-        s.addErrorMessage(a.getTarget(), r)
+        i.addErrorMessage(a.getTarget(), r)
       );
-    }), i.length === 0 && n.push(
-      s.addErrorMessage(t.getTarget(), r)
+    }), s.length === 0 && n.push(
+      i.addErrorMessage(t.getTarget(), r)
     ), Promise.all(n).then(() => {
     });
   }
@@ -500,7 +500,7 @@ class E {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return E.findFragmentByKeyParts(t, e.split("."));
+    return b.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -512,31 +512,31 @@ class E {
    */
   static findFragmentByKeyParts(t, e) {
     const r = [], n = e[0];
-    if (e.length == 1 && t.getAttribute("name") === n && r.push(t), t.hasAttribute(`${h.prefix}form-object`))
-      e.length > 1 && t.getAttribute(`${h.prefix}form-object`) === n && t.getChildElementFragments().forEach((i) => {
-        r.push(...E.findFragmentByKeyParts(i, e.slice(1)));
+    if (e.length == 1 && t.getAttribute("name") === n && r.push(t), t.hasAttribute(`${f.prefix}form-object`))
+      e.length > 1 && t.getAttribute(`${f.prefix}form-object`) === n && t.getChildElementFragments().forEach((s) => {
+        r.push(...b.findFragmentByKeyParts(s, e.slice(1)));
       });
-    else if (t.hasAttribute(`${h.prefix}form-list`)) {
+    else if (t.hasAttribute(`${f.prefix}form-list`)) {
       if (e.length > 1) {
-        const s = t.getAttribute(`${h.prefix}form-list`), i = n.lastIndexOf("["), a = n.lastIndexOf("]");
-        if (i !== -1 && a !== -1 && i < a) {
-          const o = n.substring(0, i);
-          if (s === o) {
-            const g = n.substring(i + 1, a), u = Number(g);
-            if (isNaN(u))
-              f.error("Haori", `Invalid index: ${n}`);
+        const i = t.getAttribute(`${f.prefix}form-list`), s = n.lastIndexOf("["), a = n.lastIndexOf("]");
+        if (s !== -1 && a !== -1 && s < a) {
+          const o = n.substring(0, s);
+          if (i === o) {
+            const p = n.substring(s + 1, a), c = Number(p);
+            if (isNaN(c))
+              h.error("Haori", `Invalid index: ${n}`);
             else {
-              const b = t.getChildElementFragments().filter((l) => l.hasAttribute(`${h.prefix}row`));
-              u < b.length && r.push(
-                ...E.findFragmentByKeyParts(b[u], e.slice(1))
+              const y = t.getChildElementFragments().filter((l) => l.hasAttribute(`${f.prefix}row`));
+              c < y.length && r.push(
+                ...b.findFragmentByKeyParts(y[c], e.slice(1))
               );
             }
           }
         }
       }
     } else
-      t.getChildElementFragments().forEach((s) => {
-        r.push(...E.findFragmentByKeyParts(s, e));
+      t.getChildElementFragments().forEach((i) => {
+        r.push(...b.findFragmentByKeyParts(i, e));
       });
     return r;
   }
@@ -598,28 +598,28 @@ const S = class S {
    */
   static evaluate(t, e = {}) {
     if (t.trim() === "")
-      return f.warn("[Haori]", t, "Expression is empty"), null;
+      return h.warn("[Haori]", t, "Expression is empty"), null;
     if (this.containsDangerousPatterns(t))
-      return f.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
+      return h.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
     if (this.containsForbiddenKeys(e))
-      return f.warn("[Haori]", e, "Binded values contain forbidden keys"), null;
+      return h.warn("[Haori]", e, "Binded values contain forbidden keys"), null;
     if (this.containsForbiddenBindingValues(e))
-      return f.warn(
+      return h.warn(
         "[Haori]",
         e,
         "Binded values contain forbidden values"
       ), null;
-    const r = Object.keys(e).filter((i) => !this.FORBIDDEN_BINDING_NAMES.has(i)).sort(), n = `${t}:${r.join(",")}`;
-    let s = this.EXPRESSION_CACHE.get(n);
-    if (!s) {
-      const i = this.buildAssignments(r), a = i ? `"use strict";
-${i};
+    const r = Object.keys(e).filter((s) => !this.FORBIDDEN_BINDING_NAMES.has(s)).sort(), n = `${t}:${r.join(",")}`;
+    let i = this.EXPRESSION_CACHE.get(n);
+    if (!i) {
+      const s = this.buildAssignments(r), a = s ? `"use strict";
+${s};
 return (${t});` : `"use strict";
 return (${t});`;
       try {
-        s = new Function(...r, a), this.EXPRESSION_CACHE.set(n, s);
+        i = new Function(...r, a), this.EXPRESSION_CACHE.set(n, i);
       } catch (o) {
-        return f.error(
+        return h.error(
           "[Haori]",
           "Failed to compile expression:",
           t,
@@ -628,12 +628,12 @@ return (${t});`;
       }
     }
     try {
-      const i = [], a = this.wrapBoundValues(e);
+      const s = [], a = this.wrapBoundValues(e);
       return r.forEach((o) => {
-        i.push(a[o]);
-      }), this.withBlockedPropertyAccess(() => s(...i));
-    } catch (i) {
-      return f.error("[Haori]", "Expression evaluation error:", t, i), i instanceof ReferenceError ? void 0 : null;
+        s.push(a[o]);
+      }), this.withBlockedPropertyAccess(() => i(...s));
+    } catch (s) {
+      return h.error("[Haori]", "Expression evaluation error:", t, s), s instanceof ReferenceError ? void 0 : null;
     }
   }
   /**
@@ -664,13 +664,13 @@ return (${t});`;
       return !1;
     const r = [];
     let n = null;
-    for (let s = 0; s < e.length; s++) {
-      const i = e[s], a = e[s + 1] || null, o = r[r.length - 1] || null;
-      if (i.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(i.value) || this.STRICT_FORBIDDEN_NAMES.includes(i.value) || (n?.value === "." || n?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(i.value)) || o === "member" && i.value !== "]" && i.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
-        this.decodeStringLiteral(i.value)
-      ) || i.value === "." && a?.type !== "identifier" || i.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
+    for (let i = 0; i < e.length; i++) {
+      const s = e[i], a = e[i + 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) || (n?.value === "." || n?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(s.value)) || o === "member" && s.value !== "]" && s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+        this.decodeStringLiteral(s.value)
+      ) || s.value === "." && a?.type !== "identifier" || s.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
         return !1;
-      switch (i.value) {
+      switch (s.value) {
         case "(":
           r.push("paren");
           break;
@@ -680,8 +680,8 @@ return (${t});`;
           break;
         }
         case "[": {
-          const g = this.startsMemberAccess(n) ? "member" : "array";
-          r.push(g);
+          const p = this.startsMemberAccess(n) ? "member" : "array";
+          r.push(p);
           break;
         }
         case "]": {
@@ -690,7 +690,7 @@ return (${t});`;
           break;
         }
       }
-      n = i;
+      n = s;
     }
     return r.length === 0;
   }
@@ -731,41 +731,41 @@ return (${t});`;
       ">",
       "<"
     ]);
-    let s = 0;
-    for (; s < t.length; ) {
-      const i = t[s];
-      if (/\s/.test(i)) {
-        s += 1;
+    let i = 0;
+    for (; i < t.length; ) {
+      const s = t[i];
+      if (/\s/.test(s)) {
+        i += 1;
         continue;
       }
-      if (i === "/" && (t[s + 1] === "/" || t[s + 1] === "*"))
+      if (s === "/" && (t[i + 1] === "/" || t[i + 1] === "*"))
         return null;
-      if (i === '"' || i === "'") {
-        const o = this.readStringToken(t, s);
+      if (s === '"' || s === "'") {
+        const o = this.readStringToken(t, i);
         if (o === null)
           return null;
-        e.push(o.token), s = o.nextIndex;
+        e.push(o.token), i = o.nextIndex;
         continue;
       }
       const a = r.find(
-        (o) => t.startsWith(o, s)
+        (o) => t.startsWith(o, i)
       );
       if (a) {
-        e.push({ type: "operator", value: a, position: s }), s += a.length;
+        e.push({ type: "operator", value: a, position: i }), i += a.length;
         continue;
       }
-      if (/[0-9]/.test(i)) {
-        const o = this.readNumberToken(t, s);
-        e.push(o.token), s = o.nextIndex;
+      if (/[0-9]/.test(s)) {
+        const o = this.readNumberToken(t, i);
+        e.push(o.token), i = o.nextIndex;
         continue;
       }
-      if (/[A-Za-z_$]/.test(i)) {
-        const o = this.readIdentifierToken(t, s);
-        e.push(o.token), s = o.nextIndex;
+      if (/[A-Za-z_$]/.test(s)) {
+        const o = this.readIdentifierToken(t, i);
+        e.push(o.token), i = o.nextIndex;
         continue;
       }
-      if (n.has(i)) {
-        e.push({ type: "operator", value: i, position: s }), s += 1;
+      if (n.has(s)) {
+        e.push({ type: "operator", value: s, position: i }), i += 1;
         continue;
       }
       return null;
@@ -783,12 +783,12 @@ return (${t});`;
     const r = t[e];
     let n = e + 1;
     for (; n < t.length; ) {
-      const s = t[n];
-      if (s === "\\") {
+      const i = t[n];
+      if (i === "\\") {
         n += 2;
         continue;
       }
-      if (s === r)
+      if (i === r)
         return {
           token: {
             type: "string",
@@ -896,8 +896,8 @@ return (${t});`;
    */
   static wrapBoundValues(t) {
     const e = /* @__PURE__ */ new WeakMap(), r = {};
-    return Object.entries(t).forEach(([n, s]) => {
-      r[n] = this.wrapBoundValue(s, e);
+    return Object.entries(t).forEach(([n, i]) => {
+      r[n] = this.wrapBoundValue(i, e);
     }), r;
   }
   /**
@@ -913,39 +913,39 @@ return (${t});`;
     const r = t, n = e.get(r);
     if (n !== void 0)
       return n;
-    const s = new Proxy(r, {
-      get: (i, a, o) => {
+    const i = new Proxy(r, {
+      get: (s, a, o) => {
         if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
           return;
-        const g = Reflect.get(i, a, o);
-        return typeof a == "symbol" ? g : this.wrapBoundValue(
-          g,
+        const p = Reflect.get(s, a, o);
+        return typeof a == "symbol" ? p : this.wrapBoundValue(
+          p,
           e
         );
       },
-      has: (i, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(i, a),
-      getOwnPropertyDescriptor: (i, a) => {
+      has: (s, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(s, a),
+      getOwnPropertyDescriptor: (s, a) => {
         if (!(typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a)))
-          return Reflect.getOwnPropertyDescriptor(i, a);
+          return Reflect.getOwnPropertyDescriptor(s, a);
       },
-      apply: (i, a, o) => {
-        const g = Reflect.apply(
-          i,
+      apply: (s, a, o) => {
+        const p = Reflect.apply(
+          s,
           a,
           o
         );
-        return this.isIteratorLike(g) ? g : this.wrapBoundValue(g, e);
+        return this.isIteratorLike(p) ? p : this.wrapBoundValue(p, e);
       },
-      construct: (i, a, o) => this.wrapBoundValue(
+      construct: (s, a, o) => this.wrapBoundValue(
         Reflect.construct(
-          i,
+          s,
           a,
           o
         ),
         e
       )
     });
-    return e.set(r, s), s;
+    return e.set(r, i), i;
   }
   /**
    * Proxy ラップ対象の値かどうかを判定します。
@@ -978,8 +978,8 @@ return (${t});`;
       ...n,
       descriptor: Object.getOwnPropertyDescriptor(n.target, n.property)
     })).filter((n) => n.descriptor?.configurable === !0);
-    r.forEach(({ target: n, property: s }) => {
-      Object.defineProperty(n, s, {
+    r.forEach(({ target: n, property: i }) => {
+      Object.defineProperty(n, i, {
         configurable: !0,
         enumerable: !1,
         get: () => {
@@ -991,8 +991,8 @@ return (${t});`;
     try {
       return t();
     } finally {
-      r.forEach(({ target: n, property: s, descriptor: i }) => {
-        i !== void 0 && Object.defineProperty(n, s, i);
+      r.forEach(({ target: n, property: i, descriptor: s }) => {
+        s !== void 0 && Object.defineProperty(n, i, s);
       });
     }
   }
@@ -1125,7 +1125,7 @@ S.FORBIDDEN_NAMES = [
   "with",
   "yield"
 ]), S.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
-let H = S;
+let $ = S;
 const k = class k {
   /**
    * フラグメントのコンストラクタ。
@@ -1146,13 +1146,13 @@ const k = class k {
         e = new P(t);
         break;
       case Node.TEXT_NODE:
-        e = new B(t);
+        e = new I(t);
         break;
       case Node.COMMENT_NODE:
         e = new G(t);
         break;
       default:
-        return f.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
+        return h.warn("[Haori]", "Unsupported node type:", t.nodeType), null;
     }
     return e;
   }
@@ -1258,8 +1258,8 @@ const k = class k {
   }
 };
 k.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let y = k;
-class P extends y {
+let A = k;
+class P extends A {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1289,7 +1289,7 @@ class P extends y {
         this.attributeMap.set(e, n);
       }
     }), t.childNodes.forEach((e) => {
-      const r = y.get(e);
+      const r = A.get(e);
       r.setParent(this), this.children.push(r);
     });
   }
@@ -1329,7 +1329,7 @@ class P extends y {
   removeChild(t) {
     const e = this.children.indexOf(t);
     if (e < 0) {
-      f.warn("[Haori]", "Child fragment not found.", t);
+      h.warn("[Haori]", "Child fragment not found.", t);
       return;
     }
     this.children.splice(e, 1), t.setParent(null);
@@ -1343,7 +1343,9 @@ class P extends y {
     const t = new P(
       this.target.cloneNode(!1)
     );
-    return this.children.forEach((e) => {
+    return this.attributeMap.forEach((e, r) => {
+      t.attributeMap.set(r, e);
+    }), 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;
@@ -1393,6 +1395,14 @@ class P extends y {
   setBindingData(t) {
     this.bindingData = t, this.clearBindingDataCache();
   }
+  /**
+   * 親フラグメントを設定します。バインドデータキャッシュをクリアします。
+   *
+   * @param parent 親フラグメント
+   */
+  setParent(t) {
+    this.parent !== t && (this.parent = t, this.clearBindingDataCache());
+  }
   /**
    * バインドデータのキャッシュをクリアします。
    */
@@ -1456,7 +1466,7 @@ class P extends y {
       e.value = t === null ? "" : String(t), (e instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(e.type) || e instanceof HTMLTextAreaElement) && e.dispatchEvent(new Event("input", { bubbles: !0 })), e.dispatchEvent(new Event("change", { bubbles: !0 }));
     }).finally(() => {
       this.skipChangeValue = !1;
-    })) : (f.warn(
+    })) : (h.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
       e
@@ -1512,13 +1522,13 @@ class P extends y {
       return this.removeAttribute(t);
     const r = new j(t, e);
     this.attributeMap.set(t, r), this.skipMutationAttributes = !0;
-    const n = this.getTarget(), s = r.isForceEvaluation() ? e : this.getAttribute(t);
+    const n = this.getTarget(), i = r.isForceEvaluation() ? e : this.getAttribute(t);
     return N.enqueue(() => {
-      if (s === null || s === !1)
+      if (i === null || i === !1)
         n.removeAttribute(t);
       else {
-        const i = String(s);
-        n.getAttribute(t) !== i && n.setAttribute(t, i);
+        const s = String(i);
+        n.getAttribute(t) !== s && n.setAttribute(t, s);
       }
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1553,7 +1563,7 @@ class P extends y {
     if (e === void 0)
       return null;
     const r = e.evaluate(this.getBindingData());
-    return r.length === 1 ? r[0] : I.joinEvaluateResults(r);
+    return r.length === 1 ? r[0] : H.joinEvaluateResults(r);
   }
   /**
    * 属性の生の値を取得します。
@@ -1594,15 +1604,15 @@ class P extends y {
     if (r.parentNode !== this.target)
       return null;
     const n = e ? r.nextSibling : r;
-    let s = e ? r.nextSibling : r;
-    for (; s !== null; ) {
-      const i = y.get(s);
-      if (i !== null) {
-        const a = this.children.indexOf(i);
+    let i = e ? r.nextSibling : r;
+    for (; i !== null; ) {
+      const s = A.get(i);
+      if (s !== null) {
+        const a = this.children.indexOf(s);
         if (a !== -1)
           return { index: a, referenceNode: n };
       }
-      s = s.nextSibling;
+      i = i.nextSibling;
     }
     return { index: this.children.length, referenceNode: n };
   }
@@ -1618,42 +1628,42 @@ class P extends y {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (t === this)
-      return f.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
+      return h.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
     const n = /* @__PURE__ */ new Set();
-    let s = this.parent;
-    for (; s; )
-      n.add(s), s = s.getParent();
+    let i = this.parent;
+    for (; i; )
+      n.add(i), i = i.getParent();
     if (n.has(t))
-      return f.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
-    const i = t.getParent() === this;
+      return h.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
+    const s = t.getParent() === this;
     let a = -1, o = -1;
-    i && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
-    const g = t.getParent();
-    g !== null && g.removeChild(t);
-    let u = r === void 0 ? e?.getTarget() || null : r;
+    s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
+    const p = t.getParent();
+    p !== null && p.removeChild(t);
+    let c = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
     else {
       let l;
-      if (i ? a !== -1 && a < o ? l = o - 1 : l = o : l = this.children.indexOf(e), l === -1) {
+      if (s ? a !== -1 && a < o ? l = o - 1 : l = o : l = this.children.indexOf(e), l === -1) {
         const d = this.resolveInsertionPointFromDom(
           e,
           !1
         );
-        d === null ? (f.warn(
+        d === null ? (h.warn(
           "[Haori]",
           "Reference child not found in children.",
           e
-        ), this.children.push(t)) : (this.children.splice(d.index, 0, t), u = d.referenceNode);
+        ), this.children.push(t)) : (this.children.splice(d.index, 0, t), c = d.referenceNode);
       } else
         this.children.splice(l, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const b = this.skipMutationNodes;
+    const y = this.skipMutationNodes;
     return this.skipMutationNodes = !0, N.enqueue(() => {
-      this.target.insertBefore(t.getTarget(), u);
+      this.target.insertBefore(t.getTarget(), c);
     }).finally(() => {
-      this.skipMutationNodes = b;
+      this.skipMutationNodes = y;
     });
   }
   /**
@@ -1672,7 +1682,7 @@ class P extends y {
         e,
         !0
       );
-      return n === null ? (f.warn(
+      return n === null ? (h.warn(
         "[Haori]",
         "Reference child not found in children.",
         e
@@ -1724,7 +1734,7 @@ class P extends y {
    * @returns エレメントの非表示のPromise
    */
   hide() {
-    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${h.prefix}if-false`, ""), Promise.resolve();
+    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${f.prefix}if-false`, ""), Promise.resolve();
   }
   /**
    * エレメントを表示します。
@@ -1732,7 +1742,7 @@ class P extends y {
    * @return エレメントの表示のPromise
    */
   show() {
-    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${h.prefix}if-false`), this.visible = !0, Promise.resolve();
+    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${f.prefix}if-false`), this.visible = !0, Promise.resolve();
   }
   /**
    * 指定した属性名を持つ最も近い親要素を返します。
@@ -1748,7 +1758,7 @@ class P extends y {
     return e === null ? null : e.closestByAttribute(t);
   }
 }
-class B extends y {
+class I extends A {
   /**
    * テキストフラグメントのコンストラクタ。
    * 対象テキストノードの内容を初期化します。
@@ -1756,7 +1766,7 @@ class B extends y {
    * @param target 対象テキストノード
    */
   constructor(t) {
-    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new I(this.text);
+    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new H(this.text);
   }
   /**
    * フラグメントをクローンします。
@@ -1764,7 +1774,7 @@ class B extends y {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new B(this.target.cloneNode(!0));
+    const t = new I(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t.contents = this.contents, t;
   }
   /**
@@ -1782,7 +1792,7 @@ class B extends y {
    * @returns 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new I(t), this.evaluate());
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new H(t), this.evaluate());
   }
   /**
    * フラグメントを評価します。
@@ -1795,7 +1805,7 @@ class B extends y {
     ) : N.enqueue(() => {
       this.skipMutation = !0, this.contents.isRawEvaluate ? this.parent.getTarget().innerHTML = this.contents.evaluate(
         this.parent.getBindingData()
-      )[0] : this.contents.isEvaluate ? this.target.textContent = I.joinEvaluateResults(
+      )[0] : this.contents.isEvaluate ? this.target.textContent = H.joinEvaluateResults(
         this.contents.evaluate(this.parent.getBindingData())
       ) : this.target.textContent = this.text;
     }).finally(() => {
@@ -1803,7 +1813,7 @@ class B extends y {
     });
   }
 }
-class G extends y {
+class G extends A {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -1853,25 +1863,25 @@ const U = class U {
   constructor(t) {
     this.contents = [], this.isEvaluate = !1, this.isRawEvaluate = !1, this.value = t;
     const e = [...t.matchAll(U.PLACEHOLDER_REGEX)];
-    let r = 0, n = !1, s = !1;
-    for (const i of e) {
-      i.index > r && this.contents.push({
-        text: t.slice(r, i.index),
+    let r = 0, n = !1, i = !1;
+    for (const s of e) {
+      s.index > r && this.contents.push({
+        text: t.slice(r, s.index),
         type: 0
         /* TEXT */
       });
       const a = {
-        text: i[1] ?? i[2],
-        type: i[1] ? 2 : 1
+        text: s[1] ?? s[2],
+        type: s[1] ? 2 : 1
         /* EXPRESSION */
       };
-      n = !0, s = s || a.type === 2, this.contents.push(a), r = i.index + i[0].length;
+      n = !0, i = i || a.type === 2, this.contents.push(a), r = s.index + s[0].length;
     }
     r < t.length && this.contents.push({
       text: t.slice(r),
       type: 0
       /* TEXT */
-    }), this.isEvaluate = n, this.isRawEvaluate = s, this.checkRawExpressions();
+    }), this.isEvaluate = n, this.isRawEvaluate = i, this.checkRawExpressions();
   }
   /**
    * 評価結果を結合して文字列にします。
@@ -1895,7 +1905,7 @@ const U = class U {
    */
   checkRawExpressions() {
     for (let t = 0; t < this.contents.length; t++)
-      this.contents[t].type === 2 && this.contents.length > 1 && (f.error(
+      this.contents[t].type === 2 && this.contents.length > 1 && (h.error(
         "[Haori]",
         "Raw expressions are not allowed in multi-content expressions."
       ), this.contents[t].type = 1);
@@ -1913,12 +1923,12 @@ const U = class U {
     return this.contents.forEach((r) => {
       try {
         if (r.type === 1 || r.type === 2) {
-          const n = H.evaluate(r.text, t);
+          const n = $.evaluate(r.text, t);
           e.push(n);
         } else
           e.push(r.text);
       } catch (n) {
-        f.error(
+        h.error(
           "[Haori]",
           `Error evaluating text expression: ${r.text}`,
           n
@@ -1928,8 +1938,8 @@ const U = class U {
   }
 };
 U.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let I = U;
-const q = class q extends I {
+let H = U;
+const q = class q extends H {
   /**
    * コンストラクタ。
    *
@@ -1960,18 +1970,18 @@ const q = class q extends I {
     return this.contents.forEach((r) => {
       try {
         if (this.forceEvaluation && r.type === 0 || r.type === 1 || r.type === 2) {
-          const n = H.evaluate(r.text, t);
+          const n = $.evaluate(r.text, t);
           e.push(n);
         } else
           e.push(r.text);
       } catch (n) {
-        f.error(
+        h.error(
           "[Haori]",
           `Error evaluating attribute expression: ${r.text}`,
           n
         ), e.push("");
       }
-    }), this.forceEvaluation && e.length > 1 ? (f.error(
+    }), this.forceEvaluation && e.length > 1 ? (h.error(
       "[Haori]",
       "each or if expressions must have a single content.",
       e
@@ -1985,7 +1995,7 @@ q.FORCE_EVALUATION_ATTRIBUTES = [
   "hor-each"
 ];
 let j = q;
-class A {
+class E {
   /**
    * カスタムイベントを発火します。
    *
@@ -1995,13 +2005,13 @@ class A {
    * @param options イベントオプション
    */
   static dispatch(t, e, r, n) {
-    const s = new CustomEvent(`haori:${e}`, {
+    const i = new CustomEvent(`haori:${e}`, {
       bubbles: n?.bubbles ?? !0,
       cancelable: n?.cancelable ?? !1,
       composed: n?.composed ?? !0,
       detail: r
     });
-    return t.dispatchEvent(s);
+    return t.dispatchEvent(i);
   }
   /**
    * readyイベントを発火します。
@@ -2009,7 +2019,7 @@ class A {
    * @param version ライブラリバージョン
    */
   static ready(t) {
-    A.dispatch(document, "ready", { version: t });
+    E.dispatch(document, "ready", { version: t });
   }
   /**
    * renderイベントを発火します。
@@ -2017,7 +2027,7 @@ class A {
    * @param target 評価対象要素
    */
   static render(t) {
-    A.dispatch(t, "render", { target: t });
+    E.dispatch(t, "render", { target: t });
   }
   /**
    * importstartイベントを発火します。
@@ -2026,7 +2036,7 @@ class A {
    * @param url インポート対象URL
    */
   static importStart(t, e) {
-    A.dispatch(t, "importstart", {
+    E.dispatch(t, "importstart", {
       url: e,
       startedAt: performance.now()
     });
@@ -2040,7 +2050,7 @@ class A {
    * @param startedAt 開始時刻
    */
   static importEnd(t, e, r, n) {
-    A.dispatch(t, "importend", {
+    E.dispatch(t, "importend", {
       url: e,
       bytes: r,
       durationMs: performance.now() - n
@@ -2054,7 +2064,7 @@ class A {
    * @param error エラー内容
    */
   static importError(t, e, r) {
-    A.dispatch(t, "importerror", { url: e, error: r });
+    E.dispatch(t, "importerror", { url: e, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -2065,15 +2075,15 @@ class A {
    * @param reason 変更理由
    */
   static bindChange(t, e, r, n = "other") {
-    const s = [], i = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...i, ...a]);
-    for (const g of o) {
-      const u = e?.[g], b = r[g];
-      u !== b && s.push(g);
+    const i = [], s = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...s, ...a]);
+    for (const p of o) {
+      const c = e?.[p], y = r[p];
+      c !== y && i.push(p);
     }
-    A.dispatch(t, "bindchange", {
+    E.dispatch(t, "bindchange", {
       previous: e || {},
       next: r,
-      changedKeys: s,
+      changedKeys: i,
       reason: n
     });
   }
@@ -2086,7 +2096,7 @@ class A {
    * @param order 現在の順序
    */
   static eachUpdate(t, e, r, n) {
-    A.dispatch(t, "eachupdate", {
+    E.dispatch(t, "eachupdate", {
       added: e,
       removed: r,
       order: n,
@@ -2102,7 +2112,7 @@ class A {
    * @param item 行データ
    */
   static rowAdd(t, e, r, n) {
-    A.dispatch(t, "rowadd", { key: e, index: r, item: n });
+    E.dispatch(t, "rowadd", { key: e, index: r, item: n });
   }
   /**
    * rowremoveイベントを発火します。
@@ -2112,7 +2122,7 @@ class A {
    * @param index インデックス
    */
   static rowRemove(t, e, r) {
-    A.dispatch(t, "rowremove", { key: e, index: r });
+    E.dispatch(t, "rowremove", { key: e, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -2123,7 +2133,7 @@ class A {
    * @param to 移動後インデックス
    */
   static rowMove(t, e, r, n) {
-    A.dispatch(t, "rowmove", { key: e, from: r, to: n });
+    E.dispatch(t, "rowmove", { key: e, from: r, to: n });
   }
   /**
    * showイベントを発火します。
@@ -2131,7 +2141,7 @@ class A {
    * @param target data-if要素
    */
   static show(t) {
-    A.dispatch(t, "show", { visible: !0 });
+    E.dispatch(t, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -2139,7 +2149,7 @@ class A {
    * @param target data-if要素
    */
   static hide(t) {
-    A.dispatch(t, "hide", { visible: !1 });
+    E.dispatch(t, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -2150,7 +2160,7 @@ class A {
    * @param payload 送信データ
    */
   static fetchStart(t, e, r, n) {
-    A.dispatch(t, "fetchstart", {
+    E.dispatch(t, "fetchstart", {
       url: e,
       options: r || {},
       payload: n,
@@ -2166,7 +2176,7 @@ class A {
    * @param startedAt 開始時刻
    */
   static fetchEnd(t, e, r, n) {
-    A.dispatch(t, "fetchend", {
+    E.dispatch(t, "fetchend", {
       url: e,
       status: r,
       durationMs: performance.now() - n
@@ -2181,12 +2191,12 @@ class A {
    * @param status HTTPステータス（存在する場合）
    * @param startedAt 開始時刻（存在する場合）
    */
-  static fetchError(t, e, r, n, s) {
-    A.dispatch(t, "fetcherror", {
+  static fetchError(t, e, r, n, i) {
+    E.dispatch(t, "fetcherror", {
       url: e,
       status: n,
       error: r,
-      durationMs: s ? performance.now() - s : void 0
+      durationMs: i ? performance.now() - i : void 0
     });
   }
 }
@@ -2204,7 +2214,7 @@ function K() {
     (r) => typeof t?.[r] == "function"
   ) ? t : W;
 }
-const c = class c {
+const u = class u {
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -2213,7 +2223,7 @@ const c = class c {
    * 非イベント変種が "data-fetch-xxx" として存在するものについては、event が null の場合にそちらを返します。
    */
   static attrName(t, e, r = !1) {
-    return t ? `${h.prefix}${t}-${e}` : r ? `${h.prefix}fetch-${e}` : `${h.prefix}${e}`;
+    return t ? `${f.prefix}${t}-${e}` : r ? `${f.prefix}fetch-${e}` : `${f.prefix}${e}`;
   }
   /**
    * data 属性のテンプレート式評価結果を URLSearchParams 向けに組み立てます。
@@ -2224,13 +2234,13 @@ const c = class c {
    */
   static resolveDataParamString(t, e) {
     return t.replace(
-      c.DATA_PLACEHOLDER_REGEX,
-      (r, n, s) => {
-        const i = H.evaluate(
-          n ?? s ?? "",
+      u.DATA_PLACEHOLDER_REGEX,
+      (r, n, i) => {
+        const s = $.evaluate(
+          n ?? i ?? "",
           e
         );
-        return i == null || Number.isNaN(i) ? "" : encodeURIComponent(typeof i == "object" ? JSON.stringify(i) : String(i));
+        return s == null || Number.isNaN(s) ? "" : encodeURIComponent(typeof s == "object" ? JSON.stringify(s) : String(s));
       }
     );
   }
@@ -2243,17 +2253,17 @@ const c = class c {
    */
   static isJsonStringContext(t, e) {
     let r = !1, n = !1;
-    for (let s = 0; s < e; s += 1) {
-      const i = t[s];
+    for (let i = 0; i < e; i += 1) {
+      const s = t[i];
       if (n) {
         n = !1;
         continue;
       }
-      if (i === "\\") {
+      if (s === "\\") {
         n = !0;
         continue;
       }
-      i === '"' && (r = !r);
+      s === '"' && (r = !r);
     }
     return r;
   }
@@ -2281,7 +2291,7 @@ const c = class c {
   static stringifyJsonTemplateStringContent(t) {
     if (t == null || Number.isNaN(t))
       return "";
-    const e = typeof t == "object" ? c.stringifyJsonTemplateValue(t) : String(t);
+    const e = typeof t == "object" ? u.stringifyJsonTemplateValue(t) : String(t);
     return JSON.stringify(e).slice(1, -1);
   }
   /**
@@ -2293,13 +2303,13 @@ const c = class c {
    */
   static resolveDataJsonString(t, e) {
     return t.replace(
-      c.DATA_PLACEHOLDER_REGEX,
-      (r, n, s, i) => {
-        const a = H.evaluate(
-          n ?? s ?? "",
+      u.DATA_PLACEHOLDER_REGEX,
+      (r, n, i, s) => {
+        const a = $.evaluate(
+          n ?? i ?? "",
           e
         );
-        return c.isJsonStringContext(t, i) ? c.stringifyJsonTemplateStringContent(a) : c.stringifyJsonTemplateValue(a);
+        return u.isJsonStringContext(t, s) ? u.stringifyJsonTemplateStringContent(a) : u.stringifyJsonTemplateValue(a);
       }
     );
   }
@@ -2316,14 +2326,14 @@ const c = class c {
       return n;
     if (typeof n != "string" || r === null)
       return null;
-    const s = r.trim();
-    return c.SINGLE_PLACEHOLDER_REGEX.test(s) ? T.parseDataBind(n) : s.startsWith("{") || s.startsWith("[") ? T.parseDataBind(
-      c.resolveDataJsonString(
+    const i = r.trim();
+    return u.SINGLE_PLACEHOLDER_REGEX.test(i) ? T.parseDataBind(n) : i.startsWith("{") || i.startsWith("[") ? T.parseDataBind(
+      u.resolveDataJsonString(
         r,
         t.getBindingData()
       )
     ) : T.parseDataBind(
-      c.resolveDataParamString(r, t.getBindingData())
+      u.resolveDataParamString(r, t.getBindingData())
     );
   }
   /**
@@ -2338,29 +2348,29 @@ const c = class c {
       targetFragment: t
     };
     if (e) {
-      if (t.hasAttribute(c.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(c.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
-        c.attrName(e, "confirm")
-      )), t.hasAttribute(c.attrName(e, "data")) && (r.data = c.resolveDataAttribute(
+      if (t.hasAttribute(u.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(u.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
+        u.attrName(e, "confirm")
+      )), t.hasAttribute(u.attrName(e, "data")) && (r.data = u.resolveDataAttribute(
         t,
-        c.attrName(e, "data")
-      )), t.hasAttribute(c.attrName(e, "form"))) {
+        u.attrName(e, "data")
+      )), t.hasAttribute(u.attrName(e, "form"))) {
         const l = t.getRawAttribute(
-          c.attrName(e, "form")
+          u.attrName(e, "form")
         );
         if (l) {
           const d = document.body.querySelector(l);
-          d !== null ? r.formFragment = E.getFormFragment(
-            y.get(d)
-          ) : f.error(
+          d !== null ? r.formFragment = b.getFormFragment(
+            A.get(d)
+          ) : h.error(
             "Haori",
-            `Form element not found: ${l} (${c.attrName(e, "form")})`
+            `Form element not found: ${l} (${u.attrName(e, "form")})`
           );
         } else
-          r.formFragment = E.getFormFragment(t);
-      } else e === "change" && (r.formFragment = E.getFormFragment(t));
-      if (t.hasAttribute(`${h.prefix}${e}-before-run`)) {
+          r.formFragment = b.getFormFragment(t);
+      } else e === "change" && (r.formFragment = b.getFormFragment(t));
+      if (t.hasAttribute(`${f.prefix}${e}-before-run`)) {
         const l = t.getRawAttribute(
-          `${h.prefix}${e}-before-run`
+          `${f.prefix}${e}-before-run`
         );
         try {
           r.beforeCallback = new Function(
@@ -2372,38 +2382,38 @@ ${l}
 `
           );
         } catch (d) {
-          f.error("Haori", `Invalid before script: ${d}`);
+          h.error("Haori", `Invalid before script: ${d}`);
         }
       }
     }
-    const n = c.attrName(e, "fetch"), s = t.hasAttribute(n);
-    s && (r.fetchUrl = t.getAttribute(n));
-    const i = {};
+    const n = u.attrName(e, "fetch"), i = t.hasAttribute(n);
+    i && (r.fetchUrl = t.getAttribute(n));
+    const s = {};
     if (e) {
-      const l = c.attrName(e, "fetch-method");
-      t.hasAttribute(l) && (i.method = t.getAttribute(
+      const l = u.attrName(e, "fetch-method");
+      t.hasAttribute(l) && (s.method = t.getAttribute(
         l
       ));
     } else {
-      const l = c.attrName(null, "method", !0);
-      t.hasAttribute(l) && (i.method = t.getAttribute(
+      const l = u.attrName(null, "method", !0);
+      t.hasAttribute(l) && (s.method = t.getAttribute(
         l
       ));
     }
     if (e) {
-      const l = c.attrName(e, "fetch-headers");
+      const l = u.attrName(e, "fetch-headers");
       if (t.hasAttribute(l)) {
         const d = t.getRawAttribute(
           l
         );
         try {
-          i.headers = T.parseDataBind(d);
-        } catch (p) {
-          f.error("Haori", `Invalid fetch headers: ${p}`);
+          s.headers = T.parseDataBind(d);
+        } catch (g) {
+          h.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     } else {
-      const l = c.attrName(
+      const l = u.attrName(
         null,
         "headers",
         !0
@@ -2413,111 +2423,111 @@ ${l}
           l
         );
         try {
-          i.headers = T.parseDataBind(d);
-        } catch (p) {
-          f.error("Haori", `Invalid fetch headers: ${p}`);
+          s.headers = T.parseDataBind(d);
+        } catch (g) {
+          h.error("Haori", `Invalid fetch headers: ${g}`);
         }
       }
     }
     if (e) {
-      const l = c.attrName(
+      const l = u.attrName(
         e,
         "fetch-content-type"
       );
       if (t.hasAttribute(l))
-        i.headers = {
-          ...i.headers,
+        s.headers = {
+          ...s.headers,
           "Content-Type": t.getAttribute(l)
         };
-      else if (i.method && i.method !== "GET" && i.method !== "HEAD" && i.method !== "OPTIONS") {
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let d = !1;
-        i.headers && typeof i.headers == "object" && (d = "Content-Type" in i.headers), d || (i.headers = {
-          ...i.headers,
+        s.headers && typeof s.headers == "object" && (d = "Content-Type" in s.headers), d || (s.headers = {
+          ...s.headers,
           "Content-Type": "application/json"
         });
-      } else i.method && (i.method === "GET" || i.method === "HEAD" || i.method === "OPTIONS") && (i.headers = {
-        ...i.headers,
+      } else s.method && (s.method === "GET" || s.method === "HEAD" || s.method === "OPTIONS") && (s.headers = {
+        ...s.headers,
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const l = c.attrName(
+      const l = u.attrName(
         null,
         "content-type",
         !0
       );
       if (t.hasAttribute(l))
-        i.headers = {
-          ...i.headers,
+        s.headers = {
+          ...s.headers,
           "Content-Type": t.getAttribute(l)
         };
-      else if (i.method && i.method !== "GET" && i.method !== "HEAD" && i.method !== "OPTIONS") {
+      else if (s.method && s.method !== "GET" && s.method !== "HEAD" && s.method !== "OPTIONS") {
         let d = !1;
-        i.headers && typeof i.headers == "object" && (d = "Content-Type" in i.headers), d || (i.headers = {
-          ...i.headers,
+        s.headers && typeof s.headers == "object" && (d = "Content-Type" in s.headers), d || (s.headers = {
+          ...s.headers,
           "Content-Type": "application/json"
         });
-      } else i.method && (i.method === "GET" || i.method === "HEAD" || i.method === "OPTIONS") && (i.headers = {
-        ...i.headers,
+      } else s.method && (s.method === "GET" || s.method === "HEAD" || s.method === "OPTIONS") && (s.headers = {
+        ...s.headers,
         "Content-Type": "application/x-www-form-urlencoded"
       });
     }
-    Object.keys(i).length > 0 && (r.fetchOptions = i);
-    const a = e ? c.attrName(e, "bind") : c.attrName(null, "bind", !0);
+    Object.keys(s).length > 0 && (r.fetchOptions = s);
+    const a = e ? u.attrName(e, "bind") : u.attrName(null, "bind", !0);
     if (t.hasAttribute(a)) {
       const l = t.getRawAttribute(a);
       if (l) {
         const d = document.body.querySelectorAll(l);
-        d.length > 0 ? (r.bindFragments = [], d.forEach((p) => {
-          const v = y.get(p);
+        d.length > 0 ? (r.bindFragments = [], d.forEach((g) => {
+          const v = A.get(g);
           v && r.bindFragments.push(v);
-        })) : f.error(
+        })) : h.error(
           "Haori",
           `Bind element not found: ${l} (${a})`
         );
       }
     }
-    const o = c.attrName(e, "bind-arg"), g = c.attrName(
+    const o = u.attrName(e, "bind-arg"), p = u.attrName(
       null,
       "arg",
       !0
-    ), u = c.attrName(
+    ), c = u.attrName(
       null,
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(g) ? r.bindArg = t.getRawAttribute(
-      g
-    ) : t.hasAttribute(u) && (r.bindArg = t.getRawAttribute(u));
-    const b = e ? c.attrName(e, "bind-params") : c.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(b)) {
-      const l = t.getRawAttribute(b);
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(p) ? r.bindArg = t.getRawAttribute(
+      p
+    ) : t.hasAttribute(c) && (r.bindArg = t.getRawAttribute(c));
+    const y = e ? u.attrName(e, "bind-params") : u.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(y)) {
+      const l = t.getRawAttribute(y);
       r.bindParams = l.split("&").map((d) => d.trim());
     }
     if (e) {
-      if (t.hasAttribute(c.attrName(e, "adjust"))) {
+      if (t.hasAttribute(u.attrName(e, "adjust"))) {
         const d = t.getRawAttribute(
-          c.attrName(e, "adjust")
+          u.attrName(e, "adjust")
         );
         if (d) {
-          const p = document.body.querySelectorAll(d);
-          p.length > 0 ? (r.adjustFragments = [], p.forEach((v) => {
-            const w = y.get(v);
+          const g = document.body.querySelectorAll(d);
+          g.length > 0 ? (r.adjustFragments = [], g.forEach((v) => {
+            const w = A.get(v);
             w && r.adjustFragments.push(w);
-          })) : f.error(
+          })) : h.error(
             "Haori",
-            `Adjust element not found: ${d} (${c.attrName(e, "adjust")})`
+            `Adjust element not found: ${d} (${u.attrName(e, "adjust")})`
           );
         }
-        if (t.hasAttribute(c.attrName(e, "adjust-value"))) {
-          const p = t.getRawAttribute(
-            c.attrName(e, "adjust-value")
-          ), v = Number(p);
+        if (t.hasAttribute(u.attrName(e, "adjust-value"))) {
+          const g = t.getRawAttribute(
+            u.attrName(e, "adjust-value")
+          ), v = Number(g);
           isNaN(v) || (r.adjustValue = v);
         }
       }
-      if (t.hasAttribute(c.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(c.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(c.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(c.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${h.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(`${f.prefix}${e}-after-run`)) {
         const d = t.getRawAttribute(
-          `${h.prefix}${e}-after-run`
+          `${f.prefix}${e}-after-run`
         );
         try {
           r.afterCallback = new Function(
@@ -2527,31 +2537,51 @@ ${l}
 ${d}
 `
           );
-        } catch (p) {
-          f.error("Haori", `Invalid after script: ${p}`);
+        } catch (g) {
+          h.error("Haori", `Invalid after script: ${g}`);
         }
       }
-      t.hasAttribute(c.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
-        c.attrName(e, "dialog")
-      )), t.hasAttribute(c.attrName(e, "toast")) && (r.toastMessage = t.getAttribute(
-        c.attrName(e, "toast")
-      )), t.hasAttribute(c.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
-        c.attrName(e, "redirect")
-      )), [
+      if (t.hasAttribute(u.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
+        u.attrName(e, "dialog")
+      )), t.hasAttribute(u.attrName(e, "toast")) && (r.toastMessage = t.getAttribute(
+        u.attrName(e, "toast")
+      )), t.hasAttribute(u.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
+        u.attrName(e, "redirect")
+      )), t.hasAttribute(u.attrName(e, "history")) && (r.historyUrl = t.getAttribute(
+        u.attrName(e, "history")
+      )), t.hasAttribute(u.attrName(e, "history-data")) && (r.historyData = u.resolveDataAttribute(
+        t,
+        u.attrName(e, "history-data")
+      )), t.hasAttribute(u.attrName(e, "history-form"))) {
+        const d = t.getRawAttribute(
+          u.attrName(e, "history-form")
+        );
+        if (d) {
+          const g = document.body.querySelector(d);
+          g !== null ? r.historyFormFragment = b.getFormFragment(
+            A.get(g)
+          ) : h.error(
+            "Haori",
+            `Form element not found: ${d} (${u.attrName(e, "history-form")})`
+          );
+        } else
+          r.historyFormFragment = b.getFormFragment(t);
+      }
+      [
         "reset",
         "refetch",
         "click",
         "open",
         "close"
       ].forEach((d) => {
-        const p = c.attrName(e, d);
-        if (!t.hasAttribute(p))
+        const g = u.attrName(e, d);
+        if (!t.hasAttribute(g))
           return;
-        const v = t.getRawAttribute(p), w = [];
+        const v = t.getRawAttribute(g), w = [];
         if (v ? (document.body.querySelectorAll(v).forEach((F) => {
-          const x = y.get(F);
+          const x = A.get(F);
           x && w.push(x);
-        }), w.length === 0 && f.error("Haori", `Element not found: ${v} (${p})`)) : w.push(t), w.length > 0)
+        }), w.length === 0 && h.error("Haori", `Element not found: ${v} (${g})`)) : w.push(t), w.length > 0)
           switch (d) {
             case "reset":
               r.resetFragments = w;
@@ -2571,25 +2601,25 @@ ${d}
           }
       });
     }
-    if (!e && (t.hasAttribute(c.attrName(null, "data", !0)) && (r.data = c.resolveDataAttribute(
+    if (!e && (t.hasAttribute(u.attrName(null, "data", !0)) && (r.data = u.resolveDataAttribute(
       t,
-      c.attrName(null, "data", !0)
-    )), t.hasAttribute(c.attrName(null, "form", !0)))) {
+      u.attrName(null, "data", !0)
+    )), t.hasAttribute(u.attrName(null, "form", !0)))) {
       const l = t.getRawAttribute(
-        c.attrName(null, "form", !0)
+        u.attrName(null, "form", !0)
       );
       if (l) {
         const d = document.body.querySelector(l);
-        d !== null ? r.formFragment = E.getFormFragment(
-          y.get(d)
-        ) : f.error(
+        d !== null ? r.formFragment = b.getFormFragment(
+          A.get(d)
+        ) : h.error(
           "Haori",
-          `Form element not found: ${l} (${c.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${l} (${u.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = E.getFormFragment(t);
+        r.formFragment = b.getFormFragment(t);
     }
-    return s && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
+    return i && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
   }
   /**
    * ElementFragment の構造的タイプガード。
@@ -2610,7 +2640,7 @@ ${d}
    * @param arg2 イベント名
    */
   constructor(t, e = null) {
-    c.isElementFragment(t) ? this.options = c.buildOptions(t, e) : this.options = t;
+    u.isElementFragment(t) ? this.options = u.buildOptions(t, e) : this.options = t;
   }
   /**
    * 一連の処理を実行します。オプションが空の場合は即座にresolveされます。
@@ -2623,82 +2653,82 @@ ${d}
         return Promise.resolve();
       let e = this.options.fetchUrl, r = this.options.fetchOptions;
       if (this.options.beforeCallback) {
-        const i = this.options.beforeCallback(
+        const s = this.options.beforeCallback(
           e || null,
           r || null
         );
-        if (i != null) {
-          if (i === !1 || typeof i == "object" && i.stop)
+        if (s != null) {
+          if (s === !1 || typeof s == "object" && s.stop)
             return Promise.resolve();
-          typeof i == "object" && (e = "fetchUrl" in i ? i.fetchUrl : e, r = "fetchOptions" in i ? i.fetchOptions : r);
+          typeof s == "object" && (e = "fetchUrl" in s ? s.fetchUrl : e, r = "fetchOptions" in s ? s.fetchOptions : r);
         }
       }
       const n = {};
       if (this.options.formFragment) {
-        const i = E.getValues(this.options.formFragment);
-        Object.assign(n, i);
+        const s = b.getValues(this.options.formFragment);
+        Object.assign(n, s);
       }
       this.options.data && typeof this.options.data == "object" && Object.assign(n, this.options.data);
-      const s = Object.keys(n).length > 0;
+      const i = Object.keys(n).length > 0;
       if (e) {
-        const i = { ...r || {} }, a = new Headers(
-          i.headers || void 0
-        ), o = (i.method || "GET").toUpperCase();
+        const s = { ...r || {} }, a = new Headers(
+          s.headers || void 0
+        ), o = (s.method || "GET").toUpperCase();
         if (o === "GET" || o === "HEAD" || o === "OPTIONS") {
-          if (s) {
-            const g = new URL(e, window.location.href), u = new URLSearchParams(g.search);
-            for (const [b, l] of Object.entries(n))
-              l !== void 0 && (l === null ? u.append(b, "") : Array.isArray(l) ? l.forEach((d) => {
-                u.append(b, String(d));
-              }) : typeof l == "object" || typeof l == "function" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l)));
-            g.search = u.toString(), e = g.toString();
+          if (i) {
+            const p = new URL(e, window.location.href), c = new URLSearchParams(p.search);
+            for (const [y, l] of Object.entries(n))
+              l !== void 0 && (l === null ? c.append(y, "") : Array.isArray(l) ? l.forEach((d) => {
+                c.append(y, String(d));
+              }) : typeof l == "object" || typeof l == "function" ? c.append(y, JSON.stringify(l)) : c.append(y, String(l)));
+            p.search = c.toString(), e = p.toString();
           }
-        } else if (s) {
-          const g = a.get("Content-Type") || "";
-          if (/multipart\/form-data/i.test(g)) {
+        } else if (i) {
+          const p = a.get("Content-Type") || "";
+          if (/multipart\/form-data/i.test(p)) {
             a.delete("Content-Type");
-            const u = new FormData();
-            for (const [b, l] of Object.entries(n))
-              l == null ? u.append(b, "") : l instanceof Blob ? u.append(b, l) : Array.isArray(l) ? l.forEach((d) => u.append(b, String(d))) : typeof l == "object" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l));
-            i.body = u;
-          } else if (/application\/x-www-form-urlencoded/i.test(g)) {
-            const u = new URLSearchParams();
-            for (const [b, l] of Object.entries(n))
-              l !== void 0 && (l === null ? u.append(b, "") : Array.isArray(l) ? l.forEach((d) => u.append(b, String(d))) : typeof l == "object" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l)));
-            i.body = u;
+            const c = new FormData();
+            for (const [y, l] of Object.entries(n))
+              l == null ? c.append(y, "") : l instanceof Blob ? c.append(y, l) : Array.isArray(l) ? l.forEach((d) => c.append(y, String(d))) : typeof l == "object" ? c.append(y, JSON.stringify(l)) : c.append(y, String(l));
+            s.body = c;
+          } else if (/application\/x-www-form-urlencoded/i.test(p)) {
+            const c = new URLSearchParams();
+            for (const [y, l] of Object.entries(n))
+              l !== void 0 && (l === null ? c.append(y, "") : Array.isArray(l) ? l.forEach((d) => c.append(y, String(d))) : typeof l == "object" ? c.append(y, JSON.stringify(l)) : c.append(y, String(l)));
+            s.body = c;
           } else
-            a.set("Content-Type", "application/json"), i.body = JSON.stringify(n);
+            a.set("Content-Type", "application/json"), s.body = JSON.stringify(n);
         }
-        if (i.headers = a, this.options.targetFragment && e) {
-          const g = performance.now();
-          return A.fetchStart(
+        if (s.headers = a, this.options.targetFragment && e) {
+          const p = performance.now();
+          return E.fetchStart(
             this.options.targetFragment.getTarget(),
             e,
-            i,
-            s ? n : void 0
-          ), fetch(e, i).then((u) => this.handleFetchResult(
-            u,
+            s,
+            i ? n : void 0
+          ), fetch(e, s).then((c) => this.handleFetchResult(
+            c,
             e || void 0,
-            g
-          )).catch((u) => {
-            throw e && A.fetchError(
+            p
+          )).catch((c) => {
+            throw e && E.fetchError(
               this.options.targetFragment.getTarget(),
               e,
-              u
-            ), u;
+              c
+            ), c;
           });
-        } else return e ? fetch(e, i).then((g) => this.handleFetchResult(g, e || void 0)) : Promise.resolve();
+        } else return e ? fetch(e, s).then((p) => this.handleFetchResult(p, e || void 0)) : Promise.resolve();
       } else {
-        if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && s) {
-          const o = this.options.formFragment, g = o.getTarget();
-          g.setAttribute(
-            `${h.prefix}bind`,
+        if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && i) {
+          const o = this.options.formFragment, p = o.getTarget();
+          p.setAttribute(
+            `${f.prefix}bind`,
             JSON.stringify(n)
           );
-          const u = o.getBindingData();
-          return Object.assign(u, n), T.setBindingData(g, u);
+          const c = o.getBindingData();
+          return Object.assign(c, n), T.setBindingData(p, c);
         }
-        const i = s ? n : {}, a = new Response(JSON.stringify(i), {
+        const s = i ? n : {}, a = new Response(JSON.stringify(s), {
           headers: { "Content-Type": "application/json" }
         });
         return this.handleFetchResult(a);
@@ -2711,82 +2741,115 @@ ${d}
   handleFetchResult(t, e, r) {
     const n = K();
     if (!t.ok)
-      return this.options.targetFragment && e && A.fetchError(
+      return this.options.targetFragment && e && E.fetchError(
         this.options.targetFragment.getTarget(),
         e,
         new Error(`${t.status} ${t.statusText}`),
         t.status,
         r
       ), this.handleFetchError(t);
-    if (this.options.targetFragment && e && r && A.fetchEnd(
+    if (this.options.targetFragment && e && r && E.fetchEnd(
       this.options.targetFragment.getTarget(),
       e,
       t.status,
       r
     ), this.options.afterCallback) {
-      const i = this.options.afterCallback(t);
-      if (i != null) {
-        if (i === !1 || typeof i == "object" && i.stop)
+      const s = this.options.afterCallback(t);
+      if (s != null) {
+        if (s === !1 || typeof s == "object" && s.stop)
           return Promise.resolve();
-        typeof i == "object" && "response" in i && (t = "response" in i ? i.response : t);
+        typeof s == "object" && "response" in s && (t = "response" in s ? s.response : t);
       }
     }
-    const s = [];
-    return s.push(this.bindResult(t)), s.push(this.adjust()), s.push(this.addRow()), s.push(this.removeRow()), s.push(this.movePrevRow()), s.push(this.moveNextRow()), this.options.resetFragments && this.options.resetFragments.length > 0 && this.options.resetFragments.forEach((i) => {
-      s.push(E.reset(i));
-    }), this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((i) => {
-      s.push(new c(i, null).run());
-    }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((i) => {
-      const a = i.getTarget();
+    const i = [];
+    return i.push(this.bindResult(t)), i.push(this.adjust()), i.push(this.addRow()), i.push(this.removeRow()), i.push(this.movePrevRow()), i.push(this.moveNextRow()), this.options.resetFragments && this.options.resetFragments.length > 0 && this.options.resetFragments.forEach((s) => {
+      i.push(b.reset(s));
+    }), this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((s) => {
+      i.push(new u(s, null).run());
+    }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((s) => {
+      const a = s.getTarget();
       typeof a.click == "function" ? a.click() : a.dispatchEvent(
         new MouseEvent("click", { bubbles: !0, cancelable: !0 })
       );
-    }), this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((i) => {
-      const a = i.getTarget();
-      a instanceof HTMLElement ? s.push(n.openDialog(a)) : f.error("Haori", "Element is not an HTML element: ", a);
-    }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((i) => {
-      const a = i.getTarget();
-      a instanceof HTMLElement ? s.push(n.closeDialog(a)) : f.error("Haori", "Element is not an HTML element: ", a);
-    }), Promise.all(s).then(() => this.options.dialogMessage ? n.dialog(this.options.dialogMessage) : Promise.resolve()).then(() => this.options.toastMessage ? n.toast(this.options.toastMessage, "info") : Promise.resolve()).then(() => (this.options.redirectUrl && (window.location.href = this.options.redirectUrl), Promise.resolve()));
+    }), this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((s) => {
+      const a = s.getTarget();
+      a instanceof HTMLElement ? i.push(n.openDialog(a)) : h.error("Haori", "Element is not an HTML element: ", a);
+    }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((s) => {
+      const a = s.getTarget();
+      a instanceof HTMLElement ? i.push(n.closeDialog(a)) : h.error("Haori", "Element is not an HTML element: ", a);
+    }), Promise.all(i).then(() => this.options.dialogMessage ? n.dialog(this.options.dialogMessage) : Promise.resolve()).then(() => this.options.toastMessage ? n.toast(this.options.toastMessage, "info") : Promise.resolve()).then(() => (this.pushHistory(), Promise.resolve())).then(() => (this.options.redirectUrl && (window.location.href = this.options.redirectUrl), Promise.resolve()));
+  }
+  /**
+   * history.pushState を実行します。
+   *
+   * `historyUrl` / `historyData` / `historyFormFragment` の内容を基に URL を組み立て、
+   * `history.pushState()` を呼び出します。いずれも未指定の場合は何もしません。
+   * 不正 URL・オリジン違反・例外は `Log.error` でログ出力してスキップし、後続処理は継続します。
+   */
+  pushHistory() {
+    const t = this.options.historyUrl !== void 0 && this.options.historyUrl !== null, e = this.options.historyData !== void 0 && this.options.historyData !== null, r = this.options.historyFormFragment !== void 0 && this.options.historyFormFragment !== null;
+    if (!(!t && !e && !r))
+      try {
+        const n = t ? this.options.historyUrl : window.location.pathname, i = new URL(n, window.location.href);
+        if (i.origin !== window.location.origin) {
+          const a = "history.pushState: cross-origin URL is not allowed: " + i.toString();
+          h.error(
+            "Haori",
+            a
+          );
+          return;
+        }
+        const s = (a) => {
+          for (const [o, p] of Object.entries(a))
+            p != null && (Array.isArray(p) ? p.forEach((c) => i.searchParams.append(o, String(c))) : typeof p == "object" ? i.searchParams.set(o, JSON.stringify(p)) : i.searchParams.set(o, String(p)));
+        };
+        e && s(this.options.historyData), r && s(
+          b.getValues(
+            this.options.historyFormFragment
+          )
+        ), history.pushState({}, "", i.toString());
+      } catch (n) {
+        h.error("Haori", `history.pushState failed: ${n}`);
+      }
   }
   /**
    * フェッチエラー応答のメッセージを適切な要素へ伝播します。
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = E.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
-    const r = async (s) => {
-      const i = e ? e.getTarget() : document.body;
-      await K().addErrorMessage(i, s);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = b.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    const r = async (i) => {
+      const s = e ? e.getTarget() : document.body;
+      await K().addErrorMessage(s, i);
     };
     if ((t.headers.get("Content-Type") || "").includes("application/json"))
       try {
-        const s = await t.json(), i = [];
-        if (s && typeof s == "object") {
-          if (typeof s.message == "string" && i.push({ message: s.message }), Array.isArray(s.messages))
-            for (const a of s.messages)
-              typeof a == "string" && i.push({ message: a });
-          if (s.errors && typeof s.errors == "object")
-            for (const [a, o] of Object.entries(s.errors))
-              Array.isArray(o) ? i.push({ key: a, message: o.join(`
-`) }) : typeof o == "string" ? i.push({ key: a, message: o }) : o != null && i.push({ key: a, message: String(o) });
-          if (i.length === 0)
-            for (const [a, o] of Object.entries(s))
-              a === "message" || a === "messages" || a === "errors" || (Array.isArray(o) ? i.push({ key: a, message: o.join(`
-`) }) : typeof o == "string" && i.push({ key: a, message: o }));
+        const i = await t.json(), s = [];
+        if (i && typeof i == "object") {
+          if (typeof i.message == "string" && s.push({ message: i.message }), Array.isArray(i.messages))
+            for (const a of i.messages)
+              typeof a == "string" && s.push({ message: a });
+          if (i.errors && typeof i.errors == "object")
+            for (const [a, o] of Object.entries(i.errors))
+              Array.isArray(o) ? s.push({ key: a, message: o.join(`
+`) }) : typeof o == "string" ? s.push({ key: a, message: o }) : o != null && s.push({ key: a, message: String(o) });
+          if (s.length === 0)
+            for (const [a, o] of Object.entries(i))
+              a === "message" || a === "messages" || a === "errors" || (Array.isArray(o) ? s.push({ key: a, message: o.join(`
+`) }) : typeof o == "string" && s.push({ key: a, message: o }));
         }
-        if (i.length === 0) {
+        if (s.length === 0) {
           await r(`${t.status} ${t.statusText}`);
           return;
         }
-        for (const a of i)
-          a.key && e ? await E.addErrorMessage(e, a.key, a.message) : await r(a.message);
+        for (const a of s)
+          a.key && e ? await b.addErrorMessage(e, a.key, a.message) : await r(a.message);
         return;
       } catch {
       }
     try {
-      const s = await t.text();
-      s && s.trim().length > 0 ? await r(s.trim()) : await r(`${t.status} ${t.statusText}`);
+      const i = await t.text();
+      i && i.trim().length > 0 ? await r(i.trim()) : await r(`${t.status} ${t.statusText}`);
     } catch {
       await r(`${t.status} ${t.statusText}`);
     }
@@ -2835,26 +2898,26 @@ ${d}
   bindResult(t) {
     return !this.options.bindFragments || this.options.bindFragments.length === 0 ? Promise.resolve() : (t.headers.get("Content-Type")?.includes("application/json") ? t.json() : t.text()).then((r) => {
       if (this.options.bindParams) {
-        const s = {};
-        this.options.bindParams.forEach((i) => {
-          r && typeof r == "object" && i in r && (s[i] = r[i]);
-        }), r = s;
+        const i = {};
+        this.options.bindParams.forEach((s) => {
+          r && typeof r == "object" && s in r && (i[s] = r[s]);
+        }), r = i;
       }
       const n = [];
       if (this.options.bindArg)
-        this.options.bindFragments.forEach((s) => {
-          const i = s.getBindingData();
-          i[this.options.bindArg] = r, n.push(T.setBindingData(s.getTarget(), i));
+        this.options.bindFragments.forEach((i) => {
+          const s = i.getBindingData();
+          s[this.options.bindArg] = r, n.push(T.setBindingData(i.getTarget(), s));
         });
       else {
         if (typeof r == "string")
-          return f.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
+          return h.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) => {
+        this.options.bindFragments.forEach((i) => {
           n.push(
             T.setBindingData(
-              s.getTarget(),
+              i.getTarget(),
               r
             )
           );
@@ -2874,8 +2937,8 @@ ${d}
     for (const r of this.options.adjustFragments) {
       let n = r.getValue();
       (n == null || n === "") && (n = "0");
-      let s = Number(n);
-      isNaN(s) && (s = 0), s += t, e.push(r.setValue(String(s)));
+      let i = Number(n);
+      isNaN(i) && (i = 0), i += t, e.push(r.setValue(String(i)));
     }
     return Promise.all(e).then(() => {
     });
@@ -2887,11 +2950,11 @@ ${d}
    */
   getRowFragment() {
     if (!this.options.targetFragment)
-      return f.error("Haori", "Target fragment is not specified for row operation."), null;
+      return h.error("Haori", "Target fragment is not specified for row operation."), null;
     const t = this.options.targetFragment.closestByAttribute(
-      `${h.prefix}row`
+      `${f.prefix}row`
     );
-    return t || (f.error("Haori", "Row fragment not found."), null);
+    return t || (h.error("Haori", "Row fragment not found."), null);
   }
   /**
    * 行を追加します。
@@ -2907,7 +2970,7 @@ ${d}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(T.evaluateAll(r)), e.push(E.reset(r)), Promise.all(e).then(() => {
+    ), e.push(T.evaluateAll(r)), e.push(b.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -2922,7 +2985,7 @@ ${d}
     if (!t)
       return Promise.reject(new Error("Row fragment not found."));
     const e = t.getParent();
-    return e && e.getChildElementFragments().filter((n) => !n.hasAttribute(`${h.prefix}each-before`) && !n.hasAttribute(`${h.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
+    return e && e.getChildElementFragments().filter((n) => !n.hasAttribute(`${f.prefix}each-before`) && !n.hasAttribute(`${f.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
   }
   /**
    * 前の行へ移動します。
@@ -2959,8 +3022,8 @@ ${d}
     return r ? r.insertAfter(t, e) : Promise.resolve();
   }
 };
-c.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, c.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
-let L = c;
+u.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, u.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
+let L = u;
 class _ {
   /**
    * URLのクエリパラメータを取得します。
@@ -2969,8 +3032,8 @@ class _ {
    */
   static readParams() {
     const t = {}, e = window.location.search;
-    return new URLSearchParams(e).forEach((n, s) => {
-      t[s] = n;
+    return new URLSearchParams(e).forEach((n, i) => {
+      t[i] = n;
     }), t;
   }
 }
@@ -2991,24 +3054,24 @@ class tt {
     let r;
     try {
       r = await fetch(t, e);
-    } catch (s) {
-      throw f.error("[Haori]", "Failed to fetch import source:", t, s), new Error(`Failed to fetch: ${t}`);
+    } catch (i) {
+      throw h.error("[Haori]", "Failed to fetch import source:", t, i), new Error(`Failed to fetch: ${t}`);
     }
     if (!r.ok) {
-      const s = `${r.status} ${r.statusText}`;
-      throw f.error("[Haori]", "Import HTTP error:", t, s), new Error(`Failed to load ${t}: ${s}`);
+      const i = `${r.status} ${r.statusText}`;
+      throw h.error("[Haori]", "Import HTTP error:", t, i), new Error(`Failed to load ${t}: ${i}`);
     }
     let n;
     try {
       n = await r.text();
-    } catch (s) {
-      throw f.error("[Haori]", "Failed to read response text:", t, s), new Error(`Failed to read response from: ${t}`);
+    } catch (i) {
+      throw h.error("[Haori]", "Failed to read response text:", t, i), new Error(`Failed to read response from: ${t}`);
     }
     try {
-      const i = new DOMParser().parseFromString(n, "text/html");
-      return i && i.body ? i.body.innerHTML : (f.warn("[Haori]", "No body found in imported document:", t), n);
-    } catch (s) {
-      return f.error("[Haori]", "Failed to parse imported HTML:", t, s), n;
+      const s = new DOMParser().parseFromString(n, "text/html");
+      return s && s.body ? s.body.innerHTML : (h.warn("[Haori]", "No body found in imported document:", t), n);
+    } catch (i) {
+      return h.error("[Haori]", "Failed to parse imported HTML:", t, i), n;
     }
   }
 }
@@ -3021,7 +3084,7 @@ const m = class m {
    */
   static isDeferredAttributeName(t) {
     return m.DEFERRED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${h.prefix}${e}`
+      (e) => t === `${f.prefix}${e}`
     );
   }
   /**
@@ -3032,7 +3095,7 @@ const m = class m {
    */
   static isEvaluateAllExcludedAttributeName(t) {
     return m.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
-      (e) => t === `${h.prefix}${e}`
+      (e) => t === `${f.prefix}${e}`
     );
   }
   /**
@@ -3068,39 +3131,39 @@ const m = class m {
    * @returns Promise (スキャンが完了したときに解決される)
    */
   static scan(t) {
-    const e = y.get(t);
+    const e = A.get(t);
     if (!e)
       return Promise.resolve();
-    t.parentNode && (y.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
+    t.parentNode && (A.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
     const r = [], n = /* @__PURE__ */ new Set();
-    for (const s of m.PRIORITY_ATTRIBUTE_SUFFIXES) {
-      const i = h.prefix + s;
-      e.hasAttribute(i) && (r.push(
+    for (const i of m.PRIORITY_ATTRIBUTE_SUFFIXES) {
+      const s = f.prefix + i;
+      e.hasAttribute(s) && (r.push(
         m.setAttribute(
           e.getTarget(),
-          i,
-          e.getRawAttribute(i)
+          s,
+          e.getRawAttribute(s)
         )
-      ), n.add(i));
+      ), n.add(s));
     }
-    for (const s of e.getAttributeNames()) {
-      if (n.has(s) || m.isDeferredAttributeName(s))
+    for (const i of e.getAttributeNames()) {
+      if (n.has(i) || m.isDeferredAttributeName(i))
         continue;
-      const i = e.getRawAttribute(s);
-      i !== null && r.push(m.setAttribute(e.getTarget(), s, i));
+      const s = e.getRawAttribute(i);
+      s !== null && r.push(m.setAttribute(e.getTarget(), i, s));
     }
-    for (const s of m.DEFERRED_ATTRIBUTE_SUFFIXES) {
-      const i = h.prefix + s;
-      e.hasAttribute(i) && (r.push(
+    for (const i of m.DEFERRED_ATTRIBUTE_SUFFIXES) {
+      const s = f.prefix + i;
+      e.hasAttribute(s) && (r.push(
         m.setAttribute(
           e.getTarget(),
-          i,
-          e.getRawAttribute(i)
+          s,
+          e.getRawAttribute(s)
         )
-      ), n.add(i));
+      ), n.add(s));
     }
-    return e.getChildren().forEach((s) => {
-      s instanceof P ? r.push(m.scan(s.getTarget())) : s instanceof B && r.push(m.evaluateText(s));
+    return e.getChildren().forEach((i) => {
+      i instanceof P ? r.push(m.scan(i.getTarget())) : i instanceof I && r.push(m.evaluateText(i));
     }), Promise.all(r).then(() => {
     });
   }
@@ -3114,51 +3177,51 @@ const m = class m {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r) {
-    const n = y.get(t), s = [];
+    const n = A.get(t), i = [];
     switch (e) {
-      case `${h.prefix}bind`: {
+      case `${f.prefix}bind`: {
         r === null ? (n.clearBindingDataCache(), n.setBindingData({})) : n.setBindingData(m.parseDataBind(r));
         break;
       }
-      case `${h.prefix}if`:
-        s.push(m.evaluateIf(n));
+      case `${f.prefix}if`:
+        i.push(m.evaluateIf(n));
         break;
-      case `${h.prefix}each`:
-        s.push(m.evaluateEach(n));
+      case `${f.prefix}each`:
+        i.push(m.evaluateEach(n));
         break;
-      case `${h.prefix}fetch`:
-        s.push(new L(n, null).run());
+      case `${f.prefix}fetch`:
+        i.push(new L(n, null).run());
         break;
-      case `${h.prefix}import`: {
+      case `${f.prefix}import`: {
         if (typeof r == "string") {
-          const i = n.getTarget(), a = performance.now();
-          A.importStart(i, r), s.push(
+          const s = n.getTarget(), a = performance.now();
+          E.importStart(s, r), i.push(
             tt.load(r).then((o) => {
-              const g = new TextEncoder().encode(o).length;
+              const p = new TextEncoder().encode(o).length;
               return N.enqueue(() => {
-                i.innerHTML = o;
+                s.innerHTML = o;
               }).then(() => {
-                A.importEnd(i, r, g, a);
+                E.importEnd(s, r, p, a);
               });
             }).catch((o) => {
-              A.importError(i, r, o), f.error("[Haori]", "Failed to import HTML:", r, o);
+              E.importError(s, r, o), h.error("[Haori]", "Failed to import HTML:", r, o);
             })
           );
         }
         break;
       }
-      case `${h.prefix}url-param`: {
-        const i = n.getAttribute(`${h.prefix}url-arg`), a = _.readParams();
-        if (i === null)
+      case `${f.prefix}url-param`: {
+        const s = n.getAttribute(`${f.prefix}url-arg`), a = _.readParams();
+        if (s === null)
           m.setBindingData(t, a);
         else {
           const o = n.getRawBindingData() || {};
-          o[String(i)] = a, m.setBindingData(t, o);
+          o[String(s)] = a, m.setBindingData(t, o);
         }
         break;
       }
     }
-    return r === null ? s.push(n.removeAttribute(e)) : s.push(n.setAttribute(e, r)), Promise.all(s).then(() => {
+    return r === null ? i.push(n.removeAttribute(e)) : i.push(n.setAttribute(e, r)), Promise.all(i).then(() => {
     });
   }
   /**
@@ -3170,12 +3233,12 @@ const m = class m {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setBindingData(t, e) {
-    const r = y.get(t), n = r.getRawBindingData();
+    const r = A.get(t), n = r.getRawBindingData();
     r.setBindingData(e);
-    const s = [];
-    return s.push(
-      r.setAttribute(`${h.prefix}bind`, JSON.stringify(e))
-    ), s.push(m.evaluateAll(r)), A.bindChange(t, n, e, "manual"), Promise.all(s).then(() => {
+    const i = [];
+    return i.push(
+      r.setAttribute(`${f.prefix}bind`, JSON.stringify(e))
+    ), i.push(m.evaluateAll(r)), E.bindChange(t, n, e, "manual"), Promise.all(i).then(() => {
     });
   }
   /**
@@ -3189,12 +3252,12 @@ const m = class m {
       try {
         return JSON.parse(t);
       } catch (e) {
-        return f.error("[Haori]", "Invalid JSON in data-bind:", e), {};
+        return h.error("[Haori]", "Invalid JSON in data-bind:", e), {};
       }
     else {
       const e = new URLSearchParams(t), r = {};
-      for (const [n, s] of e.entries())
-        r[n] !== void 0 ? Array.isArray(r[n]) ? r[n].push(s) : r[n] = [r[n], s] : r[n] = s;
+      for (const [n, i] of e.entries())
+        r[n] !== void 0 ? Array.isArray(r[n]) ? r[n].push(i) : r[n] = [r[n], i] : r[n] = i;
       return r;
     }
   }
@@ -3205,11 +3268,11 @@ const m = class m {
    * @param node 追加するノード
    */
   static addNode(t, e) {
-    const r = y.get(t);
+    const r = A.get(t);
     if (r.isSkipMutationNodes())
       return;
-    const n = y.get(e.nextSibling), s = y.get(e);
-    s && (r.insertBefore(s, n), s instanceof P ? m.scan(s.getTarget()) : s instanceof B && m.evaluateText(s));
+    const n = A.get(e.nextSibling), i = A.get(e);
+    i && (r.insertBefore(i, n), i instanceof P ? m.scan(i.getTarget()) : i instanceof I && m.evaluateText(i));
   }
   /**
    * ノードを親要素から削除します。
@@ -3217,7 +3280,7 @@ const m = class m {
    * @param node 削除するノード
    */
   static removeNode(t) {
-    const e = y.get(t);
+    const e = A.get(t);
     if (e) {
       const r = e.getParent();
       if (r && r.isSkipMutationNodes())
@@ -3232,7 +3295,7 @@ const m = class m {
    * @param text 新しいテキスト
    */
   static changeText(t, e) {
-    const r = y.get(t);
+    const r = A.get(t);
     r && r.setContent(e);
   }
   /**
@@ -3244,16 +3307,16 @@ const m = class m {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static changeValue(t, e) {
-    const r = y.get(t);
+    const r = A.get(t);
     if (r.getValue() === e)
       return Promise.resolve();
     const n = [];
     n.push(r.setValue(e));
-    const s = m.getFormFragment(r);
-    if (s) {
-      const i = E.getValues(s), a = s.getAttribute(`${h.prefix}form-arg`);
+    const i = m.getFormFragment(r);
+    if (i) {
+      const s = b.getValues(i), a = i.getAttribute(`${f.prefix}form-arg`);
       let o;
-      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = i) : o = i, n.push(m.setBindingData(s.getTarget(), o));
+      a ? (o = i.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, n.push(m.setBindingData(i.getTarget(), o));
     }
     return Promise.all(n).then(() => {
     });
@@ -3278,8 +3341,8 @@ const m = class m {
    */
   static evaluateAll(t) {
     const e = [];
-    return e.push(m.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${h.prefix}if`) && e.push(m.evaluateIf(t)), t.hasAttribute(`${h.prefix}each`) && e.push(m.evaluateEach(t)), t.getChildren().forEach((r) => {
-      r instanceof P ? e.push(m.evaluateAll(r)) : r instanceof B && e.push(m.evaluateText(r));
+    return e.push(m.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${f.prefix}if`) && e.push(m.evaluateIf(t)), t.hasAttribute(`${f.prefix}each`) && e.push(m.evaluateEach(t)), t.getChildren().forEach((r) => {
+      r instanceof P ? e.push(m.evaluateAll(r)) : r instanceof I && e.push(m.evaluateText(r));
     }), Promise.all(e).then(() => {
     });
   }
@@ -3300,14 +3363,14 @@ const m = class m {
    * @return Promise (DOM操作が完了したときに解決される)
    */
   static evaluateIf(t) {
-    const e = [], r = t.getAttribute(`${h.prefix}if`);
+    const e = [], r = t.getAttribute(`${f.prefix}if`);
     return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
       t.hide().then(() => {
-        A.hide(t.getTarget());
+        E.hide(t.getTarget());
       })
     ) : t.isVisible() || (e.push(
       t.show().then(() => {
-        A.show(t.getTarget());
+        E.show(t.getTarget());
       })
     ), e.push(m.evaluateAll(t))), Promise.all(e).then(() => {
     });
@@ -3324,20 +3387,20 @@ const m = class m {
     let e = t.getTemplate();
     if (e === null) {
       let n = !1;
-      t.getChildren().forEach((i) => {
-        if (!n && i instanceof P) {
-          if (i.hasAttribute(`${h.prefix}each-before`) || i.hasAttribute(`${h.prefix}each-after`))
+      t.getChildren().forEach((s) => {
+        if (!n && s instanceof P) {
+          if (s.hasAttribute(`${f.prefix}each-before`) || s.hasAttribute(`${f.prefix}each-after`))
             return;
-          e = i.clone(), t.setTemplate(e), n = !0, t.removeChild(i);
-          const a = i.getTarget();
-          a.parentNode && a.parentNode.removeChild(a), i.setMounted(!1);
+          e = s.clone(), t.setTemplate(e), n = !0, t.removeChild(s);
+          const a = s.getTarget();
+          a.parentNode && a.parentNode.removeChild(a), s.setMounted(!1);
         }
       });
-      const s = t.getAttribute(`${h.prefix}each`);
-      return Array.isArray(s) ? this.updateDiff(t, s) : (f.error("[Haori]", "Invalid each attribute:", s), Promise.reject(new Error("Invalid each attribute.")));
+      const i = t.getAttribute(`${f.prefix}each`);
+      return Array.isArray(i) ? this.updateDiff(t, i) : (h.error("[Haori]", "Invalid each attribute:", i), Promise.reject(new Error("Invalid each attribute.")));
     }
-    const r = t.getAttribute(`${h.prefix}each`);
-    return Array.isArray(r) ? this.updateDiff(t, r) : (f.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
+    const r = t.getAttribute(`${f.prefix}each`);
+    return Array.isArray(r) ? this.updateDiff(t, r) : (h.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
   }
   /**
    * 差分を更新します。
@@ -3348,37 +3411,37 @@ const m = class m {
   static updateDiff(t, e) {
     const r = t.getTemplate();
     if (r === null)
-      return f.error("[Haori]", "Template is not set for each element."), Promise.resolve();
-    let n = t.getAttribute(`${h.prefix}each-index`);
+      return h.error("[Haori]", "Template is not set for each element."), Promise.resolve();
+    let n = t.getAttribute(`${f.prefix}each-index`);
     n && (n = String(n));
-    const s = t.getAttribute(`${h.prefix}each-key`), i = t.getAttribute(`${h.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    e.forEach((p, v) => {
+    const i = t.getAttribute(`${f.prefix}each-key`), s = t.getAttribute(`${f.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
+    e.forEach((g, v) => {
       const w = m.createListKey(
-        p,
-        s ? String(s) : null,
+        g,
+        i ? String(i) : null,
         v
       );
-      o.push(w), a.set(w, { item: p, itemIndex: v });
+      o.push(w), a.set(w, { item: g, itemIndex: v });
     });
-    const g = [];
-    let u = t.getChildren().filter((p) => p instanceof P).filter(
-      (p) => !p.hasAttribute(`${h.prefix}each-before`) && !p.hasAttribute(`${h.prefix}each-after`)
+    const p = [];
+    let c = t.getChildren().filter((g) => g instanceof P).filter(
+      (g) => !g.hasAttribute(`${f.prefix}each-before`) && !g.hasAttribute(`${f.prefix}each-after`)
     );
-    u = u.filter((p) => o.indexOf(String(p.getListKey())) === -1 ? (g.push(p.remove()), !1) : !0);
-    const b = u.map((p) => p.getListKey()), l = t.getChildren().filter((p) => p instanceof P).filter((p) => p.hasAttribute(`${h.prefix}each-before`)).length;
+    c = c.filter((g) => o.indexOf(String(g.getListKey())) === -1 ? (p.push(g.remove()), !1) : !0);
+    const y = c.map((g) => g.getListKey()), l = t.getChildren().filter((g) => g instanceof P).filter((g) => g.hasAttribute(`${f.prefix}each-before`)).length;
     let d = Promise.resolve();
-    return o.forEach((p, v) => {
-      const w = b.indexOf(p), { item: $, itemIndex: F } = a.get(p);
+    return o.forEach((g, v) => {
+      const w = y.indexOf(g), { item: B, itemIndex: F } = a.get(g);
       let x;
       if (w !== -1)
-        x = u[w], d = d.then(
+        x = c[w], d = d.then(
           () => m.updateRowFragment(
             x,
-            $,
+            B,
             n,
             F,
-            i ? String(i) : null,
-            p
+            s ? String(s) : null,
+            g
           ).then(() => m.evaluateAll(x))
         );
       else {
@@ -3387,11 +3450,11 @@ const m = class m {
         d = d.then(
           () => m.updateRowFragment(
             x,
-            $,
+            B,
             n,
             F,
-            i ? String(i) : null,
-            p
+            s ? String(s) : null,
+            g
           ).then(
             () => t.insertBefore(
               x,
@@ -3400,21 +3463,21 @@ const m = class m {
           )
         );
       }
-    }), Promise.all(g).then(() => d).then(() => {
-      const p = o.filter(
+    }), Promise.all(p).then(() => d).then(() => {
+      const g = o.filter(
         (F) => F !== null
-      ), v = b.filter(
+      ), v = y.filter(
         (F) => F !== null
-      ), w = p.filter(
+      ), w = g.filter(
         (F) => !v.includes(F)
-      ), $ = v.filter(
-        (F) => !p.includes(F)
+      ), B = v.filter(
+        (F) => !g.includes(F)
       );
-      A.eachUpdate(
+      E.eachUpdate(
         t.getTarget(),
         w,
-        $,
-        p
+        B,
+        g
       );
     });
   }
@@ -3430,8 +3493,8 @@ const m = class m {
     let n;
     if (typeof t == "object" && t !== null)
       if (e) {
-        const s = t[e];
-        s == null ? n = `__index_${r}` : typeof s == "object" ? n = JSON.stringify(s) : n = String(s);
+        const i = t[e];
+        i == null ? n = `__index_${r}` : typeof i == "object" ? n = JSON.stringify(i) : n = String(i);
       } else
         n = `__index_${r}`;
     else
@@ -3449,22 +3512,22 @@ const m = class m {
    * @param listKey リストキー
    * @returns 行メタデータの更新完了 Promise
    */
-  static updateRowFragment(t, e, r, n, s, i) {
+  static updateRowFragment(t, e, r, n, i, s) {
     let a = e;
     if (typeof e == "object" && e !== null)
-      a = { ...e }, r && (a[r] = n), s && (a = {
-        [s]: a
+      a = { ...e }, r && (a[r] = n), i && (a = {
+        [i]: a
       });
-    else if (s)
+    else if (i)
       a = {
-        [s]: e
+        [i]: e
       }, r && (a[r] = n);
     else
-      return f.error(
+      return h.error(
         "[Haori]",
-        `Primitive value requires '${h.prefix}each-arg' attribute: ${e}`
+        `Primitive value requires '${f.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve();
-    return t.setListKey(i), t.setBindingData(a), t.setAttribute(`${h.prefix}row`, i);
+    return t.setListKey(s), t.setBindingData(a), t.setAttribute(`${f.prefix}row`, s);
   }
 };
 m.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], m.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], m.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
@@ -3484,7 +3547,7 @@ class et {
    */
   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 = y.get(e);
+      const e = document.documentElement, r = A.get(e);
       r && new L(r, "load").run();
     }, this.root = t;
   }
@@ -3511,9 +3574,9 @@ class et {
     const r = this.getElementFromTarget(t.target);
     if (!r)
       return;
-    const n = y.get(r);
-    n && (e === "change" && n instanceof P && n.syncValue(), new L(n, e).run().catch((s) => {
-      f.error("[Haori]", "Procedure execution error:", s);
+    const n = A.get(r);
+    n && (e === "change" && n instanceof P && n.syncValue(), new L(n, e).run().catch((i) => {
+      h.error("[Haori]", "Procedure execution error:", i);
     }));
   }
   /**
@@ -3539,7 +3602,7 @@ const O = class O {
       T.scan(document.head),
       T.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && f.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && f.error("[Haori]", "Failed to build body fragment:", r.reason), O.observe(document.head), O.observe(document.body), new et().start();
+    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", r.reason), O.observe(document.head), O.observe(document.body), new et().start();
   }
   /**
    * 指定された要素を監視します。
@@ -3552,40 +3615,40 @@ const O = class O {
         try {
           switch (n.type) {
             case "attributes": {
-              f.info(
+              h.info(
                 "[Haori]",
                 "Attribute changed:",
                 n.target,
                 n.attributeName
               );
-              const s = n.target;
+              const i = n.target;
               T.setAttribute(
-                s,
+                i,
                 n.attributeName,
-                s.getAttribute(n.attributeName)
+                i.getAttribute(n.attributeName)
               );
               break;
             }
             case "childList": {
-              f.info(
+              h.info(
                 "[Haori]",
                 "Child list changed:",
-                Array.from(n.removedNodes).map((s) => s.nodeName),
-                Array.from(n.addedNodes).map((s) => s.nodeName)
-              ), Array.from(n.removedNodes).forEach((s) => {
-                T.removeNode(s);
-              }), Array.from(n.addedNodes).forEach((s) => {
-                s.parentElement instanceof HTMLElement && T.addNode(s.parentElement, s);
+                Array.from(n.removedNodes).map((i) => i.nodeName),
+                Array.from(n.addedNodes).map((i) => i.nodeName)
+              ), Array.from(n.removedNodes).forEach((i) => {
+                T.removeNode(i);
+              }), Array.from(n.addedNodes).forEach((i) => {
+                i.parentElement instanceof HTMLElement && T.addNode(i.parentElement, i);
               });
               break;
             }
             case "characterData": {
-              f.info(
+              h.info(
                 "[Haori]",
                 "Character data changed:",
                 n.target,
                 n.target.textContent
-              ), n.target instanceof Text || n.target instanceof Comment ? T.changeText(n.target, n.target.textContent) : f.warn(
+              ), n.target instanceof Text || n.target instanceof Comment ? T.changeText(n.target, n.target.textContent) : h.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 n.target
@@ -3593,31 +3656,31 @@ const O = class O {
               break;
             }
             default:
-              f.warn("[Haori]", "Unknown mutation type:", n.type);
+              h.warn("[Haori]", "Unknown mutation type:", n.type);
               continue;
           }
-        } catch (s) {
-          f.error("[Haori]", "Error processing mutation:", s);
+        } catch (i) {
+          h.error("[Haori]", "Error processing mutation:", i);
         }
     }).observe(t, {
       childList: !0,
       subtree: !0,
       attributes: !0,
       characterData: !0
-    }), f.info("[Haori]", "Observer initialized for", t);
+    }), h.info("[Haori]", "Observer initialized for", t);
   }
 };
 O._initialized = !1;
 let V = O;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", V.init) : V.init();
-const rt = "0.1.5";
+const rt = "0.2.0";
 export {
   T as Core,
-  h as Env,
-  E as Form,
-  y as Fragment,
+  f as Env,
+  b as Form,
+  A as Fragment,
   W as Haori,
-  f as Log,
+  h as Log,
   N as Queue,
   W as default,
   rt as version