haori 0.17.0 → 0.17.2

package/dist/haori.es.js

@@ -202,28 +202,28 @@ function wt(p, t, e = {}) {
     a.add(h);
   for (let h = Math.max(0, i - n); h <= Math.min(r - 1, i + n); h += 1)
     a.add(h);
-  const o = Array.from(a).sort((h, g) => h - g), c = [];
+  const o = Array.from(a).sort((h, g) => h - g), u = [];
   let d = null;
   for (const h of o) {
     if (d !== null && h - d > 1)
       if (h - d === 2) {
         const g = d + 1;
-        c.push({
+        u.push({
           page: g,
           label: g + 1,
           active: g === i,
           ellipsis: !1
         });
       } else
-        c.push({ page: null, label: "…", active: !1, ellipsis: !0 });
-    c.push({
+        u.push({ page: null, label: "…", active: !1, ellipsis: !0 });
+    u.push({
       page: h,
       label: h + 1,
       active: h === i,
       ellipsis: !1
     }), d = h;
   }
-  return c;
+  return u;
 }
 const Ct = /^(\d{4})-(\d{1,2})$/, kt = 1200;
 function tt(p, t) {
@@ -273,14 +273,14 @@ function Rt(p, t) {
   if (i <= 0)
     return e;
   const n = Math.max(0, tt(r.number, 0)), s = Math.max(0, tt(r.size, 0)), a = n * s, o = Math.min(a + 1, i);
-  let c;
+  let u;
   if (t !== void 0 && Number.isFinite(t))
-    c = Math.max(0, Math.trunc(t));
+    u = Math.max(0, Math.trunc(t));
   else {
     const h = tt(r.numberOfElements, NaN);
-    c = Number.isFinite(h) ? h : Math.min(s, i - a);
+    u = Number.isFinite(h) ? h : Math.min(s, i - a);
   }
-  const d = Math.min(a + c, i);
+  const d = Math.min(a + u, i);
   return { start: o, end: Math.max(d, o), total: i, empty: !1 };
 }
 function Nt(p, t, e) {
@@ -401,11 +401,11 @@ const $t = Object.freeze({
     if (this.containsDangerousPatterns(t)) {
       const o = this.detectDisallowedKeywords(t);
       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.";
+        const u = o.some((d) => d === "function" || d === "return") ? " Statement keywords are not allowed in expressions; use an arrow function such as `x => ({key: value})` instead of `function(x){ return {key: value}; }`." : " These are statement keywords and cannot be used in expressions.";
         m.warn(
           "[Haori]",
           t,
-          "Expression uses disallowed keyword(s): " + o.join(", ") + "." + c
+          "Expression uses disallowed keyword(s): " + o.join(", ") + "." + u
         );
       } else
         m.warn(
@@ -440,16 +440,16 @@ const $t = Object.freeze({
     );
     const s = n ? { ...e, [this.BUILTIN_NAMESPACE]: this.BUILTIN_HELPERS } : { ...e }, a = this.canAttemptMissingIdentifierRecovery(t);
     for (let o = 0; o <= this.MAX_IDENTIFIER_RECOVERY_COUNT; o += 1) {
-      const c = this.prepareEvaluator(t, s);
-      if (c.compileFailed || c.evaluator === null)
+      const u = this.prepareEvaluator(t, s);
+      if (u.compileFailed || u.evaluator === null)
         return { value: null, unresolvedReference: !1 };
       try {
         const d = [], h = this.wrapBoundValues(s);
-        return c.bindKeys.forEach((g) => {
+        return u.bindKeys.forEach((g) => {
           d.push(h[g]);
         }), {
           value: this.withBlockedPropertyAccess(
-            () => c.evaluator(...d)
+            () => u.evaluator(...d)
           ),
           unresolvedReference: !1
         };
@@ -588,11 +588,11 @@ return (${t});`;
     const r = [];
     let i = null;
     for (let n = 0; n < e.length; n++) {
-      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, c = e[n - 2] || null, d = e[n - 3] || null;
+      const s = e[n], a = e[n + 1] || null, o = r[r.length - 1] || null, u = e[n - 2] || null, d = e[n - 3] || null;
       if (this.startsObjectKey(
         o,
         i,
-        c,
+        u,
         d
       ) && (s.value === "[" || s.type === "identifier" && this.FORBIDDEN_PROPERTY_NAMES.has(s.value) || s.type === "string" && this.FORBIDDEN_PROPERTY_NAMES.has(
         this.decodeStringLiteral(s.value)
@@ -870,8 +870,8 @@ return (${t});`;
       get: (s, a, o) => {
         if (typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a))
           return;
-        const c = Reflect.get(s, a, o);
-        return typeof a == "symbol" ? c : this.wrapBoundValue(c, e);
+        const u = Reflect.get(s, a, o);
+        return typeof a == "symbol" ? u : this.wrapBoundValue(u, e);
       },
       has: (s, a) => typeof a == "string" && this.FORBIDDEN_PROPERTY_NAMES.has(a) ? !1 : Reflect.has(s, a),
       getOwnPropertyDescriptor: (s, a) => {
@@ -879,12 +879,12 @@ return (${t});`;
           return Reflect.getOwnPropertyDescriptor(s, a);
       },
       apply: (s, a, o) => {
-        const c = Reflect.apply(
+        const u = Reflect.apply(
           s,
           a,
           o
         );
-        return this.isIteratorLike(c) ? c : this.wrapBoundValue(c, e);
+        return this.isIteratorLike(u) ? u : this.wrapBoundValue(u, e);
       },
       construct: (s, a, o) => this.wrapBoundValue(
         Reflect.construct(
@@ -1084,7 +1084,7 @@ B.MAX_IDENTIFIER_RECOVERY_COUNT = 8, B.BUILTIN_NAMESPACE = "haori", B.BUILTIN_HE
   "with",
   "yield"
 ]), B.EXPRESSION_CACHE = /* @__PURE__ */ new Map();
-let W = B;
+let z = B;
 class dt {
   constructor() {
     this.MAX_BUDGET = 8, this.queue = [], this.processing = !1;
@@ -1216,7 +1216,7 @@ const pt = class pt {
   }
 };
 pt.ASYNC_QUEUE = new dt();
-let x = pt;
+let P = pt;
 const N = class N {
   /**
    * 集計状態を初期化します。
@@ -1460,7 +1460,7 @@ const Y = class Y {
     let e;
     switch (t.nodeType) {
       case Node.ELEMENT_NODE:
-        e = new P(t);
+        e = new M(t);
         break;
       case Node.TEXT_NODE:
         e = new U(t);
@@ -1491,7 +1491,7 @@ const Y = class Y {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return x.enqueue(() => {
+      return P.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode === t.getTarget() && t.getTarget().removeChild(this.target), this.mounted = !1;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1499,7 +1499,7 @@ const Y = class Y {
     } else {
       const t = this.target.parentNode;
       if (t)
-        return x.enqueue(() => {
+        return P.enqueue(() => {
           this.target.parentNode === t && t.removeChild(this.target), this.mounted = !1;
         });
       this.mounted = !1;
@@ -1516,7 +1516,7 @@ const Y = class Y {
       return Promise.resolve();
     if (this.parent) {
       const t = this.parent, e = t.skipMutationNodes;
-      return x.enqueue(() => {
+      return P.enqueue(() => {
         t.skipMutationNodes = !0, this.target.parentNode !== t.getTarget() && t.getTarget().appendChild(this.target), this.mounted = !0;
       }).finally(() => {
         t.skipMutationNodes = e;
@@ -1576,7 +1576,7 @@ const Y = class Y {
 };
 Y.FRAGMENT_CACHE = /* @__PURE__ */ new WeakMap();
 let T = Y;
-const z = class z extends T {
+const W = class W extends T {
   /**
    * エレメントフラグメントのコンストラクタ。
    * アトリビュートや子フラグメントの作成も行います。
@@ -1599,7 +1599,7 @@ const z = class z extends T {
       "month",
       "time",
       "week"
-    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingWorkChain = Promise.resolve(), this.processingBindingWork = !1, this.initialBindAttribute = null, this.derivedBindingData = null, this.bindingDataCache = null, this.descendantBindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.renderSignature = null, this.eachInputSignature = null, this.deriveSubtreeSignature = null, this.deriveInputSignature = null, this.freshInitializationSkippable = !1, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.syncValue(), this.initialBindAttribute = t.getAttribute(`${l.prefix}bind`), t.getAttributeNames().forEach((e) => {
+    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingWorkChain = Promise.resolve(), this.initialBindAttribute = null, this.derivedBindingData = null, this.bindingDataCache = null, this.descendantBindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.renderSignature = null, this.eachInputSignature = null, this.deriveSubtreeSignature = null, this.deriveInputSignature = null, this.freshInitializationSkippable = !1, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.selfWrittenBind = /* @__PURE__ */ new Map(), this.syncValue(), this.initialBindAttribute = t.getAttribute(`${l.prefix}bind`), t.getAttributeNames().forEach((e) => {
       const r = t.getAttribute(e);
       if (r !== null && !this.attributeMap.has(e)) {
         const i = new rt(e, r);
@@ -1625,7 +1625,7 @@ const z = class z extends T {
    */
   getChildElementFragments() {
     return this.children.filter(
-      (t) => t instanceof z
+      (t) => t instanceof W
     );
   }
   /**
@@ -1657,7 +1657,7 @@ const z = class z extends T {
    * @returns クローンされたフラグメント
    */
   clone() {
-    const t = new z(
+    const t = new W(
       this.target.cloneNode(!1)
     );
     return this.attributeMap.forEach((e, r) => {
@@ -1672,7 +1672,7 @@ const z = class z extends T {
    */
   normalizeClonedVisibilityState() {
     (this.visible === !1 || this.getTarget().style.display === "none" || this.getTarget().hasAttribute(`${l.prefix}if-false`)) && (this.visible = !0, this.display = null, this.displayPriority = null, this.getTarget().style.removeProperty("display"), this.getTarget().removeAttribute(`${l.prefix}if-false`)), this.children.forEach((t) => {
-      t instanceof z && t.normalizeClonedVisibilityState();
+      t instanceof W && t.normalizeClonedVisibilityState();
     });
   }
   /**
@@ -1723,6 +1723,25 @@ const z = class z extends T {
   getRawBindingData() {
     return this.bindingData;
   }
+  /**
+   * `data-bind` 属性への自己書き込みを記録します（DOM へ実際に書き込んだ時に呼ぶ）。
+   *
+   * @param value 書き込んだ属性値
+   */
+  recordSelfWrittenBind(t) {
+    this.selfWrittenBind.size > 64 && this.selfWrittenBind.clear(), this.selfWrittenBind.set(t, (this.selfWrittenBind.get(t) ?? 0) + 1);
+  }
+  /**
+   * 指定値が Haori 自身の `data-bind` 書き込みのエコーかどうかを判定し、該当すれば
+   * 記録を 1 つ消費します。
+   *
+   * @param value MutationObserver が観測した属性値
+   * @returns 自己書き込みのエコーであれば true（再取り込みをスキップしてよい）
+   */
+  consumeSelfWrittenBind(t) {
+    const e = this.selfWrittenBind.get(t);
+    return e === void 0 ? !1 : (e <= 1 ? this.selfWrittenBind.delete(t) : this.selfWrittenBind.set(t, e - 1), !0);
+  }
   /**
    * 生の派生バインドデータを取得します。
    *
@@ -1744,25 +1763,24 @@ const z = class z extends T {
    * （FIFO）で直列実行します。並行呼出による適用順の逆転（古いデータが後から
    * 適用されて新しい値を上書きする現象）を防ぎます。
    *
-   * 更新処理の内部から同一フラグメントへ再帰的に呼ばれた場合（data-url-param に
-   * よる再評価中の再設定など）は、自己待機によるデッドロックを避けるため即時
-   * 実行します。
+   * 純粋な FIFO（並行呼出を決して即時インライン実行しない）です。以前は実行中
+   * フラグでの「再入即時実行」を行っていましたが、await をまたいで届く**独立した
+   * 並行呼出**まで再入扱いしてインライン実行し、`skipMutationAttributes` 中の
+   * `data-bind` 書き込みが破棄されて古い値が後勝ちする競合の原因になっていました。
+   * 真の再入（data-url-param 等）は呼出側がキューを介さず実行するため、ここでは
+   * 一律にチェーンへ積みます。
    *
    * @param work 直列化したいバインドデータ更新処理
    * @returns work の完了 Promise
    */
   enqueueBindingWork(t) {
-    if (this.processingBindingWork)
-      return t();
-    const e = () => (this.processingBindingWork = !0, Promise.resolve().then(t).finally(() => {
-      this.processingBindingWork = !1;
-    })), r = this.bindingWorkChain.then(e, e);
-    return this.bindingWorkChain = r.then(
+    const e = this.bindingWorkChain.then(t, t);
+    return this.bindingWorkChain = e.then(
       () => {
       },
       () => {
       }
-    ), r;
+    ), e;
   }
   /**
    * 生成時点の data-bind 属性の生値を取得します。
@@ -1795,7 +1813,7 @@ const z = class z extends T {
    */
   clearBindingDataCache() {
     this.bindingDataCache = null, this.descendantBindingDataCache = null, this.children.forEach((t) => {
-      t instanceof z && t.clearBindingDataCache();
+      t instanceof W && t.clearBindingDataCache();
     });
   }
   /**
@@ -1947,14 +1965,14 @@ const z = class z extends T {
     if (r instanceof HTMLInputElement && (r.type === "checkbox" || r.type === "radio")) {
       const i = this.getAttribute("value"), n = r.type === "checkbox" && i === "true";
       let s;
-      return n ? s = t === !0 || t === "true" : i === "false" ? s = t === !1 : Array.isArray(t) ? s = t.map(String).includes(String(i)) : s = i === String(t), n ? this.value = s : s ? Array.isArray(t) ? this.value = String(i) : this.value = t : this.value = null, r.checked === s ? Promise.resolve() : (this.skipChangeValue = !0, x.enqueue(() => {
+      return n ? s = t === !0 || t === "true" : i === "false" ? s = t === !1 : Array.isArray(t) ? s = t.map(String).includes(String(i)) : s = i === String(t), n ? this.value = s : s ? Array.isArray(t) ? this.value = String(i) : this.value = t : this.value = null, r.checked === s ? Promise.resolve() : (this.skipChangeValue = !0, P.enqueue(() => {
         r.checked = s, e && r.dispatchEvent(new Event("change", { bubbles: !0 }));
       }).finally(() => {
         this.skipChangeValue = !1;
       }));
     } else if (r instanceof HTMLInputElement || r instanceof HTMLTextAreaElement || r instanceof HTMLSelectElement) {
       const i = Array.isArray(t) ? t.join(",") : t;
-      return this.value = this.normalizeValueForElement(r, i), this.skipChangeValue = !0, x.enqueue(() => {
+      return this.value = this.normalizeValueForElement(r, i), this.skipChangeValue = !0, P.enqueue(() => {
         r.value = i === null ? "" : String(i), e && ((r instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(r.type) || r instanceof HTMLTextAreaElement) && r.dispatchEvent(new Event("input", { bubbles: !0 })), r.dispatchEvent(new Event("change", { bubbles: !0 })));
       }).finally(() => {
         this.skipChangeValue = !1;
@@ -2062,7 +2080,7 @@ const z = class z extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const r = this.getTarget();
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       r.removeAttribute(t), e !== t && r.removeAttribute(e);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2086,7 +2104,7 @@ const z = class z extends T {
     if (n) {
       const ot = this.attributeMap.get(t);
       if (ot && (ot.isEvaluate || ot.isForceEvaluation()) && !s.isEvaluate && !s.isForceEvaluation())
-        return this.skipMutationAttributes = !0, x.enqueue(() => {
+        return this.skipMutationAttributes = !0, P.enqueue(() => {
         }).finally(() => {
           this.skipMutationAttributes = !1;
         });
@@ -2097,9 +2115,9 @@ const z = class z extends T {
       element: a,
       rawName: t,
       template: r
-    }), c = s.isEvaluate || s.isRawEvaluate, d = t === e && z.BOOLEAN_ATTRIBUTES.has(e.toLowerCase()), h = s.isSingleExpression(), g = K.joinEvaluateResults(o.results), E = o.results.length === 1 ? o.results[0] : g, w = !s.isForceEvaluation() && (e !== t || d || h ? o.hasUnresolvedReference || E === null || E === void 0 || E === !1 : c && g === ""), k = s.isForceEvaluation() ? r : h ? E : g, A = i && s.isEvaluate && e === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), v = a.getRootNode(), b = A && a === v.activeElement, S = w || k === null || k === !1 ? null : String(k), F = t !== e && a.getAttribute(t) !== r, I = S === null ? a.hasAttribute(e) : a.getAttribute(e) !== S, $ = A && !b && S !== null && a.value !== S, V = e === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), C = e === "selected" && a instanceof HTMLOptionElement, Q = v.activeElement, gt = Q !== null && (V && a === Q || C && a.closest("select") === Q), _ = S !== null, mt = V && !gt && a.checked !== _, bt = C && !gt && a.selected !== _;
-    return !F && !I && !$ && !mt && !bt ? (A && !b && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, x.enqueue(() => {
-      F && a.setAttribute(t, r), S === null ? a.removeAttribute(e) : (I && a.setAttribute(e, S), A && !b && (this.value = this.normalizeValueForElement(a, S), $ && (a.value = S))), mt && (a.checked = _), bt && (a.selected = _);
+    }), u = s.isEvaluate || s.isRawEvaluate, d = t === e && W.BOOLEAN_ATTRIBUTES.has(e.toLowerCase()), h = s.isSingleExpression(), g = K.joinEvaluateResults(o.results), E = o.results.length === 1 ? o.results[0] : g, w = !s.isForceEvaluation() && (e !== t || d || h ? o.hasUnresolvedReference || E === null || E === void 0 || E === !1 : u && g === ""), k = s.isForceEvaluation() ? r : h ? E : g, A = i && s.isEvaluate && e === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), v = a.getRootNode(), b = A && a === v.activeElement, S = w || k === null || k === !1 ? null : String(k), F = t !== e && a.getAttribute(t) !== r, I = S === null ? a.hasAttribute(e) : a.getAttribute(e) !== S, $ = A && !b && S !== null && a.value !== S, V = e === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), C = e === "selected" && a instanceof HTMLOptionElement, Q = v.activeElement, gt = Q !== null && (V && a === Q || C && a.closest("select") === Q), _ = S !== null, mt = V && !gt && a.checked !== _, bt = C && !gt && a.selected !== _;
+    return !F && !I && !$ && !mt && !bt ? (A && !b && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, P.enqueue(() => {
+      F && a.setAttribute(t, r), S === null ? a.removeAttribute(e) : (I && (a.setAttribute(e, S), e === `${l.prefix}bind` && this.recordSelfWrittenBind(S)), A && !b && (this.value = this.normalizeValueForElement(a, S), $ && (a.value = S))), mt && (a.checked = _), bt && (a.selected = _);
     }).finally(() => {
       this.skipMutationAttributes = !1;
     }));
@@ -2115,7 +2133,7 @@ const z = class z extends T {
       return Promise.resolve();
     this.attributeMap.delete(t), this.skipMutationAttributes = !0;
     const e = this.getTarget();
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       e.removeAttribute(t);
     }).finally(() => {
       this.skipMutationAttributes = !1;
@@ -2228,8 +2246,8 @@ const z = class z extends T {
     const s = t.getParent() === this;
     let a = -1, o = -1;
     s && (a = this.children.indexOf(t), e !== null && (o = this.children.indexOf(e)));
-    const c = t.getParent();
-    c !== null && c.removeChild(t);
+    const u = t.getParent();
+    u !== null && u.removeChild(t);
     let d = r === void 0 ? e?.getTarget() || null : r;
     if (e === null)
       this.children.push(t);
@@ -2250,7 +2268,7 @@ const z = class z extends T {
     }
     t.setParent(this), t.setMounted(this.mounted);
     const h = this.skipMutationNodes;
-    return this.skipMutationNodes = !0, x.enqueue(() => {
+    return this.skipMutationNodes = !0, P.enqueue(() => {
       this.target.insertBefore(t.getTarget(), d);
     }).finally(() => {
       this.skipMutationNodes = h;
@@ -2359,7 +2377,7 @@ const z = class z extends T {
     return e === null ? null : e.closestByAttribute(t);
   }
 };
-z.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
+W.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "allowfullscreen",
   "async",
   "autofocus",
@@ -2384,7 +2402,7 @@ z.BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "reversed",
   "selected"
 ]);
-let P = z;
+let M = W;
 class U extends T {
   /**
    * テキストフラグメントのコンストラクタ。
@@ -2437,7 +2455,7 @@ class U extends T {
   evaluate() {
     return this.contents.isRawEvaluate && this.parent === null ? Promise.reject(
       new Error("Parent fragment is required for raw evaluation")
-    ) : x.enqueue(() => {
+    ) : P.enqueue(() => {
       this.skipMutation = !0;
       let t = this.text;
       this.contents.isRawEvaluate ? t = this.contents.evaluate(
@@ -2497,7 +2515,7 @@ class ft extends T {
    * @return 更新のPromise
    */
   setContent(t) {
-    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, x.enqueue(() => {
+    return this.skipMutation || this.text === t ? Promise.resolve() : (this.text = t, P.enqueue(() => {
       this.skipMutation = !0, this.target.textContent = this.text;
     }).finally(() => {
       this.skipMutation = !1;
@@ -2606,25 +2624,25 @@ const nt = class nt {
   evaluateWithProfile(t, e, r, i) {
     const n = [], s = [];
     let a = 0, o = !1;
-    return this.contents.forEach((c) => {
+    return this.contents.forEach((u) => {
       try {
-        if (r(c)) {
+        if (r(u)) {
           const d = et.measure(
-            () => W.evaluateDetailed(c.text, t)
+            () => z.evaluateDetailed(u.text, t)
           ), h = d.value;
           a += d.durationMs, s.push({
-            expression: c.text,
+            expression: u.text,
             durationMs: d.durationMs
           }), o = o || h.unresolvedReference, n.push(h.value);
         } else
-          n.push(c.text);
+          n.push(u.text);
       } catch (d) {
         m.error(
           "[Haori]",
-          `Error evaluating ${i} expression: ${c.text}`,
+          `Error evaluating ${i} expression: ${u.text}`,
           d
         ), s.push({
-          expression: c.text,
+          expression: u.text,
           durationMs: 0
         }), n.push("");
       }
@@ -2731,7 +2749,7 @@ class Z {
    * @return すべてのレンダリングが完了したら解決される Promise
    */
   static waitForRenders() {
-    return x.waitForIdle();
+    return P.waitForIdle();
   }
   /**
    * 通知ダイアログを表示します。
@@ -2740,7 +2758,7 @@ class Z {
    * @returns 通知が閉じられると解決されるPromise
    */
   static dialog(t) {
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       window.alert(t);
     }, !0);
   }
@@ -2768,7 +2786,7 @@ class Z {
    * @returns ユーザーがOKをクリックした場合はtrue、キャンセルした場合はfalseが解決されるPromise
    */
   static confirm(t) {
-    return x.enqueue(() => window.confirm(t), !0);
+    return P.enqueue(() => window.confirm(t), !0);
   }
   /**
    * ダイアログを開きます。
@@ -2776,7 +2794,7 @@ class Z {
    * @param element 開くダイアログのHTML要素
    */
   static openDialog(t) {
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       t instanceof HTMLDialogElement ? t.showModal() : m.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
@@ -2786,7 +2804,7 @@ class Z {
    * @param element 閉じるダイアログのHTML要素
    */
   static closeDialog(t) {
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       t instanceof HTMLDialogElement ? t.close() : m.error("[Haori]", "Element is not a dialog: ", t);
     }, !0);
   }
@@ -2807,7 +2825,7 @@ class Z {
    * @param level メッセージのレベル（省略可能）
    */
   static addMessage(t, e, r) {
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       const i = t instanceof HTMLFormElement ? t : t.parentElement ?? t;
       i.setAttribute("data-message", e), r !== void 0 ? i.setAttribute("data-message-level", r) : i.removeAttribute("data-message-level");
     }, !0);
@@ -2818,7 +2836,7 @@ class Z {
    * @param parent メッセージをクリアする親要素
    */
   static clearMessages(t) {
-    return x.enqueue(() => {
+    return P.enqueue(() => {
       t.removeAttribute("data-message"), t.removeAttribute("data-message-level"), t.querySelectorAll("[data-message]").forEach((e) => {
         e.removeAttribute("data-message"), e.removeAttribute("data-message-level");
       });
@@ -3058,11 +3076,11 @@ class y {
    * @returns Promise（DOMの更新が完了したら解決される）
    */
   static setPartValues(t, e, r = null, i = !1, n = !0) {
-    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), c = t.getAttribute(`${l.prefix}form-list`), d = t.getAttribute(`${l.prefix}form-detach`);
+    const s = [], a = t.getAttribute("name"), o = t.getAttribute(`${l.prefix}form-object`), u = t.getAttribute(`${l.prefix}form-list`), d = t.getAttribute(`${l.prefix}form-detach`);
     if (a) {
       if (!d || i) {
         const h = e[String(a)];
-        c && Array.isArray(h) && r !== null ? s.push(
+        u && Array.isArray(h) && r !== null ? s.push(
           y.applyFragmentValue(t, h[r] ?? null, n)
         ) : typeof h > "u" || (Array.isArray(h) && y.isGroupedCheckable(t) || typeof h == "string" || typeof h == "number" || typeof h == "boolean" || h === null ? s.push(
           y.applyFragmentValue(
@@ -3087,8 +3105,8 @@ class y {
               n
             )
           );
-    } else if (c) {
-      const h = e[String(c)];
+    } else if (u) {
+      const h = e[String(u)];
       if (Array.isArray(h)) {
         const g = t.getChildElementFragments();
         for (let E = 0; E < g.length; E++) {
@@ -3123,7 +3141,7 @@ class y {
     y.clearValues(t), await Promise.all([
       y.clearMessages(t),
       y.clearEachClones(t)
-    ]), await x.enqueue(() => {
+    ]), await P.enqueue(() => {
       const r = t.getTarget();
       if (r instanceof HTMLFormElement)
         r.reset();
@@ -3139,7 +3157,7 @@ class y {
     const e = y.collectBindingTargetForms(t);
     for (const r of e) {
       const i = y.getInitialBindingData(r);
-      i && await M.setBindingData(r.getTarget(), i);
+      i && await x.setBindingData(r.getTarget(), i);
     }
     y.syncValuesFromDom(t);
     for (const r of e) {
@@ -3147,9 +3165,9 @@ class y {
       if (r.getRawBindingData() === null && i === null)
         continue;
       const n = y.getValues(r), s = r.getAttribute(`${l.prefix}form-arg`), a = { ...i || {} };
-      s ? a[String(s)] = n : Object.assign(a, n), await M.setBindingData(r.getTarget(), a);
+      s ? a[String(s)] = n : Object.assign(a, n), await x.setBindingData(r.getTarget(), a);
     }
-    await M.evaluateAll(t);
+    await x.evaluateAll(t);
   }
   /**
    * data-bind 属性で宣言された初期バインドデータを取得します。
@@ -3159,7 +3177,7 @@ class y {
    */
   static getInitialBindingData(t) {
     const e = t.getInitialBindAttribute();
-    return e === null ? null : M.parseDataBind(e);
+    return e === null ? null : x.parseDataBind(e);
   }
   /**
    * フラグメント配下の入力要素について、内部値を現在の DOM 値と再同期します。
@@ -3187,7 +3205,7 @@ class y {
     const i = [];
     for (const n of r) {
       const s = T.get(n);
-      s instanceof P && i.push(s);
+      s instanceof M && i.push(s);
     }
     return i;
   }
@@ -3259,10 +3277,10 @@ class y {
    * @return Promise（メッセージの追加が完了したら解決される）
    */
   static addMessage(t, e, r, i) {
-    const n = [], s = Et(), a = s.addMessage, o = (d) => typeof a == "function" ? a.call(s, d, r, i) : s.addErrorMessage(d, r), c = y.findFragmentsByKey(t, e);
-    return c.forEach((d) => {
+    const n = [], s = Et(), a = s.addMessage, o = (d) => typeof a == "function" ? a.call(s, d, r, i) : s.addErrorMessage(d, r), u = y.findFragmentsByKey(t, e);
+    return u.forEach((d) => {
       n.push(o(d.getTarget()));
-    }), c.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
+    }), u.length === 0 && n.push(o(t.getTarget())), Promise.all(n).then(() => {
     });
   }
   /**
@@ -3295,7 +3313,7 @@ class y {
         if (s !== -1 && a !== -1 && s < a) {
           const o = i.substring(0, s);
           if (n === o) {
-            const c = i.substring(s + 1, a), d = Number(c);
+            const u = i.substring(s + 1, a), d = Number(u);
             if (isNaN(d))
               m.error("Haori", `Invalid index: ${i}`);
             else {
@@ -3413,9 +3431,9 @@ class R {
    */
   static bindChange(t, e, r, i = "other") {
     const n = [], s = new Set(Object.keys(e || {})), a = new Set(Object.keys(r)), o = /* @__PURE__ */ new Set([...s, ...a]);
-    for (const c of o) {
-      const d = e?.[c], h = r[c];
-      d !== h && n.push(c);
+    for (const u of o) {
+      const d = e?.[u], h = r[u];
+      d !== h && n.push(u);
     }
     R.dispatch(t, "bindchange", {
       previous: e || {},
@@ -3561,7 +3579,7 @@ const Ht = {
 function Lt(p, t) {
   return p.replace(/\{\{([\s\S]+?)\}\}/g, (e, r) => {
     try {
-      const i = W.evaluate(String(r).trim(), t);
+      const i = z.evaluate(String(r).trim(), t);
       return i == null ? "" : String(i);
     } catch {
       return "";
@@ -3574,7 +3592,7 @@ function Ut(p, t) {
     return null;
   if (!e.includes("{{"))
     return e;
-  const r = T.get(p), i = r instanceof P ? r.getBindingData() : {}, n = Lt(e, i);
+  const r = T.get(p), i = r instanceof M ? r.getBindingData() : {}, n = Lt(e, i);
   return n === "" ? null : n;
 }
 function Mt(p) {
@@ -3611,10 +3629,10 @@ function ut() {
   ) ? t : Z;
 }
 const qt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
-function zt(p) {
+function Wt(p) {
   return qt.has(p.toUpperCase());
 }
-function Wt(p, t) {
+function zt(p, t) {
   for (const [e, r] of Object.entries(t))
     r !== void 0 && (r === null ? p.append(e, "") : Array.isArray(r) ? r.forEach((i) => {
       p.append(e, String(i));
@@ -3622,7 +3640,7 @@ function Wt(p, t) {
 }
 function Kt(p, t) {
   const e = new URL(p, window.location.href), r = new URLSearchParams(e.search);
-  return Wt(r, t), e.search = r.toString(), e.toString();
+  return zt(r, t), e.search = r.toString(), e.toString();
 }
 function Gt(p) {
   return p == null ? null : typeof p == "string" ? p : p instanceof URLSearchParams ? p.toString() : p instanceof FormData ? Array.from(p.entries()).map(([t, e]) => e instanceof File ? [
@@ -3681,7 +3699,7 @@ const f = class f {
     return { value: t.replace(
       f.DATA_PLACEHOLDER_REGEX,
       (n, s, a) => {
-        const o = W.evaluateDetailed(
+        const o = z.evaluateDetailed(
           s ?? a ?? "",
           e
         );
@@ -3761,11 +3779,11 @@ const f = class f {
     return { value: t.replace(
       f.DATA_PLACEHOLDER_REGEX,
       (n, s, a, o) => {
-        const c = W.evaluateDetailed(
+        const u = z.evaluateDetailed(
           s ?? a ?? "",
           e
         );
-        return r = r || c.unresolvedReference, f.isJsonStringContext(t, o) ? f.stringifyJsonTemplateStringContent(c.value) : f.stringifyJsonTemplateValue(c.value);
+        return r = r || u.unresolvedReference, f.isJsonStringContext(t, o) ? f.stringifyJsonTemplateStringContent(u.value) : f.stringifyJsonTemplateValue(u.value);
       }
     ), hasUnresolvedReference: r };
   }
@@ -3798,17 +3816,17 @@ const f = class f {
     const a = r.trim();
     if (f.SINGLE_PLACEHOLDER_REGEX.test(a))
       return {
-        value: M.parseDataBind(n),
+        value: x.parseDataBind(n),
         hasUnresolvedReference: s
       };
     if (a.startsWith("{") || a.startsWith("[")) {
-      const c = f.resolveDataJsonStringDetailed(
+      const u = f.resolveDataJsonStringDetailed(
         r,
         t.getBindingData()
       );
       return {
-        value: M.parseDataBind(c.value),
-        hasUnresolvedReference: s || c.hasUnresolvedReference
+        value: x.parseDataBind(u.value),
+        hasUnresolvedReference: s || u.hasUnresolvedReference
       };
     }
     const o = f.resolveDataParamStringDetailed(
@@ -3816,7 +3834,7 @@ const f = class f {
       t.getBindingData()
     );
     return {
-      value: M.parseDataBind(o.value),
+      value: x.parseDataBind(o.value),
       hasUnresolvedReference: s || o.hasUnresolvedReference
     };
   }
@@ -3909,7 +3927,7 @@ ${v}
           A
         );
         try {
-          s.headers = M.parseDataBind(v);
+          s.headers = x.parseDataBind(v);
         } catch (b) {
           m.error("Haori", `Invalid fetch headers: ${b}`);
         }
@@ -3925,7 +3943,7 @@ ${v}
           A
         );
         try {
-          s.headers = M.parseDataBind(v);
+          s.headers = x.parseDataBind(v);
         } catch (b) {
           m.error("Haori", `Invalid fetch headers: ${b}`);
         }
@@ -3987,7 +4005,7 @@ ${v}
         );
       }
     }
-    const o = f.attrName(e, "bind-arg"), c = f.attrName(
+    const o = f.attrName(e, "bind-arg"), u = f.attrName(
       null,
       "arg",
       !0
@@ -3996,8 +4014,8 @@ ${v}
       "bind-arg",
       !0
     );
-    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(c) ? r.bindArg = t.getRawAttribute(
-      c
+    e ? t.hasAttribute(o) && (r.bindArg = t.getRawAttribute(o)) : t.hasAttribute(u) ? r.bindArg = t.getRawAttribute(
+      u
     ) : t.hasAttribute(d) && (r.bindArg = t.getRawAttribute(d));
     const h = e ? f.attrName(e, "bind-params") : f.attrName(null, "bind-params", !0);
     if (t.hasAttribute(h)) {
@@ -4299,14 +4317,14 @@ ${b}
       }
       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();
-        t && t.appliedDisabledAttribute && this.options.targetFragment && g.add(this.options.targetFragment), h.setAttribute(`${l.prefix}bind`, JSON.stringify(i));
+        t && t.appliedDisabledAttribute && this.options.targetFragment && g.add(this.options.targetFragment);
         const E = d.getBindingData();
-        Object.assign(E, i), await M.setBindingData(h, E, g);
+        Object.assign(E, i), await x.setBindingData(h, E, g);
       }
-      const o = a ? i : {}, c = new Response(JSON.stringify(o), {
+      const o = a ? i : {}, u = new Response(JSON.stringify(o), {
         headers: { "Content-Type": "application/json" }
       });
-      return this.handleFetchResult(c);
+      return this.handleFetchResult(u);
     } finally {
       this.releaseExecutionLock(t);
     }
@@ -4374,7 +4392,7 @@ ${b}
       s.push(new f(a, null).run());
     }), this.options.clickFragments && this.options.clickFragments.length > 0)
       for (const a of this.options.clickFragments) {
-        await M.evaluateAll(a);
+        await x.evaluateAll(a);
         const o = a.getTarget();
         typeof o.click == "function" ? o.click() : o.dispatchEvent(
           new MouseEvent("click", { bubbles: !0, cancelable: !0 })
@@ -4404,12 +4422,12 @@ ${b}
       try {
         const s = t ? this.options.historyUrl : window.location.pathname, a = new URL(s, window.location.href);
         if (a.origin !== window.location.origin) {
-          const c = "history.pushState: cross-origin URL is not allowed: " + a.toString();
-          m.error("Haori", c);
+          const u = "history.pushState: cross-origin URL is not allowed: " + a.toString();
+          m.error("Haori", u);
           return;
         }
-        const o = (c) => {
-          for (const [d, h] of Object.entries(c))
+        const o = (u) => {
+          for (const [d, h] of Object.entries(u))
             h != null && (Array.isArray(h) ? h.forEach((g) => a.searchParams.append(d, String(g))) : typeof h == "object" ? a.searchParams.set(d, JSON.stringify(h)) : a.searchParams.set(d, String(h)));
         };
         i && o(e), n && o(r), history.pushState(
@@ -4444,13 +4462,13 @@ ${b}
             for (const o of s.messages)
               typeof o == "string" && a.push({ message: o });
           if (s.errors && typeof s.errors == "object")
-            for (const [o, c] of Object.entries(s.errors))
-              Array.isArray(c) ? a.push({ key: o, message: c.join(`
-`) }) : typeof c == "string" ? a.push({ key: o, message: c }) : c != null && a.push({ key: o, message: String(c) });
+            for (const [o, u] of Object.entries(s.errors))
+              Array.isArray(u) ? a.push({ key: o, message: u.join(`
+`) }) : typeof u == "string" ? a.push({ key: o, message: u }) : u != null && a.push({ key: o, message: String(u) });
           if (a.length === 0)
-            for (const [o, c] of Object.entries(s))
-              o === "message" || o === "messages" || o === "errors" || (Array.isArray(c) ? a.push({ key: o, message: c.join(`
-`) }) : typeof c == "string" && a.push({ key: o, message: c }));
+            for (const [o, u] of Object.entries(s))
+              o === "message" || o === "messages" || o === "errors" || (Array.isArray(u) ? a.push({ key: o, message: u.join(`
+`) }) : typeof u == "string" && a.push({ key: o, message: u }));
         }
         if (a.length === 0)
           return await r(`${t.status} ${t.statusText}`), i(), !1;
@@ -4525,7 +4543,7 @@ ${b}
     return !this.options.bindFragments || this.options.bindFragments.length === 0 ? Promise.resolve() : (t.headers.get("Content-Type")?.includes("application/json") ? t.json() : t.text()).then((r) => {
       if (this.options.bindTransform)
         try {
-          r = W.evaluate(this.options.bindTransform, {
+          r = z.evaluate(this.options.bindTransform, {
             response: r
           });
         } catch (n) {
@@ -4542,15 +4560,15 @@ ${b}
         this.options.bindFragments.forEach((n) => {
           const s = { ...n.getRawBindingData() ?? {} }, a = this.options.bindArg;
           if (r && typeof r == "object" && !Array.isArray(r)) {
-            const o = s[a], c = o && typeof o == "object" && !Array.isArray(o) ? o : {};
+            const o = s[a], u = o && typeof o == "object" && !Array.isArray(o) ? o : {};
             s[a] = this.mergeAppendBindingData(
               n,
               r,
-              c
+              u
             );
           } else
             s[a] = r;
-          i.push(M.setBindingData(n.getTarget(), s));
+          i.push(x.setBindingData(n.getTarget(), s));
         });
       else {
         if (typeof r == "string")
@@ -4562,7 +4580,7 @@ ${b}
             n,
             r
           ), a = this.options.bindMerge ? { ...n.getRawBindingData() ?? {}, ...s } : s;
-          i.push(M.setBindingData(n.getTarget(), a));
+          i.push(x.setBindingData(n.getTarget(), a));
         });
       }
       return Promise.all(i).then(() => {
@@ -4597,7 +4615,7 @@ ${b}
         ...i.getBindingData(),
         ...e
       };
-      return M.setBindingData(i.getTarget(), n);
+      return x.setBindingData(i.getTarget(), n);
     });
     return Promise.all(r).then(() => {
     });
@@ -4666,8 +4684,8 @@ ${b}
     let i = this.options.fetchUrl;
     const n = { ...this.options.fetchOptions || {} }, s = new Headers(
       n.headers || void 0
-    ), a = (n.method || "GET").toUpperCase(), o = l.runtime === "demo" && !zt(a), c = o ? "GET" : a;
-    if (n.method = c, c === "GET" || c === "HEAD" || c === "OPTIONS")
+    ), a = (n.method || "GET").toUpperCase(), o = l.runtime === "demo" && !Wt(a), u = o ? "GET" : a;
+    if (n.method = u, u === "GET" || u === "HEAD" || u === "OPTIONS")
       Object.keys(e).length > 0 && (i = Kt(i, e));
     else if (Object.keys(e).length > 0) {
       const h = s.get("Content-Type") || "";
@@ -4693,7 +4711,7 @@ ${b}
       payload: e,
       hasUnresolvedReference: !1,
       requestedMethod: a,
-      effectiveMethod: c,
+      effectiveMethod: u,
       queryString: d,
       transportMode: o ? "query-get" : "http",
       signature: Yt(i, n)
@@ -4796,7 +4814,7 @@ ${b}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(M.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
+    ), e.push(x.evaluateAll(r)), e.push(y.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -4902,7 +4920,7 @@ class Jt {
     }
   }
 }
-const u = class u {
+const c = class c {
   /**
    * 遅延属性かどうか（完全名で判定）を判定します。
    *
@@ -4910,7 +4928,7 @@ const u = class u {
    * @returns 遅延属性かどうか
    */
   static isDeferredAttributeName(t) {
-    return u.DEFERRED_ATTRIBUTE_SUFFIXES.some(
+    return c.DEFERRED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -4921,7 +4939,7 @@ const u = class u {
    * @returns 除外対象かどうか
    */
   static isEvaluateAllExcludedAttributeName(t) {
-    return u.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
+    return c.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES.some(
       (e) => t === `${l.prefix}${e}`
     );
   }
@@ -4933,7 +4951,7 @@ const u = class u {
    * @returns 再評価する場合は true
    */
   static shouldReevaluateAttribute(t, e) {
-    return e !== null && !u.isEvaluateAllExcludedAttributeName(t) && u.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
+    return e !== null && !c.isEvaluateAllExcludedAttributeName(t) && c.ATTRIBUTE_PLACEHOLDER_REGEX.test(e);
   }
   /**
    * data-attr-* 形式の属性名から実際に更新する属性名を取得します。
@@ -4942,7 +4960,7 @@ const u = class u {
    * @returns 実際の属性名。data-attr-* でない場合は null
    */
   static getAliasedAttributeName(t) {
-    const e = `${l.prefix}${u.ATTRIBUTE_ALIAS_SUFFIX}`;
+    const e = `${l.prefix}${c.ATTRIBUTE_ALIAS_SUFFIX}`;
     return !t.startsWith(e) || t.length <= e.length ? null : t.slice(e.length);
   }
   /**
@@ -4954,8 +4972,8 @@ const u = class u {
    */
   static isAliasedAttributeReflection(t, e) {
     const r = T.get(t);
-    return r instanceof P ? r.hasAttribute(
-      `${l.prefix}${u.ATTRIBUTE_ALIAS_SUFFIX}${e}`
+    return r instanceof M ? r.hasAttribute(
+      `${l.prefix}${c.ATTRIBUTE_ALIAS_SUFFIX}${e}`
     ) : !1;
   }
   /**
@@ -4969,8 +4987,8 @@ const u = class u {
     let e = Promise.resolve();
     for (const r of t.getAttributeNames()) {
       const i = t.getRawAttribute(r);
-      u.shouldReevaluateAttribute(r, i) && (e = e.then(
-        () => u.setAttribute(t.getTarget(), r, i)
+      c.shouldReevaluateAttribute(r, i) && (e = e.then(
+        () => c.setAttribute(t.getTarget(), r, i)
       ));
     }
     return e.then(() => {
@@ -4985,7 +5003,7 @@ const u = class u {
   static reevaluateChildren(t) {
     const e = [];
     return t.getChildren().forEach((r) => {
-      r instanceof P ? e.push(u.evaluateAll(r)) : r instanceof U && e.push(u.evaluateText(r));
+      r instanceof M ? e.push(c.evaluateAll(r)) : r instanceof U && e.push(c.evaluateText(r));
     }), Promise.all(e).then(() => {
     });
   }
@@ -4996,7 +5014,7 @@ const u = class u {
    * @returns 再評価状態
    */
   static getReactiveFetchState(t) {
-    const e = u.REACTIVE_FETCH_STATES.get(t);
+    const e = c.REACTIVE_FETCH_STATES.get(t);
     if (e)
       return e;
     const r = {
@@ -5004,7 +5022,7 @@ const u = class u {
       running: !1,
       rerunRequested: !1
     };
-    return u.REACTIVE_FETCH_STATES.set(t, r), r;
+    return c.REACTIVE_FETCH_STATES.set(t, r), r;
   }
   /**
    * data-import の再評価状態を取得します。
@@ -5013,7 +5031,7 @@ const u = class u {
    * @returns 再評価状態
    */
   static getReactiveImportState(t) {
-    const e = u.REACTIVE_IMPORT_STATES.get(t);
+    const e = c.REACTIVE_IMPORT_STATES.get(t);
     if (e)
       return e;
     const r = {
@@ -5021,7 +5039,7 @@ const u = class u {
       running: !1,
       rerunRequested: !1
     };
-    return u.REACTIVE_IMPORT_STATES.set(t, r), r;
+    return c.REACTIVE_IMPORT_STATES.set(t, r), r;
   }
   /**
    * bind 更新時に data-fetch / data-import を専用ルートで再評価します。
@@ -5034,9 +5052,9 @@ const u = class u {
     if (e.has(t))
       return Promise.resolve();
     const r = [];
-    return t.hasAttribute(`${l.prefix}fetch`) && r.push(u.executeManagedFetch(t)), t.hasAttribute(`${l.prefix}import`) && r.push(u.executeManagedImport(t)), t.getChildren().forEach((i) => {
-      i instanceof P && r.push(
-        u.reevaluateReactiveSpecialAttributes(i, e)
+    return t.hasAttribute(`${l.prefix}fetch`) && r.push(c.executeManagedFetch(t)), t.hasAttribute(`${l.prefix}import`) && r.push(c.executeManagedImport(t)), t.getChildren().forEach((i) => {
+      i instanceof M && r.push(
+        c.reevaluateReactiveSpecialAttributes(i, e)
       );
     }), Promise.all(r).then(() => {
     });
@@ -5048,11 +5066,11 @@ const u = class u {
    * @returns 実行完了の Promise
    */
   static executeManagedFetch(t) {
-    const e = t.getTarget(), r = u.getReactiveFetchState(e), i = j.resolveAutoFetchSignature(t);
+    const e = t.getTarget(), r = c.getReactiveFetchState(e), i = j.resolveAutoFetchSignature(t);
     return r.running ? ((i.hasUnresolvedReference || i.signature !== r.lastSignature) && (r.rerunRequested = !0), Promise.resolve()) : i.hasUnresolvedReference || i.signature === null ? (r.lastSignature = null, Promise.resolve()) : r.lastSignature === i.signature ? Promise.resolve() : (r.lastSignature = i.signature, r.running = !0, new j(t, null).runWithResult().then(() => {
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
-        return r.rerunRequested = !1, u.executeManagedFetch(t);
+        return r.rerunRequested = !1, c.executeManagedFetch(t);
     }));
   }
   /**
@@ -5062,7 +5080,7 @@ const u = class u {
    * @returns 実行完了の Promise
    */
   static executeManagedImport(t) {
-    const e = t.getTarget(), r = u.getReactiveImportState(e), i = t.getAttributeEvaluation(
+    const e = t.getTarget(), r = c.getReactiveImportState(e), i = t.getAttributeEvaluation(
       `${l.prefix}import`
     ), n = i && !i.hasUnresolvedReference && typeof i.value == "string" && i.value !== "" ? i.value : null;
     if (r.running)
@@ -5075,15 +5093,15 @@ const u = class u {
     const s = performance.now();
     return e.setAttribute(`${l.prefix}importing`, ""), R.importStart(e, n), Jt.load(n).then((a) => {
       const o = new TextEncoder().encode(a).length;
-      return x.enqueue(() => {
+      return P.enqueue(() => {
         e.innerHTML = a;
       }).then(() => {
         if (e.removeAttribute(`${l.prefix}importing`), R.importEnd(e, n, o, s), !document.body.hasAttribute("data-haori-ready")) {
-          const c = [];
+          const u = [];
           return e.childNodes.forEach((d) => {
             const h = T.get(d);
-            h instanceof P ? c.push(u.scan(h.getTarget())) : h instanceof U && c.push(u.evaluateText(h));
-          }), Promise.all(c).then(() => {
+            h instanceof M ? u.push(c.scan(h.getTarget())) : h instanceof U && u.push(c.evaluateText(h));
+          }), Promise.all(u).then(() => {
           });
         }
       });
@@ -5091,7 +5109,7 @@ const u = class u {
       e.removeAttribute(`${l.prefix}importing`), R.importError(e, n, a), m.error("[Haori]", "Failed to import HTML:", n, a);
     }).finally(() => {
       if (r.running = !1, r.rerunRequested)
-        return r.rerunRequested = !1, u.executeManagedImport(t);
+        return r.rerunRequested = !1, c.executeManagedImport(t);
     });
   }
   /**
@@ -5102,7 +5120,7 @@ const u = class u {
    */
   static scan(t) {
     const e = T.get(t);
-    return e ? u.initializeElementFragment(e, !1) : Promise.resolve();
+    return e ? c.initializeElementFragment(e, !1) : Promise.resolve();
   }
   /**
    * 新規 each 行を局所初期化します。
@@ -5112,8 +5130,8 @@ const u = class u {
    * @returns 初期化完了の Promise
    */
   static initializeFreshEachRow(t) {
-    return u.initializeElementFragment(t, !0).then(() => {
-      u.needsScheduledEvaluateAll(t) && u.scheduleEvaluateAll(t);
+    return c.initializeElementFragment(t, !0).then(() => {
+      c.needsScheduledEvaluateAll(t) && c.scheduleEvaluateAll(t);
     });
   }
   /**
@@ -5124,16 +5142,16 @@ const u = class u {
    * @returns 初期化完了の Promise
    */
   static initializeElementFragment(t, e) {
-    return u.syncMountedState(t), e && t.isFreshInitializationSkippable() ? Promise.resolve() : u.initializeElementAttributes(t).then(() => {
-      if (u.shouldSkipChildInitialization(t, e)) {
-        u.refreshDerivedSubtreeSignature(t);
+    return c.syncMountedState(t), e && t.isFreshInitializationSkippable() ? Promise.resolve() : c.initializeElementAttributes(t).then(() => {
+      if (c.shouldSkipChildInitialization(t, e)) {
+        c.refreshDerivedSubtreeSignature(t);
         return;
       }
       const r = [];
       return t.getChildren().forEach((i) => {
-        i instanceof P ? r.push(u.initializeElementFragment(i, e)) : i instanceof U && r.push(u.evaluateText(i));
+        i instanceof M ? r.push(c.initializeElementFragment(i, e)) : i instanceof U && r.push(c.evaluateText(i));
       }), Promise.all(r).then(() => {
-        u.refreshDerivedSubtreeSignature(t);
+        c.refreshDerivedSubtreeSignature(t);
       });
     });
   }
@@ -5163,10 +5181,10 @@ const u = class u {
   static initializeElementAttributes(t) {
     let e = Promise.resolve();
     const r = /* @__PURE__ */ new Set();
-    for (const i of u.PRIORITY_ATTRIBUTE_SUFFIXES) {
+    for (const i of c.PRIORITY_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + i;
       t.hasAttribute(n) && (e = e.then(
-        () => u.setAttribute(
+        () => c.setAttribute(
           t.getTarget(),
           n,
           t.getRawAttribute(n)
@@ -5174,17 +5192,17 @@ const u = class u {
       ), r.add(n));
     }
     for (const i of t.getAttributeNames()) {
-      if (r.has(i) || u.isDeferredAttributeName(i))
+      if (r.has(i) || c.isDeferredAttributeName(i))
         continue;
       const n = t.getRawAttribute(i);
       n !== null && (e = e.then(
-        () => u.setAttribute(t.getTarget(), i, n)
+        () => c.setAttribute(t.getTarget(), i, n)
       ));
     }
-    for (const i of u.DEFERRED_ATTRIBUTE_SUFFIXES) {
+    for (const i of c.DEFERRED_ATTRIBUTE_SUFFIXES) {
       const n = l.prefix + i;
       t.hasAttribute(n) && (e = e.then(
-        () => u.setAttribute(
+        () => c.setAttribute(
           t.getTarget(),
           n,
           t.getRawAttribute(n)
@@ -5203,7 +5221,7 @@ const u = class u {
    */
   static shouldSkipChildInitialization(t, e) {
     const r = t.getAttribute(`${l.prefix}if`);
-    return t.hasAttribute(`${l.prefix}if`) && u.isHiddenIfCondition(r) ? !0 : e && t.hasAttribute(`${l.prefix}each`);
+    return t.hasAttribute(`${l.prefix}if`) && c.isHiddenIfCondition(r) ? !0 : e && t.hasAttribute(`${l.prefix}each`);
   }
   /**
    * エレメントに属性を設定します。
@@ -5215,7 +5233,7 @@ const u = class u {
    * @returns Promise (DOM操作が完了したときに解決される)
    */
   static setAttribute(t, e, r, i = !1) {
-    const n = T.get(t), s = u.getAliasedAttributeName(e);
+    const n = T.get(t), s = c.getAliasedAttributeName(e);
     if (s !== null)
       return r === null ? n.removeAliasedAttribute(e, s) : n.setAliasedAttribute(
         e,
@@ -5224,18 +5242,24 @@ const u = class u {
         i
       );
     const a = [];
-    let o = null, c = null;
+    let o = null, u = null;
     switch (e) {
       case `${l.prefix}bind`: {
-        r === null ? (n.clearBindingDataCache(), n.setBindingData({})) : n.setBindingData(u.parseDataBind(r));
+        if (r === null)
+          n.clearBindingDataCache(), n.setBindingData({});
+        else {
+          if (i && n instanceof M && n.consumeSelfWrittenBind(r))
+            break;
+          n.setBindingData(c.parseDataBind(r));
+        }
         break;
       }
       case `${l.prefix}derive`:
-        c = u.createDeriveInputSignature(
+        u = c.createDeriveInputSignature(
           n,
           r,
           n.getRawAttribute(`${l.prefix}derive-name`)
-        ), o = u.evaluateDerive(
+        ), o = c.evaluateDerive(
           n,
           r,
           n.getRawAttribute(`${l.prefix}derive-name`)
@@ -5243,11 +5267,11 @@ const u = class u {
         }));
         break;
       case `${l.prefix}derive-name`:
-        c = u.createDeriveInputSignature(
+        u = c.createDeriveInputSignature(
           n,
           n.getRawAttribute(`${l.prefix}derive`),
           r
-        ), o = u.evaluateDerive(
+        ), o = c.evaluateDerive(
           n,
           n.getRawAttribute(`${l.prefix}derive`),
           r
@@ -5255,33 +5279,33 @@ const u = class u {
         }));
         break;
       case `${l.prefix}if`:
-        a.push(u.evaluateIf(n));
+        a.push(c.evaluateIf(n));
         break;
       case `${l.prefix}each`:
-        a.push(u.evaluateEach(n));
+        a.push(c.evaluateEach(n));
         break;
       case `${l.prefix}fetch`:
-        a.push(u.executeManagedFetch(n));
+        a.push(c.executeManagedFetch(n));
         break;
       case `${l.prefix}import`:
-        typeof r == "string" && a.push(u.executeManagedImport(n));
+        typeof r == "string" && a.push(c.executeManagedImport(n));
         break;
       case `${l.prefix}url-param`: {
         const d = n.getAttribute(`${l.prefix}url-arg`), h = Xt.readParams();
         if (d === null)
-          a.push(u.setBindingData(t, h));
+          a.push(c.setBindingData(t, h, /* @__PURE__ */ new Set(), !0));
         else {
           const g = n.getRawBindingData() || {};
-          g[String(d)] = h, a.push(u.setBindingData(t, g));
+          g[String(d)] = h, a.push(c.setBindingData(t, g, /* @__PURE__ */ new Set(), !0));
         }
         break;
       }
     }
     return r === null ? a.push(n.removeAttribute(e)) : a.push(n.setAttribute(e, r, i)), Promise.all(a).then(() => {
       if (o !== null)
-        return n.setDeriveInputSignature(c), o.then((d) => {
+        return n.setDeriveInputSignature(u), o.then((d) => {
           if (d)
-            return u.reevaluateChildren(n);
+            return c.reevaluateChildren(n);
         });
     }).then(() => {
     });
@@ -5294,22 +5318,25 @@ const u = class u {
    * @param value 属性値
    * @returns Promise (DOM操作が完了したときに解決される)
    */
-  static setBindingData(t, e, r = /* @__PURE__ */ new Set()) {
-    const i = T.get(t), n = i.getRawBindingData();
-    return i.setBindingData(e), R.bindChange(t, n, e, "manual"), i.enqueueBindingWork(() => {
-      let s = i.setAttribute(
+  static setBindingData(t, e, r = /* @__PURE__ */ new Set(), i = !1) {
+    const n = T.get(t), s = n.getRawBindingData();
+    n.setBindingData(e), R.bindChange(t, s, e, "manual");
+    const a = () => {
+      const o = n.getRawBindingData() ?? e;
+      let u = n.setAttribute(
         `${l.prefix}bind`,
-        JSON.stringify(e)
+        JSON.stringify(o)
       );
       if (t.tagName === "FORM") {
-        const a = i.getAttribute(`${l.prefix}form-arg`), o = a && e[String(a)] && typeof e[String(a)] == "object" && !Array.isArray(e[String(a)]) ? e[String(a)] : a ? {} : e;
-        s = s.then(() => y.syncValues(i, o));
+        const d = n.getAttribute(`${l.prefix}form-arg`), h = d && o[String(d)] && typeof o[String(d)] == "object" && !Array.isArray(o[String(d)]) ? o[String(d)] : d ? {} : o;
+        u = u.then(() => y.syncValues(n, h));
       }
-      return s = s.then(() => u.evaluateAll(i, r)), s = s.then(
-        () => u.reevaluateReactiveSpecialAttributes(i, r)
-      ), s.then(() => {
+      return u = u.then(() => c.evaluateAll(n, r)), u = u.then(
+        () => c.reevaluateReactiveSpecialAttributes(n, r)
+      ), u.then(() => {
       });
-    });
+    };
+    return i ? a() : n.enqueueBindingWork(a);
   }
   /**
    * 指定要素のバインディングデータを取得します。`setBindingData` の対となる
@@ -5330,7 +5357,7 @@ const u = class u {
    */
   static getBindingData(t, e = {}) {
     const r = T.get(t);
-    return r instanceof P ? e.resolved ? r.getBindingData() : r.getRawBindingData() : null;
+    return r instanceof M ? e.resolved ? r.getBindingData() : r.getRawBindingData() : null;
   }
   /**
    * 指定要素の式評価で見えるバインディングスコープをダンプします（デバッグ用）。
@@ -5351,14 +5378,14 @@ const u = class u {
     const e = T.get(t);
     if (!e)
       return { resolved: {}, sources: {} };
-    const r = e.getBindingData(), i = {}, n = (c) => {
-      const d = c.getTarget();
+    const r = e.getBindingData(), i = {}, n = (u) => {
+      const d = u.getTarget();
       return d.id ? `#${d.id}` : d.tagName.toLowerCase();
-    }, s = (c, d, h, g) => {
-      if (c)
-        for (const E of Object.keys(c))
+    }, s = (u, d, h, g) => {
+      if (u)
+        for (const E of Object.keys(u))
           E in i || (i[E] = {
-            value: c[E],
+            value: u[E],
             source: n(d),
             kind: h,
             depth: g
@@ -5400,7 +5427,7 @@ const u = class u {
     if (r.isSkipMutationNodes())
       return;
     const i = T.get(e.nextSibling), n = T.get(e);
-    n && (r.insertBefore(n, i), n instanceof P ? u.scan(n.getTarget()) : n instanceof U && u.evaluateText(n));
+    n && (r.insertBefore(n, i), n instanceof M ? c.scan(n.getTarget()) : n instanceof U && c.evaluateText(n));
   }
   /**
    * ノードを親要素から削除します。
@@ -5440,11 +5467,11 @@ const u = class u {
       return Promise.resolve();
     const i = [];
     i.push(r.setValue(e));
-    const n = u.getFormFragment(r);
+    const n = c.getFormFragment(r);
     if (n) {
       const s = y.getValues(n), a = n.getAttribute(`${l.prefix}form-arg`);
       let o;
-      a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(u.setBindingData(n.getTarget(), o));
+      a ? (o = n.getRawBindingData(), o || (o = {}), o[String(a)] = s) : o = s, i.push(c.setBindingData(n.getTarget(), o));
     }
     return Promise.all(i).then(() => {
     });
@@ -5459,7 +5486,7 @@ const u = class u {
     if (t.getTarget() instanceof HTMLFormElement)
       return t;
     const e = t.getParent();
-    return e ? u.getFormFragment(e) : null;
+    return e ? c.getFormFragment(e) : null;
   }
   /**
    * フラグメントとその子要素を評価します。
@@ -5470,21 +5497,21 @@ const u = class u {
   static evaluateAll(t, e = /* @__PURE__ */ new Set()) {
     if (e.has(t))
       return Promise.resolve();
-    let r = u.reevaluateInterpolatedAttributes(t);
+    let r = c.reevaluateInterpolatedAttributes(t);
     const i = t.hasAttribute(`${l.prefix}derive`), n = t.hasAttribute(`${l.prefix}if`), s = t.hasAttribute(`${l.prefix}each`), a = t.getRawAttribute(`${l.prefix}derive`), o = t.getRawAttribute(`${l.prefix}derive-name`);
-    let c = !1, d = !1, h = null;
+    let u = !1, d = !1, h = null;
     if (!i && t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), !i && t.getDeriveInputSignature() !== null && t.setDeriveInputSignature(null), i) {
-      const g = u.createDeriveInputSignature(
+      const g = c.createDeriveInputSignature(
         t,
         a,
         o
       );
       g === null ? (t.getDeriveInputSignature() !== null && t.setDeriveInputSignature(null), r = r.then(
-        () => u.evaluateDerive(t, a, o).then(
+        () => c.evaluateDerive(t, a, o).then(
           () => {
           }
         )
-      )) : t.getDeriveInputSignature() !== g && (r = r.then(() => u.evaluateDerive(
+      )) : t.getDeriveInputSignature() !== g && (r = r.then(() => c.evaluateDerive(
         t,
         a,
         o
@@ -5492,29 +5519,29 @@ const u = class u {
         t.setDeriveInputSignature(g);
       })));
     }
-    return n && (r = r.then(() => u.evaluateIf(t))), s ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => u.evaluateEach(t))) : n ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => {
+    return n && (r = r.then(() => c.evaluateIf(t))), s ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => c.evaluateEach(t))) : n ? (t.getDeriveSubtreeSignature() !== null && t.setDeriveSubtreeSignature(null), r.then(() => {
     })) : (i && (r = r.then(() => {
-      if (!u.canSkipStableDerivedSubtree(t)) {
-        t.setDeriveSubtreeSignature(null), u.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
+      if (!c.canSkipStableDerivedSubtree(t)) {
+        t.setDeriveSubtreeSignature(null), c.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
         return;
       }
-      h = u.createDescendantBindingSignature(
+      h = c.createDescendantBindingSignature(
         t,
         "evaluateAll"
-      ), d = !0, c = t.getDeriveSubtreeSignature() !== null && t.getDeriveSubtreeSignature() === h, u.logDerivedSubtreeProfileSnapshot(
+      ), d = !0, u = t.getDeriveSubtreeSignature() !== null && t.getDeriveSubtreeSignature() === h, c.logDerivedSubtreeProfileSnapshot(
         t,
-        c ? "skip-hit" : "skip-miss"
+        u ? "skip-hit" : "skip-miss"
       );
     })), r.then(() => {
-      if (c)
+      if (u)
         return;
       const g = [];
       return t.getChildren().forEach((E) => {
-        if (E instanceof P) {
-          if (u.canSkipUnchangedNestedEach(E))
+        if (E instanceof M) {
+          if (c.canSkipUnchangedNestedEach(E))
             return;
-          g.push(u.evaluateAll(E, e));
-        } else E instanceof U && g.push(u.evaluateText(E));
+          g.push(c.evaluateAll(E, e));
+        } else E instanceof U && g.push(c.evaluateText(E));
       }), Promise.all(g).then(() => {
       });
     }).then(() => {
@@ -5537,7 +5564,7 @@ const u = class u {
     const i = t.getRawDerivedBindingData(), n = typeof r == "string" ? r.trim() : "";
     if (!e || n === "")
       return i === null ? Promise.resolve(!1) : (t.setDerivedBindingData(null), Promise.resolve(!0));
-    const s = W.evaluateDetailed(
+    const s = z.evaluateDetailed(
       e,
       t.getBindingData()
     );
@@ -5546,7 +5573,7 @@ const u = class u {
     const a = {
       [n]: s.value
     };
-    return u.createBindingSignature(i) === u.createBindingSignature(a) ? Promise.resolve(!1) : (t.setDerivedBindingData(a), Promise.resolve(!0));
+    return c.createBindingSignature(i) === c.createBindingSignature(a) ? Promise.resolve(!1) : (t.setDerivedBindingData(a), Promise.resolve(!0));
   }
   /**
    * テキストフラグメントを評価します。
@@ -5584,11 +5611,11 @@ const u = class u {
     const e = t.getRawAttribute(`${l.prefix}if`);
     if (typeof e != "string" || e.indexOf("{{") >= 0)
       return;
-    const { sources: r } = u.dumpScope(t.getTarget()), i = /* @__PURE__ */ new Set(), n = e.match(/[A-Za-z_$][\w$]*/g) ?? [];
+    const { sources: r } = c.dumpScope(t.getTarget()), i = /* @__PURE__ */ new Set(), n = e.match(/[A-Za-z_$][\w$]*/g) ?? [];
     let s = 0;
     n.forEach((o) => {
-      const c = e.indexOf(o, s);
-      s = c + o.length, !(c > 0 && e[c - 1] === ".") && i.add(o);
+      const u = e.indexOf(o, s);
+      s = u + o.length, !(u > 0 && e[u - 1] === ".") && i.add(o);
     });
     const a = {};
     i.forEach((o) => {
@@ -5611,8 +5638,8 @@ const u = class u {
    */
   static evaluateIf(t) {
     const e = [], r = t.getAttribute(`${l.prefix}if`);
-    if (u.isHiddenIfCondition(r))
-      H.isEnabled() && u.logFalsyIfDiagnostics(t), e.push(
+    if (c.isHiddenIfCondition(r))
+      H.isEnabled() && c.logFalsyIfDiagnostics(t), e.push(
         t.hide().then(() => {
           R.hide(t.getTarget());
         })
@@ -5620,12 +5647,12 @@ const u = class u {
     else {
       const i = t.isVisible(), n = [];
       t.getChildren().forEach((s) => {
-        s instanceof P ? n.push(
-          s.isMounted() ? u.evaluateAll(s) : u.scan(s.getTarget())
-        ) : s instanceof U && n.push(u.evaluateText(s));
+        s instanceof M ? n.push(
+          s.isMounted() ? c.evaluateAll(s) : c.scan(s.getTarget())
+        ) : s instanceof U && n.push(c.evaluateText(s));
       }), e.push(
         t.show().then(() => {
-          R.show(t.getTarget()), i || u.triggerLoadOnShow(t);
+          R.show(t.getTarget()), i || c.triggerLoadOnShow(t);
         })
       ), e.push(Promise.all(n).then(() => {
       }));
@@ -5655,8 +5682,8 @@ const u = class u {
    * @return 再入制御状態
    */
   static getEachUpdateState(t) {
-    let e = u.EACH_UPDATE_STATES.get(t);
-    return e || (e = { running: !1, rerunRequested: !1, settled: null }, u.EACH_UPDATE_STATES.set(t, e)), e;
+    let e = c.EACH_UPDATE_STATES.get(t);
+    return e || (e = { running: !1, rerunRequested: !1, settled: null }, c.EACH_UPDATE_STATES.set(t, e)), e;
   }
   /**
    * each要素を評価します。
@@ -5674,8 +5701,8 @@ const u = class u {
   static evaluateEach(t) {
     if (!t.isVisible() || !t.isMounted())
       return Promise.resolve();
-    const e = u.getEachUpdateState(t);
-    return e.running ? (e.rerunRequested = !0, e.settled ?? Promise.resolve()) : u.runEachUpdateLoop(t, e);
+    const e = c.getEachUpdateState(t);
+    return e.running ? (e.rerunRequested = !0, e.settled ?? Promise.resolve()) : c.runEachUpdateLoop(t, e);
   }
   /**
    * data-each の差分更新を、再評価要求が無くなるまで直列に繰り返し実行します。
@@ -5691,7 +5718,7 @@ const u = class u {
     const r = (async () => {
       try {
         do
-          e.rerunRequested = !1, await u.performEachUpdate(t);
+          e.rerunRequested = !1, await c.performEachUpdate(t);
         while (e.rerunRequested);
         t.getTarget().setAttribute(`${l.prefix}each-done`, "");
       } finally {
@@ -5707,35 +5734,35 @@ const u = class u {
    * @return 差分更新完了の Promise
    */
   static performEachUpdate(t) {
-    const e = u.resolveEachItems(t);
+    const e = c.resolveEachItems(t);
     if (e === null)
       return Promise.reject(new Error("Invalid each attribute."));
     let r = t.getTemplate();
-    const i = t.getAttribute(`${l.prefix}each-key`), n = u.createBindingSignature({
+    const i = t.getAttribute(`${l.prefix}each-key`), n = c.createBindingSignature({
       key: i ? String(i) : null,
       items: e
     });
     if (r === null) {
       let s = !1;
       if (t.getChildren().forEach((a) => {
-        if (!s && a instanceof P) {
+        if (!s && a instanceof M) {
           if (a.hasAttribute(`${l.prefix}each-before`) || a.hasAttribute(`${l.prefix}each-after`))
             return;
-          r = a.clone(), u.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0, t.removeChild(a);
+          r = a.clone(), c.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0, t.removeChild(a);
           const o = a.getTarget();
           o.parentNode && o.parentNode.removeChild(o), a.setMounted(!1);
         }
       }), !s) {
         const a = t.getTarget();
         Array.from(a.children).filter(
-          (c) => !c.hasAttribute(`${l.prefix}each-before`) && !c.hasAttribute(`${l.prefix}each-after`)
-        ).forEach((c) => {
+          (u) => !u.hasAttribute(`${l.prefix}each-before`) && !u.hasAttribute(`${l.prefix}each-after`)
+        ).forEach((u) => {
           if (!s) {
-            const h = T.get(c);
-            h instanceof P && (r = h.clone(), u.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0);
+            const h = T.get(u);
+            h instanceof M && (r = h.clone(), c.markFreshInitializationSkippable(r), t.setTemplate(r), s = !0);
           }
-          const d = T.get(c);
-          d instanceof P && t.getChildren().includes(d) && (t.removeChild(d), d.setMounted(!1)), c.parentNode && c.parentNode.removeChild(c);
+          const d = T.get(u);
+          d instanceof M && t.getChildren().includes(d) && (t.removeChild(d), d.setMounted(!1)), u.parentNode && u.parentNode.removeChild(u);
         });
       }
       return this.updateDiff(t, e).then(() => {
@@ -5767,12 +5794,12 @@ const u = class u {
     if (!t.hasAttribute(`${l.prefix}each`) || t.getEachInputSignature() === null)
       return !1;
     const e = t.getParent();
-    if (e?.closestByAttribute(`${l.prefix}derive`) || e?.closestByAttribute(`${l.prefix}derive-name`) || e?.closestByAttribute(`${l.prefix}if`) || e?.closestByAttribute(`${l.prefix}fetch`) || e?.closestByAttribute(`${l.prefix}import`) || u.hasNonEachDynamicElementState(t))
+    if (e?.closestByAttribute(`${l.prefix}derive`) || e?.closestByAttribute(`${l.prefix}derive-name`) || e?.closestByAttribute(`${l.prefix}if`) || e?.closestByAttribute(`${l.prefix}fetch`) || e?.closestByAttribute(`${l.prefix}import`) || c.hasNonEachDynamicElementState(t))
       return !1;
-    const r = u.resolveEachItems(t);
+    const r = c.resolveEachItems(t);
     if (r === null)
       return !1;
-    const i = t.getAttribute(`${l.prefix}each-key`), n = u.createBindingSignature({
+    const i = t.getAttribute(`${l.prefix}each-key`), n = c.createBindingSignature({
       key: i ? String(i) : null,
       items: r
     });
@@ -5786,7 +5813,7 @@ const u = class u {
    * @returns 省略可能なら true
    */
   static canSkipStableDerivedSubtree(t) {
-    return !t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}if`) || t.hasAttribute(`${l.prefix}each`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !1 : !u.hasDisallowedDerivedSubtreeDescendant(t);
+    return !t.hasAttribute(`${l.prefix}derive`) || t.hasAttribute(`${l.prefix}if`) || t.hasAttribute(`${l.prefix}each`) || t.hasAttribute(`${l.prefix}fetch`) || t.hasAttribute(`${l.prefix}import`) ? !1 : !c.hasDisallowedDerivedSubtreeDescendant(t);
   }
   /**
    * data-derive subtree skip の初期 PoC で扱わない子孫要素を含むかを返します。
@@ -5795,7 +5822,7 @@ const u = class u {
    * @returns 含むなら true
    */
   static hasDisallowedDerivedSubtreeDescendant(t) {
-    return t.getChildren().some((e) => e instanceof P ? e.hasAttribute(`${l.prefix}derive`) || e.hasAttribute(`${l.prefix}derive-name`) || e.hasAttribute(`${l.prefix}fetch`) || e.hasAttribute(`${l.prefix}import`) ? !0 : u.hasDisallowedDerivedSubtreeDescendant(e) : !1);
+    return t.getChildren().some((e) => e instanceof M ? e.hasAttribute(`${l.prefix}derive`) || e.hasAttribute(`${l.prefix}derive-name`) || e.hasAttribute(`${l.prefix}fetch`) || e.hasAttribute(`${l.prefix}import`) ? !0 : c.hasDisallowedDerivedSubtreeDescendant(e) : !1);
   }
   /**
    * data-derive host が子孫要素へ公開している binding の署名を返します。
@@ -5804,7 +5831,7 @@ const u = class u {
    * @returns binding 署名
    */
   static createDescendantBindingSignature(t, e) {
-    return u.recordDerivedSubtreeSignatureComputation(t, e), u.createBindingSignature(t.getDescendantBindingData());
+    return c.recordDerivedSubtreeSignatureComputation(t, e), c.createBindingSignature(t.getDescendantBindingData());
   }
   /**
    * data-derive 実行前の入力署名を返します。
@@ -5816,7 +5843,7 @@ const u = class u {
    */
   static createDeriveInputSignature(t, e, r) {
     const i = typeof r == "string" ? r.trim() : "";
-    return !e || i === "" ? null : u.createBindingSignature({
+    return !e || i === "" ? null : c.createBindingSignature({
       expression: e,
       name: i,
       scope: t.getBindingData()
@@ -5828,13 +5855,13 @@ const u = class u {
    * @param fragment 対象フラグメント
    */
   static refreshDerivedSubtreeSignature(t) {
-    if (!u.canSkipStableDerivedSubtree(t)) {
-      t.setDeriveSubtreeSignature(null), u.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
+    if (!c.canSkipStableDerivedSubtree(t)) {
+      t.setDeriveSubtreeSignature(null), c.logDerivedSubtreeProfileSnapshot(t, "skip-ineligible");
       return;
     }
     t.setDeriveSubtreeSignature(
-      u.createDescendantBindingSignature(t, "refresh")
-    ), u.logDerivedSubtreeProfileSnapshot(t, "refresh");
+      c.createDescendantBindingSignature(t, "refresh")
+    ), c.logDerivedSubtreeProfileSnapshot(t, "refresh");
   }
   /**
    * data-derive subtree skip のプロファイルを取得または初期化します。
@@ -5845,11 +5872,11 @@ const u = class u {
   static getOrCreateDerivedSubtreeProfile(t) {
     if (!H.isEnabled() || !t.hasAttribute(`${l.prefix}derive`))
       return null;
-    const e = u.DERIVE_SUBTREE_PROFILES.get(t);
+    const e = c.DERIVE_SUBTREE_PROFILES.get(t);
     if (e)
       return e;
     const r = {
-      hostId: u.createDerivedSubtreeHostId(t),
+      hostId: c.createDerivedSubtreeHostId(t),
       signatureComputeTotal: 0,
       signatureComputeFromEvaluateAll: 0,
       signatureComputeFromRefresh: 0,
@@ -5857,7 +5884,7 @@ const u = class u {
       skipMissCount: 0,
       skipIneligibleCount: 0
     };
-    return u.DERIVE_SUBTREE_PROFILES.set(t, r), r;
+    return c.DERIVE_SUBTREE_PROFILES.set(t, r), r;
   }
   /**
    * data-derive subtree host の識別子を作成します。
@@ -5881,7 +5908,7 @@ const u = class u {
       typeof s == "string" && s.trim() !== "" && (n += `[${l.prefix}derive-name="${s.trim()}"]`);
       const a = r.getParent();
       if (a) {
-        const o = a.getChildren().filter((c) => c instanceof P).findIndex((c) => c === r);
+        const o = a.getChildren().filter((u) => u instanceof M).findIndex((u) => u === r);
         n += `:nth-child(${o + 1})`;
       }
       e.unshift(n), r = a;
@@ -5895,7 +5922,7 @@ const u = class u {
    * @param source 計算元
    */
   static recordDerivedSubtreeSignatureComputation(t, e) {
-    const r = u.getOrCreateDerivedSubtreeProfile(t);
+    const r = c.getOrCreateDerivedSubtreeProfile(t);
     if (r !== null) {
       if (r.signatureComputeTotal += 1, e === "refresh") {
         r.signatureComputeFromRefresh += 1;
@@ -5911,7 +5938,7 @@ const u = class u {
    * @param reason ログ理由
    */
   static logDerivedSubtreeProfileSnapshot(t, e) {
-    const r = u.getOrCreateDerivedSubtreeProfile(t);
+    const r = c.getOrCreateDerivedSubtreeProfile(t);
     r !== null && (e === "skip-hit" ? r.skipHitCount += 1 : e === "skip-miss" ? r.skipMissCount += 1 : e === "skip-ineligible" && (r.skipIneligibleCount += 1), m.info("[Haori][derive-profile]", {
       reason: e,
       hostId: r.hostId,
@@ -5954,7 +5981,7 @@ const u = class u {
    * @returns subtree 全体を省略可能なら true
    */
   static markFreshInitializationSkippable(t) {
-    const e = t.getAttributeNames().some((n) => u.isFreshInitializationDynamicAttribute(t, n)), r = t.getChildren().some((n) => n instanceof P ? !u.markFreshInitializationSkippable(n) : n instanceof U ? n.hasDynamicContent() : !1), i = !e && !r;
+    const e = t.getAttributeNames().some((n) => c.isFreshInitializationDynamicAttribute(t, n)), r = t.getChildren().some((n) => n instanceof M ? !c.markFreshInitializationSkippable(n) : n instanceof U ? n.hasDynamicContent() : !1), i = !e && !r;
     return t.setFreshInitializationSkippable(i), i;
   }
   /**
@@ -5984,19 +6011,19 @@ const u = class u {
     i && (i = String(i));
     const n = t.getAttribute(`${l.prefix}each-key`), s = t.getAttribute(`${l.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
     e.forEach((b, S) => {
-      const F = u.createListKey(
+      const F = c.createListKey(
         b,
         n ? String(n) : null,
         S
       );
       o.push(F), a.set(F, { item: b, itemIndex: S });
     });
-    const c = new Set(o), d = [];
-    let h = t.getChildren().filter((b) => b instanceof P).filter(
+    const u = new Set(o), d = [];
+    let h = t.getChildren().filter((b) => b instanceof M).filter(
       (b) => !b.hasAttribute(`${l.prefix}each-before`) && !b.hasAttribute(`${l.prefix}each-after`)
     );
     const g = h.map((b) => b.getListKey());
-    h = h.filter((b) => c.has(String(b.getListKey())) ? !0 : (d.push(b.remove()), !1));
+    h = h.filter((b) => u.has(String(b.getListKey())) ? !0 : (d.push(b.remove()), !1));
     const E = h.map((b) => b.getListKey()), w = /* @__PURE__ */ new Map();
     h.forEach((b) => {
       const S = b.getListKey();
@@ -6012,7 +6039,7 @@ const u = class u {
       const V = w.get(b);
       if (V)
         $ = V, v = v.then(
-          () => u.updateRowFragment(
+          () => c.updateRowFragment(
             $,
             F,
             i,
@@ -6021,14 +6048,14 @@ const u = class u {
             b
           ).then((C) => {
             if (C)
-              return u.evaluateAll($);
+              return c.evaluateAll($);
           })
         );
       else {
         $ = r.clone();
         const C = A + S;
         v = v.then(
-          () => u.updateRowFragment(
+          () => c.updateRowFragment(
             $,
             F,
             i,
@@ -6039,7 +6066,7 @@ const u = class u {
             const Q = k[C] ?? null;
             return t.insertBefore($, Q).then(() => {
               k.splice(C, 0, $);
-            }).then(() => u.initializeFreshEachRow($));
+            }).then(() => c.initializeFreshEachRow($));
           })
         );
       }
@@ -6051,7 +6078,7 @@ const u = class u {
       ), F = new Set(S), I = b.filter((C) => !F.has(C)), V = g.filter(
         (C) => C !== null
       ).filter(
-        (C) => !c.has(C)
+        (C) => !u.has(C)
       );
       R.eachUpdate(
         t.getTarget(),
@@ -6107,11 +6134,11 @@ const u = class u {
         "[Haori]",
         `Primitive value requires '${l.prefix}each-arg' attribute: ${e}`
       ), Promise.resolve(!1);
-    const o = a, c = u.createBindingSignature({
+    const o = a, u = c.createBindingSignature({
       listKey: s,
       bindingData: o
     });
-    return t.getListKey() === s && t.getRenderSignature() === c ? Promise.resolve(!1) : (t.setListKey(s), t.setRenderSignature(c), t.setBindingData(o), t.setAttribute(`${l.prefix}row`, s).then(() => !0));
+    return t.getListKey() === s && t.getRenderSignature() === u ? Promise.resolve(!1) : (t.setListKey(s), t.setRenderSignature(u), t.setBindingData(o), t.setAttribute(`${l.prefix}row`, s).then(() => !0));
   }
   /**
    * 新規挿入行に遅延再評価が必要かどうかを判定します。
@@ -6125,7 +6152,7 @@ const u = class u {
       const r = e.pop();
       if (r.getChildElementFragments().forEach((i) => {
         e.push(i);
-      }), r !== t && !r.isMounted() && u.hasMountSensitiveAttribute(r))
+      }), r !== t && !r.isMounted() && c.hasMountSensitiveAttribute(r))
         return !0;
     }
     return !1;
@@ -6168,7 +6195,7 @@ const u = class u {
       if (e.has(t))
         return `[Circular:${e.get(t)}]`;
       const i = `array-${r.value}`;
-      return r.value += 1, e.set(t, i), `[${t.map((n) => u.createBindingSignature(n, e, r)).join(",")}]`;
+      return r.value += 1, e.set(t, i), `[${t.map((n) => c.createBindingSignature(n, e, r)).join(",")}]`;
     }
     if (typeof t == "object") {
       if (e.has(t))
@@ -6177,7 +6204,7 @@ const u = class u {
       r.value += 1, e.set(t, i);
       const n = t;
       return `{${Object.keys(n).sort().map(
-        (s) => `${JSON.stringify(s)}:${u.createBindingSignature(
+        (s) => `${JSON.stringify(s)}:${c.createBindingSignature(
           n[s],
           e,
           r
@@ -6193,18 +6220,18 @@ const u = class u {
    */
   static scheduleEvaluateAll(t) {
     setTimeout(() => {
-      u.evaluateAll(t);
+      c.evaluateAll(t);
     }, 100);
   }
 };
-u.ATTRIBUTE_ALIAS_SUFFIX = "attr-", u.PRIORITY_ATTRIBUTE_SUFFIXES = [
+c.ATTRIBUTE_ALIAS_SUFFIX = "attr-", c.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "bind",
   "url-param",
   "derive-name",
   "derive",
   "if",
   "each"
-], u.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], u.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
+], c.DEFERRED_ATTRIBUTE_SUFFIXES = ["fetch"], c.EVALUATE_ALL_EXCLUDED_ATTRIBUTE_SUFFIXES = [
   "bind",
   "derive",
   "derive-name",
@@ -6213,8 +6240,8 @@ u.ATTRIBUTE_ALIAS_SUFFIX = "attr-", u.PRIORITY_ATTRIBUTE_SUFFIXES = [
   "fetch",
   "import",
   "url-param"
-], u.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, u.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), u.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), u.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), u.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap();
-let M = u;
+], c.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/, c.REACTIVE_FETCH_STATES = /* @__PURE__ */ new WeakMap(), c.REACTIVE_IMPORT_STATES = /* @__PURE__ */ new WeakMap(), c.DERIVE_SUBTREE_PROFILES = /* @__PURE__ */ new WeakMap(), c.EACH_UPDATE_STATES = /* @__PURE__ */ new WeakMap();
+let x = c;
 const J = class J {
   /**
    * コンストラクタ。
@@ -6303,7 +6330,7 @@ const J = class J {
       if (i.getAttribute(this.onAttributeName) !== t)
         return;
       const n = T.get(i);
-      n instanceof P && new j(n, "on", e).run().catch((s) => {
+      n instanceof M && new j(n, "on", e).run().catch((s) => {
         m.error("[Haori]", "Procedure execution error:", s);
       });
     });
@@ -6351,7 +6378,7 @@ const J = class J {
     const i = T.get(r);
     if (!i)
       return;
-    (e === "change" || e === "input") && i instanceof P && i.syncValue();
+    (e === "change" || e === "input") && i instanceof M && i.syncValue();
     const n = () => {
       new j(i, e, t).run().catch((s) => {
         m.error("[Haori]", "Procedure execution error:", s);
@@ -6449,9 +6476,9 @@ const D = class D {
     }
     e && (e.observer.disconnect(), D.registrations.delete(t));
     const o = new IntersectionObserver(
-      (c) => {
+      (u) => {
         const d = D.registrations.get(t);
-        d && c.forEach((h) => {
+        d && u.forEach((h) => {
           !h.isIntersecting || d.running || D.isDisabled(d.fragment) || (d.running = !0, new j(d.fragment, "intersect").runWithResult().then((g) => {
             g && d.once && (d.observer.disconnect(), D.registrations.delete(t));
           }).catch((g) => {
@@ -6559,10 +6586,10 @@ const O = class O {
       return;
     O._initialized = !0, O.disconnectMutationObservers();
     const t = await Promise.allSettled([
-      M.scan(document.head),
-      M.scan(document.body)
+      x.scan(document.head),
+      x.scan(document.body)
     ]), [e, r] = t;
-    e.status !== "fulfilled" && m.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && m.error("[Haori]", "Failed to build body fragment:", r.reason), await x.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ht().start(), X.syncTree(document.body);
+    e.status !== "fulfilled" && m.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && m.error("[Haori]", "Failed to build body fragment:", r.reason), await P.wait(), document.body.setAttribute("data-haori-ready", ""), O.observe(document.head), O.observe(document.body), new ht().start(), X.syncTree(document.body);
   }
   /**
    * 指定された要素を監視します。
@@ -6576,12 +6603,12 @@ const O = class O {
           switch (i.type) {
             case "attributes": {
               const n = i.target;
-              if (i.attributeName && n.hasAttribute("data-haori-click-lock") && (i.attributeName === "disabled" || i.attributeName === "data-haori-click-lock") || i.attributeName && M.isAliasedAttributeReflection(
+              if (i.attributeName && n.hasAttribute("data-haori-click-lock") && (i.attributeName === "disabled" || i.attributeName === "data-haori-click-lock") || i.attributeName && x.isAliasedAttributeReflection(
                 n,
                 i.attributeName
               ))
                 break;
-              M.setAttribute(
+              x.setAttribute(
                 n,
                 i.attributeName,
                 n.getAttribute(i.attributeName),
@@ -6591,14 +6618,14 @@ const O = class O {
             }
             case "childList": {
               Array.from(i.removedNodes).forEach((n) => {
-                X.cleanupTree(n), M.removeNode(n);
+                X.cleanupTree(n), x.removeNode(n);
               }), Array.from(i.addedNodes).forEach((n) => {
-                n.parentElement instanceof Element && (M.addNode(n.parentElement, n), X.syncTree(n));
+                n.parentElement instanceof Element && (x.addNode(n.parentElement, n), X.syncTree(n));
               });
               break;
             }
             case "characterData": {
-              i.target instanceof Text || i.target instanceof Comment ? M.changeText(i.target, i.target.textContent) : m.warn(
+              i.target instanceof Text || i.target instanceof Comment ? x.changeText(i.target, i.target.textContent) : m.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 i.target
@@ -6624,15 +6651,15 @@ const O = class O {
 O._initialized = !1, O._mutationObservers = [];
 let it = O;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", it.init) : it.init();
-const Qt = () => Z.waitForRenders(), Zt = "0.17.0";
+const Qt = () => Z.waitForRenders(), Zt = "0.17.2";
 export {
-  M as Core,
+  x as Core,
   l as Env,
   y as Form,
   T as Fragment,
   Z as Haori,
   m as Log,
-  x as Queue,
+  P as Queue,
   Z as default,
   Zt as version,
   Qt as waitForRenders