haori 0.17.2 → 0.18.1

package/dist/haori.es.js

@@ -31,11 +31,11 @@ const G = class G {
 G.devMode = !1;
 let H = G;
 const ct = "embedded";
-function yt(p) {
+function Et(p) {
   return p === "embedded" || p === "demo";
 }
 function xt(p) {
-  return p === null ? null : yt(p) ? p : ct;
+  return p === null ? null : Et(p) ? p : ct;
 }
 const L = class L {
   /**
@@ -53,7 +53,7 @@ const L = class L {
    * @return 戻り値はありません。
    */
   static setRuntime(t) {
-    L._runtime = yt(t) ? t : ct;
+    L._runtime = Et(t) ? t : ct;
   }
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
@@ -126,11 +126,11 @@ class m {
     console.error(t, ...e);
   }
 }
-const Pt = "yyyy/MM/dd HH:mm", It = "en-US", vt = 1e4;
+const kt = "yyyy/MM/dd HH:mm", Pt = "en-US", vt = 1e4;
 function q(p) {
   return String(p).padStart(2, "0");
 }
-function At(p, t = Pt) {
+function At(p, t = kt) {
   if (p == null || p === "")
     return "";
   const e = p instanceof Date ? p : new Date(p);
@@ -172,7 +172,7 @@ function St(p, t) {
     const i = Math.max(0, Math.trunc(t));
     r.minimumFractionDigits = i, r.maximumFractionDigits = i;
   }
-  return new Intl.NumberFormat(It, r).format(e);
+  return new Intl.NumberFormat(Pt, r).format(e);
 }
 function Tt(p, t, e) {
   let r, i, n;
@@ -196,18 +196,18 @@ function wt(p, t, e = {}) {
     Math.max(Math.trunc(Number(t)) || 0, 0),
     r - 1
   ), n = Math.max(0, Math.trunc(e.window ?? 2)), s = Math.max(0, Math.trunc(e.boundary ?? 1)), a = /* @__PURE__ */ new Set();
-  for (let h = 0; h < s && h < r; h += 1)
-    a.add(h);
-  for (let h = Math.max(0, r - s); h < r; h += 1)
-    a.add(h);
-  for (let h = Math.max(0, i - n); h <= Math.min(r - 1, i + n); h += 1)
-    a.add(h);
-  const o = Array.from(a).sort((h, g) => h - g), u = [];
-  let d = null;
-  for (const h of o) {
-    if (d !== null && h - d > 1)
-      if (h - d === 2) {
-        const g = d + 1;
+  for (let d = 0; d < s && d < r; d += 1)
+    a.add(d);
+  for (let d = Math.max(0, r - s); d < r; d += 1)
+    a.add(d);
+  for (let d = Math.max(0, i - n); d <= Math.min(r - 1, i + n); d += 1)
+    a.add(d);
+  const o = Array.from(a).sort((d, g) => d - g), u = [];
+  let c = null;
+  for (const d of o) {
+    if (c !== null && d - c > 1)
+      if (d - c === 2) {
+        const g = c + 1;
         u.push({
           page: g,
           label: g + 1,
@@ -217,15 +217,15 @@ function wt(p, t, e = {}) {
       } else
         u.push({ page: null, label: "…", active: !1, ellipsis: !0 });
     u.push({
-      page: h,
-      label: h + 1,
-      active: h === i,
+      page: d,
+      label: d + 1,
+      active: d === i,
       ellipsis: !1
-    }), d = h;
+    }), c = d;
   }
   return u;
 }
-const Ct = /^(\d{4})-(\d{1,2})$/, kt = 1200;
+const It = /^(\d{4})-(\d{1,2})$/, Ct = 1200;
 function tt(p, t) {
   const e = Number(p);
   return Number.isFinite(e) ? Math.trunc(e) : t;
@@ -233,7 +233,7 @@ function tt(p, t) {
 function at(p, t) {
   if (typeof p != "string")
     return "";
-  const e = Ct.exec(p.trim());
+  const e = It.exec(p.trim());
   if (!e)
     return "";
   const r = Number(e[1]), i = Number(e[2]);
@@ -255,7 +255,7 @@ function Dt(p, t) {
   const r = Bt(t);
   if (r === "")
     return [];
-  const i = Math.min(e, kt), n = [];
+  const i = Math.min(e, Ct), n = [];
   for (let s = 0; s <= i; s += 1) {
     const a = at(r, -s);
     n.push({ targetMonth: a, label: a.replace(/-/g, "/") });
@@ -277,11 +277,11 @@ function Rt(p, t) {
   if (t !== void 0 && Number.isFinite(t))
     u = Math.max(0, Math.trunc(t));
   else {
-    const h = tt(r.numberOfElements, NaN);
-    u = Number.isFinite(h) ? h : Math.min(s, i - a);
+    const d = tt(r.numberOfElements, NaN);
+    u = Number.isFinite(d) ? d : Math.min(s, i - a);
   }
-  const d = Math.min(a + u, i);
-  return { start: o, end: Math.max(d, o), total: i, empty: !1 };
+  const c = Math.min(a + u, i);
+  return { start: o, end: Math.max(c, o), total: i, empty: !1 };
 }
 function Nt(p, t, e) {
   if (!Array.isArray(p) || p.length === 0)
@@ -401,7 +401,7 @@ const $t = Object.freeze({
     if (this.containsDangerousPatterns(t)) {
       const o = this.detectDisallowedKeywords(t);
       if (o.length > 0) {
-        const u = o.some((d) => d === "function" || d === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
+        const u = o.some((c) => c === "function" || c === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
         m.warn(
           "[Haori]",
           t,
@@ -444,29 +444,29 @@ const $t = Object.freeze({
       if (u.compileFailed || u.evaluator === null)
         return { value: null, unresolvedReference: !1 };
       try {
-        const d = [], h = this.wrapBoundValues(s);
+        const c = [], d = this.wrapBoundValues(s);
         return u.bindKeys.forEach((g) => {
-          d.push(h[g]);
+          c.push(d[g]);
         }), {
           value: this.withBlockedPropertyAccess(
-            () => u.evaluator(...d)
+            () => u.evaluator(...c)
           ),
           unresolvedReference: !1
         };
-      } catch (d) {
-        if (a && d instanceof ReferenceError) {
-          const g = this.extractMissingIdentifier(d);
+      } catch (c) {
+        if (a && c instanceof ReferenceError) {
+          const g = this.extractMissingIdentifier(c);
           if (g !== null && this.canRecoverMissingIdentifier(g, s)) {
             s[g] = void 0;
             continue;
           }
         }
-        const h = this.detectForbiddenIdentifiers(t);
-        return h.length > 0 && m.warn(
+        const d = this.detectForbiddenIdentifiers(t);
+        return d.length > 0 && m.warn(
           "[Haori]",
-          "Expression references blocked identifier(s): " + h.join(", ") + ". These are blocked in expressions and evaluate to undefined (often the cause of this error). Use spread {...a, ...b} instead of Object.assign.",
+          "Expression references blocked identifier(s): " + d.join(", ") + ". These are blocked in expressions and evaluate to undefined (often the cause of this error). Use spread {...a, ...b} instead of Object.assign.",
           t
-        ), m.error("[Haori]", "Expression evaluation error:", t, d), d instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
+        ), m.error("[Haori]", "Expression evaluation error:", t, c), c instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
       }
     }
     return m.error(
@@ -588,12 +588,12 @@ return (${t});`;
     const r = [];
     let i = null;
     for (let n = 0; n < e.length; n++) {
-      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, u = e[n - 2] || null, d = e[n - 3] || null;
+      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, u = e[n - 2] || null, c = e[n - 3] || null;
       if (this.startsObjectKey(
         o,
         i,
         u,
-        d
+        c
       ) && (s.value === "[" || s.type === "identifier" && this.FORBIDDEN_PROPERTY_NAMES.has(s.value) || s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
         this.decodeStringLiteral(s.value)
       )) || s.type === "identifier" && (this.DISALLOWED_KEYWORDS.has(s.value) || this.STRICT_FORBIDDEN_NAMES.includes(s.value) || (i?.value === "." || i?.value === "?.") && this.FORBIDDEN_PROPERTY_NAMES.has(s.value)) || o === "member" && s.value !== "]" && s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
@@ -610,8 +610,8 @@ return (${t});`;
           break;
         }
         case "[": {
-          const h = this.startsMemberAccess(i) ? "member" : "array";
-          r.push(h);
+          const d = this.startsMemberAccess(i) ? "member" : "array";
+          r.push(d);
           break;
         }
         case "{":
@@ -1216,7 +1216,7 @@ const pt = class pt {
   }
 };
 pt.ASYNC_QUEUE = new dt();
-let P = pt;
+let k = pt;
 const N = class N {
   /**
    * 集計状態を初期化します。
@@ -1491,7 +1491,7 @@ const Y = class Y {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return P.enqueue(() => {
+      return k.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode === t.getTarget() && t.getTarget().removeChild(this.target), this.mounted = !1;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1499,7 +1499,7 @@ const Y = class Y {
     } else {
       const t = this.target.parentNode;
       if (t)
-        return P.enqueue(() => {
+        return k.enqueue(() => {
           this.target.parentNode === t && t.removeChild(this.target), this.mounted = !1;
         });
       this.mounted = !1;
@@ -1516,7 +1516,7 @@ const Y = class Y {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return P.enqueue(() => {
+      return k.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode !== t.getTarget() && t.getTarget().appendChild(this.target), this.mounted = !0;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1575,8 +1575,8 @@ const Y = class Y {
   }
 };
 Y.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
-let T = Y;
-const W = class W extends T {
+let w = Y;
+const W = class W extends w {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1599,14 +1599,14 @@ const W = class W extends T {
       "month",
       "time",
       "week"
-    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingWorkChain = Promise.resolve(), this.initialBindAttribute = null, this.derivedBindingData = null, this.bindingDataCache = null, this.descendantBindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.renderSignature = null, this.eachInputSignature = null, this.deriveSubtreeSignature = null, this.deriveInputSignature = null, this.freshInitializationSkippable = !1, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.selfWrittenBind = /* @__PURE__ */ new Map(), this.syncValue(), this.initialBindAttribute = t.getAttribute(`${l.prefix}bind`), t.getAttributeNames().forEach((e) => {
+    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingWorkChain = Promise.resolve(), this.bindingWorkActive = 0, this.initialBindAttribute = null, this.derivedBindingData = null, this.bindingDataCache = null, this.descendantBindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.renderSignature = null, this.eachInputSignature = null, this.deriveSubtreeSignature = null, this.deriveInputSignature = null, this.freshInitializationSkippable = !1, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.selfWrittenBind = /* @__PURE__ */ new Map(), this.syncValue(), this.initialBindAttribute = t.getAttribute(`${l.prefix}bind`), t.getAttributeNames().forEach((e) => {
       const r = t.getAttribute(e);
       if (r !== null && !this.attributeMap.has(e)) {
         const i = new rt(e, r);
         this.attributeMap.set(e, i);
       }
     }), t.childNodes.forEach((e) => {
-      const r = T.get(e);
+      const r = w.get(e);
       r.setParent(this), this.children.push(r);
     });
   }
@@ -1767,12 +1767,35 @@ const W = class W extends T {
    * フラグでの「再入即時実行」を行っていましたが、await をまたいで届く**独立した
    * 並行呼出**まで再入扱いしてインライン実行し、`skipMutationAttributes` 中の
    * `data-bind` 書き込みが破棄されて古い値が後勝ちする競合の原因になっていました。
-   * 真の再入（data-url-param 等）は呼出側がキューを介さず実行するため、ここでは
-   * 一律にチェーンへ積みます。
+   * 真の再入（`data-url-param` の再評価、マネージド `data-fetch` の同一フラグメント
+   * への bind-back）は呼出側が `reentrant=true` でキューを介さず実行するため、
+   * ここでは一律にチェーンへ積みます。
    *
    * @param work 直列化したいバインドデータ更新処理
    * @returns work の完了 Promise
    */
+  /**
+   * このフラグメントのバインドワークが実行中（await をまたぐ期間を含む）かどうかを
+   * 返します。マネージド `data-fetch` の bind-back を reentrant 実行へ切り替えるべきか
+   * の判定に使います。
+   *
+   * @return 実行中なら true
+   */
+  isExecutingBindingWork() {
+    return this.bindingWorkActive > 0;
+  }
+  /**
+   * バインドワークの実行開始を記録します（`Core.setBindingData` の work 開始時に呼ぶ）。
+   */
+  markBindingWorkStart() {
+    this.bindingWorkActive++;
+  }
+  /**
+   * バインドワークの実行終了を記録します（work 完了時に呼ぶ）。
+   */
+  markBindingWorkEnd() {
+    this.bindingWorkActive > 0 && this.bindingWorkActive--;
+  }
   enqueueBindingWork(t) {
     const e = this.bindingWorkChain.then(t, t);
     return this.bindingWorkChain = e.then(
@@ -1965,14 +1988,14 @@ const W = class W extends T {
     if (r instanceof HTMLInputElement && (r.type === "checkbox" || r.type === "radio")) {
       const i = this.getAttribute("value"), n = r.type === "checkbox" && i === "true";
       let s;
-      return n ? s = t === !0 || t === "true" : i === "false" ? s = t === !1 : Array.isArray(t) ? s = t.map(String).includes(String(i)) : s = i === String(t), n ? this.value = s : s ? Array.isArray(t) ? this.value = String(i) : this.value = t : this.value = null, r.checked === s ? Promise.resolve() : (this.skipChangeValue = !0, P.enqueue(() => {
+      return n ? s = t === !0 || t === "true" : i === "false" ? s = t === !1 : Array.isArray(t) ? s = t.map(String).includes(String(i)) : s = i === String(t), n ? this.value = s : s ? Array.isArray(t) ? this.value = String(i) : this.value = t : this.value = null, r.checked === s ? Promise.resolve() : (this.skipChangeValue = !0, k.enqueue(() => {
         r.checked = s, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
     } else if (r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement) {
       const i = Array.isArray(t) ? t.join(",") : t;
-      return this.value = this.normalizeValueForElement(r, i), this.skipChangeValue = !0, P.enqueue(() => {
+      return this.value = this.normalizeValueForElement(r, i), this.skipChangeValue = !0, k.enqueue(() => {
         r.value = i === null ? "" : String(i), 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;
@@ -2080,7 +2103,7 @@ const W = class W extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const r = this.getTarget();
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       r.removeAttribute(t), e !== t && r.removeAttribute(e);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2104,7 +2127,7 @@ const W = class W extends T {
     if (n) {
       const ot = this.attributeMap.get(t);
       if (ot && (ot.isEvaluate || ot.isForceEvaluation()) && !s.isEvaluate && !s.isForceEvaluation())
-        return this.skipMutationAttributes = !0, P.enqueue(() => {
+        return this.skipMutationAttributes = !0, k.enqueue(() => {
         }).finally(() => {
           this.skipMutationAttributes = !1;
         });
@@ -2115,8 +2138,8 @@ const W = class W extends T {
       element: a,
       rawName: t,
       template: r
-    }), u = s.isEvaluate || s.isRawEvaluate, d = t === e && W.BOOLEAN_ATTRIBUTES.has(e.toLowerCase()), h = s.isSingleExpression(), g = K.joinEvaluateResults(o.results), E = o.results.length === 1 ? o.results[0] : g, w = !s.isForceEvaluation() && (e !== t || d || h ? o.hasUnresolvedReference || E === null || E === void 0 || E === !1 : u && g === ""), k = s.isForceEvaluation() ? r : h ? E : g, A = i && s.isEvaluate && e === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), v = a.getRootNode(), b = A && a === v.activeElement, S = w || k === null || k === !1 ? null : String(k), F = t !== e && a.getAttribute(t) !== r, I = S === null ? a.hasAttribute(e) : a.getAttribute(e) !== S, $ = A && !b && S !== null && a.value !== S, V = e === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), C = e === "selected" && a instanceof HTMLOptionElement, Q = v.activeElement, gt = Q !== null && (V && a === Q || C && a.closest("select") === Q), _ = S !== null, mt = V && !gt && a.checked !== _, bt = C && !gt && a.selected !== _;
-    return !F && !I && !$ && !mt && !bt ? (A && !b && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, P.enqueue(() => {
+    }), u = s.isEvaluate || s.isRawEvaluate, c = t === e && W.BOOLEAN_ATTRIBUTES.has(e.toLowerCase()), d = s.isSingleExpression(), g = K.joinEvaluateResults(o.results), y = o.results.length === 1 ? o.results[0] : g, T = !s.isForceEvaluation() && (e !== t || c || d ? o.hasUnresolvedReference || y === null || y === void 0 || y === !1 : u && g === ""), P = s.isForceEvaluation() ? r : d ? y : g, A = i && s.isEvaluate && e === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), v = a.getRootNode(), b = A && a === v.activeElement, S = T || P === null || P === !1 ? null : String(P), F = t !== e && a.getAttribute(t) !== r, I = S === null ? a.hasAttribute(e) : a.getAttribute(e) !== S, $ = A && !b && S !== null && a.value !== S, V = e === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), C = e === "selected" && a instanceof HTMLOptionElement, Q = v.activeElement, gt = Q !== null && (V && a === Q || C && a.closest("select") === Q), _ = S !== null, mt = V && !gt && a.checked !== _, bt = C && !gt && a.selected !== _;
+    return !F && !I && !$ && !mt && !bt ? (A && !b && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, k.enqueue(() => {
       F && a.setAttribute(t, r), S === null ? a.removeAttribute(e) : (I && (a.setAttribute(e, S), e === `${l.prefix}bind` && this.recordSelfWrittenBind(S)), A && !b && (this.value = this.normalizeValueForElement(a, S), $ && (a.value = S))), mt && (a.checked = _), bt && (a.selected = _);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2133,7 +2156,7 @@ const W = class W extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const e = this.getTarget();
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       e.removeAttribute(t);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2214,7 +2237,7 @@ const W = class W extends T {
     const i = e ? r.nextSibling : r;
     let n = e ? r.nextSibling : r;
     for (; n !== null; ) {
-      const s = T.get(n);
+      const s = w.get(n);
       if (s !== null) {
         const a = this.children.indexOf(s);
         if (a !== -1)
@@ -2248,30 +2271,30 @@ const W = class W extends T {
     s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
     const u = t.getParent();
     u !== null && u.removeChild(t);
-    let d = r === void 0 ? e?.getTarget() || null : r;
+    let c = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
     else {
       let g;
       if (s ? a !== -1 && a < o ? g = o - 1 : g = o : g = this.children.indexOf(e), g === -1) {
-        const E = this.resolveInsertionPointFromDom(
+        const y = this.resolveInsertionPointFromDom(
           e,
           !1
         );
-        E === null ? (m.warn(
+        y === null ? (m.warn(
           "[Haori]",
           "Reference child not found in children.",
           e
-        ), this.children.push(t)) : (this.children.splice(E.index, 0, t), d = E.referenceNode);
+        ), this.children.push(t)) : (this.children.splice(y.index, 0, t), c = y.referenceNode);
       } else
         this.children.splice(g, 0, t);
     }
     t.setParent(this), t.setMounted(this.mounted);
-    const h = this.skipMutationNodes;
-    return this.skipMutationNodes = !0, P.enqueue(() => {
-      this.target.insertBefore(t.getTarget(), d);
+    const d = this.skipMutationNodes;
+    return this.skipMutationNodes = !0, k.enqueue(() => {
+      this.target.insertBefore(t.getTarget(), c);
     }).finally(() => {
-      this.skipMutationNodes = h;
+      this.skipMutationNodes = d;
     });
   }
   /**
@@ -2403,7 +2426,7 @@ W.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "selected"
 ]);
 let M = W;
-class U extends T {
+class U extends w {
   /**
    * テキストフラグメントのコンストラクタ。
    * 対象テキストノードの内容を初期化します。
@@ -2455,7 +2478,7 @@ class U extends T {
   evaluate() {
     return this.contents.isRawEvaluate && this.parent === null ? Promise.reject(
       new Error("Parent fragment is required for raw evaluation")
-    ) : P.enqueue(() => {
+    ) : k.enqueue(() => {
       this.skipMutation = !0;
       let t = this.text;
       this.contents.isRawEvaluate ? t = this.contents.evaluate(
@@ -2481,7 +2504,7 @@ class U extends T {
     });
   }
 }
-class ft extends T {
+class ft extends w {
   /**
    * コメントフラグメントのコンストラクタ。
    * 対象コメントノードの内容を初期化します。
@@ -2515,7 +2538,7 @@ class ft extends T {
    * @return 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, P.enqueue(() => {
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, k.enqueue(() => {
       this.skipMutation = !0, this.target.textContent = this.text;
     }).finally(() => {
       this.skipMutation = !1;
@@ -2627,20 +2650,20 @@ const nt = class nt {
     return this.contents.forEach((u) => {
       try {
         if (r(u)) {
-          const d = et.measure(
+          const c = et.measure(
             () => z.evaluateDetailed(u.text, t)
-          ), h = d.value;
-          a += d.durationMs, s.push({
+          ), d = c.value;
+          a += c.durationMs, s.push({
             expression: u.text,
-            durationMs: d.durationMs
-          }), o = o || h.unresolvedReference, n.push(h.value);
+            durationMs: c.durationMs
+          }), o = o || d.unresolvedReference, n.push(d.value);
         } else
           n.push(u.text);
-      } catch (d) {
+      } catch (c) {
         m.error(
           "[Haori]",
           `Error evaluating ${i} expression: ${u.text}`,
-          d
+          c
         ), s.push({
           expression: u.text,
           durationMs: 0
@@ -2749,7 +2772,7 @@ class Z {
    * @return すべてのレンダリングが完了したら解決される Promise
    */
   static waitForRenders() {
-    return P.waitForIdle();
+    return k.waitForIdle();
   }
   /**
    * 通知ダイアログを表示します。
@@ -2758,7 +2781,7 @@ class Z {
    * @returns 通知が閉じられると解決されるPromise
    */
   static dialog(t) {
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       window.alert(t);
     }, !0);
   }
@@ -2786,7 +2809,7 @@ class Z {
    * @returns ユーザーがOKをクリックした場合はtrue、キャンセルした場合はfalseが解決されるPromise
    */
   static confirm(t) {
-    return P.enqueue(() => window.confirm(t), !0);
+    return k.enqueue(() => window.confirm(t), !0);
   }
   /**
    * ダイアログを開きます。
@@ -2794,7 +2817,7 @@ class Z {
    * @param element 開くダイアログのHTML要素
    */
   static openDialog(t) {
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       t instanceof HTMLDialogElement ? t.showModal() : m.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
@@ -2804,7 +2827,7 @@ class Z {
    * @param element 閉じるダイアログのHTML要素
    */
   static closeDialog(t) {
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       t instanceof HTMLDialogElement ? t.close() : m.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
@@ -2825,7 +2848,7 @@ class Z {
    * @param level メッセージのレベル（省略可能）
    */
   static addMessage(t, e, r) {
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       const i = t instanceof HTMLFormElement ? t : t.parentElement ?? t;
       i.setAttribute("data-message", e), r !== void 0 ? i.setAttribute("data-message-level", r) : i.removeAttribute("data-message-level");
     }, !0);
@@ -2836,7 +2859,7 @@ class Z {
    * @param parent メッセージをクリアする親要素
    */
   static clearMessages(t) {
-    return P.enqueue(() => {
+    return k.enqueue(() => {
       t.removeAttribute("data-message"), t.removeAttribute("data-message-level"), t.querySelectorAll("[data-message]").forEach((e) => {
         e.removeAttribute("data-message"), e.removeAttribute("data-message-level");
       });
@@ -2957,13 +2980,13 @@ class Z {
   }
 }
 const Ot = ["addErrorMessage", "clearMessages"];
-function Et() {
+function yt() {
   const t = globalThis.window?.Haori;
   return Ot.every(
     (r) => typeof t?.[r] == "function"
   ) ? t : Z;
 }
-class y {
+class E {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -2974,7 +2997,7 @@ class y {
    */
   static getValues(t) {
     const e = {};
-    return y.getPartValues(t, e);
+    return E.getPartValues(t, e);
   }
   /**
    * フォーム内の各入力エレメントから値を取得し、オブジェクトとして返します。
@@ -2989,7 +3012,7 @@ class y {
     if (r) {
       if (n)
         Array.isArray(e[String(r)]) ? e[String(r)].push(t.getValue()) : e[String(r)] = [t.getValue()];
-      else if (y.isGroupedCheckable(t)) {
+      else if (E.isGroupedCheckable(t)) {
         const s = t.getValue(), a = String(r);
         s === null ? a in e || (e[a] = null) : e[a] === null || e[a] === void 0 ? e[a] = s : Array.isArray(e[a]) ? e[a].push(s) : e[a] = [e[a], s];
       } else
@@ -2999,11 +3022,11 @@ class y {
         `Element cannot have both ${l.prefix}form-object and name attributes.`
       );
       for (const s of t.getChildElementFragments())
-        y.getPartValues(s, e);
+        E.getPartValues(s, e);
     } else if (i) {
       const s = {};
       for (const a of t.getChildElementFragments())
-        y.getPartValues(a, s);
+        E.getPartValues(a, s);
       Object.keys(s).length > 0 && (e[String(i)] = s), n && m.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
@@ -3012,12 +3035,12 @@ class y {
       const s = [];
       for (const a of t.getChildElementFragments()) {
         const o = {};
-        y.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
+        E.getPartValues(a, o), Object.keys(o).length > 0 && s.push(o);
       }
       s.length > 0 && (e[String(n)] = s);
     } else
       for (const s of t.getChildElementFragments())
-        y.getPartValues(s, e);
+        E.getPartValues(s, e);
     return e;
   }
   /**
@@ -3030,7 +3053,7 @@ class y {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(t, e, r = !1) {
-    return y.setPartValues(t, e, null, r, !0);
+    return E.setPartValues(t, e, null, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -3042,7 +3065,7 @@ class y {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(t, e, r = !1) {
-    return y.setPartValues(t, e, null, r, !1);
+    return E.setPartValues(t, e, null, r, !1);
   }
   /**
    * 値による上書きをグループ単位で扱うべき入力要素（boolean 型でない
@@ -3076,56 +3099,56 @@ class y {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setPartValues(t, e, r = null, i = !1, n = !0) {
-    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), u = t.getAttribute(`${l.prefix}form-list`), d = t.getAttribute(`${l.prefix}form-detach`);
+    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), u = t.getAttribute(`${l.prefix}form-list`), c = t.getAttribute(`${l.prefix}form-detach`);
     if (a) {
-      if (!d || i) {
-        const h = e[String(a)];
-        u && Array.isArray(h) && r !== null ? s.push(
-          y.applyFragmentValue(t, h[r] ?? null, n)
-        ) : typeof h > "u" || (Array.isArray(h) && y.isGroupedCheckable(t) || typeof h == "string" || typeof h == "number" || typeof h == "boolean" || h === null ? s.push(
-          y.applyFragmentValue(
+      if (!c || i) {
+        const d = e[String(a)];
+        u && Array.isArray(d) && r !== null ? s.push(
+          E.applyFragmentValue(t, d[r] ?? null, n)
+        ) : typeof d > "u" || (Array.isArray(d) && E.isGroupedCheckable(t) || typeof d == "string" || typeof d == "number" || typeof d == "boolean" || d === null ? s.push(
+          E.applyFragmentValue(
             t,
-            h,
+            d,
             n
           )
         ) : s.push(
-          y.applyFragmentValue(t, String(h), n)
+          E.applyFragmentValue(t, String(d), n)
         ));
       }
     } else if (o) {
-      const h = e[String(o)];
-      if (h && typeof h == "object")
+      const d = e[String(o)];
+      if (d && typeof d == "object")
         for (const g of t.getChildElementFragments())
           s.push(
-            y.setPartValues(
+            E.setPartValues(
               g,
-              h,
+              d,
               null,
               i,
               n
             )
           );
     } else if (u) {
-      const h = e[String(u)];
-      if (Array.isArray(h)) {
+      const d = e[String(u)];
+      if (Array.isArray(d)) {
         const g = t.getChildElementFragments();
-        for (let E = 0; E < g.length; E++) {
-          const w = g[E];
-          h.length > E ? s.push(
-            y.setPartValues(
-              w,
-              h[E],
-              E,
+        for (let y = 0; y < g.length; y++) {
+          const T = g[y];
+          d.length > y ? s.push(
+            E.setPartValues(
+              T,
+              d[y],
+              y,
               i,
               n
             )
-          ) : s.push(y.setPartValues(w, {}, E, i, n));
+          ) : s.push(E.setPartValues(T, {}, y, i, n));
         }
       }
     } else
-      for (const h of t.getChildElementFragments())
+      for (const d of t.getChildElementFragments())
         s.push(
-          y.setPartValues(h, e, null, i, n)
+          E.setPartValues(d, e, null, i, n)
         );
     return Promise.all(s).then(() => {
     });
@@ -3138,10 +3161,10 @@ class y {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(t) {
-    y.clearValues(t), await Promise.all([
-      y.clearMessages(t),
-      y.clearEachClones(t)
-    ]), await P.enqueue(() => {
+    E.clearValues(t), await Promise.all([
+      E.clearMessages(t),
+      E.clearEachClones(t)
+    ]), await k.enqueue(() => {
       const r = t.getTarget();
       if (r instanceof HTMLFormElement)
         r.reset();
@@ -3154,17 +3177,17 @@ class y {
         }
       }
     });
-    const e = y.collectBindingTargetForms(t);
+    const e = E.collectBindingTargetForms(t);
     for (const r of e) {
-      const i = y.getInitialBindingData(r);
+      const i = E.getInitialBindingData(r);
       i && await x.setBindingData(r.getTarget(), i);
     }
-    y.syncValuesFromDom(t);
+    E.syncValuesFromDom(t);
     for (const r of e) {
-      const i = y.getInitialBindingData(r);
+      const i = E.getInitialBindingData(r);
       if (r.getRawBindingData() === null && i === null)
         continue;
-      const n = y.getValues(r), s = r.getAttribute(`${l.prefix}form-arg`), a = { ...i || {} };
+      const n = E.getValues(r), s = r.getAttribute(`${l.prefix}form-arg`), a = { ...i || {} };
       s ? a[String(s)] = n : Object.assign(a, n), await x.setBindingData(r.getTarget(), a);
     }
     await x.evaluateAll(t);
@@ -3188,7 +3211,7 @@ class y {
     const e = t.getTarget();
     (e instanceof HTMLInputElement || e instanceof HTMLTextAreaElement || e instanceof HTMLSelectElement) && t.syncValue();
     for (const r of t.getChildElementFragments())
-      y.syncValuesFromDom(r);
+      E.syncValuesFromDom(r);
   }
   /**
    * リセット後にバインドデータを更新すべきフォームフラグメントを収集します。
@@ -3204,7 +3227,7 @@ class y {
     e instanceof HTMLFormElement ? r.push(e) : r.push(...Array.from(e.querySelectorAll("form")));
     const i = [];
     for (const n of r) {
-      const s = T.get(n);
+      const s = w.get(n);
       s instanceof M && i.push(s);
     }
     return i;
@@ -3241,7 +3264,7 @@ class y {
   static clearValues(t) {
     t.clearValue();
     for (const e of t.getChildElementFragments())
-      y.clearValues(e);
+      E.clearValues(e);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -3250,7 +3273,7 @@ class y {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(t) {
-    return Et().clearMessages(
+    return yt().clearMessages(
       t.getTarget()
     );
   }
@@ -3264,7 +3287,7 @@ class y {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(t, e, r) {
-    return y.addMessage(t, e, r, "error");
+    return E.addMessage(t, e, r, "error");
   }
   /**
    * キーに一致するフラグメントにレベル付きメッセージを追加します。
@@ -3277,9 +3300,9 @@ class y {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(t, e, r, i) {
-    const n = [], s = Et(), a = s.addMessage, o = (d) => typeof a == "function" ? a.call(s, d, r, i) : s.addErrorMessage(d, r), u = y.findFragmentsByKey(t, e);
-    return u.forEach((d) => {
-      n.push(o(d.getTarget()));
+    const n = [], s = yt(), a = s.addMessage, o = (c) => typeof a == "function" ? a.call(s, c, r, i) : s.addErrorMessage(c, r), u = E.findFragmentsByKey(t, e);
+    return u.forEach((c) => {
+      n.push(o(c.getTarget()));
     }), u.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
     });
   }
@@ -3291,7 +3314,7 @@ class y {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(t, e) {
-    return y.findFragmentByKeyParts(t, e.split("."));
+    return E.findFragmentByKeyParts(t, e.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -3305,7 +3328,7 @@ class y {
     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((s) => {
-        r.push(...y.findFragmentByKeyParts(s, e.slice(1)));
+        r.push(...E.findFragmentByKeyParts(s, e.slice(1)));
       });
     else if (t.hasAttribute(`${l.prefix}form-list`)) {
       if (e.length > 1) {
@@ -3313,13 +3336,13 @@ class y {
         if (s !== -1 && a !== -1 && s < a) {
           const o = i.substring(0, s);
           if (n === o) {
-            const u = i.substring(s + 1, a), d = Number(u);
-            if (isNaN(d))
+            const u = i.substring(s + 1, a), c = Number(u);
+            if (isNaN(c))
               m.error("Haori", `Invalid index: ${i}`);
             else {
-              const h = t.getChildElementFragments().filter((g) => g.hasAttribute(`${l.prefix}row`));
-              d < h.length && r.push(
-                ...y.findFragmentByKeyParts(h[d], e.slice(1))
+              const d = t.getChildElementFragments().filter((g) => g.hasAttribute(`${l.prefix}row`));
+              c < d.length && r.push(
+                ...E.findFragmentByKeyParts(d[c], e.slice(1))
               );
             }
           }
@@ -3327,7 +3350,7 @@ class y {
       }
     } else
       t.getChildElementFragments().forEach((n) => {
-        r.push(...y.findFragmentByKeyParts(n, e));
+        r.push(...E.findFragmentByKeyParts(n, e));
       });
     return r;
   }
@@ -3432,8 +3455,8 @@ class R {
   static bindChange(t, e, r, i = "other") {
     const n = [], s = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...s, ...a]);
     for (const u of o) {
-      const d = e?.[u], h = r[u];
-      d !== h && n.push(u);
+      const c = e?.[u], d = r[u];
+      c !== d && n.push(u);
     }
     R.dispatch(t, "bindchange", {
       previous: e || {},
@@ -3592,7 +3615,7 @@ function Ut(p, t) {
     return null;
   if (!e.includes("{{"))
     return e;
-  const r = T.get(p), i = r instanceof M ? r.getBindingData() : {}, n = Lt(e, i);
+  const r = w.get(p), i = r instanceof M ? r.getBindingData() : {}, n = Lt(e, i);
   return n === "" ? null : n;
 }
 function Mt(p) {
@@ -3667,6 +3690,16 @@ function Yt(p, t) {
   });
 }
 const f = class f {
+  /**
+   * コンストラクタ。
+   *
+   * @param arg1 オプションもしくはフラグメント
+   * @param arg2 イベント名
+   * @param domEvent 起点となった DOM イベント
+   */
+  constructor(t, e = null, r = null) {
+    this.reentrantBind = !1, f.isElementFragment(t) ? (this.options = f.buildOptions(t, e), this.eventType = e) : (this.options = t, this.eventType = null), this.domEvent = r;
+  }
   /**
    * イベント属性名を正しく生成します。
    * 例: ("click", "fetch") => "data-click-fetch"
@@ -3857,15 +3890,15 @@ const f = class f {
         );
         if (v) {
           const b = document.body.querySelector(v);
-          b !== null ? r.formFragment = y.getFormFragment(
-            T.get(b)
+          b !== null ? r.formFragment = E.getFormFragment(
+            w.get(b)
           ) : m.error(
             "Haori",
             `Form element not found: ${v} (${f.attrName(e, "form")})`
           );
         } else
-          r.formFragment = y.getFormFragment(t);
-      } else (e === "change" || e === "input") && (r.formFragment = y.getFormFragment(t));
+          r.formFragment = E.getFormFragment(t);
+      } else (e === "change" || e === "input") && (r.formFragment = E.getFormFragment(t));
       if (t.hasAttribute(`${l.prefix}${e}-before-run`)) {
         const v = t.getRawAttribute(
           `${l.prefix}${e}-before-run`
@@ -3997,7 +4030,7 @@ ${v}
       if (A) {
         const v = document.body.querySelectorAll(A);
         v.length > 0 ? (r.bindFragments = [], v.forEach((b) => {
-          const S = T.get(b);
+          const S = w.get(b);
           S && r.bindFragments.push(S);
         })) : m.error(
           "Haori",
@@ -4009,17 +4042,17 @@ ${v}
       null,
       "arg",
       !0
-    ), d = f.attrName(
+    ), c = f.attrName(
       null,
       "bind-arg",
       !0
     );
     e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(u) ? r.bindArg = t.getRawAttribute(
       u
-    ) : t.hasAttribute(d) && (r.bindArg = t.getRawAttribute(d));
-    const h = e ? f.attrName(e, "bind-params") : f.attrName(null, "bind-params", !0);
-    if (t.hasAttribute(h)) {
-      const A = t.getRawAttribute(h);
+    ) : t.hasAttribute(c) && (r.bindArg = t.getRawAttribute(c));
+    const d = e ? f.attrName(e, "bind-params") : f.attrName(null, "bind-params", !0);
+    if (t.hasAttribute(d)) {
+      const A = t.getRawAttribute(d);
       r.bindParams = A.split("&").map((v) => v.trim());
     }
     const g = e ? f.attrName(e, "bind-append") : f.attrName(null, "bind-append", !0);
@@ -4027,13 +4060,13 @@ ${v}
       const A = t.getRawAttribute(g);
       r.bindAppendParams = A.split("&").map((v) => v.trim()).filter(Boolean);
     }
-    const E = e ? f.attrName(e, "bind-merge") : f.attrName(null, "bind-merge", !0);
-    t.hasAttribute(E) && (r.bindMerge = !0);
-    const w = e ? f.attrName(e, "bind-transform") : f.attrName(null, "bind-transform", !0);
-    t.hasAttribute(w) && (r.bindTransform = t.getRawAttribute(w));
-    const k = e ? f.attrName(e, "copy-params") : null;
-    if (k && t.hasAttribute(k)) {
-      const A = t.getRawAttribute(k);
+    const y = e ? f.attrName(e, "bind-merge") : f.attrName(null, "bind-merge", !0);
+    t.hasAttribute(y) && (r.bindMerge = !0);
+    const T = e ? f.attrName(e, "bind-transform") : f.attrName(null, "bind-transform", !0);
+    t.hasAttribute(T) && (r.bindTransform = t.getRawAttribute(T));
+    const P = e ? f.attrName(e, "copy-params") : null;
+    if (P && t.hasAttribute(P)) {
+      const A = t.getRawAttribute(P);
       r.copyParams = A.split("&").map((v) => v.trim()).filter(Boolean);
     }
     if (e) {
@@ -4044,7 +4077,7 @@ ${v}
         if (b) {
           const S = document.body.querySelectorAll(b);
           S.length > 0 ? (r.adjustFragments = [], S.forEach((F) => {
-            const I = T.get(F);
+            const I = w.get(F);
             I && r.adjustFragments.push(I);
           })) : m.error(
             "Haori",
@@ -4096,14 +4129,14 @@ ${b}
         );
         if (b) {
           const S = document.body.querySelector(b);
-          S !== null ? r.historyFormFragment = y.getFormFragment(
-            T.get(S)
+          S !== null ? r.historyFormFragment = E.getFormFragment(
+            w.get(S)
           ) : m.error(
             "Haori",
             `Form element not found: ${b} (${f.attrName(e, "history-form")})`
           );
         } else
-          r.historyFormFragment = y.getFormFragment(t);
+          r.historyFormFragment = E.getFormFragment(t);
       }
       [
         "reset-before",
@@ -4119,7 +4152,7 @@ ${b}
           return;
         const F = t.getRawAttribute(S), I = [];
         if (F ? (document.body.querySelectorAll(F).forEach((V) => {
-          const C = T.get(V);
+          const C = w.get(V);
           C && I.push(C);
         }), I.length === 0 && m.error("Haori", `Element not found: ${F} (${S})`)) : I.push(t), I.length > 0)
           switch (b) {
@@ -4154,7 +4187,7 @@ ${b}
         if (b) {
           const S = document.body.querySelector(b);
           if (S !== null) {
-            const F = T.get(S);
+            const F = w.get(S);
             F ? r.copySourceFragment = F : m.error(
               "Haori",
               `Element is not managed by Haori: ${b} (${v})`
@@ -4174,16 +4207,16 @@ ${b}
       );
       if (A) {
         const v = document.body.querySelector(A);
-        v !== null ? r.formFragment = y.getFormFragment(
-          T.get(v)
+        v !== null ? r.formFragment = E.getFormFragment(
+          w.get(v)
         ) : m.error(
           "Haori",
           `Form element not found: ${A} (${f.attrName(null, "fetch-form", !0)})`
         );
       } else
-        r.formFragment = y.getFormFragment(t);
+        r.formFragment = E.getFormFragment(t);
     }
-    return n && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t]), r;
+    return n && (!r.bindFragments || r.bindFragments.length === 0) && (r.bindFragments = [t], r.defaultSelfBind = !0), r;
   }
   /**
    * ElementFragment の構造的タイプガード。
@@ -4197,16 +4230,6 @@ ${b}
     const e = t;
     return typeof e.getTarget == "function" && typeof e.getChildElementFragments == "function";
   }
-  /**
-   * コンストラクタ。
-   *
-   * @param arg1 オプションもしくはフラグメント
-   * @param arg2 イベント名
-   * @param domEvent 起点となった DOM イベント
-   */
-  constructor(t, e = null, r = null) {
-    f.isElementFragment(t) ? (this.options = f.buildOptions(t, e), this.eventType = e) : (this.options = t, this.eventType = null), this.domEvent = r;
-  }
   /**
    * 非イベント data-fetch の自動再評価用シグネチャを解決します。
    *
@@ -4225,6 +4248,13 @@ ${b}
     return this.runWithResult().then(() => {
     });
   }
+  /**
+   * bind 結果の反映を reentrant（即時実行）で行うよう指定します。マネージド
+   * `data-fetch` の自動再評価から生成した Procedure に対して使います。
+   */
+  markReentrantBind() {
+    this.reentrantBind = !0;
+  }
   /**
    * 一連の処理を実行し、成功したかどうかを返します。
    *
@@ -4246,65 +4276,65 @@ ${b}
       if (Object.keys(this.options).length === 0 || this.options.formFragment && this.validate(this.options.formFragment) === !1)
         return !1;
       if (this.options.runScript) {
-        const d = this.options.targetFragment?.getTarget() ?? null;
+        const c = this.options.targetFragment?.getTarget() ?? null;
         try {
           this.options.runScript.call(
-            d,
+            c,
             this.domEvent
           ) === !1 && this.domEvent && this.domEvent.preventDefault();
-        } catch (h) {
-          m.error("Haori", `Run script execution error: ${h}`);
+        } catch (d) {
+          m.error("Haori", `Run script execution error: ${d}`);
         }
       }
       if (!await this.confirm())
         return !1;
       this.options.resetBeforeFragments && this.options.resetBeforeFragments.length > 0 && (await Promise.all(
         this.options.resetBeforeFragments.map(
-          (d) => y.reset(d)
+          (c) => E.reset(c)
         )
       ), this.captureHistorySnapshots());
       const r = this.prepareFetchRequest(), i = r.payload;
       let n = r.url, s = r.options;
       if (this.options.beforeCallback) {
-        const d = this.options.beforeCallback(
+        const c = this.options.beforeCallback(
           n || null,
           s || null
         );
-        if (d != null) {
-          if (d === !1 || typeof d == "object" && d.stop)
+        if (c != null) {
+          if (c === !1 || typeof c == "object" && c.stop)
             return !1;
-          typeof d == "object" && (n = "fetchUrl" in d ? d.fetchUrl : n, s = "fetchOptions" in d ? d.fetchOptions : s);
+          typeof c == "object" && (n = "fetchUrl" in c ? c.fetchUrl : n, s = "fetchOptions" in c ? c.fetchOptions : s);
         }
       }
       const a = Object.keys(i).length > 0;
       if (n) {
-        const d = { ...s || {} }, h = r.requestedMethod, g = r.effectiveMethod, E = r.transportMode === "query-get", w = r.queryString;
-        if (E && m.info("Haori demo fetch normalization", {
+        const c = { ...s || {} }, d = r.requestedMethod, g = r.effectiveMethod, y = r.transportMode === "query-get", T = r.queryString;
+        if (y && m.info("Haori demo fetch normalization", {
           runtime: l.runtime,
-          requestedMethod: h,
+          requestedMethod: d,
           effectiveMethod: g,
           transportMode: "query-get",
           url: n,
           payload: a ? i : void 0,
-          queryString: w
+          queryString: T
         }), this.options.targetFragment && n) {
-          const k = performance.now(), A = {
+          const P = performance.now(), A = {
             runtime: l.runtime,
-            requestedMethod: h,
+            requestedMethod: d,
             effectiveMethod: g,
-            transportMode: E ? "query-get" : "http",
-            ...E ? { queryString: w } : {}
+            transportMode: y ? "query-get" : "http",
+            ...y ? { queryString: T } : {}
           };
           return R.fetchStart(
             this.options.targetFragment.getTarget(),
             n,
-            d,
+            c,
             a ? i : void 0,
             A
-          ), fetch(n, d).then((v) => this.handleFetchResult(
+          ), fetch(n, c).then((v) => this.handleFetchResult(
             v,
             n || void 0,
-            k
+            P
           )).catch((v) => {
             throw n && R.fetchError(
               this.options.targetFragment.getTarget(),
@@ -4313,13 +4343,13 @@ ${b}
             ), v;
           });
         }
-        return fetch(n, d).then((k) => this.handleFetchResult(k, n || void 0));
+        return fetch(n, c).then((P) => this.handleFetchResult(P, n || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && a) {
-        const d = this.options.formFragment, h = d.getTarget(), g = /* @__PURE__ */ new Set();
+        const c = this.options.formFragment, d = c.getTarget(), g = /* @__PURE__ */ new Set();
         t && t.appliedDisabledAttribute && this.options.targetFragment && g.add(this.options.targetFragment);
-        const E = d.getBindingData();
-        Object.assign(E, i), await x.setBindingData(h, E, g);
+        const y = c.getBindingData();
+        Object.assign(y, i), await x.setBindingData(d, y, g);
       }
       const o = a ? i : {}, u = new Response(JSON.stringify(o), {
         headers: { "Content-Type": "application/json" }
@@ -4385,7 +4415,7 @@ ${b}
     }
     const n = [];
     n.push(this.bindResult(t)), n.push(this.adjust()), n.push(this.addRow()), n.push(this.removeRow()), n.push(this.movePrevRow()), n.push(this.moveNextRow()), await Promise.all(n), this.options.resetFragments && this.options.resetFragments.length > 0 && await Promise.all(
-      this.options.resetFragments.map((a) => y.reset(a))
+      this.options.resetFragments.map((a) => E.reset(a))
     ), await this.copy();
     const s = [];
     if (this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((a) => {
@@ -4427,8 +4457,8 @@ ${b}
           return;
         }
         const o = (u) => {
-          for (const [d, h] of Object.entries(u))
-            h != null && (Array.isArray(h) ? h.forEach((g) => a.searchParams.append(d, String(g))) : typeof h == "object" ? a.searchParams.set(d, JSON.stringify(h)) : a.searchParams.set(d, String(h)));
+          for (const [c, d] of Object.entries(u))
+            d != null && (Array.isArray(d) ? d.forEach((g) => a.searchParams.append(c, String(g))) : typeof d == "object" ? a.searchParams.set(c, JSON.stringify(d)) : a.searchParams.set(c, String(d)));
         };
         i && o(e), n && o(r), history.pushState(
           { [jt]: !0 },
@@ -4444,7 +4474,7 @@ ${b}
    */
   async handleFetchError(t) {
     let e = null;
-    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = y.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
+    this.options.formFragment ? e = this.options.formFragment : this.options.targetFragment && (e = E.getFormFragment(this.options.targetFragment) || this.options.targetFragment);
     const r = async (s) => {
       const a = e ? e.getTarget() : document.body;
       await ut().addErrorMessage(a, s);
@@ -4457,7 +4487,25 @@ ${b}
     if ((t.headers.get("Content-Type") || "").includes("application/json"))
       try {
         const s = await t.json(), a = [];
-        if (s && typeof s == "object") {
+        if (Array.isArray(s)) {
+          const o = /* @__PURE__ */ new Map(), u = [];
+          for (const c of s)
+            if (c && typeof c == "object" && !Array.isArray(c)) {
+              const d = c.key, g = c.message, y = typeof d == "string" && d.length > 0 ? d : null, T = typeof g == "string" ? g : g != null ? String(g) : "";
+              if (T.length === 0)
+                continue;
+              if (y !== null) {
+                const P = o.get(y) ?? [];
+                P.push(T), o.set(y, P);
+              } else
+                u.push(T);
+            } else typeof c == "string" && c.length > 0 && u.push(c);
+          for (const [c, d] of o)
+            a.push({ key: c, message: d.join(`
+`) });
+          for (const c of u)
+            a.push({ message: c });
+        } else if (s && typeof s == "object") {
           if (typeof s.message == "string" && a.push({ message: s.message }), Array.isArray(s.messages))
             for (const o of s.messages)
               typeof o == "string" && a.push({ message: o });
@@ -4473,7 +4521,7 @@ ${b}
         if (a.length === 0)
           return await r(`${t.status} ${t.statusText}`), i(), !1;
         for (const o of a)
-          o.key && e ? await y.addErrorMessage(e, o.key, o.message) : await r(o.message);
+          o.key && e ? await E.addErrorMessage(e, o.key, o.message) : await r(o.message);
         return i(), !1;
       } catch {
       }
@@ -4540,53 +4588,84 @@ ${b}
    * @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((r) => {
+    if (!this.options.bindFragments || this.options.bindFragments.length === 0)
+      return Promise.resolve();
+    const e = t.headers.get("Content-Type")?.includes("application/json");
+    return t.text().then((r) => {
+      if (r === "")
+        return;
+      let i = e ? JSON.parse(r) : r;
       if (this.options.bindTransform)
         try {
-          r = z.evaluate(this.options.bindTransform, {
-            response: r
+          i = z.evaluate(this.options.bindTransform, {
+            response: i
           });
-        } catch (n) {
-          m.error("Haori", `Invalid bind-transform: ${n}`);
+        } catch (s) {
+          m.error("Haori", `Invalid bind-transform: ${s}`);
         }
       if (this.options.bindParams) {
-        const n = {};
-        this.options.bindParams.forEach((s) => {
-          r && typeof r == "object" && s in r && (n[s] = r[s]);
-        }), r = n;
+        const s = {};
+        this.options.bindParams.forEach((a) => {
+          i && typeof i == "object" && a in i && (s[a] = i[a]);
+        }), i = s;
       }
-      const i = [];
+      const n = [];
       if (this.options.bindArg)
-        this.options.bindFragments.forEach((n) => {
-          const s = { ...n.getRawBindingData() ?? {} }, a = this.options.bindArg;
-          if (r && typeof r == "object" && !Array.isArray(r)) {
-            const o = s[a], u = o && typeof o == "object" && !Array.isArray(o) ? o : {};
-            s[a] = this.mergeAppendBindingData(
-              n,
-              r,
-              u
+        this.options.bindFragments.forEach((s) => {
+          const a = { ...s.getRawBindingData() ?? {} }, o = this.options.bindArg;
+          if (i && typeof i == "object" && !Array.isArray(i)) {
+            const u = a[o], c = u && typeof u == "object" && !Array.isArray(u) ? u : {};
+            a[o] = this.mergeAppendBindingData(
+              s,
+              i,
+              c
             );
           } else
-            s[a] = r;
-          i.push(x.setBindingData(n.getTarget(), s));
-        });
-      else {
-        if (typeof r == "string")
-          return m.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
-            new Error("string data cannot be bound without a bindArg.")
+            a[o] = i;
+          n.push(
+            x.setBindingData(
+              s.getTarget(),
+              a,
+              /* @__PURE__ */ new Set(),
+              // マネージド fetch の bind かつ、bind 先が実行中のバインドワークを
+              // 持つ（= 自分自身を await している）ときだけ reentrant（即時実行）に
+              // する。これで自己デッドロックのみを解消し、idle なフラグメントへの
+              // bind は従来どおり FIFO で適用順を保証する。
+              this.reentrantBind && s.isExecutingBindingWork()
+            )
           );
-        this.options.bindFragments.forEach((n) => {
-          const s = this.mergeAppendBindingData(
-            n,
-            r
-          ), a = this.options.bindMerge ? { ...n.getRawBindingData() ?? {}, ...s } : s;
-          i.push(x.setBindingData(n.getTarget(), a));
         });
-      }
-      return Promise.all(i).then(() => {
-        const n = this.options.bindArg ?? null;
+      else if (typeof i == "string") {
+        if (this.options.defaultSelfBind) {
+          m.warn(
+            "Haori",
+            "string data is not bound because no bind target was specified."
+          );
+          return;
+        }
+        return m.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
+          new Error("string data cannot be bound without a bindArg.")
+        );
+      } else
         this.options.bindFragments.forEach((s) => {
-          R.bindComplete(s.getTarget(), n);
+          const a = this.mergeAppendBindingData(
+            s,
+            i
+          ), o = this.options.bindMerge ? { ...s.getRawBindingData() ?? {}, ...a } : a;
+          n.push(
+            x.setBindingData(
+              s.getTarget(),
+              o,
+              /* @__PURE__ */ new Set(),
+              // 自己デッドロックのみを解消する限定 reentrant（上の bindArg 分岐と同様）。
+              this.reentrantBind && s.isExecutingBindingWork()
+            )
+          );
+        });
+      return Promise.all(n).then(() => {
+        const s = this.options.bindArg ?? null;
+        this.options.bindFragments.forEach((a) => {
+          R.bindComplete(a.getTarget(), s);
         });
       });
     });
@@ -4624,7 +4703,7 @@ ${b}
    * copy のコピー元データを取得します。
    */
   resolveCopySourceData() {
-    return this.options.copySourceFragment ? this.options.copySourceFragment.getTarget().tagName === "FORM" ? y.getValues(this.options.copySourceFragment) : { ...this.options.copySourceFragment.getBindingData() } : this.options.formFragment ? y.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
+    return this.options.copySourceFragment ? this.options.copySourceFragment.getTarget().tagName === "FORM" ? E.getValues(this.options.copySourceFragment) : { ...this.options.copySourceFragment.getBindingData() } : this.options.formFragment ? E.getValues(this.options.formFragment) : this.options.targetFragment ? { ...this.options.targetFragment.getBindingData() } : {};
   }
   /**
    * data 属性とフォーム値を統合した送信データを作成します。
@@ -4642,7 +4721,7 @@ ${b}
   buildPayloadResolution() {
     const t = {};
     let e = !1;
-    if (this.options.formFragment && Object.assign(t, y.getValues(this.options.formFragment)), this.options.data && typeof this.options.data == "object" && Object.assign(t, this.options.data), this.options.targetFragment && this.options.dataAttrName) {
+    if (this.options.formFragment && Object.assign(t, E.getValues(this.options.formFragment)), this.options.data && typeof this.options.data == "object" && Object.assign(t, this.options.data), this.options.targetFragment && this.options.dataAttrName) {
       const r = f.resolveDataAttributeDetailed(
         this.options.targetFragment,
         this.options.dataAttrName
@@ -4688,31 +4767,31 @@ ${b}
     if (n.method = u, u === "GET" || u === "HEAD" || u === "OPTIONS")
       Object.keys(e).length > 0 && (i = Kt(i, e));
     else if (Object.keys(e).length > 0) {
-      const h = s.get("Content-Type") || "";
-      if (/multipart\/form-data/i.test(h)) {
+      const d = s.get("Content-Type") || "";
+      if (/multipart\/form-data/i.test(d)) {
         s.delete("Content-Type");
         const g = new FormData();
-        for (const [E, w] of Object.entries(e))
-          w == null ? g.append(E, "") : w instanceof Blob ? g.append(E, w) : Array.isArray(w) ? w.forEach((k) => g.append(E, String(k))) : typeof w == "object" ? g.append(E, JSON.stringify(w)) : g.append(E, String(w));
+        for (const [y, T] of Object.entries(e))
+          T == null ? g.append(y, "") : T instanceof Blob ? g.append(y, T) : Array.isArray(T) ? T.forEach((P) => g.append(y, String(P))) : typeof T == "object" ? g.append(y, JSON.stringify(T)) : g.append(y, String(T));
         n.body = g;
-      } else if (/application\/x-www-form-urlencoded/i.test(h)) {
+      } else if (/application\/x-www-form-urlencoded/i.test(d)) {
         const g = new URLSearchParams();
-        for (const [E, w] of Object.entries(e))
-          w !== void 0 && (w === null ? g.append(E, "") : Array.isArray(w) ? w.forEach((k) => g.append(E, String(k))) : typeof w == "object" ? g.append(E, JSON.stringify(w)) : g.append(E, String(w)));
+        for (const [y, T] of Object.entries(e))
+          T !== void 0 && (T === null ? g.append(y, "") : Array.isArray(T) ? T.forEach((P) => g.append(y, String(P))) : typeof T == "object" ? g.append(y, JSON.stringify(T)) : g.append(y, String(T)));
         n.body = g;
       } else
         s.set("Content-Type", "application/json"), n.body = JSON.stringify(e);
     }
     n.headers = s;
-    let d;
-    return o && (d = new URL(i, window.location.href).search || void 0, s.delete("Content-Type")), {
+    let c;
+    return o && (c = new URL(i, window.location.href).search || void 0, s.delete("Content-Type")), {
       url: i,
       options: n,
       payload: e,
       hasUnresolvedReference: !1,
       requestedMethod: a,
       effectiveMethod: u,
-      queryString: d,
+      queryString: c,
       transportMode: o ? "query-get" : "http",
       signature: Yt(i, n)
     };
@@ -4724,7 +4803,7 @@ ${b}
     this.options.targetFragment && this.options.historyDataAttrName ? this.historyDataSnapshot = f.resolveDataAttribute(
       this.options.targetFragment,
       this.options.historyDataAttrName
-    ) : this.historyDataSnapshot = void 0, this.historyFormSnapshot = this.options.historyFormFragment ? y.getValues(this.options.historyFormFragment) : void 0;
+    ) : this.historyDataSnapshot = void 0, this.historyFormSnapshot = this.options.historyFormFragment ? E.getValues(this.options.historyFormFragment) : void 0;
   }
   /**
    * history-data の評価値を取得します。
@@ -4746,7 +4825,7 @@ ${b}
     if (this.historyFormSnapshot !== void 0)
       return this.historyFormSnapshot;
     if (this.options.historyFormFragment)
-      return y.getValues(this.options.historyFormFragment);
+      return E.getValues(this.options.historyFormFragment);
   }
   /**
    * copy-params が指定されている場合は include / exclude を考慮して抽出します。
@@ -4814,7 +4893,7 @@ ${b}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(x.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
+    ), e.push(x.evaluateAll(r)), e.push(E.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -4868,7 +4947,7 @@ ${b}
 };
 f.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g, f.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/, f.RUNNING_CLICK_TARGETS = /* @__PURE__ */ new WeakSet();
 let j = f;
-class Xt {
+class Jt {
   /**
    * URLのクエリパラメータを取得します。
    *
@@ -4881,7 +4960,7 @@ class Xt {
     }), t;
   }
 }
-class Jt {
+class Xt {
   /**
    * 指定URLから HTML を取得し、body 内の HTML 文字列を返します。
    *
@@ -4920,7 +4999,7 @@ class Jt {
     }
   }
 }
-const c = class c {
+const h = class h {
   /**
    * 遅延属性かどうか（完全名で判定）を判定します。
    *
@@ -4928,7 +5007,7 @@ const c = class c {
    * @returns 遅延属性かどうか
    */
   static isDeferredAttributeName(t) {
-    return c.DEFERRED_ATTRIBUTE_SUFFIXES.some(
+    return h.DEFERRED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -4939,7 +5018,7 @@ const c = class c {
    * @returns 除外対象かどうか
    */
   static isEvaluateAllExcludedAttributeName(t) {
-    return c.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
+    return h.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -4951,7 +5030,7 @@ const c = class c {
    * @returns 再評価する場合は true
    */
   static shouldReevaluateAttribute(t, e) {
-    return e !== null && !c.isEvaluateAllExcludedAttributeName(t) && c.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
+    return e !== null && !h.isEvaluateAllExcludedAttributeName(t) && h.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
   }
   /**
    * data-attr-* 形式の属性名から実際に更新する属性名を取得します。
@@ -4960,7 +5039,7 @@ const c = class c {
    * @returns 実際の属性名。data-attr-* でない場合は null
    */
   static getAliasedAttributeName(t) {
-    const e = `${l.prefix}${c.ATTRIBUTE_ALIAS_SUFFIX}`;
+    const e = `${l.prefix}${h.ATTRIBUTE_ALIAS_SUFFIX}`;
     return !t.startsWith(e) || t.length <= e.length ? null : t.slice(e.length);
   }
   /**
@@ -4971,9 +5050,9 @@ const c = class c {
    * @returns data-attr-* の内部反映なら true
    */
   static isAliasedAttributeReflection(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     return r instanceof M ? r.hasAttribute(
-      `${l.prefix}${c.ATTRIBUTE_ALIAS_SUFFIX}${e}`
+      `${l.prefix}${h.ATTRIBUTE_ALIAS_SUFFIX}${e}`
     ) : !1;
   }
   /**
@@ -4987,8 +5066,8 @@ const c = class c {
     let e = Promise.resolve();
     for (const r of t.getAttributeNames()) {
       const i = t.getRawAttribute(r);
-      c.shouldReevaluateAttribute(r, i) && (e = e.then(
-        () => c.setAttribute(t.getTarget(), r, i)
+      h.shouldReevaluateAttribute(r, i) && (e = e.then(
+        () => h.setAttribute(t.getTarget(), r, i)
       ));
     }
     return e.then(() => {
@@ -5003,7 +5082,7 @@ const c = class c {
   static reevaluateChildren(t) {
     const e = [];
     return t.getChildren().forEach((r) => {
-      r instanceof M ? e.push(c.evaluateAll(r)) : r instanceof U && e.push(c.evaluateText(r));
+      r instanceof M ? e.push(h.evaluateAll(r)) : r instanceof U && e.push(h.evaluateText(r));
     }), Promise.all(e).then(() => {
     });
   }
@@ -5014,7 +5093,7 @@ const c = class c {
    * @returns 再評価状態
    */
   static getReactiveFetchState(t) {
-    const e = c.REACTIVE_FETCH_STATES.get(t);
+    const e = h.REACTIVE_FETCH_STATES.get(t);
     if (e)
       return e;
     const r = {
@@ -5022,7 +5101,7 @@ const c = class c {
       running: !1,
       rerunRequested: !1
     };
-    return c.REACTIVE_FETCH_STATES.set(t, r), r;
+    return h.REACTIVE_FETCH_STATES.set(t, r), r;
   }
   /**
    * data-import の再評価状態を取得します。
@@ -5031,7 +5110,7 @@ const c = class c {
    * @returns 再評価状態
    */
   static getReactiveImportState(t) {
-    const e = c.REACTIVE_IMPORT_STATES.get(t);
+    const e = h.REACTIVE_IMPORT_STATES.get(t);
     if (e)
       return e;
     const r = {
@@ -5039,7 +5118,7 @@ const c = class c {
       running: !1,
       rerunRequested: !1
     };
-    return c.REACTIVE_IMPORT_STATES.set(t, r), r;
+    return h.REACTIVE_IMPORT_STATES.set(t, r), r;
   }
   /**
    * bind 更新時に data-fetch / data-import を専用ルートで再評価します。
@@ -5052,9 +5131,9 @@ const c = class c {
     if (e.has(t))
       return Promise.resolve();
     const r = [];
-    return t.hasAttribute(`${l.prefix}fetch`) && r.push(c.executeManagedFetch(t)), t.hasAttribute(`${l.prefix}import`) && r.push(c.executeManagedImport(t)), t.getChildren().forEach((i) => {
+    return t.hasAttribute(`${l.prefix}fetch`) && r.push(h.executeManagedFetch(t)), t.hasAttribute(`${l.prefix}import`) && r.push(h.executeManagedImport(t)), t.getChildren().forEach((i) => {
       i instanceof M && r.push(
-        c.reevaluateReactiveSpecialAttributes(i, e)
+        h.reevaluateReactiveSpecialAttributes(i, e)
       );
     }), Promise.all(r).then(() => {
     });
@@ -5066,12 +5145,20 @@ const c = class c {
    * @returns 実行完了の Promise
    */
   static executeManagedFetch(t) {
-    const e = t.getTarget(), r = c.getReactiveFetchState(e), i = j.resolveAutoFetchSignature(t);
-    return r.running ? ((i.hasUnresolvedReference || i.signature !== r.lastSignature) && (r.rerunRequested = !0), Promise.resolve()) : i.hasUnresolvedReference || i.signature === null ? (r.lastSignature = null, Promise.resolve()) : r.lastSignature === i.signature ? Promise.resolve() : (r.lastSignature = i.signature, r.running = !0, new j(t, null).runWithResult().then(() => {
+    const e = t.getTarget(), r = h.getReactiveFetchState(e), i = j.resolveAutoFetchSignature(t);
+    if (r.running)
+      return (i.hasUnresolvedReference || i.signature !== r.lastSignature) && (r.rerunRequested = !0), Promise.resolve();
+    if (i.hasUnresolvedReference || i.signature === null)
+      return r.lastSignature = null, Promise.resolve();
+    if (r.lastSignature === i.signature)
+      return Promise.resolve();
+    r.lastSignature = i.signature, r.running = !0;
+    const n = new j(t, null);
+    return n.markReentrantBind(), n.runWithResult().then(() => {
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
-        return r.rerunRequested = !1, c.executeManagedFetch(t);
-    }));
+        return r.rerunRequested = !1, h.executeManagedFetch(t);
+    });
   }
   /**
    * data-import を URL 比較付きで実行します。
@@ -5080,7 +5167,7 @@ const c = class c {
    * @returns 実行完了の Promise
    */
   static executeManagedImport(t) {
-    const e = t.getTarget(), r = c.getReactiveImportState(e), i = t.getAttributeEvaluation(
+    const e = t.getTarget(), r = h.getReactiveImportState(e), i = t.getAttributeEvaluation(
       `${l.prefix}import`
     ), n = i && !i.hasUnresolvedReference && typeof i.value == "string" && i.value !== "" ? i.value : null;
     if (r.running)
@@ -5091,16 +5178,16 @@ const c = class c {
       return Promise.resolve();
     r.lastUrl = n, r.running = !0;
     const s = performance.now();
-    return e.setAttribute(`${l.prefix}importing`, ""), R.importStart(e, n), Jt.load(n).then((a) => {
+    return e.setAttribute(`${l.prefix}importing`, ""), R.importStart(e, n), Xt.load(n).then((a) => {
       const o = new TextEncoder().encode(a).length;
-      return P.enqueue(() => {
+      return k.enqueue(() => {
         e.innerHTML = a;
       }).then(() => {
         if (e.removeAttribute(`${l.prefix}importing`), R.importEnd(e, n, o, s), !document.body.hasAttribute("data-haori-ready")) {
           const u = [];
-          return e.childNodes.forEach((d) => {
-            const h = T.get(d);
-            h instanceof M ? u.push(c.scan(h.getTarget())) : h instanceof U && u.push(c.evaluateText(h));
+          return e.childNodes.forEach((c) => {
+            const d = w.get(c);
+            d instanceof M ? u.push(h.scan(d.getTarget())) : d instanceof U && u.push(h.evaluateText(d));
           }), Promise.all(u).then(() => {
           });
         }
@@ -5109,7 +5196,7 @@ const c = class c {
       e.removeAttribute(`${l.prefix}importing`), R.importError(e, n, a), m.error("[Haori]", "Failed to import HTML:", n, a);
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
-        return r.rerunRequested = !1, c.executeManagedImport(t);
+        return r.rerunRequested = !1, h.executeManagedImport(t);
     });
   }
   /**
@@ -5119,8 +5206,8 @@ const c = class c {
    * @returns Promise (スキャンが完了したときに解決される)
    */
   static scan(t) {
-    const e = T.get(t);
-    return e ? c.initializeElementFragment(e, !1) : Promise.resolve();
+    const e = w.get(t);
+    return e ? h.initializeElementFragment(e, !1) : Promise.resolve();
   }
   /**
    * 新規 each 行を局所初期化します。
@@ -5130,8 +5217,8 @@ const c = class c {
    * @returns 初期化完了の Promise
    */
   static initializeFreshEachRow(t) {
-    return c.initializeElementFragment(t, !0).then(() => {
-      c.needsScheduledEvaluateAll(t) && c.scheduleEvaluateAll(t);
+    return h.initializeElementFragment(t, !0).then(() => {
+      h.needsScheduledEvaluateAll(t) && h.scheduleEvaluateAll(t);
     });
   }
   /**
@@ -5142,16 +5229,16 @@ const c = class c {
    * @returns 初期化完了の Promise
    */
   static initializeElementFragment(t, e) {
-    return c.syncMountedState(t), e && t.isFreshInitializationSkippable() ? Promise.resolve() : c.initializeElementAttributes(t).then(() => {
-      if (c.shouldSkipChildInitialization(t, e)) {
-        c.refreshDerivedSubtreeSignature(t);
+    return h.syncMountedState(t), e && t.isFreshInitializationSkippable() ? Promise.resolve() : h.initializeElementAttributes(t).then(() => {
+      if (h.shouldSkipChildInitialization(t, e)) {
+        h.refreshDerivedSubtreeSignature(t);
         return;
       }
       const r = [];
       return t.getChildren().forEach((i) => {
-        i instanceof M ? r.push(c.initializeElementFragment(i, e)) : i instanceof U && r.push(c.evaluateText(i));
+        i instanceof M ? r.push(h.initializeElementFragment(i, e)) : i instanceof U && r.push(h.evaluateText(i));
       }), Promise.all(r).then(() => {
-        c.refreshDerivedSubtreeSignature(t);
+        h.refreshDerivedSubtreeSignature(t);
       });
     });
   }
@@ -5181,10 +5268,10 @@ const c = class c {
   static initializeElementAttributes(t) {
     let e = Promise.resolve();
     const r = /* @__PURE__ */ new Set();
-    for (const i of c.PRIORITY_ATTRIBUTE_SUFFIXES) {
+    for (const i of h.PRIORITY_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + i;
       t.hasAttribute(n) && (e = e.then(
-        () => c.setAttribute(
+        () => h.setAttribute(
           t.getTarget(),
           n,
           t.getRawAttribute(n)
@@ -5192,17 +5279,17 @@ const c = class c {
       ), r.add(n));
     }
     for (const i of t.getAttributeNames()) {
-      if (r.has(i) || c.isDeferredAttributeName(i))
+      if (r.has(i) || h.isDeferredAttributeName(i))
         continue;
       const n = t.getRawAttribute(i);
       n !== null && (e = e.then(
-        () => c.setAttribute(t.getTarget(), i, n)
+        () => h.setAttribute(t.getTarget(), i, n)
       ));
     }
-    for (const i of c.DEFERRED_ATTRIBUTE_SUFFIXES) {
+    for (const i of h.DEFERRED_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + i;
       t.hasAttribute(n) && (e = e.then(
-        () => c.setAttribute(
+        () => h.setAttribute(
           t.getTarget(),
           n,
           t.getRawAttribute(n)
@@ -5221,7 +5308,7 @@ const c = class c {
    */
   static shouldSkipChildInitialization(t, e) {
     const r = t.getAttribute(`${l.prefix}if`);
-    return t.hasAttribute(`${l.prefix}if`) && c.isHiddenIfCondition(r) ? !0 : e && t.hasAttribute(`${l.prefix}each`);
+    return t.hasAttribute(`${l.prefix}if`) && h.isHiddenIfCondition(r) ? !0 : e && t.hasAttribute(`${l.prefix}each`);
   }
   /**
    * エレメントに属性を設定します。
@@ -5233,7 +5320,7 @@ const c = class c {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r, i = !1) {
-    const n = T.get(t), s = c.getAliasedAttributeName(e);
+    const n = w.get(t), s = h.getAliasedAttributeName(e);
     if (s !== null)
       return r === null ? n.removeAliasedAttribute(e, s) : n.setAliasedAttribute(
         e,
@@ -5250,16 +5337,16 @@ const c = class c {
         else {
           if (i && n instanceof M && n.consumeSelfWrittenBind(r))
             break;
-          n.setBindingData(c.parseDataBind(r));
+          n.setBindingData(h.parseDataBind(r));
         }
         break;
       }
       case `${l.prefix}derive`:
-        u = c.createDeriveInputSignature(
+        u = h.createDeriveInputSignature(
           n,
           r,
           n.getRawAttribute(`${l.prefix}derive-name`)
-        ), o = c.evaluateDerive(
+        ), o = h.evaluateDerive(
           n,
           r,
           n.getRawAttribute(`${l.prefix}derive-name`)
@@ -5267,11 +5354,11 @@ const c = class c {
         }));
         break;
       case `${l.prefix}derive-name`:
-        u = c.createDeriveInputSignature(
+        u = h.createDeriveInputSignature(
           n,
           n.getRawAttribute(`${l.prefix}derive`),
           r
-        ), o = c.evaluateDerive(
+        ), o = h.evaluateDerive(
           n,
           n.getRawAttribute(`${l.prefix}derive`),
           r
@@ -5279,33 +5366,33 @@ const c = class c {
         }));
         break;
       case `${l.prefix}if`:
-        a.push(c.evaluateIf(n));
+        a.push(h.evaluateIf(n));
         break;
       case `${l.prefix}each`:
-        a.push(c.evaluateEach(n));
+        a.push(h.evaluateEach(n));
         break;
       case `${l.prefix}fetch`:
-        a.push(c.executeManagedFetch(n));
+        a.push(h.executeManagedFetch(n));
         break;
       case `${l.prefix}import`:
-        typeof r == "string" && a.push(c.executeManagedImport(n));
+        typeof r == "string" && a.push(h.executeManagedImport(n));
         break;
       case `${l.prefix}url-param`: {
-        const d = n.getAttribute(`${l.prefix}url-arg`), h = Xt.readParams();
-        if (d === null)
-          a.push(c.setBindingData(t, h, /* @__PURE__ */ new Set(), !0));
+        const c = n.getAttribute(`${l.prefix}url-arg`), d = Jt.readParams();
+        if (c === null)
+          a.push(h.setBindingData(t, d, /* @__PURE__ */ new Set(), !0));
         else {
           const g = n.getRawBindingData() || {};
-          g[String(d)] = h, a.push(c.setBindingData(t, g, /* @__PURE__ */ new Set(), !0));
+          g[String(c)] = d, a.push(h.setBindingData(t, g, /* @__PURE__ */ new Set(), !0));
         }
         break;
       }
     }
     return r === null ? a.push(n.removeAttribute(e)) : a.push(n.setAttribute(e, r, i)), Promise.all(a).then(() => {
       if (o !== null)
-        return n.setDeriveInputSignature(u), o.then((d) => {
-          if (d)
-            return c.reevaluateChildren(n);
+        return n.setDeriveInputSignature(u), o.then((c) => {
+          if (c)
+            return h.reevaluateChildren(n);
         });
     }).then(() => {
     });
@@ -5319,22 +5406,27 @@ const c = class c {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setBindingData(t, e, r = /* @__PURE__ */ new Set(), i = !1) {
-    const n = T.get(t), s = n.getRawBindingData();
+    const n = w.get(t), s = n.getRawBindingData();
     n.setBindingData(e), R.bindChange(t, s, e, "manual");
     const a = () => {
+      n.markBindingWorkStart();
       const o = n.getRawBindingData() ?? e;
       let u = n.setAttribute(
         `${l.prefix}bind`,
         JSON.stringify(o)
       );
       if (t.tagName === "FORM") {
-        const d = n.getAttribute(`${l.prefix}form-arg`), h = d && o[String(d)] && typeof o[String(d)] == "object" && !Array.isArray(o[String(d)]) ? o[String(d)] : d ? {} : o;
-        u = u.then(() => y.syncValues(n, h));
+        const c = n.getAttribute(`${l.prefix}form-arg`), d = c && o[String(c)] && typeof o[String(c)] == "object" && !Array.isArray(o[String(c)]) ? o[String(c)] : c ? {} : o;
+        u = u.then(() => E.syncValues(n, d));
       }
-      return u = u.then(() => c.evaluateAll(n, r)), u = u.then(
-        () => c.reevaluateReactiveSpecialAttributes(n, r)
-      ), u.then(() => {
-      });
+      return u = u.then(() => h.evaluateAll(n, r)), u = u.then(
+        () => h.reevaluateReactiveSpecialAttributes(n, r)
+      ), u.then(
+        () => n.markBindingWorkEnd(),
+        (c) => {
+          throw n.markBindingWorkEnd(), c;
+        }
+      );
     };
     return i ? a() : n.enqueueBindingWork(a);
   }
@@ -5356,7 +5448,7 @@ const c = class c {
    *     `resolved: true` のときは解決済みスコープ（常にオブジェクト）。
    */
   static getBindingData(t, e = {}) {
-    const r = T.get(t);
+    const r = w.get(t);
     return r instanceof M ? e.resolved ? r.getBindingData() : r.getRawBindingData() : null;
   }
   /**
@@ -5375,19 +5467,19 @@ const c = class c {
    * @return 解決済みスコープと各キーの由来情報
    */
   static dumpScope(t) {
-    const e = T.get(t);
+    const e = w.get(t);
     if (!e)
       return { resolved: {}, sources: {} };
     const r = e.getBindingData(), i = {}, n = (u) => {
-      const d = u.getTarget();
-      return d.id ? `#${d.id}` : d.tagName.toLowerCase();
-    }, s = (u, d, h, g) => {
+      const c = u.getTarget();
+      return c.id ? `#${c.id}` : c.tagName.toLowerCase();
+    }, s = (u, c, d, g) => {
       if (u)
-        for (const E of Object.keys(u))
-          E in i || (i[E] = {
-            value: u[E],
-            source: n(d),
-            kind: h,
+        for (const y of Object.keys(u))
+          y in i || (i[y] = {
+            value: u[y],
+            source: n(c),
+            kind: d,
             depth: g
           });
     };
@@ -5423,11 +5515,11 @@ const c = class c {
    * @param node 追加するノード
    */
   static addNode(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     if (r.isSkipMutationNodes())
       return;
-    const i = T.get(e.nextSibling), n = T.get(e);
-    n && (r.insertBefore(n, i), n instanceof M ? c.scan(n.getTarget()) : n instanceof U && c.evaluateText(n));
+    const i = w.get(e.nextSibling), n = w.get(e);
+    n && (r.insertBefore(n, i), n instanceof M ? h.scan(n.getTarget()) : n instanceof U && h.evaluateText(n));
   }
   /**
    * ノードを親要素から削除します。
@@ -5435,7 +5527,7 @@ const c = class c {
    * @param node 削除するノード
    */
   static removeNode(t) {
-    const e = T.get(t);
+    const e = w.get(t);
     if (e) {
       const r = e.getParent();
       if (r && r.isSkipMutationNodes())
@@ -5450,7 +5542,7 @@ const c = class c {
    * @param text 新しいテキスト
    */
   static changeText(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     r && r.setContent(e);
   }
   /**
@@ -5462,16 +5554,16 @@ const c = class c {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static changeValue(t, e) {
-    const r = T.get(t);
+    const r = w.get(t);
     if (r.getValue() === e)
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
-    const n = c.getFormFragment(r);
+    const n = h.getFormFragment(r);
     if (n) {
-      const s = y.getValues(n), a = n.getAttribute(`${l.prefix}form-arg`);
+      const s = E.getValues(n), a = n.getAttribute(`${l.prefix}form-arg`);
       let o;
-      a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(c.setBindingData(n.getTarget(), o));
+      a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(h.setBindingData(n.getTarget(), o));
     }
     return Promise.all(i).then(() => {
     });
@@ -5486,7 +5578,7 @@ const c = class c {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
     const e = t.getParent();
-    return e ? c.getFormFragment(e) : null;
+    return e ? h.getFormFragment(e) : null;
   }
   /**
    * フラグメントとその子要素を評価します。
@@ -5497,21 +5589,21 @@ const c = class c {
   static evaluateAll(t, e = /* @__PURE__ */ new Set()) {
     if (e.has(t))
       return Promise.resolve();
-    let r = c.reevaluateInterpolatedAttributes(t);
+    let r = h.reevaluateInterpolatedAttributes(t);
     const i = t.hasAttribute(`${l.prefix}derive`), n = t.hasAttribute(`${l.prefix}if`), s = t.hasAttribute(`${l.prefix}each`), a = t.getRawAttribute(`${l.prefix}derive`), o = t.getRawAttribute(`${l.prefix}derive-name`);
-    let u = !1, d = !1, h = null;
+    let u = !1, c = !1, d = null;
     if (!i && t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), !i && t.getDeriveInputSignature() !== null && t.setDeriveInputSignature(null), i) {
-      const g = c.createDeriveInputSignature(
+      const g = h.createDeriveInputSignature(
         t,
         a,
         o
       );
       g === null ? (t.getDeriveInputSignature() !== null && t.setDeriveInputSignature(null), r = r.then(
-        () => c.evaluateDerive(t, a, o).then(
+        () => h.evaluateDerive(t, a, o).then(
           () => {
           }
         )
-      )) : t.getDeriveInputSignature() !== g && (r = r.then(() => c.evaluateDerive(
+      )) : t.getDeriveInputSignature() !== g && (r = r.then(() => h.evaluateDerive(
         t,
         a,
         o
@@ -5519,16 +5611,16 @@ const c = class c {
         t.setDeriveInputSignature(g);
       })));
     }
-    return n && (r = r.then(() => c.evaluateIf(t))), s ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => c.evaluateEach(t))) : n ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => {
+    return n && (r = r.then(() => h.evaluateIf(t))), s ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => h.evaluateEach(t))) : n ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => {
     })) : (i && (r = r.then(() => {
-      if (!c.canSkipStableDerivedSubtree(t)) {
-        t.setDeriveSubtreeSignature(null), c.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
+      if (!h.canSkipStableDerivedSubtree(t)) {
+        t.setDeriveSubtreeSignature(null), h.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
         return;
       }
-      h = c.createDescendantBindingSignature(
+      d = h.createDescendantBindingSignature(
         t,
         "evaluateAll"
-      ), d = !0, u = t.getDeriveSubtreeSignature() !== null && t.getDeriveSubtreeSignature() === h, c.logDerivedSubtreeProfileSnapshot(
+      ), c = !0, u = t.getDeriveSubtreeSignature() !== null && t.getDeriveSubtreeSignature() === d, h.logDerivedSubtreeProfileSnapshot(
         t,
         u ? "skip-hit" : "skip-miss"
       );
@@ -5536,16 +5628,16 @@ const c = class c {
       if (u)
         return;
       const g = [];
-      return t.getChildren().forEach((E) => {
-        if (E instanceof M) {
-          if (c.canSkipUnchangedNestedEach(E))
+      return t.getChildren().forEach((y) => {
+        if (y instanceof M) {
+          if (h.canSkipUnchangedNestedEach(y))
             return;
-          g.push(c.evaluateAll(E, e));
-        } else E instanceof U && g.push(c.evaluateText(E));
+          g.push(h.evaluateAll(y, e));
+        } else y instanceof U && g.push(h.evaluateText(y));
       }), Promise.all(g).then(() => {
       });
     }).then(() => {
-      d && h !== null && t.setDeriveSubtreeSignature(h);
+      c && d !== null && t.setDeriveSubtreeSignature(d);
     }));
   }
   /**
@@ -5573,7 +5665,7 @@ const c = class c {
     const a = {
       [n]: s.value
     };
-    return c.createBindingSignature(i) === c.createBindingSignature(a) ? Promise.resolve(!1) : (t.setDerivedBindingData(a), Promise.resolve(!0));
+    return h.createBindingSignature(i) === h.createBindingSignature(a) ? Promise.resolve(!1) : (t.setDerivedBindingData(a), Promise.resolve(!0));
   }
   /**
    * テキストフラグメントを評価します。
@@ -5611,7 +5703,7 @@ const c = class c {
     const e = t.getRawAttribute(`${l.prefix}if`);
     if (typeof e != "string" || e.indexOf("{{") >= 0)
       return;
-    const { sources: r } = c.dumpScope(t.getTarget()), i = /* @__PURE__ */ new Set(), n = e.match(/[A-Za-z_$][\w$]*/g) ?? [];
+    const { sources: r } = h.dumpScope(t.getTarget()), i = /* @__PURE__ */ new Set(), n = e.match(/[A-Za-z_$][\w$]*/g) ?? [];
     let s = 0;
     n.forEach((o) => {
       const u = e.indexOf(o, s);
@@ -5638,8 +5730,8 @@ const c = class c {
    */
   static evaluateIf(t) {
     const e = [], r = t.getAttribute(`${l.prefix}if`);
-    if (c.isHiddenIfCondition(r))
-      H.isEnabled() && c.logFalsyIfDiagnostics(t), e.push(
+    if (h.isHiddenIfCondition(r))
+      H.isEnabled() && h.logFalsyIfDiagnostics(t), e.push(
         t.hide().then(() => {
           R.hide(t.getTarget());
         })
@@ -5648,11 +5740,11 @@ const c = class c {
       const i = t.isVisible(), n = [];
       t.getChildren().forEach((s) => {
         s instanceof M ? n.push(
-          s.isMounted() ? c.evaluateAll(s) : c.scan(s.getTarget())
-        ) : s instanceof U && n.push(c.evaluateText(s));
+          s.isMounted() ? h.evaluateAll(s) : h.scan(s.getTarget())
+        ) : s instanceof U && n.push(h.evaluateText(s));
       }), e.push(
         t.show().then(() => {
-          R.show(t.getTarget()), i || c.triggerLoadOnShow(t);
+          R.show(t.getTarget()), i || h.triggerLoadOnShow(t);
         })
       ), e.push(Promise.all(n).then(() => {
       }));
@@ -5682,8 +5774,8 @@ const c = class c {
    * @return 再入制御状態
    */
   static getEachUpdateState(t) {
-    let e = c.EACH_UPDATE_STATES.get(t);
-    return e || (e = { running: !1, rerunRequested: !1, settled: null }, c.EACH_UPDATE_STATES.set(t, e)), e;
+    let e = h.EACH_UPDATE_STATES.get(t);
+    return e || (e = { running: !1, rerunRequested: !1, settled: null }, h.EACH_UPDATE_STATES.set(t, e)), e;
   }
   /**
    * each要素を評価します。
@@ -5701,8 +5793,8 @@ const c = class c {
   static evaluateEach(t) {
     if (!t.isVisible() || !t.isMounted())
       return Promise.resolve();
-    const e = c.getEachUpdateState(t);
-    return e.running ? (e.rerunRequested = !0, e.settled ?? Promise.resolve()) : c.runEachUpdateLoop(t, e);
+    const e = h.getEachUpdateState(t);
+    return e.running ? (e.rerunRequested = !0, e.settled ?? Promise.resolve()) : h.runEachUpdateLoop(t, e);
   }
   /**
    * data-each の差分更新を、再評価要求が無くなるまで直列に繰り返し実行します。
@@ -5718,7 +5810,7 @@ const c = class c {
     const r = (async () => {
       try {
         do
-          e.rerunRequested = !1, await c.performEachUpdate(t);
+          e.rerunRequested = !1, await h.performEachUpdate(t);
         while (e.rerunRequested);
         t.getTarget().setAttribute(`${l.prefix}each-done`, "");
       } finally {
@@ -5734,11 +5826,11 @@ const c = class c {
    * @return 差分更新完了の Promise
    */
   static performEachUpdate(t) {
-    const e = c.resolveEachItems(t);
+    const e = h.resolveEachItems(t);
     if (e === null)
       return Promise.reject(new Error("Invalid each attribute."));
     let r = t.getTemplate();
-    const i = t.getAttribute(`${l.prefix}each-key`), n = c.createBindingSignature({
+    const i = t.getAttribute(`${l.prefix}each-key`), n = h.createBindingSignature({
       key: i ? String(i) : null,
       items: e
     });
@@ -5748,7 +5840,7 @@ const c = class c {
         if (!s && a instanceof M) {
           if (a.hasAttribute(`${l.prefix}each-before`) || a.hasAttribute(`${l.prefix}each-after`))
             return;
-          r = a.clone(), c.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0, t.removeChild(a);
+          r = a.clone(), h.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0, t.removeChild(a);
           const o = a.getTarget();
           o.parentNode && o.parentNode.removeChild(o), a.setMounted(!1);
         }
@@ -5758,11 +5850,11 @@ const c = class c {
           (u) => !u.hasAttribute(`${l.prefix}each-before`) && !u.hasAttribute(`${l.prefix}each-after`)
         ).forEach((u) => {
           if (!s) {
-            const h = T.get(u);
-            h instanceof M && (r = h.clone(), c.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0);
+            const d = w.get(u);
+            d instanceof M && (r = d.clone(), h.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0);
           }
-          const d = T.get(u);
-          d instanceof M && t.getChildren().includes(d) && (t.removeChild(d), d.setMounted(!1)), u.parentNode && u.parentNode.removeChild(u);
+          const c = w.get(u);
+          c instanceof M && t.getChildren().includes(c) && (t.removeChild(c), c.setMounted(!1)), u.parentNode && u.parentNode.removeChild(u);
         });
       }
       return this.updateDiff(t, e).then(() => {
@@ -5794,12 +5886,12 @@ const c = class c {
     if (!t.hasAttribute(`${l.prefix}each`) || t.getEachInputSignature() === null)
       return !1;
     const e = t.getParent();
-    if (e?.closestByAttribute(`${l.prefix}derive`) || e?.closestByAttribute(`${l.prefix}derive-name`) || e?.closestByAttribute(`${l.prefix}if`) || e?.closestByAttribute(`${l.prefix}fetch`) || e?.closestByAttribute(`${l.prefix}import`) || c.hasNonEachDynamicElementState(t))
+    if (e?.closestByAttribute(`${l.prefix}derive`) || e?.closestByAttribute(`${l.prefix}derive-name`) || e?.closestByAttribute(`${l.prefix}if`) || e?.closestByAttribute(`${l.prefix}fetch`) || e?.closestByAttribute(`${l.prefix}import`) || h.hasNonEachDynamicElementState(t))
       return !1;
-    const r = c.resolveEachItems(t);
+    const r = h.resolveEachItems(t);
     if (r === null)
       return !1;
-    const i = t.getAttribute(`${l.prefix}each-key`), n = c.createBindingSignature({
+    const i = t.getAttribute(`${l.prefix}each-key`), n = h.createBindingSignature({
       key: i ? String(i) : null,
       items: r
     });
@@ -5813,7 +5905,7 @@ const c = class c {
    * @returns 省略可能なら true
    */
   static canSkipStableDerivedSubtree(t) {
-    return !t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}if`) || t.hasAttribute(`${l.prefix}each`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !1 : !c.hasDisallowedDerivedSubtreeDescendant(t);
+    return !t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}if`) || t.hasAttribute(`${l.prefix}each`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !1 : !h.hasDisallowedDerivedSubtreeDescendant(t);
   }
   /**
    * data-derive subtree skip の初期 PoC で扱わない子孫要素を含むかを返します。
@@ -5822,7 +5914,7 @@ const c = class c {
    * @returns 含むなら true
    */
   static hasDisallowedDerivedSubtreeDescendant(t) {
-    return t.getChildren().some((e) => e instanceof M ? e.hasAttribute(`${l.prefix}derive`) || e.hasAttribute(`${l.prefix}derive-name`) || e.hasAttribute(`${l.prefix}fetch`) || e.hasAttribute(`${l.prefix}import`) ? !0 : c.hasDisallowedDerivedSubtreeDescendant(e) : !1);
+    return t.getChildren().some((e) => e instanceof M ? e.hasAttribute(`${l.prefix}derive`) || e.hasAttribute(`${l.prefix}derive-name`) || e.hasAttribute(`${l.prefix}fetch`) || e.hasAttribute(`${l.prefix}import`) ? !0 : h.hasDisallowedDerivedSubtreeDescendant(e) : !1);
   }
   /**
    * data-derive host が子孫要素へ公開している binding の署名を返します。
@@ -5831,7 +5923,7 @@ const c = class c {
    * @returns binding 署名
    */
   static createDescendantBindingSignature(t, e) {
-    return c.recordDerivedSubtreeSignatureComputation(t, e), c.createBindingSignature(t.getDescendantBindingData());
+    return h.recordDerivedSubtreeSignatureComputation(t, e), h.createBindingSignature(t.getDescendantBindingData());
   }
   /**
    * data-derive 実行前の入力署名を返します。
@@ -5843,7 +5935,7 @@ const c = class c {
    */
   static createDeriveInputSignature(t, e, r) {
     const i = typeof r == "string" ? r.trim() : "";
-    return !e || i === "" ? null : c.createBindingSignature({
+    return !e || i === "" ? null : h.createBindingSignature({
       expression: e,
       name: i,
       scope: t.getBindingData()
@@ -5855,13 +5947,13 @@ const c = class c {
    * @param fragment 対象フラグメント
    */
   static refreshDerivedSubtreeSignature(t) {
-    if (!c.canSkipStableDerivedSubtree(t)) {
-      t.setDeriveSubtreeSignature(null), c.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
+    if (!h.canSkipStableDerivedSubtree(t)) {
+      t.setDeriveSubtreeSignature(null), h.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
       return;
     }
     t.setDeriveSubtreeSignature(
-      c.createDescendantBindingSignature(t, "refresh")
-    ), c.logDerivedSubtreeProfileSnapshot(t, "refresh");
+      h.createDescendantBindingSignature(t, "refresh")
+    ), h.logDerivedSubtreeProfileSnapshot(t, "refresh");
   }
   /**
    * data-derive subtree skip のプロファイルを取得または初期化します。
@@ -5872,11 +5964,11 @@ const c = class c {
   static getOrCreateDerivedSubtreeProfile(t) {
     if (!H.isEnabled() || !t.hasAttribute(`${l.prefix}derive`))
       return null;
-    const e = c.DERIVE_SUBTREE_PROFILES.get(t);
+    const e = h.DERIVE_SUBTREE_PROFILES.get(t);
     if (e)
       return e;
     const r = {
-      hostId: c.createDerivedSubtreeHostId(t),
+      hostId: h.createDerivedSubtreeHostId(t),
       signatureComputeTotal: 0,
       signatureComputeFromEvaluateAll: 0,
       signatureComputeFromRefresh: 0,
@@ -5884,7 +5976,7 @@ const c = class c {
       skipMissCount: 0,
       skipIneligibleCount: 0
     };
-    return c.DERIVE_SUBTREE_PROFILES.set(t, r), r;
+    return h.DERIVE_SUBTREE_PROFILES.set(t, r), r;
   }
   /**
    * data-derive subtree host の識別子を作成します。
@@ -5922,7 +6014,7 @@ const c = class c {
    * @param source 計算元
    */
   static recordDerivedSubtreeSignatureComputation(t, e) {
-    const r = c.getOrCreateDerivedSubtreeProfile(t);
+    const r = h.getOrCreateDerivedSubtreeProfile(t);
     if (r !== null) {
       if (r.signatureComputeTotal += 1, e === "refresh") {
         r.signatureComputeFromRefresh += 1;
@@ -5938,7 +6030,7 @@ const c = class c {
    * @param reason ログ理由
    */
   static logDerivedSubtreeProfileSnapshot(t, e) {
-    const r = c.getOrCreateDerivedSubtreeProfile(t);
+    const r = h.getOrCreateDerivedSubtreeProfile(t);
     r !== null && (e === "skip-hit" ? r.skipHitCount += 1 : e === "skip-miss" ? r.skipMissCount += 1 : e === "skip-ineligible" && (r.skipIneligibleCount += 1), m.info("[Haori][derive-profile]", {
       reason: e,
       hostId: r.hostId,
@@ -5981,7 +6073,7 @@ const c = class c {
    * @returns subtree 全体を省略可能なら true
    */
   static markFreshInitializationSkippable(t) {
-    const e = t.getAttributeNames().some((n) => c.isFreshInitializationDynamicAttribute(t, n)), r = t.getChildren().some((n) => n instanceof M ? !c.markFreshInitializationSkippable(n) : n instanceof U ? n.hasDynamicContent() : !1), i = !e && !r;
+    const e = t.getAttributeNames().some((n) => h.isFreshInitializationDynamicAttribute(t, n)), r = t.getChildren().some((n) => n instanceof M ? !h.markFreshInitializationSkippable(n) : n instanceof U ? n.hasDynamicContent() : !1), i = !e && !r;
     return t.setFreshInitializationSkippable(i), i;
   }
   /**
@@ -6011,35 +6103,35 @@ const c = class c {
     i && (i = String(i));
     const n = t.getAttribute(`${l.prefix}each-key`), s = t.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
     e.forEach((b, S) => {
-      const F = c.createListKey(
+      const F = h.createListKey(
         b,
         n ? String(n) : null,
         S
       );
       o.push(F), a.set(F, { item: b, itemIndex: S });
     });
-    const u = new Set(o), d = [];
-    let h = t.getChildren().filter((b) => b instanceof M).filter(
+    const u = new Set(o), c = [];
+    let d = t.getChildren().filter((b) => b instanceof M).filter(
       (b) => !b.hasAttribute(`${l.prefix}each-before`) && !b.hasAttribute(`${l.prefix}each-after`)
     );
-    const g = h.map((b) => b.getListKey());
-    h = h.filter((b) => u.has(String(b.getListKey())) ? !0 : (d.push(b.remove()), !1));
-    const E = h.map((b) => b.getListKey()), w = /* @__PURE__ */ new Map();
-    h.forEach((b) => {
+    const g = d.map((b) => b.getListKey());
+    d = d.filter((b) => u.has(String(b.getListKey())) ? !0 : (c.push(b.remove()), !1));
+    const y = d.map((b) => b.getListKey()), T = /* @__PURE__ */ new Map();
+    d.forEach((b) => {
       const S = b.getListKey();
-      S !== null && !w.has(S) && w.set(S, b);
+      S !== null && !T.has(S) && T.set(S, b);
     });
-    const k = t.getChildElementFragments().slice(), A = k.filter(
+    const P = t.getChildElementFragments().slice(), A = P.filter(
       (b) => b.hasAttribute(`${l.prefix}each-before`)
     ).length;
     let v = Promise.resolve();
     return o.forEach((b, S) => {
       const { item: F, itemIndex: I } = a.get(b);
       let $;
-      const V = w.get(b);
+      const V = T.get(b);
       if (V)
         $ = V, v = v.then(
-          () => c.updateRowFragment(
+          () => h.updateRowFragment(
             $,
             F,
             i,
@@ -6048,14 +6140,14 @@ const c = class c {
             b
           ).then((C) => {
             if (C)
-              return c.evaluateAll($);
+              return h.evaluateAll($);
           })
         );
       else {
         $ = r.clone();
         const C = A + S;
         v = v.then(
-          () => c.updateRowFragment(
+          () => h.updateRowFragment(
             $,
             F,
             i,
@@ -6063,17 +6155,17 @@ const c = class c {
             s ? String(s) : null,
             b
           ).then(() => {
-            const Q = k[C] ?? null;
+            const Q = P[C] ?? null;
             return t.insertBefore($, Q).then(() => {
-              k.splice(C, 0, $);
-            }).then(() => c.initializeFreshEachRow($));
+              P.splice(C, 0, $);
+            }).then(() => h.initializeFreshEachRow($));
           })
         );
       }
-    }), Promise.all(d).then(() => v).then(() => {
+    }), Promise.all(c).then(() => v).then(() => {
       const b = o.filter(
         (C) => C !== null
-      ), S = E.filter(
+      ), S = y.filter(
         (C) => C !== null
       ), F = new Set(S), I = b.filter((C) => !F.has(C)), V = g.filter(
         (C) => C !== null
@@ -6134,7 +6226,7 @@ const c = class c {
         "[Haori]",
         `Primitive value requires '${l.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve(!1);
-    const o = a, u = c.createBindingSignature({
+    const o = a, u = h.createBindingSignature({
       listKey: s,
       bindingData: o
     });
@@ -6152,7 +6244,7 @@ const c = class c {
       const r = e.pop();
       if (r.getChildElementFragments().forEach((i) => {
         e.push(i);
-      }), r !== t && !r.isMounted() && c.hasMountSensitiveAttribute(r))
+      }), r !== t && !r.isMounted() && h.hasMountSensitiveAttribute(r))
         return !0;
     }
     return !1;
@@ -6195,7 +6287,7 @@ const c = class c {
       if (e.has(t))
         return `[Circular:${e.get(t)}]`;
       const i = `array-${r.value}`;
-      return r.value += 1, e.set(t, i), `[${t.map((n) => c.createBindingSignature(n, e, r)).join(",")}]`;
+      return r.value += 1, e.set(t, i), `[${t.map((n) => h.createBindingSignature(n, e, r)).join(",")}]`;
     }
     if (typeof t == "object") {
       if (e.has(t))
@@ -6204,7 +6296,7 @@ const c = class c {
       r.value += 1, e.set(t, i);
       const n = t;
       return `{${Object.keys(n).sort().map(
-        (s) => `${JSON.stringify(s)}:${c.createBindingSignature(
+        (s) => `${JSON.stringify(s)}:${h.createBindingSignature(
           n[s],
           e,
           r
@@ -6220,18 +6312,18 @@ const c = class c {
    */
   static scheduleEvaluateAll(t) {
     setTimeout(() => {
-      c.evaluateAll(t);
+      h.evaluateAll(t);
     }, 100);
   }
 };
-c.ATTRIBUTE_ALIAS_SUFFIX = "attr-", c.PRIORITY_ATTRIBUTE_SUFFIXES = [
+h.ATTRIBUTE_ALIAS_SUFFIX = "attr-", h.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "bind",
   "url-param",
   "derive-name",
   "derive",
   "if",
   "each"
-], c.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], c.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
+], h.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], h.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
   "bind",
   "derive",
   "derive-name",
@@ -6240,9 +6332,9 @@ c.ATTRIBUTE_ALIAS_SUFFIX = "attr-", c.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "fetch",
   "import",
   "url-param"
-], c.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, c.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), c.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), c.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), c.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap();
-let x = c;
-const J = class J {
+], h.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, h.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), h.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), h.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), h.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap();
+let x = h;
+const X = class X {
   /**
    * コンストラクタ。
    *
@@ -6250,11 +6342,11 @@ const J = class J {
    */
   constructor(t = document) {
     this.customEventHandlers = /* @__PURE__ */ new Map(), this.onClick = (e) => this.delegate(e, "click"), this.onChange = (e) => this.delegate(e, "change"), this.onInput = (e) => this.delegate(e, "input"), this.onLoadCapture = (e) => this.delegate(e, "load"), this.onWindowLoad = () => {
-      const e = document.documentElement, r = T.get(e);
+      const e = document.documentElement, r = w.get(e);
       r && new j(r, "load").run();
     }, this.onPopstate = (e) => {
       const r = e.state;
-      !r || r[J.HISTORY_STATE_KEY] !== !0 || location.reload();
+      !r || r[X.HISTORY_STATE_KEY] !== !0 || location.reload();
     }, this.root = t;
   }
   /**
@@ -6306,7 +6398,7 @@ const J = class J {
   subscribeCustomEvent(t) {
     if (t === null || t === "")
       return;
-    if (J.BUILTIN_EVENT_NAMES.has(t)) {
+    if (X.BUILTIN_EVENT_NAMES.has(t)) {
       m.warn(
         "[Haori]",
         `data-on="${t}" は組み込みイベントです。data-${t}-* を使用してください（data-on はカスタムイベント専用）。`
@@ -6329,7 +6421,7 @@ const J = class J {
     this.root.querySelectorAll(`[${this.onAttributeName}]`).forEach((i) => {
       if (i.getAttribute(this.onAttributeName) !== t)
         return;
-      const n = T.get(i);
+      const n = w.get(i);
       n instanceof M && new j(n, "on", e).run().catch((s) => {
         m.error("[Haori]", "Procedure execution error:", s);
       });
@@ -6375,7 +6467,7 @@ const J = class J {
         return;
     }
     r.hasAttribute(`${l.prefix}${e}-prevent`) && t.preventDefault();
-    const i = T.get(r);
+    const i = w.get(r);
     if (!i)
       return;
     (e === "change" || e === "input") && i instanceof M && i.syncValue();
@@ -6433,13 +6525,13 @@ const J = class J {
     return null;
   }
 };
-J.HISTORY_STATE_KEY = "__haoriHistoryState__", J.BUILTIN_EVENT_NAMES = /* @__PURE__ */ new Set([
+X.HISTORY_STATE_KEY = "__haoriHistoryState__", X.BUILTIN_EVENT_NAMES = /* @__PURE__ */ new Set([
   "click",
   "change",
   "input",
   "load"
 ]);
-let ht = J;
+let ht = X;
 const D = class D {
   /**
    * ノードが現在の Window に属する HTMLElement かどうかを判定します。
@@ -6459,7 +6551,7 @@ const D = class D {
     }));
   }
   static syncElement(t) {
-    const e = D.registrations.get(t), r = T.get(t);
+    const e = D.registrations.get(t), r = w.get(t);
     if (!r || !D.shouldObserve(r)) {
       e && (e.observer.disconnect(), D.registrations.delete(t));
       return;
@@ -6477,10 +6569,10 @@ const D = class D {
     e && (e.observer.disconnect(), D.registrations.delete(t));
     const o = new IntersectionObserver(
       (u) => {
-        const d = D.registrations.get(t);
-        d && u.forEach((h) => {
-          !h.isIntersecting || d.running || D.isDisabled(d.fragment) || (d.running = !0, new j(d.fragment, "intersect").runWithResult().then((g) => {
-            g && d.once && (d.observer.disconnect(), D.registrations.delete(t));
+        const c = D.registrations.get(t);
+        c && u.forEach((d) => {
+          !d.isIntersecting || c.running || D.isDisabled(c.fragment) || (c.running = !0, new j(c.fragment, "intersect").runWithResult().then((g) => {
+            g && c.once && (c.observer.disconnect(), D.registrations.delete(t));
           }).catch((g) => {
             m.error(
               "[Haori]",
@@ -6567,7 +6659,7 @@ D.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "disabled",
   "once"
 ]), D.registrations = /* @__PURE__ */ new Map();
-let X = D;
+let J = D;
 const O = class O {
   /**
    * 既存の MutationObserver をすべて停止します。
@@ -6589,7 +6681,7 @@ const O = class O {
       x.scan(document.head),
       x.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && m.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && m.error("[Haori]", "Failed to build body fragment:", r.reason), await P.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ht().start(), X.syncTree(document.body);
+    e.status !== "fulfilled" && m.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && m.error("[Haori]", "Failed to build body fragment:", r.reason), await k.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ht().start(), J.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -6613,14 +6705,14 @@ const O = class O {
                 i.attributeName,
                 n.getAttribute(i.attributeName),
                 !0
-              ), X.syncElement(n);
+              ), J.syncElement(n);
               break;
             }
             case "childList": {
               Array.from(i.removedNodes).forEach((n) => {
-                X.cleanupTree(n), x.removeNode(n);
+                J.cleanupTree(n), x.removeNode(n);
               }), Array.from(i.addedNodes).forEach((n) => {
-                n.parentElement instanceof Element && (x.addNode(n.parentElement, n), X.syncTree(n));
+                n.parentElement instanceof Element && (x.addNode(n.parentElement, n), J.syncTree(n));
               });
               break;
             }
@@ -6651,15 +6743,15 @@ const O = class O {
 O._initialized = !1, O._mutationObservers = [];
 let it = O;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", it.init) : it.init();
-const Qt = () => Z.waitForRenders(), Zt = "0.17.2";
+const Qt = () => Z.waitForRenders(), Zt = "0.18.0";
 export {
   x as Core,
   l as Env,
-  y as Form,
-  T as Fragment,
+  E as Form,
+  w as Fragment,
   Z as Haori,
   m as Log,
-  P as Queue,
+  k as Queue,
   Z as default,
   Zt as version,
   Qt as waitForRenders