haori 0.4.0 → 0.4.2

package/dist/haori.es.js

@@ -336,7 +336,7 @@ function Q() {
     (r) => typeof t?.[r] == "function"
   ) ? t : _;
 }
-class A {
+class m {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -347,7 +347,7 @@ class A {
    */
   static getValues(t) {
     const e = {};
-    return A.getPartValues(t, e);
+    return m.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -365,11 +365,11 @@ class A {
         `Element cannot have both ${l.prefix}form-object and name attributes.`
       );
       for (const n of t.getChildElementFragments())
-        A.getPartValues(n, e);
+        m.getPartValues(n, e);
     } else if (i) {
       const n = {};
       for (const a of t.getChildElementFragments())
-        A.getPartValues(a, n);
+        m.getPartValues(a, n);
       Object.keys(n).length > 0 && (e[String(i)] = n), s && h.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
@@ -378,12 +378,12 @@ class A {
       const n = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        A.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
+        m.getPartValues(a, o), Object.keys(o).length > 0 && n.push(o);
       }
       n.length > 0 && (e[String(s)] = n);
     } else
       for (const n of t.getChildElementFragments())
-        A.getPartValues(n, e);
+        m.getPartValues(n, e);
     return e;
   }
   /**
@@ -396,7 +396,30 @@ class A {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return A.setPartValues(t, e, null, r);
+    return m.setPartValues(t, e, null, r, !0);
+  }
+  /**
+   * フォーム内にある入力エレメントに値をイベントなしで設定します。
+   * フォーム bindingData からの内部同期に利用します。
+   *
+   * @param form フォームのElementFragment
+   * @param values フォームに設定する値のオブジェクト
+   * @param force data-form-detach属性があるエレメントにも値を反映するかどうか
+   * @returns Promise（DOMの更新が完了したら解決される）
+   */
+  static syncValues(t, e, r = !1) {
+    return m.setPartValues(t, e, null, r, !1);
+  }
+  /**
+   * 単一フラグメントへ値を設定します。
+   *
+   * @param fragment 対象フラグメント
+   * @param value 設定する値
+   * @param emitEvents input/change イベントを発火するかどうか
+   * @returns Promise（DOMの更新が完了したら解決される）
+   */
+  static applyFragmentValue(t, e, r) {
+    return r ? t.setValue(e) : t.syncBindingValue(e);
   }
   /**
    * フラグメント内にある各入力エレメントに値を設定します。
@@ -407,45 +430,53 @@ class A {
    * @param force data-form-detach属性があるエレメントにも値を反映するかどうか
    * @returns Promise（DOMの更新が完了したら解決される）
    */
-  static setPartValues(t, e, r = null, i = !1) {
-    const s = [], n = t.getAttribute("name"), a = t.getAttribute(`${l.prefix}form-object`), o = t.getAttribute(`${l.prefix}form-list`), p = t.getAttribute(`${l.prefix}form-detach`);
-    if (n) {
-      if (!p || i) {
-        const f = e[String(n)];
-        o && Array.isArray(f) && r !== null ? s.push(t.setValue(f[r])) : typeof f == "string" || typeof f == "number" || typeof f == "boolean" || f === null ? s.push(t.setValue(f)) : s.push(t.setValue(String(f)));
+  static setPartValues(t, e, r = null, i = !1, s = !0) {
+    const n = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), d = t.getAttribute(`${l.prefix}form-list`), y = t.getAttribute(`${l.prefix}form-detach`);
+    if (a) {
+      if (!y || i) {
+        const b = e[String(a)];
+        d && Array.isArray(b) && r !== null ? n.push(
+          m.applyFragmentValue(t, b[r] ?? null, s)
+        ) : typeof b == "string" || typeof b == "number" || typeof b == "boolean" || b === null ? n.push(m.applyFragmentValue(t, b, s)) : n.push(
+          m.applyFragmentValue(t, String(b), s)
+        );
       }
-    } else if (a) {
-      const f = e[String(a)];
-      if (f && typeof f == "object")
-        for (const T of t.getChildElementFragments())
-          s.push(
-            A.setPartValues(
-              T,
-              f,
+    } else if (o) {
+      const b = e[String(o)];
+      if (b && typeof b == "object")
+        for (const v of t.getChildElementFragments())
+          n.push(
+            m.setPartValues(
+              v,
+              b,
               null,
-              i
+              i,
+              s
             )
           );
-    } else if (o) {
-      const f = e[String(o)];
-      if (Array.isArray(f)) {
-        const T = t.getChildElementFragments();
-        for (let E = 0; E < T.length; E++) {
-          const d = T[E];
-          f.length > E ? s.push(
-            A.setPartValues(
-              d,
-              f[E],
-              E,
-              i
+    } else if (d) {
+      const b = e[String(d)];
+      if (Array.isArray(b)) {
+        const v = t.getChildElementFragments();
+        for (let f = 0; f < v.length; f++) {
+          const u = v[f];
+          b.length > f ? n.push(
+            m.setPartValues(
+              u,
+              b[f],
+              f,
+              i,
+              s
             )
-          ) : s.push(A.setPartValues(d, {}, E, i));
+          ) : n.push(m.setPartValues(u, {}, f, i, s));
         }
       }
     } else
-      for (const f of t.getChildElementFragments())
-        s.push(A.setPartValues(f, e, null, i));
-    return Promise.all(s).then(() => {
+      for (const b of t.getChildElementFragments())
+        n.push(
+          m.setPartValues(b, e, null, i, s)
+        );
+    return Promise.all(n).then(() => {
     });
   }
   /**
@@ -456,9 +487,9 @@ class A {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    A.clearValues(t), await Promise.all([
-      A.clearMessages(t),
-      A.clearEachClones(t)
+    m.clearValues(t), await Promise.all([
+      m.clearMessages(t),
+      m.clearEachClones(t)
     ]), await F.enqueue(() => {
       const e = t.getTarget();
       if (e instanceof HTMLFormElement)
@@ -470,7 +501,7 @@ class A {
           s.appendChild(e), s.reset(), r.insertBefore(e, i);
         }
       }
-    }), await R.evaluateAll(t);
+    }), await x.evaluateAll(t);
   }
   /**
    * data-each によって生成された複製（テンプレート以外）を削除します。
@@ -504,7 +535,7 @@ class A {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      A.clearValues(e);
+      m.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -527,7 +558,7 @@ class A {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    const i = [], s = Q(), n = A.findFragmentsByKey(t, e);
+    const i = [], s = Q(), n = m.findFragmentsByKey(t, e);
     return n.forEach((a) => {
       i.push(
         s.addErrorMessage(a.getTarget(), r)
@@ -545,7 +576,7 @@ class A {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return A.findFragmentByKeyParts(t, e.split("."));
+    return m.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -559,7 +590,7 @@ class A {
     const r = [], i = e[0];
     if (e.length == 1 && t.getAttribute("name") === i && r.push(t), t.hasAttribute(`${l.prefix}form-object`))
       e.length > 1 && t.getAttribute(`${l.prefix}form-object`) === i && t.getChildElementFragments().forEach((n) => {
-        r.push(...A.findFragmentByKeyParts(n, e.slice(1)));
+        r.push(...m.findFragmentByKeyParts(n, e.slice(1)));
       });
     else if (t.hasAttribute(`${l.prefix}form-list`)) {
       if (e.length > 1) {
@@ -567,13 +598,13 @@ class A {
         if (n !== -1 && a !== -1 && n < a) {
           const o = i.substring(0, n);
           if (s === o) {
-            const p = i.substring(n + 1, a), f = Number(p);
-            if (isNaN(f))
+            const d = i.substring(n + 1, a), y = Number(d);
+            if (isNaN(y))
               h.error("Haori", `Invalid index: ${i}`);
             else {
-              const T = t.getChildElementFragments().filter((E) => E.hasAttribute(`${l.prefix}row`));
-              f < T.length && r.push(
-                ...A.findFragmentByKeyParts(T[f], e.slice(1))
+              const b = t.getChildElementFragments().filter((v) => v.hasAttribute(`${l.prefix}row`));
+              y < b.length && r.push(
+                ...m.findFragmentByKeyParts(b[y], e.slice(1))
               );
             }
           }
@@ -581,7 +612,7 @@ class A {
       }
     } else
       t.getChildElementFragments().forEach((s) => {
-        r.push(...A.findFragmentByKeyParts(s, e));
+        r.push(...m.findFragmentByKeyParts(s, e));
       });
     return r;
   }
@@ -725,8 +756,8 @@ return (${t});`;
           break;
         }
         case "[": {
-          const p = this.startsMemberAccess(i) ? "member" : "array";
-          r.push(p);
+          const d = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(d);
           break;
         }
         case "]": {
@@ -962,9 +993,9 @@ return (${t});`;
       get: (n, a, o) => {
         if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
           return;
-        const p = Reflect.get(n, a, o);
-        return typeof a == "symbol" ? p : this.wrapBoundValue(
-          p,
+        const d = Reflect.get(n, a, o);
+        return typeof a == "symbol" ? d : this.wrapBoundValue(
+          d,
           e
         );
       },
@@ -974,12 +1005,12 @@ return (${t});`;
           return Reflect.getOwnPropertyDescriptor(n, a);
       },
       apply: (n, a, o) => {
-        const p = Reflect.apply(
+        const d = Reflect.apply(
           n,
           a,
           o
         );
-        return this.isIteratorLike(p) ? p : this.wrapBoundValue(p, e);
+        return this.isIteratorLike(d) ? d : this.wrapBoundValue(d, e);
       },
       construct: (n, a, o) => this.wrapBoundValue(
         Reflect.construct(
@@ -1496,25 +1527,46 @@ class D extends N {
    * @returns エレメントの更新のPromise
    */
   setValue(t) {
+    return this.applyValue(t, !0);
+  }
+  /**
+   * 入力エレメントに値をイベントなしで設定します。
+   * フォームの bindingData 反映時に内部同期として利用します。
+   *
+   * @param value 値
+   * @returns エレメントの更新のPromise
+   */
+  syncBindingValue(t) {
+    return this.applyValue(t, !1);
+  }
+  /**
+   * 入力エレメントに値を設定します。
+   * 必要に応じて入力系イベントも発火します。
+   *
+   * @param value 値
+   * @param dispatchEvents input/change イベントを発火するかどうか
+   * @returns エレメントの更新のPromise
+   */
+  applyValue(t, e) {
     if (this.skipChangeValue || this.value === t)
       return Promise.resolve();
-    const e = this.getTarget();
-    if (e instanceof HTMLInputElement && (e.type === "checkbox" || e.type === "radio")) {
-      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, F.enqueue(() => {
-        e.checked = i, e.dispatchEvent(new Event("change", { bubbles: !0 }));
+    const r = this.getTarget();
+    if (r instanceof HTMLInputElement && (r.type === "checkbox" || r.type === "radio")) {
+      const i = this.getAttribute("value"), s = r.type === "checkbox" && i === "true";
+      let n;
+      return s ? n = t === !0 || t === "true" : i === "false" ? n = t === !1 : n = i === String(t), this.value = s ? n : n ? t : null, r.checked === n ? Promise.resolve() : (this.skipChangeValue = !0, F.enqueue(() => {
+        r.checked = n, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
-    } else return e instanceof HTMLInputElement || e instanceof HTMLTextAreaElement || e instanceof HTMLSelectElement ? (this.value = t, this.skipChangeValue = !0, F.enqueue(() => {
-      e.value = t === null ? "" : String(t), (e instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(e.type) || e instanceof HTMLTextAreaElement) && e.dispatchEvent(new Event("input", { bubbles: !0 })), e.dispatchEvent(new Event("change", { bubbles: !0 }));
+    } else return r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement ? (this.value = t, this.skipChangeValue = !0, F.enqueue(() => {
+      r.value = t === null ? "" : String(t), e && ((r instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(r.type) || r instanceof HTMLTextAreaElement) && r.dispatchEvent(new Event("input", { bubbles: !0 })), r.dispatchEvent(new Event("change", { bubbles: !0 })));
     }).finally(() => {
       this.skipChangeValue = !1;
     })) : (h.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
-      e
+      r
     ), Promise.resolve());
   }
   /**
@@ -1539,15 +1591,16 @@ class D extends N {
   syncValue() {
     const t = this.getTarget();
     if (t instanceof HTMLInputElement)
-      if (t.type === "checkbox" || t.type === "radio")
+      if (t.type === "checkbox" || t.type === "radio") {
+        const e = t.type === "checkbox" && t.value === "true";
         if (t.checked) {
-          const e = t.value;
-          e === "true" ? this.value = !0 : e === "false" ? this.value = !1 : this.value = e;
+          const r = t.value;
+          e ? this.value = !0 : r === "false" ? this.value = !1 : this.value = r;
         } else {
-          const e = t.value;
-          e === "true" ? this.value = !1 : e === "false" ? this.value = !0 : this.value = null;
+          const r = t.value;
+          e ? this.value = !1 : r === "false" ? this.value = !0 : this.value = null;
         }
-      else
+      } else
         this.value = t.value;
     else t instanceof HTMLTextAreaElement ? this.value = t.value : t instanceof HTMLSelectElement && (this.value = t.value);
   }
@@ -1573,7 +1626,7 @@ class D extends N {
         i.removeAttribute(t);
       else {
         const n = String(s);
-        i.getAttribute(t) !== n && i.setAttribute(t, n);
+        i.getAttribute(t) !== n && i.setAttribute(t, n), t === "value" && (i instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(i.type) || i instanceof HTMLTextAreaElement || i instanceof HTMLSelectElement) && (this.value = n, i.value !== n && (i.value = n));
       }
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -1683,32 +1736,32 @@ class D extends N {
     const n = t.getParent() === this;
     let a = -1, o = -1;
     n && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
-    const p = t.getParent();
-    p !== null && p.removeChild(t);
-    let f = r === void 0 ? e?.getTarget() || null : r;
+    const d = t.getParent();
+    d !== null && d.removeChild(t);
+    let y = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
     else {
-      let E;
-      if (n ? a !== -1 && a < o ? E = o - 1 : E = o : E = this.children.indexOf(e), E === -1) {
-        const d = this.resolveInsertionPointFromDom(
+      let v;
+      if (n ? a !== -1 && a < o ? v = o - 1 : v = o : v = this.children.indexOf(e), v === -1) {
+        const f = this.resolveInsertionPointFromDom(
           e,
           !1
         );
-        d === null ? (h.warn(
+        f === null ? (h.warn(
           "[Haori]",
           "Reference child not found in children.",
           e
-        ), this.children.push(t)) : (this.children.splice(d.index, 0, t), f = d.referenceNode);
+        ), this.children.push(t)) : (this.children.splice(f.index, 0, t), y = f.referenceNode);
       } else
-        this.children.splice(E, 0, t);
+        this.children.splice(v, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const T = this.skipMutationNodes;
+    const b = this.skipMutationNodes;
     return this.skipMutationNodes = !0, F.enqueue(() => {
-      this.target.insertBefore(t.getTarget(), f);
+      this.target.insertBefore(t.getTarget(), y);
     }).finally(() => {
-      this.skipMutationNodes = T;
+      this.skipMutationNodes = b;
     });
   }
   /**
@@ -2040,7 +2093,7 @@ J.FORCE_EVALUATION_ATTRIBUTES = [
   "hor-each"
 ];
 let q = J;
-class v {
+class w {
   /**
    * カスタムイベントを発火します。
    *
@@ -2064,7 +2117,7 @@ class v {
    * @param version ライブラリバージョン
    */
   static ready(t) {
-    v.dispatch(document, "ready", { version: t });
+    w.dispatch(document, "ready", { version: t });
   }
   /**
    * renderイベントを発火します。
@@ -2072,7 +2125,7 @@ class v {
    * @param target 評価対象要素
    */
   static render(t) {
-    v.dispatch(t, "render", { target: t });
+    w.dispatch(t, "render", { target: t });
   }
   /**
    * importstartイベントを発火します。
@@ -2081,7 +2134,7 @@ class v {
    * @param url インポート対象URL
    */
   static importStart(t, e) {
-    v.dispatch(t, "importstart", {
+    w.dispatch(t, "importstart", {
       url: e,
       startedAt: performance.now()
     });
@@ -2095,7 +2148,7 @@ class v {
    * @param startedAt 開始時刻
    */
   static importEnd(t, e, r, i) {
-    v.dispatch(t, "importend", {
+    w.dispatch(t, "importend", {
       url: e,
       bytes: r,
       durationMs: performance.now() - i
@@ -2109,7 +2162,7 @@ class v {
    * @param error エラー内容
    */
   static importError(t, e, r) {
-    v.dispatch(t, "importerror", { url: e, error: r });
+    w.dispatch(t, "importerror", { url: e, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -2121,11 +2174,11 @@ class v {
    */
   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 p of o) {
-      const f = e?.[p], T = r[p];
-      f !== T && s.push(p);
+    for (const d of o) {
+      const y = e?.[d], b = r[d];
+      y !== b && s.push(d);
     }
-    v.dispatch(t, "bindchange", {
+    w.dispatch(t, "bindchange", {
       previous: e || {},
       next: r,
       changedKeys: s,
@@ -2141,7 +2194,7 @@ class v {
    * @param order 現在の順序
    */
   static eachUpdate(t, e, r, i) {
-    v.dispatch(t, "eachupdate", {
+    w.dispatch(t, "eachupdate", {
       added: e,
       removed: r,
       order: i,
@@ -2157,7 +2210,7 @@ class v {
    * @param item 行データ
    */
   static rowAdd(t, e, r, i) {
-    v.dispatch(t, "rowadd", { key: e, index: r, item: i });
+    w.dispatch(t, "rowadd", { key: e, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -2167,7 +2220,7 @@ class v {
    * @param index インデックス
    */
   static rowRemove(t, e, r) {
-    v.dispatch(t, "rowremove", { key: e, index: r });
+    w.dispatch(t, "rowremove", { key: e, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -2178,7 +2231,7 @@ class v {
    * @param to 移動後インデックス
    */
   static rowMove(t, e, r, i) {
-    v.dispatch(t, "rowmove", { key: e, from: r, to: i });
+    w.dispatch(t, "rowmove", { key: e, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -2186,7 +2239,7 @@ class v {
    * @param target data-if要素
    */
   static show(t) {
-    v.dispatch(t, "show", { visible: !0 });
+    w.dispatch(t, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -2194,7 +2247,7 @@ class v {
    * @param target data-if要素
    */
   static hide(t) {
-    v.dispatch(t, "hide", { visible: !1 });
+    w.dispatch(t, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -2207,7 +2260,7 @@ class v {
     * @return 戻り値はありません。
    */
   static fetchStart(t, e, r, i, s) {
-    v.dispatch(t, "fetchstart", {
+    w.dispatch(t, "fetchstart", {
       url: e,
       options: r || {},
       payload: i,
@@ -2224,7 +2277,7 @@ class v {
    * @param startedAt 開始時刻
    */
   static fetchEnd(t, e, r, i) {
-    v.dispatch(t, "fetchend", {
+    w.dispatch(t, "fetchend", {
       url: e,
       status: r,
       durationMs: performance.now() - i
@@ -2240,7 +2293,7 @@ class v {
    * @param startedAt 開始時刻（存在する場合）
    */
   static fetchError(t, e, r, i, s) {
-    v.dispatch(t, "fetcherror", {
+    w.dispatch(t, "fetcherror", {
       url: e,
       status: i,
       error: r,
@@ -2389,12 +2442,12 @@ const c = class c {
     if (typeof i != "string" || r === null)
       return null;
     const s = r.trim();
-    return c.SINGLE_PLACEHOLDER_REGEX.test(s) ? R.parseDataBind(i) : s.startsWith("{") || s.startsWith("[") ? R.parseDataBind(
+    return c.SINGLE_PLACEHOLDER_REGEX.test(s) ? x.parseDataBind(i) : s.startsWith("{") || s.startsWith("[") ? x.parseDataBind(
       c.resolveDataJsonString(
         r,
         t.getBindingData()
       )
-    ) : R.parseDataBind(
+    ) : x.parseDataBind(
       c.resolveDataParamString(r, t.getBindingData())
     );
   }
@@ -2416,22 +2469,22 @@ const c = class c {
         t,
         c.attrName(e, "data")
       )), t.hasAttribute(c.attrName(e, "form"))) {
-        const d = t.getRawAttribute(
+        const f = t.getRawAttribute(
           c.attrName(e, "form")
         );
-        if (d) {
-          const u = document.body.querySelector(d);
-          u !== null ? r.formFragment = A.getFormFragment(
+        if (f) {
+          const u = document.body.querySelector(f);
+          u !== null ? r.formFragment = m.getFormFragment(
             N.get(u)
           ) : h.error(
             "Haori",
-            `Form element not found: ${d} (${c.attrName(e, "form")})`
+            `Form element not found: ${f} (${c.attrName(e, "form")})`
           );
         } else
-          r.formFragment = A.getFormFragment(t);
-      } else e === "change" && (r.formFragment = A.getFormFragment(t));
+          r.formFragment = m.getFormFragment(t);
+      } else e === "change" && (r.formFragment = m.getFormFragment(t));
       if (t.hasAttribute(`${l.prefix}${e}-before-run`)) {
-        const d = t.getRawAttribute(
+        const f = t.getRawAttribute(
           `${l.prefix}${e}-before-run`
         );
         try {
@@ -2440,7 +2493,7 @@ const c = class c {
             "fetchOptions",
             `
 "use strict";
-${d}
+${f}
 `
           );
         } catch (u) {
@@ -2452,54 +2505,54 @@ ${d}
     s && (r.fetchUrl = t.getAttribute(i));
     const n = {};
     if (e) {
-      const d = c.attrName(e, "fetch-method");
-      t.hasAttribute(d) && (n.method = t.getAttribute(
-        d
+      const f = c.attrName(e, "fetch-method");
+      t.hasAttribute(f) && (n.method = t.getAttribute(
+        f
       ));
     } else {
-      const d = c.attrName(null, "method", !0);
-      t.hasAttribute(d) && (n.method = t.getAttribute(
-        d
+      const f = c.attrName(null, "method", !0);
+      t.hasAttribute(f) && (n.method = t.getAttribute(
+        f
       ));
     }
     if (e) {
-      const d = c.attrName(e, "fetch-headers");
-      if (t.hasAttribute(d)) {
+      const f = c.attrName(e, "fetch-headers");
+      if (t.hasAttribute(f)) {
         const u = t.getRawAttribute(
-          d
+          f
         );
         try {
-          n.headers = R.parseDataBind(u);
-        } catch (g) {
-          h.error("Haori", `Invalid fetch headers: ${g}`);
+          n.headers = x.parseDataBind(u);
+        } catch (p) {
+          h.error("Haori", `Invalid fetch headers: ${p}`);
         }
       }
     } else {
-      const d = c.attrName(
+      const f = c.attrName(
         null,
         "headers",
         !0
       );
-      if (t.hasAttribute(d)) {
+      if (t.hasAttribute(f)) {
         const u = t.getRawAttribute(
-          d
+          f
         );
         try {
-          n.headers = R.parseDataBind(u);
-        } catch (g) {
-          h.error("Haori", `Invalid fetch headers: ${g}`);
+          n.headers = x.parseDataBind(u);
+        } catch (p) {
+          h.error("Haori", `Invalid fetch headers: ${p}`);
         }
       }
     }
     if (e) {
-      const d = c.attrName(
+      const f = c.attrName(
         e,
         "fetch-content-type"
       );
-      if (t.hasAttribute(d))
+      if (t.hasAttribute(f))
         n.headers = {
           ...n.headers,
-          "Content-Type": t.getAttribute(d)
+          "Content-Type": t.getAttribute(f)
         };
       else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
         let u = !1;
@@ -2512,15 +2565,15 @@ ${d}
         "Content-Type": "application/x-www-form-urlencoded"
       });
     } else {
-      const d = c.attrName(
+      const f = c.attrName(
         null,
         "content-type",
         !0
       );
-      if (t.hasAttribute(d))
+      if (t.hasAttribute(f))
         n.headers = {
           ...n.headers,
-          "Content-Type": t.getAttribute(d)
+          "Content-Type": t.getAttribute(f)
         };
       else if (n.method && n.method !== "GET" && n.method !== "HEAD" && n.method !== "OPTIONS") {
         let u = !1;
@@ -2536,39 +2589,39 @@ ${d}
     Object.keys(n).length > 0 && (r.fetchOptions = n);
     const a = e ? c.attrName(e, "bind") : c.attrName(null, "bind", !0);
     if (t.hasAttribute(a)) {
-      const d = t.getRawAttribute(a);
-      if (d) {
-        const u = document.body.querySelectorAll(d);
-        u.length > 0 ? (r.bindFragments = [], u.forEach((g) => {
-          const b = N.get(g);
-          b && r.bindFragments.push(b);
+      const f = t.getRawAttribute(a);
+      if (f) {
+        const u = document.body.querySelectorAll(f);
+        u.length > 0 ? (r.bindFragments = [], u.forEach((p) => {
+          const E = N.get(p);
+          E && r.bindFragments.push(E);
         })) : h.error(
           "Haori",
-          `Bind element not found: ${d} (${a})`
+          `Bind element not found: ${f} (${a})`
         );
       }
     }
-    const o = c.attrName(e, "bind-arg"), p = c.attrName(
+    const o = c.attrName(e, "bind-arg"), d = c.attrName(
       null,
       "arg",
       !0
-    ), f = c.attrName(
+    ), y = c.attrName(
       null,
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(p) ? r.bindArg = t.getRawAttribute(
-      p
-    ) : t.hasAttribute(f) && (r.bindArg = t.getRawAttribute(f));
-    const T = e ? c.attrName(e, "bind-params") : c.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(T)) {
-      const d = t.getRawAttribute(T);
-      r.bindParams = d.split("&").map((u) => u.trim());
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(d) ? r.bindArg = t.getRawAttribute(
+      d
+    ) : t.hasAttribute(y) && (r.bindArg = t.getRawAttribute(y));
+    const b = e ? c.attrName(e, "bind-params") : c.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(b)) {
+      const f = t.getRawAttribute(b);
+      r.bindParams = f.split("&").map((u) => u.trim());
     }
-    const E = e ? c.attrName(e, "bind-append") : c.attrName(null, "bind-append", !0);
-    if (t.hasAttribute(E)) {
-      const d = t.getRawAttribute(E);
-      r.bindAppendParams = d.split("&").map((u) => u.trim()).filter(Boolean);
+    const v = e ? c.attrName(e, "bind-append") : c.attrName(null, "bind-append", !0);
+    if (t.hasAttribute(v)) {
+      const f = t.getRawAttribute(v);
+      r.bindAppendParams = f.split("&").map((u) => u.trim()).filter(Boolean);
     }
     if (e) {
       if (t.hasAttribute(c.attrName(e, "adjust"))) {
@@ -2576,20 +2629,20 @@ ${d}
           c.attrName(e, "adjust")
         );
         if (u) {
-          const g = document.body.querySelectorAll(u);
-          g.length > 0 ? (r.adjustFragments = [], g.forEach((b) => {
-            const y = N.get(b);
-            y && r.adjustFragments.push(y);
+          const p = document.body.querySelectorAll(u);
+          p.length > 0 ? (r.adjustFragments = [], p.forEach((E) => {
+            const A = N.get(E);
+            A && r.adjustFragments.push(A);
           })) : h.error(
             "Haori",
             `Adjust element not found: ${u} (${c.attrName(e, "adjust")})`
           );
         }
         if (t.hasAttribute(c.attrName(e, "adjust-value"))) {
-          const g = t.getRawAttribute(
+          const p = t.getRawAttribute(
             c.attrName(e, "adjust-value")
-          ), b = Number(g);
-          isNaN(b) || (r.adjustValue = b);
+          ), E = Number(p);
+          isNaN(E) || (r.adjustValue = E);
         }
       }
       if (t.hasAttribute(c.attrName(e, "row-add")) && (r.rowAdd = !0), t.hasAttribute(c.attrName(e, "row-remove")) && (r.rowRemove = !0), t.hasAttribute(c.attrName(e, "row-prev")) && (r.rowMovePrev = !0), t.hasAttribute(c.attrName(e, "row-next")) && (r.rowMoveNext = !0), t.hasAttribute(`${l.prefix}${e}-after-run`)) {
@@ -2604,8 +2657,8 @@ ${d}
 ${u}
 `
           );
-        } catch (g) {
-          h.error("Haori", `Invalid after script: ${g}`);
+        } catch (p) {
+          h.error("Haori", `Invalid after script: ${p}`);
         }
       }
       if (t.hasAttribute(c.attrName(e, "dialog")) && (r.dialogMessage = t.getAttribute(
@@ -2624,15 +2677,15 @@ ${u}
           c.attrName(e, "history-form")
         );
         if (u) {
-          const g = document.body.querySelector(u);
-          g !== null ? r.historyFormFragment = A.getFormFragment(
-            N.get(g)
+          const p = document.body.querySelector(u);
+          p !== null ? r.historyFormFragment = m.getFormFragment(
+            N.get(p)
           ) : h.error(
             "Haori",
             `Form element not found: ${u} (${c.attrName(e, "history-form")})`
           );
         } else
-          r.historyFormFragment = A.getFormFragment(t);
+          r.historyFormFragment = m.getFormFragment(t);
       }
       [
         "reset",
@@ -2641,29 +2694,29 @@ ${u}
         "open",
         "close"
       ].forEach((u) => {
-        const g = c.attrName(e, u);
-        if (!t.hasAttribute(g))
+        const p = c.attrName(e, u);
+        if (!t.hasAttribute(p))
           return;
-        const b = t.getRawAttribute(g), y = [];
-        if (b ? (document.body.querySelectorAll(b).forEach((k) => {
+        const E = t.getRawAttribute(p), A = [];
+        if (E ? (document.body.querySelectorAll(E).forEach((k) => {
           const U = N.get(k);
-          U && y.push(U);
-        }), y.length === 0 && h.error("Haori", `Element not found: ${b} (${g})`)) : y.push(t), y.length > 0)
+          U && A.push(U);
+        }), A.length === 0 && h.error("Haori", `Element not found: ${E} (${p})`)) : A.push(t), A.length > 0)
           switch (u) {
             case "reset":
-              r.resetFragments = y;
+              r.resetFragments = A;
               break;
             case "refetch":
-              r.refetchFragments = y;
+              r.refetchFragments = A;
               break;
             case "click":
-              r.clickFragments = y;
+              r.clickFragments = A;
               break;
             case "open":
-              r.openFragments = y;
+              r.openFragments = A;
               break;
             case "close":
-              r.closeFragments = y;
+              r.closeFragments = A;
               break;
           }
       });
@@ -2672,19 +2725,19 @@ ${u}
       t,
       c.attrName(null, "data", !0)
     )), t.hasAttribute(c.attrName(null, "form", !0)))) {
-      const d = t.getRawAttribute(
+      const f = t.getRawAttribute(
         c.attrName(null, "form", !0)
       );
-      if (d) {
-        const u = document.body.querySelector(d);
-        u !== null ? r.formFragment = A.getFormFragment(
+      if (f) {
+        const u = document.body.querySelector(f);
+        u !== null ? r.formFragment = m.getFormFragment(
           N.get(u)
         ) : h.error(
           "Haori",
-          `Form element not found: ${d} (${c.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${f} (${c.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = A.getFormFragment(t);
+        r.formFragment = m.getFormFragment(t);
     }
     return s && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
   }
@@ -2748,79 +2801,79 @@ ${u}
     }
     const i = {};
     if (this.options.formFragment) {
-      const o = A.getValues(this.options.formFragment);
+      const o = m.getValues(this.options.formFragment);
       Object.assign(i, o);
     }
     this.options.data && typeof this.options.data == "object" && Object.assign(i, this.options.data);
     const s = Object.keys(i).length > 0;
     if (e) {
-      const o = { ...r || {} }, p = new Headers(
+      const o = { ...r || {} }, d = new Headers(
         o.headers || void 0
-      ), f = (o.method || "GET").toUpperCase(), T = l.runtime === "demo" && !nt(f), E = T ? "GET" : f;
-      if (o.method = E, E === "GET" || E === "HEAD" || E === "OPTIONS")
+      ), y = (o.method || "GET").toUpperCase(), b = l.runtime === "demo" && !nt(y), v = b ? "GET" : y;
+      if (o.method = v, v === "GET" || v === "HEAD" || v === "OPTIONS")
         s && (e = ot(e, i));
       else if (s) {
-        const u = p.get("Content-Type") || "";
+        const u = d.get("Content-Type") || "";
         if (/multipart\/form-data/i.test(u)) {
-          p.delete("Content-Type");
-          const g = new FormData();
-          for (const [b, y] of Object.entries(i))
-            y == null ? g.append(b, "") : y instanceof Blob ? g.append(b, y) : Array.isArray(y) ? y.forEach((x) => g.append(b, String(x))) : typeof y == "object" ? g.append(b, JSON.stringify(y)) : g.append(b, String(y));
-          o.body = g;
+          d.delete("Content-Type");
+          const p = new FormData();
+          for (const [E, A] of Object.entries(i))
+            A == null ? p.append(E, "") : A instanceof Blob ? p.append(E, A) : Array.isArray(A) ? A.forEach((R) => p.append(E, String(R))) : typeof A == "object" ? p.append(E, JSON.stringify(A)) : p.append(E, String(A));
+          o.body = p;
         } else if (/application\/x-www-form-urlencoded/i.test(u)) {
-          const g = new URLSearchParams();
-          for (const [b, y] of Object.entries(i))
-            y !== void 0 && (y === null ? g.append(b, "") : Array.isArray(y) ? y.forEach((x) => g.append(b, String(x))) : typeof y == "object" ? g.append(b, JSON.stringify(y)) : g.append(b, String(y)));
-          o.body = g;
+          const p = new URLSearchParams();
+          for (const [E, A] of Object.entries(i))
+            A !== void 0 && (A === null ? p.append(E, "") : Array.isArray(A) ? A.forEach((R) => p.append(E, String(R))) : typeof A == "object" ? p.append(E, JSON.stringify(A)) : p.append(E, String(A)));
+          o.body = p;
         } else
-          p.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
+          d.set("Content-Type", "application/json"), o.body = JSON.stringify(i);
       }
-      o.headers = p;
-      let d;
-      if (T && (d = e && new URL(e, window.location.href).search || void 0, p.delete("Content-Type"), h.info("Haori demo fetch normalization", {
+      o.headers = d;
+      let f;
+      if (b && (f = e && new URL(e, window.location.href).search || void 0, d.delete("Content-Type"), h.info("Haori demo fetch normalization", {
         runtime: l.runtime,
-        requestedMethod: f,
-        effectiveMethod: E,
+        requestedMethod: y,
+        effectiveMethod: v,
         transportMode: "query-get",
         url: e,
         payload: s ? i : void 0,
-        queryString: d
+        queryString: f
       })), this.options.targetFragment && e) {
-        const u = performance.now(), g = {
+        const u = performance.now(), p = {
           runtime: l.runtime,
-          requestedMethod: f,
-          effectiveMethod: E,
-          transportMode: T ? "query-get" : "http",
-          ...T ? { queryString: d } : {}
+          requestedMethod: y,
+          effectiveMethod: v,
+          transportMode: b ? "query-get" : "http",
+          ...b ? { queryString: f } : {}
         };
-        return v.fetchStart(
+        return w.fetchStart(
           this.options.targetFragment.getTarget(),
           e,
           o,
           s ? i : void 0,
-          g
-        ), fetch(e, o).then((b) => this.handleFetchResult(
-          b,
+          p
+        ), fetch(e, o).then((E) => this.handleFetchResult(
+          E,
           e || void 0,
           u
-        )).catch((b) => {
-          throw e && v.fetchError(
+        )).catch((E) => {
+          throw e && w.fetchError(
             this.options.targetFragment.getTarget(),
             e,
-            b
-          ), b;
+            E
+          ), E;
         });
       }
       return fetch(e, o).then((u) => this.handleFetchResult(u, e || void 0));
     }
     if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && s) {
-      const o = this.options.formFragment, p = o.getTarget();
-      p.setAttribute(
+      const o = this.options.formFragment, d = o.getTarget();
+      d.setAttribute(
         `${l.prefix}bind`,
         JSON.stringify(i)
       );
-      const f = o.getBindingData();
-      return Object.assign(f, i), await R.setBindingData(p, f), !0;
+      const y = o.getBindingData();
+      return Object.assign(y, i), await x.setBindingData(d, y), !0;
     }
     const n = s ? i : {}, a = new Response(JSON.stringify(n), {
       headers: { "Content-Type": "application/json" }
@@ -2833,14 +2886,14 @@ ${u}
   async handleFetchResult(t, e, r) {
     const i = X();
     if (!t.ok)
-      return this.options.targetFragment && e && v.fetchError(
+      return this.options.targetFragment && e && w.fetchError(
         this.options.targetFragment.getTarget(),
         e,
         new Error(`${t.status} ${t.statusText}`),
         t.status,
         r
       ), await this.handleFetchError(t), !1;
-    if (this.options.targetFragment && e && r && v.fetchEnd(
+    if (this.options.targetFragment && e && r && w.fetchEnd(
       this.options.targetFragment.getTarget(),
       e,
       t.status,
@@ -2855,7 +2908,7 @@ ${u}
     }
     const s = [];
     return s.push(this.bindResult(t)), s.push(this.adjust()), s.push(this.addRow()), s.push(this.removeRow()), s.push(this.movePrevRow()), s.push(this.moveNextRow()), this.options.resetFragments && this.options.resetFragments.length > 0 && this.options.resetFragments.forEach((n) => {
-      s.push(A.reset(n));
+      s.push(m.reset(n));
     }), this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((n) => {
       s.push(new c(n, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0 && this.options.clickFragments.forEach((n) => {
@@ -2892,11 +2945,11 @@ ${u}
           return;
         }
         const n = (a) => {
-          for (const [o, p] of Object.entries(a))
-            p != null && (Array.isArray(p) ? p.forEach((f) => s.searchParams.append(o, String(f))) : typeof p == "object" ? s.searchParams.set(o, JSON.stringify(p)) : s.searchParams.set(o, String(p)));
+          for (const [o, d] of Object.entries(a))
+            d != null && (Array.isArray(d) ? d.forEach((y) => s.searchParams.append(o, String(y))) : typeof d == "object" ? s.searchParams.set(o, JSON.stringify(d)) : s.searchParams.set(o, String(d)));
         };
         e && n(this.options.historyData), r && n(
-          A.getValues(
+          m.getValues(
             this.options.historyFormFragment
           )
         ), history.pushState({}, "", s.toString());
@@ -2909,7 +2962,7 @@ ${u}
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = A.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = m.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (s) => {
       const n = e ? e.getTarget() : document.body;
       await X().addErrorMessage(n, s);
@@ -2933,7 +2986,7 @@ ${u}
         if (n.length === 0)
           return await r(`${t.status} ${t.statusText}`), !1;
         for (const a of n)
-          a.key && e ? await A.addErrorMessage(e, a.key, a.message) : await r(a.message);
+          a.key && e ? await m.addErrorMessage(e, a.key, a.message) : await r(a.message);
         return !1;
       } catch {
       }
@@ -2999,15 +3052,15 @@ ${u}
         this.options.bindFragments.forEach((s) => {
           const n = s.getBindingData(), a = this.options.bindArg;
           if (r && typeof r == "object" && !Array.isArray(r)) {
-            const o = n[a], p = o && typeof o == "object" && !Array.isArray(o) ? o : {};
+            const o = n[a], d = o && typeof o == "object" && !Array.isArray(o) ? o : {};
             n[a] = this.mergeAppendBindingData(
               s,
               r,
-              p
+              d
             );
           } else
             n[a] = r;
-          i.push(R.setBindingData(s.getTarget(), n));
+          i.push(x.setBindingData(s.getTarget(), n));
         });
       else {
         if (typeof r == "string")
@@ -3020,7 +3073,7 @@ ${u}
             r
           );
           i.push(
-            R.setBindingData(
+            x.setBindingData(
               s.getTarget(),
               n
             )
@@ -3087,7 +3140,7 @@ ${u}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(R.evaluateAll(r)), e.push(A.reset(r)), Promise.all(e).then(() => {
+    ), e.push(x.evaluateAll(r)), e.push(m.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3154,7 +3207,7 @@ class lt {
     }), t;
   }
 }
-class ct {
+class ut {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -3192,7 +3245,7 @@ class ct {
     }
   }
 }
-const m = class m {
+const g = class g {
   /**
    * 遅延属性かどうか（完全名で判定）を判定します。
    *
@@ -3200,7 +3253,7 @@ const m = class m {
    * @returns 遅延属性かどうか
    */
   static isDeferredAttributeName(t) {
-    return m.DEFERRED_ATTRIBUTE_SUFFIXES.some(
+    return g.DEFERRED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -3211,7 +3264,7 @@ const m = class m {
    * @returns 除外対象かどうか
    */
   static isEvaluateAllExcludedAttributeName(t) {
-    return m.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
+    return g.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -3223,7 +3276,7 @@ const m = class m {
    * @returns 再評価する場合は true
    */
   static shouldReevaluateAttribute(t, e) {
-    return e !== null && !m.isEvaluateAllExcludedAttributeName(t) && m.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
+    return e !== null && !g.isEvaluateAllExcludedAttributeName(t) && g.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
   }
   /**
    * プレースホルダを含む通常属性を再評価します。
@@ -3236,7 +3289,7 @@ const m = class m {
     let e = Promise.resolve();
     for (const r of t.getAttributeNames()) {
       const i = t.getRawAttribute(r);
-      m.shouldReevaluateAttribute(r, i) && (e = e.then(() => t.setAttribute(r, i)));
+      g.shouldReevaluateAttribute(r, i) && (e = e.then(() => t.setAttribute(r, i)));
     }
     return e.then(() => {
     });
@@ -3253,10 +3306,10 @@ const m = class m {
       return Promise.resolve();
     t.parentNode && (N.get(t.parentNode)?.isMounted() || document.body.contains(t) ? e.setMounted(!0) : e.setMounted(!1));
     const r = [], i = /* @__PURE__ */ new Set();
-    for (const s of m.PRIORITY_ATTRIBUTE_SUFFIXES) {
+    for (const s of g.PRIORITY_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + s;
       e.hasAttribute(n) && (r.push(
-        m.setAttribute(
+        g.setAttribute(
           e.getTarget(),
           n,
           e.getRawAttribute(n)
@@ -3264,15 +3317,15 @@ const m = class m {
       ), i.add(n));
     }
     for (const s of e.getAttributeNames()) {
-      if (i.has(s) || m.isDeferredAttributeName(s))
+      if (i.has(s) || g.isDeferredAttributeName(s))
         continue;
       const n = e.getRawAttribute(s);
-      n !== null && r.push(m.setAttribute(e.getTarget(), s, n));
+      n !== null && r.push(g.setAttribute(e.getTarget(), s, n));
     }
-    for (const s of m.DEFERRED_ATTRIBUTE_SUFFIXES) {
+    for (const s of g.DEFERRED_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + s;
       e.hasAttribute(n) && (r.push(
-        m.setAttribute(
+        g.setAttribute(
           e.getTarget(),
           n,
           e.getRawAttribute(n)
@@ -3280,7 +3333,7 @@ const m = class m {
       ), i.add(n));
     }
     return e.getChildren().forEach((s) => {
-      s instanceof D ? r.push(m.scan(s.getTarget())) : s instanceof L && r.push(m.evaluateText(s));
+      s instanceof D ? r.push(g.scan(s.getTarget())) : s instanceof L && r.push(g.evaluateText(s));
     }), Promise.all(r).then(() => {
     });
   }
@@ -3297,14 +3350,14 @@ const m = class m {
     const i = N.get(t), s = [];
     switch (e) {
       case `${l.prefix}bind`: {
-        r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(m.parseDataBind(r));
+        r === null ? (i.clearBindingDataCache(), i.setBindingData({})) : i.setBindingData(g.parseDataBind(r));
         break;
       }
       case `${l.prefix}if`:
-        s.push(m.evaluateIf(i));
+        s.push(g.evaluateIf(i));
         break;
       case `${l.prefix}each`:
-        s.push(m.evaluateEach(i));
+        s.push(g.evaluateEach(i));
         break;
       case `${l.prefix}fetch`:
         s.push(
@@ -3315,16 +3368,16 @@ const m = class m {
       case `${l.prefix}import`: {
         if (typeof r == "string") {
           const n = i.getTarget(), a = performance.now();
-          v.importStart(n, r), s.push(
-            ct.load(r).then((o) => {
-              const p = new TextEncoder().encode(o).length;
+          w.importStart(n, r), s.push(
+            ut.load(r).then((o) => {
+              const d = new TextEncoder().encode(o).length;
               return F.enqueue(() => {
                 n.innerHTML = o;
               }).then(() => {
-                v.importEnd(n, r, p, a);
+                w.importEnd(n, r, d, a);
               });
             }).catch((o) => {
-              v.importError(n, r, o), h.error("[Haori]", "Failed to import HTML:", r, o);
+              w.importError(n, r, o), h.error("[Haori]", "Failed to import HTML:", r, o);
             })
           );
         }
@@ -3333,10 +3386,10 @@ const m = class m {
       case `${l.prefix}url-param`: {
         const n = i.getAttribute(`${l.prefix}url-arg`), a = lt.readParams();
         if (n === null)
-          m.setBindingData(t, a);
+          g.setBindingData(t, a);
         else {
           const o = i.getRawBindingData() || {};
-          o[String(n)] = a, m.setBindingData(t, o);
+          o[String(n)] = a, g.setBindingData(t, o);
         }
         break;
       }
@@ -3356,9 +3409,13 @@ const m = class m {
     const r = N.get(t), i = r.getRawBindingData();
     r.setBindingData(e);
     const s = [];
-    return s.push(
+    if (s.push(
       r.setAttribute(`${l.prefix}bind`, JSON.stringify(e))
-    ), s.push(m.evaluateAll(r)), v.bindChange(t, i, e, "manual"), Promise.all(s).then(() => {
+    ), t.tagName === "FORM") {
+      const n = r.getAttribute(`${l.prefix}form-arg`), a = n && e[String(n)] && typeof e[String(n)] == "object" && !Array.isArray(e[String(n)]) ? e[String(n)] : n ? {} : e;
+      s.push(m.syncValues(r, a));
+    }
+    return s.push(g.evaluateAll(r)), w.bindChange(t, i, e, "manual"), Promise.all(s).then(() => {
     });
   }
   /**
@@ -3392,7 +3449,7 @@ const m = class m {
     if (r.isSkipMutationNodes())
       return;
     const i = N.get(e.nextSibling), s = N.get(e);
-    s && (r.insertBefore(s, i), s instanceof D ? m.scan(s.getTarget()) : s instanceof L && m.evaluateText(s));
+    s && (r.insertBefore(s, i), s instanceof D ? g.scan(s.getTarget()) : s instanceof L && g.evaluateText(s));
   }
   /**
    * ノードを親要素から削除します。
@@ -3432,11 +3489,11 @@ const m = class m {
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
-    const s = m.getFormFragment(r);
+    const s = g.getFormFragment(r);
     if (s) {
-      const n = A.getValues(s), a = s.getAttribute(`${l.prefix}form-arg`);
+      const n = m.getValues(s), a = s.getAttribute(`${l.prefix}form-arg`);
       let o;
-      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(m.setBindingData(s.getTarget(), o));
+      a ? (o = s.getRawBindingData(), o || (o = {}), o[String(a)] = n) : o = n, i.push(g.setBindingData(s.getTarget(), o));
     }
     return Promise.all(i).then(() => {
     });
@@ -3451,7 +3508,7 @@ const m = class m {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
     const e = t.getParent();
-    return e ? m.getFormFragment(e) : null;
+    return e ? g.getFormFragment(e) : null;
   }
   /**
    * フラグメントとその子要素を評価します。
@@ -3461,8 +3518,8 @@ const m = class m {
    */
   static evaluateAll(t) {
     const e = [];
-    return e.push(m.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${l.prefix}if`) && e.push(m.evaluateIf(t)), t.hasAttribute(`${l.prefix}each`) && e.push(m.evaluateEach(t)), t.getChildren().forEach((r) => {
-      r instanceof D ? e.push(m.evaluateAll(r)) : r instanceof L && e.push(m.evaluateText(r));
+    return e.push(g.reevaluateInterpolatedAttributes(t)), t.hasAttribute(`${l.prefix}if`) && e.push(g.evaluateIf(t)), t.hasAttribute(`${l.prefix}each`) && e.push(g.evaluateEach(t)), t.getChildren().forEach((r) => {
+      r instanceof D ? e.push(g.evaluateAll(r)) : r instanceof L && e.push(g.evaluateText(r));
     }), Promise.all(e).then(() => {
     });
   }
@@ -3486,13 +3543,13 @@ const m = class m {
     const e = [], r = t.getAttribute(`${l.prefix}if`);
     return r === !1 || r === void 0 || r === null || Number.isNaN(r) ? t.isVisible() && e.push(
       t.hide().then(() => {
-        v.hide(t.getTarget());
+        w.hide(t.getTarget());
       })
     ) : t.isVisible() || (e.push(
       t.show().then(() => {
-        v.show(t.getTarget());
+        w.show(t.getTarget());
       })
-    ), e.push(m.evaluateAll(t))), Promise.all(e).then(() => {
+    ), e.push(g.evaluateAll(t))), Promise.all(e).then(() => {
     });
   }
   /**
@@ -3535,68 +3592,68 @@ const m = class m {
     let i = t.getAttribute(`${l.prefix}each-index`);
     i && (i = String(i));
     const s = t.getAttribute(`${l.prefix}each-key`), n = t.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    e.forEach((u, g) => {
-      const b = m.createListKey(
+    e.forEach((u, p) => {
+      const E = g.createListKey(
         u,
         s ? String(s) : null,
-        g
+        p
       );
-      o.push(b), a.set(b, { item: u, itemIndex: g });
+      o.push(E), a.set(E, { item: u, itemIndex: p });
     });
-    const p = [];
-    let f = t.getChildren().filter((u) => u instanceof D).filter(
+    const d = [];
+    let y = t.getChildren().filter((u) => u instanceof D).filter(
       (u) => !u.hasAttribute(`${l.prefix}each-before`) && !u.hasAttribute(`${l.prefix}each-after`)
     );
-    f = f.filter((u) => o.indexOf(String(u.getListKey())) === -1 ? (p.push(u.remove()), !1) : !0);
-    const T = f.map((u) => u.getListKey()), E = t.getChildren().filter((u) => u instanceof D).filter((u) => u.hasAttribute(`${l.prefix}each-before`)).length;
-    let d = Promise.resolve();
-    return o.forEach((u, g) => {
-      const b = T.indexOf(u), { item: y, itemIndex: x } = a.get(u);
+    y = y.filter((u) => o.indexOf(String(u.getListKey())) === -1 ? (d.push(u.remove()), !1) : !0);
+    const b = y.map((u) => u.getListKey()), v = t.getChildren().filter((u) => u instanceof D).filter((u) => u.hasAttribute(`${l.prefix}each-before`)).length;
+    let f = Promise.resolve();
+    return o.forEach((u, p) => {
+      const E = b.indexOf(u), { item: A, itemIndex: R } = a.get(u);
       let k;
-      if (b !== -1)
-        k = f[b], d = d.then(
-          () => m.updateRowFragment(
+      if (E !== -1)
+        k = y[E], f = f.then(
+          () => g.updateRowFragment(
             k,
-            y,
+            A,
             i,
-            x,
+            R,
             n ? String(n) : null,
             u
-          ).then(() => m.evaluateAll(k))
+          ).then(() => g.evaluateAll(k))
         );
       else {
         k = r.clone();
-        const U = E + g;
-        d = d.then(
-          () => m.updateRowFragment(
+        const U = v + p;
+        f = f.then(
+          () => g.updateRowFragment(
             k,
-            y,
+            A,
             i,
-            x,
+            R,
             n ? String(n) : null,
             u
           ).then(
             () => t.insertBefore(
               k,
               t.getChildren()[U] || null
-            ).then(() => m.evaluateAll(k))
+            ).then(() => g.evaluateAll(k))
           )
         );
       }
-    }), Promise.all(p).then(() => d).then(() => {
+    }), Promise.all(d).then(() => f).then(() => {
       const u = o.filter(
-        (x) => x !== null
-      ), g = T.filter(
-        (x) => x !== null
-      ), b = u.filter(
-        (x) => !g.includes(x)
-      ), y = g.filter(
-        (x) => !u.includes(x)
+        (R) => R !== null
+      ), p = b.filter(
+        (R) => R !== null
+      ), E = u.filter(
+        (R) => !p.includes(R)
+      ), A = p.filter(
+        (R) => !u.includes(R)
       );
-      v.eachUpdate(
+      w.eachUpdate(
         t.getTarget(),
-        b,
-        y,
+        E,
+        A,
         u
       );
     });
@@ -3650,16 +3707,16 @@ const m = class m {
     return t.setListKey(n), t.setBindingData(a), t.setAttribute(`${l.prefix}row`, n);
   }
 };
-m.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], m.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], m.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
+g.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if", "each"], g.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch", "url-param"], g.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
   "bind",
   "if",
   "each",
   "fetch",
   "import",
   "url-param"
-], m.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
-let R = m;
-class ut {
+], g.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
+let x = g;
+class ct {
   /**
    * コンストラクタ。
    *
@@ -3709,44 +3766,44 @@ class ut {
     return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
   }
 }
-const w = class w {
+const T = class T {
   static syncTree(t) {
-    (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && w.syncElement(t), t.querySelectorAll("*").forEach((e) => {
-      w.syncElement(e);
+    (t instanceof Element || t instanceof DocumentFragment) && (t instanceof HTMLElement && T.syncElement(t), t.querySelectorAll("*").forEach((e) => {
+      T.syncElement(e);
     }));
   }
   static syncElement(t) {
-    const e = w.registrations.get(t), r = N.get(t);
-    if (!r || !w.shouldObserve(r)) {
-      e && (e.observer.disconnect(), w.registrations.delete(t));
+    const e = T.registrations.get(t), r = N.get(t);
+    if (!r || !T.shouldObserve(r)) {
+      e && (e.observer.disconnect(), T.registrations.delete(t));
       return;
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = w.resolveRoot(r), s = w.resolveRootMargin(r), n = w.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
-    if (e && e.observer.root === i && e.observer.rootMargin === s && w.sameThreshold(
+    const i = T.resolveRoot(r), s = T.resolveRootMargin(r), n = T.resolveThreshold(r), a = r.hasAttribute(`${l.prefix}intersect-once`);
+    if (e && e.observer.root === i && e.observer.rootMargin === s && T.sameThreshold(
       e.observer.thresholds,
       n
     ) && e.once === a) {
       e.fragment = r;
       return;
     }
-    e && (e.observer.disconnect(), w.registrations.delete(t));
+    e && (e.observer.disconnect(), T.registrations.delete(t));
     const o = new IntersectionObserver(
-      (p) => {
-        const f = w.registrations.get(t);
-        f && p.forEach((T) => {
-          !T.isIntersecting || f.running || w.isDisabled(f.fragment) || (f.running = !0, new V(f.fragment, "intersect").runWithResult().then((E) => {
-            E && f.once && (f.observer.disconnect(), w.registrations.delete(t));
-          }).catch((E) => {
+      (d) => {
+        const y = T.registrations.get(t);
+        y && d.forEach((b) => {
+          !b.isIntersecting || y.running || T.isDisabled(y.fragment) || (y.running = !0, new V(y.fragment, "intersect").runWithResult().then((v) => {
+            v && y.once && (y.observer.disconnect(), T.registrations.delete(t));
+          }).catch((v) => {
             h.error(
               "[Haori]",
               "Intersect procedure execution error:",
-              E
+              v
             );
           }).finally(() => {
-            const E = w.registrations.get(t);
-            E && (E.running = !1);
+            const v = T.registrations.get(t);
+            v && (v.running = !1);
           }));
         });
       },
@@ -3756,7 +3813,7 @@ const w = class w {
         threshold: n
       }
     );
-    o.observe(t), w.registrations.set(t, {
+    o.observe(t), T.registrations.set(t, {
       fragment: r,
       observer: o,
       once: a,
@@ -3765,25 +3822,25 @@ const w = class w {
   }
   static cleanupTree(t) {
     if (t instanceof HTMLElement) {
-      const e = w.registrations.get(t);
-      e && (e.observer.disconnect(), w.registrations.delete(t));
+      const e = T.registrations.get(t);
+      e && (e.observer.disconnect(), T.registrations.delete(t));
     }
     (t instanceof Element || t instanceof DocumentFragment) && t.querySelectorAll("*").forEach((e) => {
-      const r = w.registrations.get(e);
-      r && (r.observer.disconnect(), w.registrations.delete(e));
+      const r = T.registrations.get(e);
+      r && (r.observer.disconnect(), T.registrations.delete(e));
     });
   }
   static disconnectAll() {
-    w.registrations.forEach((t) => {
+    T.registrations.forEach((t) => {
       t.observer.disconnect();
-    }), w.registrations.clear();
+    }), T.registrations.clear();
   }
   static shouldObserve(t) {
     return t.getAttributeNames().some((e) => {
       if (!e.startsWith(`${l.prefix}intersect-`))
         return !1;
       const r = e.slice(`${l.prefix}intersect-`.length);
-      return !w.CONFIG_KEYS.has(r);
+      return !T.CONFIG_KEYS.has(r);
     });
   }
   static resolveRoot(t) {
@@ -3817,14 +3874,14 @@ const w = class w {
     return t.length === 1 && t[0] === e;
   }
 };
-w.CONFIG_KEYS = /* @__PURE__ */ new Set([
+T.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "root",
   "root-margin",
   "threshold",
   "disabled",
   "once"
-]), w.registrations = /* @__PURE__ */ new Map();
-let B = w;
+]), T.registrations = /* @__PURE__ */ new Map();
+let B = T;
 const H = class H {
   /**
    * 初期化メソッド。
@@ -3835,10 +3892,10 @@ const H = class H {
       return;
     H._initialized = !0;
     const t = await Promise.allSettled([
-      R.scan(document.head),
-      R.scan(document.body)
+      x.scan(document.head),
+      x.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", r.reason), H.observe(document.head), H.observe(document.body), new ut().start(), B.syncTree(document.body);
+    e.status !== "fulfilled" && h.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && h.error("[Haori]", "Failed to build body fragment:", r.reason), H.observe(document.head), H.observe(document.body), new ct().start(), B.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -3858,7 +3915,7 @@ const H = class H {
                 i.attributeName
               );
               const s = i.target;
-              R.setAttribute(
+              x.setAttribute(
                 s,
                 i.attributeName,
                 s.getAttribute(i.attributeName)
@@ -3872,9 +3929,9 @@ const H = class H {
                 Array.from(i.removedNodes).map((s) => s.nodeName),
                 Array.from(i.addedNodes).map((s) => s.nodeName)
               ), Array.from(i.removedNodes).forEach((s) => {
-                B.cleanupTree(s), R.removeNode(s);
+                B.cleanupTree(s), x.removeNode(s);
               }), Array.from(i.addedNodes).forEach((s) => {
-                s.parentElement instanceof HTMLElement && (R.addNode(s.parentElement, s), B.syncTree(s));
+                s.parentElement instanceof HTMLElement && (x.addNode(s.parentElement, s), B.syncTree(s));
               });
               break;
             }
@@ -3884,7 +3941,7 @@ const H = class H {
                 "Character data changed:",
                 i.target,
                 i.target.textContent
-              ), i.target instanceof Text || i.target instanceof Comment ? R.changeText(i.target, i.target.textContent) : h.warn(
+              ), i.target instanceof Text || i.target instanceof Comment ? x.changeText(i.target, i.target.textContent) : h.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -3909,11 +3966,11 @@ const H = class H {
 H._initialized = !1;
 let G = H;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", G.init) : G.init();
-const ht = "0.4.0";
+const ht = "0.4.2";
 export {
-  R as Core,
+  x as Core,
   l as Env,
-  A as Form,
+  m as Form,
   N as Fragment,
   _ as Haori,
   h as Log,