haori 0.13.1 → 0.13.2

package/dist/haori.es.js

@@ -1,23 +1,23 @@
-const z = class z {
+const K = class K {
   /**
    * 開発モードの状態を取得します。
    *
    * @returns 開発モードならtrue、そうでなければfalse
    */
   static isEnabled() {
-    return z.devMode;
+    return K.devMode;
   }
   /**
    * 開発モードを有効化します。
    */
   static enable() {
-    z.devMode = !0;
+    K.devMode = !0;
   }
   /**
    * 開発モードを無効化します。
    */
   static disable() {
-    z.devMode = !1;
+    K.devMode = !1;
   }
   /**
    * 開発モードを切り替えます。
@@ -25,11 +25,11 @@ const z = class z {
    * @param enabled trueで有効化、falseで無効化
    */
   static set(e) {
-    z.devMode = e;
+    K.devMode = e;
   }
 };
-z.devMode = !1;
-let B = z;
+K.devMode = !1;
+let B = K;
 const ne = "embedded";
 function de(E) {
   return E === "embedded" || E === "demo";
@@ -97,7 +97,7 @@ const H = class H {
 H._prefix = "data-", H._runtime = ne;
 let l = H;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", l.detect) : l.detect();
-class p {
+class g {
   /**
    * 開発モードでのみコンソールに情報を出力します。
    *
@@ -149,14 +149,22 @@ function fe(E, e = ye) {
     ss: W(t.getSeconds())
   };
   return e.replace(
-    /yyyy|yy|MM|dd|HH|mm|ss|M|d|H/g,
-    (i) => r[i]
+    /'([^']*)'|yyyy|yy|MM|dd|HH|mm|ss|M|d|H/g,
+    (i, s) => s !== void 0 ? s === "" ? "'" : s : r[i]
   );
 }
 function pe(E, e) {
-  if (E == null || E === "")
+  if (E == null)
     return "";
-  const t = typeof E == "number" ? E : Number(E);
+  let t;
+  if (typeof E == "number")
+    t = E;
+  else {
+    const i = String(E).trim();
+    if (i === "")
+      return "";
+    t = Number(i);
+  }
   if (!Number.isFinite(t))
     return "";
   const r = {};
@@ -194,15 +202,27 @@ function me(E, e, t = {}) {
     a.add(h);
   for (let h = Math.max(0, i - s); h <= Math.min(r - 1, i + s); h += 1)
     a.add(h);
-  const o = Array.from(a).sort((h, g) => h - g), c = [];
+  const o = Array.from(a).sort((h, p) => h - p), c = [];
   let d = null;
-  for (const h of o)
-    d !== null && h - d > 1 && c.push({ page: null, label: "…", active: !1, ellipsis: !0 }), c.push({
+  for (const h of o) {
+    if (d !== null && h - d > 1)
+      if (h - d === 2) {
+        const p = d + 1;
+        c.push({
+          page: p,
+          label: p + 1,
+          active: p === i,
+          ellipsis: !1
+        });
+      } else
+        c.push({ page: null, label: "…", active: !1, ellipsis: !0 });
+    c.push({
       page: h,
       label: h + 1,
       active: h === i,
       ellipsis: !1
     }), d = h;
+  }
   return c;
 }
 const Ae = Object.freeze({ date: fe, number: pe, pages: me, range: ge }), I = class I {
@@ -288,18 +308,18 @@ const Ae = Object.freeze({ date: fe, number: pe, pages: me, range: ge }), I = cl
    */
   static evaluateDetailed(e, t = {}) {
     if (this.scheduleForbiddenBindingValueCacheReset(), e.trim() === "")
-      return p.warn("[Haori]", e, "Expression is empty"), { value: null, unresolvedReference: !1 };
+      return g.warn("[Haori]", e, "Expression is empty"), { value: null, unresolvedReference: !1 };
     if (this.containsDangerousPatterns(e)) {
-      const a = this.detectDisallowedKeywords(e);
-      if (a.length > 0) {
-        const o = a.some((c) => c === "function" || c === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
-        p.warn(
+      const o = this.detectDisallowedKeywords(e);
+      if (o.length > 0) {
+        const c = o.some((d) => d === "function" || d === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
+        g.warn(
           "[Haori]",
           e,
-          "Expression uses disallowed keyword(s): " + a.join(", ") + "." + o
+          "Expression uses disallowed keyword(s): " + o.join(", ") + "." + c
         );
       } else
-        p.warn(
+        g.warn(
           "[Haori]",
           e,
           "Expression contains dangerous patterns"
@@ -307,59 +327,64 @@ const Ae = Object.freeze({ date: fe, number: pe, pages: me, range: ge }), I = cl
       return { value: null, unresolvedReference: !1 };
     }
     if (this.containsForbiddenKeys(t))
-      return p.warn("[Haori]", t, "Binded values contain forbidden keys"), { value: null, unresolvedReference: !1 };
+      return g.warn("[Haori]", t, "Binded values contain forbidden keys"), { value: null, unresolvedReference: !1 };
     const r = this.getForbiddenBindingValueSet();
     if (this.containsForbiddenBindingValues(
       t,
       /* @__PURE__ */ new WeakSet(),
       r
     ))
-      return p.warn(
+      return g.warn(
         "[Haori]",
         t,
         "Binded values contain forbidden values"
       ), { value: null, unresolvedReference: !1 };
-    const i = this.BUILTIN_REFERENCE_PATTERN.test(e);
-    i && this.BUILTIN_NAMESPACE in t && p.warn(
+    const i = e.replace(
+      /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"/g,
+      ""
+    ), s = this.BUILTIN_REFERENCE_PATTERN.test(
+      i
+    );
+    s && this.BUILTIN_NAMESPACE in t && g.warn(
       "[Haori]",
       `Binding key "${this.BUILTIN_NAMESPACE}" is reserved for built-in helpers; the bound value is ignored in expressions.`
     );
-    const s = i ? { ...t, [this.BUILTIN_NAMESPACE]: this.BUILTIN_HELPERS } : { ...t }, n = this.canAttemptMissingIdentifierRecovery(e);
-    for (let a = 0; a <= this.MAX_IDENTIFIER_RECOVERY_COUNT; a += 1) {
-      const o = this.prepareEvaluator(e, s);
-      if (o.compileFailed || o.evaluator === null)
+    const n = s ? { ...t, [this.BUILTIN_NAMESPACE]: this.BUILTIN_HELPERS } : { ...t }, a = this.canAttemptMissingIdentifierRecovery(e);
+    for (let o = 0; o <= this.MAX_IDENTIFIER_RECOVERY_COUNT; o += 1) {
+      const c = this.prepareEvaluator(e, n);
+      if (c.compileFailed || c.evaluator === null)
         return { value: null, unresolvedReference: !1 };
       try {
-        const c = [], d = this.wrapBoundValues(s);
-        return o.bindKeys.forEach((h) => {
-          c.push(d[h]);
+        const d = [], h = this.wrapBoundValues(n);
+        return c.bindKeys.forEach((p) => {
+          d.push(h[p]);
         }), {
           value: this.withBlockedPropertyAccess(
-            () => o.evaluator(...c)
+            () => c.evaluator(...d)
           ),
           unresolvedReference: !1
         };
-      } catch (c) {
-        if (n && c instanceof ReferenceError) {
-          const h = this.extractMissingIdentifier(c);
-          if (h !== null && this.canRecoverMissingIdentifier(h, s)) {
-            s[h] = void 0;
+      } catch (d) {
+        if (a && d instanceof ReferenceError) {
+          const p = this.extractMissingIdentifier(d);
+          if (p !== null && this.canRecoverMissingIdentifier(p, n)) {
+            n[p] = void 0;
             continue;
           }
         }
-        const d = this.detectForbiddenIdentifiers(e);
-        return d.length > 0 && p.warn(
+        const h = this.detectForbiddenIdentifiers(e);
+        return h.length > 0 && g.warn(
           "[Haori]",
-          "Expression references blocked identifier(s): " + d.join(", ") + ". These are blocked in expressions and evaluate to undefined (often the cause of this error). Use spread {...a, ...b} instead of Object.assign.",
+          "Expression references blocked identifier(s): " + h.join(", ") + ". These are blocked in expressions and evaluate to undefined (often the cause of this error). Use spread {...a, ...b} instead of Object.assign.",
           e
-        ), p.error("[Haori]", "Expression evaluation error:", e, c), c instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
+        ), g.error("[Haori]", "Expression evaluation error:", e, d), d instanceof ReferenceError ? { value: void 0, unresolvedReference: !0 } : { value: null, unresolvedReference: !1 };
       }
     }
-    return p.error(
+    return g.error(
       "[Haori]",
       "Failed to recover missing identifiers:",
       e,
-      s
+      n
     ), { value: void 0, unresolvedReference: !0 };
   }
   /**
@@ -389,7 +414,7 @@ return (${e});`;
         compileFailed: !1
       };
     } catch (o) {
-      return p.error(
+      return g.error(
         "[Haori]",
         "Failed to compile expression:",
         e,
@@ -1013,13 +1038,13 @@ class oe {
             const r = await t.task();
             t.resolve(r);
           } catch (r) {
-            t.reject(r), p.error("[Haori]", `Task ${t.timestamp} failed:`, r);
+            t.reject(r), g.error("[Haori]", `Task ${t.timestamp} failed:`, r);
           }
           if (performance.now() - e > this.MAX_BUDGET)
             break;
         }
       } catch (e) {
-        p.error("[Haori]", "Error processing queue:", e);
+        g.error("[Haori]", "Error processing queue:", e);
       } finally {
         this.processing = !1, this.queue.length > 0 && this.scheduleProcessing();
       }
@@ -1179,7 +1204,7 @@ class X {
    */
   static openDialog(e) {
     return x.enqueue(() => {
-      e instanceof HTMLDialogElement ? e.showModal() : p.error("[Haori]", "Element is not a dialog: ", e);
+      e instanceof HTMLDialogElement ? e.showModal() : g.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
   /**
@@ -1189,7 +1214,7 @@ class X {
    */
   static closeDialog(e) {
     return x.enqueue(() => {
-      e instanceof HTMLDialogElement ? e.close() : p.error("[Haori]", "Element is not a dialog: ", e);
+      e instanceof HTMLDialogElement ? e.close() : g.error("[Haori]", "Element is not a dialog: ", e);
     }, !0);
   }
   /**
@@ -1308,7 +1333,7 @@ class S {
   static getPartValues(e, t) {
     const r = e.getAttribute("name"), i = e.getAttribute(`${l.prefix}form-object`), s = e.getAttribute(`${l.prefix}form-list`);
     if (r) {
-      s ? Array.isArray(t[String(r)]) ? t[String(r)].push(e.getValue()) : t[String(r)] = [e.getValue()] : t[String(r)] = e.getValue(), i && p.warn(
+      s ? Array.isArray(t[String(r)]) ? t[String(r)].push(e.getValue()) : t[String(r)] = [e.getValue()] : t[String(r)] = e.getValue(), i && g.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-object and name attributes.`
       );
@@ -1318,7 +1343,7 @@ class S {
       const n = {};
       for (const a of e.getChildElementFragments())
         S.getPartValues(a, n);
-      Object.keys(n).length > 0 && (t[String(i)] = n), s && p.warn(
+      Object.keys(n).length > 0 && (t[String(i)] = n), s && g.warn(
         "Haori",
         `Element cannot have both ${l.prefix}form-list and ${l.prefix}form-object attributes.`
       );
@@ -1392,10 +1417,10 @@ class S {
     } else if (o) {
       const h = t[String(o)];
       if (h && typeof h == "object")
-        for (const g of e.getChildElementFragments())
+        for (const p of e.getChildElementFragments())
           n.push(
             S.setPartValues(
-              g,
+              p,
               h,
               null,
               i,
@@ -1405,9 +1430,9 @@ class S {
     } else if (c) {
       const h = t[String(c)];
       if (Array.isArray(h)) {
-        const g = e.getChildElementFragments();
-        for (let v = 0; v < g.length; v++) {
-          const T = g[v];
+        const p = e.getChildElementFragments();
+        for (let v = 0; v < p.length; v++) {
+          const T = p[v];
           h.length > v ? n.push(
             S.setPartValues(
               T,
@@ -1557,9 +1582,9 @@ class S {
           if (s === o) {
             const c = i.substring(n + 1, a), d = Number(c);
             if (isNaN(d))
-              p.error("Haori", `Invalid index: ${i}`);
+              g.error("Haori", `Invalid index: ${i}`);
             else {
-              const h = e.getChildElementFragments().filter((g) => g.hasAttribute(`${l.prefix}row`));
+              const h = e.getChildElementFragments().filter((p) => p.hasAttribute(`${l.prefix}row`));
               d < h.length && r.push(
                 ...S.findFragmentByKeyParts(h[d], t.slice(1))
               );
@@ -1844,7 +1869,7 @@ const G = class G {
         t = new le(e);
         break;
       default:
-        return p.warn("[Haori]", "Unsupported node type:", e.nodeType), null;
+        return g.warn("[Haori]", "Unsupported node type:", e.nodeType), null;
     }
     return t;
   }
@@ -2021,7 +2046,7 @@ const V = class V extends w {
   removeChild(e) {
     const t = this.children.indexOf(e);
     if (t < 0) {
-      p.warn("[Haori]", "Child fragment not found.", e);
+      g.warn("[Haori]", "Child fragment not found.", e);
       return;
     }
     this.children.splice(t, 1), e.setParent(null);
@@ -2294,7 +2319,7 @@ const V = class V extends w {
       r.value = e === null ? "" : String(e), t && ((r instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(r.type) || r instanceof HTMLTextAreaElement) && r.dispatchEvent(new Event("input", { bubbles: !0 })), r.dispatchEvent(new Event("change", { bubbles: !0 })));
     }).finally(() => {
       this.skipChangeValue = !1;
-    })) : (p.warn(
+    })) : (g.warn(
       "[Haori]",
       "setValue is not supported for this element type.",
       r
@@ -2431,9 +2456,9 @@ const V = class V extends w {
       element: a,
       rawName: e,
       template: r
-    }), c = n.isEvaluate || n.isRawEvaluate, d = e === t && V.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), h = n.isSingleExpression(), g = j.joinEvaluateResults(o.results), v = o.results.length === 1 ? o.results[0] : g, T = !n.isForceEvaluation() && (t !== e || d || h ? o.hasUnresolvedReference || v === null || v === void 0 || v === !1 : c && g === ""), b = n.isForceEvaluation() ? r : h ? v : g, y = i && n.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), m = T || b === null || b === !1 ? null : String(b), A = e !== t && a.getAttribute(e) !== r, F = m === null ? a.hasAttribute(t) : a.getAttribute(t) !== m, M = y && m !== null && a.value !== m;
-    return !A && !F && !M ? (y && m !== null && (this.value = m), Promise.resolve()) : (this.skipMutationAttributes = !0, x.enqueue(() => {
-      A && a.setAttribute(e, r), m === null ? a.removeAttribute(t) : (F && a.setAttribute(t, m), y && (this.value = m, M && (a.value = m)));
+    }), c = n.isEvaluate || n.isRawEvaluate, d = e === t && V.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), h = n.isSingleExpression(), p = j.joinEvaluateResults(o.results), v = o.results.length === 1 ? o.results[0] : p, T = !n.isForceEvaluation() && (t !== e || d || h ? o.hasUnresolvedReference || v === null || v === void 0 || v === !1 : c && p === ""), b = n.isForceEvaluation() ? r : h ? v : p, y = i && n.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), m = T || b === null || b === !1 ? null : String(b), A = e !== t && a.getAttribute(e) !== r, F = m === null ? a.hasAttribute(t) : a.getAttribute(t) !== m, M = y && m !== null && a.value !== m;
+    return !A && !F && !M ? (y && m !== null && (this.value = this.normalizeValueForElement(a, m)), Promise.resolve()) : (this.skipMutationAttributes = !0, x.enqueue(() => {
+      A && a.setAttribute(e, r), m === null ? a.removeAttribute(t) : (F && a.setAttribute(t, m), y && (this.value = this.normalizeValueForElement(a, m), M && (a.value = m)));
     }).finally(() => {
       this.skipMutationAttributes = !1;
     }));
@@ -2552,13 +2577,13 @@ const V = class V extends w {
     if (this.skipMutationNodes)
       return Promise.resolve();
     if (e === this)
-      return p.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
+      return g.error("[Haori]", "Cannot insert element as child of itself"), Promise.reject(new Error("Self-insertion not allowed"));
     const i = /* @__PURE__ */ new Set();
     let s = this.parent;
     for (; s; )
       i.add(s), s = s.getParent();
     if (i.has(e))
-      return p.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
+      return g.error("[Haori]", "Cannot create circular reference"), Promise.reject(new Error("Circular reference detected"));
     const n = e.getParent() === this;
     let a = -1, o = -1;
     n && (a = this.children.indexOf(e), t !== null && (o = this.children.indexOf(t)));
@@ -2568,19 +2593,19 @@ const V = class V extends w {
     if (t === null)
       this.children.push(e);
     else {
-      let g;
-      if (n ? a !== -1 && a < o ? g = o - 1 : g = o : g = this.children.indexOf(t), g === -1) {
+      let p;
+      if (n ? a !== -1 && a < o ? p = o - 1 : p = o : p = this.children.indexOf(t), p === -1) {
         const v = this.resolveInsertionPointFromDom(
           t,
           !1
         );
-        v === null ? (p.warn(
+        v === null ? (g.warn(
           "[Haori]",
           "Reference child not found in children.",
           t
         ), this.children.push(e)) : (this.children.splice(v.index, 0, e), d = v.referenceNode);
       } else
-        this.children.splice(g, 0, e);
+        this.children.splice(p, 0, e);
     }
     e.setParent(this), e.setMounted(this.mounted);
     const h = this.skipMutationNodes;
@@ -2606,7 +2631,7 @@ const V = class V extends w {
         t,
         !0
       );
-      return i === null ? (p.warn(
+      return i === null ? (g.warn(
         "[Haori]",
         "Reference child not found in children.",
         t
@@ -2897,7 +2922,7 @@ const ee = class ee {
    */
   checkRawExpressions() {
     for (let e = 0; e < this.contents.length; e++)
-      this.contents[e].type === 2 && this.contents.length > 1 && (p.error(
+      this.contents[e].type === 2 && this.contents.length > 1 && (g.error(
         "[Haori]",
         "Raw expressions are not allowed in multi-content expressions."
       ), this.contents[e].type = 1);
@@ -2953,7 +2978,7 @@ const ee = class ee {
         } else
           s.push(c.text);
       } catch (d) {
-        p.error(
+        g.error(
           "[Haori]",
           `Error evaluating ${i} expression: ${c.text}`,
           d
@@ -3016,7 +3041,7 @@ const te = class te extends j {
       (i) => this.forceEvaluation && i.type === 0 || i.type === 1 || i.type === 2,
       "attribute"
     );
-    return this.forceEvaluation && r.results.length > 1 ? (p.error(
+    return this.forceEvaluation && r.results.length > 1 ? (g.error(
       "[Haori]",
       "each or if expressions must have a single content.",
       r.results
@@ -3502,7 +3527,7 @@ const f = class f {
           const m = document.body.querySelector(y);
           m !== null ? r.formFragment = S.getFormFragment(
             w.get(m)
-          ) : p.error(
+          ) : g.error(
             "Haori",
             `Form element not found: ${y} (${f.attrName(t, "form")})`
           );
@@ -3523,7 +3548,7 @@ ${y}
 `
           );
         } catch (m) {
-          p.error("Haori", `Invalid before script: ${m}`);
+          g.error("Haori", `Invalid before script: ${m}`);
         }
       }
       const b = f.attrName(t, "run");
@@ -3538,7 +3563,7 @@ ${y}
 `
           );
         } catch (m) {
-          p.error("Haori", `Invalid run script: ${m}`);
+          g.error("Haori", `Invalid run script: ${m}`);
         }
       }
     }
@@ -3572,7 +3597,7 @@ ${y}
         try {
           n.headers = P.parseDataBind(y);
         } catch (m) {
-          p.error("Haori", `Invalid fetch headers: ${m}`);
+          g.error("Haori", `Invalid fetch headers: ${m}`);
         }
       }
     } else {
@@ -3588,7 +3613,7 @@ ${y}
         try {
           n.headers = P.parseDataBind(y);
         } catch (m) {
-          p.error("Haori", `Invalid fetch headers: ${m}`);
+          g.error("Haori", `Invalid fetch headers: ${m}`);
         }
       }
     }
@@ -3642,7 +3667,7 @@ ${y}
         y.length > 0 ? (r.bindFragments = [], y.forEach((m) => {
           const A = w.get(m);
           A && r.bindFragments.push(A);
-        })) : p.error(
+        })) : g.error(
           "Haori",
           `Bind element not found: ${b} (${a})`
         );
@@ -3665,9 +3690,9 @@ ${y}
       const b = e.getRawAttribute(h);
       r.bindParams = b.split("&").map((y) => y.trim());
     }
-    const g = t ? f.attrName(t, "bind-append") : f.attrName(null, "bind-append", !0);
-    if (e.hasAttribute(g)) {
-      const b = e.getRawAttribute(g);
+    const p = t ? f.attrName(t, "bind-append") : f.attrName(null, "bind-append", !0);
+    if (e.hasAttribute(p)) {
+      const b = e.getRawAttribute(p);
       r.bindAppendParams = b.split("&").map((y) => y.trim()).filter(Boolean);
     }
     const v = t ? f.attrName(t, "bind-merge") : f.attrName(null, "bind-merge", !0);
@@ -3687,7 +3712,7 @@ ${y}
           A.length > 0 ? (r.adjustFragments = [], A.forEach((F) => {
             const M = w.get(F);
             M && r.adjustFragments.push(M);
-          })) : p.error(
+          })) : g.error(
             "Haori",
             `Adjust element not found: ${m} (${f.attrName(t, "adjust")})`
           );
@@ -3712,7 +3737,7 @@ ${m}
 `
           );
         } catch (A) {
-          p.error("Haori", `Invalid after script: ${A}`);
+          g.error("Haori", `Invalid after script: ${A}`);
         }
       }
       if (e.hasAttribute(f.attrName(t, "dialog")) && (r.dialogMessage = e.getAttribute(f.attrName(t, "dialog")).replace(/\\n/g, `
@@ -3739,7 +3764,7 @@ ${m}
           const A = document.body.querySelector(m);
           A !== null ? r.historyFormFragment = S.getFormFragment(
             w.get(A)
-          ) : p.error(
+          ) : g.error(
             "Haori",
             `Form element not found: ${m} (${f.attrName(t, "history-form")})`
           );
@@ -3760,9 +3785,9 @@ ${m}
           return;
         const F = e.getRawAttribute(A), M = [];
         if (F ? (document.body.querySelectorAll(F).forEach(($) => {
-          const K = w.get($);
-          K && M.push(K);
-        }), M.length === 0 && p.error("Haori", `Element not found: ${F} (${A})`)) : M.push(e), M.length > 0)
+          const z = w.get($);
+          z && M.push(z);
+        }), M.length === 0 && g.error("Haori", `Element not found: ${F} (${A})`)) : M.push(e), M.length > 0)
           switch (m) {
             case "reset-before":
               r.resetBeforeFragments = M;
@@ -3796,12 +3821,12 @@ ${m}
           const A = document.body.querySelector(m);
           if (A !== null) {
             const F = w.get(A);
-            F ? r.copySourceFragment = F : p.error(
+            F ? r.copySourceFragment = F : g.error(
               "Haori",
               `Element is not managed by Haori: ${m} (${y})`
             );
           } else
-            p.error(
+            g.error(
               "Haori",
               `Element not found: ${m} (${y})`
             );
@@ -3817,7 +3842,7 @@ ${m}
         const y = document.body.querySelector(b);
         y !== null ? r.formFragment = S.getFormFragment(
           w.get(y)
-        ) : p.error(
+        ) : g.error(
           "Haori",
           `Form element not found: ${b} (${f.attrName(null, "fetch-form", !0)})`
         );
@@ -3894,7 +3919,7 @@ ${m}
             this.domEvent
           ) === !1 && this.domEvent && this.domEvent.preventDefault();
         } catch (h) {
-          p.error("Haori", `Run script execution error: ${h}`);
+          g.error("Haori", `Run script execution error: ${h}`);
         }
       }
       if (!await this.confirm())
@@ -3919,11 +3944,11 @@ ${m}
       }
       const a = Object.keys(i).length > 0;
       if (s) {
-        const d = { ...n || {} }, h = r.requestedMethod, g = r.effectiveMethod, v = r.transportMode === "query-get", T = r.queryString;
-        if (v && p.info("Haori demo fetch normalization", {
+        const d = { ...n || {} }, h = r.requestedMethod, p = r.effectiveMethod, v = r.transportMode === "query-get", T = r.queryString;
+        if (v && g.info("Haori demo fetch normalization", {
           runtime: l.runtime,
           requestedMethod: h,
-          effectiveMethod: g,
+          effectiveMethod: p,
           transportMode: "query-get",
           url: s,
           payload: a ? i : void 0,
@@ -3932,7 +3957,7 @@ ${m}
           const b = performance.now(), y = {
             runtime: l.runtime,
             requestedMethod: h,
-            effectiveMethod: g,
+            effectiveMethod: p,
             transportMode: v ? "query-get" : "http",
             ...v ? { queryString: T } : {}
           };
@@ -3957,10 +3982,10 @@ ${m}
         return fetch(s, d).then((b) => this.handleFetchResult(b, s || void 0));
       }
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && a) {
-        const d = this.options.formFragment, h = d.getTarget(), g = /* @__PURE__ */ new Set();
-        e && e.appliedDisabledAttribute && this.options.targetFragment && g.add(this.options.targetFragment), h.setAttribute(`${l.prefix}bind`, JSON.stringify(i));
+        const d = this.options.formFragment, h = d.getTarget(), p = /* @__PURE__ */ new Set();
+        e && e.appliedDisabledAttribute && this.options.targetFragment && p.add(this.options.targetFragment), h.setAttribute(`${l.prefix}bind`, JSON.stringify(i));
         const v = d.getBindingData();
-        Object.assign(v, i), await P.setBindingData(h, v, g);
+        Object.assign(v, i), await P.setBindingData(h, v, p);
       }
       const o = a ? i : {}, c = new Response(JSON.stringify(o), {
         headers: { "Content-Type": "application/json" }
@@ -4041,10 +4066,10 @@ ${m}
       }
     return this.options.openFragments && this.options.openFragments.length > 0 && this.options.openFragments.forEach((a) => {
       const o = a.getTarget();
-      o instanceof HTMLElement ? n.push(i.openDialog(o)) : p.error("Haori", "Element is not an HTML element: ", o);
+      o instanceof HTMLElement ? n.push(i.openDialog(o)) : g.error("Haori", "Element is not an HTML element: ", o);
     }), this.options.closeFragments && this.options.closeFragments.length > 0 && this.options.closeFragments.forEach((a) => {
       const o = a.getTarget();
-      o instanceof HTMLElement ? n.push(i.closeDialog(o)) : p.error("Haori", "Element is not an HTML element: ", o);
+      o instanceof HTMLElement ? n.push(i.closeDialog(o)) : g.error("Haori", "Element is not an HTML element: ", o);
     }), await Promise.all(n), this.options.dialogMessage && await i.dialog(this.options.dialogMessage), this.options.toastMessage && await i.toast(
       this.options.toastMessage,
       this.options.toastLevel ?? "info"
@@ -4064,12 +4089,12 @@ ${m}
         const n = e ? this.options.historyUrl : window.location.pathname, a = new URL(n, window.location.href);
         if (a.origin !== window.location.origin) {
           const c = "history.pushState: cross-origin URL is not allowed: " + a.toString();
-          p.error("Haori", c);
+          g.error("Haori", c);
           return;
         }
         const o = (c) => {
           for (const [d, h] of Object.entries(c))
-            h != null && (Array.isArray(h) ? h.forEach((g) => a.searchParams.append(d, String(g))) : typeof h == "object" ? a.searchParams.set(d, JSON.stringify(h)) : a.searchParams.set(d, String(h)));
+            h != null && (Array.isArray(h) ? h.forEach((p) => a.searchParams.append(d, String(p))) : typeof h == "object" ? a.searchParams.set(d, JSON.stringify(h)) : a.searchParams.set(d, String(h)));
         };
         i && o(t), s && o(r), history.pushState(
           { [we]: !0 },
@@ -4077,7 +4102,7 @@ ${m}
           a.toString()
         );
       } catch (n) {
-        p.error("Haori", `history.pushState failed: ${n}`);
+        g.error("Haori", `history.pushState failed: ${n}`);
       }
   }
   /**
@@ -4205,7 +4230,7 @@ ${m}
         });
       else {
         if (typeof r == "string")
-          return p.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
+          return g.error("Haori", "string data cannot be bound without a bindArg."), Promise.reject(
             new Error("string data cannot be bound without a bindArg.")
           );
         this.options.bindFragments.forEach((s) => {
@@ -4324,15 +4349,15 @@ ${m}
       const h = n.get("Content-Type") || "";
       if (/multipart\/form-data/i.test(h)) {
         n.delete("Content-Type");
-        const g = new FormData();
+        const p = new FormData();
         for (const [v, T] of Object.entries(t))
-          T == null ? g.append(v, "") : T instanceof Blob ? g.append(v, T) : Array.isArray(T) ? T.forEach((b) => g.append(v, String(b))) : typeof T == "object" ? g.append(v, JSON.stringify(T)) : g.append(v, String(T));
-        s.body = g;
+          T == null ? p.append(v, "") : T instanceof Blob ? p.append(v, T) : Array.isArray(T) ? T.forEach((b) => p.append(v, String(b))) : typeof T == "object" ? p.append(v, JSON.stringify(T)) : p.append(v, String(T));
+        s.body = p;
       } else if (/application\/x-www-form-urlencoded/i.test(h)) {
-        const g = new URLSearchParams();
+        const p = new URLSearchParams();
         for (const [v, T] of Object.entries(t))
-          T !== void 0 && (T === null ? g.append(v, "") : Array.isArray(T) ? T.forEach((b) => g.append(v, String(b))) : typeof T == "object" ? g.append(v, JSON.stringify(T)) : g.append(v, String(T)));
-        s.body = g;
+          T !== void 0 && (T === null ? p.append(v, "") : Array.isArray(T) ? T.forEach((b) => p.append(v, String(b))) : typeof T == "object" ? p.append(v, JSON.stringify(T)) : p.append(v, String(T)));
+        s.body = p;
       } else
         n.set("Content-Type", "application/json"), s.body = JSON.stringify(t);
     }
@@ -4427,11 +4452,11 @@ ${m}
    */
   getRowFragment() {
     if (!this.options.targetFragment)
-      return p.error("Haori", "Target fragment is not specified for row operation."), null;
+      return g.error("Haori", "Target fragment is not specified for row operation."), null;
     const e = this.options.targetFragment.closestByAttribute(
       `${l.prefix}row`
     );
-    return e || (p.error("Haori", "Row fragment not found."), null);
+    return e || (g.error("Haori", "Row fragment not found."), null);
   }
   /**
    * 行を追加します。
@@ -4532,23 +4557,23 @@ class Ie {
     try {
       r = await fetch(e, t);
     } catch (s) {
-      throw p.error("[Haori]", "Failed to fetch import source:", e, s), new Error(`Failed to fetch: ${e}`);
+      throw g.error("[Haori]", "Failed to fetch import source:", e, s), new Error(`Failed to fetch: ${e}`);
     }
     if (!r.ok) {
       const s = `${r.status} ${r.statusText}`;
-      throw p.error("[Haori]", "Import HTTP error:", e, s), new Error(`Failed to load ${e}: ${s}`);
+      throw g.error("[Haori]", "Import HTTP error:", e, s), new Error(`Failed to load ${e}: ${s}`);
     }
     let i;
     try {
       i = await r.text();
     } catch (s) {
-      throw p.error("[Haori]", "Failed to read response text:", e, s), new Error(`Failed to read response from: ${e}`);
+      throw g.error("[Haori]", "Failed to read response text:", e, s), new Error(`Failed to read response from: ${e}`);
     }
     try {
       const n = new DOMParser().parseFromString(i, "text/html");
-      return n && n.body ? n.body.innerHTML : (p.warn("[Haori]", "No body found in imported document:", e), i);
+      return n && n.body ? n.body.innerHTML : (g.warn("[Haori]", "No body found in imported document:", e), i);
     } catch (s) {
-      return p.error("[Haori]", "Failed to parse imported HTML:", e, s), i;
+      return g.error("[Haori]", "Failed to parse imported HTML:", e, s), i;
     }
   }
 }
@@ -4738,7 +4763,7 @@ const u = class u {
         }
       });
     }).catch((a) => {
-      t.removeAttribute(`${l.prefix}importing`), R.importError(t, s, a), p.error("[Haori]", "Failed to import HTML:", s, a);
+      t.removeAttribute(`${l.prefix}importing`), R.importError(t, s, a), g.error("[Haori]", "Failed to import HTML:", s, a);
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
         return r.rerunRequested = !1, u.executeManagedImport(e);
@@ -4921,8 +4946,8 @@ const u = class u {
         if (d === null)
           a.push(u.setBindingData(e, h));
         else {
-          const g = s.getRawBindingData() || {};
-          g[String(d)] = h, a.push(u.setBindingData(e, g));
+          const p = s.getRawBindingData() || {};
+          p[String(d)] = h, a.push(u.setBindingData(e, p));
         }
         break;
       }
@@ -4982,20 +5007,20 @@ const u = class u {
     const r = t.getBindingData(), i = {}, s = (c) => {
       const d = c.getTarget();
       return d.id ? `#${d.id}` : d.tagName.toLowerCase();
-    }, n = (c, d, h, g) => {
+    }, n = (c, d, h, p) => {
       if (c)
         for (const v of Object.keys(c))
           v in i || (i[v] = {
             value: c[v],
             source: s(d),
             kind: h,
-            depth: g
+            depth: p
           });
     };
     let a = t, o = 0;
     for (; a; )
       a !== t && n(a.getRawDerivedBindingData(), a, "derive", o), n(a.getRawBindingData(), a, "bind", o), a = a.getParent(), o += 1;
-    return B.isEnabled() && p.info("[Haori]", "scope dump for", e, { resolved: r, sources: i }), { resolved: r, sources: i };
+    return B.isEnabled() && g.info("[Haori]", "scope dump for", e, { resolved: r, sources: i }), { resolved: r, sources: i };
   }
   /**
    * data-bind 属性の値をパースします。
@@ -5008,7 +5033,7 @@ const u = class u {
       try {
         return JSON.parse(e);
       } catch (t) {
-        return p.error("[Haori]", "Invalid JSON in data-bind:", t), {};
+        return g.error("[Haori]", "Invalid JSON in data-bind:", t), {};
       }
     else {
       const t = new URLSearchParams(e), r = {};
@@ -5102,22 +5127,22 @@ const u = class u {
     const i = e.hasAttribute(`${l.prefix}derive`), s = e.hasAttribute(`${l.prefix}if`), n = e.hasAttribute(`${l.prefix}each`), a = e.getRawAttribute(`${l.prefix}derive`), o = e.getRawAttribute(`${l.prefix}derive-name`);
     let c = !1, d = !1, h = null;
     if (!i && e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), !i && e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), i) {
-      const g = u.createDeriveInputSignature(
+      const p = u.createDeriveInputSignature(
         e,
         a,
         o
       );
-      g === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
+      p === null ? (e.getDeriveInputSignature() !== null && e.setDeriveInputSignature(null), r = r.then(
         () => u.evaluateDerive(e, a, o).then(
           () => {
           }
         )
-      )) : e.getDeriveInputSignature() !== g && (r = r.then(() => u.evaluateDerive(
+      )) : e.getDeriveInputSignature() !== p && (r = r.then(() => u.evaluateDerive(
         e,
         a,
         o
       ).then(() => {
-        e.setDeriveInputSignature(g);
+        e.setDeriveInputSignature(p);
       })));
     }
     return s && (r = r.then(() => u.evaluateIf(e))), n ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => u.evaluateEach(e))) : s ? (e.getDeriveSubtreeSignature() !== null && e.setDeriveSubtreeSignature(null), r.then(() => {
@@ -5136,14 +5161,14 @@ const u = class u {
     })), r.then(() => {
       if (c)
         return;
-      const g = [];
+      const p = [];
       return e.getChildren().forEach((v) => {
         if (v instanceof C) {
           if (u.canSkipUnchangedNestedEach(v))
             return;
-          g.push(u.evaluateAll(v, t));
-        } else v instanceof L && g.push(u.evaluateText(v));
-      }), Promise.all(g).then(() => {
+          p.push(u.evaluateAll(v, t));
+        } else v instanceof L && p.push(u.evaluateText(v));
+      }), Promise.all(p).then(() => {
       });
     }).then(() => {
       d && h !== null && e.setDeriveSubtreeSignature(h);
@@ -5221,7 +5246,7 @@ const u = class u {
     const a = {};
     i.forEach((o) => {
       o in r && (a[o] = r[o]);
-    }), p.info(
+    }), g.info(
       "[Haori]",
       "data-if is falsy (hidden):",
       t,
@@ -5273,7 +5298,7 @@ const u = class u {
   static triggerLoadOnShow(e) {
     const t = `${l.prefix}load-`;
     e.getTarget().getAttributeNames().some((i) => i.startsWith(t)) && new q(e, "load").run().catch((i) => {
-      p.error("[Haori]", "data-load procedure error (on show):", i);
+      g.error("[Haori]", "data-load procedure error (on show):", i);
     });
   }
   /**
@@ -5382,7 +5407,7 @@ const u = class u {
    */
   static resolveEachItems(e) {
     const t = e.getAttributeEvaluation(`${l.prefix}each`), r = t?.value;
-    return t?.hasUnresolvedReference || r === !1 || r === null || r === void 0 ? [] : Array.isArray(r) ? r : (p.error("[Haori]", "Invalid each attribute:", r), null);
+    return t?.hasUnresolvedReference || r === !1 || r === null || r === void 0 ? [] : Array.isArray(r) ? r : (g.error("[Haori]", "Invalid each attribute:", r), null);
   }
   /**
    * nested data-each の入力が同値で、要素自身に他の動的要素が無い場合は
@@ -5540,7 +5565,7 @@ const u = class u {
    */
   static logDerivedSubtreeProfileSnapshot(e, t) {
     const r = u.getOrCreateDerivedSubtreeProfile(e);
-    r !== null && (t === "skip-hit" ? r.skipHitCount += 1 : t === "skip-miss" ? r.skipMissCount += 1 : t === "skip-ineligible" && (r.skipIneligibleCount += 1), p.info("[Haori][derive-profile]", {
+    r !== null && (t === "skip-hit" ? r.skipHitCount += 1 : t === "skip-miss" ? r.skipMissCount += 1 : t === "skip-ineligible" && (r.skipIneligibleCount += 1), g.info("[Haori][derive-profile]", {
       reason: t,
       hostId: r.hostId,
       signatureComputeTotal: r.signatureComputeTotal,
@@ -5607,7 +5632,7 @@ const u = class u {
   static updateDiff(e, t) {
     const r = e.getTemplate();
     if (r === null)
-      return p.error("[Haori]", "Template is not set for each element."), Promise.resolve();
+      return g.error("[Haori]", "Template is not set for each element."), Promise.resolve();
     let i = e.getAttribute(`${l.prefix}each-index`);
     i && (i = String(i));
     const s = e.getAttribute(`${l.prefix}each-key`), n = e.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
@@ -5623,7 +5648,7 @@ const u = class u {
     let h = e.getChildren().filter((A) => A instanceof C).filter(
       (A) => !A.hasAttribute(`${l.prefix}each-before`) && !A.hasAttribute(`${l.prefix}each-after`)
     );
-    const g = h.map((A) => A.getListKey());
+    const p = h.map((A) => A.getListKey());
     h = h.filter((A) => c.has(String(A.getListKey())) ? !0 : (d.push(A.remove()), !1));
     const v = h.map((A) => A.getListKey()), T = /* @__PURE__ */ new Map();
     h.forEach((A) => {
@@ -5637,9 +5662,9 @@ const u = class u {
     return o.forEach((A, F) => {
       const { item: M, itemIndex: U } = a.get(A);
       let $;
-      const K = T.get(A);
-      if (K)
-        $ = K, m = m.then(
+      const z = T.get(A);
+      if (z)
+        $ = z, m = m.then(
           () => u.updateRowFragment(
             $,
             M,
@@ -5676,7 +5701,7 @@ const u = class u {
         (k) => k !== null
       ), F = v.filter(
         (k) => k !== null
-      ), M = new Set(F), U = A.filter((k) => !M.has(k)), K = g.filter(
+      ), M = new Set(F), U = A.filter((k) => !M.has(k)), z = p.filter(
         (k) => k !== null
       ).filter(
         (k) => !c.has(k)
@@ -5684,7 +5709,7 @@ const u = class u {
       R.eachUpdate(
         e.getTarget(),
         U,
-        K,
+        z,
         A
       );
     });
@@ -5731,7 +5756,7 @@ const u = class u {
         [s]: t
       }, r && (a[r] = i);
     else
-      return p.error(
+      return g.error(
         "[Haori]",
         `Primitive value requires '${l.prefix}each-arg' attribute: ${t}`
       ), Promise.resolve(!1);
@@ -5881,17 +5906,17 @@ const re = class re {
     const r = this.getElementFromTarget(e.target, t);
     if (!r)
       return;
-    r.hasAttribute(`data-${t}-prevent`) && e.preventDefault();
+    r.hasAttribute(`${l.prefix}${t}-prevent`) && e.preventDefault();
     const i = w.get(r);
     if (!i)
       return;
     t === "change" && i instanceof C && i.syncValue();
     const s = () => {
       new q(i, t, e).run().catch((n) => {
-        p.error("[Haori]", "Procedure execution error:", n);
+        g.error("[Haori]", "Procedure execution error:", n);
       });
     };
-    if (t === "click" && r.hasAttribute("data-click-defer")) {
+    if (t === "click" && r.hasAttribute(`${l.prefix}click-defer`)) {
       typeof requestAnimationFrame < "u" ? requestAnimationFrame(() => s()) : setTimeout(s, 0);
       return;
     }
@@ -5924,7 +5949,8 @@ const re = class re {
   findClickableElement(e) {
     let t = e;
     for (; t; ) {
-      if (t.getAttributeNames().some((r) => r.startsWith("data-click-")))
+      const r = `${l.prefix}click-`;
+      if (t.getAttributeNames().some((i) => i.startsWith(r)))
         return t;
       t = t.parentElement;
     }
@@ -5972,17 +5998,17 @@ const D = class D {
       (c) => {
         const d = D.registrations.get(e);
         d && c.forEach((h) => {
-          !h.isIntersecting || d.running || D.isDisabled(d.fragment) || (d.running = !0, new q(d.fragment, "intersect").runWithResult().then((g) => {
-            g && d.once && (d.observer.disconnect(), D.registrations.delete(e));
-          }).catch((g) => {
-            p.error(
+          !h.isIntersecting || d.running || D.isDisabled(d.fragment) || (d.running = !0, new q(d.fragment, "intersect").runWithResult().then((p) => {
+            p && d.once && (d.observer.disconnect(), D.registrations.delete(e));
+          }).catch((p) => {
+            g.error(
               "[Haori]",
               "Intersect procedure execution error:",
-              g
+              p
             );
           }).finally(() => {
-            const g = D.registrations.get(e);
-            g && (g.running = !1);
+            const p = D.registrations.get(e);
+            p && (p.running = !1);
           }));
         });
       },
@@ -6030,7 +6056,7 @@ const D = class D {
     if (typeof r != "string" || r.trim() === "")
       return null;
     const i = document.querySelector(r);
-    return D.isHtmlElement(i) ? i : (p.error("[Haori]", `Intersect root element not found: ${r}`), null);
+    return D.isHtmlElement(i) ? i : (g.error("[Haori]", `Intersect root element not found: ${r}`), null);
   }
   static resolveRootMargin(e) {
     const t = `${l.prefix}intersect-root-margin`, r = e.getAttribute(t);
@@ -6082,7 +6108,7 @@ const O = class O {
       P.scan(document.head),
       P.scan(document.body)
     ]), [t, r] = e;
-    t.status !== "fulfilled" && p.error("[Haori]", "Failed to build head fragment:", t.reason), r.status !== "fulfilled" && p.error("[Haori]", "Failed to build body fragment:", r.reason), await x.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ae().start(), Y.syncTree(document.body);
+    t.status !== "fulfilled" && g.error("[Haori]", "Failed to build head fragment:", t.reason), r.status !== "fulfilled" && g.error("[Haori]", "Failed to build body fragment:", r.reason), await x.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ae().start(), Y.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -6118,7 +6144,7 @@ const O = class O {
               break;
             }
             case "characterData": {
-              i.target instanceof Text || i.target instanceof Comment ? P.changeText(i.target, i.target.textContent) : p.warn(
+              i.target instanceof Text || i.target instanceof Comment ? P.changeText(i.target, i.target.textContent) : g.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -6126,11 +6152,11 @@ const O = class O {
               break;
             }
             default:
-              p.warn("[Haori]", "Unknown mutation type:", i.type);
+              g.warn("[Haori]", "Unknown mutation type:", i.type);
               continue;
           }
         } catch (s) {
-          p.error("[Haori]", "Error processing mutation:", s);
+          g.error("[Haori]", "Error processing mutation:", s);
         }
     });
     t.observe(e, {
@@ -6144,14 +6170,14 @@ const O = class O {
 O._initialized = !1, O._mutationObservers = [];
 let _ = O;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", _.init) : _.init();
-const Ce = () => X.waitForRenders(), ke = "0.13.1";
+const Ce = () => X.waitForRenders(), ke = "0.13.2";
 export {
   P as Core,
   l as Env,
   S as Form,
   w as Fragment,
   X as Haori,
-  p as Log,
+  g as Log,
   x as Queue,
   X as default,
   ke as version,