haori 0.22.0 → 0.22.1

package/dist/haori.es.js

@@ -533,8 +533,8 @@ const We = Object.freeze({
         return { value: null, unresolvedReference: !1 };
       try {
         const u = [], p = this.wrapBoundValues(a);
-        return h.bindKeys.forEach((b) => {
-          u.push(p[b]);
+        return h.bindKeys.forEach((v) => {
+          u.push(p[v]);
         }), {
           value: this.withBlockedPropertyAccess(
             () => h.evaluator(...u)
@@ -543,9 +543,9 @@ const We = Object.freeze({
         };
       } catch (u) {
         if (o && u instanceof ReferenceError) {
-          const b = this.extractMissingIdentifier(u);
-          if (b !== null && this.canRecoverMissingIdentifier(b, a)) {
-            a[b] = void 0;
+          const v = this.extractMissingIdentifier(u);
+          if (v !== null && this.canRecoverMissingIdentifier(v, a)) {
+            a[v] = void 0;
             continue;
           }
         }
@@ -2242,9 +2242,9 @@ const K = class K extends R {
       element: a,
       rawName: e,
       template: r
-    }), l = s.isEvaluate || s.isRawEvaluate, h = e === t && K.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), u = s.isSingleExpression(), p = G.joinEvaluateResults(o.results), b = o.results.length === 1 ? o.results[0] : p, T = !s.isForceEvaluation() && (t !== e || h || u ? o.hasUnresolvedReference || b === null || b === void 0 || b === !1 : l && p === ""), I = s.isForceEvaluation() ? r : u ? b : p, A = i && s.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), y = a.getRootNode(), v = A && a === y.activeElement, S = T || I === null || I === !1 ? null : String(I), k = e !== t && a.getAttribute(e) !== r, C = S === null ? a.hasAttribute(t) : a.getAttribute(t) !== S, O = A && !v && S !== null && a.value !== S, j = t === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), $ = t === "selected" && a instanceof HTMLOptionElement, _ = y.activeElement, be = _ !== null && (j && a === _ || $ && a.closest("select") === _), te = S !== null, ve = j && !be && a.checked !== te, ye = $ && !be && a.selected !== te;
-    return !k && !C && !O && !ve && !ye ? (A && !v && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, P.enqueue(() => {
-      k && a.setAttribute(e, r), S === null ? a.removeAttribute(t) : (C && (a.setAttribute(t, S), t === `${c.prefix}bind` && this.recordSelfWrittenBind(S)), A && !v && (this.value = this.normalizeValueForElement(a, S), O && (a.value = S))), ve && (a.checked = te), ye && (a.selected = te);
+    }), l = s.isEvaluate || s.isRawEvaluate, h = e === t && K.BOOLEAN_ATTRIBUTES.has(t.toLowerCase()), u = s.isSingleExpression(), p = G.joinEvaluateResults(o.results), v = o.results.length === 1 ? o.results[0] : p, T = !s.isForceEvaluation() && (t !== e || h || u ? o.hasUnresolvedReference || v === null || v === void 0 || v === !1 : l && p === ""), I = s.isForceEvaluation() ? r : u ? v : p, A = i && s.isEvaluate && t === "value" && (a instanceof HTMLInputElement && this.INPUT_EVENT_TYPES.includes(a.type) || a instanceof HTMLTextAreaElement || a instanceof HTMLSelectElement), y = a.getRootNode(), b = A && a === y.activeElement, S = T || I === null || I === !1 ? null : String(I), k = e !== t && a.getAttribute(e) !== r, C = S === null ? a.hasAttribute(t) : a.getAttribute(t) !== S, O = A && !b && S !== null && a.value !== S, j = t === "checked" && a instanceof HTMLInputElement && (a.type === "checkbox" || a.type === "radio"), $ = t === "selected" && a instanceof HTMLOptionElement, _ = y.activeElement, be = _ !== null && (j && a === _ || $ && a.closest("select") === _), te = S !== null, ve = j && !be && a.checked !== te, ye = $ && !be && a.selected !== te;
+    return !k && !C && !O && !ve && !ye ? (A && !b && S !== null && (this.value = this.normalizeValueForElement(a, S)), Promise.resolve()) : (this.skipMutationAttributes = !0, P.enqueue(() => {
+      k && a.setAttribute(e, r), S === null ? a.removeAttribute(t) : (C && (a.setAttribute(t, S), t === `${c.prefix}bind` && this.recordSelfWrittenBind(S)), A && !b && (this.value = this.normalizeValueForElement(a, S), O && (a.value = S))), ve && (a.checked = te), ye && (a.selected = te);
     }).finally(() => {
       this.skipMutationAttributes = !1;
     }));
@@ -2381,15 +2381,15 @@ const K = class K extends R {
     else {
       let p;
       if (s ? a !== -1 && a < o ? p = o - 1 : p = o : p = this.children.indexOf(t), p === -1) {
-        const b = this.resolveInsertionPointFromDom(
+        const v = this.resolveInsertionPointFromDom(
           t,
           !1
         );
-        b === null ? (m.warn(
+        v === null ? (m.warn(
           "[Haori]",
           "Reference child not found in children.",
           t
-        ), this.children.push(e)) : (this.children.splice(b.index, 0, e), h = b.referenceNode);
+        ), this.children.push(e)) : (this.children.splice(v.index, 0, e), h = v.referenceNode);
       } else
         this.children.splice(p, 0, e);
     }
@@ -3263,17 +3263,17 @@ class E {
       const u = t[String(l)];
       if (Array.isArray(u)) {
         const p = e.getChildElementFragments();
-        for (let b = 0; b < p.length; b++) {
-          const T = p[b];
-          u.length > b ? s.push(
+        for (let v = 0; v < p.length; v++) {
+          const T = p[v];
+          u.length > v ? s.push(
             E.setPartValues(
               T,
-              u[b],
-              b,
+              u[v],
+              v,
               i,
               n
             )
-          ) : s.push(E.setPartValues(T, {}, b, i, n));
+          ) : s.push(E.setPartValues(T, {}, v, i, n));
         }
       }
     } else
@@ -4073,9 +4073,9 @@ const g = class g {
           g.attrName(t, "form")
         );
         if (y) {
-          const v = document.body.querySelector(y);
-          v !== null ? r.formFragment = E.getFormFragment(
-            R.get(v)
+          const b = document.body.querySelector(y);
+          b !== null ? r.formFragment = E.getFormFragment(
+            R.get(b)
           ) : m.error(
             "Haori",
             `Form element not found: ${y} (${g.attrName(t, "form")})`
@@ -4096,24 +4096,34 @@ const g = class g {
 ${y}
 `
           );
-        } catch (v) {
-          m.error("Haori", `Invalid before script: ${v}`);
+        } catch (b) {
+          m.error("Haori", `Invalid before script: ${b}`);
         }
       }
       const A = g.attrName(t, "run");
       if (e.hasAttribute(A)) {
         const y = String(e.getAttribute(A) ?? "");
+        let b = null;
         try {
-          r.runScript = new Function(
+          b = new Function(
             "event",
-            `
-"use strict";
+            `"use strict"; return (
 ${y}
-`
+);`
           );
-        } catch (v) {
-          m.error("Haori", `Invalid run script: ${v}`);
+        } catch {
+          try {
+            b = new Function(
+              "event",
+              `"use strict";
+${y}
+`
+            );
+          } catch (S) {
+            m.error("Haori", `Invalid run script: ${S}`);
+          }
         }
+        b && (r.runScript = b);
       }
     }
     const i = g.attrName(t, "fetch"), n = e.hasAttribute(i);
@@ -4145,8 +4155,8 @@ ${y}
         );
         try {
           s.headers = x.parseDataBind(y);
-        } catch (v) {
-          m.error("Haori", `Invalid fetch headers: ${v}`);
+        } catch (b) {
+          m.error("Haori", `Invalid fetch headers: ${b}`);
         }
       }
     } else {
@@ -4161,8 +4171,8 @@ ${y}
         );
         try {
           s.headers = x.parseDataBind(y);
-        } catch (v) {
-          m.error("Haori", `Invalid fetch headers: ${v}`);
+        } catch (b) {
+          m.error("Haori", `Invalid fetch headers: ${b}`);
         }
       }
     }
@@ -4213,8 +4223,8 @@ ${y}
       const A = e.getRawAttribute(a);
       if (A) {
         const y = document.body.querySelectorAll(A);
-        y.length > 0 ? (r.bindFragments = [], y.forEach((v) => {
-          const S = R.get(v);
+        y.length > 0 ? (r.bindFragments = [], y.forEach((b) => {
+          const S = R.get(b);
           S && r.bindFragments.push(S);
         })) : m.error(
           "Haori",
@@ -4244,8 +4254,8 @@ ${y}
       const A = e.getRawAttribute(p);
       r.bindAppendParams = A.split("&").map((y) => y.trim()).filter(Boolean);
     }
-    const b = t ? g.attrName(t, "bind-merge") : g.attrName(null, "bind-merge", !0);
-    e.hasAttribute(b) && (r.bindMerge = !0);
+    const v = t ? g.attrName(t, "bind-merge") : g.attrName(null, "bind-merge", !0);
+    e.hasAttribute(v) && (r.bindMerge = !0);
     const T = t ? g.attrName(t, "bind-transform") : g.attrName(null, "bind-transform", !0);
     e.hasAttribute(T) && (r.bindTransform = e.getRawAttribute(T));
     const I = t ? g.attrName(t, "copy-params") : null;
@@ -4255,17 +4265,17 @@ ${y}
     }
     if (t) {
       if (e.hasAttribute(g.attrName(t, "adjust"))) {
-        const v = e.getRawAttribute(
+        const b = e.getRawAttribute(
           g.attrName(t, "adjust")
         );
-        if (v) {
-          const S = document.body.querySelectorAll(v);
+        if (b) {
+          const S = document.body.querySelectorAll(b);
           S.length > 0 ? (r.adjustFragments = [], S.forEach((k) => {
             const C = R.get(k);
             C && r.adjustFragments.push(C);
           })) : m.error(
             "Haori",
-            `Adjust element not found: ${v} (${g.attrName(t, "adjust")})`
+            `Adjust element not found: ${b} (${g.attrName(t, "adjust")})`
           );
         }
         if (e.hasAttribute(g.attrName(t, "adjust-value"))) {
@@ -4276,7 +4286,7 @@ ${y}
         }
       }
       if (e.hasAttribute(g.attrName(t, "row-add")) && (r.rowAdd = !0), e.hasAttribute(g.attrName(t, "row-remove")) && (r.rowRemove = !0), e.hasAttribute(g.attrName(t, "row-prev")) && (r.rowMovePrev = !0), e.hasAttribute(g.attrName(t, "row-next")) && (r.rowMoveNext = !0), e.hasAttribute(`${c.prefix}${t}-after-run`)) {
-        const v = e.getRawAttribute(
+        const b = e.getRawAttribute(
           `${c.prefix}${t}-after-run`
         );
         try {
@@ -4284,7 +4294,7 @@ ${y}
             "response",
             `
 "use strict";
-${v}
+${b}
 `
           );
         } catch (S) {
@@ -4296,21 +4306,21 @@ ${v}
         r.toastMessage = e.getAttribute(
           g.attrName(t, "toast")
         );
-        const v = e.getRawAttribute(
+        const b = e.getRawAttribute(
           g.attrName(t, "toast-level")
-        ), k = ["info", "warning", "error", "success"].includes(v);
-        r.toastLevel = k ? v : null;
+        ), k = ["info", "warning", "error", "success"].includes(b);
+        r.toastLevel = k ? b : null;
       }
       if (e.hasAttribute(g.attrName(t, "redirect"))) {
         r.redirectUrl = e.getAttribute(
           g.attrName(t, "redirect")
         );
-        const v = g.attrName(
+        const b = g.attrName(
           t,
           "redirect-return-param"
         );
-        e.hasAttribute(v) && (r.redirectReturnParam = e.getAttribute(
-          v
+        e.hasAttribute(b) && (r.redirectReturnParam = e.getAttribute(
+          b
         ));
       }
       if (e.hasAttribute(g.attrName(t, "scroll-error")) && (r.scrollOnError = !0), e.hasAttribute(g.attrName(t, "scroll")) && (r.scrollTarget = e.getAttribute(
@@ -4318,16 +4328,16 @@ ${v}
       )), e.hasAttribute(g.attrName(t, "history")) && (r.historyUrl = e.getAttribute(
         g.attrName(t, "history")
       )), e.hasAttribute(g.attrName(t, "history-data")) && (r.historyDataAttrName = g.attrName(t, "history-data")), e.hasAttribute(g.attrName(t, "history-form"))) {
-        const v = e.getRawAttribute(
+        const b = e.getRawAttribute(
           g.attrName(t, "history-form")
         );
-        if (v) {
-          const S = document.body.querySelector(v);
+        if (b) {
+          const S = document.body.querySelector(b);
           S !== null ? r.historyFormFragment = E.getFormFragment(
             R.get(S)
           ) : m.error(
             "Haori",
-            `Form element not found: ${v} (${g.attrName(t, "history-form")})`
+            `Form element not found: ${b} (${g.attrName(t, "history-form")})`
           );
         } else
           r.historyFormFragment = E.getFormFragment(e);
@@ -4340,8 +4350,8 @@ ${v}
         "copy",
         "open",
         "close"
-      ].forEach((v) => {
-        const S = g.attrName(t, v);
+      ].forEach((b) => {
+        const S = g.attrName(t, b);
         if (!e.hasAttribute(S))
           return;
         const k = e.getRawAttribute(S), C = [];
@@ -4349,7 +4359,7 @@ ${v}
           const $ = R.get(j);
           $ && C.push($);
         }), C.length === 0 && m.error("Haori", `Element not found: ${k} (${S})`)) : C.push(e), C.length > 0)
-          switch (v) {
+          switch (b) {
             case "reset-before":
               r.resetBeforeFragments = C;
               break;
@@ -4375,21 +4385,21 @@ ${v}
       });
       const y = g.attrName(t, "copy-source");
       if (e.hasAttribute(y)) {
-        const v = e.getRawAttribute(
+        const b = e.getRawAttribute(
           y
         );
-        if (v) {
-          const S = document.body.querySelector(v);
+        if (b) {
+          const S = document.body.querySelector(b);
           if (S !== null) {
             const k = R.get(S);
             k ? r.copySourceFragment = k : m.error(
               "Haori",
-              `Element is not managed by Haori: ${v} (${y})`
+              `Element is not managed by Haori: ${b} (${y})`
             );
           } else
             m.error(
               "Haori",
-              `Element not found: ${v} (${y})`
+              `Element not found: ${b} (${y})`
             );
         } else
           r.copySourceFragment = e;
@@ -4503,8 +4513,8 @@ ${v}
       }
       const a = Object.keys(i).length > 0;
       if (n) {
-        const h = { ...s || {} }, u = r.requestedMethod, p = r.effectiveMethod, b = r.transportMode === "query-get", T = r.queryString;
-        if (b && m.info("Haori demo fetch normalization", {
+        const h = { ...s || {} }, u = r.requestedMethod, p = r.effectiveMethod, v = r.transportMode === "query-get", T = r.queryString;
+        if (v && m.info("Haori demo fetch normalization", {
           runtime: c.runtime,
           requestedMethod: u,
           effectiveMethod: p,
@@ -4517,8 +4527,8 @@ ${v}
             runtime: c.runtime,
             requestedMethod: u,
             effectiveMethod: p,
-            transportMode: b ? "query-get" : "http",
-            ...b ? { queryString: T } : {}
+            transportMode: v ? "query-get" : "http",
+            ...v ? { queryString: T } : {}
           };
           return N.fetchStart(
             this.options.targetFragment.getTarget(),
@@ -4543,8 +4553,8 @@ ${v}
       if ((!this.options.bindFragments || this.options.bindFragments.length === 0) && this.options.formFragment && a) {
         const h = this.options.formFragment, u = h.getTarget(), p = /* @__PURE__ */ new Set();
         e && e.appliedDisabledAttribute && this.options.targetFragment && p.add(this.options.targetFragment);
-        const b = h.getBindingData();
-        Object.assign(b, i), await x.setBindingData(u, b, p);
+        const v = h.getBindingData();
+        Object.assign(v, i), await x.setBindingData(u, v, p);
       }
       const o = a ? i : {}, l = new Response(JSON.stringify(o), {
         headers: { "Content-Type": "application/json" }
@@ -4703,7 +4713,7 @@ ${v}
           const l = /* @__PURE__ */ new Map(), h = [];
           for (const u of a)
             if (u && typeof u == "object" && !Array.isArray(u)) {
-              const p = u.key, b = u.message, T = typeof p == "string" && p.length > 0 ? p : null, I = typeof b == "string" ? b : b != null ? String(b) : "";
+              const p = u.key, v = u.message, T = typeof p == "string" && p.length > 0 ? p : null, I = typeof v == "string" ? v : v != null ? String(v) : "";
               if (I.length === 0)
                 continue;
               if (T !== null) {
@@ -4983,13 +4993,13 @@ ${v}
       if (/multipart\/form-data/i.test(u)) {
         s.delete("Content-Type");
         const p = new FormData();
-        for (const [b, T] of Object.entries(t))
-          T == null ? p.append(b, "") : T instanceof Blob ? p.append(b, T) : Array.isArray(T) ? T.forEach((I) => p.append(b, String(I))) : typeof T == "object" ? p.append(b, JSON.stringify(T)) : p.append(b, String(T));
+        for (const [v, T] of Object.entries(t))
+          T == null ? p.append(v, "") : T instanceof Blob ? p.append(v, T) : Array.isArray(T) ? T.forEach((I) => p.append(v, String(I))) : typeof T == "object" ? p.append(v, JSON.stringify(T)) : p.append(v, String(T));
         n.body = p;
       } else if (/application\/x-www-form-urlencoded/i.test(u)) {
         const p = new URLSearchParams();
-        for (const [b, T] of Object.entries(t))
-          T !== void 0 && (T === null ? p.append(b, "") : Array.isArray(T) ? T.forEach((I) => p.append(b, String(I))) : typeof T == "object" ? p.append(b, JSON.stringify(T)) : p.append(b, String(T)));
+        for (const [v, T] of Object.entries(t))
+          T !== void 0 && (T === null ? p.append(v, "") : Array.isArray(T) ? T.forEach((I) => p.append(v, String(I))) : typeof T == "object" ? p.append(v, JSON.stringify(T)) : p.append(v, String(T)));
         n.body = p;
       } else
         s.set("Content-Type", "application/json"), n.body = JSON.stringify(t);
@@ -5681,9 +5691,9 @@ const d = class d {
       return h.id ? `#${h.id}` : h.tagName.toLowerCase();
     }, s = (l, h, u, p) => {
       if (l)
-        for (const b of Object.keys(l))
-          b in i || (i[b] = {
-            value: l[b],
+        for (const v of Object.keys(l))
+          v in i || (i[v] = {
+            value: l[v],
             source: n(h),
             kind: u,
             depth: p
@@ -5834,12 +5844,12 @@ const d = class d {
       if (l)
         return;
       const p = [];
-      return e.getChildren().forEach((b) => {
-        if (b instanceof M) {
-          if (d.canSkipUnchangedNestedEach(b))
+      return e.getChildren().forEach((v) => {
+        if (v instanceof M) {
+          if (d.canSkipUnchangedNestedEach(v))
             return;
-          p.push(d.evaluateAll(b, t));
-        } else b instanceof V && p.push(d.evaluateText(b));
+          p.push(d.evaluateAll(v, t));
+        } else v instanceof V && p.push(d.evaluateText(v));
       }), Promise.all(p).then(() => {
       });
     }).then(() => {
@@ -6308,33 +6318,33 @@ const d = class d {
     let i = e.getAttribute(`${c.prefix}each-index`);
     i && (i = String(i));
     const n = e.getAttribute(`${c.prefix}each-key`), s = e.getAttribute(`${c.prefix}each-arg`), a = /* @__PURE__ */ new Map(), o = [];
-    t.forEach((v, S) => {
+    t.forEach((b, S) => {
       const k = d.createListKey(
-        v,
+        b,
         n ? String(n) : null,
         S
       );
-      o.push(k), a.set(k, { item: v, itemIndex: S });
+      o.push(k), a.set(k, { item: b, itemIndex: S });
     });
     const l = new Set(o), h = [];
-    let u = e.getChildren().filter((v) => v instanceof M).filter(
-      (v) => !v.hasAttribute(`${c.prefix}each-before`) && !v.hasAttribute(`${c.prefix}each-after`)
+    let u = e.getChildren().filter((b) => b instanceof M).filter(
+      (b) => !b.hasAttribute(`${c.prefix}each-before`) && !b.hasAttribute(`${c.prefix}each-after`)
     );
-    const p = u.map((v) => v.getListKey());
-    u = u.filter((v) => l.has(String(v.getListKey())) ? !0 : (h.push(v.remove()), !1));
-    const b = u.map((v) => v.getListKey()), T = /* @__PURE__ */ new Map();
-    u.forEach((v) => {
-      const S = v.getListKey();
-      S !== null && !T.has(S) && T.set(S, v);
+    const p = u.map((b) => b.getListKey());
+    u = u.filter((b) => l.has(String(b.getListKey())) ? !0 : (h.push(b.remove()), !1));
+    const v = u.map((b) => b.getListKey()), T = /* @__PURE__ */ new Map();
+    u.forEach((b) => {
+      const S = b.getListKey();
+      S !== null && !T.has(S) && T.set(S, b);
     });
     const I = e.getChildElementFragments().slice(), A = I.filter(
-      (v) => v.hasAttribute(`${c.prefix}each-before`)
+      (b) => b.hasAttribute(`${c.prefix}each-before`)
     ).length;
     let y = Promise.resolve();
-    return o.forEach((v, S) => {
-      const { item: k, itemIndex: C } = a.get(v);
+    return o.forEach((b, S) => {
+      const { item: k, itemIndex: C } = a.get(b);
       let O;
-      const j = T.get(v);
+      const j = T.get(b);
       if (j)
         O = j, y = y.then(
           () => d.updateRowFragment(
@@ -6343,7 +6353,7 @@ const d = class d {
             i,
             C,
             s ? String(s) : null,
-            v
+            b
           ).then(($) => {
             if ($)
               return d.evaluateAll(O);
@@ -6359,7 +6369,7 @@ const d = class d {
             i,
             C,
             s ? String(s) : null,
-            v
+            b
           ).then(() => {
             const _ = I[$] ?? null;
             return e.insertBefore(O, _).then(() => {
@@ -6369,11 +6379,11 @@ const d = class d {
         );
       }
     }), Promise.all(h).then(() => y).then(() => {
-      const v = o.filter(
+      const b = o.filter(
         ($) => $ !== null
-      ), S = b.filter(
+      ), S = v.filter(
         ($) => $ !== null
-      ), k = new Set(S), C = v.filter(($) => !k.has($)), j = p.filter(
+      ), k = new Set(S), C = b.filter(($) => !k.has($)), j = p.filter(
         ($) => $ !== null
       ).filter(
         ($) => !l.has($)
@@ -6382,7 +6392,7 @@ const d = class d {
         e.getTarget(),
         C,
         j,
-        v
+        b
       );
     });
   }
@@ -6927,8 +6937,8 @@ const w = class w {
           return;
         let u = !1;
         l.forEach((p) => {
-          const b = p.target;
-          h.observedRows.has(b) && (p.isIntersecting ? h.visibleRows.has(b) || (h.visibleRows.add(b), u = !0) : h.visibleRows.delete(b) && (u = !0));
+          const v = p.target;
+          h.observedRows.has(v) && (p.isIntersecting ? h.visibleRows.has(v) || (h.visibleRows.add(v), u = !0) : h.visibleRows.delete(v) && (u = !0));
         }), u && w.scheduleCompute(h);
       },
       {