@jasonshimmy/custom-elements-runtime 2.5.0 → 2.5.1

package/dist/custom-elements-runtime.router.es.js

@@ -20,63 +20,63 @@ function k(o) {
   return i.startsWith("/") || (i = "/" + i), i.length > 1 && i.endsWith("/") && (i = i.slice(0, -1)), i;
 }
 function ft(o) {
-  const i = o.path || "/", s = k(i), d = s === "/" ? [] : s.split("/").filter(Boolean), h = [], l = [];
-  for (let c = 0; c < d.length; c++) {
-    const p = d[c];
+  const i = o.path || "/", s = k(i), m = s === "/" ? [] : s.split("/").filter(Boolean), h = [], l = [];
+  for (let c = 0; c < m.length; c++) {
+    const p = m[c];
     if (p === "*") {
-      if (c !== d.length - 1)
+      if (c !== m.length - 1)
         return P(
           `Route '${o.path}' contains a '*' splat in a non-terminal position; splats must be the last segment. This route will be ignored.`
         ), { invalid: !0 };
-      const g = `splat${h.length}`;
-      h.push(g), l.push("__SPLAT__");
+      const w = `splat${h.length}`;
+      h.push(w), l.push("__SPLAT__");
       continue;
     }
     const b = p.match(/^:([A-Za-z0-9_-]+)(\*)?$/);
     if (b) {
-      const g = b[1], q = !!b[2];
-      if (q && c !== d.length - 1)
+      const w = b[1], q = !!b[2];
+      if (q && c !== m.length - 1)
         return P(
-          `Route '${o.path}' contains a splat param ':${g}*' in a non-terminal position; splats must be the last segment. This route will be ignored.`
+          `Route '${o.path}' contains a splat param ':${w}*' in a non-terminal position; splats must be the last segment. This route will be ignored.`
         ), { invalid: !0 };
-      h.push(g), l.push(q ? "__SPLAT__" : "([^/]+)");
+      h.push(w), l.push(q ? "__SPLAT__" : "([^/]+)");
       continue;
     }
     l.push(ut(p));
   }
-  let m;
+  let d;
   if (l.length === 0)
-    m = "^/$";
+    d = "^/$";
   else if (l[l.length - 1] === "__SPLAT__") {
     const p = l.slice(0, -1).join("/");
-    p ? m = `^/${p}(?:/(.*))?(?:/)?$` : m = "^(?:/(.*))?(?:/)?$";
+    p ? d = `^/${p}(?:/(.*))?(?:/)?$` : d = "^(?:/(.*))?(?:/)?$";
   } else
-    m = `^/${l.join("/")}(?:/)?$`;
+    d = `^/${l.join("/")}(?:/)?$`;
   try {
-    return { regex: new RegExp(m), paramNames: h };
+    return { regex: new RegExp(d), paramNames: h };
   } catch (c) {
     return P(`Failed to compile route regex for '${o.path}': ${String(c)}`), { invalid: !0 };
   }
 }
 const M = (o, i) => {
   const s = k(i);
-  for (const d of o) {
-    let h = ot.get(d);
-    if (h || (h = ft(d), ot.set(d, h)), h.invalid) continue;
-    const { regex: l, paramNames: m } = h, c = l.exec(s);
+  for (const m of o) {
+    let h = ot.get(m);
+    if (h || (h = ft(m), ot.set(m, h)), h.invalid) continue;
+    const { regex: l, paramNames: d } = h, c = l.exec(s);
     if (c) {
-      const p = {}, b = (g) => {
+      const p = {}, b = (w) => {
         try {
-          return decodeURIComponent(g);
+          return decodeURIComponent(w);
         } catch {
-          return g;
+          return w;
         }
       };
-      for (let g = 0; g < m.length; g++) {
-        const q = c[g + 1] || "";
-        p[m[g]] = q ? b(q) : "";
+      for (let w = 0; w < d.length; w++) {
+        const q = c[w + 1] || "";
+        p[d[w]] = q ? b(q) : "";
       }
-      return { route: d, params: p };
+      return { route: m, params: p };
     }
   }
   return { route: null, params: {} };
@@ -101,22 +101,22 @@ async function ht(o) {
   throw new Error(`No component or loader defined for route: ${o.path}`);
 }
 function pt(o) {
-  const { routes: i, base: s = "", initialUrl: d, scrollToFragment: h = !0 } = o, l = (() => {
+  const { routes: i, base: s = "", initialUrl: m, scrollToFragment: h = !0 } = o, l = (() => {
     if (!s) return "";
     const r = k(s);
     return r === "/" ? "" : r;
-  })(), m = typeof h == "boolean" ? { enabled: !!h, offset: 0, timeoutMs: 2e3 } : {
+  })(), d = typeof h == "boolean" ? { enabled: !!h, offset: 0, timeoutMs: 2e3 } : {
     enabled: h.enabled ?? !0,
     offset: h.offset ?? 0,
     timeoutMs: h.timeoutMs ?? 2e3
   };
-  let c, p, b, g, q, B, D;
+  let c, p, b, w, q, B, D;
   const Y = async (r, e) => {
     const t = K(i, r.path);
     if (!t || !t.beforeEnter) return !0;
     try {
       const n = await t.beforeEnter(r, e);
-      return typeof n == "string" ? (await y(n, !0), !1) : n !== !1;
+      return typeof n == "string" ? (await g(n, !0), !1) : n !== !1;
     } catch (n) {
       return F("beforeEnter error", n), !1;
     }
@@ -125,7 +125,7 @@ function pt(o) {
     if (!t || !t.onEnter) return !0;
     try {
       const n = await t.onEnter(r, e);
-      return typeof n == "string" ? (await y(n, !0), !1) : n !== !1;
+      return typeof n == "string" ? (await g(n, !0), !1) : n !== !1;
     } catch (n) {
       return F("onEnter error", n), !1;
     }
@@ -138,7 +138,7 @@ function pt(o) {
         F("afterEnter error", n);
       }
   };
-  let w = 0, C = null, O = null, L = null;
+  let v = 0, C = null, O = null, L = null;
   async function a(r, e = 0) {
     try {
       const t = document.getElementById(r);
@@ -187,9 +187,9 @@ function pt(o) {
       O = null;
     }
   }
-  function v(r, e, t) {
-    w += 1;
-    const n = w;
+  function y(r, e, t) {
+    v += 1;
+    const n = v;
     if (L) {
       try {
         L(!1);
@@ -200,7 +200,7 @@ function pt(o) {
     return u(), new Promise((E) => {
       L = E;
       const f = (A) => {
-        if (n === w) {
+        if (n === v) {
           u();
           try {
             E(A);
@@ -210,24 +210,24 @@ function pt(o) {
         }
       };
       queueMicrotask(async () => {
-        if (n !== w) return f(!1);
+        if (n !== v) return f(!1);
         if (await a(r, e)) return f(!0);
         if (typeof window.requestAnimationFrame == "function")
           window.requestAnimationFrame(async () => {
-            if (n !== w) return f(!1);
+            if (n !== v) return f(!1);
             if (await a(r, e)) return f(!0);
-            if (n !== w) return f(!1);
+            if (n !== v) return f(!1);
             const A = document.querySelector("router-view") || document.body;
             try {
               const x = new MutationObserver(async () => {
-                n === w && await a(r, e) && f(!0);
+                n === v && await a(r, e) && f(!0);
               });
               C = x, x.observe(A, {
                 childList: !0,
                 subtree: !0,
                 attributes: !1
               }), O = window.setTimeout(() => {
-                if (n === w) {
+                if (n === v) {
                   try {
                     x.disconnect();
                   } catch {
@@ -238,7 +238,7 @@ function pt(o) {
             } catch {
               let R = 0;
               const S = async () => {
-                if (n !== w) return f(!1);
+                if (n !== v) return f(!1);
                 if (await a(r, e)) return f(!0);
                 R += 1, R < 40 ? window.setTimeout(S, 50) : f(!1);
               };
@@ -249,14 +249,14 @@ function pt(o) {
           const A = document.querySelector("router-view") || document.body;
           try {
             const x = new MutationObserver(async () => {
-              n === w && await a(r, e) && f(!0);
+              n === v && await a(r, e) && f(!0);
             });
             C = x, x.observe(A, {
               childList: !0,
               subtree: !0,
               attributes: !1
             }), O = window.setTimeout(() => {
-              if (n === w) {
+              if (n === v) {
                 try {
                   x.disconnect();
                 } catch {
@@ -267,7 +267,7 @@ function pt(o) {
           } catch {
             let R = 0;
             const S = async () => {
-              if (n !== w) return f(!1);
+              if (n !== v) return f(!1);
               if (await a(r, e)) return f(!0);
               R += 1, R < 40 ? window.setTimeout(S, 50) : f(!1);
             };
@@ -277,7 +277,7 @@ function pt(o) {
       });
     });
   }
-  const y = async (r, e = !1) => {
+  const g = async (r, e = !1) => {
     try {
       const t = r.indexOf("#"), n = t >= 0 ? r.slice(t + 1) : "", E = t >= 0 ? r.slice(0, t) : r, f = E.indexOf("?"), $ = f >= 0 ? E.slice(0, f) : E, A = f >= 0 ? Q(E.slice(f)) : {}, x = $.startsWith(l) ? $.slice(l.length) : $, R = {
         path: k(x || "/"),
@@ -299,10 +299,10 @@ function pt(o) {
       b.setState(W), Z(W, N);
       try {
         const _ = W.fragment;
-        m.enabled && _ && typeof window < "u" && typeof document < "u" && v(
+        d.enabled && _ && typeof window < "u" && typeof document < "u" && y(
           String(_),
-          m.offset,
-          m.timeoutMs
+          d.offset,
+          d.timeoutMs
         ).catch(() => {
         });
       } catch {
@@ -311,7 +311,7 @@ function pt(o) {
       F("Navigation error:", t);
     }
   };
-  if (typeof window < "u" && typeof document < "u" && typeof d > "u") {
+  if (typeof window < "u" && typeof document < "u" && typeof m > "u") {
     c = () => {
       const e = new URL(window.location.href), t = e.pathname, n = t.startsWith(l) ? t.slice(l.length) : t, E = k(n || "/"), f = Q(e.search), $ = e.hash && e.hash.length ? e.hash.slice(1) : "";
       return { path: E, query: f, fragment: $ };
@@ -322,13 +322,13 @@ function pt(o) {
       params: r.params,
       query: p.query,
       fragment: p.fragment
-    }), g = async (e = !1) => {
+    }), w = async (e = !1) => {
       const t = c();
-      await y(t.path, e);
-    }, window.addEventListener("popstate", () => g(!0)), q = (e) => y(e, !1), B = (e) => y(e, !0), D = () => window.history.back();
+      await g(t.path, e);
+    }, window.addEventListener("popstate", () => w(!0)), q = (e) => g(e, !1), B = (e) => g(e, !0), D = () => window.history.back();
   } else {
     c = () => {
-      const t = new URL(d || "/", "http://localhost"), n = t.pathname, E = n.startsWith(l) ? n.slice(l.length) : n, f = k(E || "/"), $ = Q(t.search), A = t.hash && t.hash.length ? t.hash.slice(1) : "";
+      const t = new URL(m || "/", "http://localhost"), n = t.pathname, E = n.startsWith(l) ? n.slice(l.length) : n, f = k(E || "/"), $ = Q(t.search), A = t.hash && t.hash.length ? t.hash.slice(1) : "";
       return { path: f, query: $, fragment: A };
     }, p = c();
     const r = M(i, p.path);
@@ -337,7 +337,7 @@ function pt(o) {
       params: r.params,
       query: p.query,
       fragment: p.fragment
-    }), g = async () => {
+    }), w = async () => {
       const t = c();
       await e(t.path);
     };
@@ -393,10 +393,10 @@ function pt(o) {
     // a fragment when they know their DOM is ready. Returns true if scrolled.
     scrollToFragment: (r) => {
       const e = r || b.getState().fragment;
-      return !e || typeof window > "u" || typeof document > "u" ? Promise.resolve(!1) : v(
+      return !e || typeof window > "u" || typeof document > "u" ? Promise.resolve(!1) : y(
         String(e),
-        m.offset,
-        m.timeoutMs
+        d.offset,
+        d.timeoutMs
       );
     }
   };
@@ -408,39 +408,39 @@ let G = null;
 function bt(o) {
   const i = pt(o);
   return G = i, tt("router-view", async () => {
-    const s = G || i;
-    if (!s) return z`<div>Router not initialized.</div>`;
-    const d = V(s.getCurrent());
+    const s = () => G || i;
+    if (!s()) return z`<div>Router not initialized.</div>`;
+    const m = V(s().getCurrent());
     let h;
     et(() => {
       try {
-        s && typeof s.subscribe == "function" && (h = s.subscribe((m) => {
+        s() && typeof s().subscribe == "function" && (h = s().subscribe((d) => {
           try {
-            d.value = m;
+            m.value = d;
           } catch (c) {
             P("router-view subscription update failed", c);
           }
         }));
-      } catch (m) {
-        P("router-view subscribe failed", m);
+      } catch (d) {
+        P("router-view subscribe failed", d);
       }
     }), nt(() => {
       if (typeof h == "function")
         try {
           h();
-        } catch (m) {
-          P("router-view unsubscribe failed", m);
+        } catch (d) {
+          P("router-view unsubscribe failed", d);
         }
     });
-    const l = s.matchRoute(d.value.path);
+    const l = s().matchRoute(m.value.path);
     if (!l || !l.route) return z`<div>Not found</div>`;
     try {
-      const c = await s.resolveRouteComponent(l.route);
+      const c = await s().resolveRouteComponent(l.route);
       if (typeof c == "string")
         return { tag: c, props: {}, children: [] };
       if (typeof c == "function") {
         const p = c();
-        return (p instanceof Promise ? p : Promise.resolve(p)).then((g) => typeof g == "string" ? { tag: g, props: {}, children: [] } : g);
+        return (p instanceof Promise ? p : Promise.resolve(p)).then((w) => typeof w == "string" ? { tag: w, props: {}, children: [] } : w);
       }
       return z`<div>Invalid route component</div>`;
     } catch {
@@ -460,17 +460,17 @@ function bt(o) {
       // allow host `class` and `style` attributes to be read via useProps
       class: "",
       style: ""
-    }), d = G || i, h = V(d.getCurrent());
+    }), m = () => G || i, h = V(m().getCurrent());
     let l;
     it(() => "a,button{display:inline-block;}");
-    const m = V(s.class || ""), c = V(s.style || "");
+    const d = V(s.class || ""), c = V(s.style || "");
     et((a) => {
       try {
-        d && typeof d.subscribe == "function" && (l = d.subscribe((u) => {
+        m() && typeof m().subscribe == "function" && (l = m().subscribe((u) => {
           try {
             h.value = u;
-          } catch (v) {
-            P("router-link subscription update failed", v);
+          } catch (y) {
+            P("router-link subscription update failed", y);
           }
         }));
       } catch (u) {
@@ -479,8 +479,8 @@ function bt(o) {
       try {
         const u = a?._host;
         if (u instanceof HTMLElement) {
-          const v = u.getAttribute("class"), y = u.getAttribute("style");
-          v && (m.value = v), y && (c.value = y), v !== null && u.removeAttribute("class"), y !== null && u.removeAttribute("style");
+          const y = u.getAttribute("class"), g = u.getAttribute("style");
+          y && (d.value = y), g && (c.value = g), y !== null && u.removeAttribute("class"), g !== null && u.removeAttribute("style");
         }
       } catch (u) {
         P("router-link host migration failed", u);
@@ -494,46 +494,46 @@ function bt(o) {
         }
     });
     const p = T(() => {
-      const a = d?.base ?? "", u = s.to || "";
+      const a = m().base ?? "", u = s.to || "";
       if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(u) || u.startsWith("//"))
         return !1;
-      const v = (u.split("#")[0] || "/").split("?")[0];
+      const y = (u.split("#")[0] || "/").split("?")[0];
       try {
-        let y = v;
-        a && y.startsWith(a) && (y = y.slice(a.length) || "/");
-        const r = k(h.value.path), e = k(y);
+        let g = y;
+        a && g.startsWith(a) && (g = g.slice(a.length) || "/");
+        const r = k(h.value.path), e = k(g);
         return r === e;
       } catch {
-        return h.value.path === v;
+        return h.value.path === y;
       }
     }), b = T(() => {
-      const a = d?.base ?? "", u = s.to || "";
+      const a = m().base ?? "", u = s.to || "";
       if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(u) || u.startsWith("//"))
         return !1;
-      const v = (u.split("#")[0] || "/").split("?")[0];
+      const y = (u.split("#")[0] || "/").split("?")[0];
       if (s.exact) return p.value;
       try {
-        let y = v;
-        a && y.startsWith(a) && (y = y.slice(a.length) || "/");
-        const r = k(h.value.path), e = k(y);
+        let g = y;
+        a && g.startsWith(a) && (g = g.slice(a.length) || "/");
+        const r = k(h.value.path), e = k(g);
         return e === "/" ? r === "/" : r === e ? !0 : r.startsWith(e.endsWith("/") ? e : e + "/");
       } catch {
-        return h.value && typeof h.value.path == "string" && h.value.path.startsWith(v);
+        return h.value && typeof h.value.path == "string" && h.value.path.startsWith(y);
       }
-    }), g = T(() => {
+    }), w = T(() => {
       const a = String(s.to || "");
       if (at(a)) return null;
       if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(a) || a.startsWith("//"))
         return a;
-      const [u, v] = a.split("#"), [y, r] = (u || "").split("?"), e = d?.base ?? "";
-      let t = y || "/";
+      const [u, y] = a.split("#"), [g, r] = (u || "").split("?"), e = m().base ?? "";
+      let t = g || "/";
       e && t.startsWith(e) && (t = t.slice(e.length) || "/");
       const n = k(t || "/");
-      return e + n + (r ? "?" + r : "") + (v ? "#" + v : "");
+      return e + n + (r ? "?" + r : "") + (y ? "#" + y : "");
     }), q = T(() => {
-      const u = (m && m.value || s.class || "").split(/\s+/).filter(Boolean), v = {};
-      for (const y of u) v[y] = !0;
-      return v;
+      const u = (d && d.value || s.class || "").split(/\s+/).filter(Boolean), y = {};
+      for (const g of u) y[g] = !0;
+      return y;
     }), B = T(() => ({
       ...q.value,
       [s.activeClass || "active"]: b.value,
@@ -542,7 +542,7 @@ function bt(o) {
       () => Object.keys(B.value).filter((a) => B.value[a]).join(" ")
     ), Y = T(() => s.tag || "a"), X = T(() => Y.value === "button"), Z = T(
       () => p.value ? s.ariaCurrentValue : null
-    ), w = T(() => !!s.disabled), C = T(() => {
+    ), v = T(() => !!s.disabled), C = T(() => {
       const a = String(s.to || "");
       return (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(a) || a.startsWith("//") || !!s.external) && Y.value === "a";
     }), O = T(
@@ -550,7 +550,7 @@ function bt(o) {
     ), L = (a) => {
       if (a.defaultPrevented || a.button !== 0 || a.metaKey || a.altKey || a.ctrlKey || a.shiftKey)
         return;
-      if (w.value) {
+      if (v.value) {
         a.preventDefault();
         return;
       }
@@ -563,7 +563,10 @@ function bt(o) {
         P("Blocked unsafe javascript: URI in router-link.to");
         return;
       }
-      C.value || (a.preventDefault(), s.replace ? d.replace(s.to) : d.push(s.to));
+      if (C.value) return;
+      a.preventDefault();
+      const y = m();
+      s.replace ? y.replace(s.to) : y.push(s.to);
     };
     return z`
       ${ct().when(
@@ -574,9 +577,9 @@ function bt(o) {
               class="${D.value}"
               style="${O.value || null}"
               aria-current="${Z.value}"
-              disabled="${w.value ? "" : null}"
-              aria-disabled="${w.value ? "true" : null}"
-              tabindex="${w.value ? "-1" : null}"
+              disabled="${v.value ? "" : null}"
+              aria-disabled="${v.value ? "true" : null}"
+              tabindex="${v.value ? "-1" : null}"
               @click="${L}"
             >
               <slot></slot>
@@ -585,12 +588,12 @@ function bt(o) {
     ).otherwise(z`
           <a
             part="link"
-            href="${w.value ? null : g.value}"
+            href="${v.value ? null : w.value}"
             class="${D.value}"
             style="${O.value || null}"
             aria-current="${Z.value}"
-            aria-disabled="${w.value ? "true" : null}"
-            tabindex="${w.value ? "-1" : null}"
+            aria-disabled="${v.value ? "true" : null}"
+            tabindex="${v.value ? "-1" : null}"
             target="${C.value ? "_blank" : null}"
             rel="${C.value ? "noopener noreferrer" : null}"
             @click="${L}"