haori 0.41.4 → 0.42.0

package/dist/haori.es.js

@@ -521,16 +521,16 @@ function rt(g, e, t = {}) {
     a.add(d);
   for (let d = Math.max(0, i - n); d <= Math.min(r - 1, i + n); d += 1)
     a.add(d);
-  const o = Array.from(a).sort((d, h) => d - h), l = [];
+  const o = Array.from(a).sort((d, p) => d - p), l = [];
   let c = null;
   for (const d of o) {
     if (c !== null && d - c > 1)
       if (d - c === 2) {
-        const h = c + 1;
+        const p = c + 1;
         l.push({
-          page: h,
-          label: h + 1,
-          active: h === i,
+          page: p,
+          label: p + 1,
+          active: p === i,
           ellipsis: !1
         });
       } else
@@ -794,7 +794,7 @@ const He = class He {
 };
 He.ASYNC_QUEUE = new Be();
 let W = He;
-const M = class M {
+const k = class k {
   /**
    * ストレージを、参照が例外になる環境でも安全に読み出します。
    *
@@ -832,8 +832,8 @@ const M = class M {
       e.history,
       // 参照だけで例外になり得るのはこの 2 つのみ（他は同一オリジンの自 window
       // 由来で常に読める）。ホットパスなので、囲むのも必要な箇所だけに絞る。
-      M.readStorageSafely(() => e.localStorage),
-      M.readStorageSafely(() => e.sessionStorage),
+      k.readStorageSafely(() => e.localStorage),
+      k.readStorageSafely(() => e.sessionStorage),
       e.fetch,
       e.Function,
       e.setTimeout,
@@ -1147,6 +1147,56 @@ let ${e.join(", ")};`;
     }
     return this.OPTIONAL_CHAIN_CACHE.set(e, i), i;
   }
+  /**
+   * 計算プロパティ名を評価時に検査する形へ書き換えます。
+   *
+   * `obj[key]` を `obj[(_hk=>禁止名なら undefined:_hk)(key)]` へ包み、キーの評価結果が
+   * `constructor` / `__proto__` / `prototype` のときプロパティ名を `undefined` へ
+   * 差し替えます（仕様「評価メカニズム」の「`constructor`、`__proto__`、`prototype`
+   * へのアクセスを遮断」。遮断されたアクセスは同節のとおり `undefined` になります）。
+   *
+   * 静的な検証（`hasAllowedSyntax()`）は文字列リテラルのトークンを 1 個ずつ照合する
+   * ため、`["con"+"structor"]` のように**式で組み立てた名前**を検出できません。連結・
+   * `String.fromCharCode`・`join`・Unicode エスケープと作り方は無限にあるので、名前が
+   * 確定する評価時に見るのが唯一の確実な位置です。
+   *
+   * 書き換えはメンバーアクセスの `[` … `]` に限り、配列リテラルには触れません。
+   * トークン位置に基づく差し替えのみで行い、それ以外の文字列は元のまま保持します。
+   *
+   * @param expression 変換対象の式（暗黙のオプショナルチェーン変換の後）
+   * @returns 変換後の式
+   */
+  static toGuardedMemberExpression(e) {
+    const t = this.GUARDED_MEMBER_CACHE.get(e);
+    if (t !== void 0)
+      return t;
+    const r = this.tokenizeExpression(e);
+    let i = e;
+    if (r !== null) {
+      const n = [], s = [];
+      let a = null;
+      for (const o of r) {
+        if (o.value === "[") {
+          const l = this.startsMemberAccess(a);
+          s.push(l), l && n.push({
+            start: o.position + 1,
+            end: o.position + 1,
+            text: k.MEMBER_KEY_GUARD_OPEN
+          });
+        } else o.value === "]" && s.pop() === !0 && n.push({
+          start: o.position,
+          end: o.position,
+          text: ")"
+        });
+        a = o;
+      }
+      for (let o = n.length - 1; o >= 0; o -= 1) {
+        const l = n[o];
+        i = i.slice(0, l.start) + l.text + i.slice(l.end);
+      }
+    }
+    return this.GUARDED_MEMBER_CACHE.set(e, i), i;
+  }
   /**
    * TDZ の `ReferenceError` から実際に参照された識別子名を取り出します。
    *
@@ -1366,11 +1416,11 @@ ${t}`;
     if (this.containsDangerousPatterns(e)) {
       const d = this.detectDisallowedKeywords(e);
       if (d.length > 0) {
-        const h = d.some((y) => y === "function" || y === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
+        const p = d.some((y) => y === "function" || y === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
         m.warn(
           "[Haori]",
           e,
-          "Expression uses disallowed keyword(s): " + d.join(", ") + "." + h
+          "Expression uses disallowed keyword(s): " + d.join(", ") + "." + p
         );
       } else
         m.warn(
@@ -1425,7 +1475,7 @@ ${t}`;
     if (j.isEnabled()) {
       const d = this.extractBoundIdentifiers(e);
       this.recordScopeMissingIdentifiers(
-        d.size === 0 ? l : l.filter((h) => !d.has(h)),
+        d.size === 0 ? l : l.filter((p) => !d.has(p)),
         e
       );
     }
@@ -1434,20 +1484,20 @@ ${t}`;
     });
     const c = o ? [] : l;
     for (let d = 0; d <= this.MAX_IDENTIFIER_RECOVERY_COUNT; d += 1) {
-      const h = this.prepareEvaluator(
+      const p = this.prepareEvaluator(
         e,
         a,
         c
       );
-      if (h.compileFailed || h.evaluator === null)
+      if (p.compileFailed || p.evaluator === null)
         return { value: null, unresolvedReference: !1 };
       try {
         const y = [], A = this.wrapBoundValues(a);
-        h.bindKeys.forEach((P) => {
-          y.push(A[P]);
+        p.bindKeys.forEach((D) => {
+          y.push(A[D]);
         });
         const S = this.withBlockedPropertyAccess(
-          () => h.evaluator(...y)
+          () => p.evaluator(...y)
         );
         return S === void 0 && this.warnBlockedIdentifiers(e), {
           value: S,
@@ -1510,10 +1560,12 @@ ${t}`;
         evaluator: c,
         compileFailed: !1
       };
-    const d = this.buildAssignments(n), h = this.buildShadowDeclarations(o), y = this.toOptionalChainExpression(e), A = d ? `"use strict";
+    const d = this.buildAssignments(n), p = this.buildShadowDeclarations(o), y = this.toGuardedMemberExpression(
+      this.toOptionalChainExpression(e)
+    ), A = d ? `"use strict";
 ${d};
-return (${y});${h}` : `"use strict";
-return (${y});${h}`;
+return (${y});${p}` : `"use strict";
+return (${y});${p}`;
     try {
       return c = new Function(...n, A), this.EXPRESSION_CACHE.set(l, c), this.compileFailedExpressions.delete(e), {
         bindKeys: n,
@@ -1802,11 +1854,15 @@ return (${y});${h}`;
   /**
    * 角括弧がメンバーアクセスかどうかを判定します。
    *
+   * 文字列リテラルも基点に含めます。含めないと `""["constructor"]` の `[` を配列
+   * リテラルの開始と誤って分類し、メンバーアクセスに対する禁止プロパティ名の検証
+   * （`hasAllowedSyntax()`）を素通りして `String` へ到達できてしまいます。
+   *
    * @param previous 直前のトークン
    * @returns メンバーアクセスであればtrue
    */
   static startsMemberAccess(e) {
-    return e === null ? !1 : e.type === "identifier" || e.type === "number" ? !0 : e.value === ")" || e.value === "]" || e.value === "?.";
+    return e === null ? !1 : e.type === "identifier" || e.type === "number" || e.type === "string" ? !0 : e.value === ")" || e.value === "]" || e.value === "?.";
   }
   /**
    * object literal 内で次のトークンがキー位置かどうかを判定します。
@@ -2024,9 +2080,9 @@ return (${y});${h}`;
     return this.forbiddenBindingValueCache.set(e, !1), !1;
   }
 };
-M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HELPERS = {
+k.MAX_IDENTIFIER_RECOVERY_COUNT = 8, k.BUILTIN_NAMESPACE = "haori", k.BUILTIN_HELPERS = {
   ...vt
-}, M.BUILTIN_REFERENCE_PATTERN = /(^|[^\w$.])haori(?![\w$])/, M.BUILTIN_DATA_PROPERTY = "data", M.BUILTIN_DATA_REFERENCE_PATTERN = /(^|[^\w$.])haori\s*(\.\s*data(?![\w$])|\[)/, M.IDENTIFIER_NAME_PATTERN = /^[\p{ID_Start}$_][\p{ID_Continue}$\u200C\u200D]*$/u, M.usableBindingKeyCache = /* @__PURE__ */ new Map(), M.loggedUnusableBindingKeys = /* @__PURE__ */ new Set(), M.compileFailedExpressions = /* @__PURE__ */ new Set(), M.forbiddenBindingValueCache = /* @__PURE__ */ new WeakMap(), M.forbiddenBindingValueCacheResetScheduled = !1, M.loggedForbiddenKeySignatures = /* @__PURE__ */ new Set(), M.loggedForbiddenKeyResetScheduled = !1, M.FORBIDDEN_NAMES = [
+}, k.BUILTIN_REFERENCE_PATTERN = /(^|[^\w$.])haori(?![\w$])/, k.BUILTIN_DATA_PROPERTY = "data", k.BUILTIN_DATA_REFERENCE_PATTERN = /(^|[^\w$.])haori\s*(\.\s*data(?![\w$])|\[)/, k.IDENTIFIER_NAME_PATTERN = /^[\p{ID_Start}$_][\p{ID_Continue}$\u200C\u200D]*$/u, k.usableBindingKeyCache = /* @__PURE__ */ new Map(), k.loggedUnusableBindingKeys = /* @__PURE__ */ new Set(), k.compileFailedExpressions = /* @__PURE__ */ new Set(), k.forbiddenBindingValueCache = /* @__PURE__ */ new WeakMap(), k.forbiddenBindingValueCacheResetScheduled = !1, k.loggedForbiddenKeySignatures = /* @__PURE__ */ new Set(), k.loggedForbiddenKeyResetScheduled = !1, k.FORBIDDEN_NAMES = [
   // グローバルオブジェクト
   "window",
   "self",
@@ -2058,7 +2114,7 @@ M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HE
   "sessionStorage",
   "IndexedDB",
   "history"
-], M.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], M.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set([
+], k.STRICT_FORBIDDEN_NAMES = ["eval", "arguments"], k.REBINDABLE_FORBIDDEN_NAMES = /* @__PURE__ */ new Set([
   "location",
   "history",
   "document",
@@ -2066,23 +2122,23 @@ M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HE
   "localStorage",
   "sessionStorage",
   "IndexedDB"
-]), M.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
-  ...M.FORBIDDEN_NAMES.filter(
-    (e) => !M.REBINDABLE_FORBIDDEN_NAMES.has(e)
+]), k.FORBIDDEN_BINDING_NAMES = /* @__PURE__ */ new Set([
+  ...k.FORBIDDEN_NAMES.filter(
+    (e) => !k.REBINDABLE_FORBIDDEN_NAMES.has(e)
   ),
   "constructor",
   "__proto__",
   "prototype",
-  ...M.STRICT_FORBIDDEN_NAMES
-]), M.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
+  ...k.STRICT_FORBIDDEN_NAMES
+]), k.FORBIDDEN_PROPERTY_NAMES = /* @__PURE__ */ new Set([
   "constructor",
   "__proto__",
   "prototype"
-]), M.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
+]), k.OBJECT_PROPERTY_MODIFIERS = /* @__PURE__ */ new Set([
   "get",
   "set",
   "async"
-]), M.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
+]), k.DISALLOWED_KEYWORDS = /* @__PURE__ */ new Set([
   "await",
   "break",
   "case",
@@ -2116,7 +2172,7 @@ M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HE
   "while",
   "with",
   "yield"
-]), M.NON_SHADOWABLE_IDENTIFIERS = /* @__PURE__ */ new Set([
+]), k.NON_SHADOWABLE_IDENTIFIERS = /* @__PURE__ */ new Set([
   // リテラル・グローバル定数
   "true",
   "false",
@@ -2134,7 +2190,7 @@ M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HE
   "public",
   "static",
   "super"
-]), M.ALLOWED_GLOBAL_IDENTIFIERS = /* @__PURE__ */ new Set([
+]), k.ALLOWED_GLOBAL_IDENTIFIERS = /* @__PURE__ */ new Set([
   // 名前空間オブジェクト
   "Math",
   "JSON",
@@ -2190,11 +2246,11 @@ M.MAX_IDENTIFIER_RECOVERY_COUNT = 8, M.BUILTIN_NAMESPACE = "haori", M.BUILTIN_HE
   "encodeURIComponent",
   "decodeURI",
   "decodeURIComponent"
-]), M.EXPRESSION_CACHE = /* @__PURE__ */ new Map(), M.FREE_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), M.BOUND_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), M.OPTIONAL_CHAIN_CACHE = /* @__PURE__ */ new Map(), M.FORBIDDEN_NAME_PATTERNS = M.FORBIDDEN_NAMES.map((e) => ({
+]), k.EXPRESSION_CACHE = /* @__PURE__ */ new Map(), k.FREE_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), k.BOUND_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), k.OPTIONAL_CHAIN_CACHE = /* @__PURE__ */ new Map(), k.GUARDED_MEMBER_CACHE = /* @__PURE__ */ new Map(), k.MEMBER_KEY_GUARD_OPEN = "(_hk=>_hk==='constructor'||_hk==='__proto__'||_hk==='prototype'?undefined:_hk)(", k.FORBIDDEN_NAME_PATTERNS = k.FORBIDDEN_NAMES.map((e) => ({
   name: e,
   pattern: new RegExp(`(^|[^\\w$.])${e}(?![\\w$])`)
-})), M.FORBIDDEN_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), M.pendingUnresolvedIdentifiers = /* @__PURE__ */ new Set(), M.unresolvedReportScheduled = !1, M.suppliedIdentifiers = /* @__PURE__ */ new Set(), M.pendingScopeMissingIdentifiers = /* @__PURE__ */ new Map(), M.scopeMissingReportScheduled = !1, M.rowScopeIdentifiers = /* @__PURE__ */ new Set(), M.loggedScopeMissingIdentifiers = /* @__PURE__ */ new Set(), M.loggedBlockedIdentifierExpressions = /* @__PURE__ */ new Set();
-let J = M;
+})), k.FORBIDDEN_IDENTIFIER_CACHE = /* @__PURE__ */ new Map(), k.pendingUnresolvedIdentifiers = /* @__PURE__ */ new Set(), k.unresolvedReportScheduled = !1, k.suppliedIdentifiers = /* @__PURE__ */ new Set(), k.pendingScopeMissingIdentifiers = /* @__PURE__ */ new Map(), k.scopeMissingReportScheduled = !1, k.rowScopeIdentifiers = /* @__PURE__ */ new Set(), k.loggedScopeMissingIdentifiers = /* @__PURE__ */ new Set(), k.loggedBlockedIdentifierExpressions = /* @__PURE__ */ new Set();
+let J = k;
 const pe = "data-haori-if-disabled", je = "input, select, textarea, button, fieldset", q = class q {
   /**
    * 集計状態を初期化します。
@@ -2554,7 +2610,7 @@ const oe = class oe {
 };
 oe.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
 let N = oe;
-const C = class C extends N {
+const M = class M extends N {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -2588,7 +2644,7 @@ const C = class C extends N {
    */
   getChildElementFragments() {
     return this.children.filter(
-      (e) => e instanceof C
+      (e) => e instanceof M
     );
   }
   /**
@@ -2620,7 +2676,7 @@ const C = class C extends N {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const e = new C(
+    const e = new M(
       this.target.cloneNode(!1)
     );
     return this.attributeMap.forEach((t, r) => {
@@ -2635,7 +2691,7 @@ const C = class C extends N {
    */
   normalizeClonedVisibilityState() {
     (this.visible === !1 || this.getTarget().style.display === "none" || this.getTarget().hasAttribute(`${u.prefix}if-false`)) && (this.visible = !0, this.display = null, this.displayPriority = null, this.getTarget().style.removeProperty("display"), this.getTarget().removeAttribute(`${u.prefix}if-false`), this.restoreFormControlsDisabledByIf()), this.children.forEach((e) => {
-      e instanceof C && e.normalizeClonedVisibilityState();
+      e instanceof M && e.normalizeClonedVisibilityState();
     });
   }
   /**
@@ -2755,19 +2811,19 @@ const C = class C extends N {
    * @returns 実行中なら true
    */
   static isExecutingAnyBindingWork() {
-    return C.bindingWorkActiveCount > 0;
+    return M.bindingWorkActiveCount > 0;
   }
   /**
    * バインドワークの実行開始を記録します（`Core.setBindingData` の work 開始時に呼ぶ）。
    */
   markBindingWorkStart() {
-    this.bindingWorkActive++, C.bindingWorkActiveCount++;
+    this.bindingWorkActive++, M.bindingWorkActiveCount++;
   }
   /**
    * バインドワークの実行終了を記録します（work 完了時に呼ぶ）。
    */
   markBindingWorkEnd() {
-    this.bindingWorkActive > 0 && (this.bindingWorkActive--, C.bindingWorkActiveCount--);
+    this.bindingWorkActive > 0 && (this.bindingWorkActive--, M.bindingWorkActiveCount--);
   }
   /**
    * このフラグメントへ供給が適用されたことを記録します。
@@ -2859,7 +2915,7 @@ const C = class C extends N {
    */
   clearBindingDataCache() {
     this.bindingDataCache = null, this.descendantBindingDataCache = null, this.children.forEach((e) => {
-      e instanceof C && e.clearBindingDataCache();
+      e instanceof M && e.clearBindingDataCache();
     });
   }
   /**
@@ -3077,7 +3133,7 @@ const C = class C extends N {
     this.value = this.normalizeValueForElement(i, e);
     const s = this.userEditSequence;
     return this.enqueueValueWrite(() => {
-      this.isSupersededByUserEdit(s) || r && !this.canApplyValue(r) || (i.value = n, this.recordValueWriteResult(i.value === n), t && ((i instanceof HTMLInputElement && C.INPUT_EVENT_TYPES.includes(i.type) || i instanceof HTMLTextAreaElement) && i.dispatchEvent(new Event("input", { bubbles: !0 })), i.dispatchEvent(new Event("change", { bubbles: !0 }))));
+      this.isSupersededByUserEdit(s) || r && !this.canApplyValue(r) || (i.value = n, this.recordValueWriteResult(i.value === n), t && ((i instanceof HTMLInputElement && M.INPUT_EVENT_TYPES.includes(i.type) || i instanceof HTMLTextAreaElement) && i.dispatchEvent(new Event("input", { bubbles: !0 })), i.dispatchEvent(new Event("change", { bubbles: !0 }))));
     });
   }
   /**
@@ -3158,10 +3214,10 @@ const C = class C extends N {
    * @returns 再試行の完了 Promise
    */
   static retryUnappliedValueWrites(e, t) {
-    if (C.UNAPPLIED_VALUE_WRITES.size === 0)
+    if (M.UNAPPLIED_VALUE_WRITES.size === 0)
       return Promise.resolve();
     const r = [];
-    for (const i of Array.from(C.UNAPPLIED_VALUE_WRITES)) {
+    for (const i of Array.from(M.UNAPPLIED_VALUE_WRITES)) {
       const n = i.getTarget();
       if (i.wasResetAfter(t)) {
         i.clearUnappliedValueWrite();
@@ -3203,7 +3259,7 @@ const C = class C extends N {
    * @returns 戻り値はありません。
    */
   clearUnappliedValueWrite() {
-    this.valueWriteUnapplied = !1, C.UNAPPLIED_VALUE_WRITES.delete(this);
+    this.valueWriteUnapplied = !1, M.UNAPPLIED_VALUE_WRITES.delete(this);
   }
   /**
    * 入力エレメントの値を取得します。
@@ -3224,7 +3280,7 @@ const C = class C extends N {
    * @returns 直近に発番した通番（未発番なら 0）
    */
   static currentSequence() {
-    return C.sequenceCounter;
+    return M.sequenceCounter;
   }
   /**
    * 新しい通番を発番します。
@@ -3237,7 +3293,7 @@ const C = class C extends N {
    * @returns 発番した通番
    */
   static nextSequence() {
-    return C.sequenceCounter += 1, C.sequenceCounter;
+    return M.sequenceCounter += 1, M.sequenceCounter;
   }
   /**
    * 保留中の外部 DOM 変更を取り込む処理を登録します。
@@ -3246,7 +3302,7 @@ const C = class C extends N {
    * @returns 戻り値はありません。
    */
   static setPendingMutationFlusher(e) {
-    C.pendingMutationFlusher = e;
+    M.pendingMutationFlusher = e;
   }
   /**
    * 利用者の操作を起点とする通番を発番します。
@@ -3267,7 +3323,7 @@ const C = class C extends N {
    * @returns 発番した通番
    */
   static nextOperationSequence() {
-    return C.pendingMutationFlusher && !C.isExecutingAnyBindingWork() && C.pendingMutationFlusher(), C.nextSequence();
+    return M.pendingMutationFlusher && !M.isExecutingAnyBindingWork() && M.pendingMutationFlusher(), M.nextSequence();
   }
   /**
    * この入力欄へ値を適用してよいかを返します。
@@ -3288,7 +3344,7 @@ const C = class C extends N {
    * @returns 適用してよい場合は true
    */
   canApplyValue(e) {
-    return C.isApplicable(
+    return M.isApplicable(
       { sequence: this.lastValueSequence, kind: this.lastValueKind },
       e
     );
@@ -3311,7 +3367,7 @@ const C = class C extends N {
    * @returns 適用してよい場合は true
    */
   canApplyPath(e, t) {
-    return C.isApplicable(
+    return M.isApplicable(
       this.lastPathApplied.get(e) ?? null,
       t
     );
@@ -3360,7 +3416,7 @@ const C = class C extends N {
    * @returns 発番した編集の通番
    */
   markUserEdit() {
-    return this.userEditSequence = C.nextSequence(), this.markValueApplied({ sequence: this.userEditSequence, kind: "edit" }), this.userEditSequence;
+    return this.userEditSequence = M.nextSequence(), this.markValueApplied({ sequence: this.userEditSequence, kind: "edit" }), this.userEditSequence;
   }
   /**
    * この入力欄を最後にユーザーが編集したときの通し番号を返します。
@@ -3395,7 +3451,7 @@ const C = class C extends N {
    * @param upTo この通し番号までの編集を解除対象とする（既定は現在の最新）
    * @return 戻り値はありません。
    */
-  clearUserEditMark(e = C.currentSequence()) {
+  clearUserEditMark(e = M.currentSequence()) {
     e > this.authoritativeValueSequence && (this.authoritativeValueSequence = e), this.lastValueKind === "edit" && this.lastValueSequence <= e && (this.lastValueKind = "supply");
   }
   /**
@@ -3416,7 +3472,7 @@ const C = class C extends N {
     if (!j.isEnabled())
       return;
     const n = `${e} ${r}`;
-    C.loggedUnresolvedAttributes.has(n) || (C.loggedUnresolvedAttributes.add(n), m.warn(
+    M.loggedUnresolvedAttributes.has(n) || (M.loggedUnresolvedAttributes.add(n), m.warn(
       "[Haori]",
       `Attribute "${t}" was not applied because the expression has an unresolved reference; the attribute is removed and the synchronized value is emptied: ${e}="${r}"`,
       i
@@ -3438,7 +3494,7 @@ const C = class C extends N {
     if (!t)
       return !1;
     const r = N.get(t);
-    return r instanceof C ? r.hasPendingUserEdit() : !1;
+    return r instanceof M ? r.hasPendingUserEdit() : !1;
   }
   /**
    * 内部の値をクリアします。エレメントのvalue値は変化しません。
@@ -3453,8 +3509,10 @@ const C = class C extends N {
    * 入力要素の種別に応じて値を正規化します。
    *
    * `type="number"` の input では、文字列の入力値・バインド値を数値へ変換します
-   * （DTO が数値型を期待する場合に文字列で送られるのを防ぐため）。空文字・null・
-   * 数値化できない値は `null` を返します。それ以外の要素では値をそのまま返します。
+   * （DTO が数値型を期待する場合に文字列で送られるのを防ぐため）。数値として採用
+   * するのは、ブラウザが `<input type="number">` の値として受け付ける文字列だけで
+   * す（`NUMBER_INPUT_PATTERN`）。空文字・`null`・受け付けない文字列・有限でない数値
+   * は `null` を返します。それ以外の要素では値をそのまま返します。
    *
    * @param element 対象の入力要素
    * @param value 正規化する値
@@ -3464,8 +3522,12 @@ const C = class C extends N {
     if (e instanceof HTMLInputElement && e.type === "number") {
       if (t === null || t === "")
         return null;
-      const r = typeof t == "number" ? t : Number(t);
-      return Number.isNaN(r) ? null : r;
+      if (typeof t == "number")
+        return Number.isFinite(t) ? t : null;
+      if (typeof t != "string" || !M.NUMBER_INPUT_PATTERN.test(t))
+        return null;
+      const r = Number(t);
+      return Number.isFinite(r) ? r : null;
     }
     return t;
   }
@@ -3484,7 +3546,7 @@ const C = class C extends N {
    * @returns 同期対象の場合true
    */
   static isValuePropertyTarget(e) {
-    return e instanceof HTMLInputElement ? C.INPUT_EVENT_TYPES.includes(e.type) || e.type === "hidden" : e instanceof HTMLTextAreaElement || e instanceof HTMLSelectElement;
+    return e instanceof HTMLInputElement ? M.INPUT_EVENT_TYPES.includes(e.type) || e.type === "hidden" : e instanceof HTMLTextAreaElement || e instanceof HTMLSelectElement;
   }
   /**
    * 内部の値をDOMの値と同期します。
@@ -3532,7 +3594,7 @@ const C = class C extends N {
    */
   recordValueWriteResult(e) {
     if (!e && this.value !== null && this.value !== "") {
-      this.valueWriteUnapplied = !0, C.UNAPPLIED_VALUE_WRITES.add(this);
+      this.valueWriteUnapplied = !0, M.UNAPPLIED_VALUE_WRITES.add(this);
       return;
     }
     this.clearUnappliedValueWrite();
@@ -3562,7 +3624,7 @@ const C = class C extends N {
    * @returns 収集する値
    */
   getValueForCollection() {
-    return this.skipChangeValue || this.valueWriteUnapplied ? this.value : C.isValuePropertyTarget(this.getTarget()) ? this.readValueFromDom() : this.value;
+    return this.skipChangeValue || this.valueWriteUnapplied ? this.value : M.isValuePropertyTarget(this.getTarget()) ? this.readValueFromDom() : this.value;
   }
   /**
    * チェック状態の DOM 反映に合わせて内部値を DOM から同期します。
@@ -3582,7 +3644,7 @@ const C = class C extends N {
     if (!t)
       return;
     const r = N.get(t);
-    r instanceof C && r.syncValue();
+    r instanceof M && r.syncValue();
   }
   /**
    * 指定した属性のいずれかを自身が書き込み中なら、その完了 Promise を返します。
@@ -3698,8 +3760,8 @@ const C = class C extends N {
       return e === t ? this.removeAttribute(e) : this.removeAliasedAttribute(e, t);
     const o = new we(e, r);
     if (n) {
-      const xe = this.attributeMap.get(e);
-      if (xe && (xe.isEvaluate || xe.isForceEvaluation()) && !o.isEvaluate && !o.isForceEvaluation()) {
+      const Me = this.attributeMap.get(e);
+      if (Me && (Me.isEvaluate || Me.isForceEvaluation()) && !o.isEvaluate && !o.isForceEvaluation()) {
         const Ve = W.enqueue(() => {
         }).finally(() => {
           this.releaseSelfWritingAttributes(s);
@@ -3713,24 +3775,24 @@ const C = class C extends N {
       element: l,
       rawName: e,
       template: r
-    }), d = o.isEvaluate || o.isRawEvaluate, h = e === t && C.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), y = o.isSingleExpression(), A = ie.joinEvaluateResults(c.results), S = c.results.length === 1 ? c.results[0] : A, P = !o.isForceEvaluation() && (t !== e || h || y ? c.hasUnresolvedReference || S === null || S === void 0 || S === !1 : d && A === "");
-    P && c.hasUnresolvedReference && C.warnUnresolvedAttribute(
+    }), d = o.isEvaluate || o.isRawEvaluate, p = e === t && M.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), y = o.isSingleExpression(), A = ie.joinEvaluateResults(c.results), S = c.results.length === 1 ? c.results[0] : A, D = !o.isForceEvaluation() && (t !== e || p || y ? c.hasUnresolvedReference || S === null || S === void 0 || S === !1 : d && A === "");
+    D && c.hasUnresolvedReference && M.warnUnresolvedAttribute(
       e,
       t,
       r,
       l
     );
-    const D = o.isForceEvaluation() ? r : y ? S : A, L = i && o.isEvaluate && t === "value" && C.isValuePropertyTarget(l), E = l.getRootNode(), v = L && (l === E.activeElement || this.hasPendingUserEdit()), R = P || D === null || D === !1 ? null : String(D), x = e !== t && l.getAttribute(e) !== r, k = R === null ? l.hasAttribute(t) : l.getAttribute(t) !== R, V = R === null ? "" : R, G = L && !v && l.value !== V, _ = t === "checked" && l instanceof HTMLInputElement && (l.type === "checkbox" || l.type === "radio"), Z = t === "selected" && l instanceof HTMLOptionElement, Ne = E.activeElement, Fe = Ne !== null && (_ && l === Ne || Z && l.closest("select") === Ne) || (_ || Z) && this.hasPendingCheckableUserEdit(Z), be = R !== null, ke = _ && !Fe && l.checked !== be, ye = Z && !Fe && l.selected !== be;
-    if (!x && !k && !G && !ke && !ye)
-      return L && !v && (this.value = this.normalizeValueForElement(
+    const P = o.isForceEvaluation() ? r : y ? S : A, H = i && o.isEvaluate && t === "value" && M.isValuePropertyTarget(l), E = l.getRootNode(), v = H && (l === E.activeElement || this.hasPendingUserEdit()), R = D || P === null || P === !1 ? null : String(P), C = e !== t && l.getAttribute(e) !== r, x = R === null ? l.hasAttribute(t) : l.getAttribute(t) !== R, V = R === null ? "" : R, z = H && !v && l.value !== V, _ = t === "checked" && l instanceof HTMLInputElement && (l.type === "checkbox" || l.type === "radio"), Z = t === "selected" && l instanceof HTMLOptionElement, Ne = E.activeElement, Fe = Ne !== null && (_ && l === Ne || Z && l.closest("select") === Ne) || (_ || Z) && this.hasPendingCheckableUserEdit(Z), be = R !== null, ke = _ && !Fe && l.checked !== be, ye = Z && !Fe && l.selected !== be;
+    if (!C && !x && !z && !ke && !ye)
+      return H && !v && (this.value = this.normalizeValueForElement(
         l,
         V
       ), this.clearUnappliedValueWrite()), (_ || Z) && !Fe && this.syncCheckableValueFromDom(Z), Promise.resolve();
     const Ue = W.enqueue(() => {
-      x && l.setAttribute(e, r), R === null ? l.removeAttribute(t) : k && (l.setAttribute(t, R), t === `${u.prefix}bind` && this.recordSelfWrittenBind(R)), L && !v && (this.value = this.normalizeValueForElement(
+      C && l.setAttribute(e, r), R === null ? l.removeAttribute(t) : x && (l.setAttribute(t, R), t === `${u.prefix}bind` && this.recordSelfWrittenBind(R)), H && !v && (this.value = this.normalizeValueForElement(
         l,
         V
-      ), G && (l.value = V), this.recordValueWriteResult(l.value === V)), ke && (l.checked = be), ye && (l.selected = be), (ke || ye) && this.syncCheckableValueFromDom(ye);
+      ), z && (l.value = V), this.recordValueWriteResult(l.value === V)), ke && (l.checked = be), ye && (l.selected = be), (ke || ye) && this.syncCheckableValueFromDom(ye);
     }).finally(() => {
       this.releaseSelfWritingAttributes(s);
     });
@@ -3873,8 +3935,8 @@ const C = class C extends N {
     if (t === null)
       this.children.push(e);
     else {
-      let h;
-      if (s ? a !== -1 && a < o ? h = o - 1 : h = o : h = this.children.indexOf(t), h === -1) {
+      let p;
+      if (s ? a !== -1 && a < o ? p = o - 1 : p = o : p = this.children.indexOf(t), p === -1) {
         const y = this.resolveInsertionPointFromDom(
           t,
           !1
@@ -3885,7 +3947,7 @@ const C = class C extends N {
           t
         ), this.children.push(e)) : (this.children.splice(y.index, 0, e), c = y.referenceNode);
       } else
-        this.children.splice(h, 0, e);
+        this.children.splice(p, 0, e);
     }
     e.setParent(this), e.setMounted(this.mounted);
     const d = this.skipMutationNodes;
@@ -3967,7 +4029,7 @@ const C = class C extends N {
       return Promise.resolve();
     this.visible = !1;
     const e = this.getTarget();
-    return this.display = e.style.getPropertyValue("display"), this.displayPriority = e.style.getPropertyPriority("display"), e.style.setProperty("display", "none", "important"), e.setAttribute(`${u.prefix}if-false`, ""), C.disableFormControlsInBranch(e), Promise.resolve();
+    return this.display = e.style.getPropertyValue("display"), this.displayPriority = e.style.getPropertyPriority("display"), e.style.setProperty("display", "none", "important"), e.setAttribute(`${u.prefix}if-false`, ""), M.disableFormControlsInBranch(e), Promise.resolve();
   }
   /**
    * 分岐配下のフォームコントロールを順に処理します。
@@ -4005,7 +4067,7 @@ const C = class C extends N {
    * @returns 戻り値はありません。
    */
   static disableFormControlsInBranch(e) {
-    C.forEachFormControlInBranch(e, (t) => {
+    M.forEachFormControlInBranch(e, (t) => {
       t.hasAttribute("disabled") || (t.setAttribute(pe, ""), t.setAttribute("disabled", ""));
     });
   }
@@ -4019,7 +4081,7 @@ const C = class C extends N {
    * @returns 戻り値はありません。
    */
   restoreFormControlsDisabledByIf() {
-    C.forEachFormControlInBranch(this.getTarget(), (e) => {
+    M.forEachFormControlInBranch(this.getTarget(), (e) => {
       e.hasAttribute(pe) && (e.removeAttribute(pe), e.removeAttribute("disabled"));
     });
   }
@@ -4052,7 +4114,7 @@ const C = class C extends N {
     return t === null ? null : t.closestByAttribute(e);
   }
 };
-C.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
+M.NUMBER_INPUT_PATTERN = /^-?(?:\d+(?:\.\d+)?|\.\d+)(?:[eE][+-]?\d+)?$/, M.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "allowfullscreen",
   "async",
   "autofocus",
@@ -4076,7 +4138,7 @@ C.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "required",
   "reversed",
   "selected"
-]), C.INPUT_EVENT_TYPES = [
+]), M.INPUT_EVENT_TYPES = [
   "text",
   "password",
   "email",
@@ -4091,8 +4153,8 @@ C.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "month",
   "time",
   "week"
-], C.UNAPPLIED_VALUE_WRITES = /* @__PURE__ */ new Set(), C.sequenceCounter = 0, C.bindingWorkActiveCount = 0, C.pendingMutationFlusher = null, C.loggedUnresolvedAttributes = /* @__PURE__ */ new Set();
-let T = C;
+], M.UNAPPLIED_VALUE_WRITES = /* @__PURE__ */ new Set(), M.sequenceCounter = 0, M.bindingWorkActiveCount = 0, M.pendingMutationFlusher = null, M.loggedUnresolvedAttributes = /* @__PURE__ */ new Set();
+let T = M;
 class Q extends N {
   /**
    * テキストフラグメントのコンストラクタ。
@@ -4758,13 +4820,13 @@ de.enhancers = {
 };
 let he = de;
 const St = "入力内容を確認してください", wt = ["addErrorMessage", "clearMessages"], Ke = "data-haori-group-name";
-function ze() {
+function Ge() {
   const e = globalThis.window?.Haori;
   return wt.every(
     (r) => typeof e?.[r] == "function"
   ) ? e : he;
 }
-const p = class p {
+const h = class h {
   /**
    * フォーム内にある入力エレメントの値をオブジェクトとして取得します。
    * data-form-object属性があると、そのエレメント内の値はオブジェクトとして処理されます。
@@ -4775,7 +4837,7 @@ const p = class p {
    */
   static getValues(e) {
     const t = {}, r = /* @__PURE__ */ new Set();
-    return p.getPartValues(e, t, null, r), p.registerCollectedExcludedKeys(t, r), t;
+    return h.getPartValues(e, t, null, r), h.registerCollectedExcludedKeys(t, r), t;
   }
   /**
    * 入力エレメントから収集する値を解決します。
@@ -4796,11 +4858,11 @@ const p = class p {
    */
   static resolveCollectedValue(e) {
     const t = e.getTarget();
-    if (p.isFileInput(e)) {
+    if (h.isFileInput(e)) {
       const r = t, i = r.files ? Array.from(r.files) : [];
       return r.multiple ? i : i.length > 0 ? i[0] : null;
     }
-    if (p.isBooleanCheckbox(e)) {
+    if (h.isBooleanCheckbox(e)) {
       const r = t;
       return r.value === "false" ? !r.checked : r.checked;
     }
@@ -4869,7 +4931,7 @@ const p = class p {
     const r = e.getTarget();
     if (!(r instanceof HTMLInputElement) || r.type !== "radio" || r.hasAttribute("name") && !r.hasAttribute(Ke))
       return;
-    const i = p.resolveGroupScope(e), n = `${String(t)}--haori${p.resolveGroupScopeId(
+    const i = h.resolveGroupScope(e), n = `${String(t)}--haori${h.resolveGroupScopeId(
       i
     )}`;
     if (r.getAttribute("name") !== n)
@@ -4903,8 +4965,8 @@ const p = class p {
    * @returns スコープの識別番号
    */
   static resolveGroupScopeId(e) {
-    const t = p.GROUP_SCOPE_IDS.get(e);
-    return t !== void 0 ? t : (p.groupScopeSequence += 1, p.GROUP_SCOPE_IDS.set(e, p.groupScopeSequence), p.groupScopeSequence);
+    const t = h.GROUP_SCOPE_IDS.get(e);
+    return t !== void 0 ? t : (h.groupScopeSequence += 1, h.GROUP_SCOPE_IDS.set(e, h.groupScopeSequence), h.groupScopeSequence);
   }
   /**
    * 宣言バインドで値・状態が決まり、その評価が解決している入力かどうかを判定します。
@@ -4922,17 +4984,17 @@ const p = class p {
    * @returns 宣言バインドで値・状態が決まり、その評価が解決している場合 true
    */
   static hasResolvedDeclarativeState(e) {
-    if (!p.isDeclarativeStateBound(e))
+    if (!h.isDeclarativeStateBound(e))
       return !1;
     const t = e.getTarget();
     if (t instanceof HTMLInputElement && (t.type === "checkbox" || t.type === "radio"))
-      return p.isDeclarationResolved(e, "checked");
-    if (p.hasDeclarativeBinding(e, "value"))
-      return p.isDeclarationResolved(e, "value");
+      return h.isDeclarationResolved(e, "checked");
+    if (h.hasDeclarativeBinding(e, "value"))
+      return h.isDeclarationResolved(e, "value");
     if (t instanceof HTMLSelectElement) {
       for (const r of Array.from(t.options)) {
         const i = N.get(r);
-        if (i instanceof T && p.hasDeclarativeBinding(i, "selected") && !p.isDeclarationResolved(i, "selected"))
+        if (i instanceof T && h.hasDeclarativeBinding(i, "selected") && !h.isDeclarationResolved(i, "selected"))
           return !1;
       }
       return !0;
@@ -4975,7 +5037,7 @@ const p = class p {
    */
   static isDeclarativeStateBound(e) {
     const t = e.getTarget();
-    return t instanceof HTMLInputElement && (t.type === "checkbox" || t.type === "radio") ? p.hasDeclarativeBinding(e, "checked") : T.isValuePropertyTarget(t) ? p.hasDeclarativeBinding(e, "value") ? !0 : t instanceof HTMLSelectElement ? p.hasDeclarativeSelectedOption(t) : !1 : !1;
+    return t instanceof HTMLInputElement && (t.type === "checkbox" || t.type === "radio") ? h.hasDeclarativeBinding(e, "checked") : T.isValuePropertyTarget(t) ? h.hasDeclarativeBinding(e, "value") ? !0 : t instanceof HTMLSelectElement ? h.hasDeclarativeSelectedOption(t) : !1 : !1;
   }
   /**
    * 宣言バインドで値・状態が決まる入力について、DOM 側の値を空へ揃えます。
@@ -4987,14 +5049,14 @@ const p = class p {
    * @return 戻り値はありません。
    */
   static clearDeclarativeStateFromDom(e) {
-    if (p.isDeclarativeStateBound(e)) {
+    if (h.isDeclarativeStateBound(e)) {
       const t = e.getTarget();
       t instanceof HTMLInputElement && (t.type === "checkbox" || t.type === "radio") ? t.checked = !1 : t instanceof HTMLSelectElement ? (Array.from(t.options).forEach((r) => {
         r.selected = !1;
       }), t.selectedIndex = -1) : (t instanceof HTMLInputElement || t instanceof HTMLTextAreaElement) && (t.value = "");
     }
     e.getChildren().forEach((t) => {
-      t instanceof T && p.clearDeclarativeStateFromDom(t);
+      t instanceof T && h.clearDeclarativeStateFromDom(t);
     });
   }
   /**
@@ -5024,7 +5086,7 @@ const p = class p {
   static hasDeclarativeSelectedOption(e) {
     for (const t of Array.from(e.options)) {
       const r = N.get(t);
-      if (r instanceof T && p.hasDeclarativeBinding(r, "selected"))
+      if (r instanceof T && h.hasDeclarativeBinding(r, "selected"))
         return !0;
     }
     return !1;
@@ -5055,7 +5117,7 @@ const p = class p {
    * @returns 編集された入力欄だけを含む値のオブジェクト
    */
   static getValuesEditedAfter(e, t) {
-    return p.getPartValues(e, {}, t);
+    return h.getPartValues(e, {}, t);
   }
   /**
    * 利用者が編集した入力欄に対応するバインドデータの経路を集めます。
@@ -5086,7 +5148,7 @@ const p = class p {
    */
   static collectEditedPaths(e, t = "", r = null) {
     const i = /* @__PURE__ */ new Set();
-    return p.walkEditedPaths(p.getValuesEditedAfter(e, 0), t, i), p.walkExcludedPaths(r ?? p.getValues(e), t, i), i;
+    return h.walkEditedPaths(h.getValuesEditedAfter(e, 0), t, i), h.walkExcludedPaths(r ?? h.getValues(e), t, i), i;
   }
   /**
    * 収集値をたどって、除外されたキーの経路を集めます。
@@ -5101,15 +5163,15 @@ const p = class p {
   static walkExcludedPaths(e, t, r) {
     if (Array.isArray(e))
       return;
-    const i = p.asPlainRecord(e);
+    const i = h.asPlainRecord(e);
     if (i === null)
       return;
-    const n = p.COLLECTED_EXCLUDED_KEYS.get(i);
+    const n = h.COLLECTED_EXCLUDED_KEYS.get(i);
     if (n)
       for (const s of n)
         s in i || r.add(t === "" ? s : `${t}.${s}`);
     for (const [s, a] of Object.entries(i))
-      p.walkExcludedPaths(
+      h.walkExcludedPaths(
         a,
         t === "" ? s : `${t}.${s}`,
         r
@@ -5125,10 +5187,10 @@ const p = class p {
   static walkEditedPaths(e, t, r) {
     if (Array.isArray(e))
       return;
-    const i = p.asPlainRecord(e);
+    const i = h.asPlainRecord(e);
     if (i !== null) {
       for (const [n, s] of Object.entries(i))
-        p.walkEditedPaths(
+        h.walkEditedPaths(
           s,
           t === "" ? n : `${t}.${n}`,
           r
@@ -5150,67 +5212,79 @@ const p = class p {
    * @returns values と同じオブジェクト
    */
   static getPartValues(e, t, r = null, i = null) {
+    if (e.hasAttribute(`${u.prefix}form-detach`))
+      return t;
     if (e.getTarget().hasAttribute(`${u.prefix}if-false`)) {
       if (i !== null)
-        for (const c of p.collectDeclaredKeysInFragment(e))
+        for (const c of h.collectDeclaredKeysInFragment(e))
           i.add(c);
       return t;
     }
-    const n = p.resolveFieldName(e), s = e.getAttribute(`${u.prefix}form-object`), a = e.getAttribute(`${u.prefix}form-list`), o = e.hasAttribute(`${u.prefix}form-list`), l = r !== null && e.getUserEditSequence() <= r;
+    const n = h.resolveFieldName(e), s = e.getAttribute(`${u.prefix}form-object`), a = e.getAttribute(`${u.prefix}form-list`), o = e.hasAttribute(`${u.prefix}form-list`), l = r !== null && e.getUserEditSequence() <= r;
     if (n) {
-      if (o && l)
+      if (r !== null && h.isGroupedCheckable(e)) {
+        const c = h.collectGroupSelection(
+          e,
+          o,
+          r
+        );
+        c.edited && (t[String(n)] = c.value);
+      } else if (o && h.isGroupedCheckable(e)) {
+        const c = String(n), d = e.getTarget();
+        r === null && !Array.isArray(t[c]) && (t[c] = []), !l && d.checked && (Array.isArray(t[c]) || (t[c] = []), t[c].push(d.value));
+      } else if (o && l)
         Array.isArray(t[String(n)]) ? t[String(n)].push(null) : t[String(n)] = [null];
       else if (!l) if (o) {
-        const c = p.resolveCollectedValue(e), d = p.isFileInput(e) && Array.isArray(c) ? c : [c];
+        const c = h.resolveCollectedValue(e), d = h.isFileInput(e) && Array.isArray(c) ? c : [c];
         Array.isArray(t[String(n)]) ? t[String(n)].push(...d) : t[String(n)] = d;
-      } else if (p.isGroupedCheckable(e)) {
-        const c = e.getTarget(), d = c instanceof HTMLInputElement ? c.checked : !0, h = c instanceof HTMLInputElement ? c.value : e.getValue(), y = d ? h : null, A = String(n);
+      } else if (h.isGroupedCheckable(e)) {
+        const c = e.getTarget(), d = c instanceof HTMLInputElement ? c.checked : !0, p = c instanceof HTMLInputElement ? c.value : e.getValue(), y = d ? p : 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)] = p.resolveCollectedValue(e);
+        t[String(n)] = h.resolveCollectedValue(e);
       s && m.warn(
         "Haori",
         `Element cannot have both ${u.prefix}form-object and name attributes.`
       );
       for (const c of e.getChildElementFragments())
-        p.getPartValues(c, t, r, i);
+        h.getPartValues(c, t, r, i);
     } else if (s) {
       const c = {}, d = i === null ? null : /* @__PURE__ */ new Set();
-      for (const h of e.getChildElementFragments())
-        p.getPartValues(
-          h,
+      for (const p of e.getChildElementFragments())
+        h.getPartValues(
+          p,
           c,
           r,
           d
         );
-      d !== null && p.registerCollectedExcludedKeys(c, d), Object.keys(c).length > 0 ? t[String(s)] = c : i !== null && (d?.size ?? 0) > 0 && i.add(String(s)), a && m.warn(
+      d !== null && h.registerCollectedExcludedKeys(c, d), Object.keys(c).length > 0 ? t[String(s)] = c : i !== null && (d?.size ?? 0) > 0 && i.add(String(s)), a && m.warn(
         "Haori",
         `Element cannot have both ${u.prefix}form-list and ${u.prefix}form-object attributes.`
       );
     } else if (a) {
       const c = [], d = [];
-      let h = !1;
+      let p = !1;
       for (const y of e.getChildElementFragments()) {
         const A = {}, S = i === null ? null : /* @__PURE__ */ new Set();
-        p.getPartValues(
+        h.getPartValues(
           y,
           A,
           r,
           S
-        ), S !== null && p.registerCollectedExcludedKeys(A, S), Object.keys(A).length > 0 ? (h = !0, c.push(A), d.push(y.getListKey())) : r !== null && (c.push({}), d.push(y.getListKey()));
+        ), S !== null && h.registerCollectedExcludedKeys(A, S), Object.keys(A).length > 0 ? (p = !0, c.push(A), d.push(y.getListKey())) : r !== null && (c.push({}), d.push(y.getListKey()));
       }
       if (r === null) {
         const y = e.getAttribute(`${u.prefix}each-key`);
-        p.registerCollectedRowIdentity(
+        h.registerCollectedRowIdentity(
           c,
           y == null ? null : String(y),
           d,
-          p.isCollectedListFromEachSource(e)
+          h.isCollectedListFromEachSource(e)
         ), t[String(a)] = c;
-      } else h && (t[String(a)] = c);
+      } else p && (t[String(a)] = c);
     } else
       for (const c of e.getChildElementFragments())
-        p.getPartValues(c, t, r, i);
+        h.getPartValues(c, t, r, i);
     return t;
   }
   /**
@@ -5223,7 +5297,7 @@ const p = class p {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setValues(e, t, r = !1) {
-    return p.setPartValues(e, t, r, !0);
+    return h.setPartValues(e, t, r, !0);
   }
   /**
    * フォーム内にある入力エレメントに値をイベントなしで設定します。
@@ -5236,7 +5310,7 @@ const p = class p {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static syncValues(e, t, r = !1, i = null) {
-    return p.setPartValues(
+    return h.setPartValues(
       e,
       t,
       r,
@@ -5259,7 +5333,7 @@ const p = class p {
    * @returns 反映完了の Promise
    */
   static syncRowValues(e, t, r = null) {
-    return p.setPartValues(
+    return h.setPartValues(
       e,
       t,
       !1,
@@ -5289,7 +5363,7 @@ const p = class p {
     if (!r)
       return t;
     const i = String(r);
-    return Object.prototype.hasOwnProperty.call(t, i) ? p.asPlainRecord(t[i]) ?? {} : p.resolveAncestorArgOwner(e, i)?.value ?? {};
+    return Object.prototype.hasOwnProperty.call(t, i) ? h.asPlainRecord(t[i]) ?? {} : h.resolveAncestorArgOwner(e, i)?.value ?? {};
   }
   /**
    * `data-form-arg` のキーを所有する祖先を解決します。
@@ -5314,7 +5388,7 @@ const p = class p {
       if (i && Object.prototype.hasOwnProperty.call(i, t)) {
         if (r.getListKey() !== null)
           return null;
-        const n = p.asPlainRecord(i[t]);
+        const n = h.asPlainRecord(i[t]);
         return n ? { owner: r, value: n } : null;
       }
       r = r.getParent();
@@ -5338,18 +5412,18 @@ const p = class p {
   static buildConditionScope(e, t = null) {
     const r = { ...e.getBindingData() }, i = t ? {
       source: t,
-      argKey: p.resolveFormArgKey(t)
-    } : p.resolveConditionValueSource(e);
+      argKey: h.resolveFormArgKey(t)
+    } : h.resolveConditionValueSource(e);
     if (!i)
       return r;
-    const n = p.getValues(i.source), s = p.collectDeclaredFieldKeys(i.source);
+    const n = h.getValues(i.source), s = h.collectDeclaredFieldKeys(i.source);
     if (i.argKey === null) {
       for (const o of s)
         r[o] = n[o];
       return r;
     }
     const a = {
-      ...p.asPlainRecord(r[i.argKey]) ?? {}
+      ...h.asPlainRecord(r[i.argKey]) ?? {}
     };
     for (const o of s)
       a[o] = n[o];
@@ -5379,8 +5453,8 @@ const p = class p {
       }
       t = i;
     }
-    const r = p.getFormFragment(e);
-    return r ? { source: r, argKey: p.resolveFormArgKey(r) } : null;
+    const r = h.getFormFragment(e);
+    return r ? { source: r, argKey: h.resolveFormArgKey(r) } : null;
   }
   /**
    * フォームコンテナの `data-form-arg` のキー名を返します。
@@ -5412,7 +5486,7 @@ const p = class p {
    * @returns 宣言されている最上位のキー名
    */
   static collectDeclaredFieldKeys(e) {
-    return p.collectDeclaredKeysInFragment(e);
+    return h.collectDeclaredKeysInFragment(e);
   }
   /**
    * フラグメントの配下で収集対象として**宣言されている**最上位のキー名を列挙します。
@@ -5424,7 +5498,7 @@ const p = class p {
    * @returns 宣言されている最上位のキー名
    */
   static collectDeclaredKeysInFragment(e) {
-    const t = /* @__PURE__ */ new Set(), r = e.getTarget(), i = p.resolveFieldName(e);
+    const t = /* @__PURE__ */ new Set(), r = e.getTarget(), i = h.resolveFieldName(e);
     i && t.add(String(i));
     const n = `${u.prefix}form-object`, s = `${u.prefix}form-list`, a = r.getAttribute(n) ?? r.getAttribute(s);
     if (a)
@@ -5433,11 +5507,13 @@ const p = class p {
     return r.querySelectorAll(o).forEach((l) => {
       if (!(l instanceof HTMLElement))
         return;
-      let c = null, d = l;
-      for (; d && d !== r; )
-        (d.hasAttribute(n) || d.hasAttribute(s)) && (c = d), d = d.parentElement;
-      const h = c ?? l, y = h.getAttribute(n) || h.getAttribute(s) || h.getAttribute(`${u.prefix}form-name`) || h.getAttribute("name");
-      y && t.add(y);
+      let c = null, d = !1, p = l;
+      for (; p && p !== r; )
+        p.hasAttribute(`${u.prefix}form-detach`) && (d = !0), (p.hasAttribute(n) || p.hasAttribute(s)) && (c = p), p = p.parentElement;
+      if (d)
+        return;
+      const y = c ?? l, A = y.getAttribute(n) || y.getAttribute(s) || y.getAttribute(`${u.prefix}form-name`) || y.getAttribute("name");
+      A && t.add(A);
     }), t;
   }
   /**
@@ -5452,7 +5528,7 @@ const p = class p {
    */
   static applyCustomValidity(e) {
     const t = `${u.prefix}validity`, r = (i) => {
-      i.hasAttribute(t) && p.applyOneCustomValidity(i, t), i.getChildElementFragments().forEach(r);
+      i.hasAttribute(t) && h.applyOneCustomValidity(i, t), i.getChildElementFragments().forEach(r);
     };
     r(e);
   }
@@ -5477,19 +5553,19 @@ const p = class p {
       r.setCustomValidity("");
       return;
     }
-    const n = p.buildConditionScope(e), s = J.evaluateDetailed(
-      p.unwrapConditionExpression(i),
+    const n = h.buildConditionScope(e), s = J.evaluateDetailed(
+      h.unwrapConditionExpression(i),
       n
     );
     if (s.unresolvedReference) {
       m.warn(
         "Haori",
         `${t} の参照が解決できないため無効として扱います: ${i}`
-      ), r.setCustomValidity(p.resolveValidityMessage(e));
+      ), r.setCustomValidity(h.resolveValidityMessage(e));
       return;
     }
     r.setCustomValidity(
-      s.value ? "" : p.resolveValidityMessage(e)
+      s.value ? "" : h.resolveValidityMessage(e)
     );
   }
   /**
@@ -5551,7 +5627,7 @@ const p = class p {
    * @param identifiesItems リストキーで収集先の配列要素を識別できるかどうか
    */
   static registerCollectedRowIdentity(e, t, r, i) {
-    p.COLLECTED_ROW_IDENTITY.set(e, { keyArg: t, keys: r, identifiesItems: i });
+    h.COLLECTED_ROW_IDENTITY.set(e, { keyArg: t, keys: r, identifiesItems: i });
   }
   /**
    * 収集値の階層に、除外されたキーの集合を結び付けます。
@@ -5560,7 +5636,7 @@ const p = class p {
    * @param keys 除外されたキー
    */
   static registerCollectedExcludedKeys(e, t) {
-    t.size > 0 && p.COLLECTED_EXCLUDED_KEYS.set(e, t);
+    t.size > 0 && h.COLLECTED_EXCLUDED_KEYS.set(e, t);
   }
   /**
    * 収集値に控えた情報を、複製した値へ引き継ぎます。
@@ -5573,10 +5649,10 @@ const p = class p {
    * @param to 複製した値
    */
   static carryCollectedRowIdentity(e, t) {
-    const r = p.COLLECTED_ROW_IDENTITY.get(e);
-    r && p.COLLECTED_ROW_IDENTITY.set(t, r);
-    const i = p.COLLECTED_EXCLUDED_KEYS.get(e);
-    i && p.COLLECTED_EXCLUDED_KEYS.set(t, i);
+    const r = h.COLLECTED_ROW_IDENTITY.get(e);
+    r && h.COLLECTED_ROW_IDENTITY.set(t, r);
+    const i = h.COLLECTED_EXCLUDED_KEYS.get(e);
+    i && h.COLLECTED_EXCLUDED_KEYS.set(t, i);
   }
   /**
    * 行の対応付けが出現順へ退いたことを、開発モードで一度だけ知らせます。
@@ -5588,7 +5664,7 @@ const p = class p {
    * @param reason 退いた理由
    */
   static warnPositionalRowFallback(e) {
-    !j.isEnabled() || p.warnedPositionalRowFallbacks.has(e) || (p.warnedPositionalRowFallbacks.add(e), m.warn(
+    !j.isEnabled() || h.warnedPositionalRowFallbacks.has(e) || (h.warnedPositionalRowFallbacks.add(e), m.warn(
       "[Haori]",
       `${u.prefix}form-list の行を出現順で対応付けます（${e}）。配列と画面の行数・並びが一致していない場合、行の値を取り違えます。`
     ));
@@ -5626,8 +5702,8 @@ const p = class p {
   static mergeCollectedValues(e, t) {
     const r = { ...e ?? {} };
     for (const [n, s] of Object.entries(t))
-      p.UNSAFE_MERGE_KEYS.has(n) || (r[n] = p.overlayCollectedValue(e?.[n], s));
-    const i = p.COLLECTED_EXCLUDED_KEYS.get(t);
+      h.UNSAFE_MERGE_KEYS.has(n) || (r[n] = h.overlayCollectedValue(e?.[n], s));
+    const i = h.COLLECTED_EXCLUDED_KEYS.get(t);
     if (i)
       for (const n of i)
         n in t || delete r[n];
@@ -5644,13 +5720,13 @@ const p = class p {
     if (Array.isArray(t)) {
       if (!Array.isArray(e))
         return t;
-      const n = p.overlayIdentifiedRows(e, t);
+      const n = h.overlayIdentifiedRows(e, t);
       return n !== null ? n : t.map(
-        (s, a) => p.overlayCollectedValue(e[a], s)
+        (s, a) => h.overlayCollectedValue(e[a], s)
       );
     }
-    const r = p.asPlainRecord(t), i = p.asPlainRecord(e);
-    return r === null || i === null ? t : p.mergeCollectedValues(i, r);
+    const r = h.asPlainRecord(t), i = h.asPlainRecord(e);
+    return r === null || i === null ? t : h.mergeCollectedValues(i, r);
   }
   /**
    * 式の先頭にある素の経路を返します。
@@ -5668,7 +5744,7 @@ const p = class p {
    * @returns 先頭の経路。経路として読めない場合は null
    */
   static resolveLeadingPath(e) {
-    const t = p.LEADING_PATH_PATTERN.exec(e);
+    const t = h.LEADING_PATH_PATTERN.exec(e);
     if (!t)
       return null;
     const r = t[2].trim();
@@ -5705,7 +5781,7 @@ const p = class p {
     const r = e.getRawAttribute(`${u.prefix}each`);
     if (typeof r != "string" || r.trim() === "")
       return !0;
-    const i = p.resolveLeadingPath(r);
+    const i = h.resolveLeadingPath(r);
     if (i === null)
       return !0;
     const n = i.split(".");
@@ -5729,7 +5805,7 @@ const p = class p {
   static createRowKeyIndexes(e, t) {
     const r = /* @__PURE__ */ new Map();
     return e.forEach((i, n) => {
-      const s = O.createListKey(
+      const s = B.createListKey(
         i,
         t,
         n
@@ -5760,7 +5836,7 @@ const p = class p {
     const i = e.map((s) => s.getListKey());
     if (i.some((s) => s === null))
       return null;
-    const n = p.createRowKeyIndexes(t, r);
+    const n = h.createRowKeyIndexes(t, r);
     return i.map((s) => {
       const a = n.get(s);
       return !a || a.length === 0 ? null : t[a.shift()];
@@ -5782,23 +5858,23 @@ const p = class p {
    * @returns 重ね合わせた配列。対応付けができない場合は null（出現順へ退く）
    */
   static overlayIdentifiedRows(e, t) {
-    const r = p.COLLECTED_ROW_IDENTITY.get(t);
+    const r = h.COLLECTED_ROW_IDENTITY.get(t);
     if (r && !r.identifiesItems)
       return null;
     if (!r)
-      return t.some((s) => p.asPlainRecord(s) !== null) && p.warnPositionalRowFallback("識別情報が引き継がれていません"), null;
+      return t.some((s) => h.asPlainRecord(s) !== null) && h.warnPositionalRowFallback("識別情報が引き継がれていません"), null;
     if (r.keys.length !== t.length)
-      return p.warnPositionalRowFallback("収集後に行の数が変わっています"), null;
+      return h.warnPositionalRowFallback("収集後に行の数が変わっています"), null;
     if (r.keys.some((s) => s === null))
       return null;
-    const i = p.createRowKeyIndexes(e, r.keyArg), n = [];
+    const i = h.createRowKeyIndexes(e, r.keyArg), n = [];
     for (let s = 0; s < t.length; s += 1) {
       const a = r.keys[s], o = i.get(a);
       if (!o || o.length === 0)
         continue;
       const l = o.shift();
       n.push(
-        p.overlayCollectedValue(e[l], t[s])
+        h.overlayCollectedValue(e[l], t[s])
       );
     }
     return n;
@@ -5819,11 +5895,11 @@ const p = class p {
    */
   static syncAncestorArgForms(e, t, r = null) {
     const i = [];
-    for (const { form: n, key: s } of p.collectArgForms(e)) {
+    for (const { form: n, key: s } of h.collectArgForms(e)) {
       if (n.wasResetAfter(t))
         continue;
-      const a = p.resolveAncestorArgOwner(n, s);
-      !a || a.owner !== e || i.push(p.pushAncestorArgValue(n, s, a.value, r));
+      const a = h.resolveAncestorArgOwner(n, s);
+      !a || a.owner !== e || i.push(h.pushAncestorArgValue(n, s, a.value, r));
     }
     return Promise.all(i).then(() => {
     });
@@ -5861,22 +5937,22 @@ const p = class p {
    * @returns 反映完了の Promise
    */
   static pushAncestorArgValue(e, t, r, i = null) {
-    const n = e.getTarget(), s = p.createArgValueSignature(r);
+    const n = e.getTarget(), s = h.createArgValueSignature(r);
     if (s !== null) {
-      if (p.LAST_ANCESTOR_ARG_VALUES.get(n) === s)
+      if (h.LAST_ANCESTOR_ARG_VALUES.get(n) === s)
         return Promise.resolve();
-      p.LAST_ANCESTOR_ARG_VALUES.set(n, s);
+      h.LAST_ANCESTOR_ARG_VALUES.set(n, s);
     } else
-      p.LAST_ANCESTOR_ARG_VALUES.delete(n);
+      h.LAST_ANCESTOR_ARG_VALUES.delete(n);
     const a = e.getRawBindingData();
     if (a && Object.prototype.hasOwnProperty.call(a, t)) {
       const o = { ...a };
-      return delete o[t], O.setBindingData(n, o, {
+      return delete o[t], B.setBindingData(n, o, {
         kind: i?.kind ?? "supply",
         sequence: i?.sequence ?? T.nextSequence()
       });
     }
-    return p.syncValues(e, r, !1, i);
+    return h.syncValues(e, r, !1, i);
   }
   /**
    * 流し込み済み判定に使う値の署名を作ります。
@@ -5915,23 +5991,23 @@ const p = class p {
     });
     const r = [];
     for (const i of t) {
-      if (p.INITIAL_RESTORED_FORMS.has(i))
+      if (h.INITIAL_RESTORED_FORMS.has(i))
         continue;
       const n = N.get(i);
       if (!(n instanceof T))
         continue;
-      const s = n.getRawBindingData(), a = n.getAttribute(`${u.prefix}form-arg`), o = a ? String(a) : null, l = o !== null && !(s && Object.prototype.hasOwnProperty.call(s, o)) ? p.resolveAncestorArgOwner(n, o) : null;
+      const s = n.getRawBindingData(), a = n.getAttribute(`${u.prefix}form-arg`), o = a ? String(a) : null, l = o !== null && !(s && Object.prototype.hasOwnProperty.call(s, o)) ? h.resolveAncestorArgOwner(n, o) : null;
       if (!(!s && !l)) {
-        if (p.INITIAL_RESTORED_FORMS.add(i), l) {
+        if (h.INITIAL_RESTORED_FORMS.add(i), l) {
           r.push(
-            p.pushAncestorArgValue(n, o, l.value)
+            h.pushAncestorArgValue(n, o, l.value)
           );
           continue;
         }
         r.push(
-          p.syncValues(
+          h.syncValues(
             n,
-            p.resolveSyncValues(n, s)
+            h.resolveSyncValues(n, s)
           )
         );
       }
@@ -5939,6 +6015,151 @@ const p = class p {
     return Promise.all(r).then(() => {
     });
   }
+  /**
+   * 同名チェックボックス・ラジオの群を、群単位で収集します。
+   *
+   * 仕様「反映待ちの間に起きた変化」の「**同名チェックボックス・ラジオの群は、欄ごと
+   * ではなく群単位で保護します**」「群のいずれかの欄が要求より後に操作されていれば、
+   * その群の現在の選択集合をそのまま保護します」に対応します。群の値は 1 つのキーに
+   * 対する選択の集合なので、操作された欄だけを取り出すと集合が壊れます。
+   *
+   * 群の範囲は仕様「反映待ちの間に起きた変化」の「群の範囲は、収集値の同じ階層です」
+   * に従い、`resolveCollectionScope()` が返す階層の中だけを数えます。収集の対象外の
+   * 部分木（`data-form-detach`・非表示分岐）と、別の階層（入れ子の `data-form-object` /
+   * `data-form-list` の行）は数えません。同じ群かどうかは「群の同一性は**収集キー**で
+   * 判断します」のとおり `resolveFieldName()` の結果で判定します（DOM の `name` で
+   * 判定すると、`data-form-name` だけを宣言した別のキーの群と混ざる）。
+   *
+   * 走査は DOM 検索ではなくフラグメントの木で行います。収集（`getPartValues()`）と
+   * 同じ木をたどることで階層と除外の判定を一致させ、Haori が管理していない要素
+   * （外部ウィジェットの内部の入力欄など）へフラグメントを生やさないためです。
+   * チェック状態と送信値は仕様「収集は DOM を真とする」のとおり DOM から読みます。
+   *
+   * @param fragment 群のいずれかの入力欄のフラグメント
+   * @param isValueList `data-form-list` を併記しているかどうか
+   * @param minUserEditSequence 編集の基準となる通し番号
+   * @returns 基準より後の操作があったかどうかと、現在の選択集合
+   */
+  static collectGroupSelection(e, t, r) {
+    const i = [];
+    h.collectGroupMembers(
+      h.resolveCollectionScope(e),
+      String(h.resolveFieldName(e)),
+      i
+    );
+    let n = !1;
+    const s = [];
+    for (const a of i) {
+      a.getUserEditSequence() > r && (n = !0);
+      const o = a.getTarget();
+      o instanceof HTMLInputElement && o.checked && s.push(o.value);
+    }
+    return t ? { edited: n, value: h.markCompleteSet(s) } : s.length === 0 ? { edited: n, value: null } : {
+      edited: n,
+      value: s.length === 1 ? s[0] : h.markCompleteSet(s)
+    };
+  }
+  /**
+   * 収集値の新しい階層を始める要素かどうかを判定します。
+   *
+   * `getPartValues()` の分岐と同じ規則です。収集キー（`name` / `data-form-name`）を
+   * 持つ要素は値そのものを表すため階層を作らず、`data-form-object` /
+   * `data-form-list` に**属性値がある**ときだけ階層が変わります（属性値の無い
+   * `data-form-list` は入力要素の値を配列として集める印で、階層は作りません）。
+   *
+   * @param fragment 判定するフラグメント
+   * @returns 新しい階層を始める場合は true
+   */
+  static startsCollectionLevel(e) {
+    return h.resolveFieldName(e) ? !1 : !!(e.getAttribute(`${u.prefix}form-object`) || e.getAttribute(`${u.prefix}form-list`));
+  }
+  /**
+   * 収集値の階層（同じキーの集まる範囲）となるフラグメントを解決します。
+   *
+   * 仕様「反映待ちの間に起きた変化」の「群の範囲は、収集値の同じ階層です」
+   * 「`data-form-list` の**行**、`data-form-object`、最近傍のフォーム（`<form>` または
+   * `data-form`）のうち最も内側の範囲です」に対応します。`data-form-object` は自身が
+   * 階層、`data-form-list` はその直下の要素（= 行）が階層です。フォームの外（どの
+   * 階層にも囲まれていない構成）では、たどり着いた最上位の要素を範囲とします。
+   *
+   * ラジオの排他制御の範囲（`resolveGroupScope()`）とは別の概念です。あちらは HTML の
+   * グループの範囲で `data-form-object` を境界としませんが、こちらは収集値のキーの
+   * 範囲なので `data-form-object` も境界になります。
+   *
+   * @param fragment 起点のフラグメント
+   * @returns 階層となるフラグメント
+   */
+  static resolveCollectionScope(e) {
+    let t = e, r = t.getParent();
+    for (; r !== null; ) {
+      if (h.startsCollectionLevel(r))
+        return r.getAttribute(`${u.prefix}form-object`) ? r : t;
+      if (h.isFormScopeRoot(r))
+        return r;
+      t = r, r = r.getParent();
+    }
+    return t;
+  }
+  /**
+   * フォームの範囲の根（`<form>` または `data-form`）かどうかを判定します。
+   *
+   * @param fragment 判定するフラグメント
+   * @returns フォームの範囲の根であれば true
+   */
+  static isFormScopeRoot(e) {
+    return e.getTarget() instanceof HTMLFormElement || e.hasAttribute(`${u.prefix}form`);
+  }
+  /**
+   * 階層の中から、同じ収集キーを持つ群の欄を集めます。
+   *
+   * 収集（`getPartValues()`）と同じ判定で部分木を刈ります。別の階層（入れ子の
+   * `data-form-object` / `data-form-list`）と、収集の対象外の部分木
+   * （`data-form-detach`・非表示分岐の `data-if-false`）へは入りません。仕様
+   * 「反映待ちの間に起きた変化」の「収集の対象外である部分木の欄も群に含めません」
+   * に対応します。
+   *
+   * 入れ子のフォームはここでは刈りません。範囲の解決（`resolveCollectionScope()`）が
+   * 最近傍のフォームで止まるため、内側の欄は内側のフォームを範囲として数え直され、
+   * 同じキーへの書き込みはそちらが後に来ます（刈っても結果は変わらない）。
+   *
+   * @param fragment 走査するフラグメント（最初の呼び出しでは階層の根）
+   * @param key 群の収集キー
+   * @param members 集める先
+   */
+  static collectGroupMembers(e, t, r) {
+    h.isGroupedCheckable(e) && String(h.resolveFieldName(e)) === t && r.push(e);
+    for (const i of e.getChildElementFragments())
+      h.startsCollectionLevel(i) || i.hasAttribute(`${u.prefix}form-detach`) || // `data-if-false` は hide() が DOM へ直接付与するため実 DOM 属性を見る
+      // （`getPartValues()` と同じ理由）。
+      i.getTarget().hasAttribute(`${u.prefix}if-false`) || h.collectGroupMembers(i, t, r);
+  }
+  /**
+   * 「集合として完結した値」として印を付けます。
+   *
+   * 群の選択集合は 1 つのキーに対する完全な値なので、応答データへ重ねるときに
+   * 位置合わせで要素ごとに混ぜてはいけません（`data-form-list` の行の配列とは
+   * 意味が違います）。印は `Procedure` の `mergeUserEdits()` が見て、丸ごと
+   * 置き換えます。
+   *
+   * @param value 印を付ける配列
+   * @returns 同じ配列
+   */
+  static markCompleteSet(e) {
+    return h.COMPLETE_SET_VALUES.add(e), e;
+  }
+  /**
+   * 「集合として完結した値」の印が付いているかを返します。
+   *
+   * `Procedure` の `mergeUserEdits()` から参照するためだけに公開しています。仕様書に
+   * 載る API ではないため、利用者向けの機能として扱わないでください。
+   *
+   * @internal
+   * @param value 判定する値
+   * @returns 印が付いていれば true
+   */
+  static isCompleteSetValue(e) {
+    return e !== null && typeof e == "object" && h.COMPLETE_SET_VALUES.has(e);
+  }
   /**
    * 値による上書きをグループ単位で扱うべき入力要素（boolean 型でない
    * チェックボックス、またはラジオボタン）かどうかを判定します。
@@ -5986,77 +6207,73 @@ const p = class p {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setPartValues(e, t, r = !1, i = !0, n = !1, s = /* @__PURE__ */ new Map(), a = null) {
-    const o = [], l = p.resolveFieldName(e), c = e.getAttribute(`${u.prefix}form-object`), d = e.getAttribute(`${u.prefix}form-list`), h = e.hasAttribute(`${u.prefix}form-list`), y = e.getAttribute(`${u.prefix}form-detach`);
+    const o = [];
+    if (e.hasAttribute(`${u.prefix}form-detach`) && !r)
+      return Promise.resolve();
+    const l = h.resolveFieldName(e), c = e.getAttribute(`${u.prefix}form-object`), d = e.getAttribute(`${u.prefix}form-list`), p = e.hasAttribute(`${u.prefix}form-list`);
     if (l) {
-      if (!y || r) {
-        const A = t[String(l)], S = n && p.hasResolvedDeclarativeState(e), P = n && typeof A > "u" && !p.isDeclarativeStateBound(e);
-        let D = A;
-        if (S ? D = void 0 : P && (D = null), p.isFileInput(e))
-          return (D === null || D === "") && o.push(
-            p.applyFragmentValue(e, null, i, a)
-          ), Promise.all(o).then(() => {
-          });
-        if (h && Array.isArray(D) && // チェックボックスグループと複数選択 select は配列そのものを状態として
-        // 解釈する（後続の分岐）。位置で配ると選択状態を決められないため、
-        // `data-form-list` を併記していても従来どおりそちらへ渡す。
-        !p.isGroupedCheckable(e) && !p.isMultipleSelect(e)) {
-          const L = String(l), E = s.get(L) ?? 0;
-          s.set(L, E + 1), o.push(
-            p.applyFragmentValue(
-              e,
-              D[E] ?? null,
-              i,
-              a
-            )
-          );
-        } else typeof D > "u" || (Array.isArray(D) && p.isGroupedCheckable(e) || Array.isArray(D) && p.isMultipleSelect(e) || typeof D == "string" || typeof D == "number" || typeof D == "boolean" || D === null ? o.push(
-          p.applyFragmentValue(
-            e,
-            D,
-            i,
-            a
-          )
-        ) : o.push(
-          p.applyFragmentValue(
+      const y = t[String(l)], A = n && h.hasResolvedDeclarativeState(e), S = n && typeof y > "u" && !h.isDeclarativeStateBound(e);
+      let D = y;
+      if (A ? D = void 0 : S && (D = null), h.isFileInput(e))
+        return (D === null || D === "") && o.push(
+          h.applyFragmentValue(e, null, i, a)
+        ), Promise.all(o).then(() => {
+        });
+      if (p && Array.isArray(D) && // チェックボックスグループと複数選択 select は配列そのものを状態として
+      // 解釈する（後続の分岐）。位置で配ると選択状態を決められないため、
+      // `data-form-list` を併記していても従来どおりそちらへ渡す。
+      !h.isGroupedCheckable(e) && !h.isMultipleSelect(e)) {
+        const P = String(l), H = s.get(P) ?? 0;
+        s.set(P, H + 1), o.push(
+          h.applyFragmentValue(
             e,
-            String(D),
+            D[H] ?? 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(
+        h.applyFragmentValue(
+          e,
+          D,
+          i,
+          a
+        )
+      ) : o.push(
+        h.applyFragmentValue(e, String(D), i, a)
+      ));
     } else if (c) {
-      const A = t[String(c)];
-      if (A && typeof A == "object") {
-        const S = /* @__PURE__ */ new Map();
-        for (const P of e.getChildElementFragments())
+      const y = t[String(c)];
+      if (y && typeof y == "object") {
+        const A = /* @__PURE__ */ new Map();
+        for (const S of e.getChildElementFragments())
           o.push(
-            p.setPartValues(
-              P,
-              A,
+            h.setPartValues(
+              S,
+              y,
               r,
               i,
               n,
-              S,
+              A,
               a
             )
           );
       }
     } else if (d) {
-      const A = t[String(d)];
-      if (Array.isArray(A)) {
-        const S = e.getChildElementFragments(), P = e.getAttribute(`${u.prefix}each-key`), D = p.isCollectedListFromEachSource(e) ? p.pairRowsWithItems(
-          S,
+      const y = t[String(d)];
+      if (Array.isArray(y)) {
+        const A = e.getChildElementFragments(), S = e.getAttribute(`${u.prefix}each-key`), D = h.isCollectedListFromEachSource(e) ? h.pairRowsWithItems(
           A,
-          P == null ? null : String(P)
+          y,
+          S == null ? null : String(S)
         ) : null;
-        for (let L = 0; L < S.length; L++) {
-          const E = S[L], v = D ? D[L] : A.length > L ? A[L] : null;
+        for (let P = 0; P < A.length; P++) {
+          const H = A[P], E = D ? D[P] : y.length > P ? y[P] : null;
           o.push(
             // 行ごとに values が切り替わるので出現位置も行単位で数える。
-            p.setPartValues(
-              E,
-              p.asPlainRecord(v) ?? {},
+            h.setPartValues(
+              H,
+              h.asPlainRecord(E) ?? {},
               r,
               i,
               n,
@@ -6067,10 +6284,10 @@ const p = class p {
         }
       }
     } else
-      for (const A of e.getChildElementFragments())
+      for (const y of e.getChildElementFragments())
         o.push(
-          p.setPartValues(
-            A,
+          h.setPartValues(
+            y,
             t,
             r,
             i,
@@ -6098,14 +6315,14 @@ const p = class p {
    * @returns すべての初期化処理が完了するPromise
    */
   static async reset(e, t = T.nextSequence()) {
-    const r = p.collectBindingTargetForms(e);
+    const r = h.collectBindingTargetForms(e);
     if (r.length > 0 && r.every((n) => n.isSupplyStale(t)))
       return;
-    p.markResetSubtree(e, t), O.clearUserEditMarks(e), p.clearValues(e), await Promise.all([
-      p.clearMessages(e),
-      p.clearEachClones(e)
+    h.markResetSubtree(e, t), B.clearUserEditMarks(e), h.clearValues(e), await Promise.all([
+      h.clearMessages(e),
+      h.clearEachClones(e)
     ]), await W.enqueue(() => {
-      const n = p.collectEditsAfter(
+      const n = h.collectEditsAfter(
         e,
         t
       ), s = e.getTarget();
@@ -6119,36 +6336,36 @@ const p = class p {
           l.appendChild(s), l.reset(), a.insertBefore(s, o);
         }
       }
-      p.clearDeclarativeStateFromDom(e), p.restoreEdits(n);
+      h.clearDeclarativeStateFromDom(e), h.restoreEdits(n);
     });
     const i = r;
     for (const n of i) {
-      const s = p.getInitialBindingData(n);
-      s === null && n.getRawBindingData() === null || await O.setBindingData(n.getTarget(), s ?? {}, {
+      const s = h.getInitialBindingData(n);
+      s === null && n.getRawBindingData() === null || await B.setBindingData(n.getTarget(), s ?? {}, {
         sequence: t
       });
     }
-    p.syncValuesFromDom(e), await O.evaluateAll(e);
+    h.syncValuesFromDom(e), await B.evaluateAll(e);
     for (const n of i)
-      p.getInitialBindingData(n) !== null || n.getRawBindingData() !== null || await p.restoreAncestorArgValues(n, {
+      h.getInitialBindingData(n) !== null || n.getRawBindingData() !== null || await h.restoreAncestorArgValues(n, {
         sequence: t,
         kind: "supply"
       });
     for (const n of i) {
-      const s = p.getInitialBindingData(n);
+      const s = h.getInitialBindingData(n);
       if (n.getRawBindingData() === null && s === null)
         continue;
-      const a = p.getValues(n), o = n.getAttribute(`${u.prefix}form-arg`);
+      const a = h.getValues(n), o = n.getAttribute(`${u.prefix}form-arg`);
       let l = { ...s || {} };
       if (o) {
         const c = String(o);
-        !Object.prototype.hasOwnProperty.call(s ?? {}, c) && p.resolveAncestorArgOwner(n, c) !== null || (l[c] = p.mergeCollectedValues(
+        !Object.prototype.hasOwnProperty.call(s ?? {}, c) && h.resolveAncestorArgOwner(n, c) !== null || (l[c] = h.mergeCollectedValues(
           l[c] ?? null,
           a
         ));
       } else
-        l = p.mergeCollectedValues(l, a);
-      await O.setBindingData(n.getTarget(), l, {
+        l = h.mergeCollectedValues(l, a);
+      await B.setBindingData(n.getTarget(), l, {
         sequence: t
       });
     }
@@ -6161,7 +6378,7 @@ const p = class p {
    */
   static getInitialBindingData(e) {
     const t = e.getInitialBindAttribute();
-    return t === null ? null : O.parseDataBind(t);
+    return t === null ? null : B.parseDataBind(t);
   }
   /**
    * フラグメント配下の入力要素について、内部値を現在の DOM 値と再同期します。
@@ -6172,7 +6389,7 @@ const p = class p {
     const t = e.getTarget();
     (t instanceof HTMLInputElement || t instanceof HTMLTextAreaElement || t instanceof HTMLSelectElement) && e.syncValue();
     for (const r of e.getChildElementFragments())
-      p.syncValuesFromDom(r);
+      h.syncValuesFromDom(r);
   }
   /**
    * リセット後にバインドデータを更新すべきフォームフラグメントを収集します。
@@ -6227,7 +6444,7 @@ const p = class p {
   static clearValues(e) {
     e.clearValue();
     for (const t of e.getChildElementFragments())
-      p.clearValues(t);
+      h.clearValues(t);
   }
   /**
    * 指定した通番より後に編集された入力欄の DOM の状態を控えます。
@@ -6251,7 +6468,7 @@ const p = class p {
       )
     }) : r.push({ element: i, value: i.value }));
     for (const n of e.getChildElementFragments())
-      p.collectEditsAfter(n, t, r);
+      h.collectEditsAfter(n, t, r);
     return r;
   }
   /**
@@ -6293,8 +6510,8 @@ const p = class p {
     const r = e.getAttribute(`${u.prefix}form-arg`);
     if (!r)
       return;
-    const i = String(r), n = p.resolveAncestorArgOwner(e, i);
-    n && (p.LAST_ANCESTOR_ARG_VALUES.delete(e.getTarget()), await p.pushAncestorArgValue(e, i, n.value, t));
+    const i = String(r), n = h.resolveAncestorArgOwner(e, i);
+    n && (h.LAST_ANCESTOR_ARG_VALUES.delete(e.getTarget()), await h.pushAncestorArgValue(e, i, n.value, t));
   }
   /**
    * 初期化の通番を部分木のすべてのフラグメントへ記録します。
@@ -6310,7 +6527,7 @@ const p = class p {
   static markResetSubtree(e, t) {
     e.markResetAt(t), e.markSupplyApplied(t);
     for (const r of e.getChildElementFragments())
-      p.markResetSubtree(r, t);
+      h.markResetSubtree(r, t);
   }
   /**
    * フラグメントとその子要素のメッセージをクリアします。
@@ -6319,7 +6536,7 @@ const p = class p {
    * @returns Promise（メッセージのクリアが完了したら解決される）
    */
   static clearMessages(e) {
-    return ze().clearMessages(
+    return Ge().clearMessages(
       e.getTarget()
     );
   }
@@ -6333,7 +6550,7 @@ const p = class p {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addErrorMessage(e, t, r) {
-    return p.addMessage(e, t, r, "error");
+    return h.addMessage(e, t, r, "error");
   }
   /**
    * キーに一致するフラグメントにレベル付きメッセージを追加します。
@@ -6346,7 +6563,7 @@ const p = class p {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(e, t, r, i) {
-    const n = [], s = ze(), a = s.addMessage, o = (c) => typeof a == "function" ? a.call(s, c, r, i) : s.addErrorMessage(c, r), l = p.findFragmentsByKey(e, t);
+    const n = [], s = Ge(), a = s.addMessage, o = (c) => typeof a == "function" ? a.call(s, c, r, i) : s.addErrorMessage(c, r), l = h.findFragmentsByKey(e, t);
     return l.forEach((c) => {
       n.push(o(c.getTarget()));
     }), l.length === 0 && n.push(o(e.getTarget())), Promise.all(n).then(() => {
@@ -6360,7 +6577,7 @@ const p = class p {
    * @returns 一致するフラグメントの配列
    */
   static findFragmentsByKey(e, t) {
-    return p.findFragmentByKeyParts(e, t.split("."));
+    return h.findFragmentByKeyParts(e, t.split("."));
   }
   /**
    * 指定されたキーに一致するフラグメントを検索します。
@@ -6372,9 +6589,9 @@ const p = class p {
    */
   static findFragmentByKeyParts(e, t) {
     const r = [], i = t[0];
-    if (t.length == 1 && p.resolveFieldName(e) === i && r.push(e), e.hasAttribute(`${u.prefix}form-object`))
+    if (t.length == 1 && h.resolveFieldName(e) === i && r.push(e), e.hasAttribute(`${u.prefix}form-object`))
       t.length > 1 && e.getAttribute(`${u.prefix}form-object`) === i && e.getChildElementFragments().forEach((s) => {
-        r.push(...p.findFragmentByKeyParts(s, t.slice(1)));
+        r.push(...h.findFragmentByKeyParts(s, t.slice(1)));
       });
     else if (e.hasAttribute(`${u.prefix}form-list`)) {
       if (t.length > 1) {
@@ -6386,9 +6603,9 @@ const p = class p {
             if (isNaN(c))
               m.error("Haori", `Invalid index: ${i}`);
             else {
-              const d = e.getChildElementFragments().filter((h) => h.hasAttribute(`${u.prefix}row`));
+              const d = e.getChildElementFragments().filter((p) => p.hasAttribute(`${u.prefix}row`));
               c < d.length && r.push(
-                ...p.findFragmentByKeyParts(d[c], t.slice(1))
+                ...h.findFragmentByKeyParts(d[c], t.slice(1))
               );
             }
           }
@@ -6396,7 +6613,7 @@ const p = class p {
       }
     } else
       e.getChildElementFragments().forEach((n) => {
-        r.push(...p.findFragmentByKeyParts(n, t));
+        r.push(...h.findFragmentByKeyParts(n, t));
       });
     return r;
   }
@@ -6419,13 +6636,13 @@ const p = class p {
     return r ? this.getFormFragment(r) : null;
   }
 };
-p.INITIAL_RESTORED_FORMS = /* @__PURE__ */ new WeakSet(), p.LAST_ANCESTOR_ARG_VALUES = /* @__PURE__ */ new WeakMap(), p.GROUP_SCOPE_IDS = /* @__PURE__ */ new WeakMap(), p.groupScopeSequence = 0, p.UNSAFE_MERGE_KEYS = /* @__PURE__ */ new Set([
+h.INITIAL_RESTORED_FORMS = /* @__PURE__ */ new WeakSet(), h.LAST_ANCESTOR_ARG_VALUES = /* @__PURE__ */ new WeakMap(), h.GROUP_SCOPE_IDS = /* @__PURE__ */ new WeakMap(), h.groupScopeSequence = 0, h.UNSAFE_MERGE_KEYS = /* @__PURE__ */ new Set([
   "__proto__",
   "constructor",
   "prototype"
-]), p.COLLECTED_ROW_IDENTITY = /* @__PURE__ */ new WeakMap(), p.COLLECTED_EXCLUDED_KEYS = /* @__PURE__ */ new WeakMap(), p.warnedPositionalRowFallbacks = /* @__PURE__ */ new Set(), p.LEADING_PATH_PATTERN = /^\s*([A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*)*)\s*([\s\S]*)$/;
-let F = p;
-class H {
+]), h.COLLECTED_ROW_IDENTITY = /* @__PURE__ */ new WeakMap(), h.COMPLETE_SET_VALUES = /* @__PURE__ */ new WeakSet(), h.COLLECTED_EXCLUDED_KEYS = /* @__PURE__ */ new WeakMap(), h.warnedPositionalRowFallbacks = /* @__PURE__ */ new Set(), h.LEADING_PATH_PATTERN = /^\s*([A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*)*)\s*([\s\S]*)$/;
+let F = h;
+class O {
   /**
    * カスタムイベントを発火します。
    *
@@ -6449,7 +6666,7 @@ class H {
    * @param version ライブラリバージョン
    */
   static ready(e) {
-    H.dispatch(document, "ready", { version: e });
+    O.dispatch(document, "ready", { version: e });
   }
   /**
    * importstartイベントを発火します。
@@ -6458,7 +6675,7 @@ class H {
    * @param url インポート対象URL
    */
   static importStart(e, t) {
-    H.dispatch(e, "importstart", {
+    O.dispatch(e, "importstart", {
       url: t,
       startedAt: performance.now()
     });
@@ -6472,7 +6689,7 @@ class H {
    * @param startedAt 開始時刻
    */
   static importEnd(e, t, r, i) {
-    H.dispatch(e, "importend", {
+    O.dispatch(e, "importend", {
       url: t,
       bytes: r,
       durationMs: performance.now() - i
@@ -6486,7 +6703,7 @@ class H {
    * @param error エラー内容
    */
   static importError(e, t, r) {
-    H.dispatch(e, "importerror", { url: t, error: r });
+    O.dispatch(e, "importerror", { url: t, error: r });
   }
   /**
    * bindchangeイベントを発火します。
@@ -6502,7 +6719,7 @@ class H {
       const c = t?.[l], d = r[l];
       c !== d && n.push(l);
     }
-    H.dispatch(e, "bindchange", {
+    O.dispatch(e, "bindchange", {
       previous: t || {},
       next: r,
       changedKeys: n,
@@ -6521,7 +6738,7 @@ class H {
    * @param reason 変更理由
    */
   static bindComplete(e, t = null, r = "other") {
-    H.dispatch(e, "bindcomplete", { bindArg: t, reason: r });
+    O.dispatch(e, "bindcomplete", { bindArg: t, reason: r });
   }
   /**
    * eachupdateイベントを発火します。
@@ -6532,7 +6749,7 @@ class H {
    * @param order 現在の順序
    */
   static eachUpdate(e, t, r, i) {
-    H.dispatch(e, "eachupdate", {
+    O.dispatch(e, "eachupdate", {
       added: t,
       removed: r,
       order: i,
@@ -6548,7 +6765,7 @@ class H {
    * @param item 行データ
    */
   static rowAdd(e, t, r, i) {
-    H.dispatch(e, "rowadd", { key: t, index: r, item: i });
+    O.dispatch(e, "rowadd", { key: t, index: r, item: i });
   }
   /**
    * rowremoveイベントを発火します。
@@ -6558,7 +6775,7 @@ class H {
    * @param index インデックス
    */
   static rowRemove(e, t, r) {
-    H.dispatch(e, "rowremove", { key: t, index: r });
+    O.dispatch(e, "rowremove", { key: t, index: r });
   }
   /**
    * rowmoveイベントを発火します。
@@ -6569,7 +6786,7 @@ class H {
    * @param to 移動後インデックス
    */
   static rowMove(e, t, r, i) {
-    H.dispatch(e, "rowmove", { key: t, from: r, to: i });
+    O.dispatch(e, "rowmove", { key: t, from: r, to: i });
   }
   /**
    * showイベントを発火します。
@@ -6577,7 +6794,7 @@ class H {
    * @param target data-if要素
    */
   static show(e) {
-    H.dispatch(e, "show", { visible: !0 });
+    O.dispatch(e, "show", { visible: !0 });
   }
   /**
    * hideイベントを発火します。
@@ -6585,7 +6802,7 @@ class H {
    * @param target data-if要素
    */
   static hide(e) {
-    H.dispatch(e, "hide", { visible: !1 });
+    O.dispatch(e, "hide", { visible: !1 });
   }
   /**
    * fetchstartイベントを発火します。
@@ -6598,7 +6815,7 @@ class H {
    * @return 戻り値はありません。
    */
   static fetchStart(e, t, r, i, n) {
-    H.dispatch(e, "fetchstart", {
+    O.dispatch(e, "fetchstart", {
       url: t,
       options: r || {},
       payload: i,
@@ -6615,7 +6832,7 @@ class H {
    * @param startedAt 開始時刻
    */
   static fetchEnd(e, t, r, i) {
-    H.dispatch(e, "fetchend", {
+    O.dispatch(e, "fetchend", {
       url: t,
       status: r,
       durationMs: performance.now() - i
@@ -6631,7 +6848,7 @@ class H {
    * @param startedAt 開始時刻（存在する場合）
    */
   static fetchError(e, t, r, i, n) {
-    H.dispatch(e, "fetcherror", {
+    O.dispatch(e, "fetcherror", {
       url: t,
       status: i,
       error: r,
@@ -6647,7 +6864,7 @@ class H {
    * @return 戻り値はありません。
    */
   static pollTimeout(e, t, r) {
-    H.dispatch(e, "polltimeout", { count: t, elapsedMs: r });
+    O.dispatch(e, "polltimeout", { count: t, elapsedMs: r });
   }
   /**
    * pollstopイベントを発火します。
@@ -6661,7 +6878,7 @@ class H {
    * @return 戻り値はありません。
    */
   static pollStop(e, t, r, i) {
-    H.dispatch(e, "pollstop", { reason: t, count: r, elapsedMs: i });
+    O.dispatch(e, "pollstop", { reason: t, count: r, elapsedMs: i });
   }
 }
 const Rt = {
@@ -6720,7 +6937,7 @@ function ct(g) {
   }
   return !1;
 }
-class z {
+class G {
   /**
    * セレクタ属性の値を評価済みの文字列として読み取ります。
    *
@@ -6892,12 +7109,12 @@ const I = class I {
     const a = e.getRawAttribute(`${u.prefix}store-arg`), o = a === null || a.trim() === "" ? null : a.trim(), l = e.getRawAttribute(`${u.prefix}store-params`);
     let c = null;
     if (l !== null) {
-      const d = l.split("&").map((y) => y.trim()).filter((y) => y !== ""), h = d.filter((y) => !I.isReservedKey(y));
-      h.length !== d.length && I.warnOnce(
+      const d = l.split("&").map((y) => y.trim()).filter((y) => y !== ""), p = d.filter((y) => !I.isReservedKey(y));
+      p.length !== d.length && I.warnOnce(
         t,
         "reserved",
         `${u.prefix}store-params の予約キー（先頭が _ のキー）は対象外です。`
-      ), c = h.length > 0 ? h : null;
+      ), c = p.length > 0 ? p : null;
     }
     return c === null && o === null ? (I.warnOnce(
       t,
@@ -7105,7 +7322,7 @@ const I = class I {
       ), Promise.resolve();
     I.RESTORED_ELEMENTS.add(r);
     const i = I.readRecord(t), n = i ? I.extractFromRecord(t, i) : {}, s = { ...e.getRawBindingData() ?? {}, ...n };
-    return I.seedSignature(r, I.selectFromData(t, s)), Object.keys(n).length === 0 ? Promise.resolve() : O.setBindingData(r, s, {
+    return I.seedSignature(r, I.selectFromData(t, s)), Object.keys(n).length === 0 ? Promise.resolve() : B.setBindingData(r, s, {
       reentrant: !0,
       kind: "nonSupply",
       sequence: T.nextSequence()
@@ -7247,7 +7464,7 @@ const Nt = [
   "dialog",
   "openDialog",
   "toast"
-], Ft = "__haoriHistoryState__", Me = "data-haori-click-lock";
+], Ft = "__haoriHistoryState__", xe = "data-haori-click-lock";
 function Ae() {
   const e = globalThis.window?.Haori;
   return Nt.every(
@@ -7258,7 +7475,7 @@ const kt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
 function Pe(g) {
   return kt.has(g.toUpperCase());
 }
-function xt(g, e) {
+function Mt(g, e) {
   for (const [t, r] of Object.entries(e))
     r !== void 0 && (Array.isArray(r) ? r.forEach((i) => {
       g.append(t, le(i));
@@ -7277,9 +7494,9 @@ function le(g) {
 }
 function ft(g, e) {
   const t = new URL(g, window.location.href), r = new URLSearchParams(t.search);
-  return xt(r, e), t.search = r.toString(), t.toString();
+  return Mt(r, e), t.search = r.toString(), t.toString();
 }
-function Mt(g) {
+function xt(g) {
   if (g == null)
     return { payload: {}, dropped: !1 };
   if (typeof g == "string") {
@@ -7296,12 +7513,12 @@ function Mt(g) {
       return { payload: {}, dropped: !0 };
     }
     return e.includes("=") ? {
-      payload: Ge(new URLSearchParams(e)),
+      payload: ze(new URLSearchParams(e)),
       dropped: !1
     } : { payload: {}, dropped: !0 };
   }
   if (g instanceof URLSearchParams)
-    return { payload: Ge(g), dropped: !1 };
+    return { payload: ze(g), dropped: !1 };
   if (typeof FormData < "u" && g instanceof FormData) {
     const e = {};
     let t = !1;
@@ -7316,7 +7533,7 @@ function Mt(g) {
   }
   return { payload: {}, dropped: !0 };
 }
-function Ge(g) {
+function ze(g) {
   const e = {};
   for (const [t, r] of g.entries())
     ht(e, t, r);
@@ -7327,6 +7544,8 @@ function ht(g, e, t) {
   r === void 0 ? g[e] = t : Array.isArray(r) ? r.push(t) : g[e] = [r, t];
 }
 function ne(g, e) {
+  if (F.isCompleteSetValue(e))
+    return e;
   if (Array.isArray(e)) {
     const t = Array.isArray(g) ? g.slice() : [];
     let r = !1;
@@ -7358,7 +7577,7 @@ function Pt(g, e) {
       effectiveMethod: r,
       normalized: !1
     };
-  const { payload: i, dropped: n } = Mt(
+  const { payload: i, dropped: n } = xt(
     t.body
   );
   let s = g;
@@ -7608,7 +7827,7 @@ const b = class b {
     const a = r.trim();
     if (b.SINGLE_PLACEHOLDER_REGEX.test(a))
       return {
-        value: O.parseDataBind(n),
+        value: B.parseDataBind(n),
         hasUnresolvedReference: s
       };
     if (a.startsWith("{") || a.startsWith("[")) {
@@ -7617,7 +7836,7 @@ const b = class b {
         e.getBindingData()
       );
       return {
-        value: O.parseDataBind(l.value),
+        value: B.parseDataBind(l.value),
         hasUnresolvedReference: s || l.hasUnresolvedReference
       };
     }
@@ -7626,7 +7845,7 @@ const b = class b {
       e.getBindingData()
     );
     return {
-      value: O.parseDataBind(o.value),
+      value: B.parseDataBind(o.value),
       hasUnresolvedReference: s || o.hasUnresolvedReference
     };
   }
@@ -7651,12 +7870,12 @@ const b = class b {
     if (t) {
       if (e.hasAttribute(b.attrName(t, "validate")) && (r.valid = !0), e.hasAttribute(b.attrName(t, "confirm")) && (r.confirmMessage = e.getAttribute(b.attrName(t, "confirm")).replace(/\\n/g, `
 `)), e.hasAttribute(b.attrName(t, "data")) && (r.dataAttrName = b.attrName(t, "data")), e.hasAttribute(b.attrName(t, "form"))) {
-        const v = z.read(
+        const v = G.read(
           e,
           b.attrName(t, "form")
         );
         if (v) {
-          const R = z.query(
+          const R = G.query(
             v,
             b.attrName(t, "form")
           );
@@ -7702,8 +7921,8 @@ ${v}
             R = new Function("event", `"use strict";
 ${v}
 `);
-          } catch (x) {
-            m.error("Haori", `Invalid run script: ${x}`);
+          } catch (C) {
+            m.error("Haori", `Invalid run script: ${C}`);
           }
         }
         R && (r.runScript = R);
@@ -7737,7 +7956,7 @@ ${v}
           E
         );
         try {
-          a.headers = O.parseDataBind(v);
+          a.headers = B.parseDataBind(v);
         } catch (R) {
           m.error("Haori", `Invalid fetch headers: ${R}`);
         }
@@ -7753,7 +7972,7 @@ ${v}
           E
         );
         try {
-          a.headers = O.parseDataBind(v);
+          a.headers = B.parseDataBind(v);
         } catch (R) {
           m.error("Haori", `Invalid fetch headers: ${R}`);
         }
@@ -7803,12 +8022,12 @@ ${v}
     Object.keys(a).length > 0 && (r.fetchOptions = a);
     const o = t ? b.attrName(t, "bind") : b.attrName(null, "bind", !0);
     if (e.hasAttribute(o)) {
-      const E = z.read(e, o);
+      const E = G.read(e, o);
       if (E) {
-        const v = z.queryAll(E, o);
+        const v = G.queryAll(E, o);
         v.length > 0 ? (r.bindFragments = [], v.forEach((R) => {
-          const x = N.get(R);
-          x && r.bindFragments.push(x);
+          const C = N.get(R);
+          C && r.bindFragments.push(C);
         })) : m.error(
           "Haori",
           `Bind element not found: ${E} (${o})`
@@ -7819,9 +8038,9 @@ ${v}
     t ? e.hasAttribute(l) && (r.bindArg = e.getRawAttribute(l)) : e.hasAttribute(c) ? r.bindArg = e.getRawAttribute(
       c
     ) : e.hasAttribute(d) && (r.bindArg = e.getRawAttribute(d));
-    const h = t ? b.attrName(t, "bind-params") : b.attrName(null, "bind-params", !0);
-    if (e.hasAttribute(h)) {
-      const E = e.getRawAttribute(h);
+    const p = t ? b.attrName(t, "bind-params") : b.attrName(null, "bind-params", !0);
+    if (e.hasAttribute(p)) {
+      const E = e.getRawAttribute(p);
       r.bindParams = E.split("&").map((v) => v.trim());
     }
     const y = t ? b.attrName(t, "bind-append") : b.attrName(null, "bind-append", !0);
@@ -7833,24 +8052,24 @@ ${v}
     e.hasAttribute(A) && (r.bindMerge = !0);
     const S = t ? b.attrName(t, "bind-transform") : b.attrName(null, "bind-transform", !0);
     e.hasAttribute(S) && (r.bindTransform = e.getRawAttribute(S));
-    const P = t ? b.attrName(t, "copy-params") : null;
-    if (P && e.hasAttribute(P)) {
-      const E = e.getRawAttribute(P);
+    const D = t ? b.attrName(t, "copy-params") : null;
+    if (D && e.hasAttribute(D)) {
+      const E = e.getRawAttribute(D);
       r.copyParams = E.split("&").map((v) => v.trim()).filter(Boolean);
     }
     if (t) {
       if (e.hasAttribute(b.attrName(t, "adjust"))) {
-        const R = z.read(
+        const R = G.read(
           e,
           b.attrName(t, "adjust")
         );
         if (R) {
-          const x = z.queryAll(
+          const C = G.queryAll(
             R,
             b.attrName(t, "adjust")
           );
-          x.length > 0 ? (r.adjustFragments = [], x.forEach((k) => {
-            const V = N.get(k);
+          C.length > 0 ? (r.adjustFragments = [], C.forEach((x) => {
+            const V = N.get(x);
             V && r.adjustFragments.push(V);
           })) : m.error(
             "Haori",
@@ -7858,10 +8077,10 @@ ${v}
           );
         }
         if (e.hasAttribute(b.attrName(t, "adjust-value"))) {
-          const x = e.getRawAttribute(
+          const C = e.getRawAttribute(
             b.attrName(t, "adjust-value")
-          ), k = Number(x);
-          isNaN(k) || (r.adjustValue = k);
+          ), x = Number(C);
+          isNaN(x) || (r.adjustValue = x);
         }
       }
       if (e.hasAttribute(b.attrName(t, "row-add")) && (r.rowAdd = !0), e.hasAttribute(b.attrName(t, "row-remove")) && (r.rowRemove = !0), e.hasAttribute(b.attrName(t, "row-prev")) && (r.rowMovePrev = !0), e.hasAttribute(b.attrName(t, "row-next")) && (r.rowMoveNext = !0), e.hasAttribute(`${u.prefix}${t}-after-run`)) {
@@ -7876,8 +8095,8 @@ ${v}
 ${R}
 `
           );
-        } catch (x) {
-          m.error("Haori", `Invalid after script: ${x}`);
+        } catch (C) {
+          m.error("Haori", `Invalid after script: ${C}`);
         }
       }
       if (e.hasAttribute(b.attrName(t, "dialog")) && (r.dialogMessage = b.unescapeNewlines(
@@ -7896,8 +8115,8 @@ ${R}
         );
         const R = e.getRawAttribute(
           b.attrName(t, "toast-level")
-        ), k = ["info", "warning", "error", "success"].includes(R);
-        r.toastLevel = k ? R : null;
+        ), x = ["info", "warning", "error", "success"].includes(R);
+        r.toastLevel = x ? R : null;
       }
       if (e.hasAttribute(b.attrName(t, "redirect"))) {
         r.redirectUrl = b.readLateAttribute(
@@ -7928,17 +8147,17 @@ ${R}
         "history",
         b.attrName(t, "history")
       )), e.hasAttribute(b.attrName(t, "history-data")) && (r.historyDataAttrName = b.attrName(t, "history-data")), e.hasAttribute(b.attrName(t, "history-form"))) {
-        const R = z.read(
+        const R = G.read(
           e,
           b.attrName(t, "history-form")
         );
         if (R) {
-          const x = z.query(
+          const C = G.query(
             R,
             b.attrName(t, "history-form")
           );
-          x !== null ? r.historyFormFragment = F.getFormFragment(
-            N.get(x)
+          C !== null ? r.historyFormFragment = F.getFormFragment(
+            N.get(C)
           ) : m.error(
             "Haori",
             `Form element not found: ${R} (${b.attrName(t, "history-form")})`
@@ -7955,18 +8174,18 @@ ${R}
         "open",
         "close"
       ].forEach((R) => {
-        const x = b.attrName(t, R);
-        if (!e.hasAttribute(x))
+        const C = b.attrName(t, R);
+        if (!e.hasAttribute(C))
           return;
-        const k = z.read(e, x), V = [];
-        if (k)
-          z.queryAll(k, x).forEach((_) => {
+        const x = G.read(e, C), V = [];
+        if (x)
+          G.queryAll(x, C).forEach((_) => {
             const Z = N.get(_);
             Z && V.push(Z);
-          }), V.length === 0 && m.error("Haori", `Element not found: ${k} (${x})`);
+          }), V.length === 0 && m.error("Haori", `Element not found: ${x} (${C})`);
         else if (R === "open" || R === "close") {
-          const G = e.getTarget().closest("dialog");
-          G ? V.push(N.get(G)) : m.error("Haori", `Ancestor <dialog> not found (${x})`);
+          const z = e.getTarget().closest("dialog");
+          z ? V.push(N.get(z)) : m.error("Haori", `Ancestor <dialog> not found (${C})`);
         } else
           V.push(e);
         if (V.length > 0)
@@ -7996,12 +8215,12 @@ ${R}
       });
       const v = b.attrName(t, "copy-source");
       if (e.hasAttribute(v)) {
-        const R = z.read(e, v);
+        const R = G.read(e, v);
         if (R) {
-          const x = z.query(R, v);
-          if (x !== null) {
-            const k = N.get(x);
-            k ? r.copySourceFragment = k : m.error(
+          const C = G.query(R, v);
+          if (C !== null) {
+            const x = N.get(C);
+            x ? r.copySourceFragment = x : m.error(
               "Haori",
               `Element is not managed by Haori: ${R} (${v})`
             );
@@ -8015,12 +8234,12 @@ ${R}
       }
     }
     if (!t && (e.hasAttribute(b.attrName(null, "data", !0)) && (r.dataAttrName = b.attrName(null, "data", !0)), e.hasAttribute(b.attrName(null, "form", !0)))) {
-      const E = z.read(
+      const E = G.read(
         e,
         b.attrName(null, "form", !0)
       );
       if (E) {
-        const v = z.query(
+        const v = G.query(
           E,
           b.attrName(null, "form", !0)
         );
@@ -8033,33 +8252,33 @@ ${R}
       } else
         r.formFragment = F.getFormFragment(e);
     }
-    const D = t ? b.attrName(t, "fetch-state") : b.attrName(null, "state", !0);
-    if (e.hasAttribute(D)) {
-      const E = z.read(e, D), v = [];
-      E ? (z.queryAll(E, D).forEach((x) => {
-        const k = N.get(x);
-        k && v.push(k);
+    const P = t ? b.attrName(t, "fetch-state") : b.attrName(null, "state", !0);
+    if (e.hasAttribute(P)) {
+      const E = G.read(e, P), v = [];
+      E ? (G.queryAll(E, P).forEach((C) => {
+        const x = N.get(C);
+        x && v.push(x);
       }), v.length === 0 && m.error(
         "Haori",
-        `Element not found: ${E} (${D})`
+        `Element not found: ${E} (${P})`
       )) : v.push(e), v.length > 0 && (r.fetchStateFragments = v);
     }
-    const L = t ? b.attrName(t, "store-clear") : b.attrName(null, "store-clear", !0);
-    if (e.hasAttribute(L)) {
-      const E = e.getRawAttribute(L), v = E === null ? "" : E.trim();
+    const H = t ? b.attrName(t, "store-clear") : b.attrName(null, "store-clear", !0);
+    if (e.hasAttribute(H)) {
+      const E = e.getRawAttribute(H), v = E === null ? "" : E.trim();
       if (v === "")
         m.error(
           "Haori",
-          `ストレージキーが指定されていません (${L})`
+          `ストレージキーが指定されていません (${H})`
         );
       else {
         r.storeClearKey = v;
         const R = e.getRawAttribute(
-          `${L}-type`
-        ), x = R === null ? "session" : R.trim();
-        x === "local" || x === "session" ? r.storeClearKind = x : (m.warn(
+          `${H}-type`
+        ), C = R === null ? "session" : R.trim();
+        C === "local" || C === "session" ? r.storeClearKind = C : (m.warn(
           "Haori",
-          `${L}-type は session または local を指定してください（session として扱います）: ${x}`
+          `${H}-type は session または local を指定してください（session として扱います）: ${C}`
         ), r.storeClearKind = "session");
       }
     }
@@ -8165,10 +8384,10 @@ ${R}
       ), !this.evaluateExecutionCondition()))
         return !1;
       if (this.options.runScript) {
-        const h = this.options.targetFragment?.getTarget() ?? null;
+        const p = this.options.targetFragment?.getTarget() ?? null;
         try {
           const y = this.options.runScript.call(
-            h,
+            p,
             this.domEvent
           );
           y === !1 && this.domEvent && this.domEvent.preventDefault(), y != null && typeof y.then == "function" && await y;
@@ -8180,7 +8399,7 @@ ${R}
         return !1;
       this.options.resetBeforeFragments && this.options.resetBeforeFragments.length > 0 && (await Promise.all(
         this.options.resetBeforeFragments.map(
-          (h) => F.reset(h, this.operationSequence)
+          (p) => F.reset(p, this.operationSequence)
         )
       ), this.captureHistorySnapshots());
       const r = this.prepareFetchRequest();
@@ -8188,86 +8407,86 @@ ${R}
       const i = r.payload;
       let n = r.url, s = r.options, a = !1, o = !1;
       if (this.options.beforeCallback) {
-        const h = this.options.beforeCallback(
+        const p = this.options.beforeCallback(
           n || null,
           s || null
         );
-        if (h != null) {
-          if (h === !1 || typeof h == "object" && h.stop)
+        if (p != null) {
+          if (p === !1 || typeof p == "object" && p.stop)
             return !1;
-          typeof h == "object" && (a = "fetchUrl" in h, o = "fetchOptions" in h, n = a ? h.fetchUrl : n, s = o ? h.fetchOptions : s);
+          typeof p == "object" && (a = "fetchUrl" in p, o = "fetchOptions" in p, n = a ? p.fetchUrl : n, s = o ? p.fetchOptions : s);
         }
       }
       const l = Object.keys(i).length > 0;
       if (n) {
-        const h = (s?.method || "GET").toUpperCase(), A = !a && o && r.transportMode === "query-get" && Ct(s) && !Pe(h) ? r.baseUrl ?? n : n, S = Pt(
+        const p = (s?.method || "GET").toUpperCase(), A = !a && o && r.transportMode === "query-get" && Ct(s) && !Pe(p) ? r.baseUrl ?? n : n, S = Pt(
           A,
           s
         );
         n = S.url;
-        const P = { ...S.options }, D = S.normalized ? S.requestedMethod : r.requestedMethod, L = S.effectiveMethod, E = r.transportMode === "query-get" || S.normalized, v = S.queryString ?? r.queryString;
+        const D = { ...S.options }, P = S.normalized ? S.requestedMethod : r.requestedMethod, H = S.effectiveMethod, E = r.transportMode === "query-get" || S.normalized, v = S.queryString ?? r.queryString;
         if (E && m.info("Haori demo fetch normalization", {
           runtime: u.runtime,
-          requestedMethod: D,
-          effectiveMethod: L,
+          requestedMethod: P,
+          effectiveMethod: H,
           transportMode: "query-get",
           url: n,
           payload: l ? i : void 0,
           queryString: v
         }), this.options.targetFragment && n) {
-          const R = performance.now(), x = {
+          const R = performance.now(), C = {
             runtime: u.runtime,
-            requestedMethod: D,
-            effectiveMethod: L,
+            requestedMethod: P,
+            effectiveMethod: H,
             transportMode: E ? "query-get" : "http",
             ...E ? { queryString: v } : {}
           };
-          return H.fetchStart(
+          return O.fetchStart(
             this.options.targetFragment.getTarget(),
             n,
-            P,
+            D,
             l ? i : void 0,
-            x
-          ), await this.injectFetchState("loading"), fetch(n, P).then((k) => this.handleFetchResult(
-            k,
+            C
+          ), await this.injectFetchState("loading"), await fetch(n, D).then((x) => this.handleFetchResult(
+            x,
             n || void 0,
             R
-          )).catch(async (k) => {
-            throw n && H.fetchError(
+          )).catch(async (x) => {
+            throw n && O.fetchError(
               this.options.targetFragment.getTarget(),
               n,
-              k
+              x
             ), await this.injectFetchState(
               "error",
               null,
-              k instanceof Error ? k.message : String(k)
-            ), k;
+              x instanceof Error ? x.message : String(x)
+            ), x;
           });
         }
-        return fetch(n, P).then((R) => this.handleFetchResult(R, n || void 0));
+        return await fetch(n, D).then((R) => this.handleFetchResult(R, n || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && l) {
-        const h = this.options.formFragment, y = h.getTarget(), A = /* @__PURE__ */ new Set();
+        const p = this.options.formFragment, y = p.getTarget(), A = /* @__PURE__ */ new Set();
         e && e.appliedDisabledAttribute && this.options.targetFragment && A.add(this.options.targetFragment);
-        const S = h.getRawBindingData(), P = $e(i), D = h.getAttribute(`${u.prefix}form-arg`);
-        let L;
-        if (D) {
-          L = { ...S ?? {} };
-          const E = String(D), v = F.resolveAncestorArgOwner(h, E);
-          L[E] = F.mergeCollectedValues(
-            (v ? v.value : L[E]) ?? null,
-            P
+        const S = p.getRawBindingData(), D = $e(i), P = p.getAttribute(`${u.prefix}form-arg`);
+        let H;
+        if (P) {
+          H = { ...S ?? {} };
+          const E = String(P), v = F.resolveAncestorArgOwner(p, E);
+          H[E] = F.mergeCollectedValues(
+            (v ? v.value : H[E]) ?? null,
+            D
           );
         } else
-          L = F.mergeCollectedValues(S, P);
-        await O.setBindingData(y, L, {
+          H = F.mergeCollectedValues(S, D);
+        await B.setBindingData(y, H, {
           skipFragments: A,
           kind: "nonSupply",
           sequence: this.operationSequence,
           editedPaths: F.collectEditedPaths(
-            h,
-            D ? String(D) : "",
-            P
+            p,
+            P ? String(P) : "",
+            D
           )
         });
       }
@@ -8275,7 +8494,7 @@ ${R}
       const c = l ? $e(i) : {}, d = new Response(JSON.stringify(c), {
         headers: { "Content-Type": "application/json" }
       });
-      return this.handleFetchResult(d);
+      return await this.handleFetchResult(d);
     } finally {
       this.releaseExecutionLock(e);
     }
@@ -8289,10 +8508,10 @@ ${R}
     if (this.eventType !== "click" || !this.options.targetFragment)
       return null;
     const t = this.options.targetFragment.getTarget();
-    if (b.RUNNING_CLICK_TARGETS.has(t) || t.matches(":disabled") || t.hasAttribute("disabled") || t.hasAttribute(Me))
+    if (b.RUNNING_CLICK_TARGETS.has(t) || t.matches(":disabled") || t.hasAttribute("disabled") || t.hasAttribute(xe))
       return !1;
     const r = t.hasAttribute(`${u.prefix}click-no-disabled`);
-    return b.RUNNING_CLICK_TARGETS.add(t), t.setAttribute(Me, ""), r || t.setAttribute("disabled", ""), {
+    return b.RUNNING_CLICK_TARGETS.add(t), t.setAttribute(xe, ""), r || t.setAttribute("disabled", ""), {
       target: t,
       appliedDisabledAttribute: !r
     };
@@ -8304,7 +8523,7 @@ ${R}
    * @returns 戻り値はありません。
    */
   releaseExecutionLock(e) {
-    e && (b.RUNNING_CLICK_TARGETS.delete(e.target), e.target.removeAttribute(Me), e.appliedDisabledAttribute && e.target.removeAttribute("disabled"));
+    e && (b.RUNNING_CLICK_TARGETS.delete(e.target), e.target.removeAttribute(xe), e.appliedDisabledAttribute && e.target.removeAttribute("disabled"));
   }
   /**
    * フェッチ後の処理を実行します。
@@ -8312,7 +8531,7 @@ ${R}
   async handleFetchResult(e, t, r) {
     const i = Ae();
     if (!e.ok)
-      return ct(e.status) || (this.options.targetFragment && t && H.fetchError(
+      return ct(e.status) || (this.options.targetFragment && t && O.fetchError(
         this.options.targetFragment.getTarget(),
         t,
         new Error(`${e.status} ${e.statusText}`),
@@ -8323,7 +8542,7 @@ ${R}
         e.status,
         e.statusText || null
       )), !1;
-    if (this.options.targetFragment && t && r && H.fetchEnd(
+    if (this.options.targetFragment && t && r && O.fetchEnd(
       this.options.targetFragment.getTarget(),
       t,
       e.status,
@@ -8347,18 +8566,18 @@ ${R}
       s.push(new b(d, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0)
       for (const d of this.options.clickFragments) {
-        await O.evaluateAll(d);
-        const h = d.getTarget();
-        typeof h.click == "function" ? h.click() : h.dispatchEvent(
+        await B.evaluateAll(d);
+        const p = d.getTarget();
+        typeof p.click == "function" ? p.click() : p.dispatchEvent(
           new MouseEvent("click", { bubbles: !0, cancelable: !0 })
         );
       }
     this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((d) => {
-      const h = d.getTarget();
-      h instanceof HTMLElement ? s.push(i.openDialog(h)) : m.error("Haori", "Element is not an HTML element: ", h);
+      const p = d.getTarget();
+      p instanceof HTMLElement ? s.push(i.openDialog(p)) : m.error("Haori", "Element is not an HTML element: ", p);
     }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((d) => {
-      const h = d.getTarget();
-      h instanceof HTMLElement ? s.push(i.closeDialog(h)) : m.error("Haori", "Element is not an HTML element: ", h);
+      const p = d.getTarget();
+      p instanceof HTMLElement ? s.push(i.closeDialog(p)) : m.error("Haori", "Element is not an HTML element: ", p);
     }), await Promise.all(s);
     const a = b.unescapeNewlines(
       this.resolveLateAttribute("dialog", this.options.dialogMessage)
@@ -8373,7 +8592,7 @@ ${R}
       "scroll",
       this.options.scrollTarget
     );
-    l && z.query(
+    l && G.query(
       l,
       b.attrName(this.eventType, "scroll"),
       document
@@ -8384,12 +8603,12 @@ ${R}
     );
     if (c) {
       let d = c;
-      const h = this.resolveLateAttribute(
+      const p = this.resolveLateAttribute(
         "redirect-return-param",
         this.options.redirectReturnParam
       );
-      if (h) {
-        const A = new URLSearchParams(window.location.search).get(h);
+      if (p) {
+        const A = new URLSearchParams(window.location.search).get(p);
         if (A !== null) {
           const S = A.trim();
           dt.isSafeLocalPath(S) ? d = S : m.warn(
@@ -8455,8 +8674,8 @@ ${R}
           return;
         }
         const l = (c) => {
-          for (const [d, h] of Object.entries(c))
-            h != null && (Array.isArray(h) ? h.forEach((y) => o.searchParams.append(d, String(y))) : typeof h == "object" ? o.searchParams.set(d, JSON.stringify(h)) : o.searchParams.set(d, String(h)));
+          for (const [d, p] of Object.entries(c))
+            p != null && (Array.isArray(p) ? p.forEach((y) => o.searchParams.append(d, String(y))) : typeof p == "object" ? o.searchParams.set(d, JSON.stringify(p)) : o.searchParams.set(d, String(p)));
         };
         n && l(r), s && l(i), history.pushState(
           { [Ft]: !0 },
@@ -8491,17 +8710,17 @@ ${R}
           const l = /* @__PURE__ */ new Map(), c = [];
           for (const d of a)
             if (d && typeof d == "object" && !Array.isArray(d)) {
-              const h = d.key, y = d.message, A = typeof h == "string" && h.length > 0 ? h : null, S = typeof y == "string" ? y : y != null ? String(y) : "";
+              const p = d.key, y = d.message, A = typeof p == "string" && p.length > 0 ? p : null, S = typeof y == "string" ? y : y != null ? String(y) : "";
               if (S.length === 0)
                 continue;
               if (A !== null) {
-                const P = l.get(A) ?? [];
-                P.push(S), l.set(A, P);
+                const D = l.get(A) ?? [];
+                D.push(S), l.set(A, D);
               } else
                 c.push(S);
             } else typeof d == "string" && d.length > 0 && c.push(d);
-          for (const [d, h] of l)
-            o.push({ key: d, message: h.join(`
+          for (const [d, p] of l)
+            o.push({ key: d, message: p.join(`
 `) });
           for (const d of c)
             o.push({ message: d });
@@ -8728,7 +8947,7 @@ ${R}
           if (l.kind === "skip")
             return;
           if (l.kind === "row") {
-            const h = this.options.bindArg;
+            const p = this.options.bindArg;
             a.push({
               container: l.container,
               row: o,
@@ -8737,14 +8956,14 @@ ${R}
               apply: (y) => {
                 const A = this.resolveCurrentRowItem(o, y), S = { ...A };
                 if (i && typeof i == "object" && !Array.isArray(i)) {
-                  const P = A[h], D = P !== null && typeof P == "object" && !Array.isArray(P) ? P : {};
-                  S[h] = this.mergeAppendBindingData(
+                  const D = A[p], P = D !== null && typeof D == "object" && !Array.isArray(D) ? D : {};
+                  S[p] = this.mergeAppendBindingData(
                     o,
                     i,
-                    D
+                    P
                   );
                 } else
-                  S[h] = i;
+                  S[p] = i;
                 return this.reconcileRowUserEdits(o, S);
               }
             });
@@ -8752,7 +8971,7 @@ ${R}
           }
           const c = { ...o.getRawBindingData() ?? {} }, d = this.options.bindArg;
           if (i && typeof i == "object" && !Array.isArray(i)) {
-            const h = c[d], y = h && typeof h == "object" && !Array.isArray(h) ? h : {};
+            const p = c[d], y = p && typeof p == "object" && !Array.isArray(p) ? p : {};
             c[d] = this.mergeAppendBindingData(
               o,
               i,
@@ -8761,7 +8980,7 @@ ${R}
           } else
             c[d] = i;
           n.push(
-            O.setBindingData(
+            B.setBindingData(
               o.getTarget(),
               this.reconcileUserEditsForBind(o, c),
               {
@@ -8803,8 +9022,8 @@ ${R}
               row: o,
               attributeName: s,
               syncWhenUnchanged: "reflect",
-              apply: (h) => {
-                const y = this.options.bindMerge ? this.resolveCurrentRowItem(o, h) : h, A = this.mergeAppendBindingData(
+              apply: (p) => {
+                const y = this.options.bindMerge ? this.resolveCurrentRowItem(o, p) : p, A = this.mergeAppendBindingData(
                   o,
                   i,
                   y
@@ -8819,7 +9038,7 @@ ${R}
             i
           ), d = this.options.bindMerge ? { ...o.getRawBindingData() ?? {}, ...c } : c;
           n.push(
-            O.setBindingData(
+            B.setBindingData(
               o.getTarget(),
               this.reconcileUserEditsForBind(o, d),
               {
@@ -8834,7 +9053,7 @@ ${R}
       return n.push(this.applyRowWrites(a)), Promise.all(n).then(() => {
         const o = this.options.bindArg ?? null;
         this.options.bindFragments.forEach((l) => {
-          H.bindComplete(l.getTarget(), o);
+          O.bindComplete(l.getTarget(), o);
         });
       });
     });
@@ -8875,7 +9094,7 @@ ${R}
     if (r === null)
       return t;
     const i = this.eventType === "poll";
-    if (!i && !this.twoWayCommitBind && O.clearUserEditMarks(e, r), !(e.getTarget() instanceof HTMLFormElement))
+    if (!i && !this.twoWayCommitBind && B.clearUserEditMarks(e, r), !(e.getTarget() instanceof HTMLFormElement))
       return this.reconcileAncestorArgFormEdits(
         e,
         t,
@@ -8914,7 +9133,7 @@ ${R}
     if (r === null)
       return t;
     const i = this.eventType === "poll";
-    !i && !this.twoWayCommitBind && O.clearUserEditMarks(e, r);
+    !i && !this.twoWayCommitBind && B.clearUserEditMarks(e, r);
     const n = F.getValuesEditedAfter(
       e,
       i ? 0 : r
@@ -8987,7 +9206,7 @@ ${R}
         ...t
       };
       n.push(
-        O.setBindingData(s.getTarget(), o, {
+        B.setBindingData(s.getTarget(), o, {
           // 通番はコピーを起こした操作のもの（フェッチ応答の反映と同じ理由）。
           sequence: this.operationSequence
         })
@@ -9129,17 +9348,17 @@ ${R}
       const d = s.get("Content-Type") || "";
       if (/multipart\/form-data/i.test(d)) {
         s.delete("Content-Type");
-        const h = new FormData();
+        const p = new FormData();
         for (const [y, A] of Object.entries(t))
-          A == null ? h.append(y, "") : A instanceof Blob ? h.append(y, A) : Array.isArray(A) ? A.forEach((S) => {
-            S instanceof Blob ? h.append(y, S) : h.append(y, le(S));
-          }) : h.append(y, le(A));
-        n.body = h;
+          A == null ? p.append(y, "") : A instanceof Blob ? p.append(y, A) : Array.isArray(A) ? A.forEach((S) => {
+            S instanceof Blob ? p.append(y, S) : p.append(y, le(S));
+          }) : p.append(y, le(A));
+        n.body = p;
       } else if (/application\/x-www-form-urlencoded/i.test(d)) {
-        const h = new URLSearchParams();
+        const p = new URLSearchParams();
         for (const [y, A] of Object.entries(t))
-          A !== void 0 && (Array.isArray(A) ? A.forEach((S) => h.append(y, le(S))) : h.append(y, le(A)));
-        n.body = h;
+          A !== void 0 && (Array.isArray(A) ? A.forEach((S) => p.append(y, le(S))) : p.append(y, le(A)));
+        n.body = p;
       } else
         s.set("Content-Type", "application/json"), n.body = JSON.stringify(t);
     }
@@ -9256,9 +9475,9 @@ ${R}
     const t = this.options.targetFragment;
     if (!t)
       return m.error("Haori", "Target fragment is not specified for row operation."), null;
-    const r = b.attrName(this.eventType, e), i = z.read(t, r);
+    const r = b.attrName(this.eventType, e), i = G.read(t, r);
     if (i !== null && i.trim() !== "") {
-      const s = z.query(i, r, document);
+      const s = G.query(i, r, document);
       if (s === null)
         return m.error(
           "Haori",
@@ -9411,16 +9630,16 @@ ${R}
         const d = b.resolveRowArrayIndex(c, a);
         if (d === null)
           continue;
-        const h = a[d];
-        if (h === null || typeof h != "object" || Array.isArray(h)) {
+        const p = a[d];
+        if (p === null || typeof p != "object" || Array.isArray(p)) {
           m.warn(
             "Haori",
             `Row data is not an object; the write was skipped (${c.attributeName}).`
           );
           continue;
         }
-        const y = c.apply(h);
-        if (b.isSameRowItem(h, y)) {
+        const y = c.apply(p);
+        if (b.isSameRowItem(p, y)) {
           c.syncWhenUnchanged && r.push(
             b.syncUnchangedRowValues(
               c.row,
@@ -9434,7 +9653,7 @@ ${R}
       }
       if (!o)
         return;
-      const l = O.setBindingData(
+      const l = B.setBindingData(
         s.owner.getTarget(),
         b.withPathValue(s.ownerData, s.path, a),
         {
@@ -9450,7 +9669,7 @@ ${R}
           sequence: this.operationSequence
         }
       );
-      if (O.isEachUpdateRunning(n)) {
+      if (B.isEachUpdateRunning(n)) {
         l.catch((c) => {
           m.error("Haori", "Failed to write row data.", c);
         });
@@ -9480,7 +9699,7 @@ ${R}
    * @returns 反映完了の Promise
    */
   static syncUnchangedRowValues(e, t, r) {
-    return r === "supply" && O.clearUserEditMarks(e), F.syncRowValues(e, t);
+    return r === "supply" && B.clearUserEditMarks(e), F.syncRowValues(e, t);
   }
   /**
    * 行の要素データが同じ内容かどうかを判定します。
@@ -9526,7 +9745,7 @@ ${R}
     if (n && s !== null) {
       const a = [];
       t.forEach((c, d) => {
-        O.createListKey(
+        B.createListKey(
           c,
           String(n),
           d
@@ -9612,7 +9831,7 @@ ${R}
     if (!i)
       return Promise.reject(new Error("Row array not resolved."));
     const n = this.options.targetFragment, s = n ? n.closestByAttribute(`${u.prefix}row`) : null, a = b.getRowFragments(r), o = s ? a.indexOf(s) : a.length - 1, l = i.array.slice();
-    return t(l, o) ? O.setBindingData(
+    return t(l, o) ? B.setBindingData(
       i.owner.getTarget(),
       b.withPathValue(i.ownerData, i.path, l),
       {
@@ -9655,7 +9874,7 @@ ${R}
           ...s.getRawBindingData() ?? {},
           _fetch: n
         };
-        return O.setBindingData(a, o, {
+        return B.setBindingData(a, o, {
           reflectToAttribute: !1,
           // 状態変数の注入は値の供給ではない（権威を持たず、ユーザー編集の印も
           // 解除しない）。
@@ -9908,12 +10127,12 @@ const f = class f {
       return Promise.resolve();
     r.lastUrl = n, r.running = !0;
     const s = performance.now();
-    return t.setAttribute(`${u.prefix}importing`, ""), H.importStart(t, n), Ot.load(n).then((a) => {
+    return t.setAttribute(`${u.prefix}importing`, ""), O.importStart(t, n), Ot.load(n).then((a) => {
       const o = new TextEncoder().encode(a).length;
       return W.enqueue(() => {
         t.innerHTML = a;
       }).then(() => {
-        t.removeAttribute(`${u.prefix}importing`), H.importEnd(t, n, o, s), f.adoptImportedChildren(e);
+        t.removeAttribute(`${u.prefix}importing`), O.importEnd(t, n, o, s), f.adoptImportedChildren(e);
         const l = [];
         return e.getChildren().forEach((c) => {
           c instanceof T ? l.push(f.scan(c.getTarget())) : c instanceof Q && l.push(f.evaluateText(c));
@@ -9921,7 +10140,7 @@ const f = class f {
         });
       });
     }).catch((a) => {
-      t.removeAttribute(`${u.prefix}importing`), H.importError(t, n, a), m.error("[Haori]", "Failed to import HTML:", n, a);
+      t.removeAttribute(`${u.prefix}importing`), O.importError(t, n, a), m.error("[Haori]", "Failed to import HTML:", n, a);
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
         return r.rerunRequested = !1, f.executeManagedImport(e);
@@ -10088,22 +10307,22 @@ const f = class f {
       case `${u.prefix}bind`: {
         if (r !== null && i && s instanceof T && s.consumeSelfWrittenBind(r))
           break;
-        const h = r === null ? {} : f.parseDataBind(r);
+        const p = r === null ? {} : f.parseDataBind(r);
         if (i) {
           const y = n ?? T.nextSequence();
           return r === null ? (o.push(
-            f.setBindingData(e, h, {
+            f.setBindingData(e, p, {
               reflectToAttribute: !1,
               sequence: y
             })
           ), o.push(s.removeAttribute(t))) : o.push(
-            f.setBindingData(e, h, {
+            f.setBindingData(e, p, {
               sequence: y
             })
           ), Promise.all(o).then(() => {
           });
         }
-        r === null && s.clearBindingDataCache(), s.setBindingData(h);
+        r === null && s.clearBindingDataCache(), s.setBindingData(p);
         break;
       }
       case `${u.prefix}derive`:
@@ -10150,8 +10369,8 @@ const f = class f {
         return r !== null && F.applyCustomValidity(s), Promise.all(o).then(() => {
         });
       case `${u.prefix}url-param`: {
-        const h = s.getAttribute(`${u.prefix}url-arg`), y = dt.readParams();
-        h === null && s.hasAttribute(`${u.prefix}store`) && m.warn(
+        const p = s.getAttribute(`${u.prefix}url-arg`), y = dt.readParams();
+        p === null && s.hasAttribute(`${u.prefix}store`) && m.warn(
           "Haori",
           `${u.prefix}url-param を ${u.prefix}url-arg なしで ${u.prefix}store と併用すると復元した値が消えます（${u.prefix}url-arg を指定してください）。`
         );
@@ -10160,11 +10379,11 @@ const f = class f {
           kind: "nonSupply",
           sequence: T.nextSequence()
         };
-        if (h === null)
+        if (p === null)
           o.push(f.setBindingData(e, y, A));
         else {
           const S = s.getRawBindingData() || {};
-          S[String(h)] = y, o.push(f.setBindingData(e, S, A));
+          S[String(p)] = y, o.push(f.setBindingData(e, S, A));
         }
         break;
       }
@@ -10173,8 +10392,8 @@ const f = class f {
       () => d === null ? void 0 : d()
     ).then(() => {
       if (l !== null)
-        return s.setDeriveInputSignature(c), l.then((h) => {
-          if (h)
+        return s.setDeriveInputSignature(c), l.then((p) => {
+          if (p)
             return f.reevaluateChildren(s);
         });
     }).then(() => {
@@ -10213,34 +10432,34 @@ const f = class f {
       ...r.editedPaths === void 0 ? {} : { editedPaths: r.editedPaths }
     }, d = o === "supply";
     d && i.markSupplyApplied(l);
-    const h = T.currentSequence(), y = i.getRawBindingData();
+    const p = T.currentSequence(), y = i.getRawBindingData();
     d && (r.clearUserEdits ?? !0) && f.clearUserEditMarks(i, l);
     const A = a ? f.resolveByPathAuthority(i, y, t, c) : t;
-    i.setBindingData(A), a && (H.bindChange(e, y, A, "manual"), ge.mirror(i));
+    i.setBindingData(A), a && (O.bindChange(e, y, A, "manual"), ge.mirror(i));
     const S = () => {
       i.markBindingWorkStart();
-      const P = i.getRawBindingData() ?? A;
-      let D = a ? i.setAttribute(`${u.prefix}bind`, JSON.stringify(P)) : Promise.resolve();
-      return e.tagName === "FORM" && (D = D.then(() => {
-        if (i.wasResetAfter(h))
+      const D = i.getRawBindingData() ?? A;
+      let P = a ? i.setAttribute(`${u.prefix}bind`, JSON.stringify(D)) : Promise.resolve();
+      return e.tagName === "FORM" && (P = P.then(() => {
+        if (i.wasResetAfter(p))
           return;
-        const L = i.getRawBindingData() ?? A;
+        const H = i.getRawBindingData() ?? A;
         return F.syncValues(
           i,
-          F.resolveSyncValues(i, L),
+          F.resolveSyncValues(i, H),
           !1,
           c
         );
-      })), D = D.then(
-        () => F.syncAncestorArgForms(i, h, c)
-      ), D = D.then(() => f.evaluateAll(i, n)), D = D.then(
-        () => T.retryUnappliedValueWrites(e, h)
-      ), D = D.then(
+      })), P = P.then(
+        () => F.syncAncestorArgForms(i, p, c)
+      ), P = P.then(() => f.evaluateAll(i, n)), P = P.then(
+        () => T.retryUnappliedValueWrites(e, p)
+      ), P = P.then(
         () => f.reevaluateReactiveSpecialAttributes(i, n)
-      ), D.then(
+      ), P.then(
         () => i.markBindingWorkEnd(),
-        (L) => {
-          throw i.markBindingWorkEnd(), L;
+        (H) => {
+          throw i.markBindingWorkEnd(), H;
         }
       );
     };
@@ -10284,7 +10503,7 @@ const f = class f {
   static mergePathAuthority(e, t, r, i, n) {
     if (f.isPlainRecord(t) && f.isPlainRecord(r)) {
       const l = t, c = r, d = {};
-      let h = Object.keys(l).some(
+      let p = Object.keys(l).some(
         (A) => !Object.prototype.hasOwnProperty.call(c, A)
       );
       const y = /* @__PURE__ */ new Set([
@@ -10292,29 +10511,29 @@ const f = class f {
         ...Object.keys(c)
       ]);
       for (const A of y) {
-        const S = n === "" ? A : `${n}.${A}`, P = f.mergePathAuthority(
+        const S = n === "" ? A : `${n}.${A}`, D = f.mergePathAuthority(
           e,
           Object.prototype.hasOwnProperty.call(l, A) ? l[A] : f.ABSENT_PATH,
           Object.prototype.hasOwnProperty.call(c, A) ? c[A] : f.ABSENT_PATH,
           i,
           S
         );
-        P !== f.ABSENT_PATH && (d[A] = P), P !== (Object.prototype.hasOwnProperty.call(c, A) ? c[A] : f.ABSENT_PATH) && (h = !0);
+        D !== f.ABSENT_PATH && (d[A] = D), D !== (Object.prototype.hasOwnProperty.call(c, A) ? c[A] : f.ABSENT_PATH) && (p = !0);
       }
-      return h ? d : c;
+      return p ? d : c;
     }
     const s = f.resolveArrayPairing(e, t, r, n);
     if (s !== null) {
       const l = t, c = r, d = c.map(
-        (h, y) => f.mergePathAuthority(
+        (p, y) => f.mergePathAuthority(
           e,
           l[y],
-          h,
+          p,
           i,
           `${n}[${s[y]}]`
         )
       );
-      return d.some((h, y) => h !== c[y]) ? d : c;
+      return d.some((p, y) => p !== c[y]) ? d : c;
     }
     if (f.isSameBindingValue(t, r))
       return r;
@@ -10490,14 +10709,14 @@ const f = class f {
     const r = t.getBindingData(), i = {}, n = (l) => {
       const c = l.getTarget(), d = f.resolveElementId(c);
       return d !== "" ? `#${d}` : c.tagName.toLowerCase();
-    }, s = (l, c, d, h) => {
+    }, s = (l, c, d, p) => {
       if (l)
         for (const y of Object.keys(l))
           y in i || (i[y] = {
             value: l[y],
             source: n(c),
             kind: d,
-            depth: h
+            depth: p
           });
     };
     let a = t, o = 0;
@@ -10630,22 +10849,22 @@ const f = class f {
     const i = e.hasAttribute(`${u.prefix}derive`), n = e.hasAttribute(`${u.prefix}if`), s = e.hasAttribute(`${u.prefix}each`), a = e.getRawAttribute(`${u.prefix}derive`), o = e.getRawAttribute(`${u.prefix}derive-name`);
     let l = !1, c = !1, d = null;
     if (!i && e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), !i && e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), i) {
-      const h = f.createDeriveInputSignature(
+      const p = f.createDeriveInputSignature(
         e,
         a,
         o
       );
-      h === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
+      p === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
         () => f.evaluateDerive(e, a, o).then(
           () => {
           }
         )
-      )) : e.getDeriveInputSignature() !== h && (r = r.then(() => f.evaluateDerive(
+      )) : e.getDeriveInputSignature() !== p && (r = r.then(() => f.evaluateDerive(
         e,
         a,
         o
       ).then(() => {
-        e.setDeriveInputSignature(h);
+        e.setDeriveInputSignature(p);
       })));
     }
     return n && (r = r.then(() => f.evaluateIf(e))), s ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => f.evaluateEach(e))) : n ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => {
@@ -10664,14 +10883,14 @@ const f = class f {
     })), r.then(() => {
       if (l)
         return;
-      const h = [];
+      const p = [];
       return e.getChildren().forEach((y) => {
         if (y instanceof T) {
           if (f.canSkipUnchangedNestedEach(y))
             return;
-          h.push(f.evaluateAll(y, t));
-        } else y instanceof Q && h.push(f.evaluateText(y));
-      }), Promise.all(h).then(() => {
+          p.push(f.evaluateAll(y, t));
+        } else y instanceof Q && p.push(f.evaluateText(y));
+      }), Promise.all(p).then(() => {
       });
     }).then(() => {
       c && d !== null && e.setDeriveSubtreeSignature(d);
@@ -10778,7 +10997,7 @@ const f = class f {
     if (f.isHiddenIfCondition(r))
       j.isEnabled() && f.logFalsyIfDiagnostics(e), t.push(
         e.hide().then(() => {
-          H.hide(e.getTarget());
+          O.hide(e.getTarget());
         })
       );
     else {
@@ -10790,7 +11009,7 @@ const f = class f {
         ) : s instanceof Q && n.push(f.evaluateText(s));
       }), t.push(
         e.show().then(() => {
-          H.show(e.getTarget()), i || (f.triggerLoadOnShow(e), te.refreshSubtree(e.getTarget()));
+          O.show(e.getTarget()), i || (f.triggerLoadOnShow(e), te.refreshSubtree(e.getTarget()));
         })
       ), t.push(Promise.all(n).then(() => {
       }));
@@ -11438,15 +11657,15 @@ ${r}
     let d = e.getChildren().filter((E) => E instanceof T).filter(
       (E) => !E.hasAttribute(`${u.prefix}each-before`) && !E.hasAttribute(`${u.prefix}each-after`)
     );
-    const h = d.map((E) => E.getListKey()), y = /* @__PURE__ */ new Set();
+    const p = d.map((E) => E.getListKey()), y = /* @__PURE__ */ new Set();
     d = d.filter((E, v) => {
-      const R = String(E.getListKey()), x = l.get(R) ?? 0;
-      if (x === 0) {
+      const R = String(E.getListKey()), C = l.get(R) ?? 0;
+      if (C === 0) {
         y.add(E);
-        const k = E.getListKey();
-        return k !== null && H.rowRemove(E.getTarget(), k, v), c.push(E.remove()), !1;
+        const x = E.getListKey();
+        return x !== null && O.rowRemove(E.getTarget(), x, v), c.push(E.remove()), !1;
       }
-      return l.set(R, x - 1), !0;
+      return l.set(R, C - 1), !0;
     });
     const A = d.map((E) => E.getListKey()), S = /* @__PURE__ */ new Map();
     d.forEach((E) => {
@@ -11456,23 +11675,23 @@ ${r}
       const R = S.get(v);
       R ? R.push(E) : S.set(v, [E]);
     });
-    const P = e.getChildElementFragments().filter((E) => !y.has(E)), D = P.filter(
+    const D = e.getChildElementFragments().filter((E) => !y.has(E)), P = D.filter(
       (E) => E.hasAttribute(`${u.prefix}each-before`)
     ).length;
-    let L = Promise.resolve();
+    let H = Promise.resolve();
     return a.forEach((E, v) => {
-      const R = t[v], x = v;
-      let k;
+      const R = t[v], C = v;
+      let x;
       const V = S.get(E)?.shift();
       if (V) {
-        k = V;
-        const G = D + v;
-        L = L.then(
+        x = V;
+        const z = P + v;
+        H = H.then(
           () => f.updateRowFragment(
-            k,
+            x,
             R,
             i,
-            x,
+            C,
             s ? String(s) : null,
             E
           ).then(
@@ -11482,57 +11701,57 @@ ${r}
               // される）で DOM の順序が古いまま残る。
               f.repositionEachRow(
                 e,
-                k,
-                P,
-                G
+                x,
+                D,
+                z
               ).then((Z) => {
-                if (Z !== null && H.rowMove(
-                  k.getTarget(),
+                if (Z !== null && O.rowMove(
+                  x.getTarget(),
                   E,
-                  Z - D,
+                  Z - P,
                   v
                 ), !!_)
-                  return f.clearUserEditMarks(k), f.evaluateAll(k).then(
-                    () => f.applyRowFormValues(e, k, R)
+                  return f.clearUserEditMarks(x), f.evaluateAll(x).then(
+                    () => f.applyRowFormValues(e, x, R)
                   );
               })
             )
           )
         );
       } else {
-        k = r.clone();
-        const G = D + v;
-        L = L.then(
+        x = r.clone();
+        const z = P + v;
+        H = H.then(
           () => f.updateRowFragment(
-            k,
+            x,
             R,
             i,
-            x,
+            C,
             s ? String(s) : null,
             E
           ).then(() => {
-            const _ = P[G] ?? null;
-            return e.insertBefore(k, _).then(() => {
-              P.splice(G, 0, k);
-            }).then(() => f.initializeFreshEachRow(k)).then(() => f.applyRowFormValues(e, k, R)).then(() => {
-              H.rowAdd(k.getTarget(), E, x, R);
+            const _ = D[z] ?? null;
+            return e.insertBefore(x, _).then(() => {
+              D.splice(z, 0, x);
+            }).then(() => f.initializeFreshEachRow(x)).then(() => f.applyRowFormValues(e, x, R)).then(() => {
+              O.rowAdd(x.getTarget(), E, C, R);
             });
           })
         );
       }
-    }), Promise.all(c).then(() => L).then(() => {
+    }), Promise.all(c).then(() => H).then(() => {
       const E = a.filter(
-        (G) => G !== null
+        (z) => z !== null
       ), v = A.filter(
-        (G) => G !== null
-      ), R = new Set(v), x = E.filter((G) => !R.has(G)), V = h.filter(
-        (G) => G !== null
+        (z) => z !== null
+      ), R = new Set(v), C = E.filter((z) => !R.has(z)), V = p.filter(
+        (z) => z !== null
       ).filter(
-        (G) => !o.has(G)
+        (z) => !o.has(z)
       );
-      H.eachUpdate(
+      O.eachUpdate(
         e.getTarget(),
-        x,
+        C,
         V,
         E
       );
@@ -11789,7 +12008,7 @@ f.ATTRIBUTE_ALIAS_SUFFIX = "attr-", f.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "enhance",
   "enhance-new"
 ]), f.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), f.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), f.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), f.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap(), f.EACH_RENDERED_CHANGE_FIRED = /* @__PURE__ */ new WeakSet(), f.EACH_RENDERED_CHANGE_WARNED = /* @__PURE__ */ new WeakSet(), f.WARNED_DUPLICATE_EACH_KEYS = /* @__PURE__ */ new Set(), f.ABSENT_PATH = Symbol("absent");
-let O = f;
+let B = f;
 const fe = class fe {
   /**
    * コンストラクタ。
@@ -12173,17 +12392,17 @@ const U = class U {
       (l) => {
         const c = U.registrations.get(e);
         c && l.forEach((d) => {
-          !d.isIntersecting || c.running || U.isDisabled(c.fragment) || (c.running = !0, new ee(c.fragment, "intersect").runWithResult().then((h) => {
-            h && c.once && (c.observer.disconnect(), U.registrations.delete(e));
-          }).catch((h) => {
+          !d.isIntersecting || c.running || U.isDisabled(c.fragment) || (c.running = !0, new ee(c.fragment, "intersect").runWithResult().then((p) => {
+            p && c.once && (c.observer.disconnect(), U.registrations.delete(e));
+          }).catch((p) => {
             m.error(
               "[Haori]",
               "Intersect procedure execution error:",
-              h
+              p
             );
           }).finally(() => {
-            const h = U.registrations.get(e);
-            h && (h.running = !1);
+            const p = U.registrations.get(e);
+            p && (p.running = !1);
           }));
         });
       },
@@ -12230,7 +12449,7 @@ const U = class U {
     const r = e.getAttribute(t);
     if (typeof r != "string" || r.trim() === "")
       return null;
-    const i = z.query(r, t, document);
+    const i = G.query(r, t, document);
     return U.isHtmlElement(i) ? i : (m.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(e) {
@@ -12496,7 +12715,7 @@ const w = class w {
    */
   static async handleTimeout(e) {
     const t = w.registrations.get(e);
-    !t || t.stopped || (t.timeoutTimerId = null, t.timedOut = !0, e.isConnected && H.pollTimeout(
+    !t || t.stopped || (t.timeoutTimerId = null, t.timedOut = !0, e.isConnected && O.pollTimeout(
       e,
       t.count,
       w.elapsed(t)
@@ -12516,7 +12735,7 @@ const w = class w {
         w.registrations.delete(e);
         return;
       }
-      await w.injectState(t), e.isConnected && H.pollStop(
+      await w.injectState(t), e.isConnected && O.pollStop(
         e,
         r,
         t.count,
@@ -12602,7 +12821,7 @@ const w = class w {
           ...i.getRawBindingData() ?? {},
           _poll: r
         };
-        return O.setBindingData(n, s, {
+        return B.setBindingData(n, s, {
           reflectToAttribute: !1,
           // 状態変数の注入は値の供給ではない（権威を持たず、ユーザー編集の印も
           // 解除しない）。
@@ -12646,7 +12865,7 @@ const w = class w {
     const i = r.getAttribute(t);
     if (typeof i != "string" || i.trim() === "")
       return r.getTarget().isConnected ? [r] : [];
-    const n = z.queryAll(
+    const n = G.queryAll(
       i,
       t,
       document
@@ -12806,11 +13025,11 @@ w.CONFIG_KEYS = /* @__PURE__ */ new Set([
   "state"
 ]), w.DEFAULT_INTERVAL_MS = 5e3, w.MIN_INTERVAL_MS = 100, w.registrations = /* @__PURE__ */ new Map(), w.visibilityListener = null;
 let ce = w;
-const Ht = "0.41.4";
+const Ht = "0.42.0";
 function Ut(g) {
   typeof requestAnimationFrame == "function" ? requestAnimationFrame(() => g()) : Promise.resolve().then(g);
 }
-const B = class B {
+const L = class L {
   /**
    * ノードが現在の Window に属する HTMLElement かどうかを判定します。
    *
@@ -12829,8 +13048,8 @@ const B = class B {
    * @param root 走査の起点ノード
    */
   static syncTree(e) {
-    (e instanceof Element || e instanceof DocumentFragment) && (B.isHtmlElement(e) && B.syncElement(e), e.querySelectorAll("*").forEach((t) => {
-      B.syncElement(t);
+    (e instanceof Element || e instanceof DocumentFragment) && (L.isHtmlElement(e) && L.syncElement(e), e.querySelectorAll("*").forEach((t) => {
+      L.syncElement(t);
     }));
   }
   /**
@@ -12840,42 +13059,42 @@ const B = class B {
    * @param element 対象要素
    */
   static syncElement(e) {
-    const t = B.registrations.get(e), r = N.get(e);
-    if (!(r instanceof T) || !B.shouldObserve(r)) {
-      t && (t.observer.disconnect(), B.registrations.delete(e));
+    const t = L.registrations.get(e), r = N.get(e);
+    if (!(r instanceof T) || !L.shouldObserve(r)) {
+      t && (t.observer.disconnect(), L.registrations.delete(e));
       return;
     }
     if (typeof IntersectionObserver > "u")
       return;
-    const i = B.resolveVarName(r);
+    const i = L.resolveVarName(r);
     if (i === "") {
-      t && (t.observer.disconnect(), B.registrations.delete(e)), m.warn(
+      t && (t.observer.disconnect(), L.registrations.delete(e)), m.warn(
         "[Haori]",
         'data-each-visible requires a variable name (e.g. data-each-visible="visibleRange").'
       );
       return;
     }
-    const n = B.resolveRoot(r), s = B.resolveRootMargin(r);
+    const n = L.resolveRoot(r), s = L.resolveRootMargin(r);
     if (t && t.observer.root === n && t.observer.rootMargin === s && t.varName === i) {
-      t.fragment = r, B.refreshRows(t);
+      t.fragment = r, L.refreshRows(t);
       return;
     }
-    t && (t.observer.disconnect(), B.registrations.delete(e));
+    t && (t.observer.disconnect(), L.registrations.delete(e));
     const a = new IntersectionObserver(
       (l) => {
-        const c = B.registrations.get(e);
+        const c = L.registrations.get(e);
         if (!c)
           return;
         let d = !1;
-        l.forEach((h) => {
-          const y = h.target;
-          c.observedRows.has(y) && (h.isIntersecting ? c.visibleRows.has(y) || (c.visibleRows.add(y), d = !0) : c.visibleRows.delete(y) && (d = !0));
-        }), d && B.scheduleCompute(c);
+        l.forEach((p) => {
+          const y = p.target;
+          c.observedRows.has(y) && (p.isIntersecting ? c.visibleRows.has(y) || (c.visibleRows.add(y), d = !0) : c.visibleRows.delete(y) && (d = !0));
+        }), d && L.scheduleCompute(c);
       },
       {
         root: n,
         rootMargin: s,
-        threshold: B.THRESHOLD
+        threshold: L.THRESHOLD
       }
     ), o = {
       fragment: r,
@@ -12888,7 +13107,7 @@ const B = class B {
       scheduled: !1,
       lastSnapshot: null
     };
-    B.registrations.set(e, o), B.refreshRows(o);
+    L.registrations.set(e, o), L.refreshRows(o);
   }
   /**
    * 指定ノード配下の監視登録を解放します。
@@ -12896,22 +13115,22 @@ const B = class B {
    * @param root 走査の起点ノード
    */
   static cleanupTree(e) {
-    if (B.isHtmlElement(e)) {
-      const t = B.registrations.get(e);
-      t && (t.observer.disconnect(), B.registrations.delete(e));
+    if (L.isHtmlElement(e)) {
+      const t = L.registrations.get(e);
+      t && (t.observer.disconnect(), L.registrations.delete(e));
     }
     (e instanceof Element || e instanceof DocumentFragment) && e.querySelectorAll("*").forEach((t) => {
-      const r = B.registrations.get(t);
-      r && (r.observer.disconnect(), B.registrations.delete(t));
+      const r = L.registrations.get(t);
+      r && (r.observer.disconnect(), L.registrations.delete(t));
     });
   }
   /**
    * すべての監視登録を解放します。
    */
   static disconnectAll() {
-    B.registrations.forEach((e) => {
+    L.registrations.forEach((e) => {
       e.observer.disconnect();
-    }), B.registrations.clear();
+    }), L.registrations.clear();
   }
   /**
    * 監視対象（`data-each` かつ `data-each-visible`）かどうかを判定します。
@@ -12945,8 +13164,8 @@ const B = class B {
     const r = e.getAttribute(t);
     if (typeof r != "string" || r.trim() === "")
       return null;
-    const i = z.query(r, t, document);
-    return B.isHtmlElement(i) ? i : (m.error("[Haori]", `Visible range root element not found: ${r}`), null);
+    const i = G.query(r, t, document);
+    return L.isHtmlElement(i) ? i : (m.error("[Haori]", `Visible range root element not found: ${r}`), null);
   }
   /**
    * rootMargin を解決します。
@@ -12956,7 +13175,7 @@ const B = class B {
    */
   static resolveRootMargin(e) {
     const t = `${u.prefix}each-visible-margin`, r = e.getAttribute(t);
-    return r === null || r === !1 || r === "" ? B.DEFAULT_ROOT_MARGIN : String(r);
+    return r === null || r === !1 || r === "" ? L.DEFAULT_ROOT_MARGIN : String(r);
   }
   /**
    * コンテナ直下の実際の行要素（`each-before`/`each-after` を除く）を描画順で返します。
@@ -12976,12 +13195,12 @@ const B = class B {
    * @param registration 対象の登録
    */
   static refreshRows(e) {
-    const t = B.realRowElements(e.fragment), r = new Set(t);
+    const t = L.realRowElements(e.fragment), r = new Set(t);
     for (const i of [...e.observedRows])
       r.has(i) || (e.observer.unobserve(i), e.observedRows.delete(i), e.visibleRows.delete(i));
     for (const i of t)
       e.observedRows.has(i) || (e.observer.observe(i), e.observedRows.add(i));
-    B.scheduleCompute(e);
+    L.scheduleCompute(e);
   }
   /**
    * 次フレームでの集計・公開を予約します（多発する交差イベントを 1 回にまとめる）。
@@ -12992,7 +13211,7 @@ const B = class B {
     e.scheduled || (e.scheduled = !0, Ut(() => {
       e.scheduled = !1;
       const t = e.fragment.getTarget();
-      B.registrations.get(t) === e && B.computeAndPublish(e);
+      L.registrations.get(t) === e && L.computeAndPublish(e);
     }));
   }
   /**
@@ -13001,7 +13220,7 @@ const B = class B {
    * @param registration 対象の登録
    */
   static computeAndPublish(e) {
-    const t = B.realRowElements(e.fragment), r = /* @__PURE__ */ new Map();
+    const t = L.realRowElements(e.fragment), r = /* @__PURE__ */ new Map();
     t.forEach((a, o) => r.set(a, o));
     const i = [];
     for (const a of e.visibleRows) {
@@ -13034,7 +13253,7 @@ const B = class B {
       };
     }
     const s = JSON.stringify(n);
-    s !== e.lastSnapshot && (e.lastSnapshot = s, B.publish(e, n));
+    s !== e.lastSnapshot && (e.lastSnapshot = s, L.publish(e, n));
   }
   /**
    * 可視範囲スナップショットを最近接の上位 `data-bind` スコープへ公開します。
@@ -13043,7 +13262,7 @@ const B = class B {
    * @param snapshot 公開するスナップショット
    */
   static publish(e, t) {
-    const r = B.resolveBindOwner(e.fragment);
+    const r = L.resolveBindOwner(e.fragment);
     if (!r) {
       m.warn(
         "[Haori]",
@@ -13056,7 +13275,7 @@ const B = class B {
     };
     n[e.varName] = { ...t };
     const s = e.fragment.getTarget(), a = i === s ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([e.fragment]);
-    O.setBindingData(i, n, {
+    B.setBindingData(i, n, {
       skipFragments: a,
       reflectToAttribute: !1,
       // 可視範囲の公開は値の供給ではない（権威を持たず、ユーザー編集の印も
@@ -13085,8 +13304,8 @@ const B = class B {
     return e.hasAttribute(t) ? e : null;
   }
 };
-B.THRESHOLD = 0, B.DEFAULT_ROOT_MARGIN = "0px", B.registrations = /* @__PURE__ */ new Map();
-let se = B;
+L.THRESHOLD = 0, L.DEFAULT_ROOT_MARGIN = "0px", L.registrations = /* @__PURE__ */ new Map();
+let se = L;
 const K = class K {
   /**
    * 既存の MutationObserver をすべて停止します。
@@ -13110,8 +13329,8 @@ const K = class K {
     K._dispatcher = e, e.startDeferred();
     try {
       const t = await Promise.allSettled([
-        O.scan(document.head),
-        O.scan(document.body)
+        B.scan(document.head),
+        B.scan(document.body)
       ]), [r, i] = t;
       r.status !== "fulfilled" && m.error(
         "[Haori]",
@@ -13125,7 +13344,7 @@ const K = class K {
     } finally {
       e.release();
     }
-    H.ready(Ht);
+    O.ready(Ht);
   }
   /**
    * 稼働中の EventDispatcher を返します。
@@ -13226,9 +13445,9 @@ const K = class K {
         switch (r.type) {
           case "attributes": {
             const i = r.target;
-            if (r.attributeName && i.hasAttribute("data-haori-click-lock") && (r.attributeName === "disabled" || r.attributeName === "data-haori-click-lock") || r.attributeName && i.hasAttribute(pe) && (r.attributeName === "disabled" || r.attributeName === pe) || r.attributeName && O.isAliasedAttributeReflection(i, r.attributeName))
+            if (r.attributeName && i.hasAttribute("data-haori-click-lock") && (r.attributeName === "disabled" || r.attributeName === "data-haori-click-lock") || r.attributeName && i.hasAttribute(pe) && (r.attributeName === "disabled" || r.attributeName === pe) || r.attributeName && B.isAliasedAttributeReflection(i, r.attributeName))
               break;
-            O.setAttribute(
+            B.setAttribute(
               i,
               r.attributeName,
               i.getAttribute(r.attributeName),
@@ -13239,14 +13458,14 @@ const K = class K {
           }
           case "childList": {
             Array.from(r.removedNodes).forEach((i) => {
-              ue.cleanupTree(i), ce.cleanupTree(i), se.cleanupTree(i), O.removeNode(i);
+              ue.cleanupTree(i), ce.cleanupTree(i), se.cleanupTree(i), B.removeNode(i);
             }), Array.from(r.addedNodes).forEach((i) => {
-              i.parentElement instanceof Element && (O.addNode(i.parentElement, i), ue.syncTree(i), ce.syncTree(i), se.syncTree(i));
+              i.parentElement instanceof Element && (B.addNode(i.parentElement, i), ue.syncTree(i), ce.syncTree(i), se.syncTree(i));
             }), r.target instanceof Element && se.syncElement(r.target);
             break;
           }
           case "characterData": {
-            r.target instanceof Text || r.target instanceof Comment ? O.changeText(r.target, r.target.textContent) : m.warn(
+            r.target instanceof Text || r.target instanceof Comment ? B.changeText(r.target, r.target.textContent) : m.warn(
               "[Haori]",
               "Unsupported character data type:",
               r.target
@@ -13267,7 +13486,7 @@ let Re = K;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", Re.init) : Re.init();
 const Vt = () => he.waitForRenders(), qt = he.enhancers;
 export {
-  O as Core,
+  B as Core,
   te as Enhance,
   u as Env,
   F as Form,