@qwik.dev/router 2.0.0-beta.10 → 2.0.0-beta.11

package/lib/middleware/request-handler/index.mjs

@@ -1,164 +1,167 @@
-import { _serialize as D, _UNINITIALIZED as ye, _deserialize as ee, _verifySerializable as Se } from "@qwik.dev/core/internal";
+import { _serialize as q, _UNINITIALIZED as ye, _deserialize as te, _verifySerializable as Qe } from "@qwik.dev/core/internal";
 import "@qwik.dev/core";
-import { ServerError as F, RedirectMessage as H, RewriteMessage as we, AbortMessage as pe } from "@qwik.dev/router/middleware/request-handler";
-const ne = /* @__PURE__ */ new WeakMap(), te = "qaction", v = "qloaders", Qe = "qfunc", re = "qdata", je = "q:route";
-function Ee(e, t) {
-  const n = ae(e), r = ie(e), o = ae(t), i = ie(t);
-  return Re(e, n, r, t, o, i);
+import { ServerError as D, RedirectMessage as H, RewriteMessage as we, AbortMessage as pe } from "@qwik.dev/router/middleware/request-handler";
+const re = /* @__PURE__ */ new WeakMap(), ie = "qaction", J = "qloaders", Ee = "qfunc", oe = "qdata", je = "q:route";
+function ze(e, n) {
+  const t = ce(e), r = ae(e), i = ce(n), o = ae(n);
+  return Re(e, t, r, n, i, o);
 }
-function Re(e, t, n, r, o, i) {
+function Re(e, n, t, r, i, o) {
   if (r.startsWith("/build/"))
     return null;
   let a = null;
-  for (; t < n; ) {
-    const s = e.charCodeAt(t++), c = r.charCodeAt(o++);
-    if (s === 91) {
-      const f = be(e, t), l = t + (f ? 3 : 0), u = B(
+  for (; n < t; ) {
+    const c = e.charCodeAt(n++), s = r.charCodeAt(i++);
+    if (c === 91) {
+      const l = be(e, n), f = n + (l ? 3 : 0), u = z(
         e,
-        l,
-        n,
+        f,
+        t,
         93
         /* CLOSE_BRACKET */
-      ), h = e.substring(l, u), y = B(
+      ), m = e.substring(f, u), p = z(
         e,
         u + 1,
-        n,
+        t,
         47
         /* SLASH */
-      ), w = e.substring(u + 1, y);
-      t = u + 1;
-      const R = o - 1;
-      if (f) {
-        const M = ze(
-          h,
-          w,
+      ), g = e.substring(u + 1, p);
+      n = u + 1;
+      const w = i - 1;
+      if (l) {
+        const R = Be(
+          m,
+          g,
           r,
-          R,
-          i,
+          w,
+          o,
           e,
-          t + w.length + 1,
-          n
+          n + g.length + 1,
+          t
         );
-        if (M)
-          return Object.assign(a || (a = {}), M);
+        if (R)
+          return Object.assign(a || (a = {}), R);
       }
-      const p = B(r, R, i, 47, w);
-      if (p == -1)
+      const b = z(r, w, o, 47, g);
+      if (b == -1)
         return null;
-      const T = r.substring(R, p);
-      if (!f && !w && !T)
+      const M = r.substring(w, b);
+      if (!l && !g && !M)
         return null;
-      o = p, (a || (a = {}))[h] = decodeURIComponent(T);
-    } else if (s !== c && !(isNaN(c) && Ge(e, t)))
+      i = b, (a || (a = {}))[m] = decodeURIComponent(M);
+    } else if (c !== s && !(isNaN(s) && Ge(e, n)))
       return null;
   }
-  return oe(e, t) && oe(r, o) ? a || {} : null;
+  return se(e, n) && se(r, i) ? a || {} : null;
 }
-function Ge(e, t) {
-  return e.charCodeAt(t) === 91 && be(e, t + 1);
+function Ge(e, n) {
+  return e.charCodeAt(n) === 91 && be(e, n + 1);
 }
-function ie(e) {
-  const t = e.length;
-  return t > 1 && e.charCodeAt(t - 1) === 47 ? t - 1 : t;
-}
-function oe(e, t) {
+function ae(e) {
   const n = e.length;
-  return t >= n || t == n - 1 && e.charCodeAt(t) === 47;
+  return n > 1 && e.charCodeAt(n - 1) === 47 ? n - 1 : n;
 }
-function ae(e) {
+function se(e, n) {
+  const t = e.length;
+  return n >= t || n == t - 1 && e.charCodeAt(n) === 47;
+}
+function ce(e) {
   return e.charCodeAt(0) === 47 ? 1 : 0;
 }
-function be(e, t) {
-  return e.charCodeAt(t) === 46 && e.charCodeAt(t + 1) === 46 && e.charCodeAt(t + 2) === 46;
+function be(e, n) {
+  return e.charCodeAt(n) === 46 && e.charCodeAt(n + 1) === 46 && e.charCodeAt(n + 2) === 46;
 }
-function B(e, t, n, r, o = "") {
-  for (; t < n && e.charCodeAt(t) !== r; )
-    t++;
-  const i = o.length;
-  for (let a = 0; a < i; a++)
-    if (e.charCodeAt(t - i + a) !== o.charCodeAt(a))
+function z(e, n, t, r, i = "") {
+  for (; n < t && e.charCodeAt(n) !== r; )
+    n++;
+  const o = i.length;
+  for (let a = 0; a < o; a++)
+    if (e.charCodeAt(n - o + a) !== i.charCodeAt(a))
       return -1;
-  return t - i;
+  return n - o;
 }
-function ze(e, t, n, r, o, i, a, s) {
-  n.charCodeAt(r) === 47 && r++;
-  let c = o;
-  const f = t + "/";
-  for (; c >= r; ) {
-    const l = Re(i, a, s, n, c, o);
-    if (l) {
-      let h = n.substring(r, Math.min(c, o));
-      return h.endsWith(f) && (h = h.substring(0, h.length - f.length)), l[e] = decodeURIComponent(h), l;
+function Be(e, n, t, r, i, o, a, c) {
+  t.charCodeAt(r) === 47 && r++;
+  let s = i;
+  const l = n + "/";
+  for (; s >= r; ) {
+    const f = Re(o, a, c, t, s, i);
+    if (f) {
+      let m = t.substring(r, Math.min(s, i));
+      return m.endsWith(l) && (m = m.substring(0, m.length - l.length)), f[e] = decodeURIComponent(m), f;
     }
-    const u = Be(n, r, f, c, r - 1) + f.length;
-    if (c === u)
+    const u = Ke(t, r, l, s, r - 1) + l.length;
+    if (s === u)
       break;
-    c = u;
+    s = u;
   }
   return null;
 }
-function Be(e, t, n, r, o) {
-  let i = e.lastIndexOf(n, r);
-  return i == r - n.length && (i = e.lastIndexOf(n, r - n.length - 1)), i > t ? i : o;
+function Ke(e, n, t, r, i) {
+  let o = e.lastIndexOf(t, r);
+  return o == r - t.length && (o = e.lastIndexOf(t, r - t.length - 1)), o > n ? o : i;
 }
-var k = /* @__PURE__ */ ((e) => (e[e.RouteName = 0] = "RouteName", e[e.Loaders = 1] = "Loaders", e[e.OriginalPathname = 2] = "OriginalPathname", e[e.RouteBundleNames = 3] = "RouteBundleNames", e))(k || {}), $ = /* @__PURE__ */ ((e) => (e[e.Pathname = 0] = "Pathname", e[e.MenuLoader = 1] = "MenuLoader", e))($ || {}), L = /* @__PURE__ */ ((e) => (e[e.RouteName = 0] = "RouteName", e[e.Params = 1] = "Params", e[e.Mods = 2] = "Mods", e[e.Menu = 3] = "Menu", e[e.RouteBundleNames = 4] = "RouteBundleNames", e))(L || {});
-const Ae = (e) => e == null ? e : (Object.getOwnPropertyNames(e).forEach((t) => {
-  const n = e[t];
-  n && typeof n == "object" && !Object.isFrozen(n) && Ae(n);
-}), Object.freeze(e)), Ke = async (e, t, n, r) => {
+var W = /* @__PURE__ */ ((e) => (e[e.RouteName = 0] = "RouteName", e[e.Loaders = 1] = "Loaders", e[e.OriginalPathname = 2] = "OriginalPathname", e[e.RouteBundleNames = 3] = "RouteBundleNames", e))(W || {}), $ = /* @__PURE__ */ ((e) => (e[e.Pathname = 0] = "Pathname", e[e.MenuLoader = 1] = "MenuLoader", e))($ || {}), L = /* @__PURE__ */ ((e) => (e[e.RouteName = 0] = "RouteName", e[e.Params = 1] = "Params", e[e.Mods = 2] = "Mods", e[e.Menu = 3] = "Menu", e[e.RouteBundleNames = 4] = "RouteBundleNames", e))(L || {});
+const Ae = (e) => e == null ? e : (Object.getOwnPropertyNames(e).forEach((n) => {
+  const t = e[n];
+  t && typeof t == "object" && !Object.isFrozen(t) && Ae(t);
+}), Object.freeze(e)), ve = async (e, n, t, r, i) => {
   if (!Array.isArray(e))
     return null;
   for (const o of e) {
-    const i = o[k.RouteName], a = Ee(i, r);
-    if (!a)
+    const a = o[W.RouteName], c = ze(a, r);
+    if (!c)
       continue;
-    const s = o[k.Loaders], c = o[k.RouteBundleNames], f = new Array(s.length), l = [];
-    s.forEach((y, w) => {
-      se(
-        y,
-        l,
-        (R) => f[w] = R,
-        n
+    const s = o[W.Loaders], l = o[W.RouteBundleNames], f = new Array(s.length), u = [];
+    s.forEach((p, g) => {
+      le(
+        p,
+        u,
+        (w) => f[g] = w,
+        t
       );
     });
-    const u = Je(t, r);
-    let h;
-    return se(
-      u,
-      l,
-      (y) => h = y?.default,
-      n
-    ), l.length > 0 && await Promise.all(l), [i, a, f, Ae(h), c];
+    let m;
+    if (!i) {
+      const p = Je(n, r);
+      le(
+        p,
+        u,
+        (g) => m = g?.default,
+        t
+      );
+    }
+    return u.length > 0 && await Promise.all(u), [a, c, f, Ae(m), l];
   }
   return null;
-}, se = (e, t, n, r) => {
+}, le = (e, n, t, r) => {
   if (typeof e == "function") {
-    const o = ne.get(e);
-    if (o)
-      n(o);
+    const i = re.get(e);
+    if (i)
+      t(i);
     else {
-      const i = e();
-      typeof i.then == "function" ? t.push(
-        i.then((a) => {
-          r !== !1 && ne.set(e, a), n(a);
+      const o = e();
+      typeof o.then == "function" ? n.push(
+        o.then((a) => {
+          r !== !1 && re.set(e, a), t(a);
         })
-      ) : i && n(i);
+      ) : o && t(o);
     }
   }
-}, Je = (e, t) => {
+}, Je = (e, n) => {
   if (e) {
-    t = t.endsWith("/") ? t : t + "/";
-    const n = e.find(
-      (r) => r[$.Pathname] === t || t.startsWith(r[$.Pathname] + (t.endsWith("/") ? "" : "/"))
+    n = n.endsWith("/") ? n : n + "/";
+    const t = e.find(
+      (r) => r[$.Pathname] === n || n.startsWith(r[$.Pathname])
     );
-    if (n)
-      return n[$.MenuLoader];
+    if (t)
+      return t[$.MenuLoader];
   }
 };
-var V = /* @__PURE__ */ ((e) => (e[e.Continue = 100] = "Continue", e[e.SwitchingProtocols = 101] = "SwitchingProtocols", e[e.Processing = 102] = "Processing", e[e.Ok = 200] = "Ok", e[e.Created = 201] = "Created", e[e.Accepted = 202] = "Accepted", e[e.NonAuthoritativeInformation = 203] = "NonAuthoritativeInformation", e[e.NoContent = 204] = "NoContent", e[e.ResetContent = 205] = "ResetContent", e[e.PartialContent = 206] = "PartialContent", e[e.MultiStatus = 207] = "MultiStatus", e[e.AlreadyReported = 208] = "AlreadyReported", e[e.ImUsed = 226] = "ImUsed", e[e.MultipleChoices = 300] = "MultipleChoices", e[e.MovedPermanently = 301] = "MovedPermanently", e[e.Found = 302] = "Found", e[e.SeeOther = 303] = "SeeOther", e[e.NotModified = 304] = "NotModified", e[e.UseProxy = 305] = "UseProxy", e[e.SwitchProxy = 306] = "SwitchProxy", e[e.TemporaryRedirect = 307] = "TemporaryRedirect", e[e.PermanentRedirect = 308] = "PermanentRedirect", e[e.BadRequest = 400] = "BadRequest", e[e.Unauthorized = 401] = "Unauthorized", e[e.PaymentRequired = 402] = "PaymentRequired", e[e.Forbidden = 403] = "Forbidden", e[e.NotFound = 404] = "NotFound", e[e.MethodNotAllowed = 405] = "MethodNotAllowed", e[e.NotAcceptable = 406] = "NotAcceptable", e[e.ProxyAuthenticationRequired = 407] = "ProxyAuthenticationRequired", e[e.RequestTimeout = 408] = "RequestTimeout", e[e.Conflict = 409] = "Conflict", e[e.Gone = 410] = "Gone", e[e.LengthRequired = 411] = "LengthRequired", e[e.PreconditionFailed = 412] = "PreconditionFailed", e[e.PayloadTooLarge = 413] = "PayloadTooLarge", e[e.UriTooLong = 414] = "UriTooLong", e[e.UnsupportedMediaType = 415] = "UnsupportedMediaType", e[e.RangeNotSatisfiable = 416] = "RangeNotSatisfiable", e[e.ExpectationFailed = 417] = "ExpectationFailed", e[e.IAmATeapot = 418] = "IAmATeapot", e[e.MisdirectedRequest = 421] = "MisdirectedRequest", e[e.UnprocessableEntity = 422] = "UnprocessableEntity", e[e.Locked = 423] = "Locked", e[e.FailedDependency = 424] = "FailedDependency", e[e.UpgradeRequired = 426] = "UpgradeRequired", e[e.PreconditionRequired = 428] = "PreconditionRequired", e[e.TooManyRequests = 429] = "TooManyRequests", e[e.RequestHeaderFieldsTooLarge = 431] = "RequestHeaderFieldsTooLarge", e[e.UnavailableForLegalReasons = 451] = "UnavailableForLegalReasons", e[e.InternalServerError = 500] = "InternalServerError", e[e.NotImplemented = 501] = "NotImplemented", e[e.BadGateway = 502] = "BadGateway", e[e.ServiceUnavailable = 503] = "ServiceUnavailable", e[e.GatewayTimeout = 504] = "GatewayTimeout", e[e.HttpVersionNotSupported = 505] = "HttpVersionNotSupported", e[e.VariantAlsoNegotiates = 506] = "VariantAlsoNegotiates", e[e.InsufficientStorage = 507] = "InsufficientStorage", e[e.LoopDetected = 508] = "LoopDetected", e[e.NotExtended = 510] = "NotExtended", e[e.NetworkAuthenticationRequired = 511] = "NetworkAuthenticationRequired", e))(V || {});
+var Y = /* @__PURE__ */ ((e) => (e[e.Continue = 100] = "Continue", e[e.SwitchingProtocols = 101] = "SwitchingProtocols", e[e.Processing = 102] = "Processing", e[e.Ok = 200] = "Ok", e[e.Created = 201] = "Created", e[e.Accepted = 202] = "Accepted", e[e.NonAuthoritativeInformation = 203] = "NonAuthoritativeInformation", e[e.NoContent = 204] = "NoContent", e[e.ResetContent = 205] = "ResetContent", e[e.PartialContent = 206] = "PartialContent", e[e.MultiStatus = 207] = "MultiStatus", e[e.AlreadyReported = 208] = "AlreadyReported", e[e.ImUsed = 226] = "ImUsed", e[e.MultipleChoices = 300] = "MultipleChoices", e[e.MovedPermanently = 301] = "MovedPermanently", e[e.Found = 302] = "Found", e[e.SeeOther = 303] = "SeeOther", e[e.NotModified = 304] = "NotModified", e[e.UseProxy = 305] = "UseProxy", e[e.SwitchProxy = 306] = "SwitchProxy", e[e.TemporaryRedirect = 307] = "TemporaryRedirect", e[e.PermanentRedirect = 308] = "PermanentRedirect", e[e.BadRequest = 400] = "BadRequest", e[e.Unauthorized = 401] = "Unauthorized", e[e.PaymentRequired = 402] = "PaymentRequired", e[e.Forbidden = 403] = "Forbidden", e[e.NotFound = 404] = "NotFound", e[e.MethodNotAllowed = 405] = "MethodNotAllowed", e[e.NotAcceptable = 406] = "NotAcceptable", e[e.ProxyAuthenticationRequired = 407] = "ProxyAuthenticationRequired", e[e.RequestTimeout = 408] = "RequestTimeout", e[e.Conflict = 409] = "Conflict", e[e.Gone = 410] = "Gone", e[e.LengthRequired = 411] = "LengthRequired", e[e.PreconditionFailed = 412] = "PreconditionFailed", e[e.PayloadTooLarge = 413] = "PayloadTooLarge", e[e.UriTooLong = 414] = "UriTooLong", e[e.UnsupportedMediaType = 415] = "UnsupportedMediaType", e[e.RangeNotSatisfiable = 416] = "RangeNotSatisfiable", e[e.ExpectationFailed = 417] = "ExpectationFailed", e[e.IAmATeapot = 418] = "IAmATeapot", e[e.MisdirectedRequest = 421] = "MisdirectedRequest", e[e.UnprocessableEntity = 422] = "UnprocessableEntity", e[e.Locked = 423] = "Locked", e[e.FailedDependency = 424] = "FailedDependency", e[e.UpgradeRequired = 426] = "UpgradeRequired", e[e.PreconditionRequired = 428] = "PreconditionRequired", e[e.TooManyRequests = 429] = "TooManyRequests", e[e.RequestHeaderFieldsTooLarge = 431] = "RequestHeaderFieldsTooLarge", e[e.UnavailableForLegalReasons = 451] = "UnavailableForLegalReasons", e[e.InternalServerError = 500] = "InternalServerError", e[e.NotImplemented = 501] = "NotImplemented", e[e.BadGateway = 502] = "BadGateway", e[e.ServiceUnavailable = 503] = "ServiceUnavailable", e[e.GatewayTimeout = 504] = "GatewayTimeout", e[e.HttpVersionNotSupported = 505] = "HttpVersionNotSupported", e[e.VariantAlsoNegotiates = 506] = "VariantAlsoNegotiates", e[e.InsufficientStorage = 507] = "InsufficientStorage", e[e.LoopDetected = 508] = "LoopDetected", e[e.NotExtended = 510] = "NotExtended", e[e.NetworkAuthenticationRequired = 511] = "NetworkAuthenticationRequired", e))(Y || {});
 const Ye = (e) => e && typeof e.then == "function";
-function ve(e) {
-  const t = [];
+function Ve(e) {
+  const n = [];
   return e === "day" ? e = 3600 * 24 : e === "week" ? e = 3600 * 24 * 7 : e === "month" ? e = 3600 * 24 * 30 : e === "year" ? e = 3600 * 24 * 365 : e === "private" ? e = {
     private: !0,
     noCache: !0
@@ -171,64 +174,64 @@ function ve(e) {
   }), typeof e == "number" && (e = {
     maxAge: e,
     sMaxAge: e
-  }), e.immutable && t.push("immutable"), e.maxAge && t.push(`max-age=${e.maxAge}`), e.sMaxAge && t.push(`s-maxage=${e.sMaxAge}`), e.noStore && t.push("no-store"), e.noCache && t.push("no-cache"), e.private && t.push("private"), e.public && t.push("public"), e.staleWhileRevalidate && t.push(`stale-while-revalidate=${e.staleWhileRevalidate}`), e.staleIfError && t.push(`stale-if-error=${e.staleIfError}`), t.join(", ");
+  }), e.immutable && n.push("immutable"), e.maxAge && n.push(`max-age=${e.maxAge}`), e.sMaxAge && n.push(`s-maxage=${e.sMaxAge}`), e.noStore && n.push("no-store"), e.noCache && n.push("no-cache"), e.private && n.push("private"), e.public && n.push("public"), e.staleWhileRevalidate && n.push(`stale-while-revalidate=${e.staleWhileRevalidate}`), e.staleIfError && n.push(`stale-if-error=${e.staleIfError}`), n.join(", ");
 }
-const Ve = {
+const Xe = {
   lax: "Lax",
   Lax: "Lax",
   None: "None",
   none: "None",
   strict: "Strict",
   Strict: "Strict"
-}, Xe = {
+}, Ze = {
   seconds: 1,
   minutes: 60,
   hours: 3600,
   days: 3600 * 24,
   weeks: 3600 * 24 * 7
-}, ce = (e, t, n) => {
-  const r = [`${e}=${t}`];
-  typeof n.domain == "string" && r.push(`Domain=${n.domain}`), typeof n.maxAge == "number" ? r.push(`Max-Age=${n.maxAge}`) : Array.isArray(n.maxAge) ? r.push(`Max-Age=${n.maxAge[0] * Xe[n.maxAge[1]]}`) : typeof n.expires == "number" || typeof n.expires == "string" ? r.push(`Expires=${n.expires}`) : n.expires instanceof Date && r.push(`Expires=${n.expires.toUTCString()}`), n.httpOnly && r.push("HttpOnly"), typeof n.path == "string" && r.push(`Path=${n.path}`);
-  const o = He(n.sameSite);
-  return o && r.push(`SameSite=${o}`), n.secure && r.push("Secure"), r.join("; ");
+}, de = (e, n, t) => {
+  const r = [`${e}=${n}`];
+  typeof t.domain == "string" && r.push(`Domain=${t.domain}`), typeof t.maxAge == "number" ? r.push(`Max-Age=${t.maxAge}`) : Array.isArray(t.maxAge) ? r.push(`Max-Age=${t.maxAge[0] * Ze[t.maxAge[1]]}`) : typeof t.expires == "number" || typeof t.expires == "string" ? r.push(`Expires=${t.expires}`) : t.expires instanceof Date && r.push(`Expires=${t.expires.toUTCString()}`), t.httpOnly && r.push("HttpOnly"), typeof t.path == "string" && r.push(`Path=${t.path}`);
+  const i = en(t.sameSite);
+  return i && r.push(`SameSite=${i}`), t.secure && r.push("Secure"), r.join("; ");
 };
-function le(e) {
+function fe(e) {
   try {
     return decodeURIComponent(e);
   } catch {
     return e;
   }
 }
-const Ze = (e) => {
-  const t = {};
+const He = (e) => {
+  const n = {};
   if (typeof e == "string" && e !== "") {
-    const n = e.split(";");
-    for (const r of n) {
-      const o = r.indexOf("=");
-      o !== -1 && (t[le(r.slice(0, o).trim())] = le(r.slice(o + 1).trim()));
+    const t = e.split(";");
+    for (const r of t) {
+      const i = r.indexOf("=");
+      i !== -1 && (n[fe(r.slice(0, i).trim())] = fe(r.slice(i + 1).trim()));
     }
   }
-  return t;
+  return n;
 };
-function He(e) {
+function en(e) {
   if (e === !0)
     return "Strict";
   if (e === !1)
     return "None";
   if (e)
-    return Ve[e];
+    return Xe[e];
 }
-const x = Symbol("request-cookies"), q = Symbol("response-cookies"), _ = Symbol("live-cookies");
-class en {
+const x = Symbol("request-cookies"), k = Symbol("response-cookies"), T = Symbol("live-cookies");
+class nn {
   [x];
-  [q] = {};
-  [_] = {};
+  [k] = {};
+  [T] = {};
   appendCounter = 0;
-  constructor(t) {
-    this[x] = Ze(t), this[_] = { ...this[x] };
+  constructor(n) {
+    this[x] = He(n), this[T] = { ...this[x] };
   }
-  get(t, n = !0) {
-    const r = this[n ? _ : x][t];
+  get(n, t = !0) {
+    const r = this[t ? T : x][n];
     return r ? {
       value: r,
       json() {
@@ -239,71 +242,71 @@ class en {
       }
     } : null;
   }
-  getAll(t = !0) {
-    return Object.keys(this[t ? _ : x]).reduce(
-      (n, r) => (n[r] = this.get(r), n),
+  getAll(n = !0) {
+    return Object.keys(this[n ? T : x]).reduce(
+      (t, r) => (t[r] = this.get(r), t),
       {}
     );
   }
-  has(t, n = !0) {
-    return !!this[n ? _ : x][t];
+  has(n, t = !0) {
+    return !!this[t ? T : x][n];
   }
-  set(t, n, r = {}) {
-    this[_][t] = typeof n == "string" ? n : JSON.stringify(n);
-    const o = typeof n == "string" ? n : encodeURIComponent(JSON.stringify(n));
-    this[q][t] = ce(t, o, r);
+  set(n, t, r = {}) {
+    this[T][n] = typeof t == "string" ? t : JSON.stringify(t);
+    const i = typeof t == "string" ? t : encodeURIComponent(JSON.stringify(t));
+    this[k][n] = de(n, i, r);
   }
-  append(t, n, r = {}) {
-    this[_][t] = typeof n == "string" ? n : JSON.stringify(n);
-    const o = typeof n == "string" ? n : encodeURIComponent(JSON.stringify(n));
-    this[q][++this.appendCounter] = ce(
-      t,
-      o,
+  append(n, t, r = {}) {
+    this[T][n] = typeof t == "string" ? t : JSON.stringify(t);
+    const i = typeof t == "string" ? t : encodeURIComponent(JSON.stringify(t));
+    this[k][++this.appendCounter] = de(
+      n,
+      i,
       r
     );
   }
-  delete(t, n) {
-    this.set(t, "deleted", { ...n, maxAge: 0 }), this[_][t] = null;
+  delete(n, t) {
+    this.set(n, "deleted", { ...t, maxAge: 0 }), this[T][n] = null;
   }
   headers() {
-    return Object.values(this[q]);
+    return Object.values(this[k]);
   }
 }
-const Un = (e, t) => {
-  const n = t.headers();
-  if (n.length > 0) {
+const kn = (e, n) => {
+  const t = n.headers();
+  if (t.length > 0) {
     const r = new Headers(e);
-    for (const o of n)
-      r.append("Set-Cookie", o);
+    for (const i of t)
+      r.append("Set-Cookie", i);
     return r;
   }
   return e;
 };
-function K(e, t) {
-  let n = "Server Error";
-  return t != null && (typeof t.message == "string" ? n = t.message : n = String(t)), "<html>" + _e(e, n) + "</html>";
+function G(e, n) {
+  let t = "Server Error";
+  return n != null && (typeof n.message == "string" ? t = n.message : t = String(n)), "<html>" + _e(e, t) + "</html>";
 }
-function _e(e, t) {
-  typeof e != "number" && (e = 500), typeof t == "string" ? t = tn(t) : t = "";
-  const n = typeof t == "string" ? "600px" : "300px", r = e >= 500 ? on : rn;
+function _e(e, n) {
+  typeof e != "number" && (e = 500), typeof n == "string" ? n = rn(n) : n = "";
+  const t = typeof n == "string" ? "600px" : "300px", r = e >= 500 ? an : on;
   return `
 <head>
   <meta charset="utf-8">
   <meta http-equiv="Status" content="${e}">
-  <title>${e} ${t}</title>
+  <title>${e} ${n}</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
     body { color: ${r}; background-color: #fafafa; padding: 30px; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif; }
-    p { max-width: ${n}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${r}; overflow: hidden; }
+    p { max-width: ${t}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${r}; overflow: hidden; }
     strong { display: inline-block; padding: 15px; background: ${r}; color: white; }
     span { display: inline-block; padding: 15px; }
   </style>
 </head>
-<body><p><strong>${e}</strong> <span>${t}</span></p></body>
+<body><p><strong>${e}</strong> <span>${n}</span></p></body>
 `;
 }
-const nn = /[&<>]/g, tn = (e) => e.replace(nn, (t) => {
-  switch (t) {
+const tn = /[&<>]/g, rn = (e) => e.replace(tn, (n) => {
+  switch (n) {
     case "&":
       return "&amp;";
     case "<":
@@ -313,146 +316,147 @@ const nn = /[&<>]/g, tn = (e) => e.replace(nn, (t) => {
     default:
       return "";
   }
-}), rn = "#006ce9", on = "#713fc2";
-let S;
+}), on = "#006ce9", an = "#713fc2";
+let F;
 import("node:async_hooks").then((e) => {
-  const t = e.AsyncLocalStorage;
-  S = new t(), globalThis.qcAsyncRequestStore = S;
+  const n = e.AsyncLocalStorage;
+  F = new n(), globalThis.qcAsyncRequestStore = F;
 }).catch((e) => {
   console.warn(
     "AsyncLocalStorage not available, continuing without it. This might impact concurrent server calls.",
     e
   );
 });
-function an(e, t, n, r, o = "/") {
-  let i;
-  const a = new Promise((c) => i = c), s = cn(
+function sn(e, n, t, r, i = "/") {
+  let o;
+  const a = new Promise((s) => o = s), c = ln(
     e,
-    t,
     n,
-    o,
-    i
+    t,
+    i,
+    o
   );
   return {
     response: a,
-    requestEv: s,
-    completion: S ? S.run(s, de, s, r, i) : de(s, r, i)
+    requestEv: c,
+    completion: F ? F.run(c, ue, c, r, o) : ue(c, r, o)
   };
 }
-async function de(e, t, n) {
+async function ue(e, n, t) {
   try {
     ((a) => new URL(a.pathname + a.search, a))(e.originalUrl);
   } catch {
     const a = "Resource Not Found";
     e.status(404);
-    const s = K(404, a);
-    return e.html(404, s), new F(404, a);
+    const c = G(404, a);
+    return e.html(404, c), new D(404, a);
   }
   let r = 1;
-  async function o() {
+  async function i() {
     try {
       await e.next();
-    } catch (i) {
-      if (i instanceof H)
+    } catch (o) {
+      if (o instanceof H)
         await e.getWritableStream().close();
-      else if (i instanceof we) {
+      else if (o instanceof we) {
         if (r > 50)
           throw new Error("Infinite rewrite loop");
         r += 1;
         const a = new URL(e.url);
-        a.pathname = i.pathname;
-        const { loadedRoute: s, requestHandlers: c } = await t(a);
-        return e.resetRoute(s, c, a), await o();
-      } else if (i instanceof F) {
+        a.pathname = o.pathname;
+        const { loadedRoute: c, requestHandlers: s } = await n(a);
+        return e.resetRoute(c, s, a), await i();
+      } else if (o instanceof D) {
         if (!e.headersSent) {
-          const a = i.status, s = e.request.headers.get("Accept");
-          if (s && !s.includes("text/html"))
-            e.headers.set("Content-Type", "application/qwik-json"), e.send(a, await D([i.data]));
+          const a = o.status, c = e.request.headers.get("Accept");
+          if (c && !c.includes("text/html"))
+            e.headers.set("Content-Type", "application/qwik-json"), e.send(a, await q([o.data]));
           else {
-            const c = K(i.status, i.data);
-            e.html(a, c);
+            const s = G(o.status, o.data);
+            e.html(a, s);
           }
         }
-      } else if (!(i instanceof pe)) {
-        if (P(e) !== "dev")
+      } else if (!(o instanceof pe)) {
+        if (I(e) !== "dev")
           try {
             e.headersSent || (e.headers.set("content-type", "text/html; charset=utf-8"), e.cacheControl({ noCache: !0 }), e.status(500));
             const a = e.getWritableStream();
             if (!a.locked) {
-              const s = a.getWriter();
-              await s.write(E.encode(K(500, "Internal Server Error"))), await s.close();
+              const c = a.getWriter();
+              await c.write(E.encode(G(500, "Internal Server Error"))), await c.close();
             }
           } catch {
             console.error("Unable to render error page");
           }
-        return i;
+        return o;
       }
     }
   }
   try {
-    return await o();
+    return await i();
   } finally {
-    e.isDirty() || n(null);
+    e.isDirty() || t(null);
   }
 }
-function fe(e) {
-  if (e.endsWith(C)) {
-    const t = e.length - Te + (globalThis.__NO_TRAILING_SLASH__ ? 0 : 1);
+function V(e) {
+  const n = e.endsWith(C);
+  if (n) {
+    const t = e.length - C.length + (globalThis.__NO_TRAILING_SLASH__ ? 0 : 1);
     e = e.slice(0, t), e === "" && (e = "/");
   }
-  return e;
+  return { pathname: e, isInternal: n };
 }
-const O = "@isQData", C = "/q-data.json", Te = C.length, Me = Symbol("RequestEvLoaders"), Ne = Symbol("RequestEvMode"), xe = Symbol("RequestEvRoute"), Ce = Symbol(
+const ee = "@isQData", C = "/q-data.json", Te = Symbol("RequestEvLoaders"), Me = Symbol("RequestEvMode"), Ne = Symbol("RequestEvRoute"), xe = Symbol(
   "RequestEvLoaderSerializationStrategyMap"
-), Pe = "@routeName", j = "@actionId", Ie = "@actionFormData", sn = "@nonce", Le = "@rewrite", X = "@serverTiming", Oe = "qData";
-function cn(e, t, n, r, o) {
-  const { request: i, platform: a, env: s } = e, c = /* @__PURE__ */ new Map(), f = new en(i.headers.get("cookie")), l = new Headers(), u = new URL(i.url);
-  u.pathname.endsWith(C) && (u.pathname = u.pathname.slice(0, -Te), !globalThis.__NO_TRAILING_SLASH__ && !u.pathname.endsWith("/") && (u.pathname += "/"), c.set(O, !0));
-  let h = -1, y = null, w, R = e.locale, p = 200;
-  const T = async () => {
-    for (h++; h < n.length; ) {
-      const d = n[h], m = globalThis.qcAsyncRequestStore, g = m?.run ? m.run(b, d, b) : d(b);
-      Ye(g) && await g, h++;
+), Ce = "@routeName", Q = "@actionId", Ie = "@actionFormData", cn = "@nonce", Pe = "@rewrite", X = "@serverTiming", Le = "qData";
+function ln(e, n, t, r, i) {
+  const { request: o, platform: a, env: c } = e, s = /* @__PURE__ */ new Map(), l = new nn(o.headers.get("cookie")), f = new Headers(), u = new URL(o.url), { pathname: m, isInternal: p } = V(u.pathname);
+  p && (u.pathname = m, s.set(ee, !0));
+  let g = -1, w = null, b, M = e.locale, R = 200;
+  const qe = async () => {
+    for (g++; g < t.length; ) {
+      const d = t[g], h = d(A);
+      Ye(h) && await h, g++;
     }
-  }, M = (d, m, g = u) => {
-    t = d, n = m, u.pathname = g.pathname, u.search = g.search, h = -1;
+  }, De = (d, h, y = u) => {
+    n = d, t = h, u.pathname = y.pathname, u.search = y.search, g = -1;
   }, N = () => {
-    if (y !== null)
+    if (w !== null)
       throw new Error("Response already sent");
-  }, W = (d, m) => {
+  }, U = (d, h) => {
     if (N(), typeof d == "number") {
-      p = d;
-      const A = b.getWritableStream().getWriter();
-      A.write(typeof m == "string" ? E.encode(m) : m), A.close();
-    } else if (p = d.status, d.headers.forEach((g, A) => {
-      A.toLowerCase() !== "set-cookie" && l.append(A, g);
-    }), d.headers.getSetCookie().forEach((g) => {
-      const A = g.indexOf("=");
-      if (A === -1)
+      R = d;
+      const _ = A.getWritableStream().getWriter();
+      _.write(typeof h == "string" ? E.encode(h) : h), _.close();
+    } else if (R = d.status, d.headers.forEach((y, _) => {
+      _.toLowerCase() !== "set-cookie" && f.append(_, y);
+    }), d.headers.getSetCookie().forEach((y) => {
+      const _ = y.indexOf("=");
+      if (_ === -1)
         return;
-      const De = g.slice(0, A).trim(), Fe = g.slice(A + 1).trim();
-      f.set(De, Fe);
+      const Fe = y.slice(0, _).trim(), Se = y.slice(_ + 1).trim();
+      l.set(Fe, Se);
     }), d.body) {
-      const g = b.getWritableStream();
-      d.body.pipeTo(g);
+      const y = A.getWritableStream();
+      d.body.pipeTo(y);
     } else
-      b.getWritableStream().getWriter().close();
-    return z();
-  }, z = () => (h = ue, new pe()), I = {}, b = {
-    [Me]: I,
-    [Ce]: /* @__PURE__ */ new Map(),
-    [Ne]: e.mode,
-    get [xe]() {
-      return t;
+      A.getWritableStream().getWriter().close();
+    return ne();
+  }, ne = () => (g = B, new pe()), P = {}, A = {
+    [Te]: P,
+    [xe]: /* @__PURE__ */ new Map(),
+    [Me]: e.mode,
+    get [Ne]() {
+      return n;
     },
-    cookie: f,
-    headers: l,
-    env: s,
-    method: i.method,
-    signal: i.signal,
+    cookie: l,
+    headers: f,
+    env: c,
+    method: o.method,
+    signal: o.signal,
     originalUrl: new URL(u),
     get params() {
-      return t?.[L.Params] ?? {};
+      return n?.[L.Params] ?? {};
     },
     get pathname() {
       return u.pathname;
@@ -461,348 +465,351 @@ function cn(e, t, n, r, o) {
     get query() {
       return u.searchParams;
     },
-    request: i,
+    request: o,
     url: u,
     basePathname: r,
-    sharedMap: c,
+    sharedMap: s,
     get headersSent() {
-      return y !== null;
+      return w !== null;
     },
     get exited() {
-      return h >= ue;
+      return g >= B;
     },
     get clientConn() {
       return e.getClientConn();
     },
-    next: T,
-    resetRoute: M,
-    exit: z,
-    cacheControl: (d, m = "Cache-Control") => {
-      N(), l.set(m, ve(d));
+    next: qe,
+    resetRoute: De,
+    exit: ne,
+    cacheControl: (d, h = "Cache-Control") => {
+      N(), f.set(h, Ve(d));
     },
     resolveValue: (async (d) => {
-      const m = d.__id;
+      const h = d.__id;
       if (d.__brand === "server_loader") {
-        if (!(m in I))
+        if (!(h in P))
           throw new Error(
             "You can not get the returned data of a loader that has not been executed for this request."
           );
-        if (I[m] === ye) {
-          const g = P(b) === "dev";
-          await We(d, I, b, g);
+        if (P[h] === ye) {
+          const y = I(A) === "dev";
+          await Ue(d, P, A, y);
         }
       }
-      return I[m];
+      return P[h];
     }),
-    status: (d) => typeof d == "number" ? (N(), p = d, d) : p,
-    locale: (d) => (typeof d == "string" && (R = d), R || ""),
-    error: (d, m) => (p = d, l.delete("Cache-Control"), new F(d, m)),
-    redirect: (d, m) => {
-      if (N(), p = d, m) {
-        const g = m.replace(/([^:])\/{2,}/g, "$1/");
-        m !== g && console.warn(`Redirect URL ${m} is invalid, fixing to ${g}`), l.set("Location", g);
+    status: (d) => typeof d == "number" ? (N(), R = d, d) : R,
+    locale: (d) => (typeof d == "string" && (M = d), M || ""),
+    error: (d, h) => (R = d, f.delete("Cache-Control"), new D(d, h)),
+    redirect: (d, h) => {
+      if (N(), R = d, h) {
+        if (/([^:])\/{2,}/.test(h)) {
+          const y = h.replace(/([^:])\/{2,}/g, "$1/");
+          console.warn(`Redirect URL ${h} is invalid, fixing to ${y}`), h = y;
+        }
+        f.set("Location", h);
       }
-      return l.delete("Cache-Control"), d > 301 && l.set("Cache-Control", "no-store"), z(), new H();
+      return f.delete("Cache-Control"), d > 301 && f.set("Cache-Control", "no-store"), g = B, new H();
     },
     rewrite: (d) => {
       if (N(), d.startsWith("http"))
         throw new Error("Rewrite does not support absolute urls");
-      return c.set(Le, !0), new we(d.replace(/\/+/g, "/"));
+      return s.set(Pe, !0), new we(d.replace(/\/+/g, "/"));
     },
     defer: (d) => typeof d == "function" ? d : () => d,
-    fail: (d, m) => (N(), p = d, l.delete("Cache-Control"), {
+    fail: (d, h) => (N(), R = d, f.delete("Cache-Control"), {
       failed: !0,
-      ...m
+      ...h
     }),
-    text: (d, m) => (l.set("Content-Type", "text/plain; charset=utf-8"), W(d, m)),
-    html: (d, m) => (l.set("Content-Type", "text/html; charset=utf-8"), W(d, m)),
-    parseBody: async () => w !== void 0 ? w : w = dn(b, c),
-    json: (d, m) => (l.set("Content-Type", "application/json; charset=utf-8"), W(d, JSON.stringify(m))),
-    send: W,
-    isDirty: () => y !== null,
+    text: (d, h) => (f.set("Content-Type", "text/plain; charset=utf-8"), U(d, h)),
+    html: (d, h) => (f.set("Content-Type", "text/html; charset=utf-8"), U(d, h)),
+    parseBody: async () => b !== void 0 ? b : b = fn(A, s),
+    json: (d, h) => (f.set("Content-Type", "application/json; charset=utf-8"), U(d, JSON.stringify(h))),
+    send: U,
+    isDirty: () => w !== null,
     getWritableStream: () => {
-      if (y === null) {
+      if (w === null) {
         if (e.mode === "dev") {
-          const d = c.get(X);
-          d && l.set(
+          const d = s.get(X);
+          d && f.set(
             "Server-Timing",
-            d.map(([m, g]) => `${m};dur=${g}`).join(",")
+            d.map(([h, y]) => `${h};dur=${y}`).join(",")
           );
         }
-        y = e.getWritableStream(
-          p,
-          l,
+        w = e.getWritableStream(
+          R,
           f,
-          o,
-          b
+          l,
+          i,
+          A
         );
       }
-      return y;
+      return w;
     }
   };
-  return Object.freeze(b);
+  return Object.freeze(A);
 }
-function U(e) {
-  return e[Me];
+function O(e) {
+  return e[Te];
 }
-function Ue(e) {
-  return e[Ce];
-}
-function ln(e) {
+function Oe(e) {
   return e[xe];
 }
-function P(e) {
+function dn(e) {
   return e[Ne];
 }
-const ue = Number.MAX_SAFE_INTEGER, dn = async ({ request: e, method: t, query: n }, r) => {
-  const o = e.headers.get("content-type")?.split(/[;,]/, 1)[0].trim() ?? "";
-  if (o === "application/x-www-form-urlencoded" || o === "multipart/form-data") {
-    const i = await e.formData();
-    return r.set(Ie, i), fn(i);
+function I(e) {
+  return e[Me];
+}
+const B = Number.MAX_SAFE_INTEGER, fn = async ({ request: e, method: n, query: t }, r) => {
+  const i = e.headers.get("content-type")?.split(/[;,]/, 1)[0].trim() ?? "";
+  if (i === "application/x-www-form-urlencoded" || i === "multipart/form-data") {
+    const o = await e.formData();
+    return r.set(Ie, o), un(o);
   } else {
-    if (o === "application/json")
+    if (i === "application/json")
       return await e.json();
-    if (o === "application/qwik-json") {
-      if (t === "GET" && n.has(re)) {
-        const i = n.get(re);
-        if (i)
+    if (i === "application/qwik-json") {
+      if (n === "GET" && t.has(oe)) {
+        const o = t.get(oe);
+        if (o)
           try {
-            return ee(decodeURIComponent(i));
+            return te(decodeURIComponent(o));
           } catch {
           }
       }
-      return ee(await e.text());
+      return te(await e.text());
     }
   }
-}, fn = (e) => [...e.entries()].reduce((n, [r, o]) => (r.split(".").reduce((i, a, s, c) => {
+}, un = (e) => [...e.entries()].reduce((t, [r, i]) => (r.split(".").reduce((o, a, c, s) => {
   if (a.endsWith("[]")) {
-    const f = a.slice(0, -2);
-    return i[f] = i[f] || [], i[f] = [...i[f], o];
+    const l = a.slice(0, -2);
+    return o[l] = o[l] || [], o[l] = [...o[l], i];
   }
-  return s < c.length - 1 ? i[a] = i[a] || (Number.isNaN(+c[s + 1]) ? {} : []) : i[a] = o;
-}, n), n), {});
-function un(e) {
-  const { params: t, request: n, status: r, locale: o, originalUrl: i } = e, a = {};
-  n.headers.forEach((T, M) => a[M] = T);
-  const s = e.sharedMap.get(j), c = e.sharedMap.get(Ie), f = e.sharedMap.get(Pe), l = e.sharedMap.get(sn), u = e.request.headers, h = new URL(i.pathname + i.search, i), y = u.get("X-Forwarded-Host"), w = u.get("X-Forwarded-Proto");
-  y && (h.port = "", h.host = y), w && (h.protocol = w);
-  const R = U(e), p = Ue(e);
+  return c < s.length - 1 ? o[a] = o[a] || (Number.isNaN(+s[c + 1]) ? {} : []) : o[a] = i;
+}, t), t), {});
+function hn(e) {
+  const { params: n, request: t, status: r, locale: i, originalUrl: o } = e, a = {};
+  t.headers.forEach((M, R) => a[R] = M);
+  const c = e.sharedMap.get(Q), s = e.sharedMap.get(Ie), l = e.sharedMap.get(Ce), f = e.sharedMap.get(cn), u = e.request.headers, m = new URL(o.pathname + o.search, o), p = u.get("X-Forwarded-Host"), g = u.get("X-Forwarded-Proto");
+  p && (m.port = "", m.host = p), g && (m.protocol = g);
+  const w = O(e), b = Oe(e);
   return {
-    url: h.href,
+    url: m.href,
     requestHeaders: a,
-    locale: o(),
-    nonce: l,
+    locale: i(),
+    nonce: f,
     containerAttributes: {
-      [je]: f
+      [je]: l
     },
     qwikrouter: {
-      routeName: f,
+      routeName: l,
       ev: e,
-      params: { ...t },
-      loadedRoute: ln(e),
+      params: { ...n },
+      loadedRoute: dn(e),
       response: {
         status: r(),
-        loaders: R,
-        loadersSerializationStrategy: p,
-        action: s,
-        formData: c
+        loaders: w,
+        loadersSerializationStrategy: b,
+        action: c,
+        formData: s
       }
     }
   };
 }
-const hn = (e, t, n, r, o) => {
-  const i = [], a = [], s = [], c = !!(t && bn(t[L.Mods]));
-  if (e && he(
-    i,
+const mn = (e, n, t, r, i, o) => {
+  const a = [], c = [], s = [], l = !!(n && An(n[L.Mods]));
+  if (o && s.push(Nn), e && he(
     a,
+    c,
     s,
     e,
-    c,
-    n
-  ), t) {
-    const f = t[L.RouteName];
-    r && (n === "POST" || n === "PUT" || n === "PATCH" || n === "DELETE") && (r === "lax-proto" ? s.unshift(An) : s.unshift(_n)), c && ((n === "POST" || n === "GET") && s.push(wn), s.push(pn), s.push(Nn));
-    const l = t[L.Mods];
-    s.push(Mn), he(
-      i,
+    l,
+    t
+  ), n) {
+    const f = n[L.RouteName];
+    r && (t === "POST" || t === "PUT" || t === "PATCH" || t === "DELETE") && (r === "lax-proto" ? s.unshift(_n) : s.unshift(Tn)), l && ((t === "POST" || t === "GET") && s.push(pn), s.push(Rn), o && s.push(xn));
+    const u = n[L.Mods];
+    he(
       a,
+      c,
       s,
+      u,
       l,
-      c,
-      n
-    ), c && (s.push((u) => {
-      u.sharedMap.set(Pe, f);
-    }), s.push(mn(a)), s.push(gn(i)), s.push(o));
+      t
+    ), l && (s.push((m) => {
+      m.sharedMap.set(Ce, f);
+    }), s.push(gn(c)), s.push(yn(a)), s.push(i));
   }
   return s;
-}, he = (e, t, n, r, o, i) => {
+}, he = (e, n, t, r, i, o) => {
   for (const a of r) {
-    typeof a.onRequest == "function" ? n.push(a.onRequest) : Array.isArray(a.onRequest) && n.push(...a.onRequest);
-    let s;
-    switch (i) {
+    typeof a.onRequest == "function" ? t.push(a.onRequest) : Array.isArray(a.onRequest) && t.push(...a.onRequest);
+    let c;
+    switch (o) {
       case "GET": {
-        s = a.onGet;
+        c = a.onGet;
         break;
       }
       case "POST": {
-        s = a.onPost;
+        c = a.onPost;
         break;
       }
       case "PUT": {
-        s = a.onPut;
+        c = a.onPut;
         break;
       }
       case "PATCH": {
-        s = a.onPatch;
+        c = a.onPatch;
         break;
       }
       case "DELETE": {
-        s = a.onDelete;
+        c = a.onDelete;
         break;
       }
       case "OPTIONS": {
-        s = a.onOptions;
+        c = a.onOptions;
         break;
       }
       case "HEAD": {
-        s = a.onHead;
+        c = a.onHead;
         break;
       }
     }
-    if (typeof s == "function" ? n.push(s) : Array.isArray(s) && n.push(...s), o)
-      for (const c of Object.values(a))
-        typeof c == "function" && (c.__brand === "server_loader" ? e.push(c) : c.__brand === "server_action" && t.push(c));
+    if (typeof c == "function" ? t.push(c) : Array.isArray(c) && t.push(...c), i)
+      for (const s of Object.values(a))
+        typeof s == "function" && (s.__brand === "server_loader" ? e.push(s) : s.__brand === "server_action" && n.push(s));
   }
 };
-function mn(e) {
-  return async (t) => {
-    const n = t;
-    if (n.headersSent) {
-      n.exit();
+function gn(e) {
+  return async (n) => {
+    const t = n;
+    if (t.headersSent) {
+      t.exit();
       return;
     }
-    const { method: r } = n, o = U(n), i = P(n) === "dev";
-    if (i && r === "GET" && n.query.has(te) && console.warn(
+    const { method: r } = t, i = O(t), o = I(t) === "dev";
+    if (o && r === "GET" && t.query.has(ie) && console.warn(
       `Seems like you are submitting a Qwik Action via GET request. Qwik Actions should be submitted via POST request.
 Make sure your <form> has method="POST" attribute, like this: <form method="POST">`
     ), r === "POST") {
-      const a = n.query.get(te);
+      const a = t.query.get(ie);
       if (a) {
-        const s = globalThis._qwikActionsMap, c = e.find((f) => f.__id === a) ?? s?.get(a);
-        if (c) {
-          n.sharedMap.set(j, a);
-          const f = await n.parseBody();
-          if (!f || typeof f != "object")
+        const c = globalThis._qwikActionsMap, s = e.find((l) => l.__id === a) ?? c?.get(a);
+        if (s) {
+          t.sharedMap.set(Q, a);
+          const l = await t.parseBody();
+          if (!l || typeof l != "object")
             throw new Error(
               `Expected request data for the action id ${a} to be an object`
             );
-          const l = await qe(n, c.__validators, f, i);
-          if (!l.success)
-            o[a] = n.fail(l.status ?? 500, l.error);
+          const f = await ke(t, s.__validators, l, o);
+          if (!f.success)
+            i[a] = t.fail(f.status ?? 500, f.error);
           else {
-            const u = i ? await G(
-              n,
-              c.__qrl.getHash(),
-              () => c.__qrl.call(n, l.data, n)
-            ) : await c.__qrl.call(n, l.data, n);
-            i && Q(u, c.__qrl), o[a] = u;
+            const u = o ? await j(
+              t,
+              s.__qrl.getHash(),
+              () => s.__qrl.call(t, f.data, t)
+            ) : await s.__qrl.call(t, f.data, t);
+            o && S(u, s.__qrl), i[a] = u;
           }
         }
       }
     }
   };
 }
-function gn(e) {
-  return async (t) => {
-    const n = t;
-    if (n.headersSent) {
-      n.exit();
+function yn(e) {
+  return async (n) => {
+    const t = n;
+    if (t.headersSent) {
+      t.exit();
       return;
     }
-    const r = U(n), o = P(n) === "dev";
+    const r = O(t), i = I(t) === "dev";
     if (e.length > 0) {
-      let i = [];
-      if (n.query.has(v)) {
-        const s = n.query.getAll(v);
-        for (const c of e)
-          s.includes(c.__id) ? i.push(c) : r[c.__id] = ye;
+      let o = [];
+      if (t.query.has(J)) {
+        const c = t.query.getAll(J);
+        for (const s of e)
+          c.includes(s.__id) ? o.push(s) : r[s.__id] = ye;
       } else
-        i = e;
-      const a = i.map(
-        (s) => We(s, r, n, o)
+        o = e;
+      const a = o.map(
+        (c) => Ue(c, r, t, i)
       );
       await Promise.all(a);
     }
   };
 }
-async function We(e, t, n, r) {
-  const o = e.__id;
-  return t[o] = qe(
-    n,
+async function Ue(e, n, t, r) {
+  const i = e.__id;
+  return n[i] = ke(
+    t,
     e.__validators,
     void 0,
     // data
     r
-  ).then((a) => a.success ? r ? G(
-    n,
+  ).then((a) => a.success ? r ? j(
+    t,
     e.__qrl.getHash(),
-    () => e.__qrl.call(n, n)
-  ) : e.__qrl.call(n, n) : n.fail(a.status ?? 500, a.error)).then((a) => (typeof a == "function" ? t[o] = a() : (r && Q(a, e.__qrl), t[o] = a), a)), Ue(n).set(o, e.__serializationStrategy), t[o];
+    () => e.__qrl.call(t, t)
+  ) : e.__qrl.call(t, t) : t.fail(a.status ?? 500, a.error)).then((a) => (typeof a == "function" ? n[i] = a() : (r && S(a, e.__qrl), n[i] = a), a)), Oe(t).set(i, e.__serializationStrategy), n[i];
 }
-async function qe(e, t, n, r) {
-  let o = {
+async function ke(e, n, t, r) {
+  let i = {
     success: !0,
-    data: n
+    data: t
   };
-  if (t)
-    for (const i of t)
-      if (r ? o = await G(
+  if (n)
+    for (const o of n)
+      if (r ? i = await j(
         e,
         "validator$",
-        () => i.validate(e, n)
-      ) : o = await i.validate(e, n), o.success)
-        n = o.data;
+        () => o.validate(e, t)
+      ) : i = await o.validate(e, t), i.success)
+        t = i.data;
       else
-        return o;
-  return o;
+        return i;
+  return i;
 }
-function yn(e) {
+function wn(e) {
   return e ? typeof e == "object" && Symbol.asyncIterator in e : !1;
 }
-async function wn(e) {
-  const t = e.query.get(Qe);
-  if (t && e.request.headers.get("X-QRL") === t && e.request.headers.get("Content-Type") === "application/qwik-json") {
+async function pn(e) {
+  const n = e.query.get(Ee);
+  if (n && e.request.headers.get("X-QRL") === n && e.request.headers.get("Content-Type") === "application/qwik-json") {
     e.exit();
-    const n = P(e) === "dev", r = await e.parseBody();
+    const t = I(e) === "dev", r = await e.parseBody();
     if (Array.isArray(r)) {
-      const [o, ...i] = r;
-      if (Rn(o) && o.getHash() === t) {
+      const [i, ...o] = r;
+      if (bn(i) && i.getHash() === n) {
         let a;
         try {
-          n ? a = await G(
+          t ? a = await j(
             e,
-            `server_${o.getSymbol()}`,
-            () => o.apply(e, i)
-          ) : a = await o.apply(e, i);
-        } catch (s) {
-          throw s instanceof F ? e.error(s.status, s.data) : e.error(500, "Invalid request");
+            `server_${i.getSymbol()}`,
+            () => i.apply(e, o)
+          ) : a = await i.apply(e, o);
+        } catch (c) {
+          throw c instanceof D ? e.error(c.status, c.data) : e.error(500, "Invalid request");
         }
-        if (yn(a)) {
+        if (wn(a)) {
           e.headers.set("Content-Type", "text/qwik-json-stream");
-          const c = e.getWritableStream().getWriter();
-          for await (const f of a) {
-            n && Q(f, o);
-            const l = await D([f]);
+          const s = e.getWritableStream().getWriter();
+          for await (const l of a) {
+            t && S(l, i);
+            const f = await q([l]);
             if (e.signal.aborted)
               break;
-            await c.write(E.encode(`${l}
+            await s.write(E.encode(`${f}
 `));
           }
-          c.close();
+          s.close();
         } else {
-          Q(a, o), e.headers.set("Content-Type", "application/qwik-json");
-          const s = await D([a]);
-          e.send(200, s);
+          S(a, i), e.headers.set("Content-Type", "application/qwik-json");
+          const c = await q([a]);
+          e.send(200, c);
         }
         return;
       }
@@ -810,93 +817,91 @@ async function wn(e) {
     throw e.error(500, "Invalid request");
   }
 }
-function pn(e) {
-  const { basePathname: t, originalUrl: n, sharedMap: r } = e, { pathname: o, search: i } = n;
-  if (!r.has(O) && o !== t && !o.endsWith(".html")) {
+function Rn(e) {
+  const { basePathname: n, originalUrl: t, sharedMap: r } = e, { pathname: i, search: o } = t;
+  if (!r.has(ee) && i !== n && !i.endsWith(".html")) {
     if (globalThis.__NO_TRAILING_SLASH__) {
-      if (o.endsWith("/"))
+      if (i.endsWith("/"))
         throw e.redirect(
-          V.MovedPermanently,
-          o.slice(0, o.length - 1) + i
+          Y.MovedPermanently,
+          i.slice(0, i.length - 1) + o
         );
-    } else if (!o.endsWith("/"))
-      throw e.redirect(V.MovedPermanently, o + "/" + i);
+    } else if (!i.endsWith("/"))
+      throw e.redirect(Y.MovedPermanently, i + "/" + o);
   }
 }
-function Q(e, t) {
+function S(e, n) {
   try {
-    Se(e, void 0);
-  } catch (n) {
-    throw n instanceof Error && t.dev && (n.loc = t.dev), n;
+    Qe(e, void 0);
+  } catch (t) {
+    throw t instanceof Error && n.dev && (t.loc = n.dev), t;
   }
 }
-const Rn = (e) => typeof e == "function" && typeof e.getSymbol == "function";
-function bn(e) {
-  const t = e[e.length - 1];
-  return t && typeof t.default == "function";
+const bn = (e) => typeof e == "function" && typeof e.getSymbol == "function";
+function An(e) {
+  const n = e[e.length - 1];
+  return n && typeof n.default == "function";
 }
 function Z(e) {
   e = new URL(e), e.pathname.endsWith(C) && (e.pathname = e.pathname.slice(0, -C.length)), globalThis.__NO_TRAILING_SLASH__ ? e.pathname.endsWith("/") && (e.pathname = e.pathname.slice(0, -1)) : e.pathname.endsWith("/") || (e.pathname += "/");
-  const t = e.search.slice(1).replaceAll(/&?q(action|data|func|loaders)=[^&]+/g, "");
-  return `${e.pathname}${t ? `?${t}` : ""}${e.hash}`;
+  const n = e.search.slice(1).replaceAll(/&?q(action|data|func|loaders)=[^&]+/g, "");
+  return `${e.pathname}${n ? `?${n}` : ""}${e.hash}`;
 }
 const E = /* @__PURE__ */ new TextEncoder();
-function An(e) {
-  ke(e, "lax-proto");
-}
 function _n(e) {
-  ke(e);
+  We(e, "lax-proto");
 }
-function ke(e, t) {
-  if (Cn(
+function Tn(e) {
+  We(e);
+}
+function We(e, n) {
+  if (In(
     e.request.headers,
     "application/x-www-form-urlencoded",
     "multipart/form-data",
     "text/plain"
   )) {
-    const r = e.request.headers.get("origin"), o = e.url.origin;
-    let i = r !== o;
-    if (i && t && r?.replace(/^http(s)?/g, "") === o.replace(/^http(s)?/g, "") && (i = !1), i)
+    const r = e.request.headers.get("origin"), i = e.url.origin;
+    let o = r !== i;
+    if (o && n && r?.replace(/^http(s)?/g, "") === i.replace(/^http(s)?/g, "") && (o = !1), o)
       throw e.error(
         403,
         `CSRF check failed. Cross-site ${e.method} form submissions are forbidden.
-The request origin "${r}" does not match the server origin "${o}".`
+The request origin "${r}" does not match the server origin "${i}".`
       );
   }
 }
-function Tn(e) {
-  return async (t) => {
-    if (t.headersSent || t.sharedMap.has(O))
+function Mn(e) {
+  return async (n) => {
+    if (n.headersSent || n.sharedMap.has(ee))
       return;
-    t.request.headers.forEach((l, u) => l);
-    const r = t.headers;
+    n.request.headers.forEach((f, u) => f);
+    const r = n.headers;
     r.has("Content-Type") || r.set("Content-Type", "text/html; charset=utf-8");
-    const { readable: o, writable: i } = new TextEncoderStream(), a = t.getWritableStream(), s = o.pipeTo(a, { preventClose: !0 }), c = i.getWriter(), f = t.status();
+    const { readable: i, writable: o } = new TextEncoderStream(), a = n.getWritableStream(), c = i.pipeTo(a, { preventClose: !0 }), s = o.getWriter(), l = n.status();
     try {
-      const l = P(t) === "static", u = un(t), h = await e({
-        base: t.basePathname + "build/",
-        stream: c,
+      const f = I(n) === "static", u = hn(n), m = await e({
+        base: n.basePathname + "build/",
+        stream: s,
         serverData: u,
         containerAttributes: {
-          "q:render": l ? "static" : "",
+          "q:render": f ? "static" : "",
           ...u.containerAttributes
         }
-      }), y = {
-        loaders: U(t),
-        action: t.sharedMap.get(j),
-        status: f !== 200 ? f : 200,
-        href: Z(t.url)
+      }), p = {
+        loaders: O(n),
+        action: n.sharedMap.get(Q),
+        status: l !== 200 ? l : 200,
+        href: Z(n.url)
       };
-      typeof h.html == "string" && await c.write(h.html), t.sharedMap.set(Oe, y);
+      typeof m.html == "string" && await s.write(m.html), n.sharedMap.set(Le, p);
     } finally {
-      await c.ready, await c.close(), await s;
+      await s.ready, await s.close(), await c;
     }
     await a.close();
   };
 }
-async function Mn(e) {
-  if (!e.sharedMap.has(O))
-    return;
+async function Nn(e) {
   try {
     await e.next();
   } catch (i) {
@@ -905,9 +910,9 @@ async function Mn(e) {
   }
   if (e.headersSent)
     return;
-  const n = e.status(), r = e.headers.get("Location");
-  if (n >= 301 && n <= 308 && r) {
-    const i = xn(r);
+  const n = e.status(), t = e.headers.get("Location");
+  if (n >= 301 && n <= 308 && t) {
+    const i = Cn(t);
     if (i) {
       e.headers.set("Location", i), e.getWritableStream().close();
       return;
@@ -915,177 +920,183 @@ async function Mn(e) {
       e.status(200), e.headers.delete("Location");
   }
 }
-async function Nn(e) {
-  if (!e.sharedMap.has(O) || (await e.next(), e.headersSent || e.exited))
+async function xn(e) {
+  if (await e.next(), e.headersSent || e.exited)
     return;
-  const n = e.status(), r = e.headers.get("Location");
-  e.request.headers.forEach((l, u) => l), e.headers.set("Content-Type", "application/json; charset=utf-8");
-  let o = U(e);
-  const i = e.query.getAll(v), a = i.length > 0;
-  if (a) {
+  const n = e.status(), t = e.headers.get("Location");
+  e.request.headers.forEach((l, f) => l), e.headers.set("Content-Type", "application/json; charset=utf-8");
+  let r = O(e);
+  const i = e.query.getAll(J), o = i.length > 0;
+  if (o) {
     const l = {};
-    for (const u of i) {
-      const h = o[u];
-      l[u] = h;
+    for (const f of i) {
+      const u = r[f];
+      l[f] = u;
     }
-    o = l;
+    r = l;
   }
-  const s = a ? {
+  const a = o ? {
     // send minimal data to the client
-    loaders: o,
+    loaders: r,
     status: n !== 200 ? n : 200,
     href: Z(e.url)
   } : {
-    loaders: o,
-    action: e.sharedMap.get(j),
+    loaders: r,
+    action: e.sharedMap.get(Q),
     status: n !== 200 ? n : 200,
     href: Z(e.url),
-    redirect: r ?? void 0,
-    isRewrite: e.sharedMap.get(Le)
-  }, c = e.getWritableStream().getWriter(), f = await D([s]);
-  c.write(E.encode(f)), e.sharedMap.set(Oe, s), c.close();
+    redirect: t ?? void 0,
+    isRewrite: e.sharedMap.get(Pe)
+  }, c = e.getWritableStream().getWriter(), s = await q([a]);
+  c.write(E.encode(s)), e.sharedMap.set(Le, a), c.close();
 }
-function xn(e) {
+function Cn(e) {
   if (e.startsWith("/")) {
-    const t = C, n = new URL(e, "http://localhost");
-    return (n.pathname.endsWith("/") ? n.pathname.slice(0, -1) : n.pathname) + (t.startsWith("/") ? "" : "/") + t + n.search;
+    if (!e.includes(C)) {
+      const n = new URL(e, "http://localhost");
+      return (n.pathname.endsWith("/") ? n.pathname.slice(0, -1) : n.pathname) + C + n.search;
+    }
+    return e;
   } else
     return;
 }
 function me() {
   return typeof performance < "u" ? performance.now() : 0;
 }
-async function G(e, t, n) {
+async function j(e, n, t) {
   const r = me();
   try {
-    return await n();
+    return await t();
   } finally {
-    const o = me() - r;
-    let i = e.sharedMap.get(X);
-    i || e.sharedMap.set(X, i = []), i.push([t, o]);
+    const i = me() - r;
+    let o = e.sharedMap.get(X);
+    o || e.sharedMap.set(X, o = []), o.push([n, i]);
   }
 }
-function Cn(e, ...t) {
-  const n = e.get("content-type")?.split(/;/, 1)[0].trim() ?? "";
-  return t.includes(n);
+function In(e, ...n) {
+  const t = e.get("content-type")?.split(/;/, 1)[0].trim() ?? "";
+  return n.includes(t);
 }
-let J;
-async function Wn(e, t) {
-  const { render: n, checkOrigin: r } = t;
-  let { qwikRouterConfig: o } = t;
-  if (o || (J || (J = await import("@qwik-router-config")), o = J), !o)
+let K;
+async function Wn(e, n) {
+  const { render: t, checkOrigin: r } = n;
+  let { qwikRouterConfig: i } = n;
+  if (i || (K || (K = await import("@qwik-router-config")), i = K), !i)
     throw new Error("qwikRouterConfig is required.");
-  const i = e.url.pathname, a = fe(i), s = await ge(
+  const { pathname: o, isInternal: a } = V(e.url.pathname), c = await ge(
+    i,
     o,
-    a,
     e.request.method,
     r ?? !0,
-    n
+    t,
+    a
   );
-  if (s) {
-    const [c, f] = s;
-    return an(
+  if (c) {
+    const [s, l] = c;
+    return sn(
       e,
-      c,
-      f,
+      s,
+      l,
       async (u) => {
-        const h = fe(u.pathname), y = await ge(
-          o,
-          h,
+        const { pathname: m } = V(u.pathname), p = await ge(
+          i,
+          m,
           e.request.method,
           r ?? !0,
-          n
+          t,
+          a
         );
-        if (y) {
-          const [w, R] = y;
-          return { loadedRoute: w, requestHandlers: R };
+        if (p) {
+          const [g, w] = p;
+          return { loadedRoute: g, requestHandlers: w };
         } else
           return { loadedRoute: null, requestHandlers: [] };
       },
-      o.basePathname
+      i.basePathname
     );
   }
   return null;
 }
-async function ge(e, t, n, r, o) {
-  const { routes: i, serverPlugins: a, menus: s, cacheModules: c } = e, f = await Ke(i, s, c, t), l = hn(
-    a,
+async function ge(e, n, t, r, i, o) {
+  const { routes: a, serverPlugins: c, menus: s, cacheModules: l } = e, f = await ve(a, s, l, n, o), u = mn(
+    c,
     f,
-    n,
+    t,
     r,
-    Tn(o)
+    Mn(i),
+    o
   );
-  return l.length > 0 ? [f, l] : null;
+  return u.length > 0 ? [f, u] : null;
 }
 const Pn = [
   // Will be replaced in post-build with the 404s generated by SSG
   "__QWIK_ROUTER_NOT_FOUND_ARRAY__"
 ];
-function qn(e) {
-  for (const [t, n] of Pn)
-    if (e.startsWith(t))
-      return n;
+function $n(e) {
+  for (const [n, t] of Pn)
+    if (e.startsWith(n))
+      return t;
   return _e(404, "Resource Not Found");
 }
-const Y = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
-function kn(e, t) {
+const v = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+function qn(e, n) {
   if (e.toUpperCase() !== "GET")
     return !1;
-  const n = t.pathname;
-  if (n.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/") || n.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/") || Y.has(n))
+  const t = n.pathname;
+  if (t.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/") || t.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/") || v.has(t))
     return !0;
-  if (n.endsWith("/q-data.json")) {
-    const r = n.replace(/\/q-data.json$/, "");
-    if (Y.has(r + "/") || Y.has(r))
+  if (t.endsWith("/q-data.json")) {
+    const r = t.replace(/\/q-data.json$/, "");
+    if (v.has(r + "/") || v.has(r))
       return !0;
   }
   return !1;
 }
-class $n extends Error {
-  constructor(t, n) {
-    super(typeof n == "string" ? n : void 0), this.status = t, this.data = n;
+class Dn extends Error {
+  constructor(n, t) {
+    super(typeof t == "string" ? t : void 0), this.status = n, this.data = t;
   }
 }
 class $e {
 }
-class Dn extends $e {
-}
 class Fn extends $e {
-  constructor(t) {
-    super(), this.pathname = t;
+}
+class Sn extends $e {
+  constructor(n) {
+    super(), this.pathname = n;
   }
 }
-class Sn {
+class Qn {
   #e = null;
   #n = new TextEncoder();
   #t = new TransformStream({
-    transform: (t, n) => {
-      t = String(t);
+    transform: (n, t) => {
+      n = String(n);
       let r = "";
-      for (let o = 0; o < t.length; o++) {
-        const i = t[o], a = i.charCodeAt(0);
+      for (let i = 0; i < n.length; i++) {
+        const o = n[i], a = o.charCodeAt(0);
         if (this.#e !== null) {
-          const s = this.#e;
+          const c = this.#e;
           if (this.#e = null, 56320 <= a && a <= 57343) {
-            r += s + i;
+            r += c + o;
             continue;
           }
           r += "�";
         }
         if (55296 <= a && a <= 56319) {
-          this.#e = i;
+          this.#e = o;
           continue;
         }
         if (56320 <= a && a <= 57343) {
           r += "�";
           continue;
         }
-        r += i;
+        r += o;
       }
-      r && n.enqueue(this.#n.encode(r));
+      r && t.enqueue(this.#n.encode(r));
     },
-    flush: (t) => {
-      this.#e !== null && t.enqueue(new Uint8Array([239, 191, 189]));
+    flush: (n) => {
+      this.#e !== null && n.enqueue(new Uint8Array([239, 191, 189]));
     }
   });
   get encoding() {
@@ -1103,14 +1114,14 @@ class Sn {
 }
 export {
   $e as AbortMessage,
-  Dn as RedirectMessage,
-  Oe as RequestEvShareQData,
-  Fn as RewriteMessage,
-  $n as ServerError,
-  Sn as _TextEncoderStream_polyfill,
-  K as getErrorHtml,
-  qn as getNotFound,
-  kn as isStaticPath,
-  Un as mergeHeadersCookies,
+  Fn as RedirectMessage,
+  Le as RequestEvShareQData,
+  Sn as RewriteMessage,
+  Dn as ServerError,
+  Qn as _TextEncoderStream_polyfill,
+  G as getErrorHtml,
+  $n as getNotFound,
+  qn as isStaticPath,
+  kn as mergeHeadersCookies,
   Wn as requestHandler
 };