haori 0.44.0 → 0.44.1

package/dist/haori.es.js

@@ -3672,6 +3672,26 @@ const R = class R extends N {
   static isValuePropertyTarget(e) {
     return e instanceof HTMLInputElement ? R.INPUT_EVENT_TYPES.includes(e.type) || e.type === "hidden" : e instanceof HTMLTextAreaElement || e instanceof HTMLSelectElement;
   }
+  /**
+   * 利用者が打鍵で値を変えられる入力欄かどうかを判定します。
+   *
+   * `readonly` の欄は打鍵で値が変わらないため、宣言バインドの再適用から守るべき
+   * 未コミットの入力を持ちません。それでいて `disabled` と違いタブ移動の対象には
+   * なるため、フォーカスを保護の条件にすると「算出値を入れた欄がタブ移動の行き先に
+   * なっただけで評価結果に追従しなくなる」ことになります。そこで `readonly` の欄は
+   * 保護の対象外とします（仕様「`data-attr-*`」）。
+   *
+   * `<select>` に `readonly` はないため常に編集できる扱いです。`disabled` も対象に
+   * しません。`disabled` の要素はフォーカスされないため保護に掛かる経路が無く、
+   * 「編集した欄を送信中だけ `disabled` にする」使い方で入力を評価結果へ巻き戻して
+   * しまう恐れがあるためです。
+   *
+   * @param element 判定対象のエレメント
+   * @returns 利用者が打鍵で値を変えられる場合 true
+   */
+  static isUserEditableValue(e) {
+    return e instanceof HTMLInputElement || e instanceof HTMLTextAreaElement ? !e.readOnly : !0;
+  }
   /**
    * 内部の値をDOMの値と同期します。
    * changeイベント時など、DOM値が変更された後に呼び出されます。
@@ -3884,8 +3904,8 @@ const R = class R extends N {
       return e === t ? this.removeAttribute(e) : this.removeAliasedAttribute(e, t);
     const o = new Ie(e, r);
     if (n) {
-      const xe = this.attributeMap.get(e);
-      if (xe && (xe.isEvaluate || xe.isForceEvaluation()) && !o.isEvaluate && !o.isForceEvaluation()) {
+      const Ce = this.attributeMap.get(e);
+      if (Ce && (Ce.isEvaluate || Ce.isForceEvaluation()) && !o.isEvaluate && !o.isForceEvaluation()) {
         const We = K.enqueue(() => {
         }).finally(() => {
           this.releaseSelfWritingAttributes(s);
@@ -3906,17 +3926,17 @@ const R = class R extends N {
       r,
       l
     );
-    const E = o.isForceEvaluation() ? r : g ? v : A, S = i && o.isEvaluate && t === "value" && R.isValuePropertyTarget(l), C = l.getRootNode(), H = S && (l === C.activeElement || this.hasPendingUserEdit()), P = U || E === null || E === !1 && !T ? null : String(E), Q = e !== t && l.getAttribute(e) !== r, x = P === null ? l.hasAttribute(t) : l.getAttribute(t) !== P, V = P === null ? "" : P, X = S && !H && l.value !== V, Y = t === "checked" && l instanceof HTMLInputElement && (l.type === "checkbox" || l.type === "radio"), te = t === "selected" && l instanceof HTMLOptionElement, be = C.activeElement, ue = be !== null && (Y && l === be || te && l.closest("select") === be) || (Y || te) && this.hasPendingCheckableUserEdit(te), ve = P !== null, Ce = Y && !ue && l.checked !== ve, Se = te && !ue && l.selected !== ve;
-    if (!Q && !x && !X && !Ce && !Se)
+    const E = o.isForceEvaluation() ? r : g ? v : A, S = i && o.isEvaluate && t === "value" && R.isValuePropertyTarget(l), x = l.getRootNode(), H = S && R.isUserEditableValue(l) && (l === x.activeElement || this.hasPendingUserEdit()), P = U || E === null || E === !1 && !T ? null : String(E), Q = e !== t && l.getAttribute(e) !== r, C = P === null ? l.hasAttribute(t) : l.getAttribute(t) !== P, V = P === null ? "" : P, X = S && !H && l.value !== V, Y = t === "checked" && l instanceof HTMLInputElement && (l.type === "checkbox" || l.type === "radio"), te = t === "selected" && l instanceof HTMLOptionElement, be = x.activeElement, ue = be !== null && (Y && l === be || te && l.closest("select") === be) || (Y || te) && this.hasPendingCheckableUserEdit(te), ve = P !== null, xe = Y && !ue && l.checked !== ve, Se = te && !ue && l.selected !== ve;
+    if (!Q && !C && !X && !xe && !Se)
       return S && !H && (this.value = this.normalizeValueForElement(
         l,
         V
       ), this.clearUnappliedValueWrite()), (Y || te) && !ue && this.syncCheckableValueFromDom(te), Promise.resolve();
     const qe = K.enqueue(() => {
-      Q && l.setAttribute(e, r), P === null ? l.removeAttribute(t) : x && (l.setAttribute(t, P), t === `${c.prefix}bind` && this.recordSelfWrittenBind(P)), S && !H && (this.value = this.normalizeValueForElement(
+      Q && l.setAttribute(e, r), P === null ? l.removeAttribute(t) : C && (l.setAttribute(t, P), t === `${c.prefix}bind` && this.recordSelfWrittenBind(P)), S && !H && (this.value = this.normalizeValueForElement(
         l,
         V
-      ), X && (l.value = V), this.recordValueWriteResult(l.value === V)), Ce && (l.checked = ve), Se && (l.selected = ve), (Ce || Se) && this.syncCheckableValueFromDom(Se);
+      ), X && (l.value = V), this.recordValueWriteResult(l.value === V)), xe && (l.checked = ve), Se && (l.selected = ve), (xe || Se) && this.syncCheckableValueFromDom(Se);
     }).finally(() => {
       this.releaseSelfWritingAttributes(s);
     });
@@ -7675,11 +7695,11 @@ function Re() {
     (r) => typeof e?.[r] == "function"
   ) ? e : me;
 }
-const Ct = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
+const xt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
 function Le(m) {
-  return Ct.has(m.toUpperCase());
+  return xt.has(m.toUpperCase());
 }
-function xt(m, e) {
+function Ct(m, e) {
   for (const [t, r] of Object.entries(e))
     r !== void 0 && (Array.isArray(r) ? r.forEach((i) => {
       m.append(t, de(i));
@@ -7698,7 +7718,7 @@ function de(m) {
 }
 function pt(m, e) {
   const t = new URL(m, window.location.href), r = new URLSearchParams(t.search);
-  return xt(r, e), t.search = r.toString(), t.toString();
+  return Ct(r, e), t.search = r.toString(), t.toString();
 }
 function $t(m) {
   if (m == null)
@@ -8079,12 +8099,12 @@ const y = class y {
           y.attrName(t, "form")
         );
         if (S) {
-          const C = z.query(
+          const x = z.query(
             S,
             y.attrName(t, "form")
           );
-          C !== null ? r.formFragment = k.getFormFragment(
-            N.get(C)
+          x !== null ? r.formFragment = k.getFormFragment(
+            N.get(x)
           ) : b.error(
             "Haori",
             `Form element not found: ${S} (${y.attrName(t, "form")})`
@@ -8105,16 +8125,16 @@ const y = class y {
 ${S}
 `
           );
-        } catch (C) {
-          b.error("Haori", `Invalid before script: ${C}`);
+        } catch (x) {
+          b.error("Haori", `Invalid before script: ${x}`);
         }
       }
       const E = y.attrName(t, "run");
       if (e.hasAttribute(E)) {
         const S = String(e.getAttribute(E) ?? "");
-        let C = null;
+        let x = null;
         try {
-          C = new Function(
+          x = new Function(
             "event",
             `"use strict"; return (
 ${S}
@@ -8122,14 +8142,14 @@ ${S}
           );
         } catch {
           try {
-            C = new Function("event", `"use strict";
+            x = new Function("event", `"use strict";
 ${S}
 `);
           } catch (H) {
             b.error("Haori", `Invalid run script: ${H}`);
           }
         }
-        C && (r.runScript = C);
+        x && (r.runScript = x);
       }
     }
     const n = y.attrName(t, "fetch"), s = e.hasAttribute(n);
@@ -8161,8 +8181,8 @@ ${S}
         );
         try {
           a.headers = B.parseDataBind(S);
-        } catch (C) {
-          b.error("Haori", `Invalid fetch headers: ${C}`);
+        } catch (x) {
+          b.error("Haori", `Invalid fetch headers: ${x}`);
         }
       }
     } else {
@@ -8177,8 +8197,8 @@ ${S}
         );
         try {
           a.headers = B.parseDataBind(S);
-        } catch (C) {
-          b.error("Haori", `Invalid fetch headers: ${C}`);
+        } catch (x) {
+          b.error("Haori", `Invalid fetch headers: ${x}`);
         }
       }
     }
@@ -8229,8 +8249,8 @@ ${S}
       const E = z.read(e, o);
       if (E) {
         const S = z.queryAll(E, o);
-        S.length > 0 ? (r.bindFragments = [], S.forEach((C) => {
-          const H = N.get(C);
+        S.length > 0 ? (r.bindFragments = [], S.forEach((x) => {
+          const H = N.get(x);
           H && r.bindFragments.push(H);
         })) : b.error(
           "Haori",
@@ -8263,13 +8283,13 @@ ${S}
     }
     if (t) {
       if (e.hasAttribute(y.attrName(t, "adjust"))) {
-        const x = z.read(
+        const C = z.read(
           e,
           y.attrName(t, "adjust")
         );
-        if (x) {
+        if (C) {
           const V = z.queryAll(
-            x,
+            C,
             y.attrName(t, "adjust")
           );
           V.length > 0 ? (r.adjustFragments = [], V.forEach((X) => {
@@ -8277,7 +8297,7 @@ ${S}
             Y && r.adjustFragments.push(Y);
           })) : b.error(
             "Haori",
-            `Adjust element not found: ${x} (${y.attrName(t, "adjust")})`
+            `Adjust element not found: ${C} (${y.attrName(t, "adjust")})`
           );
         }
         if (e.hasAttribute(y.attrName(t, "adjust-value"))) {
@@ -8288,7 +8308,7 @@ ${S}
         }
       }
       if (e.hasAttribute(y.attrName(t, "row-add")) && (r.rowAdd = !0), e.hasAttribute(y.attrName(t, "row-remove")) && (r.rowRemove = !0), e.hasAttribute(y.attrName(t, "row-prev")) && (r.rowMovePrev = !0), e.hasAttribute(y.attrName(t, "row-next")) && (r.rowMoveNext = !0), e.hasAttribute(`${c.prefix}${t}-after-run`)) {
-        const x = e.getRawAttribute(
+        const C = e.getRawAttribute(
           `${c.prefix}${t}-after-run`
         );
         try {
@@ -8296,7 +8316,7 @@ ${S}
             "response",
             `
 "use strict";
-${x}
+${C}
 `
           );
         } catch (V) {
@@ -8317,13 +8337,13 @@ ${x}
           "toast",
           y.attrName(t, "toast")
         );
-        const x = e.getRawAttribute(
+        const C = e.getRawAttribute(
           y.attrName(t, "toast-level")
-        ), X = ["info", "warning", "error", "success"].includes(x);
-        r.toastLevel = X ? x : null;
+        ), X = ["info", "warning", "error", "success"].includes(C);
+        r.toastLevel = X ? C : null;
       }
-      const E = y.attrName(t, "redirect"), S = y.attrName(t, "redirect-replace"), C = e.hasAttribute(E), H = e.hasAttribute(S);
-      if (C && (r.redirectUrl = y.readLateAttribute(
+      const E = y.attrName(t, "redirect"), S = y.attrName(t, "redirect-replace"), x = e.hasAttribute(E), H = e.hasAttribute(S);
+      if (x && (r.redirectUrl = y.readLateAttribute(
         e,
         r,
         "redirect",
@@ -8333,16 +8353,16 @@ ${x}
         r,
         "redirect-replace",
         S
-      )), C || H) {
-        const x = y.attrName(
+      )), x || H) {
+        const C = y.attrName(
           t,
           "redirect-return-param"
         );
-        e.hasAttribute(x) && (r.redirectReturnParam = y.readLateAttribute(
+        e.hasAttribute(C) && (r.redirectReturnParam = y.readLateAttribute(
           e,
           r,
           "redirect-return-param",
-          x
+          C
         ));
       }
       if (e.hasAttribute(y.attrName(t, "scroll-error")) && (r.scrollOnError = !0), e.hasAttribute(y.attrName(t, "scroll")) && (r.scrollTarget = y.readLateAttribute(
@@ -8356,20 +8376,20 @@ ${x}
         "history",
         y.attrName(t, "history")
       )), e.hasAttribute(y.attrName(t, "history-data")) && (r.historyDataAttrName = y.attrName(t, "history-data")), e.hasAttribute(y.attrName(t, "history-form"))) {
-        const x = z.read(
+        const C = z.read(
           e,
           y.attrName(t, "history-form")
         );
-        if (x) {
+        if (C) {
           const V = z.query(
-            x,
+            C,
             y.attrName(t, "history-form")
           );
           V !== null ? r.historyFormFragment = k.getFormFragment(
             N.get(V)
           ) : b.error(
             "Haori",
-            `Form element not found: ${x} (${y.attrName(t, "history-form")})`
+            `Form element not found: ${C} (${y.attrName(t, "history-form")})`
           );
         } else
           r.historyFormFragment = k.getFormFragment(e);
@@ -8382,8 +8402,8 @@ ${x}
         "copy",
         "open",
         "close"
-      ].forEach((x) => {
-        const V = y.attrName(t, x);
+      ].forEach((C) => {
+        const V = y.attrName(t, C);
         if (!e.hasAttribute(V))
           return;
         const X = z.read(e, V), Y = [];
@@ -8392,13 +8412,13 @@ ${x}
             const ue = N.get(be);
             ue && Y.push(ue);
           }), Y.length === 0 && b.error("Haori", `Element not found: ${X} (${V})`);
-        else if (x === "open" || x === "close") {
+        else if (C === "open" || C === "close") {
           const te = e.getTarget().closest("dialog");
           te ? Y.push(N.get(te)) : b.error("Haori", `Ancestor <dialog> not found (${V})`);
         } else
           Y.push(e);
         if (Y.length > 0)
-          switch (x) {
+          switch (C) {
             case "reset-before":
               r.resetBeforeFragments = Y;
               break;
@@ -8424,19 +8444,19 @@ ${x}
       });
       const Q = y.attrName(t, "copy-source");
       if (e.hasAttribute(Q)) {
-        const x = z.read(e, Q);
-        if (x) {
-          const V = z.query(x, Q);
+        const C = z.read(e, Q);
+        if (C) {
+          const V = z.query(C, Q);
           if (V !== null) {
             const X = N.get(V);
             X ? r.copySourceFragment = X : b.error(
               "Haori",
-              `Element is not managed by Haori: ${x} (${Q})`
+              `Element is not managed by Haori: ${C} (${Q})`
             );
           } else
             b.error(
               "Haori",
-              `Element not found: ${x} (${Q})`
+              `Element not found: ${C} (${Q})`
             );
         } else
           r.copySourceFragment = e;
@@ -8482,9 +8502,9 @@ ${x}
         );
       else {
         r.storeClearKey = S;
-        const C = e.getRawAttribute(
+        const x = e.getRawAttribute(
           `${U}-type`
-        ), H = C === null ? "session" : C.trim();
+        ), H = x === null ? "session" : x.trim();
         H === "local" || H === "session" ? r.storeClearKind = H : (b.warn(
           "Haori",
           `${U}-type は session または local を指定してください（session として扱います）: ${H}`
@@ -8643,7 +8663,7 @@ ${x}
           payload: l ? i : void 0,
           queryString: S
         }), this.options.targetFragment && n) {
-          const C = performance.now(), H = {
+          const x = performance.now(), H = {
             runtime: c.runtime,
             requestedMethod: F,
             effectiveMethod: U,
@@ -8659,7 +8679,7 @@ ${x}
           ), await this.injectFetchState("loading"), await fetch(n, T).then((P) => this.handleFetchResult(
             P,
             n || void 0,
-            C
+            x
           )).catch(async (P) => {
             throw n && O.fetchError(
               this.options.targetFragment.getTarget(),
@@ -8672,7 +8692,7 @@ ${x}
             ), P;
           });
         }
-        return await fetch(n, T).then((C) => this.handleFetchResult(C, n || void 0));
+        return await fetch(n, T).then((x) => this.handleFetchResult(x, n || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && l) {
         const p = this.options.formFragment, g = p.getTarget(), A = /* @__PURE__ */ new Set();
@@ -11880,37 +11900,37 @@ ${r}
     );
     const p = d.map((E) => E.getListKey()), g = /* @__PURE__ */ new Set();
     d = d.filter((E, S) => {
-      const C = String(E.getListKey()), H = l.get(C) ?? 0;
+      const x = String(E.getListKey()), H = l.get(x) ?? 0;
       if (H === 0) {
         g.add(E);
         const P = E.getListKey();
         return P !== null && O.rowRemove(E.getTarget(), P, S), u.push(E.remove()), !1;
       }
-      return l.set(C, H - 1), !0;
+      return l.set(x, H - 1), !0;
     });
     const A = d.map((E) => E.getListKey()), v = /* @__PURE__ */ new Map();
     d.forEach((E) => {
       const S = E.getListKey();
       if (S === null)
         return;
-      const C = v.get(S);
-      C ? C.push(E) : v.set(S, [E]);
+      const x = v.get(S);
+      x ? x.push(E) : v.set(S, [E]);
     });
     const T = e.getChildElementFragments().filter((E) => !g.has(E)), F = T.filter(
       (E) => E.hasAttribute(`${c.prefix}each-before`)
     ).length;
     let U = Promise.resolve();
     return a.forEach((E, S) => {
-      const C = t[S], H = S;
+      const x = t[S], H = S;
       let P;
       const Q = v.get(E)?.shift();
       if (Q) {
         P = Q;
-        const x = F + S;
+        const C = F + S;
         U = U.then(
           () => f.updateRowFragment(
             P,
-            C,
+            x,
             i,
             H,
             s ? String(s) : null,
@@ -11924,7 +11944,7 @@ ${r}
                 e,
                 P,
                 T,
-                x
+                C
               ).then((X) => {
                 if (X !== null && O.rowMove(
                   P.getTarget(),
@@ -11933,7 +11953,7 @@ ${r}
                   S
                 ), !!V)
                   return f.clearUserEditMarks(P), f.evaluateAll(P).then(
-                    () => f.applyRowFormValues(e, P, C)
+                    () => f.applyRowFormValues(e, P, x)
                   );
               })
             )
@@ -11941,34 +11961,34 @@ ${r}
         );
       } else {
         P = r.clone();
-        const x = F + S;
+        const C = F + S;
         U = U.then(
           () => f.updateRowFragment(
             P,
-            C,
+            x,
             i,
             H,
             s ? String(s) : null,
             E
           ).then(() => {
-            const V = T[x] ?? null;
+            const V = T[C] ?? null;
             return e.insertBefore(P, V).then(() => {
-              T.splice(x, 0, P);
-            }).then(() => f.initializeFreshEachRow(P)).then(() => f.applyRowFormValues(e, P, C)).then(() => {
-              O.rowAdd(P.getTarget(), E, H, C);
+              T.splice(C, 0, P);
+            }).then(() => f.initializeFreshEachRow(P)).then(() => f.applyRowFormValues(e, P, x)).then(() => {
+              O.rowAdd(P.getTarget(), E, H, x);
             });
           })
         );
       }
     }), Promise.all(u).then(() => U).then(() => {
       const E = a.filter(
-        (x) => x !== null
+        (C) => C !== null
       ), S = A.filter(
-        (x) => x !== null
-      ), C = new Set(S), H = E.filter((x) => !C.has(x)), Q = p.filter(
-        (x) => x !== null
+        (C) => C !== null
+      ), x = new Set(S), H = E.filter((C) => !x.has(C)), Q = p.filter(
+        (C) => C !== null
       ).filter(
-        (x) => !o.has(x)
+        (C) => !o.has(C)
       );
       O.eachUpdate(
         e.getTarget(),
@@ -13249,7 +13269,7 @@ 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 he = w;
-const Vt = "0.44.0";
+const Vt = "0.44.1";
 function qt(m) {
   typeof requestAnimationFrame == "function" ? requestAnimationFrame(() => m()) : Promise.resolve().then(m);
 }