haori 0.1.1 → 0.1.2

package/dist/haori.es.js

@@ -1,23 +1,23 @@
-const C = class C {
+const R = class R {
   /**
    * 開発モードの状態を取得します。
    *
    * @returns 開発モードならtrue、そうでなければfalse
    */
   static isEnabled() {
-    return C.devMode;
+    return R.devMode;
   }
   /**
    * 開発モードを有効化します。
    */
   static enable() {
-    C.devMode = !0;
+    R.devMode = !0;
   }
   /**
    * 開発モードを無効化します。
    */
   static disable() {
-    C.devMode = !1;
+    R.devMode = !1;
   }
   /**
    * 開発モードを切り替えます。
@@ -25,12 +25,12 @@ const C = class C {
    * @param enabled trueで有効化、falseで無効化
    */
   static set(t) {
-    C.devMode = t;
+    R.devMode = t;
   }
 };
-C.devMode = !1;
-let $ = C;
-const k = class k {
+R.devMode = !1;
+let O = R;
+const D = class D {
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
    * scriptタグにdata-prefixがある場合は、その値+"-"をプレフィックスとして使用します。
@@ -41,19 +41,19 @@ const k = class k {
     try {
       const t = document.currentScript || document.querySelector('script[src*="haori"]');
       if (t instanceof HTMLScriptElement) {
-        const s = t.getAttribute("data-prefix") || k._prefix;
-        k._prefix = s.endsWith("-") ? s : s + "-";
+        const r = t.getAttribute("data-prefix") || D._prefix;
+        D._prefix = r.endsWith("-") ? r : r + "-";
       }
-      if (t instanceof HTMLScriptElement && t.hasAttribute(`${k._prefix}dev`)) {
-        $.set(!0);
+      if (t instanceof HTMLScriptElement && t.hasAttribute(`${D._prefix}dev`)) {
+        O.set(!0);
         return;
       }
       const e = window.location.hostname;
       if (e === "localhost" || e.endsWith(".localhost") || e === "127.0.0.1" || e === "::1" || e.endsWith(".local")) {
-        $.set(!0);
+        O.set(!0);
         return;
       }
-      $.set(!1);
+      O.set(!1);
     } catch {
     }
   }
@@ -63,11 +63,11 @@ const k = class k {
    * @returns プレフィックス
    */
   static get prefix() {
-    return k._prefix;
+    return D._prefix;
   }
 };
-k._prefix = "data-";
-let c = k;
+D._prefix = "data-";
+let c = D;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", c.detect) : c.detect();
 class h {
   /**
@@ -77,7 +77,7 @@ class h {
    * @param args 追加の引数
    */
   static info(t, ...e) {
-    $.isEnabled() && console.log && console.log(t, ...e);
+    O.isEnabled() && console.log && console.log(t, ...e);
   }
   /**
    * 開発モードでのみコンソールに警告を出力します。
@@ -86,7 +86,7 @@ class h {
    * @param args 追加の引数
    */
   static warn(t, ...e) {
-    $.isEnabled() && console.warn && console.warn(t, ...e);
+    O.isEnabled() && console.warn && console.warn(t, ...e);
   }
   /**
    * モードに関係なくコンソールにエラーを出力します。
@@ -98,7 +98,7 @@ class h {
     console.error(t, ...e);
   }
 }
-class J {
+class Y {
   constructor() {
     this.MAX_BUDGET = 8, this.queue = [], this.processing = !1;
   }
@@ -110,17 +110,17 @@ class J {
    * @returns 処理完了Promise
    */
   enqueue(t, e = !1) {
-    let s, r;
-    const i = new Promise((a, u) => {
-      s = a, r = u;
+    let r, i;
+    const s = new Promise((a, o) => {
+      r = a, i = o;
     }), n = {
       task: t,
       timestamp: performance.now(),
-      promise: i,
-      resolve: s,
-      reject: r
+      promise: s,
+      resolve: r,
+      reject: i
     };
-    return e ? this.queue.unshift(n) : this.queue.push(n), this.scheduleProcessing(), i;
+    return e ? this.queue.unshift(n) : this.queue.push(n), this.scheduleProcessing(), s;
   }
   /**
    * キューを処理します。
@@ -137,10 +137,10 @@ class J {
           if (!e)
             return;
           try {
-            const s = await e.task();
-            e.resolve(s);
-          } catch (s) {
-            e.reject(s), h.error("[Haori]", `Task ${e.timestamp} failed:`, s);
+            const r = await e.task();
+            e.resolve(r);
+          } catch (r) {
+            e.reject(r), h.error("[Haori]", `Task ${e.timestamp} failed:`, r);
           }
           if (performance.now() - t > this.MAX_BUDGET)
             break;
@@ -192,9 +192,9 @@ const G = class G {
     return this.ASYNC_QUEUE.wait();
   }
 };
-G.ASYNC_QUEUE = new J();
+G.ASYNC_QUEUE = new Y();
 let T = G;
-class S {
+class M {
   /**
    * 通知ダイアログを表示します。
    *
@@ -214,12 +214,12 @@ class S {
    * @return 通知が表示されると解決されるPromise
    */
   static async toast(t, e) {
-    const s = document.createElement("div");
-    s.className = `haori-toast haori-toast-${e}`, s.textContent = t, s.setAttribute("popover", "manual"), s.setAttribute("role", "status"), s.setAttribute("aria-live", "polite"), document.body.appendChild(s), s.showPopover(), setTimeout(() => {
+    const r = document.createElement("div");
+    r.className = `haori-toast haori-toast-${e}`, r.textContent = t, r.setAttribute("popover", "manual"), r.setAttribute("role", "status"), r.setAttribute("aria-live", "polite"), document.body.appendChild(r), r.showPopover(), setTimeout(() => {
       try {
-        s.hidePopover();
+        r.hidePopover();
       } finally {
-        s.remove();
+        r.remove();
       }
     }, 3e3);
   }
@@ -284,7 +284,7 @@ class S {
     }, !0);
   }
 }
-class E {
+class y {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -295,7 +295,7 @@ class E {
    */
   static getValues(t) {
     const e = {};
-    return E.getPartValues(t, e);
+    return y.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -306,32 +306,32 @@ class E {
    * @returns values と同じオブジェクト
    */
   static getPartValues(t, e) {
-    const s = t.getAttribute("name"), r = t.getAttribute(`${c.prefix}form-object`), i = t.getAttribute(`${c.prefix}form-list`);
-    if (s) {
-      i ? Array.isArray(e[String(s)]) ? e[String(s)].push(t.getValue()) : e[String(s)] = [t.getValue()] : e[String(s)] = t.getValue(), r && h.warn(
+    const r = t.getAttribute("name"), i = t.getAttribute(`${c.prefix}form-object`), s = t.getAttribute(`${c.prefix}form-list`);
+    if (r) {
+      s ? Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()] : e[String(r)] = t.getValue(), i && h.warn(
         "Haori",
         `Element cannot have both ${c.prefix}form-object and name attributes.`
       );
       for (const n of t.getChildElementFragments())
-        E.getPartValues(n, e);
-    } else if (r) {
+        y.getPartValues(n, e);
+    } else if (i) {
       const n = {};
       for (const a of t.getChildElementFragments())
-        E.getPartValues(a, n);
-      Object.keys(n).length > 0 && (e[String(r)] = n), i && h.warn(
+        y.getPartValues(a, n);
+      Object.keys(n).length > 0 && (e[String(i)] = n), s && h.warn(
         "Haori",
         `Element cannot have both ${c.prefix}form-list and ${c.prefix}form-object attributes.`
       );
-    } else if (i) {
+    } else if (s) {
       const n = [];
       for (const a of t.getChildElementFragments()) {
-        const u = {};
-        E.getPartValues(a, u), Object.keys(u).length > 0 && n.push(u);
+        const o = {};
+        y.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
       }
-      n.length > 0 && (e[String(i)] = n);
+      n.length > 0 && (e[String(s)] = n);
     } else
       for (const n of t.getChildElementFragments())
-        E.getPartValues(n, e);
+        y.getPartValues(n, e);
     return e;
   }
   /**
@@ -343,8 +343,8 @@ class E {
    * @param force data-form-detach属性があるエレメントにも値を反映するかどうか
    * @returns Promise（DOMの更新が完了したら解決される）
    */
-  static setValues(t, e, s = !1) {
-    return E.setPartValues(t, e, null, s);
+  static setValues(t, e, r = !1) {
+    return y.setPartValues(t, e, null, r);
   }
   /**
    * フラグメント内にある各入力エレメントに値を設定します。
@@ -355,45 +355,45 @@ class E {
    * @param force data-form-detach属性があるエレメントにも値を反映するかどうか
    * @returns Promise（DOMの更新が完了したら解決される）
    */
-  static setPartValues(t, e, s = null, r = !1) {
-    const i = [], n = t.getAttribute("name"), a = t.getAttribute(`${c.prefix}form-object`), u = t.getAttribute(`${c.prefix}form-list`), m = t.getAttribute(`${c.prefix}form-detach`);
+  static setPartValues(t, e, r = null, i = !1) {
+    const s = [], n = t.getAttribute("name"), a = t.getAttribute(`${c.prefix}form-object`), o = t.getAttribute(`${c.prefix}form-list`), g = t.getAttribute(`${c.prefix}form-detach`);
     if (n) {
-      if (!m || r) {
-        const l = e[String(n)];
-        u && Array.isArray(l) && s !== null ? i.push(t.setValue(l[s])) : typeof l == "string" || typeof l == "number" || typeof l == "boolean" || l === null ? i.push(t.setValue(l)) : i.push(t.setValue(String(l)));
+      if (!g || i) {
+        const u = e[String(n)];
+        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)));
       }
     } else if (a) {
-      const l = e[String(a)];
-      if (l && typeof l == "object")
+      const u = e[String(a)];
+      if (u && typeof u == "object")
         for (const b of t.getChildElementFragments())
-          i.push(
-            E.setPartValues(
+          s.push(
+            y.setPartValues(
               b,
-              l,
+              u,
               null,
-              r
+              i
             )
           );
-    } else if (u) {
-      const l = e[String(u)];
-      if (Array.isArray(l)) {
+    } else if (o) {
+      const u = e[String(o)];
+      if (Array.isArray(u)) {
         const b = t.getChildElementFragments();
-        for (let o = 0; o < b.length; o++) {
-          const d = b[o];
-          l.length > o ? i.push(
-            E.setPartValues(
-              d,
-              l[o],
-              o,
-              r
+        for (let l = 0; l < b.length; l++) {
+          const f = b[l];
+          u.length > l ? s.push(
+            y.setPartValues(
+              f,
+              u[l],
+              l,
+              i
             )
-          ) : i.push(E.setPartValues(d, {}, o, r));
+          ) : s.push(y.setPartValues(f, {}, l, i));
         }
       }
     } else
-      for (const l of t.getChildElementFragments())
-        i.push(E.setPartValues(l, e, null, r));
-    return Promise.all(i).then(() => {
+      for (const u of t.getChildElementFragments())
+        s.push(y.setPartValues(u, e, null, i));
+    return Promise.all(s).then(() => {
     });
   }
   /**
@@ -404,18 +404,18 @@ class E {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    E.clearValues(t), await Promise.all([
-      E.clearMessages(t),
-      E.clearEachClones(t)
+    y.clearValues(t), await Promise.all([
+      y.clearMessages(t),
+      y.clearEachClones(t)
     ]), await T.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
         e.reset();
       else {
-        const s = e.parentElement;
-        if (s) {
-          const r = e.nextElementSibling, i = document.createElement("form");
-          i.appendChild(e), i.reset(), s.insertBefore(e, r);
+        const r = e.parentElement;
+        if (r) {
+          const i = e.nextElementSibling, s = document.createElement("form");
+          s.appendChild(e), s.reset(), r.insertBefore(e, i);
         }
       }
     }), await N.evaluateAll(t);
@@ -427,20 +427,20 @@ class E {
    * 対象エレメント自体は削除しません。
    */
   static clearEachClones(t) {
-    const e = [], s = (i) => {
-      if (i.hasAttribute(`${c.prefix}each`))
-        for (const n of i.getChildElementFragments()) {
-          const a = n.hasAttribute(`${c.prefix}each-before`), u = n.hasAttribute(`${c.prefix}each-after`);
-          !a && !u && e.push(n.remove());
+    const e = [], r = (s) => {
+      if (s.hasAttribute(`${c.prefix}each`))
+        for (const n of s.getChildElementFragments()) {
+          const a = n.hasAttribute(`${c.prefix}each-before`), o = n.hasAttribute(`${c.prefix}each-after`);
+          !a && !o && e.push(n.remove());
         }
-    }, r = (i) => {
-      s(i);
-      for (const n of i.getChildElementFragments())
-        r(n);
+    }, i = (s) => {
+      r(s);
+      for (const n of s.getChildElementFragments())
+        i(n);
     };
-    s(t);
-    for (const i of t.getChildElementFragments())
-      r(i);
+    r(t);
+    for (const s of t.getChildElementFragments())
+      i(s);
     return Promise.all(e).then(() => {
     });
   }
@@ -452,7 +452,7 @@ class E {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      E.clearValues(e);
+      y.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -461,7 +461,7 @@ class E {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(t) {
-    return S.clearMessages(t.getTarget());
+    return M.clearMessages(t.getTarget());
   }
   /**
    * キーに一致するフラグメントにエラーメッセージを追加します。
@@ -472,11 +472,11 @@ class E {
    * @param message 追加するエラーメッセージ]
    * @return Promise（メッセージの追加が完了したら解決される）
    */
-  static addErrorMessage(t, e, s) {
-    const r = [], i = E.findFragmentsByKey(t, e);
-    return i.forEach((n) => {
-      r.push(S.addErrorMessage(n.getTarget(), s));
-    }), i.length === 0 && r.push(S.addErrorMessage(t.getTarget(), s)), Promise.all(r).then(() => {
+  static addErrorMessage(t, e, r) {
+    const i = [], s = y.findFragmentsByKey(t, e);
+    return s.forEach((n) => {
+      i.push(M.addErrorMessage(n.getTarget(), r));
+    }), s.length === 0 && i.push(M.addErrorMessage(t.getTarget(), r)), Promise.all(i).then(() => {
     });
   }
   /**
@@ -487,7 +487,7 @@ class E {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return E.findFragmentByKeyParts(t, e.split("."));
+    return y.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -498,34 +498,34 @@ class E {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentByKeyParts(t, e) {
-    const s = [], r = e[0];
-    if (e.length == 1 && t.getAttribute("name") === r && s.push(t), t.hasAttribute(`${c.prefix}form-object`))
-      e.length > 1 && t.getAttribute(`${c.prefix}form-object`) === r && t.getChildElementFragments().forEach((n) => {
-        s.push(...E.findFragmentByKeyParts(n, e.slice(1)));
+    const r = [], i = e[0];
+    if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${c.prefix}form-object`))
+      e.length > 1 && t.getAttribute(`${c.prefix}form-object`) === i && t.getChildElementFragments().forEach((n) => {
+        r.push(...y.findFragmentByKeyParts(n, e.slice(1)));
       });
     else if (t.hasAttribute(`${c.prefix}form-list`)) {
       if (e.length > 1) {
-        const i = t.getAttribute(`${c.prefix}form-list`), n = r.lastIndexOf("["), a = r.lastIndexOf("]");
+        const s = t.getAttribute(`${c.prefix}form-list`), n = i.lastIndexOf("["), a = i.lastIndexOf("]");
         if (n !== -1 && a !== -1 && n < a) {
-          const u = r.substring(0, n);
-          if (i === u) {
-            const m = r.substring(n + 1, a), l = Number(m);
-            if (isNaN(l))
-              h.error("Haori", `Invalid index: ${r}`);
+          const o = i.substring(0, n);
+          if (s === o) {
+            const g = i.substring(n + 1, a), u = Number(g);
+            if (isNaN(u))
+              h.error("Haori", `Invalid index: ${i}`);
             else {
-              const b = t.getChildElementFragments().filter((o) => o.hasAttribute(`${c.prefix}row`));
-              l < b.length && s.push(
-                ...E.findFragmentByKeyParts(b[l], e.slice(1))
+              const b = t.getChildElementFragments().filter((l) => l.hasAttribute(`${c.prefix}row`));
+              u < b.length && r.push(
+                ...y.findFragmentByKeyParts(b[u], e.slice(1))
               );
             }
           }
         }
       }
     } else
-      t.getChildElementFragments().forEach((i) => {
-        s.push(...E.findFragmentByKeyParts(i, e));
+      t.getChildElementFragments().forEach((s) => {
+        r.push(...y.findFragmentByKeyParts(s, e));
       });
-    return s;
+    return r;
   }
   /**
    * 対象のフラグメントがフォームフラグメントであればそれを返し、
@@ -536,11 +536,11 @@ class E {
   static getFormFragment(t) {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
-    const s = t.getParent();
-    return s ? this.getFormFragment(s) : null;
+    const r = t.getParent();
+    return r ? this.getFormFragment(r) : null;
   }
 }
-const R = class R {
+const k = class k {
   /**
    * 式を評価します。
    *
@@ -554,16 +554,16 @@ const R = class R {
       return h.warn("[Haori]", t, "Expression contains dangerous patterns"), null;
     if (this.containsForbiddenKeys(e))
       return h.warn("[Haori]", e, "Binded values contain forbidden keys"), null;
-    const s = Object.keys(e).filter(
+    const r = Object.keys(e).filter(
       (n) => !this.FORBIDDEN_NAMES.includes(n) && !this.STRICT_FORBIDDEN_NAMES.includes(n)
-    ).sort(), r = `${t}:${s.join(",")}`;
-    let i = this.EXPRESSION_CACHE.get(r);
-    if (!i) {
+    ).sort(), i = `${t}:${r.join(",")}`;
+    let s = this.EXPRESSION_CACHE.get(i);
+    if (!s) {
       const n = `"use strict";
 ${this.assignments};
 return (${t});`;
       try {
-        i = new Function(...s, n), this.EXPRESSION_CACHE.set(r, i);
+        s = new Function(...r, n), this.EXPRESSION_CACHE.set(i, s);
       } catch (a) {
         return h.error(
           "[Haori]",
@@ -574,10 +574,10 @@ return (${t});`;
       }
     }
     try {
-      const n = [];
-      return s.forEach((a) => {
-        n.push(e[a]);
-      }), i(...n);
+      const n = [], a = this.wrapBoundValues(e);
+      return r.forEach((o) => {
+        n.push(a[o]);
+      }), this.withBlockedPropertyAccess(() => s(...n));
     } catch (n) {
       return h.error("[Haori]", "Expression evaluation error:", t, n), n instanceof ReferenceError ? void 0 : null;
     }
@@ -589,14 +589,367 @@ return (${t});`;
    * @return 危険なパターンが含まれている場合はtrue
    */
   static containsDangerousPatterns(t) {
-    return [
+    return this.hasAllowedSyntax(t) ? [
       /\beval\s*\(/,
       // eval(...)
       /\barguments\s*\[/,
       // arguments[...]
       /\barguments\s*\./
       // arguments.xxx
-    ].some((s) => s.test(t));
+    ].some((r) => r.test(t)) : !0;
+  }
+  /**
+   * 許可する式構文かどうかを検証します。
+   *
+   * @param expression 検証対象の式
+   * @returns 許可する構文であればtrue
+   */
+  static hasAllowedSyntax(t) {
+    const e = this.tokenizeExpression(t);
+    if (e === null || e.length === 0)
+      return !1;
+    const r = [];
+    let i = null;
+    for (let s = 0; s < e.length; s++) {
+      const n = e[s], a = e[s + 1] || null, o = r[r.length - 1] || null;
+      if (n.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(n.value) || this.STRICT_FORBIDDEN_NAMES.includes(n.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(n.value)) || o === "member" && n.value !== "]" && n.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
+        this.decodeStringLiteral(n.value)
+      ) || n.value === "." && a?.type !== "identifier" || n.value === "?." && a?.type !== "identifier" && a?.value !== "[" && a?.value !== "(")
+        return !1;
+      switch (n.value) {
+        case "(":
+          r.push("paren");
+          break;
+        case ")": {
+          if (r.pop() !== "paren")
+            return !1;
+          break;
+        }
+        case "[": {
+          const g = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(g);
+          break;
+        }
+        case "]": {
+          if (r.pop() === void 0)
+            return !1;
+          break;
+        }
+      }
+      i = n;
+    }
+    return r.length === 0;
+  }
+  /**
+   * 式をトークン列に分解します。
+   *
+   * @param expression 評価前に検証する式
+   * @returns 分解結果。未対応構文を含む場合はnull
+   */
+  static tokenizeExpression(t) {
+    const e = [], r = [
+      "===",
+      "!==",
+      "...",
+      "?.",
+      "&&",
+      "||",
+      ">=",
+      "<=",
+      "==",
+      "!=",
+      "=>"
+    ], i = /* @__PURE__ */ new Set([
+      "(",
+      ")",
+      "[",
+      "]",
+      ".",
+      ",",
+      "?",
+      ":",
+      "+",
+      "-",
+      "*",
+      "/",
+      "%",
+      "!",
+      ">",
+      "<"
+    ]);
+    let s = 0;
+    for (; s < t.length; ) {
+      const n = t[s];
+      if (/\s/.test(n)) {
+        s += 1;
+        continue;
+      }
+      if (n === "/" && (t[s + 1] === "/" || t[s + 1] === "*"))
+        return null;
+      if (n === '"' || n === "'") {
+        const o = this.readStringToken(t, s);
+        if (o === null)
+          return null;
+        e.push(o.token), s = o.nextIndex;
+        continue;
+      }
+      const a = r.find(
+        (o) => t.startsWith(o, s)
+      );
+      if (a) {
+        e.push({ type: "operator", value: a, position: s }), s += a.length;
+        continue;
+      }
+      if (/[0-9]/.test(n)) {
+        const o = this.readNumberToken(t, s);
+        e.push(o.token), s = o.nextIndex;
+        continue;
+      }
+      if (/[A-Za-z_$]/.test(n)) {
+        const o = this.readIdentifierToken(t, s);
+        e.push(o.token), s = o.nextIndex;
+        continue;
+      }
+      if (i.has(n)) {
+        e.push({ type: "operator", value: n, position: s }), s += 1;
+        continue;
+      }
+      return null;
+    }
+    return e;
+  }
+  /**
+   * 文字列リテラルを読み取ります。
+   *
+   * @param expression 式全体
+   * @param start 開始位置
+   * @returns トークンと次の位置
+   */
+  static readStringToken(t, e) {
+    const r = t[e];
+    let i = e + 1;
+    for (; i < t.length; ) {
+      const s = t[i];
+      if (s === "\\") {
+        i += 2;
+        continue;
+      }
+      if (s === r)
+        return {
+          token: {
+            type: "string",
+            value: t.slice(e, i + 1),
+            position: e
+          },
+          nextIndex: i + 1
+        };
+      i += 1;
+    }
+    return null;
+  }
+  /**
+   * 数値リテラルを読み取ります。
+   *
+   * @param expression 式全体
+   * @param start 開始位置
+   * @returns トークンと次の位置
+   */
+  static readNumberToken(t, e) {
+    let r = e;
+    for (; r < t.length && /[0-9_]/.test(t[r]); )
+      r += 1;
+    if (t[r] === ".")
+      for (r += 1; r < t.length && /[0-9_]/.test(t[r]); )
+        r += 1;
+    return {
+      token: {
+        type: "number",
+        value: t.slice(e, r),
+        position: e
+      },
+      nextIndex: r
+    };
+  }
+  /**
+   * 識別子を読み取ります。
+   *
+   * @param expression 式全体
+   * @param start 開始位置
+   * @returns トークンと次の位置
+   */
+  static readIdentifierToken(t, e) {
+    let r = e;
+    for (; r < t.length && /[A-Za-z0-9_$]/.test(t[r]); )
+      r += 1;
+    return {
+      token: {
+        type: "identifier",
+        value: t.slice(e, r),
+        position: e
+      },
+      nextIndex: r
+    };
+  }
+  /**
+   * 角括弧がメンバーアクセスかどうかを判定します。
+   *
+   * @param previous 直前のトークン
+   * @returns メンバーアクセスであればtrue
+   */
+  static startsMemberAccess(t) {
+    return t === null ? !1 : t.type === "identifier" || t.type === "number" ? !0 : t.value === ")" || t.value === "]" || t.value === "?.";
+  }
+  /**
+   * 文字列リテラルをプレーン文字列へ変換します。
+   *
+   * @param literal 文字列リテラル
+   * @returns デコード後の文字列
+   */
+  static decodeStringLiteral(t) {
+    return t.slice(1, -1).replace(
+      /\\u([0-9a-fA-F]{4})/g,
+      (e, r) => String.fromCharCode(parseInt(r, 16))
+    ).replace(
+      /\\x([0-9a-fA-F]{2})/g,
+      (e, r) => String.fromCharCode(parseInt(r, 16))
+    ).replace(/\\(["'\\bfnrtv0])/g, (e, r) => {
+      switch (r) {
+        case "b":
+          return "\b";
+        case "f":
+          return "\f";
+        case "n":
+          return `
+`;
+        case "r":
+          return "\r";
+        case "t":
+          return "	";
+        case "v":
+          return "\v";
+        case "0":
+          return "\0";
+        default:
+          return r;
+      }
+    });
+  }
+  /**
+   * バインド値を安全なProxyでラップします。
+   *
+   * @param bindedValues バインド値
+   * @returns ラップ済みのバインド値
+   */
+  static wrapBoundValues(t) {
+    const e = /* @__PURE__ */ new WeakMap(), r = {};
+    return Object.entries(t).forEach(([i, s]) => {
+      r[i] = this.wrapBoundValue(s, e);
+    }), r;
+  }
+  /**
+   * 危険なプロパティアクセスを防ぐために値を再帰的にラップします。
+   *
+   * @param value ラップ対象の値
+   * @param cache 既存Proxyのキャッシュ
+   * @returns ラップ済みの値
+   */
+  static wrapBoundValue(t, e) {
+    if (!this.shouldWrapValue(t))
+      return t;
+    const r = t, i = e.get(r);
+    if (i !== void 0)
+      return i;
+    const s = new Proxy(r, {
+      get: (n, a, o) => {
+        if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
+          return;
+        const g = Reflect.get(n, a, o);
+        return typeof a == "symbol" ? g : this.wrapBoundValue(
+          g,
+          e
+        );
+      },
+      has: (n, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(n, a),
+      getOwnPropertyDescriptor: (n, a) => {
+        if (!(typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a)))
+          return Reflect.getOwnPropertyDescriptor(n, a);
+      },
+      apply: (n, a, o) => {
+        const g = Reflect.apply(
+          n,
+          a,
+          o
+        );
+        return this.isIteratorLike(g) ? g : this.wrapBoundValue(g, e);
+      },
+      construct: (n, a, o) => this.wrapBoundValue(
+        Reflect.construct(
+          n,
+          a,
+          o
+        ),
+        e
+      )
+    });
+    return e.set(r, s), s;
+  }
+  /**
+   * Proxy ラップ対象の値かどうかを判定します。
+   *
+   * @param value 判定対象
+   * @returns ラップ対象であればtrue
+   */
+  static shouldWrapValue(t) {
+    if (typeof t == "function")
+      return !0;
+    if (t === null || typeof t != "object")
+      return !1;
+    if (Array.isArray(t))
+      return !0;
+    const e = Object.getPrototypeOf(t);
+    return e === Object.prototype || e === null;
+  }
+  /**
+   * 評価中のみ prototype 系プロパティへの生アクセスを抑止します。
+   *
+   * @param callback 実行する処理
+   * @returns 処理結果
+   */
+  static withBlockedPropertyAccess(t) {
+    const r = [
+      { target: Object.prototype, property: "constructor" },
+      { target: Function.prototype, property: "constructor" },
+      { target: Object.prototype, property: "__proto__" }
+    ].map((i) => ({
+      ...i,
+      descriptor: Object.getOwnPropertyDescriptor(i.target, i.property)
+    })).filter((i) => i.descriptor?.configurable === !0);
+    r.forEach(({ target: i, property: s }) => {
+      Object.defineProperty(i, s, {
+        configurable: !0,
+        enumerable: !1,
+        get: () => {
+        },
+        set: () => {
+        }
+      });
+    });
+    try {
+      return t();
+    } finally {
+      r.forEach(({ target: i, property: s, descriptor: n }) => {
+        n !== void 0 && Object.defineProperty(i, s, n);
+      });
+    }
+  }
+  /**
+   * イテレータ互換オブジェクトかどうかを判定します。
+   *
+   * @param value 判定対象
+   * @returns イテレータ互換であればtrue
+   */
+  static isIteratorLike(t) {
+    return t === null || typeof t != "object" ? !1 : typeof t.next == "function";
   }
   /**
    * valuesオブジェクトに禁止識別子が含まれていないか再帰的にチェックします。
@@ -613,7 +966,7 @@ return (${t});`;
     return !1;
   }
 };
-R.FORBIDDEN_NAMES = [
+k.FORBIDDEN_NAMES = [
   // グローバルオブジェクト
   "window",
   "self",
@@ -631,6 +984,7 @@ R.FORBIDDEN_NAMES = [
   "prompt",
   "fetch",
   "XMLHttpRequest",
+  "Reflect",
   // 脱出経路・プロトタイプ
   "constructor",
   "__proto__",
@@ -644,14 +998,52 @@ R.FORBIDDEN_NAMES = [
   "sessionStorage",
   "IndexedDB",
   "history"
-], R.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], R.EXPRESSION_CACHE = /* @__PURE__ */ new Map(), (() => {
+], k.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], k.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
+  "constructor",
+  "__proto__",
+  "prototype"
+]), k.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
+  "await",
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "export",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "import",
+  "in",
+  "instanceof",
+  "let",
+  "new",
+  "return",
+  "switch",
+  "this",
+  "throw",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield"
+]), k.EXPRESSION_CACHE = /* @__PURE__ */ new Map(), (() => {
   const t = [];
-  R.FORBIDDEN_NAMES.forEach((e) => {
+  k.FORBIDDEN_NAMES.forEach((e) => {
     t.push(`const ${e} = undefined`);
-  }), R.assignments = t.join(`;
+  }), k.assignments = t.join(`;
 `);
 })();
-let L = R;
+let H = k;
 const P = class P {
   /**
    * フラグメントのコンストラクタ。
@@ -669,10 +1061,10 @@ const P = class P {
     let e;
     switch (t.nodeType) {
       case Node.ELEMENT_NODE:
-        e = new M(t);
+        e = new S(t);
         break;
       case Node.TEXT_NODE:
-        e = new H(t);
+        e = new j(t);
         break;
       case Node.COMMENT_NODE:
         e = new K(t);
@@ -785,7 +1177,7 @@ const P = class P {
 };
 P.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
 let A = P;
-class M extends A {
+class S extends A {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -809,14 +1201,14 @@ class M extends A {
       "time",
       "week"
     ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingDataCache = null, this.visible = !0, this.display = null, this.template = null, this.listKey = null, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.syncValue(), t.getAttributeNames().forEach((e) => {
-      const s = t.getAttribute(e);
-      if (s !== null && !this.attributeMap.has(e)) {
-        const r = new I(e, s);
-        this.attributeMap.set(e, r);
+      const r = t.getAttribute(e);
+      if (r !== null && !this.attributeMap.has(e)) {
+        const i = new L(e, r);
+        this.attributeMap.set(e, i);
       }
     }), t.childNodes.forEach((e) => {
-      const s = A.get(e);
-      s.setParent(this), this.children.push(s);
+      const r = A.get(e);
+      r.setParent(this), this.children.push(r);
     });
   }
   /**
@@ -834,7 +1226,7 @@ class M extends A {
    */
   getChildElementFragments() {
     return this.children.filter(
-      (t) => t instanceof M
+      (t) => t instanceof S
     );
   }
   /**
@@ -866,12 +1258,12 @@ class M extends A {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new M(
+    const t = new S(
       this.target.cloneNode(!1)
     );
     return this.children.forEach((e) => {
-      const s = e.clone();
-      t.getTarget().appendChild(s.getTarget()), t.pushChild(s);
+      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;
   }
   /**
@@ -882,8 +1274,8 @@ class M extends A {
    */
   remove(t = !0) {
     const e = [];
-    return this.children.forEach((s) => {
-      e.push(s.remove(!1));
+    return this.children.forEach((r) => {
+      e.push(r.remove(!1));
     }), this.children.length = 0, this.attributeMap.clear(), this.bindingData = null, this.bindingDataCache = null, this.template && (e.push(this.template.remove(!1)), this.template = null), e.push(super.remove(t)), Promise.all(e).then(() => {
     });
   }
@@ -924,7 +1316,7 @@ class M extends A {
    */
   clearBindingDataCache() {
     this.bindingDataCache = null, this.children.forEach((t) => {
-      t instanceof M && t.clearBindingDataCache();
+      t instanceof S && t.clearBindingDataCache();
     });
   }
   /**
@@ -971,10 +1363,10 @@ class M extends A {
       return Promise.resolve();
     const e = this.getTarget();
     if (e instanceof HTMLInputElement && (e.type === "checkbox" || e.type === "radio")) {
-      const s = this.getAttribute("value");
-      let r;
-      return s === "true" ? r = t === !0 : s === "false" ? r = t === !1 : r = s === String(t), this.value = r ? t : null, e.checked === r ? Promise.resolve() : (this.skipChangeValue = !0, T.enqueue(() => {
-        e.checked = r, e.dispatchEvent(new Event("change", { bubbles: !0 }));
+      const r = this.getAttribute("value");
+      let i;
+      return r === "true" ? i = t === !0 : r === "false" ? i = t === !1 : i = r === String(t), this.value = i ? t : null, e.checked === i ? Promise.resolve() : (this.skipChangeValue = !0, T.enqueue(() => {
+        e.checked = i, e.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
@@ -1036,15 +1428,15 @@ class M extends A {
       return Promise.resolve();
     if (e === null)
       return this.removeAttribute(t);
-    const s = new I(t, e);
-    this.attributeMap.set(t, s), this.skipMutationAttributes = !0;
-    const r = this.getTarget(), i = s.isForceEvaluation() ? e : this.getAttribute(t);
+    const r = new L(t, e);
+    this.attributeMap.set(t, r), this.skipMutationAttributes = !0;
+    const i = this.getTarget(), s = r.isForceEvaluation() ? e : this.getAttribute(t);
     return T.enqueue(() => {
-      if (i === null || i === !1)
-        r.removeAttribute(t);
+      if (s === null || s === !1)
+        i.removeAttribute(t);
       else {
-        const n = String(i);
-        r.getAttribute(t) !== n && r.setAttribute(t, n);
+        const n = String(s);
+        i.getAttribute(t) !== n && i.setAttribute(t, n);
       }
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1078,8 +1470,8 @@ class M extends A {
     const e = this.attributeMap.get(t);
     if (e === void 0)
       return null;
-    const s = e.evaluate(this.getBindingData());
-    return s.length === 1 ? s[0] : j.joinEvaluateResults(s);
+    const r = e.evaluate(this.getBindingData());
+    return r.length === 1 ? r[0] : $.joinEvaluateResults(r);
   }
   /**
    * 属性の生の値を取得します。
@@ -1108,6 +1500,30 @@ class M extends A {
   hasAttribute(t) {
     return this.attributeMap.has(t);
   }
+  /**
+   * DOM上の順序から、参照フラグメントに対応する children 配列の挿入位置を推定します。
+   *
+   * @param referenceChild 参照フラグメント
+   * @param insertAfter 参照位置の後ろに挿入するかどうか
+   * @returns 挿入位置。解決できない場合はnull
+   */
+  resolveInsertionPointFromDom(t, e) {
+    const r = t.getTarget();
+    if (r.parentNode !== this.target)
+      return null;
+    const i = e ? r.nextSibling : r;
+    let s = e ? r.nextSibling : r;
+    for (; s !== null; ) {
+      const n = A.get(s);
+      if (n !== null) {
+        const a = this.children.indexOf(n);
+        if (a !== -1)
+          return { index: a, referenceNode: i };
+      }
+      s = s.nextSibling;
+    }
+    return { index: this.children.length, referenceNode: i };
+  }
   /**
    * 子ノードを参照ノードの前に挿入します。
    * 参照ノードがnullの場合、親の最後に追加されます。
@@ -1116,40 +1532,46 @@ class M extends A {
    * @param referenceChild 参照ノード
    * @return 挿入のPromise
    */
-  insertBefore(t, e) {
+  insertBefore(t, e, r) {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (t === this)
       return h.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
-    const s = /* @__PURE__ */ new Set();
-    let r = this.parent;
-    for (; r; )
-      s.add(r), r = r.getParent();
-    if (s.has(t))
+    const i = /* @__PURE__ */ new Set();
+    let s = this.parent;
+    for (; s; )
+      i.add(s), s = s.getParent();
+    if (i.has(t))
       return h.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
-    const i = t.getParent() === this;
-    let n = -1, a = -1;
-    i && (n = this.children.indexOf(t), e !== null && (a = this.children.indexOf(e)));
-    const u = t.getParent();
-    if (u !== null && u.removeChild(t), e === null)
+    const n = t.getParent() === this;
+    let a = -1, o = -1;
+    n && (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;
+    if (e === null)
       this.children.push(t);
     else {
       let l;
-      i ? n !== -1 && n < a ? l = a - 1 : l = a : l = this.children.indexOf(e), l === -1 ? (h.warn(
-        "[Haori]",
-        "Reference child not found in children.",
-        e
-      ), this.children.push(t)) : this.children.splice(l, 0, t);
+      if (n ? a !== -1 && a < o ? l = o - 1 : l = o : l = this.children.indexOf(e), l === -1) {
+        const f = this.resolveInsertionPointFromDom(
+          e,
+          !1
+        );
+        f === null ? (h.warn(
+          "[Haori]",
+          "Reference child not found in children.",
+          e
+        ), this.children.push(t)) : (this.children.splice(f.index, 0, t), u = f.referenceNode);
+      } else
+        this.children.splice(l, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const m = this.skipMutationNodes;
+    const b = this.skipMutationNodes;
     return this.skipMutationNodes = !0, T.enqueue(() => {
-      this.target.insertBefore(
-        t.getTarget(),
-        e?.getTarget() || null
-      );
+      this.target.insertBefore(t.getTarget(), u);
     }).finally(() => {
-      this.skipMutationNodes = m;
+      this.skipMutationNodes = b;
     });
   }
   /**
@@ -1162,12 +1584,23 @@ class M extends A {
   insertAfter(t, e) {
     if (e == null)
       return this.insertBefore(t, null);
-    const s = this.children.indexOf(e);
-    return s === -1 ? (h.warn(
-      "[Haori]",
-      "Reference child not found in children.",
-      e
-    ), this.insertBefore(t, null)) : this.insertBefore(t, this.children[s + 1] || null);
+    const r = this.children.indexOf(e);
+    if (r === -1) {
+      const i = this.resolveInsertionPointFromDom(
+        e,
+        !0
+      );
+      return i === null ? (h.warn(
+        "[Haori]",
+        "Reference child not found in children.",
+        e
+      ), this.insertBefore(t, null)) : this.insertBefore(
+        t,
+        this.children[i.index] || null,
+        i.referenceNode
+      );
+    }
+    return this.insertBefore(t, this.children[r + 1] || null);
   }
   /**
    * 前のエレメントフラグメントを取得します。
@@ -1179,8 +1612,8 @@ class M extends A {
     const t = this.getParent();
     if (t === null)
       return null;
-    const e = t.getChildElementFragments(), s = e.indexOf(this);
-    return s <= 0 ? null : e[s - 1];
+    const e = t.getChildElementFragments(), r = e.indexOf(this);
+    return r <= 0 ? null : e[r - 1];
   }
   /**
    * 次のエレメントフラグメントを取得します。
@@ -1192,8 +1625,8 @@ class M extends A {
     const t = this.getParent();
     if (t === null)
       return null;
-    const e = t.getChildElementFragments(), s = e.indexOf(this);
-    return s < 0 || s + 1 >= e.length ? null : e[s + 1];
+    const e = t.getChildElementFragments(), r = e.indexOf(this);
+    return r < 0 || r + 1 >= e.length ? null : e[r + 1];
   }
   /**
    * 表示状態を返します。
@@ -1233,7 +1666,7 @@ class M extends A {
     return e === null ? null : e.closestByAttribute(t);
   }
 }
-class H extends A {
+class j extends A {
   /**
    * テキストフラグメントのコンストラクタ。
    * 対象テキストノードの内容を初期化します。
@@ -1241,7 +1674,7 @@ class H extends A {
    * @param target 対象テキストノード
    */
   constructor(t) {
-    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new j(this.text);
+    super(t), this.skipMutation = !1, this.text = t.textContent || "", this.contents = new $(this.text);
   }
   /**
    * フラグメントをクローンします。
@@ -1249,7 +1682,7 @@ class H extends A {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new H(this.target.cloneNode(!0));
+    const t = new j(this.target.cloneNode(!0));
     return t.mounted = !1, t.text = this.text, t.contents = this.contents, t;
   }
   /**
@@ -1267,7 +1700,7 @@ class H extends A {
    * @returns 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new j(t), this.evaluate());
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, this.contents = new $(t), this.evaluate());
   }
   /**
    * フラグメントを評価します。
@@ -1280,7 +1713,7 @@ class H extends A {
     ) : T.enqueue(() => {
       this.skipMutation = !0, this.contents.isRawEvaluate ? this.parent.getTarget().innerHTML = this.contents.evaluate(
         this.parent.getBindingData()
-      )[0] : this.contents.isEvaluate ? this.target.textContent = j.joinEvaluateResults(
+      )[0] : this.contents.isEvaluate ? this.target.textContent = $.joinEvaluateResults(
         this.contents.evaluate(this.parent.getBindingData())
       ) : this.target.textContent = this.text;
     }).finally(() => {
@@ -1338,10 +1771,10 @@ const q = class q {
   constructor(t) {
     this.contents = [], this.isEvaluate = !1, this.isRawEvaluate = !1, this.value = t;
     const e = [...t.matchAll(q.PLACEHOLDER_REGEX)];
-    let s = 0, r = !1, i = !1;
+    let r = 0, i = !1, s = !1;
     for (const n of e) {
-      n.index > s && this.contents.push({
-        text: t.slice(s, n.index),
+      n.index > r && this.contents.push({
+        text: t.slice(r, n.index),
         type: 0
         /* TEXT */
       });
@@ -1350,13 +1783,13 @@ const q = class q {
         type: n[1] ? 2 : 1
         /* EXPRESSION */
       };
-      r = !0, i = i || a.type === 2, this.contents.push(a), s = n.index + n[0].length;
+      i = !0, s = s || a.type === 2, this.contents.push(a), r = n.index + n[0].length;
     }
-    s < t.length && this.contents.push({
-      text: t.slice(s),
+    r < t.length && this.contents.push({
+      text: t.slice(r),
       type: 0
       /* TEXT */
-    }), this.isEvaluate = r, this.isRawEvaluate = i, this.checkRawExpressions();
+    }), this.isEvaluate = i, this.isRawEvaluate = s, this.checkRawExpressions();
   }
   /**
    * 評価結果を結合して文字列にします。
@@ -1393,28 +1826,28 @@ const q = class q {
    */
   evaluate(t) {
     if (!this.isEvaluate && !this.isRawEvaluate)
-      return this.contents.map((s) => s.text);
+      return this.contents.map((r) => r.text);
     const e = [];
-    return this.contents.forEach((s) => {
+    return this.contents.forEach((r) => {
       try {
-        if (s.type === 1 || s.type === 2) {
-          const r = L.evaluate(s.text, t);
-          e.push(r);
+        if (r.type === 1 || r.type === 2) {
+          const i = H.evaluate(r.text, t);
+          e.push(i);
         } else
-          e.push(s.text);
-      } catch (r) {
+          e.push(r.text);
+      } catch (i) {
         h.error(
           "[Haori]",
-          `Error evaluating text expression: ${s.text}`,
-          r
+          `Error evaluating text expression: ${r.text}`,
+          i
         ), e.push("");
       }
     }), e;
   }
 };
 q.PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
-let j = q;
-const U = class U extends j {
+let $ = q;
+const U = class U extends $ {
   /**
    * コンストラクタ。
    *
@@ -1440,20 +1873,20 @@ const U = class U extends j {
    */
   evaluate(t) {
     if (!this.isEvaluate && !this.forceEvaluation)
-      return this.contents.map((s) => s.text);
+      return this.contents.map((r) => r.text);
     const e = [];
-    return this.contents.forEach((s) => {
+    return this.contents.forEach((r) => {
       try {
-        if (this.forceEvaluation && s.type === 0 || s.type === 1 || s.type === 2) {
-          const r = L.evaluate(s.text, t);
-          e.push(r);
+        if (this.forceEvaluation && r.type === 0 || r.type === 1 || r.type === 2) {
+          const i = H.evaluate(r.text, t);
+          e.push(i);
         } else
-          e.push(s.text);
-      } catch (r) {
+          e.push(r.text);
+      } catch (i) {
         h.error(
           "[Haori]",
-          `Error evaluating attribute expression: ${s.text}`,
-          r
+          `Error evaluating attribute expression: ${r.text}`,
+          i
         ), e.push("");
       }
     }), this.forceEvaluation && e.length > 1 ? (h.error(
@@ -1469,8 +1902,8 @@ U.FORCE_EVALUATION_ATTRIBUTES = [
   "data-each",
   "hor-each"
 ];
-let I = U;
-class y {
+let L = U;
+class E {
   /**
    * カスタムイベントを発火します。
    *
@@ -1479,14 +1912,14 @@ class y {
    * @param detail イベントの詳細データ
    * @param options イベントオプション
    */
-  static dispatch(t, e, s, r) {
-    const i = new CustomEvent(`haori:${e}`, {
-      bubbles: r?.bubbles ?? !0,
-      cancelable: r?.cancelable ?? !1,
-      composed: r?.composed ?? !0,
-      detail: s
+  static dispatch(t, e, r, i) {
+    const s = new CustomEvent(`haori:${e}`, {
+      bubbles: i?.bubbles ?? !0,
+      cancelable: i?.cancelable ?? !1,
+      composed: i?.composed ?? !0,
+      detail: r
     });
-    return t.dispatchEvent(i);
+    return t.dispatchEvent(s);
   }
   /**
    * readyイベントを発火します。
@@ -1494,7 +1927,7 @@ class y {
    * @param version ライブラリバージョン
    */
   static ready(t) {
-    y.dispatch(document, "ready", { version: t });
+    E.dispatch(document, "ready", { version: t });
   }
   /**
    * renderイベントを発火します。
@@ -1502,7 +1935,7 @@ class y {
    * @param target 評価対象要素
    */
   static render(t) {
-    y.dispatch(t, "render", { target: t });
+    E.dispatch(t, "render", { target: t });
   }
   /**
    * importstartイベントを発火します。
@@ -1511,7 +1944,7 @@ class y {
    * @param url インポート対象URL
    */
   static importStart(t, e) {
-    y.dispatch(t, "importstart", {
+    E.dispatch(t, "importstart", {
       url: e,
       startedAt: performance.now()
     });
@@ -1524,11 +1957,11 @@ class y {
    * @param bytes 取得バイト数
    * @param startedAt 開始時刻
    */
-  static importEnd(t, e, s, r) {
-    y.dispatch(t, "importend", {
+  static importEnd(t, e, r, i) {
+    E.dispatch(t, "importend", {
       url: e,
-      bytes: s,
-      durationMs: performance.now() - r
+      bytes: r,
+      durationMs: performance.now() - i
     });
   }
   /**
@@ -1538,8 +1971,8 @@ class y {
    * @param url インポート対象URL
    * @param error エラー内容
    */
-  static importError(t, e, s) {
-    y.dispatch(t, "importerror", { url: e, error: s });
+  static importError(t, e, r) {
+    E.dispatch(t, "importerror", { url: e, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -1549,17 +1982,17 @@ class y {
    * @param next 変更後のデータ
    * @param reason 変更理由
    */
-  static bindChange(t, e, s, r = "other") {
-    const i = [], n = new Set(Object.keys(e || {})), a = new Set(Object.keys(s)), u = /* @__PURE__ */ new Set([...n, ...a]);
-    for (const m of u) {
-      const l = e?.[m], b = s[m];
-      l !== b && i.push(m);
+  static bindChange(t, e, r, i = "other") {
+    const s = [], n = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...n, ...a]);
+    for (const g of o) {
+      const u = e?.[g], b = r[g];
+      u !== b && s.push(g);
     }
-    y.dispatch(t, "bindchange", {
+    E.dispatch(t, "bindchange", {
       previous: e || {},
-      next: s,
-      changedKeys: i,
-      reason: r
+      next: r,
+      changedKeys: s,
+      reason: i
     });
   }
   /**
@@ -1570,12 +2003,12 @@ class y {
    * @param removed 削除された行のキー
    * @param order 現在の順序
    */
-  static eachUpdate(t, e, s, r) {
-    y.dispatch(t, "eachupdate", {
+  static eachUpdate(t, e, r, i) {
+    E.dispatch(t, "eachupdate", {
       added: e,
-      removed: s,
-      order: r,
-      total: r.length
+      removed: r,
+      order: i,
+      total: i.length
     });
   }
   /**
@@ -1586,8 +2019,8 @@ class y {
    * @param index インデックス
    * @param item 行データ
    */
-  static rowAdd(t, e, s, r) {
-    y.dispatch(t, "rowadd", { key: e, index: s, item: r });
+  static rowAdd(t, e, r, i) {
+    E.dispatch(t, "rowadd", { key: e, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -1596,8 +2029,8 @@ class y {
    * @param key 行キー
    * @param index インデックス
    */
-  static rowRemove(t, e, s) {
-    y.dispatch(t, "rowremove", { key: e, index: s });
+  static rowRemove(t, e, r) {
+    E.dispatch(t, "rowremove", { key: e, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -1607,8 +2040,8 @@ class y {
    * @param from 移動前インデックス
    * @param to 移動後インデックス
    */
-  static rowMove(t, e, s, r) {
-    y.dispatch(t, "rowmove", { key: e, from: s, to: r });
+  static rowMove(t, e, r, i) {
+    E.dispatch(t, "rowmove", { key: e, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -1616,7 +2049,7 @@ class y {
    * @param target data-if要素
    */
   static show(t) {
-    y.dispatch(t, "show", { visible: !0 });
+    E.dispatch(t, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -1624,7 +2057,7 @@ class y {
    * @param target data-if要素
    */
   static hide(t) {
-    y.dispatch(t, "hide", { visible: !1 });
+    E.dispatch(t, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -1634,11 +2067,11 @@ class y {
    * @param options フェッチオプション
    * @param payload 送信データ
    */
-  static fetchStart(t, e, s, r) {
-    y.dispatch(t, "fetchstart", {
+  static fetchStart(t, e, r, i) {
+    E.dispatch(t, "fetchstart", {
       url: e,
-      options: s || {},
-      payload: r,
+      options: r || {},
+      payload: i,
       startedAt: performance.now()
     });
   }
@@ -1650,11 +2083,11 @@ class y {
    * @param status HTTPステータス
    * @param startedAt 開始時刻
    */
-  static fetchEnd(t, e, s, r) {
-    y.dispatch(t, "fetchend", {
+  static fetchEnd(t, e, r, i) {
+    E.dispatch(t, "fetchend", {
       url: e,
-      status: s,
-      durationMs: performance.now() - r
+      status: r,
+      durationMs: performance.now() - i
     });
   }
   /**
@@ -1666,16 +2099,16 @@ class y {
    * @param status HTTPステータス（存在する場合）
    * @param startedAt 開始時刻（存在する場合）
    */
-  static fetchError(t, e, s, r, i) {
-    y.dispatch(t, "fetcherror", {
+  static fetchError(t, e, r, i, s) {
+    E.dispatch(t, "fetcherror", {
       url: e,
-      status: r,
-      error: s,
-      durationMs: i ? performance.now() - i : void 0
+      status: i,
+      error: r,
+      durationMs: s ? performance.now() - s : void 0
     });
   }
 }
-class f {
+class d {
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -1683,8 +2116,8 @@ class f {
    *    ("change", "bind-arg") => "data-change-bind-arg"
    * 非イベント変種が "data-fetch-xxx" として存在するものについては、event が null の場合にそちらを返します。
    */
-  static attrName(t, e, s = !1) {
-    return t ? `${c.prefix}${t}-${e}` : s ? `${c.prefix}fetch-${e}` : `${c.prefix}${e}`;
+  static attrName(t, e, r = !1) {
+    return t ? `${c.prefix}${t}-${e}` : r ? `${c.prefix}fetch-${e}` : `${c.prefix}${e}`;
   }
   /**
    * オプションをフラグメントの属性から構築します。
@@ -1694,103 +2127,103 @@ class f {
    * @return 構築されたオプション
    */
   static buildOptions(t, e) {
-    const s = {
+    const r = {
       targetFragment: t
     };
     if (e) {
-      if (t.hasAttribute(f.attrName(e, "validate")) && (s.valid = !0), t.hasAttribute(f.attrName(e, "confirm")) && (s.confirmMessage = t.getAttribute(
-        f.attrName(e, "confirm")
-      )), t.hasAttribute(f.attrName(e, "data")) && (s.data = N.parseDataBind(
-        t.getRawAttribute(f.attrName(e, "data"))
-      )), t.hasAttribute(f.attrName(e, "form"))) {
-        const o = t.getRawAttribute(
-          f.attrName(e, "form")
+      if (t.hasAttribute(d.attrName(e, "validate")) && (r.valid = !0), t.hasAttribute(d.attrName(e, "confirm")) && (r.confirmMessage = t.getAttribute(
+        d.attrName(e, "confirm")
+      )), t.hasAttribute(d.attrName(e, "data")) && (r.data = N.parseDataBind(
+        t.getRawAttribute(d.attrName(e, "data"))
+      )), t.hasAttribute(d.attrName(e, "form"))) {
+        const l = t.getRawAttribute(
+          d.attrName(e, "form")
         );
-        if (o) {
-          const d = document.body.querySelector(o);
-          d !== null ? s.formFragment = E.getFormFragment(
-            A.get(d)
+        if (l) {
+          const f = document.body.querySelector(l);
+          f !== null ? r.formFragment = y.getFormFragment(
+            A.get(f)
           ) : h.error(
             "Haori",
-            `Form element not found: ${o} (${f.attrName(e, "form")})`
+            `Form element not found: ${l} (${d.attrName(e, "form")})`
           );
         } else
-          s.formFragment = E.getFormFragment(t);
-      } else e === "change" && (s.formFragment = E.getFormFragment(t));
+          r.formFragment = y.getFormFragment(t);
+      } else e === "change" && (r.formFragment = y.getFormFragment(t));
       if (t.hasAttribute(`${c.prefix}${e}-before-run`)) {
-        const o = t.getRawAttribute(
+        const l = t.getRawAttribute(
           `${c.prefix}${e}-before-run`
         );
         try {
-          s.beforeCallback = new Function(
+          r.beforeCallback = new Function(
             "fetchUrl",
             "fetchOptions",
             `
 "use strict";
-${o}
+${l}
 `
           );
-        } catch (d) {
-          h.error("Haori", `Invalid before script: ${d}`);
+        } catch (f) {
+          h.error("Haori", `Invalid before script: ${f}`);
         }
       }
     }
-    const r = f.attrName(e, "fetch"), i = t.hasAttribute(r);
-    i && (s.fetchUrl = t.getAttribute(r));
+    const i = d.attrName(e, "fetch"), s = t.hasAttribute(i);
+    s && (r.fetchUrl = t.getAttribute(i));
     const n = {};
     if (e) {
-      const o = f.attrName(e, "fetch-method");
-      t.hasAttribute(o) && (n.method = t.getAttribute(
-        o
+      const l = d.attrName(e, "fetch-method");
+      t.hasAttribute(l) && (n.method = t.getAttribute(
+        l
       ));
     } else {
-      const o = f.attrName(null, "method", !0);
-      t.hasAttribute(o) && (n.method = t.getAttribute(
-        o
+      const l = d.attrName(null, "method", !0);
+      t.hasAttribute(l) && (n.method = t.getAttribute(
+        l
       ));
     }
     if (e) {
-      const o = f.attrName(e, "fetch-headers");
-      if (t.hasAttribute(o)) {
-        const d = t.getRawAttribute(
-          o
+      const l = d.attrName(e, "fetch-headers");
+      if (t.hasAttribute(l)) {
+        const f = t.getRawAttribute(
+          l
         );
         try {
-          n.headers = N.parseDataBind(d);
-        } catch (g) {
-          h.error("Haori", `Invalid fetch headers: ${g}`);
+          n.headers = N.parseDataBind(f);
+        } catch (p) {
+          h.error("Haori", `Invalid fetch headers: ${p}`);
         }
       }
     } else {
-      const o = f.attrName(
+      const l = d.attrName(
         null,
         "headers",
         !0
       );
-      if (t.hasAttribute(o)) {
-        const d = t.getRawAttribute(
-          o
+      if (t.hasAttribute(l)) {
+        const f = t.getRawAttribute(
+          l
         );
         try {
-          n.headers = N.parseDataBind(d);
-        } catch (g) {
-          h.error("Haori", `Invalid fetch headers: ${g}`);
+          n.headers = N.parseDataBind(f);
+        } catch (p) {
+          h.error("Haori", `Invalid fetch headers: ${p}`);
         }
       }
     }
     if (e) {
-      const o = f.attrName(
+      const l = d.attrName(
         e,
         "fetch-content-type"
       );
-      if (t.hasAttribute(o))
+      if (t.hasAttribute(l))
         n.headers = {
           ...n.headers,
-          "Content-Type": t.getAttribute(o)
+          "Content-Type": t.getAttribute(l)
         };
       else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let d = !1;
-        n.headers && typeof n.headers == "object" && (d = "Content-Type" in n.headers), d || (n.headers = {
+        let f = !1;
+        n.headers && typeof n.headers == "object" && (f = "Content-Type" in n.headers), f || (n.headers = {
           ...n.headers,
           "Content-Type": "application/json"
         });
@@ -1799,19 +2232,19 @@ ${o}
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const o = f.attrName(
+      const l = d.attrName(
         null,
         "content-type",
         !0
       );
-      if (t.hasAttribute(o))
+      if (t.hasAttribute(l))
         n.headers = {
           ...n.headers,
-          "Content-Type": t.getAttribute(o)
+          "Content-Type": t.getAttribute(l)
         };
       else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
-        let d = !1;
-        n.headers && typeof n.headers == "object" && (d = "Content-Type" in n.headers), d || (n.headers = {
+        let f = !1;
+        n.headers && typeof n.headers == "object" && (f = "Content-Type" in n.headers), f || (n.headers = {
           ...n.headers,
           "Content-Type": "application/json"
         });
@@ -1820,140 +2253,140 @@ ${o}
         "Content-Type": "application/x-www-form-urlencoded"
       });
     }
-    Object.keys(n).length > 0 && (s.fetchOptions = n);
-    const a = e ? f.attrName(e, "bind") : f.attrName(null, "bind", !0);
+    Object.keys(n).length > 0 && (r.fetchOptions = n);
+    const a = e ? d.attrName(e, "bind") : d.attrName(null, "bind", !0);
     if (t.hasAttribute(a)) {
-      const o = t.getRawAttribute(a);
-      if (o) {
-        const d = document.body.querySelectorAll(o);
-        d.length > 0 ? (s.bindFragments = [], d.forEach((g) => {
-          const v = A.get(g);
-          v && s.bindFragments.push(v);
+      const l = t.getRawAttribute(a);
+      if (l) {
+        const f = document.body.querySelectorAll(l);
+        f.length > 0 ? (r.bindFragments = [], f.forEach((p) => {
+          const w = A.get(p);
+          w && r.bindFragments.push(w);
         })) : h.error(
           "Haori",
-          `Bind element not found: ${o} (${a})`
+          `Bind element not found: ${l} (${a})`
         );
       }
     }
-    const u = f.attrName(e, "bind-arg"), m = f.attrName(
+    const o = d.attrName(e, "bind-arg"), g = d.attrName(
       null,
       "arg",
       !0
-    ), l = f.attrName(
+    ), u = d.attrName(
       null,
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(u) && (s.bindArg = t.getRawAttribute(u)) : t.hasAttribute(m) ? s.bindArg = t.getRawAttribute(
-      m
-    ) : t.hasAttribute(l) && (s.bindArg = t.getRawAttribute(l));
-    const b = e ? f.attrName(e, "bind-params") : f.attrName(null, "bind-params", !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 ? d.attrName(e, "bind-params") : d.attrName(null, "bind-params", !0);
     if (t.hasAttribute(b)) {
-      const o = t.getRawAttribute(b);
-      s.bindParams = o.split("&").map((d) => d.trim());
+      const l = t.getRawAttribute(b);
+      r.bindParams = l.split("&").map((f) => f.trim());
     }
     if (e) {
-      if (t.hasAttribute(f.attrName(e, "adjust"))) {
-        const d = t.getRawAttribute(
-          f.attrName(e, "adjust")
+      if (t.hasAttribute(d.attrName(e, "adjust"))) {
+        const f = t.getRawAttribute(
+          d.attrName(e, "adjust")
         );
-        if (d) {
-          const g = document.body.querySelectorAll(d);
-          g.length > 0 ? (s.adjustFragments = [], g.forEach((v) => {
-            const w = A.get(v);
-            w && s.adjustFragments.push(w);
+        if (f) {
+          const p = document.body.querySelectorAll(f);
+          p.length > 0 ? (r.adjustFragments = [], p.forEach((w) => {
+            const v = A.get(w);
+            v && r.adjustFragments.push(v);
           })) : h.error(
             "Haori",
-            `Adjust element not found: ${d} (${f.attrName(e, "adjust")})`
+            `Adjust element not found: ${f} (${d.attrName(e, "adjust")})`
           );
         }
-        if (t.hasAttribute(f.attrName(e, "adjust-value"))) {
-          const g = t.getRawAttribute(
-            f.attrName(e, "adjust-value")
-          ), v = Number(g);
-          isNaN(v) || (s.adjustValue = v);
+        if (t.hasAttribute(d.attrName(e, "adjust-value"))) {
+          const p = t.getRawAttribute(
+            d.attrName(e, "adjust-value")
+          ), w = Number(p);
+          isNaN(w) || (r.adjustValue = w);
         }
       }
-      if (t.hasAttribute(f.attrName(e, "row-add")) && (s.rowAdd = !0), t.hasAttribute(f.attrName(e, "row-remove")) && (s.rowRemove = !0), t.hasAttribute(f.attrName(e, "row-prev")) && (s.rowMovePrev = !0), t.hasAttribute(f.attrName(e, "row-next")) && (s.rowMoveNext = !0), t.hasAttribute(`${c.prefix}${e}-after-run`)) {
-        const d = t.getRawAttribute(
+      if (t.hasAttribute(d.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(d.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(d.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(d.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${c.prefix}${e}-after-run`)) {
+        const f = t.getRawAttribute(
           `${c.prefix}${e}-after-run`
         );
         try {
-          s.afterCallback = new Function(
+          r.afterCallback = new Function(
             "response",
             `
 "use strict";
-${d}
+${f}
 `
           );
-        } catch (g) {
-          h.error("Haori", `Invalid after script: ${g}`);
+        } catch (p) {
+          h.error("Haori", `Invalid after script: ${p}`);
         }
       }
-      t.hasAttribute(f.attrName(e, "dialog")) && (s.dialogMessage = t.getAttribute(
-        f.attrName(e, "dialog")
-      )), t.hasAttribute(f.attrName(e, "toast")) && (s.toastMessage = t.getAttribute(
-        f.attrName(e, "toast")
-      )), t.hasAttribute(f.attrName(e, "redirect")) && (s.redirectUrl = t.getAttribute(
-        f.attrName(e, "redirect")
+      t.hasAttribute(d.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
+        d.attrName(e, "dialog")
+      )), t.hasAttribute(d.attrName(e, "toast")) && (r.toastMessage = t.getAttribute(
+        d.attrName(e, "toast")
+      )), t.hasAttribute(d.attrName(e, "redirect")) && (r.redirectUrl = t.getAttribute(
+        d.attrName(e, "redirect")
       )), [
         "reset",
         "refetch",
         "click",
         "open",
         "close"
-      ].forEach((d) => {
-        const g = f.attrName(e, d);
-        if (!t.hasAttribute(g))
+      ].forEach((f) => {
+        const p = d.attrName(e, f);
+        if (!t.hasAttribute(p))
           return;
-        const v = t.getRawAttribute(g), w = [];
-        if (v ? (document.body.querySelectorAll(v).forEach((x) => {
+        const w = t.getRawAttribute(p), v = [];
+        if (w ? (document.body.querySelectorAll(w).forEach((x) => {
           const F = A.get(x);
-          F && w.push(F);
-        }), w.length === 0 && h.error("Haori", `Element not found: ${v} (${g})`)) : w.push(t), w.length > 0)
-          switch (d) {
+          F && v.push(F);
+        }), v.length === 0 && h.error("Haori", `Element not found: ${w} (${p})`)) : v.push(t), v.length > 0)
+          switch (f) {
             case "reset":
-              s.resetFragments = w;
+              r.resetFragments = v;
               break;
             case "refetch":
-              s.refetchFragments = w;
+              r.refetchFragments = v;
               break;
             case "click":
-              s.clickFragments = w;
+              r.clickFragments = v;
               break;
             case "open":
-              s.openFragments = w;
+              r.openFragments = v;
               break;
             case "close":
-              s.closeFragments = w;
+              r.closeFragments = v;
               break;
           }
       });
     }
     if (!e) {
-      if (t.hasAttribute(f.attrName(null, "data", !0))) {
-        const o = t.getRawAttribute(
-          f.attrName(null, "data", !0)
+      if (t.hasAttribute(d.attrName(null, "data", !0))) {
+        const l = t.getRawAttribute(
+          d.attrName(null, "data", !0)
         );
-        s.data = N.parseDataBind(o);
+        r.data = N.parseDataBind(l);
       }
-      if (t.hasAttribute(f.attrName(null, "form", !0))) {
-        const o = t.getRawAttribute(
-          f.attrName(null, "form", !0)
+      if (t.hasAttribute(d.attrName(null, "form", !0))) {
+        const l = t.getRawAttribute(
+          d.attrName(null, "form", !0)
         );
-        if (o) {
-          const d = document.body.querySelector(o);
-          d !== null ? s.formFragment = E.getFormFragment(
-            A.get(d)
+        if (l) {
+          const f = document.body.querySelector(l);
+          f !== null ? r.formFragment = y.getFormFragment(
+            A.get(f)
           ) : h.error(
             "Haori",
-            `Form element not found: ${o} (${f.attrName(null, "fetch-form", !0)})`
+            `Form element not found: ${l} (${d.attrName(null, "fetch-form", !0)})`
           );
         } else
-          s.formFragment = E.getFormFragment(t);
+          r.formFragment = y.getFormFragment(t);
       }
     }
-    return i && (!s.bindFragments || s.bindFragments.length === 0) && (s.bindFragments = [t]), s;
+    return s && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
   }
   /**
    * ElementFragment の構造的タイプガード。
@@ -1974,7 +2407,7 @@ ${d}
    * @param arg2 イベント名
    */
   constructor(t, e = null) {
-    f.isElementFragment(t) ? this.options = f.buildOptions(t, e) : this.options = t;
+    d.isElementFragment(t) ? this.options = d.buildOptions(t, e) : this.options = t;
   }
   /**
    * 一連の処理を実行します。オプションが空の場合は即座にresolveされます。
@@ -1985,84 +2418,84 @@ ${d}
     return Object.keys(this.options).length === 0 || this.options.formFragment && this.validate(this.options.formFragment) === !1 ? Promise.resolve() : this.confirm().then((t) => {
       if (!t)
         return Promise.resolve();
-      let e = this.options.fetchUrl, s = this.options.fetchOptions;
+      let e = this.options.fetchUrl, r = this.options.fetchOptions;
       if (this.options.beforeCallback) {
         const n = this.options.beforeCallback(
           e || null,
-          s || null
+          r || null
         );
         if (n != null) {
           if (n === !1 || typeof n == "object" && n.stop)
             return Promise.resolve();
-          typeof n == "object" && (e = "fetchUrl" in n ? n.fetchUrl : e, s = "fetchOptions" in n ? n.fetchOptions : s);
+          typeof n == "object" && (e = "fetchUrl" in n ? n.fetchUrl : e, r = "fetchOptions" in n ? n.fetchOptions : r);
         }
       }
-      const r = {};
+      const i = {};
       if (this.options.formFragment) {
-        const n = E.getValues(this.options.formFragment);
-        Object.assign(r, n);
+        const n = y.getValues(this.options.formFragment);
+        Object.assign(i, n);
       }
-      this.options.data && typeof this.options.data == "object" && Object.assign(r, this.options.data);
-      const i = Object.keys(r).length > 0;
+      this.options.data && typeof this.options.data == "object" && Object.assign(i, this.options.data);
+      const s = Object.keys(i).length > 0;
       if (e) {
-        const n = { ...s || {} }, a = new Headers(
+        const n = { ...r || {} }, a = new Headers(
           n.headers || void 0
-        ), u = (n.method || "GET").toUpperCase();
-        if (u === "GET" || u === "HEAD" || u === "OPTIONS") {
-          if (i) {
-            const m = new URL(e, window.location.href), l = new URLSearchParams(m.search);
-            for (const [b, o] of Object.entries(r))
-              o !== void 0 && (o === null ? l.append(b, "") : Array.isArray(o) ? o.forEach((d) => {
-                l.append(b, String(d));
-              }) : typeof o == "object" || typeof o == "function" ? l.append(b, JSON.stringify(o)) : l.append(b, String(o)));
-            m.search = l.toString(), e = m.toString();
+        ), o = (n.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(i))
+              l !== void 0 && (l === null ? u.append(b, "") : Array.isArray(l) ? l.forEach((f) => {
+                u.append(b, String(f));
+              }) : typeof l == "object" || typeof l == "function" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l)));
+            g.search = u.toString(), e = g.toString();
           }
-        } else if (i) {
-          const m = a.get("Content-Type") || "";
-          if (/multipart\/form-data/i.test(m)) {
+        } else if (s) {
+          const g = a.get("Content-Type") || "";
+          if (/multipart\/form-data/i.test(g)) {
             a.delete("Content-Type");
-            const l = new FormData();
-            for (const [b, o] of Object.entries(r))
-              o == null ? l.append(b, "") : o instanceof Blob ? l.append(b, o) : Array.isArray(o) ? o.forEach((d) => l.append(b, String(d))) : typeof o == "object" ? l.append(b, JSON.stringify(o)) : l.append(b, String(o));
-            n.body = l;
-          } else if (/application\/x-www-form-urlencoded/i.test(m)) {
-            const l = new URLSearchParams();
-            for (const [b, o] of Object.entries(r))
-              o !== void 0 && (o === null ? l.append(b, "") : Array.isArray(o) ? o.forEach((d) => l.append(b, String(d))) : typeof o == "object" ? l.append(b, JSON.stringify(o)) : l.append(b, String(o)));
-            n.body = l;
+            const u = new FormData();
+            for (const [b, l] of Object.entries(i))
+              l == null ? u.append(b, "") : l instanceof Blob ? u.append(b, l) : Array.isArray(l) ? l.forEach((f) => u.append(b, String(f))) : typeof l == "object" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l));
+            n.body = u;
+          } else if (/application\/x-www-form-urlencoded/i.test(g)) {
+            const u = new URLSearchParams();
+            for (const [b, l] of Object.entries(i))
+              l !== void 0 && (l === null ? u.append(b, "") : Array.isArray(l) ? l.forEach((f) => u.append(b, String(f))) : typeof l == "object" ? u.append(b, JSON.stringify(l)) : u.append(b, String(l)));
+            n.body = u;
           } else
-            a.set("Content-Type", "application/json"), n.body = JSON.stringify(r);
+            a.set("Content-Type", "application/json"), n.body = JSON.stringify(i);
         }
         if (n.headers = a, this.options.targetFragment && e) {
-          const m = performance.now();
-          return y.fetchStart(
+          const g = performance.now();
+          return E.fetchStart(
             this.options.targetFragment.getTarget(),
             e,
             n,
-            i ? r : void 0
-          ), fetch(e, n).then((l) => this.handleFetchResult(
-            l,
+            s ? i : void 0
+          ), fetch(e, n).then((u) => this.handleFetchResult(
+            u,
             e || void 0,
-            m
-          )).catch((l) => {
-            throw e && y.fetchError(
+            g
+          )).catch((u) => {
+            throw e && E.fetchError(
               this.options.targetFragment.getTarget(),
               e,
-              l
-            ), l;
+              u
+            ), u;
           });
-        } else return e ? fetch(e, n).then((m) => this.handleFetchResult(m, e || void 0)) : Promise.resolve();
+        } else return e ? fetch(e, n).then((g) => this.handleFetchResult(g, e || void 0)) : Promise.resolve();
       } else {
-        if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && i) {
-          const u = this.options.formFragment, m = u.getTarget();
-          m.setAttribute(
+        if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && s) {
+          const o = this.options.formFragment, g = o.getTarget();
+          g.setAttribute(
             `${c.prefix}bind`,
-            JSON.stringify(r)
+            JSON.stringify(i)
           );
-          const l = u.getBindingData();
-          return Object.assign(l, r), N.setBindingData(m, l);
+          const u = o.getBindingData();
+          return Object.assign(u, i), N.setBindingData(g, u);
         }
-        const n = i ? r : {}, a = new Response(JSON.stringify(n), {
+        const n = s ? i : {}, a = new Response(JSON.stringify(n), {
           headers: { "Content-Type": "application/json" }
         });
         return this.handleFetchResult(a);
@@ -2072,86 +2505,86 @@ ${d}
   /**
    * フェッチ後の処理を実行します。
    */
-  handleFetchResult(t, e, s) {
+  handleFetchResult(t, e, r) {
     if (!t.ok)
-      return this.options.targetFragment && e && y.fetchError(
+      return this.options.targetFragment && e && E.fetchError(
         this.options.targetFragment.getTarget(),
         e,
         new Error(`${t.status} ${t.statusText}`),
         t.status,
-        s
+        r
       ), this.handleFetchError(t);
-    if (this.options.targetFragment && e && s && y.fetchEnd(
+    if (this.options.targetFragment && e && r && E.fetchEnd(
       this.options.targetFragment.getTarget(),
       e,
       t.status,
-      s
+      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 r = [];
-    return r.push(this.bindResult(t)), r.push(this.adjust()), r.push(this.addRow()), r.push(this.removeRow()), r.push(this.movePrevRow()), r.push(this.moveNextRow()), this.options.resetFragments && this.options.resetFragments.length > 0 && this.options.resetFragments.forEach((i) => {
-      r.push(E.reset(i));
-    }), this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((i) => {
-      r.push(new f(i, null).run());
-    }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((i) => {
-      const n = 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(y.reset(s));
+    }), this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((s) => {
+      i.push(new d(s, null).run());
+    }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((s) => {
+      const n = s.getTarget();
       typeof n.click == "function" ? n.click() : n.dispatchEvent(
         new MouseEvent("click", { bubbles: !0, cancelable: !0 })
       );
-    }), this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((i) => {
-      const n = i.getTarget();
-      n instanceof HTMLDialogElement ? r.push(S.openDialog(n)) : h.error("Haori", "Element is not a dialog: ", n);
-    }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((i) => {
-      const n = i.getTarget();
-      n instanceof HTMLDialogElement ? r.push(S.closeDialog(n)) : h.error("Haori", "Element is not a dialog: ", n);
-    }), Promise.all(r).then(() => this.options.dialogMessage ? S.dialog(this.options.dialogMessage) : Promise.resolve()).then(() => this.options.toastMessage ? S.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 n = s.getTarget();
+      n instanceof HTMLDialogElement ? i.push(M.openDialog(n)) : h.error("Haori", "Element is not a dialog: ", n);
+    }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((s) => {
+      const n = s.getTarget();
+      n instanceof HTMLDialogElement ? i.push(M.closeDialog(n)) : h.error("Haori", "Element is not a dialog: ", n);
+    }), Promise.all(i).then(() => this.options.dialogMessage ? M.dialog(this.options.dialogMessage) : Promise.resolve()).then(() => this.options.toastMessage ? M.toast(this.options.toastMessage, "info") : Promise.resolve()).then(() => (this.options.redirectUrl && (window.location.href = this.options.redirectUrl), Promise.resolve()));
   }
   /**
    * フェッチエラー応答のメッセージを適切な要素へ伝播します。
    */
   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 s = async (i) => {
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = y.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    const r = async (s) => {
       const n = e ? e.getTarget() : document.body;
-      await S.addErrorMessage(n, i);
+      await M.addErrorMessage(n, s);
     };
     if ((t.headers.get("Content-Type") || "").includes("application/json"))
       try {
-        const i = await t.json(), n = [];
-        if (i && typeof i == "object") {
-          if (typeof i.message == "string" && n.push({ message: i.message }), Array.isArray(i.messages))
-            for (const a of i.messages)
+        const s = await t.json(), n = [];
+        if (s && typeof s == "object") {
+          if (typeof s.message == "string" && n.push({ message: s.message }), Array.isArray(s.messages))
+            for (const a of s.messages)
               typeof a == "string" && n.push({ message: a });
-          if (i.errors && typeof i.errors == "object")
-            for (const [a, u] of Object.entries(i.errors))
-              Array.isArray(u) ? n.push({ key: a, message: u.join(`
-`) }) : typeof u == "string" ? n.push({ key: a, message: u }) : u != null && n.push({ key: a, message: String(u) });
+          if (s.errors && typeof s.errors == "object")
+            for (const [a, o] of Object.entries(s.errors))
+              Array.isArray(o) ? n.push({ key: a, message: o.join(`
+`) }) : typeof o == "string" ? n.push({ key: a, message: o }) : o != null && n.push({ key: a, message: String(o) });
           if (n.length === 0)
-            for (const [a, u] of Object.entries(i))
-              a === "message" || a === "messages" || a === "errors" || (Array.isArray(u) ? n.push({ key: a, message: u.join(`
-`) }) : typeof u == "string" && n.push({ key: a, message: u }));
+            for (const [a, o] of Object.entries(s))
+              a === "message" || a === "messages" || a === "errors" || (Array.isArray(o) ? n.push({ key: a, message: o.join(`
+`) }) : typeof o == "string" && n.push({ key: a, message: o }));
         }
         if (n.length === 0) {
-          await s(`${t.status} ${t.statusText}`);
+          await r(`${t.status} ${t.statusText}`);
           return;
         }
         for (const a of n)
-          a.key && e ? await E.addErrorMessage(e, a.key, a.message) : await s(a.message);
+          a.key && e ? await y.addErrorMessage(e, a.key, a.message) : await r(a.message);
         return;
       } catch {
       }
     try {
-      const i = await t.text();
-      i && i.trim().length > 0 ? await s(i.trim()) : await s(`${t.status} ${t.statusText}`);
+      const s = await t.text();
+      s && s.trim().length > 0 ? await r(s.trim()) : await r(`${t.status} ${t.statusText}`);
     } catch {
-      await s(`${t.status} ${t.statusText}`);
+      await r(`${t.status} ${t.statusText}`);
     }
   }
   /**
@@ -2165,10 +2598,10 @@ ${d}
     if (this.options.valid !== !0)
       return !0;
     const e = t.getTarget();
-    let s = this.validateOne(t);
-    return s || e.focus(), t.getChildElementFragments().reverse().forEach((r) => {
-      s &&= this.validate(r);
-    }), s;
+    let r = this.validateOne(t);
+    return r || e.focus(), t.getChildElementFragments().reverse().forEach((i) => {
+      r &&= this.validate(i);
+    }), r;
   }
   /**
    * 対象のフラグメントに対してバリデーションを実行します。
@@ -2188,7 +2621,7 @@ ${d}
    */
   confirm() {
     const t = this.options.confirmMessage;
-    return t == null ? Promise.resolve(!0) : S.confirm(t);
+    return t == null ? Promise.resolve(!0) : M.confirm(t);
   }
   /**
    * 結果データを対象のフラグメントにバインドします。
@@ -2196,34 +2629,34 @@ ${d}
    * @param response フェッチのレスポンスオブジェクト
    */
   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((s) => {
+    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 i = {};
+        const s = {};
         this.options.bindParams.forEach((n) => {
-          s && typeof s == "object" && n in s && (i[n] = s[n]);
-        }), s = i;
+          r && typeof r == "object" && n in r && (s[n] = r[n]);
+        }), r = s;
       }
-      const r = [];
+      const i = [];
       if (this.options.bindArg)
-        this.options.bindFragments.forEach((i) => {
-          const n = i.getBindingData();
-          n[this.options.bindArg] = s, r.push(N.setBindingData(i.getTarget(), n));
+        this.options.bindFragments.forEach((s) => {
+          const n = s.getBindingData();
+          n[this.options.bindArg] = r, i.push(N.setBindingData(s.getTarget(), n));
         });
       else {
-        if (typeof s == "string")
+        if (typeof r == "string")
           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((i) => {
-          r.push(
+        this.options.bindFragments.forEach((s) => {
+          i.push(
             N.setBindingData(
-              i.getTarget(),
-              s
+              s.getTarget(),
+              r
             )
           );
         });
       }
-      return Promise.all(r).then(() => {
+      return Promise.all(i).then(() => {
       });
     });
   }
@@ -2234,11 +2667,11 @@ ${d}
     if (!this.options.adjustFragments || this.options.adjustFragments.length === 0)
       return Promise.resolve();
     const t = this.options.adjustValue ?? 0, e = [];
-    for (const s of this.options.adjustFragments) {
-      let r = s.getValue();
-      (r == null || r === "") && (r = "0");
-      let i = Number(r);
-      isNaN(i) && (i = 0), i += t, e.push(s.setValue(String(i)));
+    for (const r of this.options.adjustFragments) {
+      let i = r.getValue();
+      (i == null || i === "") && (i = "0");
+      let s = Number(i);
+      isNaN(s) && (s = 0), s += t, e.push(r.setValue(String(s)));
     }
     return Promise.all(e).then(() => {
     });
@@ -2267,10 +2700,10 @@ ${d}
     const t = this.getRowFragment();
     if (!t)
       return Promise.reject(new Error("Row fragment not found."));
-    const e = [], s = t.clone();
+    const e = [], r = t.clone();
     return e.push(
-      t.getParent().insertAfter(s, t)
-    ), e.push(N.evaluateAll(s)), e.push(E.reset(s)), Promise.all(e).then(() => {
+      t.getParent().insertAfter(r, t)
+    ), e.push(N.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -2285,7 +2718,7 @@ ${d}
     if (!t)
       return Promise.reject(new Error("Row fragment not found."));
     const e = t.getParent();
-    return e && e.getChildElementFragments().filter((r) => !r.hasAttribute(`${c.prefix}each-before`) && !r.hasAttribute(`${c.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
+    return e && e.getChildElementFragments().filter((i) => !i.hasAttribute(`${c.prefix}each-before`) && !i.hasAttribute(`${c.prefix}each-after`)).length <= 1 ? Promise.resolve() : t.remove();
   }
   /**
    * 前の行へ移動します。
@@ -2301,8 +2734,8 @@ ${d}
     const e = t.getPrevious();
     if (!e)
       return Promise.resolve();
-    const s = t.getParent();
-    return s ? s.insertBefore(t, e) : Promise.resolve();
+    const r = t.getParent();
+    return r ? r.insertBefore(t, e) : Promise.resolve();
   }
   /**
    * 次の行へ移動します。
@@ -2318,11 +2751,11 @@ ${d}
     const e = t.getNext();
     if (!e)
       return Promise.resolve();
-    const s = t.getParent();
-    return s ? s.insertAfter(t, e) : Promise.resolve();
+    const r = t.getParent();
+    return r ? r.insertAfter(t, e) : Promise.resolve();
   }
 }
-class W {
+class X {
   /**
    * URLのクエリパラメータを取得します。
    *
@@ -2330,12 +2763,12 @@ class W {
    */
   static readParams() {
     const t = {}, e = window.location.search;
-    return new URLSearchParams(e).forEach((r, i) => {
-      t[i] = r;
+    return new URLSearchParams(e).forEach((i, s) => {
+      t[s] = i;
     }), t;
   }
 }
-class Y {
+class J {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -2349,31 +2782,31 @@ class Y {
    * @returns body 内の HTML 文字列
    */
   static async load(t, e) {
-    let s;
+    let r;
     try {
-      s = await fetch(t, e);
-    } catch (i) {
-      throw h.error("[Haori]", "Failed to fetch import source:", t, i), new Error(`Failed to fetch: ${t}`);
+      r = await fetch(t, e);
+    } catch (s) {
+      throw h.error("[Haori]", "Failed to fetch import source:", t, s), new Error(`Failed to fetch: ${t}`);
     }
-    if (!s.ok) {
-      const i = `${s.status} ${s.statusText}`;
-      throw h.error("[Haori]", "Import HTTP error:", t, i), new Error(`Failed to load ${t}: ${i}`);
+    if (!r.ok) {
+      const s = `${r.status} ${r.statusText}`;
+      throw h.error("[Haori]", "Import HTTP error:", t, s), new Error(`Failed to load ${t}: ${s}`);
     }
-    let r;
+    let i;
     try {
-      r = await s.text();
-    } catch (i) {
-      throw h.error("[Haori]", "Failed to read response text:", t, i), new Error(`Failed to read response from: ${t}`);
+      i = await r.text();
+    } catch (s) {
+      throw h.error("[Haori]", "Failed to read response text:", t, s), new Error(`Failed to read response from: ${t}`);
     }
     try {
-      const n = new DOMParser().parseFromString(r, "text/html");
-      return n && n.body ? n.body.innerHTML : (h.warn("[Haori]", "No body found in imported document:", t), r);
-    } catch (i) {
-      return h.error("[Haori]", "Failed to parse imported HTML:", t, i), r;
+      const n = new DOMParser().parseFromString(i, "text/html");
+      return n && n.body ? n.body.innerHTML : (h.warn("[Haori]", "No body found in imported document:", t), i);
+    } catch (s) {
+      return h.error("[Haori]", "Failed to parse imported HTML:", t, s), i;
     }
   }
 }
-const p = class p {
+const m = class m {
   /**
    * 遅延属性かどうか（完全名で判定）を判定します。
    *
@@ -2381,7 +2814,7 @@ const p = class p {
    * @returns 遅延属性かどうか
    */
   static isDeferredAttributeName(t) {
-    return p.DEFERRED_ATTRIBUTE_SUFFIXES.some(
+    return m.DEFERRED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${c.prefix}${e}`
     );
   }
@@ -2396,36 +2829,36 @@ const p = class p {
     if (!e)
       return Promise.resolve();
     t.parentNode && (A.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
-    const s = [], r = /* @__PURE__ */ new Set();
-    for (const i of p.PRIORITY_ATTRIBUTE_SUFFIXES) {
-      const n = c.prefix + i;
-      e.hasAttribute(n) && (s.push(
-        p.setAttribute(
+    const r = [], i = /* @__PURE__ */ new Set();
+    for (const s of m.PRIORITY_ATTRIBUTE_SUFFIXES) {
+      const n = c.prefix + s;
+      e.hasAttribute(n) && (r.push(
+        m.setAttribute(
           e.getTarget(),
           n,
           e.getRawAttribute(n)
         )
-      ), r.add(n));
+      ), i.add(n));
     }
-    for (const i of e.getAttributeNames()) {
-      if (r.has(i) || p.isDeferredAttributeName(i))
+    for (const s of e.getAttributeNames()) {
+      if (i.has(s) || m.isDeferredAttributeName(s))
         continue;
-      const n = e.getRawAttribute(i);
-      n !== null && s.push(p.setAttribute(e.getTarget(), i, n));
+      const n = e.getRawAttribute(s);
+      n !== null && r.push(m.setAttribute(e.getTarget(), s, n));
     }
-    for (const i of p.DEFERRED_ATTRIBUTE_SUFFIXES) {
-      const n = c.prefix + i;
-      e.hasAttribute(n) && (s.push(
-        p.setAttribute(
+    for (const s of m.DEFERRED_ATTRIBUTE_SUFFIXES) {
+      const n = c.prefix + s;
+      e.hasAttribute(n) && (r.push(
+        m.setAttribute(
           e.getTarget(),
           n,
           e.getRawAttribute(n)
         )
-      ), r.add(n));
+      ), i.add(n));
     }
-    return e.getChildren().forEach((i) => {
-      i instanceof M ? s.push(p.scan(i.getTarget())) : i instanceof H && s.push(p.evaluateText(i));
-    }), Promise.all(s).then(() => {
+    return e.getChildren().forEach((s) => {
+      s instanceof S ? r.push(m.scan(s.getTarget())) : s instanceof j && r.push(m.evaluateText(s));
+    }), Promise.all(r).then(() => {
     });
   }
   /**
@@ -2437,52 +2870,52 @@ const p = class p {
    * @param value 属性値
    * @returns Promise (DOM操作が完了したときに解決される)
    */
-  static setAttribute(t, e, s) {
-    const r = A.get(t), i = [];
+  static setAttribute(t, e, r) {
+    const i = A.get(t), s = [];
     switch (e) {
       case `${c.prefix}bind`: {
-        s === null ? (r.clearBindingDataCache(), r.setBindingData({})) : r.setBindingData(p.parseDataBind(s));
+        r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(m.parseDataBind(r));
         break;
       }
       case `${c.prefix}if`:
-        i.push(p.evaluateIf(r));
+        s.push(m.evaluateIf(i));
         break;
       case `${c.prefix}each`:
-        i.push(p.evaluateEach(r));
+        s.push(m.evaluateEach(i));
         break;
       case `${c.prefix}fetch`:
-        i.push(new f(r, null).run());
+        s.push(new d(i, null).run());
         break;
       case `${c.prefix}import`: {
-        if (typeof s == "string") {
-          const n = r.getTarget(), a = performance.now();
-          y.importStart(n, s), i.push(
-            Y.load(s).then((u) => {
-              const m = new TextEncoder().encode(u).length;
+        if (typeof r == "string") {
+          const n = i.getTarget(), a = performance.now();
+          E.importStart(n, r), s.push(
+            J.load(r).then((o) => {
+              const g = new TextEncoder().encode(o).length;
               return T.enqueue(() => {
-                n.innerHTML = u;
+                n.innerHTML = o;
               }).then(() => {
-                y.importEnd(n, s, m, a);
+                E.importEnd(n, r, g, a);
               });
-            }).catch((u) => {
-              y.importError(n, s, u), h.error("[Haori]", "Failed to import HTML:", s, u);
+            }).catch((o) => {
+              E.importError(n, r, o), h.error("[Haori]", "Failed to import HTML:", r, o);
             })
           );
         }
         break;
       }
       case `${c.prefix}url-param`: {
-        const n = r.getAttribute(`${c.prefix}url-arg`), a = W.readParams();
+        const n = i.getAttribute(`${c.prefix}url-arg`), a = X.readParams();
         if (n === null)
-          p.setBindingData(t, a);
+          m.setBindingData(t, a);
         else {
-          const u = r.getRawBindingData() || {};
-          u[String(n)] = a, p.setBindingData(t, u);
+          const o = i.getRawBindingData() || {};
+          o[String(n)] = a, m.setBindingData(t, o);
         }
         break;
       }
     }
-    return s === null ? i.push(r.removeAttribute(e)) : i.push(r.setAttribute(e, s)), Promise.all(i).then(() => {
+    return r === null ? s.push(i.removeAttribute(e)) : s.push(i.setAttribute(e, r)), Promise.all(s).then(() => {
     });
   }
   /**
@@ -2494,12 +2927,12 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setBindingData(t, e) {
-    const s = A.get(t), r = s.getRawBindingData();
-    s.setBindingData(e);
-    const i = [];
-    return i.push(
-      s.setAttribute(`${c.prefix}bind`, JSON.stringify(e))
-    ), i.push(p.evaluateAll(s)), y.bindChange(t, r, e, "manual"), Promise.all(i).then(() => {
+    const r = A.get(t), i = r.getRawBindingData();
+    r.setBindingData(e);
+    const s = [];
+    return s.push(
+      r.setAttribute(`${c.prefix}bind`, JSON.stringify(e))
+    ), s.push(m.evaluateAll(r)), E.bindChange(t, i, e, "manual"), Promise.all(s).then(() => {
     });
   }
   /**
@@ -2516,10 +2949,10 @@ const p = class p {
         return h.error("[Haori]", "Invalid JSON in data-bind:", e), {};
       }
     else {
-      const e = new URLSearchParams(t), s = {};
-      for (const [r, i] of e.entries())
-        s[r] !== void 0 ? Array.isArray(s[r]) ? s[r].push(i) : s[r] = [s[r], i] : s[r] = i;
-      return s;
+      const e = new URLSearchParams(t), r = {};
+      for (const [i, s] of e.entries())
+        r[i] !== void 0 ? Array.isArray(r[i]) ? r[i].push(s) : r[i] = [r[i], s] : r[i] = s;
+      return r;
     }
   }
   /**
@@ -2529,11 +2962,11 @@ const p = class p {
    * @param node 追加するノード
    */
   static addNode(t, e) {
-    const s = A.get(t);
-    if (s.isSkipMutationNodes())
+    const r = A.get(t);
+    if (r.isSkipMutationNodes())
       return;
-    const r = A.get(e.nextSibling), i = A.get(e);
-    i && (s.insertBefore(i, r), i instanceof M ? p.scan(i.getTarget()) : i instanceof H && p.evaluateText(i));
+    const i = A.get(e.nextSibling), s = A.get(e);
+    s && (r.insertBefore(s, i), s instanceof S ? m.scan(s.getTarget()) : s instanceof j && m.evaluateText(s));
   }
   /**
    * ノードを親要素から削除します。
@@ -2543,8 +2976,8 @@ const p = class p {
   static removeNode(t) {
     const e = A.get(t);
     if (e) {
-      const s = e.getParent();
-      if (s && s.isSkipMutationNodes())
+      const r = e.getParent();
+      if (r && r.isSkipMutationNodes())
         return;
       e.remove();
     }
@@ -2556,8 +2989,8 @@ const p = class p {
    * @param text 新しいテキスト
    */
   static changeText(t, e) {
-    const s = A.get(t);
-    s && s.setContent(e);
+    const r = A.get(t);
+    r && r.setContent(e);
   }
   /**
    * エレメントの値を変更します。
@@ -2568,18 +3001,18 @@ const p = class p {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static changeValue(t, e) {
-    const s = A.get(t);
-    if (s.getValue() === e)
+    const r = A.get(t);
+    if (r.getValue() === e)
       return Promise.resolve();
-    const r = [];
-    r.push(s.setValue(e));
-    const i = p.getFormFragment(s);
-    if (i) {
-      const n = E.getValues(i), a = i.getAttribute(`${c.prefix}form-arg`);
-      let u;
-      a ? (u = i.getRawBindingData(), u || (u = {}), u[String(a)] = n) : u = n, r.push(p.setBindingData(i.getTarget(), u));
+    const i = [];
+    i.push(r.setValue(e));
+    const s = m.getFormFragment(r);
+    if (s) {
+      const n = y.getValues(s), a = s.getAttribute(`${c.prefix}form-arg`);
+      let o;
+      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(m.setBindingData(s.getTarget(), o));
     }
-    return Promise.all(r).then(() => {
+    return Promise.all(i).then(() => {
     });
   }
   /**
@@ -2592,7 +3025,7 @@ const p = class p {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
     const e = t.getParent();
-    return e ? p.getFormFragment(e) : null;
+    return e ? m.getFormFragment(e) : null;
   }
   /**
    * フラグメントとその子要素を評価します。
@@ -2602,8 +3035,8 @@ const p = class p {
    */
   static evaluateAll(t) {
     const e = [];
-    return t.hasAttribute(`${c.prefix}if`) && e.push(p.evaluateIf(t)), t.hasAttribute(`${c.prefix}each`) && e.push(p.evaluateEach(t)), t.getChildren().forEach((s) => {
-      s instanceof M ? e.push(p.evaluateAll(s)) : s instanceof H && e.push(p.evaluateText(s));
+    return t.hasAttribute(`${c.prefix}if`) && e.push(m.evaluateIf(t)), t.hasAttribute(`${c.prefix}each`) && e.push(m.evaluateEach(t)), t.getChildren().forEach((r) => {
+      r instanceof S ? e.push(m.evaluateAll(r)) : r instanceof j && e.push(m.evaluateText(r));
     }), Promise.all(e).then(() => {
     });
   }
@@ -2624,16 +3057,16 @@ const p = class p {
    * @return Promise (DOM操作が完了したときに解決される)
    */
   static evaluateIf(t) {
-    const e = [], s = t.getAttribute(`${c.prefix}if`);
-    return s === !1 || s === void 0 || s === null || Number.isNaN(s) ? t.isVisible() && e.push(
+    const e = [], r = t.getAttribute(`${c.prefix}if`);
+    return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
       t.hide().then(() => {
-        y.hide(t.getTarget());
+        E.hide(t.getTarget());
       })
     ) : t.isVisible() || (e.push(
       t.show().then(() => {
-        y.show(t.getTarget());
+        E.show(t.getTarget());
       })
-    ), e.push(p.evaluateAll(t))), Promise.all(e).then(() => {
+    ), e.push(m.evaluateAll(t))), Promise.all(e).then(() => {
     });
   }
   /**
@@ -2647,21 +3080,21 @@ const p = class p {
       return Promise.resolve();
     let e = t.getTemplate();
     if (e === null) {
-      let r = !1;
+      let i = !1;
       t.getChildren().forEach((n) => {
-        if (!r && n instanceof M) {
+        if (!i && n instanceof S) {
           if (n.hasAttribute(`${c.prefix}each-before`) || n.hasAttribute(`${c.prefix}each-after`))
             return;
-          e = n.clone(), t.setTemplate(e), r = !0, t.removeChild(n);
+          e = n.clone(), t.setTemplate(e), i = !0, t.removeChild(n);
           const a = n.getTarget();
           a.parentNode && a.parentNode.removeChild(a), n.setMounted(!1);
         }
       });
-      const i = t.getAttribute(`${c.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 s = t.getAttribute(`${c.prefix}each`);
+      return Array.isArray(s) ? this.updateDiff(t, s) : (h.error("[Haori]", "Invalid each attribute:", s), Promise.reject(new Error("Invalid each attribute.")));
     }
-    const s = t.getAttribute(`${c.prefix}each`);
-    return Array.isArray(s) ? this.updateDiff(t, s) : (h.error("[Haori]", "Invalid each attribute:", s), Promise.reject(new Error("Invalid each attribute.")));
+    const r = t.getAttribute(`${c.prefix}each`);
+    return Array.isArray(r) ? this.updateDiff(t, r) : (h.error("[Haori]", "Invalid each attribute:", r), Promise.reject(new Error("Invalid each attribute.")));
   }
   /**
    * 差分を更新します。
@@ -2670,71 +3103,71 @@ const p = class p {
    * @param newList 新しいリスト
    */
   static updateDiff(t, e) {
-    const s = t.getTemplate();
-    if (s === null)
+    const r = t.getTemplate();
+    if (r === null)
       return h.error("[Haori]", "Template is not set for each element."), Promise.resolve();
-    let r = t.getAttribute(`${c.prefix}each-index`);
-    r && (r = String(r));
-    const i = t.getAttribute(`${c.prefix}each-key`), n = t.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), u = [];
-    e.forEach((g, v) => {
-      const w = p.createListKey(
-        g,
-        i ? String(i) : null,
-        v
+    let i = t.getAttribute(`${c.prefix}each-index`);
+    i && (i = String(i));
+    const s = t.getAttribute(`${c.prefix}each-key`), n = t.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
+    e.forEach((p, w) => {
+      const v = m.createListKey(
+        p,
+        s ? String(s) : null,
+        w
       );
-      u.push(w), a.set(w, { item: g, itemIndex: v });
+      o.push(v), a.set(v, { item: p, itemIndex: w });
     });
-    const m = [];
-    let l = t.getChildren().filter((g) => g instanceof M).filter(
-      (g) => !g.hasAttribute(`${c.prefix}each-before`) && !g.hasAttribute(`${c.prefix}each-after`)
+    const g = [];
+    let u = t.getChildren().filter((p) => p instanceof S).filter(
+      (p) => !p.hasAttribute(`${c.prefix}each-before`) && !p.hasAttribute(`${c.prefix}each-after`)
     );
-    l = l.filter((g) => u.indexOf(String(g.getListKey())) === -1 ? (m.push(g.remove()), !1) : !0);
-    const b = l.map((g) => g.getListKey()), o = t.getChildren().filter((g) => g instanceof M).filter((g) => g.hasAttribute(`${c.prefix}each-before`)).length;
-    let d = Promise.resolve();
-    return u.forEach((g, v) => {
-      const w = b.indexOf(g), { item: B, itemIndex: x } = a.get(g);
+    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 S).filter((p) => p.hasAttribute(`${c.prefix}each-before`)).length;
+    let f = Promise.resolve();
+    return o.forEach((p, w) => {
+      const v = b.indexOf(p), { item: B, itemIndex: x } = a.get(p);
       let F;
-      if (w !== -1)
-        F = l[w], p.updateRowFragment(
+      if (v !== -1)
+        F = u[v], m.updateRowFragment(
           F,
           B,
-          r,
+          i,
           x,
           n ? String(n) : null,
-          g
-        ), typeof F.clearBindingDataCache == "function" && F.clearBindingDataCache(), d = d.then(() => p.evaluateAll(F));
+          p
+        ), typeof F.clearBindingDataCache == "function" && F.clearBindingDataCache(), f = f.then(() => m.evaluateAll(F));
       else {
-        F = s.clone(), p.updateRowFragment(
+        F = r.clone(), m.updateRowFragment(
           F,
           B,
-          r,
+          i,
           x,
           n ? String(n) : null,
-          g
+          p
         ), typeof F.clearBindingDataCache == "function" && F.clearBindingDataCache();
-        const X = o + v;
-        d = d.then(
+        const W = l + w;
+        f = f.then(
           () => t.insertBefore(
             F,
-            t.getChildren()[X] || null
-          ).then(() => p.evaluateAll(F))
+            t.getChildren()[W] || null
+          ).then(() => m.evaluateAll(F))
         );
       }
-    }), Promise.all(m).then(() => d).then(() => {
-      const g = u.filter(
+    }), Promise.all(g).then(() => f).then(() => {
+      const p = o.filter(
         (x) => x !== null
-      ), v = b.filter(
+      ), w = b.filter(
         (x) => x !== null
-      ), w = g.filter(
-        (x) => !v.includes(x)
-      ), B = v.filter(
-        (x) => !g.includes(x)
+      ), v = p.filter(
+        (x) => !w.includes(x)
+      ), B = w.filter(
+        (x) => !p.includes(x)
       );
-      y.eachUpdate(
+      E.eachUpdate(
         t.getTarget(),
-        w,
+        v,
         B,
-        g
+        p
       );
     });
   }
@@ -2746,17 +3179,17 @@ const p = class p {
    * @param index 配列のインデックス
    * @returns リストキー
    */
-  static createListKey(t, e, s) {
-    let r;
+  static createListKey(t, e, r) {
+    let i;
     if (typeof t == "object" && t !== null)
       if (e) {
-        const i = t[e];
-        i == null ? r = `__index_${s}` : typeof i == "object" ? r = JSON.stringify(i) : r = String(i);
+        const s = t[e];
+        s == null ? i = `__index_${r}` : typeof s == "object" ? i = JSON.stringify(s) : i = String(s);
       } else
-        r = `__index_${s}`;
+        i = `__index_${r}`;
     else
-      r = String(t);
-    return r;
+      i = String(t);
+    return i;
   }
   /**
    * 行フラグメントにデータを設定します。
@@ -2768,16 +3201,16 @@ const p = class p {
    * @param arg バインドデータパラメータ名
    * @param listKey リストキー
    */
-  static updateRowFragment(t, e, s, r, i, n) {
+  static updateRowFragment(t, e, r, i, s, n) {
     let a = e;
     if (typeof e == "object" && e !== null)
-      a = { ...e }, s && (a[s] = r), i && (a = {
-        [i]: a
+      a = { ...e }, r && (a[r] = i), s && (a = {
+        [s]: a
       });
-    else if (i)
+    else if (s)
       a = {
-        [i]: e
-      }, s && (a[s] = r);
+        [s]: e
+      }, r && (a[r] = i);
     else {
       h.error(
         "[Haori]",
@@ -2788,9 +3221,9 @@ const p = class p {
     t.setListKey(n), t.setAttribute(`${c.prefix}row`, n), t.setBindingData(a);
   }
 };
-p.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], p.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"];
-let N = p;
-class Q {
+m.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], m.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"];
+let N = m;
+class z {
   /**
    * コンストラクタ。
    *
@@ -2798,8 +3231,8 @@ class Q {
    */
   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, s = A.get(e);
-      s && new f(s, "load").run();
+      const e = document.documentElement, r = A.get(e);
+      r && new d(r, "load").run();
     }, this.root = t;
   }
   /**
@@ -2822,12 +3255,12 @@ class Q {
    * @param type イベントタイプ（'click', 'change', 'load'など）
    */
   delegate(t, e) {
-    const s = this.getElementFromTarget(t.target);
-    if (!s)
+    const r = this.getElementFromTarget(t.target);
+    if (!r)
       return;
-    const r = A.get(s);
-    r && (e === "change" && r instanceof M && r.syncValue(), new f(r, e).run().catch((i) => {
-      h.error("[Haori]", "Procedure execution error:", i);
+    const i = A.get(r);
+    i && (e === "change" && i instanceof S && i.syncValue(), new d(i, e).run().catch((s) => {
+      h.error("[Haori]", "Procedure execution error:", s);
     }));
   }
   /**
@@ -2840,20 +3273,20 @@ class Q {
     return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
   }
 }
-const D = class D {
+const C = class C {
   /**
    * 初期化メソッド。
    * ドキュメントのheadとbodyを監視対象として設定します。
    */
   static async init() {
-    if (D._initialized)
+    if (C._initialized)
       return;
-    D._initialized = !0;
+    C._initialized = !0;
     const t = await Promise.allSettled([
       N.scan(document.head),
       N.scan(document.body)
-    ]), [e, s] = t;
-    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), s.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", s.reason), D.observe(document.head), D.observe(document.body), new Q().start();
+    ]), [e, r] = t;
+    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", r.reason), C.observe(document.head), C.observe(document.body), new z().start();
   }
   /**
    * 指定された要素を監視します。
@@ -2861,22 +3294,22 @@ const D = class D {
    * @param root 監視対象の要素
    */
   static observe(t) {
-    new MutationObserver(async (s) => {
-      for (const r of s)
+    new MutationObserver(async (r) => {
+      for (const i of r)
         try {
-          switch (r.type) {
+          switch (i.type) {
             case "attributes": {
               h.info(
                 "[Haori]",
                 "Attribute changed:",
-                r.target,
-                r.attributeName
+                i.target,
+                i.attributeName
               );
-              const i = r.target;
+              const s = i.target;
               N.setAttribute(
-                i,
-                r.attributeName,
-                i.getAttribute(r.attributeName)
+                s,
+                i.attributeName,
+                s.getAttribute(i.attributeName)
               );
               break;
             }
@@ -2884,12 +3317,12 @@ const D = class D {
               h.info(
                 "[Haori]",
                 "Child list changed:",
-                Array.from(r.removedNodes).map((i) => i.nodeName),
-                Array.from(r.addedNodes).map((i) => i.nodeName)
-              ), Array.from(r.removedNodes).forEach((i) => {
-                N.removeNode(i);
-              }), Array.from(r.addedNodes).forEach((i) => {
-                i.parentElement instanceof HTMLElement && N.addNode(i.parentElement, i);
+                Array.from(i.removedNodes).map((s) => s.nodeName),
+                Array.from(i.addedNodes).map((s) => s.nodeName)
+              ), Array.from(i.removedNodes).forEach((s) => {
+                N.removeNode(s);
+              }), Array.from(i.addedNodes).forEach((s) => {
+                s.parentElement instanceof HTMLElement && N.addNode(s.parentElement, s);
               });
               break;
             }
@@ -2897,21 +3330,21 @@ const D = class D {
               h.info(
                 "[Haori]",
                 "Character data changed:",
-                r.target,
-                r.target.textContent
-              ), r.target instanceof Text || r.target instanceof Comment ? N.changeText(r.target, r.target.textContent) : h.warn(
+                i.target,
+                i.target.textContent
+              ), i.target instanceof Text || i.target instanceof Comment ? N.changeText(i.target, i.target.textContent) : h.warn(
                 "[Haori]",
                 "Unsupported character data type:",
-                r.target
+                i.target
               );
               break;
             }
             default:
-              h.warn("[Haori]", "Unknown mutation type:", r.type);
+              h.warn("[Haori]", "Unknown mutation type:", i.type);
               continue;
           }
-        } catch (i) {
-          h.error("[Haori]", "Error processing mutation:", i);
+        } catch (s) {
+          h.error("[Haori]", "Error processing mutation:", s);
         }
     }).observe(t, {
       childList: !0,
@@ -2921,19 +3354,19 @@ const D = class D {
     }), h.info("[Haori]", "Observer initialized for", t);
   }
 };
-D._initialized = !1;
-let V = D;
+C._initialized = !1;
+let V = C;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", V.init) : V.init();
-const z = "0.1.1";
+const Q = "0.1.2";
 export {
   N as Core,
   c as Env,
-  E as Form,
+  y as Form,
   A as Fragment,
-  S as Haori,
+  M as Haori,
   h as Log,
   T as Queue,
-  S as default,
-  z as version
+  M as default,
+  Q as version
 };
 //# sourceMappingURL=haori.es.js.map