npm - haori - Versions diffs - 0.57.1 → 0.59.0 - Mend

haori 0.57.1 → 0.59.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/haori.es.js CHANGED Viewed

@@ -31,11 +31,11 @@ const me = class me {
 me.devMode = !1;
 let q = me;
 const Be = "embedded";
-function Qe(b) {
+function _e(b) {
   return b === "embedded" || b === "demo";
 }
-function bt(b) {
-  return b === null ? null : Qe(b) ? b : Be;
+function At(b) {
+  return b === null ? null : _e(b) ? b : Be;
 }
 const ee = class ee {
   /**
@@ -73,7 +73,7 @@ const ee = class ee {
    * @return 戻り値はありません。
    */
   static setRuntime(e) {
-    ee._runtime = Qe(e) ? e : Be;
+    ee._runtime = _e(e) ? e : Be;
   }
   /**
    * 実行環境からプレフィックスと開発モードかどうかを自動検出します。
@@ -87,7 +87,7 @@ const ee = class ee {
       if (e instanceof HTMLScriptElement) {
         const r = e.getAttribute("data-prefix") || ee._prefix;
         ee._prefix = r.endsWith("-") ? r : r + "-";
-        const i = bt(
+        const i = At(
           e.getAttribute("data-runtime")
         );
         i !== null && (ee._runtime = i), ee._strictBind = e.hasAttribute(
@@ -422,11 +422,11 @@ const Et = /^[A-Za-z_$][A-Za-z0-9_$]*(\.[A-Za-z_$][A-Za-z0-9_$]*)*$/, Ke = "new:
 };
 M.enhancers = /* @__PURE__ */ new Map(), M.instances = /* @__PURE__ */ new WeakMap(), M.warnedUnknownNames = /* @__PURE__ */ new Set(), M.warnedMissingGlobals = /* @__PURE__ */ new Set(), M.visited = /* @__PURE__ */ new WeakSet(), M.mutationCapture = null;
 let te = M;
-const _e = "yyyy/MM/dd HH:mm", At = "en-US", ze = 1e4;
+const et = "yyyy/MM/dd HH:mm", vt = "en-US", ze = 1e4;
 function le(b) {
   return String(b).padStart(2, "0");
 }
-function et(b, e, t, r, i, n) {
+function tt(b, e, t, r, i, n) {
   return {
     yyyy: String(b).padStart(4, "0"),
     yy: le(b % 100),
@@ -440,7 +440,7 @@ function et(b, e, t, r, i, n) {
     ss: le(n)
   };
 }
-function tt(b, e) {
+function rt(b, e) {
   let t;
   try {
     t = new Intl.DateTimeFormat("en-US", {
@@ -460,9 +460,9 @@ function tt(b, e) {
   for (const u of t)
     u.type !== "literal" && (r[u.type] = u.value);
   const i = Number(r.year), n = Number(r.month), s = Number(r.day), a = Number(r.hour), o = Number(r.minute), c = Number(r.second);
-  return !Number.isFinite(i) || !Number.isFinite(n) || !Number.isFinite(s) || !Number.isFinite(a) || !Number.isFinite(o) || !Number.isFinite(c) ? null : et(i, n, s, a, o, c);
+  return !Number.isFinite(i) || !Number.isFinite(n) || !Number.isFinite(s) || !Number.isFinite(a) || !Number.isFinite(o) || !Number.isFinite(c) ? null : tt(i, n, s, a, o, c);
 }
-function Pe(b, e = _e, t) {
+function Pe(b, e = et, t) {
   if (b == null || b === "")
     return "";
   const r = b instanceof Date ? b : new Date(b);
@@ -470,10 +470,10 @@ function Pe(b, e = _e, t) {
     return "";
   let i;
   if (typeof t == "string" && t.trim() !== "") {
-    if (i = tt(r, t.trim()), i === null)
+    if (i = rt(r, t.trim()), i === null)
       return "";
   } else
-    i = et(
+    i = tt(
       r.getFullYear(),
       r.getMonth() + 1,
       r.getDate(),
@@ -487,15 +487,15 @@ function Pe(b, e = _e, t) {
     (s, a) => a !== void 0 ? a === "" ? "'" : a : n[s]
   );
 }
-const vt = "yyyy-MM-dd";
-function rt(b = _e, e) {
+const wt = "yyyy-MM-dd";
+function it(b = et, e) {
   return Pe(/* @__PURE__ */ new Date(), b, e);
 }
-function it(b = 0, e = vt, t) {
+function nt(b = 0, e = wt, t) {
   const r = Number.isFinite(b) ? Math.trunc(b) : 0, i = typeof t == "string" && t.trim() !== "" ? t.trim() : "";
   let n, s, a;
   if (i !== "") {
-    const c = tt(/* @__PURE__ */ new Date(), i);
+    const c = rt(/* @__PURE__ */ new Date(), i);
     if (c === null)
       return "";
     n = Number(c.yyyy), s = Number(c.MM), a = Number(c.dd);
@@ -506,7 +506,7 @@ function it(b = 0, e = vt, t) {
   const o = new Date(Date.UTC(n, s - 1, a + r));
   return Pe(o, e, "UTC");
 }
-function nt(b, e) {
+function st(b, e) {
   if (b == null)
     return "";
   let t;
@@ -525,9 +525,9 @@ function nt(b, e) {
     const i = Math.max(0, Math.trunc(e));
     r.minimumFractionDigits = i, r.maximumFractionDigits = i;
   }
-  return new Intl.NumberFormat(At, r).format(t);
+  return new Intl.NumberFormat(vt, r).format(t);
 }
-function st(b, e, t) {
+function at(b, e, t) {
   let r, i, n;
   if (e === void 0 ? (r = 0, i = b, n = 1) : (r = b, i = e, n = t === void 0 ? 1 : t), !Number.isFinite(r) || !Number.isFinite(i) || !Number.isFinite(n) || n === 0)
     return [];
@@ -541,7 +541,7 @@ function st(b, e, t) {
       s.push(a);
   return s;
 }
-function at(b, e, t = {}) {
+function ot(b, e, t = {}) {
   const r = Math.trunc(Number(b));
   if (!Number.isFinite(r) || r <= 0)
     return [];
@@ -578,15 +578,15 @@ function at(b, e, t = {}) {
   }
   return c;
 }
-const wt = /^(\d{4})-(\d{1,2})$/, St = 1200;
-function Ne(b, e) {
+const St = /^(\d{4})-(\d{1,2})$/, Rt = 1200;
+function ke(b, e) {
   const t = Number(b);
   return Number.isFinite(t) ? Math.trunc(t) : e;
 }
 function Le(b, e) {
   if (typeof b != "string")
     return "";
-  const t = wt.exec(b.trim());
+  const t = St.exec(b.trim());
   if (!t)
     return "";
   const r = Number(t[1]), i = Number(t[2]);
@@ -595,45 +595,45 @@ function Le(b, e) {
   const n = Number.isFinite(e) ? Math.trunc(e) : 0, s = r * 12 + (i - 1) + n, a = Math.floor(s / 12), o = s - a * 12 + 1;
   return `${String(a).padStart(4, "0")}-${le(o)}`;
 }
-function Rt(b) {
+function Tt(b) {
   if (typeof b == "string" && b.trim() !== "")
     return Le(b, 0);
   const e = /* @__PURE__ */ new Date();
   return `${String(e.getFullYear()).padStart(4, "0")}-${le(e.getMonth() + 1)}`;
 }
-function ot(b, e) {
+function lt(b, e) {
   const t = Math.trunc(Number(b));
   if (!Number.isFinite(t) || t < 0)
     return [];
-  const r = Rt(e);
+  const r = Tt(e);
   if (r === "")
     return [];
-  const i = Math.min(t, St), n = [];
+  const i = Math.min(t, Rt), n = [];
   for (let s = 0; s <= i; s += 1) {
     const a = Le(r, -s);
     n.push({ targetMonth: a, label: a.replace(/-/g, "/") });
   }
   return n;
 }
-function lt(b, e) {
+function ct(b, e) {
   const t = { start: 0, end: 0, total: 0, empty: !0 };
   if (!b || typeof b != "object")
     return t;
-  const r = b, i = Ne(r.totalElements ?? r.totalCount, 0);
+  const r = b, i = ke(r.totalElements ?? r.totalCount, 0);
   if (i <= 0)
     return t;
-  const n = Math.max(0, Ne(r.number, 0)), s = Math.max(0, Ne(r.size, 0)), a = n * s, o = Math.min(a + 1, i);
+  const n = Math.max(0, ke(r.number, 0)), s = Math.max(0, ke(r.size, 0)), a = n * s, o = Math.min(a + 1, i);
   let c;
   if (e !== void 0 && Number.isFinite(e))
     c = Math.max(0, Math.trunc(e));
   else {
-    const d = Ne(r.numberOfElements, NaN);
+    const d = ke(r.numberOfElements, NaN);
     c = Number.isFinite(d) ? d : Math.min(s, i - a);
   }
   const u = Math.min(a + c, i);
   return { start: o, end: Math.max(u, o), total: i, empty: !1 };
 }
-function ct(b, e, t) {
+function ut(b, e, t) {
   if (!Array.isArray(b) || b.length === 0)
     return null;
   const r = String(t), i = b.find(
@@ -641,7 +641,7 @@ function ct(b, e, t) {
   );
   return i === void 0 ? null : i;
 }
-function ut(b, e) {
+function dt(b, e) {
   if (!Array.isArray(b))
     return 0;
   let t = 0;
@@ -654,25 +654,25 @@ function ut(b, e) {
   }
   return t;
 }
-function dt(b, e) {
+function ft(b, e) {
   return e == null || b == null ? String(b) : String(b[e]);
 }
-function ft(b, e) {
+function ht(b, e) {
   if (!Array.isArray(b))
     return [];
   const t = /* @__PURE__ */ new Set(), r = [];
   for (const i of b) {
-    const n = dt(i, e);
+    const n = ft(i, e);
     t.has(n) || (t.add(n), r.push(i));
   }
   return r;
 }
-function ht(b, e) {
+function pt(b, e) {
   if (!Array.isArray(b))
     return [];
   const t = /* @__PURE__ */ new Map(), r = [];
   for (const i of b) {
-    const n = dt(i, e), s = t.get(n);
+    const n = ft(i, e), s = t.get(n);
     if (s === void 0) {
       const a = i == null ? i : i[e];
       t.set(n, r.length), r.push({ key: a, items: [i] });
@@ -681,20 +681,20 @@ function ht(b, e) {
   }
   return r;
 }
-const Tt = Object.freeze({
+const Dt = Object.freeze({
   date: Pe,
-  now: rt,
-  today: it,
-  number: nt,
-  pages: at,
-  range: st,
+  now: it,
+  today: nt,
+  number: st,
+  pages: ot,
+  range: at,
   monthAdd: Le,
-  monthRange: ot,
-  pageSummary: lt,
-  findBy: ct,
-  sum: ut,
-  distinct: ft,
-  groupBy: ht
+  monthRange: lt,
+  pageSummary: ct,
+  findBy: ut,
+  sum: dt,
+  distinct: ht,
+  groupBy: pt
 });
 class qe {
   constructor() {
@@ -827,7 +827,7 @@ const je = class je {
   }
 };
 je.ASYNC_QUEUE = new qe();
-let K = je;
+let z = je;
 const R = class R {
   /**
    * ストレージを、参照が例外になる環境でも安全に読み出します。
@@ -1283,7 +1283,7 @@ let ${e.join(", ")};`;
    * @return 戻り値はありません。
    */
   static scheduleUnresolvedIdentifierReport() {
-    this.unresolvedReportScheduled || (this.unresolvedReportScheduled = !0, K.waitForIdle().then(() => {
+    this.unresolvedReportScheduled || (this.unresolvedReportScheduled = !0, z.waitForIdle().then(() => {
       this.unresolvedReportScheduled = !1, this.reportUnresolvedIdentifiers();
     }));
   }
@@ -1351,7 +1351,7 @@ let ${e.join(", ")};`;
         this.pendingScopeMissingIdentifiers.delete(t);
         return;
       }
-      this.pendingScopeMissingIdentifiers.set(t, new Set(e)), !this.scopeMissingReportScheduled && (this.scopeMissingReportScheduled = !0, K.waitForIdle().then(() => {
+      this.pendingScopeMissingIdentifiers.set(t, new Set(e)), !this.scopeMissingReportScheduled && (this.scopeMissingReportScheduled = !0, z.waitForIdle().then(() => {
         this.scopeMissingReportScheduled = !1, this.reportScopeMissingIdentifiers();
       }));
     }
@@ -1528,35 +1528,35 @@ ${t}`;
       if (g.compileFailed || g.evaluator === null)
         return { value: null, unresolvedReference: !1 };
       try {
-        const y = [], E = this.wrapBoundValues(a);
-        g.bindKeys.forEach((D) => {
-          y.push(E[D]);
+        const y = [], A = this.wrapBoundValues(a);
+        g.bindKeys.forEach((T) => {
+          y.push(A[T]);
         });
-        const A = this.withBlockedPropertyAccess(
+        const E = this.withBlockedPropertyAccess(
           () => g.evaluator(...y)
         );
-        return A === void 0 && this.warnBlockedIdentifiers(e), {
-          value: A,
+        return E === void 0 && this.warnBlockedIdentifiers(e), {
+          value: E,
           // `undefined` になる参照は「値が無い」状態であり、未解決参照として扱う。
           // 暗黙のオプショナルチェーンにより、`null` / `undefined` を経由した
           // メンバーアクセスもここへ集約される。
-          unresolvedReference: A === void 0
+          unresolvedReference: E === void 0
         };
       } catch (y) {
         if (o && y instanceof ReferenceError) {
-          const E = this.extractMissingIdentifier(y);
-          if (E !== null && this.canRecoverMissingIdentifier(E, a)) {
-            a[E] = void 0;
+          const A = this.extractMissingIdentifier(y);
+          if (A !== null && this.canRecoverMissingIdentifier(A, a)) {
+            a[A] = void 0;
             continue;
           }
         }
         if (this.warnBlockedIdentifiers(e), y instanceof ReferenceError && u.length > 0) {
-          const E = this.evaluateAsCondition(
+          const A = this.evaluateAsCondition(
             e,
             a,
             u
           );
-          return E !== void 0 ? { value: E, unresolvedReference: !1 } : (this.recordUnresolvedIdentifiers(
+          return A !== void 0 ? { value: A, unresolvedReference: !1 } : (this.recordUnresolvedIdentifiers(
             this.extractUninitializedIdentifiers(y, u),
             e
           ), { value: void 0, unresolvedReference: !0 });
@@ -1581,12 +1581,12 @@ ${t}`;
    */
   static prepareEvaluator(e, t, r = []) {
     const i = Object.keys(t).filter(
-      (A) => !this.FORBIDDEN_BINDING_NAMES.has(A)
+      (E) => !this.FORBIDDEN_BINDING_NAMES.has(E)
     ), n = [], s = [];
-    i.forEach((A) => {
-      this.isUsableBindingKey(A) ? n.push(A) : s.push(A);
+    i.forEach((E) => {
+      this.isUsableBindingKey(E) ? n.push(E) : s.push(E);
     }), n.sort(), this.reportUnusableBindingKeys(s);
-    const a = new Set(n), o = r.filter((A) => !a.has(A)), c = `${e}:${n.join(",")}:${o.join(
+    const a = new Set(n), o = r.filter((E) => !a.has(E)), c = `${e}:${n.join(",")}:${o.join(
       ","
     )}`;
     let u = this.EXPRESSION_CACHE.get(c) || null;
@@ -1598,22 +1598,22 @@ ${t}`;
       };
     const d = this.buildAssignments(n), g = this.buildShadowDeclarations(o), y = this.toGuardedMemberExpression(
       this.toOptionalChainExpression(e)
-    ), E = d ? `"use strict";
+    ), A = d ? `"use strict";
 ${d};
 return (${y});${g}` : `"use strict";
 return (${y});${g}`;
     try {
-      return u = new Function(...n, E), this.EXPRESSION_CACHE.set(c, u), this.compileFailedExpressions.delete(e), {
+      return u = new Function(...n, A), this.EXPRESSION_CACHE.set(c, u), this.compileFailedExpressions.delete(e), {
         bindKeys: n,
         evaluator: u,
         compileFailed: !1
       };
-    } catch (A) {
+    } catch (E) {
       return o.length > 0 ? (m.warn(
         "[Haori]",
         "Failed to shadow undeclared identifier(s): " + o.join(", ") + ". Falling back to evaluation without shadowing.",
         e
-      ), this.prepareEvaluator(e, t, [])) : (m.error("[Haori]", "Failed to compile expression:", e, A), this.compileFailedExpressions.add(e), {
+      ), this.prepareEvaluator(e, t, [])) : (m.error("[Haori]", "Failed to compile expression:", e, E), this.compileFailedExpressions.add(e), {
         bindKeys: n,
         evaluator: null,
         compileFailed: !0
@@ -2316,7 +2316,7 @@ return (${y});${g}`;
   }
 };
 R.MAX_IDENTIFIER_RECOVERY_COUNT = 8, R.BUILTIN_NAMESPACE = "haori", R.BUILTIN_HELPERS = {
-  ...Tt
+  ...Dt
 }, R.BUILTIN_REFERENCE_PATTERN = /(^|[^\w$.])haori(?![\w$])/, R.BUILTIN_DATA_PROPERTY = "data", R.BUILTIN_DATA_REFERENCE_PATTERN = /(^|[^\w$.])haori\s*(\.\s*data(?![\w$])|\[)/, R.IDENTIFIER_NAME_PATTERN = /^[\p{ID_Start}$_][\p{ID_Continue}$\u200C\u200D]*$/u, R.usableBindingKeyCache = /* @__PURE__ */ new Map(), R.loggedUnusableBindingKeys = /* @__PURE__ */ new Set(), R.compileFailedExpressions = /* @__PURE__ */ new Set(), R.forbiddenBindingValueCache = /* @__PURE__ */ new WeakMap(), R.forbiddenBindingValueCacheResetScheduled = !1, R.loggedForbiddenKeySignatures = /* @__PURE__ */ new Set(), R.loggedForbiddenKeyResetScheduled = !1, R.FORBIDDEN_NAMES = [
   // グローバルオブジェクト
   "window",
@@ -2931,7 +2931,7 @@ const ce = class ce {
       return Promise.resolve();
     if (this.parent) {
       const e = this.parent, t = e.skipMutationNodes;
-      return e.holdSkipMutationNode(this.target), K.enqueue(() => {
+      return e.holdSkipMutationNode(this.target), z.enqueue(() => {
         e.skipMutationNodes = !0, this.target.parentNode === e.getTarget() && e.getTarget().removeChild(this.target), this.mounted = !1;
       }).finally(() => {
         e.skipMutationNodes = t, e.releaseSkipMutationNode(this.target);
@@ -2939,7 +2939,7 @@ const ce = class ce {
     } else {
       const e = this.target.parentNode;
       if (e)
-        return K.enqueue(() => {
+        return z.enqueue(() => {
           this.target.parentNode === e && e.removeChild(this.target), this.mounted = !1;
         });
       this.mounted = !1;
@@ -2956,7 +2956,7 @@ const ce = class ce {
       return Promise.resolve();
     if (this.parent) {
       const e = this.parent, t = e.skipMutationNodes;
-      return e.holdSkipMutationNode(this.target), K.enqueue(() => {
+      return e.holdSkipMutationNode(this.target), z.enqueue(() => {
         e.skipMutationNodes = !0, this.target.parentNode !== e.getTarget() && e.getTarget().appendChild(this.target), this.mounted = !0;
       }).finally(() => {
         e.skipMutationNodes = t, e.releaseSkipMutationNode(this.target);
@@ -3635,7 +3635,7 @@ const w = class w extends I {
       return Promise.resolve();
     const i = this.getTarget();
     if (i instanceof HTMLInputElement && i.type === "file")
-      return e === null || e === "" ? (this.value = null, i.value === "" ? Promise.resolve() : K.enqueue(() => {
+      return e === null || e === "" ? (this.value = null, i.value === "" ? Promise.resolve() : z.enqueue(() => {
         i.value = "";
       })) : (m.warn(
         "[Haori]",
@@ -3724,7 +3724,7 @@ const w = class w extends I {
    */
   enqueueValueWrite(e) {
     this.skipChangeValue = !0;
-    const t = K.enqueue(e).finally(() => {
+    const t = z.enqueue(e).finally(() => {
       this.skipChangeValue = !1;
     });
     return this.pendingValueWrite = t, t;
@@ -4460,7 +4460,7 @@ const w = class w extends I {
     const i = this.getTarget(), n = i.hasAttribute(e), s = t !== e && i.hasAttribute(t);
     if (!n && !s)
       return Promise.resolve();
-    const a = K.enqueue(() => {
+    const a = z.enqueue(() => {
       n && i.removeAttribute(e), s && i.removeAttribute(t);
     }).finally(() => {
       this.releaseSelfWritingAttributes(r);
@@ -4495,7 +4495,7 @@ const w = class w extends I {
     if (n) {
       const ye = this.attributeMap.get(e);
       if (ye && (ye.isEvaluate || ye.isForceEvaluation()) && !o.isEvaluate && !o.isForceEvaluation()) {
-        const Te = K.enqueue(() => {
+        const Te = z.enqueue(() => {
         }).finally(() => {
           this.releaseSelfWritingAttributes(s);
         });
@@ -4508,13 +4508,13 @@ const w = class w extends I {
       element: c,
       rawName: e,
       template: r
-    }), d = o.isEvaluate || o.isRawEvaluate, g = e === t && w.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), y = o.isSingleExpression(), E = ue.joinEvaluateResults(u.results), A = u.results.length === 1 ? u.results[0] : E, D = t === "value" && w.resolveDeclaredValueType(c) === "boolean", N = A === !1 && !D, B = !o.isForceEvaluation() && (t !== e ? u.hasUnresolvedReference || A === null || A === void 0 || N : g ? u.hasUnresolvedReference || A === null || A === void 0 || A === !1 : y ? u.hasUnresolvedReference || A === null || A === void 0 || N : d && E === "");
+    }), d = o.isEvaluate || o.isRawEvaluate, g = e === t && w.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), y = o.isSingleExpression(), A = ue.joinEvaluateResults(u.results), E = u.results.length === 1 ? u.results[0] : A, T = t === "value" && w.resolveDeclaredValueType(c) === "boolean", N = E === !1 && !T, B = !o.isForceEvaluation() && (t !== e ? u.hasUnresolvedReference || E === null || E === void 0 || N : g ? u.hasUnresolvedReference || E === null || E === void 0 || E === !1 : y ? u.hasUnresolvedReference || E === null || E === void 0 || N : d && A === "");
     if (B && u.hasUnresolvedReference && w.warnUnresolvedAttribute(
       e,
       t,
       r,
       c
-    ), q.isEnabled() && A === !1 && y) {
+    ), q.isEnabled() && E === !1 && y) {
       const ye = o.getSingleExpression(), Te = ye === null ? null : ie.diagnoseStrictComparison(
         ye,
         this.getBindingData()
@@ -4526,17 +4526,17 @@ const w = class w extends I {
         c
       );
     }
-    const F = o.isForceEvaluation() ? r : y ? A : E, j = i && o.isEvaluate && t === "value" && w.isValuePropertyTarget(c), J = c.getRootNode(), _ = j && w.isUserEditableValue(c) && (c === J.activeElement || this.hasPendingUserEdit()), P = B || F === null || F === !1 && !D ? null : String(F), se = e !== t && c.getAttribute(e) !== r, G = P === null ? c.hasAttribute(t) : c.getAttribute(t) !== P, T = P === null ? "" : P, L = j && !_ && c.value !== T, Y = t === "checked" && c instanceof HTMLInputElement && (c.type === "checkbox" || c.type === "radio"), Q = t === "selected" && c instanceof HTMLOptionElement, de = J.activeElement, oe = de !== null && (Y && c === de || Q && c.closest("select") === de) || (Y || Q) && this.hasPendingCheckableUserEdit(Q), W = P !== null, z = Y && o.isEvaluate && !oe && c.checked !== W, X = Q && o.isEvaluate && !oe && c.selected !== W;
-    if (!se && !G && !L && !z && !X)
+    const F = o.isForceEvaluation() ? r : y ? E : A, j = i && o.isEvaluate && t === "value" && w.isValuePropertyTarget(c), Z = c.getRootNode(), _ = j && w.isUserEditableValue(c) && (c === Z.activeElement || this.hasPendingUserEdit()), P = B || F === null || F === !1 && !T ? null : String(F), se = e !== t && c.getAttribute(e) !== r, Y = P === null ? c.hasAttribute(t) : c.getAttribute(t) !== P, D = P === null ? "" : P, L = j && !_ && c.value !== D, X = t === "checked" && c instanceof HTMLInputElement && (c.type === "checkbox" || c.type === "radio"), Q = t === "selected" && c instanceof HTMLOptionElement, de = Z.activeElement, oe = de !== null && (X && c === de || Q && c.closest("select") === de) || (X || Q) && this.hasPendingCheckableUserEdit(Q), W = P !== null, G = X && o.isEvaluate && !oe && c.checked !== W, J = Q && o.isEvaluate && !oe && c.selected !== W;
+    if (!se && !Y && !L && !G && !J)
       return j && !_ && (this.value = this.normalizeValueForElement(
         c,
-        T
-      ), this.clearUnappliedValueWrite()), (Y || Q) && !oe && this.syncCheckableValueFromDom(Q), Promise.resolve();
-    const Re = K.enqueue(() => {
-      se && c.setAttribute(e, r), P === null ? c.removeAttribute(t) : G && (c.setAttribute(t, P), t === `${l.prefix}bind` && this.recordSelfWrittenBind(P)), t === "style" && this.captureAndHideDisplay(), j && !_ && (this.value = this.normalizeValueForElement(
+        D
+      ), this.clearUnappliedValueWrite()), (X || Q) && !oe && this.syncCheckableValueFromDom(Q), Promise.resolve();
+    const Re = z.enqueue(() => {
+      se && c.setAttribute(e, r), P === null ? c.removeAttribute(t) : Y && (c.setAttribute(t, P), t === `${l.prefix}bind` && this.recordSelfWrittenBind(P)), t === "style" && this.captureAndHideDisplay(), j && !_ && (this.value = this.normalizeValueForElement(
         c,
-        T
-      ), L && (c.value = T), this.recordValueWriteResult(c.value === T)), z && (c.checked = W), X && (c.selected = W), (z || X) && this.syncCheckableValueFromDom(X);
+        D
+      ), L && (c.value = D), this.recordValueWriteResult(c.value === D)), G && (c.checked = W), J && (c.selected = W), (G || J) && this.syncCheckableValueFromDom(J);
     }).finally(() => {
       this.releaseSelfWritingAttributes(s);
     });
@@ -4559,7 +4559,7 @@ const w = class w extends I {
     const t = this.getTarget();
     if (!t.hasAttribute(e))
       return Promise.resolve();
-    const r = K.enqueue(() => {
+    const r = z.enqueue(() => {
       t.removeAttribute(e);
     }).finally(() => {
       this.releaseSelfWritingAttributes([e]);
@@ -4695,7 +4695,7 @@ const w = class w extends I {
     }
     e.setParent(this), e.setMounted(this.mounted);
     const d = this.skipMutationNodes;
-    return this.skipMutationNodes = !0, this.holdSkipMutationNode(e.getTarget()), K.enqueue(() => {
+    return this.skipMutationNodes = !0, this.holdSkipMutationNode(e.getTarget()), z.enqueue(() => {
       this.target.insertBefore(e.getTarget(), u);
     }).finally(() => {
       this.skipMutationNodes = d, this.releaseSkipMutationNode(e.getTarget());
@@ -5036,7 +5036,7 @@ class ne extends I {
   evaluate() {
     return this.contents.isRawEvaluate && this.parent === null ? Promise.reject(
       new Error("Parent fragment is required for raw evaluation")
-    ) : K.enqueue(() => {
+    ) : z.enqueue(() => {
       this.skipMutation = !0;
       let e = this.text;
       this.contents.isRawEvaluate ? e = this.contents.evaluate(this.parent.getBindingData(), {
@@ -5093,7 +5093,7 @@ class We extends I {
    * @return 更新のPromise
    */
   setContent(e) {
-    return this.skipMutation || this.text === e ? Promise.resolve() : (this.text = e, K.enqueue(() => {
+    return this.skipMutation || this.text === e ? Promise.resolve() : (this.text = e, z.enqueue(() => {
       this.skipMutation = !0, this.target.textContent = this.text;
     }).finally(() => {
       this.skipMutation = !1;
@@ -5351,7 +5351,7 @@ const ve = class ve {
    * @return すべてのレンダリングが完了したら解決される Promise
    */
   static waitForRenders() {
-    return K.waitForIdle();
+    return z.waitForIdle();
   }
   /**
    * 通知ダイアログを表示します。
@@ -5360,7 +5360,7 @@ const ve = class ve {
    * @returns 通知が閉じられると解決されるPromise
    */
   static dialog(e) {
-    return K.enqueue(() => {
+    return z.enqueue(() => {
       window.alert(e);
     }, !0);
   }
@@ -5388,7 +5388,7 @@ const ve = class ve {
    * @returns ユーザーがOKをクリックした場合はtrue、キャンセルした場合はfalseが解決されるPromise
    */
   static confirm(e) {
-    return K.enqueue(() => window.confirm(e), !0);
+    return z.enqueue(() => window.confirm(e), !0);
   }
   /**
    * ダイアログを開きます。
@@ -5396,7 +5396,7 @@ const ve = class ve {
    * @param element 開くダイアログのHTML要素
    */
   static openDialog(e) {
-    return K.enqueue(() => {
+    return z.enqueue(() => {
       e instanceof HTMLDialogElement ? (ve.clearMessagesSync(e), e.showModal()) : m.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
@@ -5406,7 +5406,7 @@ const ve = class ve {
    * @param element 閉じるダイアログのHTML要素
    */
   static closeDialog(e) {
-    return K.enqueue(() => {
+    return z.enqueue(() => {
       e instanceof HTMLDialogElement ? e.close() : m.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
@@ -5427,7 +5427,7 @@ const ve = class ve {
    * @param level メッセージのレベル（省略可能）
    */
   static addMessage(e, t, r) {
-    return K.enqueue(() => {
+    return z.enqueue(() => {
       const i = e instanceof HTMLFormElement ? e : e.parentElement ?? e;
       i.setAttribute("data-message", t), r !== void 0 ? i.setAttribute("data-message-level", r) : i.removeAttribute("data-message-level");
     }, !0);
@@ -5435,11 +5435,14 @@ const ve = class ve {
   /**
    * 対象のエレメントおよびその子要素のメッセージをクリアします。
    *
+   * フォーム以外の要素を渡した場合は、{@link addMessage} がその要素について
+   * 付ける親要素の表示も消します。
+   *
    * @param parent メッセージをクリアする親要素
    */
   static clearMessages(e) {
-    return K.enqueue(() => {
-      ve.clearMessagesSync(e);
+    return z.enqueue(() => {
+      !(e instanceof HTMLFormElement) && e.parentElement && (e.parentElement.removeAttribute("data-message"), e.parentElement.removeAttribute("data-message-level")), ve.clearMessagesSync(e);
     }, !0);
   }
   /**
@@ -5479,7 +5482,7 @@ const ve = class ve {
    * @returns 整形済みの現在日時文字列
    */
   static now(e, t) {
-    return rt(e, t);
+    return it(e, t);
   }
   /**
    * 現在日付に日数を加減した日付を指定フォーマットの文字列へ整形します。
@@ -5493,7 +5496,7 @@ const ve = class ve {
    * @returns 整形済みの日付文字列。timeZone が不正な場合は空文字
    */
   static today(e, t, r) {
-    return it(e, t, r);
+    return nt(e, t, r);
   }
   /**
    * 数値を桁区切り・小数桁付きの文字列へ整形します。
@@ -5505,7 +5508,7 @@ const ve = class ve {
    * @returns 整形済み文字列。整形できない場合は空文字
    */
   static number(e, t) {
-    return nt(e, t);
+    return st(e, t);
   }
   /**
    * 整数の配列を生成します（終端は排他）。
@@ -5518,7 +5521,7 @@ const ve = class ve {
    * @returns 整数配列
    */
   static range(e, t, r) {
-    return st(e, t, r);
+    return at(e, t, r);
   }
   /**
    * 番号ページネーション用の表示要素列を生成します。
@@ -5531,7 +5534,7 @@ const ve = class ve {
    * @returns 表示要素の配列
    */
   static pages(e, t, r) {
-    return at(e, t, r);
+    return ot(e, t, r);
   }
   /**
    * `YYYY-MM` 形式の年月文字列に月数を加算します。
@@ -5555,7 +5558,7 @@ const ve = class ve {
    * @returns 年月情報の降順配列。不正な入力は空配列
    */
   static monthRange(e, t) {
-    return ot(e, t);
+    return lt(e, t);
   }
   /**
    * ページレスポンスから表示用サマリーを作ります。
@@ -5567,7 +5570,7 @@ const ve = class ve {
    * @returns 表示サマリー
    */
   static pageSummary(e, t) {
-    return lt(e, t);
+    return ct(e, t);
   }
   /**
    * 配列から `item[key]` が指定値に一致する最初の要素を返します。
@@ -5581,7 +5584,7 @@ const ve = class ve {
    * @returns 一致した最初の要素。無ければ null
    */
   static findBy(e, t, r) {
-    return ct(e, t, r);
+    return ut(e, t, r);
   }
   /**
    * 配列の数値合計を返します。
@@ -5594,7 +5597,7 @@ const ve = class ve {
    * @returns 数値の合計。対象が無ければ 0
    */
   static sum(e, t) {
-    return ut(e, t);
+    return dt(e, t);
   }
   /**
    * 配列から重複を取り除いた新しい配列を返します。
@@ -5607,7 +5610,7 @@ const ve = class ve {
    * @returns 重複排除後の新しい配列。非配列は空配列
    */
   static distinct(e, t) {
-    return ft(e, t);
+    return ht(e, t);
   }
   /**
    * 配列を `item[key]` ごとのグループへ分けて返します。
@@ -5620,7 +5623,7 @@ const ve = class ve {
    * @returns グループ情報の配列。非配列は空配列
    */
   static groupBy(e, t) {
-    return ht(e, t);
+    return pt(e, t);
   }
 };
 ve.enhancers = {
@@ -5645,10 +5648,10 @@ ve.enhancers = {
   }
 };
 let Se = ve;
-const Dt = "入力内容を確認してください", Ft = ["addErrorMessage", "clearMessages"], Ye = "data-haori-group-name";
+const Ft = "入力内容を確認してください", It = ["addErrorMessage", "clearMessages"], Ye = "data-haori-group-name";
 function Xe() {
   const e = globalThis.window?.Haori;
-  return Ft.every(
+  return It.every(
     (r) => typeof e?.[r] == "function"
   ) ? e : Se;
 }
@@ -6236,8 +6239,8 @@ const h = class h {
         const u = h.resolveCollectedValue(e), d = h.isFileInput(e) && Array.isArray(u) ? u : [u];
         Array.isArray(t[String(n)]) ? t[String(n)].push(...d) : t[String(n)] = d;
       } else if (h.isGroupedCheckable(e)) {
-        const u = e.getTarget(), d = u instanceof HTMLInputElement ? u.checked : !0, g = u instanceof HTMLInputElement ? u.value : e.getValue(), y = d ? g : null, E = String(n);
-        y === null ? E in t || (t[E] = null) : t[E] === null || t[E] === void 0 ? t[E] = y : Array.isArray(t[E]) ? t[E].push(y) : t[E] = [t[E], y];
+        const u = e.getTarget(), d = u instanceof HTMLInputElement ? u.checked : !0, g = u instanceof HTMLInputElement ? u.value : e.getValue(), y = d ? g : null, A = String(n);
+        y === null ? A in t || (t[A] = null) : t[A] === null || t[A] === void 0 ? t[A] = y : Array.isArray(t[A]) ? t[A].push(y) : t[A] = [t[A], y];
       } else
         t[String(n)] = h.resolveCollectedValue(e);
       s && m.warn(
@@ -6263,13 +6266,13 @@ const h = class h {
       const u = [], d = [];
       let g = !1;
       for (const y of e.getChildElementFragments()) {
-        const E = {}, A = i === null ? null : /* @__PURE__ */ new Set();
+        const A = {}, E = i === null ? null : /* @__PURE__ */ new Set();
         h.getPartValues(
           y,
-          E,
+          A,
           r,
-          A
-        ), A !== null && h.registerCollectedExcludedKeys(E, A), Object.keys(E).length > 0 ? (g = !0, u.push(E), d.push(y.getListKey())) : r !== null && (u.push({}), d.push(y.getListKey()));
+          E
+        ), E !== null && h.registerCollectedExcludedKeys(A, E), Object.keys(A).length > 0 ? (g = !0, u.push(A), d.push(y.getListKey())) : r !== null && (u.push({}), d.push(y.getListKey()));
       }
       if (r === null) {
         const y = e.getAttribute(`${l.prefix}each-key`);
@@ -6560,8 +6563,8 @@ const h = class h {
         g.hasAttribute(`${l.prefix}form-detach`) && (d = !0), (g.hasAttribute(n) || g.hasAttribute(s)) && (u = g), g = g.parentElement;
       if (d)
         return;
-      const y = u ?? c, E = y.getAttribute(n) || y.getAttribute(s) || y.getAttribute(`${l.prefix}form-name`) || y.getAttribute("name");
-      E && t.add(E);
+      const y = u ?? c, A = y.getAttribute(n) || y.getAttribute(s) || y.getAttribute(`${l.prefix}form-name`) || y.getAttribute("name");
+      A && t.add(A);
     }), t;
   }
   /**
@@ -6624,7 +6627,7 @@ const h = class h {
    */
   static resolveValidityMessage(e) {
     const t = e.getAttribute(`${l.prefix}validity-message`);
-    return typeof t == "string" && t.trim() !== "" ? t : Dt;
+    return typeof t == "string" && t.trim() !== "" ? t : Ft;
   }
   /**
    * 条件属性の値から式を取り出します。
@@ -7375,14 +7378,14 @@ const h = class h {
       return Promise.resolve();
     const c = h.resolveFieldName(e), u = e.getAttribute(`${l.prefix}form-object`), d = e.getAttribute(`${l.prefix}form-list`), g = e.hasAttribute(`${l.prefix}form-list`);
     if (c) {
-      const y = t[String(c)], E = n && h.hasResolvedDeclarativeState(e), A = n && typeof y > "u" && !h.isDeclarativeStateBound(e);
-      let D = y;
-      if (E ? D = void 0 : A && (D = null), h.isFileInput(e))
-        return (D === null || D === "") && o.push(
+      const y = t[String(c)], A = n && h.hasResolvedDeclarativeState(e), E = n && typeof y > "u" && !h.isDeclarativeStateBound(e);
+      let T = y;
+      if (A ? T = void 0 : E && (T = null), h.isFileInput(e))
+        return (T === null || T === "") && o.push(
           h.applyFragmentValue(e, null, i, a)
         ), Promise.all(o).then(() => {
         });
-      if (g && Array.isArray(D) && // チェックボックスグループと複数選択 select は配列そのものを状態として
+      if (g && Array.isArray(T) && // チェックボックスグループと複数選択 select は配列そのものを状態として
       // 解釈する（後続の分岐）。位置で配ると選択状態を決められないため、
       // `data-form-list` を併記していても従来どおりそちらへ渡す。
       !h.isGroupedCheckable(e) && !h.isMultipleSelect(e)) {
@@ -7390,34 +7393,34 @@ const h = class h {
         s.set(N, B + 1), o.push(
           h.applyFragmentValue(
             e,
-            D[B] ?? null,
+            T[B] ?? null,
             i,
             a
           )
         );
-      } else typeof D > "u" || (Array.isArray(D) && h.isGroupedCheckable(e) || Array.isArray(D) && h.isMultipleSelect(e) || typeof D == "string" || typeof D == "number" || typeof D == "boolean" || D === null ? o.push(
+      } else typeof T > "u" || (Array.isArray(T) && h.isGroupedCheckable(e) || Array.isArray(T) && h.isMultipleSelect(e) || typeof T == "string" || typeof T == "number" || typeof T == "boolean" || T === null ? o.push(
         h.applyFragmentValue(
           e,
-          D,
+          T,
           i,
           a
         )
       ) : o.push(
-        h.applyFragmentValue(e, String(D), i, a)
+        h.applyFragmentValue(e, String(T), i, a)
       ));
     } else if (u) {
       const y = t[String(u)];
       if (y && typeof y == "object") {
-        const E = /* @__PURE__ */ new Map();
-        for (const A of e.getChildElementFragments())
+        const A = /* @__PURE__ */ new Map();
+        for (const E of e.getChildElementFragments())
           o.push(
             h.setPartValues(
-              A,
+              E,
               y,
               r,
               i,
               n,
-              E,
+              A,
               a
             )
           );
@@ -7425,13 +7428,13 @@ const h = class h {
     } else if (d) {
       const y = t[String(d)];
       if (Array.isArray(y)) {
-        const E = e.getChildElementFragments(), A = e.getAttribute(`${l.prefix}each-key`), D = h.isCollectedListFromEachSource(e) ? h.pairRowsWithItems(
-          E,
+        const A = e.getChildElementFragments(), E = e.getAttribute(`${l.prefix}each-key`), T = h.isCollectedListFromEachSource(e) ? h.pairRowsWithItems(
+          A,
           y,
-          A == null ? null : String(A)
+          E == null ? null : String(E)
         ) : null;
-        for (let N = 0; N < E.length; N++) {
-          const B = E[N], F = D ? D[N] : y.length > N ? y[N] : null;
+        for (let N = 0; N < A.length; N++) {
+          const B = A[N], F = T ? T[N] : y.length > N ? y[N] : null;
           o.push(
             // 行ごとに values が切り替わるので出現位置も行単位で数える。
             h.setPartValues(
@@ -7484,7 +7487,7 @@ const h = class h {
     h.markResetSubtree(e, t), $.clearUserEditMarks(e, t), h.clearValues(e), await Promise.all([
       h.clearMessages(e),
       h.clearEachClones(e)
-    ]), await K.enqueue(() => {
+    ]), await z.enqueue(() => {
       const n = h.collectEditsAfter(
         e,
         t
@@ -8055,7 +8058,7 @@ class H {
     H.dispatch(e, "pollstop", { reason: t, count: r, elapsedMs: i });
   }
 }
-const It = {
+const Nt = {
   401: "unauthorized-redirect",
   403: "forbidden-redirect"
 };
@@ -8069,7 +8072,7 @@ function kt(b, e) {
     }
   });
 }
-function Nt(b, e) {
+function xt(b, e) {
   const t = b.getAttribute(e);
   if (t === null || t === "")
     return null;
@@ -8078,7 +8081,7 @@ function Nt(b, e) {
   const r = I.get(b), i = r instanceof S ? r.getBindingData() : {}, n = kt(t, i);
   return n === "" ? null : n;
 }
-function xt(b, e, t) {
+function Mt(b, e, t) {
   const r = b.getAttribute(`${e}-return-param`);
   if (r === null || r === "")
     return t;
@@ -8091,17 +8094,17 @@ function xt(b, e, t) {
   const i = window.location.pathname + window.location.search + window.location.hash, s = `${encodeURIComponent(r)}=${encodeURIComponent(i)}`, a = t.indexOf("#"), o = a >= 0 ? t.slice(a) : "", c = a >= 0 ? t.slice(0, a) : t, u = c.includes("?") ? "&" : "?";
   return `${c}${u}${s}${o}`;
 }
-function pt(b) {
-  const e = It[b];
+function gt(b) {
+  const e = Nt[b];
   if (e === void 0 || typeof document > "u")
     return !1;
   const t = `${l.prefix}${e}`, r = [];
   document.body && r.push(document.body), document.documentElement && r.push(document.documentElement);
   for (const i of r) {
-    const n = Nt(i, t);
+    const n = xt(i, t);
     if (n === null)
       continue;
-    const s = xt(i, t, n);
+    const s = Mt(i, t, n);
     try {
       if (new URL(s, window.location.href).href === window.location.href)
         return !1;
@@ -8111,7 +8114,7 @@ function pt(b) {
   }
   return !1;
 }
-class Z {
+class K {
   /**
    * セレクタ属性の値を評価済みの文字列として読み取ります。
    *
@@ -8148,6 +8151,45 @@ class Z {
       ), [];
     }
   }
+  /**
+   * セレクタに一致する要素を、カンマ区切りの各セレクタを書いた順に照会します。
+   *
+   * 仕様「`data-{event}-click`」の「カンマ区切りの各セレクタを書いた順に押します」。
+   * 1 つのセレクタに一致した複数の要素はその中で文書順に並べ、複数のセレクタに
+   * 一致した要素は最初に一致した位置にだけ置きます。
+   *
+   * @param selector CSS セレクタ（カンマ区切りのセレクタリストを含む）
+   * @param attributeName ログ出力に用いる属性名
+   * @returns 一致した要素の配列。セレクタが不正な場合は空配列
+   */
+  static queryAllInListOrder(e, t) {
+    if (K.queryAll(e, t).length === 0)
+      return [];
+    const r = /* @__PURE__ */ new Set();
+    return K.splitList(e).forEach((i) => {
+      K.queryAll(i, t).forEach(
+        (n) => r.add(n)
+      );
+    }), Array.from(r);
+  }
+  /**
+   * セレクタリストを、最上位のカンマで各セレクタに分けます。
+   *
+   * 括弧（`:is(a, b)` など）・属性セレクタの角括弧・引用符の中のカンマと、
+   * バックスラッシュでエスケープしたカンマでは分けません。
+   *
+   * @param selector セレクタリスト
+   * @returns 各セレクタ
+   */
+  static splitList(e) {
+    const t = [];
+    let r = 0, i = null, n = 0;
+    for (let s = 0; s < e.length; s++) {
+      const a = e[s];
+      a === "\\" ? s++ : i !== null ? a === i && (i = null) : a === '"' || a === "'" ? i = a : a === "(" || a === "[" ? r++ : a === ")" || a === "]" ? r-- : a === "," && r === 0 && (t.push(e.slice(n, s)), n = s + 1);
+    }
+    return t.push(e.slice(n)), t;
+  }
   /**
    * セレクタに一致する最初の要素を照会します。
    *
@@ -8594,7 +8636,7 @@ const x = class x {
 };
 x.SIGNATURES = /* @__PURE__ */ new WeakMap(), x.RESTORED_ELEMENTS = /* @__PURE__ */ new WeakSet(), x.WARNED_ELEMENTS = /* @__PURE__ */ new WeakMap(), x.WARNED_KINDS = /* @__PURE__ */ new Set();
 let Fe = x;
-class gt {
+class mt {
   /**
    * URLのクエリパラメータを取得します。
    *
@@ -8640,7 +8682,7 @@ class gt {
     }
   }
 }
-const Mt = [
+const $t = [
   "addErrorMessage",
   "clearMessages",
   "closeDialog",
@@ -8648,12 +8690,12 @@ const Mt = [
   "dialog",
   "openDialog",
   "toast"
-], $t = "__haoriHistoryState__", Oe = "data-haori-click-lock", Je = "ファイルを保存できませんでした", Ct = 100;
+], Ct = "__haoriHistoryState__", Oe = "data-haori-click-lock", Je = "ファイルを保存できませんでした", Pt = 100;
 let De = null;
-const Pt = ["info", "warning", "error", "success"], Lt = /^(\d{3})-(click|click-await|close|toast|toast-level|no-message)$/;
+const Lt = ["info", "warning", "error", "success"], Ze = /^(\d{3})-(click|click-await|close|toast|toast-level|no-message|bind)$/;
 function fe() {
   const e = globalThis.window?.Haori;
-  return Mt.every(
+  return $t.every(
     (r) => typeof e?.[r] == "function"
   ) ? e : Se;
 }
@@ -8678,7 +8720,7 @@ function be(b) {
     }
   return String(b);
 }
-function mt(b, e) {
+function yt(b, e) {
   const t = new URL(b, window.location.href), r = new URLSearchParams(t.search);
   return Bt(r, e), t.search = r.toString(), t.toString();
 }
@@ -8699,12 +8741,12 @@ function Ht(b) {
       return { payload: {}, dropped: !0 };
     }
     return e.includes("=") ? {
-      payload: Ze(new URLSearchParams(e)),
+      payload: Qe(new URLSearchParams(e)),
       dropped: !1
     } : { payload: {}, dropped: !0 };
   }
   if (b instanceof URLSearchParams)
-    return { payload: Ze(b), dropped: !1 };
+    return { payload: Qe(b), dropped: !1 };
   if (typeof FormData < "u" && b instanceof FormData) {
     const e = {};
     let t = !1;
@@ -8713,19 +8755,19 @@ function Ht(b) {
         t = !0;
         continue;
       }
-      yt(e, r, i);
+      bt(e, r, i);
     }
     return { payload: e, dropped: t };
   }
   return { payload: {}, dropped: !0 };
 }
-function Ze(b) {
+function Qe(b) {
   const e = {};
   for (const [t, r] of b.entries())
-    yt(e, t, r);
+    bt(e, t, r);
   return e;
 }
-function yt(b, e, t) {
+function bt(b, e, t) {
   const r = b[e];
   r === void 0 ? b[e] = t : Array.isArray(r) ? r.push(t) : b[e] = [r, t];
 }
@@ -8767,7 +8809,7 @@ function Vt(b, e) {
     t.body
   );
   let s = b;
-  Object.keys(i).length > 0 && (s = mt(s, i)), n && m.warn(
+  Object.keys(i).length > 0 && (s = yt(s, i)), n && m.warn(
     "Haori",
     `The ${r} body cannot be converted into a query string and is dropped by the demo runtime normalization. Send the values with ${l.prefix}{event}-data / ${l.prefix}{event}-form, or use the embedded runtime.`
   ), delete t.body, t.method = "GET";
@@ -8903,9 +8945,9 @@ const p = class p {
    * @returns 対象のフラグメント（見つからない場合は空）
    */
   static resolveSelectorTargets(e, t, r) {
-    const i = Z.read(e, t), n = [];
+    const i = K.read(e, t), n = [];
     if (i)
-      Z.queryAll(i, t).forEach((a) => {
+      (r === "click" || r === "error-click" ? K.queryAllInListOrder(i, t) : K.queryAll(i, t)).forEach((a) => {
         const o = I.get(a);
         o && n.push(o);
       }), n.length === 0 && m.error("Haori", `Element not found: ${i} (${t})`);
@@ -8939,6 +8981,43 @@ const p = class p {
       p.readLateAttribute(e, t, r, i)
     );
   }
+  /**
+   * 非イベントの `data-fetch` と `data-poll-*` で、応答本文の表示を止める宣言
+   * （`-error-status` / `-error-no-message` / `-error-{ステータス}-no-message`）を
+   * 読み取ります。
+   *
+   * 仕様「失敗時のアクション」の「対象の手続き」。ほかの失敗時のアクションは
+   * 読みません。
+   *
+   * @param fragment 対象フラグメント
+   * @param options 読み取った宣言の記録先のオプション
+   * @param event 属性名の接頭辞にするイベント名（非イベントは `fetch`）
+   * @returns 戻り値はありません。
+   */
+  static readNoMessageDeclarations(e, t, r) {
+    const i = p.attrName(r, "error-status");
+    e.hasAttribute(i) && (t.errorStatuses = p.parseErrorStatuses(
+      e.getRawAttribute(i),
+      i
+    )), t.errorNoMessage = e.hasAttribute(
+      p.attrName(r, "error-no-message")
+    );
+    const n = p.attrName(r, "error-"), s = /* @__PURE__ */ new Map();
+    for (const a of e.getAttributeNames()) {
+      const o = a.startsWith(n) ? Ze.exec(a.slice(n.length)) : null;
+      o && o[2] === "no-message" && s.set(Number(o[1]), {
+        key: `error-${o[1]}`,
+        clickFragments: null,
+        clickAwait: !1,
+        closeFragments: null,
+        toastMessage: null,
+        toastLevel: null,
+        noMessage: !0,
+        bind: !1
+      });
+    }
+    t.errorStatusActions = s;
+  }
   /**
    * ステータスごとの失敗時のアクション（`data-{event}-error-{ステータス}-*`）を
    * 読み取ります。
@@ -8957,7 +9036,7 @@ const p = class p {
     for (const a of e.getAttributeNames()) {
       if (!a.startsWith(i))
         continue;
-      const o = Lt.exec(
+      const o = Ze.exec(
         a.slice(i.length)
       );
       o && n.add(o[1]);
@@ -8991,7 +9070,8 @@ const p = class p {
           `${o}-toast-level`,
           c("toast-level")
         ),
-        noMessage: e.hasAttribute(c("no-message"))
+        noMessage: e.hasAttribute(c("no-message")),
+        bind: e.hasAttribute(c("bind"))
       });
     }), s;
   }
@@ -9002,7 +9082,7 @@ const p = class p {
    * @returns レベル。4 つの値のどれとも一致しない場合は null（`info` で表示する）
    */
   static toToastLevel(e) {
-    return Pt.includes(e) ? e : null;
+    return Lt.includes(e) ? e : null;
   }
   /**
    * `data-{event}-error-status` の値を、ステータスの一覧へ変換します。
@@ -9321,8 +9401,8 @@ const p = class p {
       targetFragment: e
     }, i = t ? p.attrName(t, "if") : p.attrName(null, "if", !0);
     if (e.hasAttribute(i)) {
-      const T = e.getRawAttribute(i);
-      typeof T == "string" && T.trim() !== "" ? (r.conditionExpression = k.unwrapConditionExpression(T), r.conditionAttributeName = i) : m.warn(
+      const D = e.getRawAttribute(i);
+      typeof D == "string" && D.trim() !== "" ? (r.conditionExpression = k.unwrapConditionExpression(D), r.conditionAttributeName = i) : m.warn(
         "Haori",
         `${i} に条件式が指定されていません。`
       );
@@ -9333,17 +9413,17 @@ const p = class p {
           e.getAttribute(p.attrName(t, "confirm"))
         )
       )), e.hasAttribute(p.attrName(t, "data")) && (r.dataAttrName = p.attrName(t, "data")), e.hasAttribute(p.attrName(t, "form"))) {
-        const L = Z.read(
+        const L = K.read(
           e,
           p.attrName(t, "form")
         );
         if (L) {
-          const Y = Z.query(
+          const X = K.query(
             L,
             p.attrName(t, "form")
           );
-          Y !== null ? r.formFragment = k.getFormFragment(
-            I.get(Y)
+          X !== null ? r.formFragment = k.getFormFragment(
+            I.get(X)
           ) : m.error(
             "Haori",
             `Form element not found: ${L} (${p.attrName(t, "form")})`
@@ -9364,16 +9444,16 @@ const p = class p {
 ${L}
 `
           );
-        } catch (Y) {
-          m.error("Haori", `Invalid before script: ${Y}`);
+        } catch (X) {
+          m.error("Haori", `Invalid before script: ${X}`);
         }
       }
-      const T = p.attrName(t, "run");
-      if (e.hasAttribute(T)) {
-        const L = String(e.getAttribute(T) ?? "");
-        let Y = null;
+      const D = p.attrName(t, "run");
+      if (e.hasAttribute(D)) {
+        const L = String(e.getAttribute(D) ?? "");
+        let X = null;
         try {
-          Y = new Function(
+          X = new Function(
             "event",
             `"use strict"; return (
 ${L}
@@ -9381,25 +9461,25 @@ ${L}
           );
         } catch {
           try {
-            Y = new Function("event", `"use strict";
+            X = new Function("event", `"use strict";
 ${L}
 `);
           } catch (Q) {
             m.error("Haori", `Invalid run script: ${Q}`);
           }
         }
-        Y && (r.runScript = Y);
+        X && (r.runScript = X);
       }
     }
     const n = p.attrName(t, "fetch"), s = e.hasAttribute(n);
     if (s) {
-      const T = e.getAttributeEvaluation(n);
-      T && (r.fetchHasUnresolvedReference = T.hasUnresolvedReference, r.fetchUrl = T.hasUnresolvedReference ? null : T.value);
+      const D = e.getAttributeEvaluation(n);
+      D && (r.fetchHasUnresolvedReference = D.hasUnresolvedReference, r.fetchUrl = D.hasUnresolvedReference ? null : D.value);
     }
     const a = {}, o = t ? p.attrName(t, "fetch-method") : p.attrName(null, "method", !0);
     if (e.hasAttribute(o)) {
-      const T = e.getAttributeEvaluation(o);
-      T?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : a.method = p.normalizeAttributeText(T?.value) ?? void 0;
+      const D = e.getAttributeEvaluation(o);
+      D?.hasUnresolvedReference ? r.fetchHasUnresolvedReference = !0 : a.method = p.normalizeAttributeText(D?.value) ?? void 0;
     }
     const c = t ? p.attrName(t, "fetch-headers") : p.attrName(null, "headers", !0), u = p.readFetchHeaders(
       e,
@@ -9409,9 +9489,9 @@ ${L}
     const d = t ? p.attrName(t, "fetch-content-type") : p.attrName(null, "content-type", !0);
     let g = null;
     if (e.hasAttribute(d)) {
-      const T = e.getAttributeEvaluation(d);
-      T?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), g = p.normalizeAttributeText(
-        T?.value
+      const D = e.getAttributeEvaluation(d);
+      D?.hasUnresolvedReference && (r.fetchHasUnresolvedReference = !0), g = p.normalizeAttributeText(
+        D?.value
       );
     }
     if (g !== null)
@@ -9420,10 +9500,10 @@ ${L}
         g
       );
     else if (a.method && !p.hasDeclaredContentType(a.headers)) {
-      const T = a.method.toUpperCase();
+      const D = a.method.toUpperCase();
       a.headers = p.withContentType(
         a.headers,
-        T === "GET" || T === "HEAD" || T === "OPTIONS" ? "application/x-www-form-urlencoded" : "application/json"
+        D === "GET" || D === "HEAD" || D === "OPTIONS" ? "application/x-www-form-urlencoded" : "application/json"
       );
     }
     Object.keys(a).length > 0 && (r.fetchOptions = a);
@@ -9435,64 +9515,64 @@ ${L}
       );
     else if (e.hasAttribute(y)) {
       r.download = !0;
-      const T = e.getAttributeEvaluation(y);
-      r.downloadFileName = T?.hasUnresolvedReference ? null : p.normalizeAttributeText(T?.value);
+      const D = e.getAttributeEvaluation(y);
+      r.downloadFileName = D?.hasUnresolvedReference ? null : p.normalizeAttributeText(D?.value);
     }
-    const E = t ? p.attrName(t, "fetch-download-folder") : p.attrName(null, "download-folder", !0);
-    e.hasAttribute(E) && (r.download ? r.downloadFolder = !0 : m.warn(
+    const A = t ? p.attrName(t, "fetch-download-folder") : p.attrName(null, "download-folder", !0);
+    e.hasAttribute(A) && (r.download ? r.downloadFolder = !0 : m.warn(
       "Haori",
-      `${E} は ${y} と併せて指定してください（書き出す応答が無いため、この宣言は無視します）。`
+      `${A} は ${y} と併せて指定してください（書き出す応答が無いため、この宣言は無視します）。`
     ));
-    const A = t ? p.attrName(t, "bind") : p.attrName(null, "bind", !0);
-    if (e.hasAttribute(A)) {
-      const T = Z.read(e, A);
-      if (T) {
-        const L = Z.queryAll(T, A);
-        L.length > 0 ? (r.bindFragments = [], L.forEach((Y) => {
-          const Q = I.get(Y);
+    const E = t ? p.attrName(t, "bind") : p.attrName(null, "bind", !0);
+    if (e.hasAttribute(E)) {
+      const D = K.read(e, E);
+      if (D) {
+        const L = K.queryAll(D, E);
+        L.length > 0 ? (r.bindFragments = [], L.forEach((X) => {
+          const Q = I.get(X);
           Q && r.bindFragments.push(Q);
         })) : m.error(
           "Haori",
-          `Bind element not found: ${T} (${A})`
+          `Bind element not found: ${D} (${E})`
         );
       }
     }
-    const D = p.attrName(t, "bind-arg"), N = p.attrName(null, "arg", !0), B = p.attrName(null, "bind-arg", !0);
-    t ? e.hasAttribute(D) && (r.bindArg = e.getRawAttribute(D)) : e.hasAttribute(N) ? r.bindArg = e.getRawAttribute(
+    const T = p.attrName(t, "bind-arg"), N = p.attrName(null, "arg", !0), B = p.attrName(null, "bind-arg", !0);
+    t ? e.hasAttribute(T) && (r.bindArg = e.getRawAttribute(T)) : e.hasAttribute(N) ? r.bindArg = e.getRawAttribute(
       N
     ) : e.hasAttribute(B) && (r.bindArg = e.getRawAttribute(B));
     const F = t ? p.attrName(t, "bind-params") : p.attrName(null, "bind-params", !0);
     if (e.hasAttribute(F)) {
-      const T = e.getRawAttribute(F);
-      r.bindParams = T.split("&").map((L) => L.trim());
+      const D = e.getRawAttribute(F);
+      r.bindParams = D.split("&").map((L) => L.trim());
     }
     const j = t ? p.attrName(t, "bind-append") : p.attrName(null, "bind-append", !0);
     if (e.hasAttribute(j)) {
-      const T = e.getRawAttribute(j);
-      r.bindAppendParams = T.split("&").map((L) => L.trim()).filter(Boolean);
+      const D = e.getRawAttribute(j);
+      r.bindAppendParams = D.split("&").map((L) => L.trim()).filter(Boolean);
     }
-    const J = t ? p.attrName(t, "bind-merge") : p.attrName(null, "bind-merge", !0);
-    e.hasAttribute(J) && (r.bindMerge = !0);
+    const Z = t ? p.attrName(t, "bind-merge") : p.attrName(null, "bind-merge", !0);
+    e.hasAttribute(Z) && (r.bindMerge = !0);
     const _ = t ? p.attrName(t, "bind-transform") : p.attrName(null, "bind-transform", !0);
     e.hasAttribute(_) && (r.bindTransform = e.getRawAttribute(_));
     const P = t ? p.attrName(t, "copy-params") : null;
     if (P && e.hasAttribute(P)) {
-      const T = e.getRawAttribute(P);
-      r.copyParams = T.split("&").map((L) => L.trim()).filter(Boolean);
+      const D = e.getRawAttribute(P);
+      r.copyParams = D.split("&").map((L) => L.trim()).filter(Boolean);
     }
     if (t) {
       if (e.hasAttribute(p.attrName(t, "adjust"))) {
-        const W = Z.read(
+        const W = K.read(
           e,
           p.attrName(t, "adjust")
         );
         if (W) {
-          const z = Z.queryAll(
+          const G = K.queryAll(
             W,
             p.attrName(t, "adjust")
           );
-          z.length > 0 ? (r.adjustFragments = [], z.forEach((X) => {
-            const Re = I.get(X);
+          G.length > 0 ? (r.adjustFragments = [], G.forEach((J) => {
+            const Re = I.get(J);
             Re && r.adjustFragments.push(Re);
           })) : m.error(
             "Haori",
@@ -9500,10 +9580,10 @@ ${L}
           );
         }
         if (e.hasAttribute(p.attrName(t, "adjust-value"))) {
-          const z = e.getRawAttribute(
+          const G = e.getRawAttribute(
             p.attrName(t, "adjust-value")
-          ), X = Number(z);
-          isNaN(X) || (r.adjustValue = X);
+          ), J = Number(G);
+          isNaN(J) || (r.adjustValue = J);
         }
       }
       if (e.hasAttribute(p.attrName(t, "row-add")) && (r.rowAdd = !0), e.hasAttribute(p.attrName(t, "row-remove")) && (r.rowRemove = !0), e.hasAttribute(p.attrName(t, "row-prev")) && (r.rowMovePrev = !0), e.hasAttribute(p.attrName(t, "row-next")) && (r.rowMoveNext = !0), e.hasAttribute(`${l.prefix}${t}-after-run`)) {
@@ -9518,8 +9598,8 @@ ${L}
 ${W}
 `
           );
-        } catch (z) {
-          m.error("Haori", `Invalid after script: ${z}`);
+        } catch (G) {
+          m.error("Haori", `Invalid after script: ${G}`);
         }
       }
       if (e.hasAttribute(p.attrName(t, "dialog")) && (r.dialogMessage = p.unescapeNewlines(
@@ -9552,26 +9632,28 @@ ${W}
           "error-toast-level",
           p.attrName(t, "error-toast-level")
         ));
-        const z = p.attrName(t, "error-status");
-        e.hasAttribute(z) && (r.errorStatuses = p.parseErrorStatuses(
-          e.getRawAttribute(z),
-          z
+        const G = p.attrName(t, "error-status");
+        e.hasAttribute(G) && (r.errorStatuses = p.parseErrorStatuses(
+          e.getRawAttribute(G),
+          G
         )), r.errorNoMessage = e.hasAttribute(
           p.attrName(t, "error-no-message")
+        ), r.errorBind = e.hasAttribute(
+          p.attrName(t, "error-bind")
         );
       }
-      const T = p.attrName(t, "redirect"), L = p.attrName(t, "redirect-replace"), Y = e.hasAttribute(T), Q = e.hasAttribute(L);
-      if (Y && (r.redirectUrl = p.readLateAttribute(
+      const D = p.attrName(t, "redirect"), L = p.attrName(t, "redirect-replace"), X = e.hasAttribute(D), Q = e.hasAttribute(L);
+      if (X && (r.redirectUrl = p.readLateAttribute(
         e,
         r,
         "redirect",
-        T
+        D
       )), Q && (r.redirectReplaceUrl = p.readLateAttribute(
         e,
         r,
         "redirect-replace",
         L
-      )), Y || Q) {
+      )), X || Q) {
         const W = p.attrName(
           t,
           "redirect-return-param"
@@ -9594,17 +9676,17 @@ ${W}
         "history",
         p.attrName(t, "history")
       )), e.hasAttribute(p.attrName(t, "history-data")) && (r.historyDataAttrName = p.attrName(t, "history-data")), e.hasAttribute(p.attrName(t, "history-form"))) {
-        const W = Z.read(
+        const W = K.read(
           e,
           p.attrName(t, "history-form")
         );
         if (W) {
-          const z = Z.query(
+          const G = K.query(
             W,
             p.attrName(t, "history-form")
           );
-          z !== null ? r.historyFormFragment = k.getFormFragment(
-            I.get(z)
+          G !== null ? r.historyFormFragment = k.getFormFragment(
+            I.get(G)
           ) : m.error(
             "Haori",
             `Form element not found: ${W} (${p.attrName(t, "history-form")})`
@@ -9625,44 +9707,44 @@ ${W}
       ].forEach((W) => {
         if (W.startsWith("error-") && t === "poll")
           return;
-        const z = p.attrName(t, W);
-        if (!e.hasAttribute(z))
+        const G = p.attrName(t, W);
+        if (!e.hasAttribute(G))
           return;
-        const X = p.resolveSelectorTargets(
+        const J = p.resolveSelectorTargets(
           e,
-          z,
+          G,
           W
         );
-        if (X.length > 0)
+        if (J.length > 0)
           switch (W) {
             case "reset-before":
-              r.resetBeforeFragments = X;
+              r.resetBeforeFragments = J;
               break;
             case "reset":
-              r.resetFragments = X;
+              r.resetFragments = J;
               break;
             case "refetch":
-              r.refetchFragments = X;
+              r.refetchFragments = J;
               break;
             case "click":
-              r.clickFragments = X, r.clickAwait = e.hasAttribute(`${z}-await`);
+              r.clickFragments = J, r.clickAwait = e.hasAttribute(`${G}-await`);
               break;
             case "copy":
-              r.copyFragments = X;
+              r.copyFragments = J;
               break;
             case "open":
-              r.openFragments = X;
+              r.openFragments = J;
               break;
             case "close":
-              r.closeFragments = X;
+              r.closeFragments = J;
               break;
             case "error-click":
-              r.errorClickFragments = X, r.errorClickAwait = e.hasAttribute(
-                `${z}-await`
+              r.errorClickFragments = J, r.errorClickAwait = e.hasAttribute(
+                `${G}-await`
               );
               break;
             case "error-close":
-              r.errorCloseFragments = X;
+              r.errorCloseFragments = J;
               break;
           }
       }), t !== "poll" && (r.errorStatusActions = p.readErrorStatusActions(
@@ -9672,12 +9754,12 @@ ${W}
       ));
       const oe = p.attrName(t, "copy-source");
       if (e.hasAttribute(oe)) {
-        const W = Z.read(e, oe);
+        const W = K.read(e, oe);
         if (W) {
-          const z = Z.query(W, oe);
-          if (z !== null) {
-            const X = I.get(z);
-            X ? r.copySourceFragment = X : m.error(
+          const G = K.query(W, oe);
+          if (G !== null) {
+            const J = I.get(G);
+            J ? r.copySourceFragment = J : m.error(
               "Haori",
               `Element is not managed by Haori: ${W} (${oe})`
             );
@@ -9691,51 +9773,52 @@ ${W}
       }
     }
     if (!t && (e.hasAttribute(p.attrName(null, "data", !0)) && (r.dataAttrName = p.attrName(null, "data", !0)), e.hasAttribute(p.attrName(null, "form", !0)))) {
-      const T = Z.read(
+      const D = K.read(
         e,
         p.attrName(null, "form", !0)
       );
-      if (T) {
-        const L = Z.query(
-          T,
+      if (D) {
+        const L = K.query(
+          D,
           p.attrName(null, "form", !0)
         );
         L !== null ? r.formFragment = k.getFormFragment(
           I.get(L)
         ) : m.error(
           "Haori",
-          `Form element not found: ${T} (${p.attrName(null, "fetch-form", !0)})`
+          `Form element not found: ${D} (${p.attrName(null, "fetch-form", !0)})`
         );
       } else
         r.formFragment = k.getFormFragment(e);
     }
+    (!t || t === "poll") && p.readNoMessageDeclarations(e, r, t ?? "fetch");
     const se = t ? p.attrName(t, "fetch-state") : p.attrName(null, "state", !0);
     if (e.hasAttribute(se)) {
-      const T = Z.read(e, se), L = [];
-      T ? (Z.queryAll(T, se).forEach((Q) => {
+      const D = K.read(e, se), L = [];
+      D ? (K.queryAll(D, se).forEach((Q) => {
         const de = I.get(Q);
         de && L.push(de);
       }), L.length === 0 && m.error(
         "Haori",
-        `Element not found: ${T} (${se})`
+        `Element not found: ${D} (${se})`
       )) : L.push(e), L.length > 0 && (r.fetchStateFragments = L);
     }
-    const G = t ? p.attrName(t, "store-clear") : p.attrName(null, "store-clear", !0);
-    if (e.hasAttribute(G)) {
-      const T = e.getRawAttribute(G), L = T === null ? "" : T.trim();
+    const Y = t ? p.attrName(t, "store-clear") : p.attrName(null, "store-clear", !0);
+    if (e.hasAttribute(Y)) {
+      const D = e.getRawAttribute(Y), L = D === null ? "" : D.trim();
       if (L === "")
         m.error(
           "Haori",
-          `ストレージキーが指定されていません (${G})`
+          `ストレージキーが指定されていません (${Y})`
         );
       else {
         r.storeClearKey = L;
-        const Y = e.getRawAttribute(
-          `${G}-type`
-        ), Q = Y === null ? "session" : Y.trim();
+        const X = e.getRawAttribute(
+          `${Y}-type`
+        ), Q = X === null ? "session" : X.trim();
         Q === "local" || Q === "session" ? r.storeClearKind = Q : (m.warn(
           "Haori",
-          `${G}-type は session または local を指定してください（session として扱います）: ${Q}`
+          `${Y}-type は session または local を指定してください（session として扱います）: ${Q}`
         ), r.storeClearKind = "session");
       }
     }
@@ -9890,12 +9973,12 @@ ${W}
       }
       const c = Object.keys(i).length > 0;
       if (n) {
-        const g = (s?.method || "GET").toUpperCase(), E = !a && o && r.transportMode === "query-get" && Ut(s) && !He(g) ? r.baseUrl ?? n : n, A = Vt(
-          E,
+        const g = (s?.method || "GET").toUpperCase(), A = !a && o && r.transportMode === "query-get" && Ut(s) && !He(g) ? r.baseUrl ?? n : n, E = Vt(
+          A,
           s
         );
-        n = A.url;
-        const D = { ...A.options }, N = A.normalized ? A.requestedMethod : r.requestedMethod, B = A.effectiveMethod, F = r.transportMode === "query-get" || A.normalized, j = A.queryString ?? r.queryString;
+        n = E.url;
+        const T = { ...E.options }, N = E.normalized ? E.requestedMethod : r.requestedMethod, B = E.effectiveMethod, F = r.transportMode === "query-get" || E.normalized, j = E.queryString ?? r.queryString;
         if (F && m.info("Haori demo fetch normalization", {
           runtime: l.runtime,
           requestedMethod: N,
@@ -9905,7 +9988,7 @@ ${W}
           payload: c ? i : void 0,
           queryString: j
         }), this.options.targetFragment && n) {
-          const J = performance.now(), _ = {
+          const Z = performance.now(), _ = {
             runtime: l.runtime,
             requestedMethod: N,
             effectiveMethod: B,
@@ -9915,13 +9998,13 @@ ${W}
           return H.fetchStart(
             this.options.targetFragment.getTarget(),
             n,
-            D,
+            T,
             c ? i : void 0,
             _
-          ), await this.injectFetchState("loading"), await p.invokeFetch(n, D).then((P) => this.handleFetchResult(
+          ), await this.injectFetchState("loading"), await p.invokeFetch(n, T).then((P) => this.handleFetchResult(
             P,
             n || void 0,
-            J
+            Z
           )).catch(async (P) => {
             throw n && H.fetchError(
               this.options.targetFragment.getTarget(),
@@ -9934,35 +10017,35 @@ ${W}
             ), await this.runErrorActions(null), P;
           });
         }
-        return await fetch(n, D).then((J) => this.handleFetchResult(J, n || void 0));
+        return await fetch(n, T).then((Z) => this.handleFetchResult(Z, n || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && c) {
-        const g = this.options.formFragment, y = g.getTarget(), E = /* @__PURE__ */ new Set();
-        e && e.appliedDisabledAttribute && this.options.targetFragment && E.add(this.options.targetFragment);
-        const A = g.getRawBindingData(), D = Ue(i), N = g.getAttribute(`${l.prefix}form-arg`);
+        const g = this.options.formFragment, y = g.getTarget(), A = /* @__PURE__ */ new Set();
+        e && e.appliedDisabledAttribute && this.options.targetFragment && A.add(this.options.targetFragment);
+        const E = g.getRawBindingData(), T = Ue(i), N = g.getAttribute(`${l.prefix}form-arg`);
         let B;
         if (N) {
-          B = { ...A ?? {} };
+          B = { ...E ?? {} };
           const F = String(N), j = k.resolveAncestorArgOwner(g, F);
           B[F] = k.mergeCollectedValues(
             (j ? j.value : B[F]) ?? null,
-            D
+            T
           );
         } else
           B = k.mergeCollectedValues(
-            A,
-            D,
+            E,
+            T,
             k.ancestorBaseResolver(g)
           );
         await $.setBindingData(y, B, {
-          skipFragments: E,
+          skipFragments: A,
           kind: "nonSupply",
           sequence: this.operationSequence,
           editedPaths: k.collectEditedPaths(
             g,
             this.operationSequence,
             N ? String(N) : "",
-            D
+            T
           )
         });
       }
@@ -10132,7 +10215,7 @@ ${W}
           break;
         await t(s), this.downloadReceivedBytes += s.byteLength, this.dropTotalBytesIfExceeded();
         const a = Date.now();
-        a - r >= Ct && (r = a, await this.injectFetchState("loading"));
+        a - r >= Pt && (r = a, await this.injectFetchState("loading"));
       }
     } catch (n) {
       return m.error("Haori", `応答をファイルとして読み取れませんでした: ${n}`), !1;
@@ -10287,11 +10370,13 @@ ${W}
    * 表示先は失敗した応答の振り分けと同じ（フォーム、無ければ対象要素、
    * それも無ければ `document.body`）です。
    *
+   * @param display 表示するか。`-error-no-message` で止めた場合は false で、
+   *     前回の表示を消すだけにする
    * @returns 表示の完了 Promise
    */
-  async showDownloadFailure() {
-    const e = this.options.formFragment ?? (this.options.targetFragment ? k.getFormFragment(this.options.targetFragment) || this.options.targetFragment : null), t = e ? e.getTarget() : document.body, r = fe();
-    await r.clearMessages(t), await r.addErrorMessage(t, Je);
+  async showDownloadFailure(e) {
+    const t = this.options.formFragment ?? (this.options.targetFragment ? k.getFormFragment(this.options.targetFragment) || this.options.targetFragment : null), r = t ? t.getTarget() : document.body, i = fe();
+    await i.clearMessages(r), e && await i.addErrorMessage(r, Je);
   }
   /**
    * 保存するファイル名を決めます。
@@ -10376,7 +10461,7 @@ ${W}
   async handleFetchResult(e, t, r) {
     const i = fe();
     if (!e.ok) {
-      if (pt(e.status))
+      if (gt(e.status))
         return !1;
       this.options.targetFragment && t && H.fetchError(
         this.options.targetFragment.getTarget(),
@@ -10385,15 +10470,17 @@ ${W}
         e.status,
         r
       );
-      const E = await this.handleFetchError(
-        e,
-        this.selectErrorActions(e.status)?.noMessage !== !0
+      const A = this.selectErrorActions(e.status), E = A?.bind === !0, T = await this.handleFetchError(
+        E ? e.clone() : e,
+        A?.noMessage !== !0 && !E
       );
-      return await this.injectFetchState(
+      return E && await this.bindResult(e).catch((N) => {
+        m.error("Haori", "Failed to bind the error response:", N);
+      }), await this.injectFetchState(
         "error",
         e.status,
         e.statusText || null,
-        E
+        T
       ), await this.runErrorActions(e.status), !1;
     }
     if (this.options.targetFragment && t && r && H.fetchEnd(
@@ -10402,45 +10489,47 @@ ${W}
       e.status,
       r
     ), this.options.afterCallback) {
-      const E = this.options.afterCallback(e);
-      if (E != null) {
-        if (E === !1 || typeof E == "object" && E.stop)
+      const A = this.options.afterCallback(e);
+      if (A != null) {
+        if (A === !1 || typeof A == "object" && A.stop)
           return !1;
-        typeof E == "object" && "response" in E && (e = "response" in E ? E.response : e);
+        typeof A == "object" && "response" in A && (e = "response" in A ? A.response : e);
       }
     }
     if (this.options.download) {
-      const E = await this.saveResponseAsFile(e, t);
-      if (E === "cancelled")
+      const A = await this.saveResponseAsFile(e, t);
+      if (A === "cancelled")
         return await this.injectFetchState("success", e.status, null), !1;
-      if (E === "failed")
-        return await this.showDownloadFailure(), await this.injectFetchState(
+      if (A === "failed") {
+        const E = this.selectErrorActions(null);
+        return await this.showDownloadFailure(E?.noMessage !== !0), await this.injectFetchState(
           "error",
           e.status,
           Je
-        ), !1;
+        ), await this.runErrorActions(null), !1;
+      }
     }
     const n = [];
     n.push(this.bindResult(e)), n.push(this.adjust()), n.push(this.addRow()), n.push(this.removeRow()), n.push(this.movePrevRow()), n.push(this.moveNextRow()), await Promise.all(n), await this.injectFetchState("success", e.status, null), this.options.resetFragments && this.options.resetFragments.length > 0 && await Promise.all(
       this.options.resetFragments.map(
-        (E) => k.reset(E, this.operationSequence)
+        (A) => k.reset(A, this.operationSequence)
       )
     ), await this.copy();
     const s = [];
-    this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((E) => {
-      s.push(new p(E, null).run());
+    this.options.refetchFragments && this.options.refetchFragments.length > 0 && this.options.refetchFragments.forEach((A) => {
+      s.push(new p(A, null).run());
     });
     const a = await this.clickTargets(
       this.options.clickFragments,
       this.options.clickAwait === !0,
       "click-await"
     );
-    if (!a && this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((E) => {
-      const A = E.getTarget();
-      A instanceof HTMLElement ? s.push(i.openDialog(A)) : m.error("Haori", "Element is not an HTML element: ", A);
-    }), !a && this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((E) => {
-      const A = E.getTarget();
-      A instanceof HTMLElement ? s.push(i.closeDialog(A)) : m.error("Haori", "Element is not an HTML element: ", A);
+    if (!a && this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((A) => {
+      const E = A.getTarget();
+      E instanceof HTMLElement ? s.push(i.openDialog(E)) : m.error("Haori", "Element is not an HTML element: ", E);
+    }), !a && this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((A) => {
+      const E = A.getTarget();
+      E instanceof HTMLElement ? s.push(i.closeDialog(E)) : m.error("Haori", "Element is not an HTML element: ", E);
     }), await Promise.all(s), a)
       return !1;
     const o = p.unescapeNewlines(
@@ -10453,17 +10542,17 @@ ${W}
       this.resolveLateAttribute("toast", this.options.toastMessage)
     );
     if (c) {
-      const E = p.toToastLevel(
+      const A = p.toToastLevel(
         this.resolveLateAttribute("toast-level", this.options.toastLevel)
       );
-      await i.toast(c, E ?? "info");
+      await i.toast(c, A ?? "info");
     }
     this.clearStore(), this.pushHistory();
     const u = this.resolveLateAttribute(
       "scroll",
       this.options.scrollTarget
     );
-    u && Z.query(
+    u && K.query(
       u,
       p.attrName(this.eventType, "scroll"),
       document
@@ -10481,22 +10570,22 @@ ${W}
     );
     const y = g || d;
     if (y) {
-      let E = y;
-      const A = this.resolveLateAttribute(
+      let A = y;
+      const E = this.resolveLateAttribute(
         "redirect-return-param",
         this.options.redirectReturnParam
       );
-      if (A) {
-        const N = new URLSearchParams(window.location.search).get(A);
+      if (E) {
+        const N = new URLSearchParams(window.location.search).get(E);
         if (N !== null) {
           const B = N.trim();
-          gt.isSafeLocalPath(B) ? E = B : m.warn(
+          mt.isSafeLocalPath(B) ? A = B : m.warn(
             "Haori",
             `戻り先パスが安全なローカルパスではないため、既定の遷移先へフォールバックします: ${N}`
           );
         }
       }
-      g ? window.location.replace(E) : window.location.href = E;
+      g ? window.location.replace(A) : window.location.href = A;
     }
     return !0;
   }
@@ -10599,7 +10688,8 @@ ${W}
       closeFragments: this.options.errorCloseFragments ?? null,
       toastMessage: this.options.errorToastMessage ?? null,
       toastLevel: this.options.errorToastLevel ?? null,
-      noMessage: this.options.errorNoMessage === !0
+      noMessage: this.options.errorNoMessage === !0,
+      bind: this.options.errorBind === !0
     } : null);
   }
   /**
@@ -10659,7 +10749,7 @@ ${W}
             g != null && (Array.isArray(g) ? (o.searchParams.delete(d), g.forEach((y) => o.searchParams.append(d, String(y)))) : typeof g == "object" ? o.searchParams.set(d, JSON.stringify(g)) : o.searchParams.set(d, String(g)));
         };
         n && c(r), s && c(i), history.pushState(
-          { [$t]: !0 },
+          { [Ct]: !0 },
           "",
           o.toString()
         ), $.refreshUrlParams();
@@ -10705,9 +10795,9 @@ ${W}
         const u = await e.json(), d = [];
         if (Array.isArray(u)) {
           const g = /* @__PURE__ */ new Map(), y = [];
-          for (const E of u)
-            if (E && typeof E == "object" && !Array.isArray(E)) {
-              const A = E.key, D = E.message, N = typeof A == "string" && A.length > 0 ? A : null, B = typeof D == "string" ? D : D != null ? String(D) : "";
+          for (const A of u)
+            if (A && typeof A == "object" && !Array.isArray(A)) {
+              const E = A.key, T = A.message, N = typeof E == "string" && E.length > 0 ? E : null, B = typeof T == "string" ? T : T != null ? String(T) : "";
               if (B.length === 0)
                 continue;
               if (N !== null) {
@@ -10715,12 +10805,12 @@ ${W}
                 F.push(B), g.set(N, F);
               } else
                 y.push(B);
-            } else typeof E == "string" && E.length > 0 && y.push(E);
-          for (const [E, A] of g)
-            d.push({ key: E, message: A.join(`
+            } else typeof A == "string" && A.length > 0 && y.push(A);
+          for (const [A, E] of g)
+            d.push({ key: A, message: E.join(`
 `) });
-          for (const E of y)
-            d.push({ message: E });
+          for (const A of y)
+            d.push({ message: A });
         } else if (u && typeof u == "object") {
           if (typeof u.message == "string" && d.push({ message: u.message }), Array.isArray(u.messages))
             for (const g of u.messages)
@@ -10946,17 +11036,17 @@ ${W}
               attributeName: s,
               syncWhenUnchanged: "reflect",
               apply: (y) => {
-                const E = this.resolveCurrentRowItem(o, y), A = { ...E };
+                const A = this.resolveCurrentRowItem(o, y), E = { ...A };
                 if (i && typeof i == "object" && !Array.isArray(i)) {
-                  const D = E[g], N = D !== null && typeof D == "object" && !Array.isArray(D) ? D : {};
-                  A[g] = this.mergeAppendBindingData(
+                  const T = A[g], N = T !== null && typeof T == "object" && !Array.isArray(T) ? T : {};
+                  E[g] = this.mergeAppendBindingData(
                     o,
                     i,
                     N
                   );
                 } else
-                  A[g] = i;
-                return this.reconcileRowUserEdits(o, A);
+                  E[g] = i;
+                return this.reconcileRowUserEdits(o, E);
               }
             });
             return;
@@ -11015,12 +11105,12 @@ ${W}
               attributeName: s,
               syncWhenUnchanged: "reflect",
               apply: (g) => {
-                const y = this.options.bindMerge ? this.resolveCurrentRowItem(o, g) : g, E = this.mergeAppendBindingData(
+                const y = this.options.bindMerge ? this.resolveCurrentRowItem(o, g) : g, A = this.mergeAppendBindingData(
                   o,
                   i,
                   y
-                ), A = this.options.bindMerge ? { ...y, ...E } : E;
-                return this.reconcileRowUserEdits(o, A);
+                ), E = this.options.bindMerge ? { ...y, ...A } : A;
+                return this.reconcileRowUserEdits(o, E);
               }
             });
             return;
@@ -11339,21 +11429,21 @@ ${W}
       );
     }
     if (c === "GET" || c === "HEAD" || c === "OPTIONS")
-      Object.keys(t).length > 0 && (i = mt(i, t));
+      Object.keys(t).length > 0 && (i = yt(i, t));
     else if (Object.keys(t).length > 0) {
       const d = s.get("Content-Type") || "";
       if (/multipart\/form-data/i.test(d)) {
         s.delete("Content-Type");
         const g = new FormData();
-        for (const [y, E] of Object.entries(t))
-          E == null ? g.append(y, "") : E instanceof Blob ? g.append(y, E) : Array.isArray(E) ? E.forEach((A) => {
-            A instanceof Blob ? g.append(y, A) : g.append(y, be(A));
-          }) : g.append(y, be(E));
+        for (const [y, A] of Object.entries(t))
+          A == null ? g.append(y, "") : A instanceof Blob ? g.append(y, A) : Array.isArray(A) ? A.forEach((E) => {
+            E instanceof Blob ? g.append(y, E) : g.append(y, be(E));
+          }) : g.append(y, be(A));
         n.body = g;
       } else if (/application\/x-www-form-urlencoded/i.test(d)) {
         const g = new URLSearchParams();
-        for (const [y, E] of Object.entries(t))
-          E !== void 0 && (Array.isArray(E) ? E.forEach((A) => g.append(y, be(A))) : g.append(y, be(E)));
+        for (const [y, A] of Object.entries(t))
+          A !== void 0 && (Array.isArray(A) ? A.forEach((E) => g.append(y, be(E))) : g.append(y, be(A)));
         n.body = g;
       } else
         s.set("Content-Type", "application/json"), n.body = JSON.stringify(t);
@@ -11471,9 +11561,9 @@ ${W}
     const t = this.options.targetFragment;
     if (!t)
       return m.error("Haori", "Target fragment is not specified for row operation."), null;
-    const r = p.attrName(this.eventType, e), i = Z.read(t, r);
+    const r = p.attrName(this.eventType, e), i = K.read(t, r);
     if (i !== null && i.trim() !== "") {
-      const s = Z.query(i, r, document);
+      const s = K.query(i, r, document);
       if (s === null)
         return m.error(
           "Haori",
@@ -11515,7 +11605,7 @@ ${W}
         `Row container has no ${l.prefix}each expression.`
       ), null;
     const i = e.getRawAttribute(`${l.prefix}each-array`), n = i !== null, s = n ? `${l.prefix}each-array` : `${l.prefix}each`, a = n ? i : r, o = a.trim().split(".");
-    if (!(o.length > 0 && o.every((A) => /^[A-Za-z_$][\w$]*$/.test(A))))
+    if (!(o.length > 0 && o.every((E) => /^[A-Za-z_$][\w$]*$/.test(E))))
       return t || m.error(
         "Haori",
         `Row operations require a plain identifier path for ${s} (got: ${a}).` + (n ? "" : ` Declare ${l.prefix}each-array to specify the array to write back to.`)
@@ -11533,9 +11623,9 @@ ${W}
       d = u.owner, g = u.ownerData, y = [...u.path, ...o.slice(1)];
     else {
       for (d = e, g = null; d; ) {
-        const A = d.getRawBindingData();
-        if (A && o[0] in A && !p.isRowScopeKey(d, o[0])) {
-          g = A;
+        const E = d.getRawBindingData();
+        if (E && o[0] in E && !p.isRowScopeKey(d, o[0])) {
+          g = E;
           break;
         }
         d = d.getParent();
@@ -11547,8 +11637,8 @@ ${W}
         "Haori",
         `Binding data owner not found for ${s}="${a}".`
       ), null;
-    const E = p.readPathValue(g, y);
-    return Array.isArray(E) ? { owner: d, ownerData: g, array: E, path: y, mapped: n } : (t || m.error(
+    const A = p.readPathValue(g, y);
+    return Array.isArray(A) ? { owner: d, ownerData: g, array: A, path: y, mapped: n } : (t || m.error(
       "Haori",
       `${s}="${a}" does not resolve to an array.`
     ), null);
@@ -11976,19 +12066,19 @@ ${W}
       return Promise.resolve();
     const g = /* @__PURE__ */ new Map();
     return a.forEach((y) => {
-      const E = y.getListKey();
-      E !== null && !g.has(String(E)) && g.set(String(E), y);
-    }), d.forEach((y, E) => {
-      if (p.isSameRowItem(i.array[E], y))
+      const A = y.getListKey();
+      A !== null && !g.has(String(A)) && g.set(String(A), y);
+    }), d.forEach((y, A) => {
+      if (p.isSameRowItem(i.array[A], y))
         return;
-      const A = g.get(
+      const E = g.get(
         $.createListKey(
           y,
           null,
-          E
+          A
         )
       );
-      A && $.clearUserEditMarks(A);
+      E && $.clearUserEditMarks(E);
     }), $.setBindingData(
       i.owner.getTarget(),
       p.withPathValue(i.ownerData, i.path, d),
@@ -12068,7 +12158,7 @@ class Kt {
       throw m.error("[Haori]", "Failed to fetch import source:", e, n), new Error(`Failed to fetch: ${e}`);
     }
     if (!r.ok) {
-      pt(r.status);
+      gt(r.status);
       const n = `${r.status} ${r.statusText}`;
       throw m.error("[Haori]", "Import HTTP error:", e, n), new Error(`Failed to load ${e}: ${n}`);
     }
@@ -12255,24 +12345,24 @@ const f = class f {
    * @returns 実行完了の Promise
    */
   static executeManagedFetch(e, t = !1) {
-    const r = e.getTarget(), i = f.initialValueRestore;
-    if (!t && i !== null && e.hasAttribute(`${l.prefix}fetch-form`))
-      return i.then(() => f.executeManagedFetch(e, !0)).catch((o) => {
-        m.error("Haori", `初期表示の取得に失敗しました: ${o}`);
+    const r = e.getTarget();
+    if (!t && f.initialValueRestores.size > 0 && e.hasAttribute(`${l.prefix}fetch-form`))
+      return Promise.all(f.initialValueRestores).then(() => f.executeManagedFetch(e, !0)).catch((a) => {
+        m.error("Haori", `初期表示の取得に失敗しました: ${a}`);
       }), Promise.resolve();
-    const n = f.getReactiveFetchState(r), s = ae.resolveAutoFetchSignature(e);
-    if (n.running)
-      return (s.hasUnresolvedReference || s.signature !== n.lastSignature) && (n.rerunRequested = !0), Promise.resolve();
-    if (s.hasUnresolvedReference || s.signature === null)
-      return n.lastSignature = null, Promise.resolve();
-    if (n.lastSignature === s.signature)
+    const i = f.getReactiveFetchState(r), n = ae.resolveAutoFetchSignature(e);
+    if (i.running)
+      return (n.hasUnresolvedReference || n.signature !== i.lastSignature) && (i.rerunRequested = !0), Promise.resolve();
+    if (n.hasUnresolvedReference || n.signature === null)
+      return i.lastSignature = null, Promise.resolve();
+    if (i.lastSignature === n.signature)
       return Promise.resolve();
-    n.lastSignature = s.signature, n.running = !0;
-    const a = new ae(e, null);
-    return a.markReentrantBind(), a.runWithResult().then(() => {
+    i.lastSignature = n.signature, i.running = !0;
+    const s = new ae(e, null);
+    return s.markReentrantBind(), s.runWithResult().then(() => {
     }).finally(() => {
-      if (n.running = !1, n.rerunRequested)
-        return n.rerunRequested = !1, f.executeManagedFetch(e);
+      if (i.running = !1, i.rerunRequested)
+        return i.rerunRequested = !1, f.executeManagedFetch(e);
     });
   }
   /**
@@ -12295,7 +12385,7 @@ const f = class f {
     const s = performance.now();
     return t.setAttribute(`${l.prefix}importing`, ""), H.importStart(t, n), Kt.load(n).then((a) => {
       const o = new TextEncoder().encode(a).length;
-      return K.enqueue(() => {
+      return z.enqueue(() => {
         t.innerHTML = a;
       }).then(() => {
         t.removeAttribute(`${l.prefix}importing`), H.importEnd(t, n, o, s), f.adoptImportedChildren(e);
@@ -12359,9 +12449,9 @@ const f = class f {
       return Promise.resolve();
     const i = f.initializeElementFragment(r, !1).then(
       () => k.restoreInitialValues(e)
-    ), n = f.initialValueRestore;
-    return f.initialValueRestore = i, i.then(() => {
-      f.initialValueRestore = n, t && te.applySubtree(e);
+    );
+    return f.initialValueRestores.add(i), i.then(() => {
+      f.initialValueRestores.delete(i), t && te.applySubtree(e);
     });
   }
   /**
@@ -12572,21 +12662,21 @@ const f = class f {
         return r !== null && k.applyCustomValidity(s), Promise.all(o).then(() => {
         });
       case `${l.prefix}url-param`: {
-        const g = s.getAttribute(`${l.prefix}url-arg`), y = gt.readParams();
+        const g = s.getAttribute(`${l.prefix}url-arg`), y = mt.readParams();
         g === null && s.hasAttribute(`${l.prefix}store`) && m.warn(
           "Haori",
           `${l.prefix}url-param を ${l.prefix}url-arg なしで ${l.prefix}store と併用すると復元した値が消えます（${l.prefix}url-arg を指定してください）。`
         );
-        const E = {
+        const A = {
           reentrant: !0,
           kind: "nonSupply",
           sequence: S.nextSequence()
         };
         if (g === null)
-          o.push(f.setBindingData(e, y, E));
+          o.push(f.setBindingData(e, y, A));
         else {
-          const A = s.getRawBindingData() || {};
-          A[String(g)] = y, o.push(f.setBindingData(e, A, E));
+          const E = s.getRawBindingData() || {};
+          E[String(g)] = y, o.push(f.setBindingData(e, E, A));
         }
         break;
       }
@@ -12637,19 +12727,19 @@ const f = class f {
     d && i.markSupplyApplied(c);
     const g = S.currentSequence(), y = i.getRawBindingData();
     d && (r.clearUserEdits ?? !0) && f.clearUserEditMarks(i, c);
-    const E = a ? f.resolveByPathAuthority(i, y, t, u) : t;
-    i.setBindingData(E), a && (H.bindChange(e, y, E, "manual"), Fe.mirror(i));
-    const A = () => {
+    const A = a ? f.resolveByPathAuthority(i, y, t, u) : t;
+    i.setBindingData(A), a && (H.bindChange(e, y, A, "manual"), Fe.mirror(i));
+    const E = () => {
       i.markBindingWorkStart();
-      const D = i.getRawBindingData() ?? E;
+      const T = i.getRawBindingData() ?? A;
       let N = a ? i.setAttribute(
         `${l.prefix}bind`,
-        JSON.stringify(f.withoutReservedBindingKeys(D))
+        JSON.stringify(f.withoutReservedBindingKeys(T))
       ) : Promise.resolve();
       return e.tagName === "FORM" && (N = N.then(() => {
         if (i.wasResetAfter(g))
           return;
-        const B = i.getRawBindingData() ?? E;
+        const B = i.getRawBindingData() ?? A;
         return k.syncValues(
           i,
           k.resolveSyncValues(i, B),
@@ -12669,7 +12759,7 @@ const f = class f {
         }
       );
     };
-    return s ? A() : i.enqueueBindingWork(A);
+    return s ? E() : i.enqueueBindingWork(E);
   }
   /**
    * 宣言データとして外へ出すデータから予約キーを取り除きます。
@@ -12728,36 +12818,36 @@ const f = class f {
     if (f.isPlainRecord(t) && f.isPlainRecord(r)) {
       const u = t, d = r, g = {};
       let y = Object.keys(u).some(
-        (A) => !Object.prototype.hasOwnProperty.call(d, A)
+        (E) => !Object.prototype.hasOwnProperty.call(d, E)
       );
-      const E = /* @__PURE__ */ new Set([
+      const A = /* @__PURE__ */ new Set([
         ...Object.keys(u),
         ...Object.keys(d)
       ]);
-      for (const A of E) {
-        const D = n === "" ? A : `${n}.${A}`, N = f.mergePathAuthority(
+      for (const E of A) {
+        const T = n === "" ? E : `${n}.${E}`, N = f.mergePathAuthority(
           e,
-          Object.prototype.hasOwnProperty.call(u, A) ? u[A] : f.ABSENT_PATH,
-          Object.prototype.hasOwnProperty.call(d, A) ? d[A] : f.ABSENT_PATH,
+          Object.prototype.hasOwnProperty.call(u, E) ? u[E] : f.ABSENT_PATH,
+          Object.prototype.hasOwnProperty.call(d, E) ? d[E] : f.ABSENT_PATH,
           i,
-          D
+          T
         );
-        N !== f.ABSENT_PATH && (g[A] = N), N !== (Object.prototype.hasOwnProperty.call(d, A) ? d[A] : f.ABSENT_PATH) && (y = !0);
+        N !== f.ABSENT_PATH && (g[E] = N), N !== (Object.prototype.hasOwnProperty.call(d, E) ? d[E] : f.ABSENT_PATH) && (y = !0);
       }
       return y ? g : d;
     }
     const s = f.resolveArrayPairing(e, t, r, n);
     if (s !== null) {
       const u = t, d = r, g = d.map(
-        (y, E) => f.mergePathAuthority(
+        (y, A) => f.mergePathAuthority(
           e,
-          u[E],
+          u[A],
           y,
           i,
-          `${n}[${s[E]}]`
+          `${n}[${s[A]}]`
         )
       );
-      return g.some((y, E) => y !== d[E]) ? g : d;
+      return g.some((y, A) => y !== d[A]) ? g : d;
     }
     if (f.isSameBindingValue(t, r))
       return r;
@@ -13099,29 +13189,29 @@ const f = class f {
     const i = e.hasAttribute(`${l.prefix}derive`), n = e.hasAttribute(`${l.prefix}if`), s = e.hasAttribute(`${l.prefix}each`), a = e.getRawAttribute(`${l.prefix}derive`), o = e.getRawAttribute(`${l.prefix}derive-name`);
     let c = !1, u = !1, d = null;
     if (!i && e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), !i && e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), i) {
-      const E = f.createDeriveInputSignature(
+      const A = f.createDeriveInputSignature(
         e,
         a,
         o
       );
-      E === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
+      A === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
         () => f.evaluateDerive(e, a, o).then(
           () => {
           }
         )
-      )) : e.getDeriveInputSignature() !== E && (r = r.then(() => f.evaluateDerive(
+      )) : e.getDeriveInputSignature() !== A && (r = r.then(() => f.evaluateDerive(
         e,
         a,
         o
       ).then(() => {
-        e.setDeriveInputSignature(E);
+        e.setDeriveInputSignature(A);
       })));
     }
     let g = !1, y = 0;
     return n && (r = r.then(() => {
-      const E = e.isVisible();
+      const A = e.isVisible();
       return y = S.currentSequence(), f.evaluateIf(e).then(() => {
-        g = !E && e.isVisible();
+        g = !A && e.isVisible();
       });
     })), s ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => f.evaluateEachFixedChildren(e)).then(() => f.evaluateEach(e)).then(() => {
       if (g)
@@ -13142,14 +13232,14 @@ const f = class f {
     })), r.then(() => {
       if (c)
         return;
-      const E = [];
-      return e.getChildren().forEach((A) => {
-        if (A instanceof S) {
-          if (f.canSkipUnchangedNestedEach(A))
+      const A = [];
+      return e.getChildren().forEach((E) => {
+        if (E instanceof S) {
+          if (f.canSkipUnchangedNestedEach(E))
             return;
-          E.push(f.evaluateAll(A, t));
-        } else A instanceof ne && E.push(f.evaluateText(A));
-      }), Promise.all(E).then(() => {
+          A.push(f.evaluateAll(E, t));
+        } else E instanceof ne && A.push(f.evaluateText(E));
+      }), Promise.all(A).then(() => {
       });
     }).then(() => {
       u && d !== null && e.setDeriveSubtreeSignature(d);
@@ -14059,60 +14149,60 @@ ${r}
     );
     const g = d.map((F) => F.getListKey()), y = /* @__PURE__ */ new Set();
     d = d.filter((F, j) => {
-      const J = String(F.getListKey()), _ = c.get(J) ?? 0;
+      const Z = String(F.getListKey()), _ = c.get(Z) ?? 0;
       if (_ === 0) {
         y.add(F);
         const P = F.getListKey();
         return P !== null && H.rowRemove(F.getTarget(), P, j), u.push(F.remove()), !1;
       }
-      return c.set(J, _ - 1), !0;
+      return c.set(Z, _ - 1), !0;
     });
-    const E = d.map((F) => F.getListKey()), A = /* @__PURE__ */ new Map();
+    const A = d.map((F) => F.getListKey()), E = /* @__PURE__ */ new Map();
     d.forEach((F) => {
       const j = F.getListKey();
       if (j === null)
         return;
-      const J = A.get(j);
-      J ? J.push(F) : A.set(j, [F]);
+      const Z = E.get(j);
+      Z ? Z.push(F) : E.set(j, [F]);
     });
-    const D = e.getChildElementFragments().filter((F) => !y.has(F)), N = D.filter(
+    const T = e.getChildElementFragments().filter((F) => !y.has(F)), N = T.filter(
       (F) => F.hasAttribute(`${l.prefix}each-before`)
     ).length;
     let B = Promise.resolve();
     return a.forEach((F, j) => {
-      const J = t[j], _ = j;
+      const Z = t[j], _ = j;
       let P;
-      const se = A.get(F)?.shift();
+      const se = E.get(F)?.shift();
       if (se) {
         P = se;
-        const G = N + j;
+        const Y = N + j;
         B = B.then(
           () => f.updateRowFragment(
             P,
-            J,
+            Z,
             i,
             _,
             s ? String(s) : null,
             F
           ).then(
-            (T) => (
+            (D) => (
               // 再利用行も新しい並び順の位置へ移動する。移動しないと、配列を並べ替え
               // ただけの更新（data-each-key 指定時はキーが変わらないため全行が再利用
               // される）で DOM の順序が古いまま残る。
               f.repositionEachRow(
                 e,
                 P,
-                D,
-                G
+                T,
+                Y
               ).then((L) => {
                 if (L !== null && H.rowMove(
                   P.getTarget(),
                   F,
                   L - N,
                   j
-                ), !(!T && f.isRowLocalEachTemplate(e)))
+                ), !(!D && f.isRowLocalEachTemplate(e)))
                   return f.evaluateAll(P).then(
-                    () => f.applyRowFormValues(e, P, J)
+                    () => f.applyRowFormValues(e, P, Z)
                   );
               })
             )
@@ -14120,34 +14210,34 @@ ${r}
         );
       } else {
         P = r.clone();
-        const G = N + j;
+        const Y = N + j;
         B = B.then(
           () => f.updateRowFragment(
             P,
-            J,
+            Z,
             i,
             _,
             s ? String(s) : null,
             F
           ).then(() => {
-            const T = D[G] ?? null;
-            return e.insertBefore(P, T).then(() => {
-              D.splice(G, 0, P);
-            }).then(() => f.initializeFreshEachRow(P)).then(() => f.applyRowFormValues(e, P, J)).then(() => {
-              H.rowAdd(P.getTarget(), F, _, J);
+            const D = T[Y] ?? null;
+            return e.insertBefore(P, D).then(() => {
+              T.splice(Y, 0, P);
+            }).then(() => f.initializeFreshEachRow(P)).then(() => f.applyRowFormValues(e, P, Z)).then(() => {
+              H.rowAdd(P.getTarget(), F, _, Z);
             });
           })
         );
       }
     }), Promise.all(u).then(() => B).then(() => {
       const F = a.filter(
-        (G) => G !== null
-      ), j = E.filter(
-        (G) => G !== null
-      ), J = new Set(j), _ = F.filter((G) => !J.has(G)), se = g.filter(
-        (G) => G !== null
+        (Y) => Y !== null
+      ), j = A.filter(
+        (Y) => Y !== null
+      ), Z = new Set(j), _ = F.filter((Y) => !Z.has(Y)), se = g.filter(
+        (Y) => Y !== null
       ).filter(
-        (G) => !o.has(G)
+        (Y) => !o.has(Y)
       );
       H.eachUpdate(
         e.getTarget(),
@@ -14410,7 +14500,7 @@ f.ATTRIBUTE_ALIAS_SUFFIX = "attr-", f.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "derive",
   "if",
   "each"
-], f.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], f.initialValueRestore = null, f.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
+], f.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], f.initialValueRestores = /* @__PURE__ */ new Set(), f.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
   "bind",
   "derive",
   "derive-name",
@@ -14603,11 +14693,31 @@ const we = class we {
       if (i.getAttribute(this.onAttributeName) !== e)
         return;
       const n = I.get(i);
-      n instanceof S && new ae(n, "on", t).run().catch((s) => {
+      n instanceof S && this.isFromTarget(n, t) && new ae(n, "on", t).run().catch((s) => {
         m.error("[Haori]", "Procedure execution error:", s);
       });
     });
   }
+  /**
+   * イベントが `data-on-target` で指定した要素（とその子孫）から発火したかを
+   * 判定します。
+   *
+   * 仕様「カスタムイベント `data-on`」の「`data-on-target`」。宣言が無い場合は
+   * 発火元で絞り込みません。
+   *
+   * @param fragment `data-on` を宣言したフラグメント
+   * @param event 発火したイベント
+   * @returns 手続きを実行する場合は true
+   */
+  isFromTarget(e, t) {
+    const r = `${this.onAttributeName}-target`;
+    if (!e.hasAttribute(r))
+      return !0;
+    const i = K.read(e, r), n = t.target;
+    return i === null || !(n instanceof Node) ? !1 : K.queryAll(i, r).some(
+      (s) => s.contains(n)
+    );
+  }
   /**
    * `data-import` 等で後から挿入される `data-on` 宣言を購読対象へ追加するため、
    * DOM の追加を監視します。
@@ -14972,7 +15082,7 @@ const V = class V {
     const r = e.getAttribute(t);
     if (typeof r != "string" || r.trim() === "")
       return null;
-    const i = Z.query(r, t, document);
+    const i = K.query(r, t, document);
     return V.isHtmlElement(i) ? i : (m.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(e) {
@@ -15000,7 +15110,7 @@ V.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "disabled",
   "once"
 ]), V.registrations = /* @__PURE__ */ new Map();
-let Ee = V;
+let Ae = V;
 const v = class v {
   /**
    * 指定ノードとその子孫を走査し、`data-poll-*` の監視状態を同期します。
@@ -15368,7 +15478,7 @@ const v = class v {
     const i = r.getAttribute(t);
     if (typeof i != "string" || i.trim() === "")
       return r.getTarget().isConnected ? [r] : [];
-    const n = Z.queryAll(
+    const n = K.queryAll(
       i,
       t,
       document
@@ -15527,8 +15637,8 @@ v.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "disabled",
   "state"
 ]), v.DEFAULT_INTERVAL_MS = 5e3, v.MIN_INTERVAL_MS = 100, v.registrations = /* @__PURE__ */ new Map(), v.visibilityListener = null;
-let Ae = v;
-const zt = "0.57.1";
+let Ee = v;
+const zt = "0.59.0";
 function Gt(b) {
   typeof requestAnimationFrame == "function" ? requestAnimationFrame(() => b()) : Promise.resolve().then(b);
 }
@@ -15667,7 +15777,7 @@ const O = class O {
     const r = e.getAttribute(t);
     if (typeof r != "string" || r.trim() === "")
       return null;
-    const i = Z.query(r, t, document);
+    const i = K.query(r, t, document);
     return O.isHtmlElement(i) ? i : (m.error("[Haori]", `Visible range root element not found: ${r}`), null);
   }
   /**
@@ -15843,7 +15953,7 @@ const U = class U {
         "[Haori]",
         "Failed to build body fragment:",
         i.reason
-      ), await U.waitInitialIntakes(), await K.wait(), document.body.setAttribute("data-haori-ready", ""), U.observe(document.head), U.observe(document.body), Ee.syncTree(document.body), Ae.syncTree(document.body), ge.syncTree(document.body);
+      ), await U.waitInitialIntakes(), await z.wait(), document.body.setAttribute("data-haori-ready", ""), U.observe(document.head), U.observe(document.body), Ae.syncTree(document.body), Ee.syncTree(document.body), ge.syncTree(document.body);
     } finally {
       U._initialIntakes = null, e.release();
     }
@@ -16076,17 +16186,17 @@ const U = class U {
               !0,
               t
             );
-            U._initialIntakes?.push(n), Ee.syncElement(i), Ae.syncElement(i), ge.syncElement(i);
+            U._initialIntakes?.push(n), Ae.syncElement(i), Ee.syncElement(i), ge.syncElement(i);
             break;
           }
           case "childList": {
             Array.from(r.removedNodes).forEach((i) => {
-              U.isStaleExternalRemoval(r, i) || (Ee.cleanupTree(i), Ae.cleanupTree(i), ge.cleanupTree(i), $.removeNode(i));
+              U.isStaleExternalRemoval(r, i) || (Ae.cleanupTree(i), Ee.cleanupTree(i), ge.cleanupTree(i), $.removeNode(i));
             }), Array.from(r.addedNodes).forEach((i) => {
               if (!(i.parentElement instanceof Element))
                 return;
               const n = $.addNode(i.parentElement, i);
-              U._initialIntakes?.push(n), Ee.syncTree(i), Ae.syncTree(i), ge.syncTree(i);
+              U._initialIntakes?.push(n), Ae.syncTree(i), Ee.syncTree(i), ge.syncTree(i);
             }), r.target instanceof Element && ge.syncElement(r.target);
             break;
           }
@@ -16108,9 +16218,9 @@ const U = class U {
   }
 };
 U._initialized = !1, U._mutationObservers = [], U._dispatcher = null, U._initialIntakes = null;
-let ke = U;
-te.setMutationCapture((b) => ke.captureMutations(b));
-document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", ke.init) : ke.init();
+let Ne = U;
+te.setMutationCapture((b) => Ne.captureMutations(b));
+document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", Ne.init) : Ne.init();
 const Yt = () => Se.waitForRenders(), Xt = Se.enhancers;
 export {
   $ as Core,
@@ -16120,7 +16230,7 @@ export {
   I as Fragment,
   Se as Haori,
   m as Log,
-  K as Queue,
+  z as Queue,
   Se as default,
   Xt as enhancers,
   zt as version,